feat(evm): remove callContractXXX event payload (#1409)

axelarnetwork · Apr 4, 2022 · 7439d13 · 7439d13
1 parent bec82b9
commit 7439d13
Show file tree

Hide file tree

Showing 7 changed files with 130 additions and 240 deletions.
diff --git a/cmd/axelard/cmd/vald/evm/evm.go b/cmd/axelard/cmd/vald/evm/evm.go
@@ -324,7 +324,6 @@ func decodeEventContractCall(log *geth.Log) (evmTypes.EventContractCall, error)
 		DestinationChain: params[0].(string),
 		ContractAddress:  params[1].(string),
 		PayloadHash:      evmTypes.Hash(common.BytesToHash(log.Topics[2].Bytes())),
-		Payload:          params[2].([]byte),
 	}, nil
 }
 
@@ -361,7 +360,6 @@ func decodeEventContractCallWithToken(log *geth.Log) (evmTypes.EventContractCall
 		DestinationChain: params[0].(string),
 		ContractAddress:  params[1].(string),
 		PayloadHash:      evmTypes.Hash(common.BytesToHash(log.Topics[2].Bytes())),
-		Payload:          params[2].([]byte),
 		Symbol:           params[3].(string),
 		Amount:           sdk.NewUintFromBigInt(params[4].(*big.Int)),
 	}, nil

diff --git a/cmd/axelard/cmd/vald/evm/evm_test.go b/cmd/axelard/cmd/vald/evm/evm_test.go
@@ -94,7 +94,6 @@ func TestDecodeEventContractCall(t *testing.T) {
 		DestinationChain: "ethereum-2",
 		ContractAddress:  "0xb9845f9247a85Ee592273a79605f34E8607d7e75",
 		PayloadHash:      evmTypes.Hash(common.HexToHash("0x9fcef596d62dca8e51b6ba3414901947c0e6821d4483b2f3327ce87c2d4e662e")),
-		Payload:          common.Hex2Bytes("627566666572"),
 	}
 	actual, err := decodeEventContractCall(log)
 
@@ -117,7 +116,6 @@ func TestDecodeEventContractCallWithToken(t *testing.T) {
 		DestinationChain: "ethereum",
 		ContractAddress:  "0x76a06043391712bE39A343d1f43165854fCF6De3",
 		PayloadHash:      evmTypes.Hash(common.HexToHash("0x9fcef596d62dca8e51b6ba3414901947c0e6821d4483b2f3327ce87c2d4e662e")),
-		Payload:          common.Hex2Bytes("627566666572"),
 		Symbol:           "uaxl",
 		Amount:           sdk.NewUint(10000000),
 	}

diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md
diff --git a/proto/evm/v1beta1/types.proto b/proto/evm/v1beta1/types.proto
@@ -55,7 +55,6 @@ message EventContractCall {
   string contract_address = 3;
   bytes payload_hash = 4
       [ (gogoproto.nullable) = false, (gogoproto.customtype) = "Hash" ];
-  bytes payload = 5;
 }
 
 message EventContractCallWithToken {
@@ -65,9 +64,8 @@ message EventContractCallWithToken {
   string contract_address = 3;
   bytes payload_hash = 4
       [ (gogoproto.nullable) = false, (gogoproto.customtype) = "Hash" ];
-  bytes payload = 5;
-  string symbol = 6;
-  bytes amount = 7 [
+  string symbol = 5;
+  bytes amount = 6 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Uint",
     (gogoproto.nullable) = false
   ];

diff --git a/x/evm/abci_test.go b/x/evm/abci_test.go
@@ -63,7 +63,6 @@ func TestHandleContractCall(t *testing.T) {
 					DestinationChain: destinationChainName,
 					ContractAddress:  evmTestUtils.RandomAddress().Hex(),
 					PayloadHash:      types.Hash(evmCrypto.Keccak256Hash(payload)),
-					Payload:          payload,
 				},
 			},
 		}
@@ -472,7 +471,6 @@ func TestHandleContractCallWithToken(t *testing.T) {
 				DestinationChain: destinationChainName,
 				ContractAddress:  evmTestUtils.RandomAddress().Hex(),
 				PayloadHash:      types.Hash(evmCrypto.Keccak256Hash(payload)),
-				Payload:          payload,
 				Symbol:           rand.Denom(3, 5),
 				Amount:           sdk.NewUint(uint64(rand.I64Between(1, 10000))),
 			},

diff --git a/x/evm/types/types.go b/x/evm/types/types.go
@@ -1542,10 +1542,6 @@ func (m EventContractCall) Validate() error {
 		return fmt.Errorf("invalid payload hash")
 	}
 
-	if !bytes.Equal(crypto.Keccak256Hash(m.Payload).Bytes(), m.PayloadHash.Bytes()) {
-		return fmt.Errorf("invalid payload")
-	}
-
 	return nil
 }
 
@@ -1567,10 +1563,6 @@ func (m EventContractCallWithToken) Validate() error {
 		return fmt.Errorf("invalid payload hash")
 	}
 
-	if !bytes.Equal(crypto.Keccak256Hash(m.Payload).Bytes(), m.PayloadHash.Bytes()) {
-		return fmt.Errorf("invalid payload")
-	}
-
 	if err := utils.ValidateString(m.Symbol); err != nil {
 		return sdkerrors.Wrap(err, "invalid symbol")
 	}