test setegress fee, unregtoken

Author: taokayan

antelope_contracts/contracts/erc20/include/erc20/erc20.hpp

@@ -107,7 +107,7 @@ class [[eosio::contract]] erc20 : public contract {
         eosio::asset balance;  // total amount in EVM side, only valid for native->evm tokens
         eosio::asset fee_balance;
         uint8_t erc20_precision = 0;
-        eosio::binary_extension<bool> _is_evm_to_native{false};
+        eosio::binary_extension<bool> from_evm_to_native{false};
 
         uint64_t primary_key() const {
             return id;
@@ -122,11 +122,11 @@ class [[eosio::contract]] erc20 : public contract {
             return make_key(address);
         }
         bool is_evm_to_native() const {
-            if (_is_evm_to_native.has_value()) return _is_evm_to_native.value();
+            if (from_evm_to_native.has_value()) return from_evm_to_native.value();
             return false;
         }
 
-        EOSLIB_SERIALIZE(token_t, (id)(token_contract)(address)(ingress_fee)(balance)(fee_balance)(erc20_precision)(_is_evm_to_native));
+        EOSLIB_SERIALIZE(token_t, (id)(token_contract)(address)(ingress_fee)(balance)(fee_balance)(erc20_precision)(from_evm_to_native));
     };
     typedef eosio::multi_index<"tokens"_n, token_t,
                                indexed_by<"by.symbol"_n, const_mem_fun<token_t, uint128_t, &token_t::by_contract_symbol> >,

antelope_contracts/contracts/erc20/src/erc20.cpp

@@ -345,7 +345,7 @@ void erc20::regevm2nat(std::string erc20_token_address,
         v.balance.amount = 0;
         v.fee_balance = v.balance;
         v.erc20_precision = erc20_precision;
-        v._is_evm_to_native = true;
+        v.from_evm_to_native = true;
     });
 }
 

antelope_contracts/tests/erc20/integrated_tests.cpp

@@ -1055,6 +1055,51 @@ try {
     evm_address = gold_evm_acc->address_0x();
     bal = balanceOf(evm2.address_0x().c_str());
     BOOST_REQUIRE(bal == 634'000'000'000'000'000);
+
+    // set egress fee to 0.5 EOS
+    constexpr intx::uint256 minimum_natively_representable = intx::exp(10_u256, intx::uint256(18 - 4));
+    evm_address = proxy_address;
+    push_action(erc20_account, "setegressfee"_n, erc20_account, 
+        mvo()("token_contract", gold_token_account_name)("token_symbol_code", "GOLD")("egress_fee", make_asset(5000)));
+    BOOST_REQUIRE(5000 * minimum_natively_representable == egressFee());
+
+    // EVM -> native with old fee, should not work
+    evm_address = proxy_address;
+    bridgeTransferERC20(evm2, addr_alice, (uint64_t)100'000'000'000'000'000, "hello world", fee);
+    produce_block();
+
+    evm_address = gold_evm_acc->address_0x();
+    bal = balanceOf(evm2.address_0x().c_str());
+    BOOST_REQUIRE(bal == 634'000'000'000'000'000);
+
+    // EVM -> native with new fee, should work
+    evm_address = proxy_address;
+    fee = egressFee();
+    bridgeTransferERC20(evm2, addr_alice, (uint64_t)100'000'000'000'000'000, "hello world", fee);
+    produce_block();
+
+    evm_address = gold_evm_acc->address_0x();
+    bal = balanceOf(evm2.address_0x().c_str());
+    BOOST_REQUIRE(bal == 534'000'000'000'000'000);
+
+    // unregtoken
+    push_action(
+        erc20_account, "unregtoken"_n, erc20_account, mvo()("eos_contract_name", gold_token_account_name)("token_symbol_code", "GOLD"));
+    
+    // EOS->EVM not allowed after unregtoken
+    BOOST_REQUIRE_EXCEPTION(
+        transfer_token(gold_token_account_name, "alice"_n, erc20_account, make_asset(2000, symbol::from_string("4,GOLD")), evm2.address_0x().c_str()),
+        eosio_assert_message_exception, 
+        eosio_assert_message_is("received unregistered token"));
+
+    // EVM -> native not allowed
+    evm_address = proxy_address;
+    fee = egressFee();
+    BOOST_REQUIRE_EXCEPTION(
+        bridgeTransferERC20(evm2, addr_alice, (uint64_t)100'000'000'000'000'000, "hello world", fee),
+        eosio_assert_message_exception, 
+        eosio_assert_message_is("ERC-20 token not registerred"));
+
 }
 FC_LOG_AND_RETHROW()