evm: TxData as proto.Any (#220)

* evm: TxData as proto.Any

* proto message

* fix protobuf any generation

* Int pointer

* fix build and tests

* ante tests

* swagger

* cleanup

* c++

proto/ethermint/evm/v1alpha1/evm.proto

@@ -197,47 +197,6 @@ message TxResult {
   uint64 gas_used = 6;
 }
 
-// TxData implements the Ethereum transaction data structure. It is used
-// solely as intended in Ethereum abiding by the protocol.
-message TxData {
-  option (gogoproto.goproto_getters) = false;
-
-  // destination EVM chain ID
-  string chain_id = 1 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
-    (gogoproto.customname) = "ChainID",
-    (gogoproto.jsontag)    = "chainID",
-    (gogoproto.nullable)   = false
-  ];
-  // nonce corresponds to the account nonce (transaction sequence).
-  uint64 nonce = 2;
-  // gas price defines the value for each gas unit
-  string gas_price = 3 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
-    (gogoproto.nullable)   = false
-  ];
-  // gas defines the gas limit defined for the transaction.
-  uint64 gas = 4 [(gogoproto.customname) = "GasLimit"];
-  // hex formatted address of the recipient
-  string to = 5;
-  // value defines the unsigned integer value of the transaction amount.
-  string value = 6 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
-    (gogoproto.customname) = "Amount",
-    (gogoproto.nullable)   = false
-  ];
-  // input defines the data payload bytes of the transaction.
-  bytes                input    = 7;
-  repeated AccessTuple accesses = 8
-      [(gogoproto.castrepeated) = "AccessList", (gogoproto.jsontag) = "accessList", (gogoproto.nullable) = false];
-  // v defines the signature value
-  bytes v = 9;
-  // r defines the signature value
-  bytes r = 10;
-  // s define the signature value
-  bytes s = 11;
-}
-
 // AccessTuple is the element type of an access list.
 message AccessTuple {
   option (gogoproto.goproto_getters) = false;

proto/ethermint/evm/v1alpha1/tx.proto

@@ -2,6 +2,8 @@ syntax = "proto3";
 package ethermint.evm.v1alpha1;
 
 import "gogoproto/gogo.proto";
+import "google/protobuf/any.proto";
+import "cosmos_proto/cosmos.proto";
 import "ethermint/evm/v1alpha1/evm.proto";
 
 option go_package = "github.com/tharsis/ethermint/x/evm/types";
@@ -17,7 +19,7 @@ message MsgEthereumTx {
   option (gogoproto.goproto_getters) = false;
 
   // inner transaction data
-  TxData data = 1;
+  google.protobuf.Any data = 1;
   // caches
 
   // encoded storage size of the transaction
@@ -30,6 +32,75 @@ message MsgEthereumTx {
   string from = 4;
 }
 
+// LegacyTx is the transaction data of regular Ethereum transactions.
+message LegacyTx {
+  option (gogoproto.goproto_getters) = false;
+  option (cosmos_proto.implements_interface) = "TxDataI";
+
+  // nonce corresponds to the account nonce (transaction sequence).
+  uint64 nonce = 1;
+  // gas price defines the value for each gas unit
+  string gas_price = 2 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"
+  ];
+  // gas defines the gas limit defined for the transaction.
+  uint64 gas = 3 [(gogoproto.customname) = "GasLimit"];
+  // hex formatted address of the recipient
+  string to = 4;
+  // value defines the unsigned integer value of the transaction amount.
+  string value = 5 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.customname) = "Amount"
+  ];
+  // input defines the data payload bytes of the transaction.
+  bytes                data    = 6;
+  // v defines the signature value
+  bytes v = 7;
+  // r defines the signature value
+  bytes r = 8;
+  // s define the signature value
+  bytes s = 9;
+}
+
+
+// AccessListTx is the data of EIP-2930 access list transactions.
+message AccessListTx {
+  option (gogoproto.goproto_getters) = false;
+  option (cosmos_proto.implements_interface) = "TxDataI";
+
+  // destination EVM chain ID
+  string chain_id = 1 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.customname) = "ChainID",
+    (gogoproto.jsontag)    = "chainID"
+  ];
+  // nonce corresponds to the account nonce (transaction sequence).
+  uint64 nonce = 2;
+  // gas price defines the value for each gas unit
+  string gas_price = 3 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"
+  ];
+  // gas defines the gas limit defined for the transaction.
+  uint64 gas = 4 [(gogoproto.customname) = "GasLimit"];
+  // hex formatted address of the recipient
+  string to = 5;
+  // value defines the unsigned integer value of the transaction amount.
+  string value = 6 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.customname) = "Amount"
+  ];
+  // input defines the data payload bytes of the transaction.
+  bytes                data    = 7;
+  repeated AccessTuple accesses = 8
+      [(gogoproto.castrepeated) = "AccessList", (gogoproto.jsontag) = "accessList", (gogoproto.nullable) = false];
+  // v defines the signature value
+  bytes v = 9;
+  // r defines the signature value
+  bytes r = 10;
+  // s define the signature value
+  bytes s = 11;
+}
+
 message ExtensionOptionsEthereumTx {
   option (gogoproto.goproto_getters) = false;
 }