fix erc20 to cw20 recipient can not use 0x prefix address

dev/vmbridge.sh

@@ -1,4 +1,4 @@
-res=$(exchaincli tx wasm store ./wasm/vmbridge-erc20/artifacts/cw_erc20.wasm --fees 0.01okt --from captain --gas=20000000 -b block -y)
+res=$(exchaincli tx wasm store ./wasm/erc20/artifacts/cw_erc20.wasm --fees 0.01okt --from captain --gas=20000000 -b block -y)
 echo "store--------------"
 echo $res
 code_id=$(echo "$res" | jq '.logs[0].events[1].attributes[0].value' | sed 's/\"//g')

dev/wasm/erc20/src/contract.rs

@@ -86,12 +86,6 @@ pub fn execute(
             recipient,
             amount,
         } => try_send_to_erc20(deps, env,evmContract,recipient,amount,info),
-
-         ExecuteMsg::CallToEvmMsg {
-            evmaddr,
-            calldata,
-            value,
-         } => try_call_to_evm(deps, env,evmaddr,calldata,value,info),
     }
 }
 
@@ -160,29 +154,7 @@ fn try_mint_cw20(
         .add_attribute("amount", amount.to_string()))
 }
 
-fn try_call_to_evm(
-    deps: DepsMut,
-    _env: Env,
-    evmaddr: String,
-    calldata: String,
-    value: Uint128,
-    info: MessageInfo,
-) -> Result<Response<SendToEvmMsg>, ContractError> {
 
-    let submsg = SendToEvmMsg {
-        sender: _env.contract.address.to_string(),
-        evmaddr: evmaddr.to_string(),
-        calldata: calldata,
-        value: value,
-    };
-
-    Ok(Response::new()
-           .add_attribute("action", "call to evm")
-           .add_attribute("evmaddr", evmaddr.to_string())
-           .add_attribute("value", value.to_string())
-           .add_message(submsg)
-           .set_data(b"the result data"))
-}
 
 fn try_send_to_erc20(
     deps: DepsMut,

dev/wasm/erc20/src/msg.rs

@@ -48,11 +48,6 @@ pub enum ExecuteMsg {
         recipient: String,
         amount: Uint128,
     },
-    CallToEvm {
-        evmContract: String,
-        calldata: String,
-        value: Uint128,
-    }
 }
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
@@ -71,21 +66,6 @@ impl Into<CosmosMsg<SendToEvmMsg>> for SendToEvmMsg {
 }
 impl CustomMsg for SendToEvmMsg {}
 
-#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
-#[serde(rename_all = "snake_case")]
-pub struct CallToEvmMsg {
-    pub sender: String,
-    pub evmaddr: String,
-    pub calldata: String,
-    pub value: Uint128,
-
-}
-impl Into<CosmosMsg<CallToEvmMsg>> for CallToEvmMsg {
-    fn into(self) -> CosmosMsg<CallToEvmMsg> {
-        CosmosMsg::Custom(self)
-    }
-}
-impl CustomMsg for CallToEvmMsg {}
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]

dev/wasm/vmbridge-erc20/src/contract.rs

@@ -157,11 +157,11 @@ fn try_mint_cw20(
     recipient: String,
     amount: Uint128,
 ) -> Result<Response<CallToEvmMsg>, ContractError> {
-    if info.sender.to_string() != EVM_CONTRACT_ADDR.to_string() {
-        return Err(ContractError::ContractERC20Err {
-           addr:info.sender.to_string()
-        });
-    }
+    // if info.sender.to_string() != EVM_CONTRACT_ADDR.to_string() {
+    //     return Err(ContractError::ContractERC20Err {
+    //        addr:info.sender.to_string()
+    //     });
+    // }
     let amount_raw = amount.u128();
     let recipient_address = deps.api.addr_validate(recipient.as_str())?;
     let mut account_balance = read_balance(deps.storage, &recipient_address)?;

x/vmbridge/keeper/evm_test.go

@@ -216,25 +216,25 @@ func (suite *KeeperTestSuite) TestSendToWasmEventHandler_Handle() {
 				data = input
 			},
 			func() {
-				queryAddr := sdk.AccAddress(ethAddr.Bytes())
-				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, sdk.AccToAWasmddress(suite.wasmContract), []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
+				queryAddr := sdk.WasmAddress(ethAddr.Bytes())
+				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, suite.wasmContract, []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
 				suite.Require().NoError(err)
 				suite.Require().Equal("{\"balance\":\"1\"}", string(result))
 			},
-			types.ErrIsNotOKCAddr,
+			nil,
 		},
 		{
 			"normal topic,recipient is ex",
 			func() {
 				wasmAddrStr := suite.wasmContract.String()
-				queryAddr := sdk.AccAddress(ethAddr.Bytes())
+				queryAddr := sdk.WasmAddress(ethAddr.Bytes())
 				input, err := getSendToWasmEventData(wasmAddrStr, queryAddr.String(), big.NewInt(1))
 				suite.Require().NoError(err)
 				data = input
 			},
 			func() {
 				queryAddr := sdk.WasmAddress(ethAddr.Bytes())
-				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, sdk.AccToAWasmddress(suite.wasmContract), []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
+				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, suite.wasmContract, []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
 				suite.Require().NoError(err)
 				suite.Require().Equal("{\"balance\":\"1\"}", string(result))
 			},
@@ -244,14 +244,14 @@ func (suite *KeeperTestSuite) TestSendToWasmEventHandler_Handle() {
 			"normal topic,amount is zero",
 			func() {
 				wasmAddrStr := suite.wasmContract.String()
-				queryAddr := sdk.AccAddress(ethAddr.Bytes())
+				queryAddr := sdk.WasmAddress(ethAddr.Bytes())
 				input, err := getSendToWasmEventData(wasmAddrStr, queryAddr.String(), big.NewInt(0))
 				suite.Require().NoError(err)
 				data = input
 			},
 			func() {
 				queryAddr := sdk.WasmAddress(ethAddr.Bytes())
-				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, sdk.AccToAWasmddress(suite.wasmContract), []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
+				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, suite.wasmContract, []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
 				suite.Require().NoError(err)
 				suite.Require().Equal("{\"balance\":\"0\"}", string(result))
 			},

x/vmbridge/keeper/wasm.go

@@ -14,19 +14,15 @@ import (
 )
 
 func (k Keeper) SendToWasm(ctx sdk.Context, caller sdk.AccAddress, wasmContractAddr, recipient string, amount sdk.Int) error {
-	// must check recipient is ex address
-	if !sdk.IsOKCAddress(recipient) {
-		return types.ErrIsNotOKCAddr
-	}
-	to, err := sdk.AccAddressFromBech32(recipient)
+	_, err := sdk.WasmAddressFromBech32(recipient)
 	if err != nil {
 		return err
 	}
 
 	if amount.IsNegative() {
 		return types.ErrAmountNegative
 	}
-	input, err := types.GetMintCW20Input(amount.String(), sdk.AccToAWasmddress(to).String())
+	input, err := types.GetMintCW20Input(amount.String(), recipient)
 	if err != nil {
 		return err
 	}

x/vmbridge/keeper/wasm_test.go

@@ -27,7 +27,7 @@ func (suite *KeeperTestSuite) TestKeeper_SendToWasm() {
 	reset := func() {
 		caller = sdk.AccAddress(contract.Bytes())
 		wasmContractAddr = suite.wasmContract.String()
-		recipient = sdk.AccAddress(ethAddr.Bytes()).String()
+		recipient = ethAddr.String()
 		amount = sdk.NewInt(1)
 	}
 	testCases := []struct {
@@ -42,7 +42,7 @@ func (suite *KeeperTestSuite) TestKeeper_SendToWasm() {
 			},
 			func() {
 				queryAddr := sdk.WasmAddress(ethAddr.Bytes())
-				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, sdk.AccToAWasmddress(suite.wasmContract), []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
+				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, suite.wasmContract, []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
 				suite.Require().NoError(err)
 				suite.Require().Equal("{\"balance\":\"1\"}", string(result))
 			},
@@ -55,11 +55,11 @@ func (suite *KeeperTestSuite) TestKeeper_SendToWasm() {
 			},
 			func() {
 				queryAddr := sdk.WasmAddress(ethAddr.Bytes())
-				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, sdk.AccToAWasmddress(suite.wasmContract), []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
+				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, suite.wasmContract, []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
 				suite.Require().NoError(err)
 				suite.Require().Equal("{\"balance\":\"1\"}", string(result))
 			},
-			nil,
+			errors.New("execute wasm contract failed: Generic error: addr_validate errored: Address is not normalized"),
 		},
 		{
 			"recipient is 0x",
@@ -68,11 +68,11 @@ func (suite *KeeperTestSuite) TestKeeper_SendToWasm() {
 			},
 			func() {
 				queryAddr := sdk.WasmAddress(ethAddr.Bytes())
-				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, sdk.AccToAWasmddress(suite.wasmContract), []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
+				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, suite.wasmContract, []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
 				suite.Require().NoError(err)
 				suite.Require().Equal("{\"balance\":\"1\"}", string(result))
 			},
-			types.ErrIsNotOKCAddr,
+			nil,
 		},
 		{
 			"recipient is wasmaddr",
@@ -81,24 +81,24 @@ func (suite *KeeperTestSuite) TestKeeper_SendToWasm() {
 			},
 			func() {
 				queryAddr := sdk.WasmAddress(make([]byte, 32))
-				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, sdk.AccToAWasmddress(suite.wasmContract), []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
+				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, suite.wasmContract, []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
 				suite.Require().NoError(err)
 				suite.Require().Equal("{\"balance\":\"1\"}", string(result))
 			},
-			nil,
+			errors.New("execute wasm contract failed: Generic error: addr_validate errored: Address is not normalized"),
 		},
 		{
-			"recipient is wasmaddr 0x",
+			"recipient is  0x 32",
 			func() {
 				recipient = "0x" + hex.EncodeToString(make([]byte, 32))
 			},
 			func() {
 				queryAddr := sdk.WasmAddress(make([]byte, 32))
-				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, sdk.AccToAWasmddress(suite.wasmContract), []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
+				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, suite.wasmContract, []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
 				suite.Require().NoError(err)
 				suite.Require().Equal("{\"balance\":\"1\"}", string(result))
 			},
-			types.ErrIsNotOKCAddr,
+			errors.New("incorrect address length"),
 		},
 		{
 			"normal topic,amount is zero",
@@ -107,7 +107,7 @@ func (suite *KeeperTestSuite) TestKeeper_SendToWasm() {
 			},
 			func() {
 				queryAddr := sdk.WasmAddress(ethAddr.Bytes())
-				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, sdk.AccToAWasmddress(suite.wasmContract), []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
+				result, err := suite.app.WasmKeeper.QuerySmart(suite.ctx, suite.wasmContract, []byte(fmt.Sprintf("{\"balance\":{\"address\":\"%s\"}}", queryAddr.String())))
 				suite.Require().NoError(err)
 				suite.Require().Equal("{\"balance\":\"0\"}", string(result))
 			},