Upgrade go-ethereum api

Author: YangChuantongStarry

api/ethermint/evm/v1/tx.pulsar.go

@@ -143,6 +143,47 @@ message DynamicFeeTx {
   bytes s = 12;
 }
 
+// BlobTx is the data of EIP-4844 blob transactions.
+message BlobTx {
+  option (gogoproto.goproto_getters) = false;
+  option (cosmos_proto.implements_interface) = "TxData";
+
+  // chain_id of the destination EVM chain
+  string chain_id = 1 [
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
+    (gogoproto.customname) = "ChainID",
+    (gogoproto.jsontag) = "chainID"
+  ];
+  // nonce corresponds to the account nonce (transaction sequence).
+  uint64 nonce = 2;
+  // gas_tip_cap defines the max value for the gas tip.
+  string gas_tip_cap = 3 [(gogoproto.customtype) = "cosmossdk.io/math.Int"];
+  // gas_fee_cap defines the max value for the gas fee.
+  string gas_fee_cap = 4 [(gogoproto.customtype) = "cosmossdk.io/math.Int"];
+  // gas defines the gas limit defined for the transaction.
+  uint64 gas = 5 [(gogoproto.customname) = "GasLimit"];
+  // to is the recipient address in hex format.
+  string to = 6;
+  // value defines the transaction amount.
+  string value = 7
+      [(gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.customname) = "Amount"];
+  // data is the data payload bytes of the transaction.
+  bytes data = 8;
+  // accesses is an array of access tuples.
+  repeated AccessTuple accesses = 9
+      [(gogoproto.castrepeated) = "AccessList", (gogoproto.jsontag) = "accessList", (gogoproto.nullable) = false];
+  // max_fee_per_blob_gas defines the max fee per blob gas.
+  string max_fee_per_blob_gas = 10 [(gogoproto.customtype) = "cosmossdk.io/math.Int"];
+  // blob_versioned_hashes are the versioned blob hashes (hex).
+  repeated string blob_versioned_hashes = 11 [(gogoproto.jsontag) = "blobVersionedHashes"];
+  // v defines the signature value.
+  bytes v = 12;
+  // r defines the signature value.
+  bytes r = 13;
+  // s defines the signature value.
+  bytes s = 14;
+}
+
 // ExtensionOptionsEthereumTx is an extension option for ethereum transactions
 message ExtensionOptionsEthereumTx {
   option (gogoproto.goproto_getters) = false;

proto/ethermint/evm/v1/tx.proto

@@ -4,6 +4,8 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/tracing"
+	"github.com/holiman/uint256"
 
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/evmos/ethermint/crypto/ethsecp256k1"
@@ -36,7 +38,7 @@ func (suite *EvmTestSuite) TestInitGenesis() {
 		{
 			"valid account",
 			func() {
-				vmdb.AddBalance(address, big.NewInt(1))
+				vmdb.AddBalance(address, uint256.MustFromBig(big.NewInt(1)), tracing.BalanceChangeUnspecified)
 			},
 			&types.GenesisState{
 				Params: types.DefaultParams(),

x/evm/genesis_test.go

@@ -478,19 +478,18 @@ func (suite *EvmTestSuite) deployERC20Contract() common.Address {
 	nonce := k.GetNonce(suite.ctx, suite.from)
 	ctorArgs, err := types.ERC20Contract.ABI.Pack("", suite.from, big.NewInt(10000000000))
 	suite.Require().NoError(err)
-	msg := ethtypes.NewMessage(
-		suite.from,
-		nil,
-		nonce,
-		big.NewInt(0),
-		2000000,
-		big.NewInt(1),
-		nil,
-		nil,
-		append(types.ERC20Contract.Bin, ctorArgs...),
-		nil,
-		true,
-	)
+	msg := core.Message{
+		From:            suite.from,
+		To:              nil,
+		Nonce:           nonce,
+		Value:           big.NewInt(0),
+		GasLimit:        2000000,
+		GasPrice:        big.NewInt(1),
+		GasFeeCap:       big.NewInt(1),
+		GasTipCap:       big.NewInt(1),
+		Data:            append(types.ERC20Contract.Bin, ctorArgs...),
+		SkipNonceChecks: true,
+	}
 	rsp, err := k.ApplyMessage(suite.ctx, msg, nil, true)
 	suite.Require().NoError(err)
 	suite.Require().False(rsp.Failed())
@@ -598,7 +597,7 @@ func (suite *EvmTestSuite) TestERC20TransferReverted() {
 }
 
 func (suite *EvmTestSuite) TestContractDeploymentRevert() {
-	intrinsicGas := uint64(134180)
+	intrinsicGas := uint64(200000)
 	testCases := []struct {
 		msg      string
 		gasLimit uint64

x/evm/handler_test.go

@@ -1,7 +1,6 @@
 package keeper_test
 
 import (
-	"github.com/cometbft/cometbft/abci/types"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 )
 
@@ -10,7 +9,7 @@ func (suite *KeeperTestSuite) TestEndBlock() {
 	suite.Require().Equal(0, len(em.Events()))
 
 	res := suite.app.EvmKeeper.EndBlock(suite.ctx)
-	suite.Require().Equal([]types.ValidatorUpdate{}, res)
+	suite.Require().Nil(res)
 
 	// should emit 1 EventTypeBlockBloom event on EndBlock
 	suite.Require().Equal(1, len(em.Events()))

x/evm/keeper/abci_test.go

@@ -581,7 +581,7 @@ func (suite *KeeperTestSuite) TestEstimateGas() {
 				}
 			},
 			true,
-			1186778,
+			1187108,
 			false,
 		},
 		// estimate gas of an erc20 transfer, the exact gas number is checked with geth
@@ -657,7 +657,7 @@ func (suite *KeeperTestSuite) TestEstimateGas() {
 				}
 			},
 			true,
-			1186778,
+			1187108,
 			true,
 		},
 		{
@@ -1100,7 +1100,7 @@ func (suite *KeeperTestSuite) TestTraceBlock() {
 				}
 			},
 			expPass:       true,
-			traceResponse: "[{\"error\":\"rpc error: code = Internal desc = tracer not found\"}]",
+			traceResponse: "[{\"error\":\"rpc error: code = Internal desc = ReferenceError: invalid_tracer is not defined at \\u003ceval\\u003e:1:2(0)\"}]",
 		},
 		{
 			msg: "invalid chain id",
@@ -1110,7 +1110,7 @@ func (suite *KeeperTestSuite) TestTraceBlock() {
 				chainID = &tmp
 			},
 			expPass:       true,
-			traceResponse: "[{\"error\":\"rpc error: code = Internal desc = invalid chain id for signer\"}]",
+			traceResponse: "[{\"error\":\"rpc error: code = Internal desc = invalid chain id for signer: have 9000 want 1\"}]",
 		},
 	}
 

x/evm/keeper/grpc_query_test.go

@@ -82,7 +82,7 @@ func (suite *KeeperTestSuite) TestEvmHooks() {
 			TxHash: txHash,
 			Logs:   logs,
 		}
-		result := k.PostTxProcessing(ctx, ethtypes.Message{}, receipt)
+		result := k.PostTxProcessing(ctx, core.Message{}, receipt)
 
 		tc.expFunc(hook, result)
 	}

x/evm/keeper/hooks_test.go

@@ -336,6 +336,29 @@ func (k *Keeper) ApplyMessageWithConfig(ctx sdk.Context,
 	evm := k.NewEVM(ctx, msg, cfg, tracer, stateDB)
 
 	leftoverGas := msg.GasLimit
+	if tracer != nil && tracer.OnTxStart != nil {
+		traceTx := ethtypes.NewTx(&ethtypes.LegacyTx{
+			Nonce:    msg.Nonce,
+			To:       msg.To,
+			Value:    msg.Value,
+			Gas:      msg.GasLimit,
+			GasPrice: msg.GasPrice,
+			Data:     msg.Data,
+		})
+		tracer.OnTxStart(&tracing.VMContext{
+			Coinbase:    cfg.CoinBase,
+			BlockNumber: big.NewInt(ctx.BlockHeight()),
+			Time:        uint64(ctx.BlockTime().Unix()),
+			Random:      nil,
+			GasPrice:    msg.GasPrice,
+			StateDB:     stateDB,
+		}, traceTx, msg.From)
+		defer func() {
+			if tracer.OnTxEnd != nil {
+				tracer.OnTxEnd(&ethtypes.Receipt{GasUsed: msg.GasLimit - leftoverGas}, vmErr)
+			}
+		}()
+	}
 
 	sender := vm.AccountRef(msg.From)
 	contractCreation := msg.To == nil

x/evm/keeper/state_transition.go

@@ -145,16 +145,16 @@ func newNativeMessage(
 	data []byte,
 	accessList ethtypes.AccessList,
 ) (core.Message, error) {
-	msgSigner := ethtypes.MakeSigner(cfg, big.NewInt(blockHeight))
+	msgSigner := ethtypes.MakeSigner(cfg, big.NewInt(blockHeight), 0)
 
 	msg, baseFee, err := newEthMsgTx(nonce, blockHeight, address, cfg, krSigner, ethSigner, txType, data, accessList)
 	if err != nil {
-		return nil, err
+		return core.Message{}, err
 	}
 
 	m, err := msg.AsMessage(msgSigner, baseFee)
 	if err != nil {
-		return nil, err
+		return core.Message{}, err
 	}
 
 	return m, nil

x/evm/keeper/state_transition_benchmark_test.go

@@ -208,7 +208,7 @@ func (suite *KeeperTestSuite) TestGetEthIntrinsicGas() {
 			1,
 			true,
 			true,
-			params.TxGas + params.TxDataNonZeroGasFrontier*1,
+			params.TxGas + params.TxDataNonZeroGasFrontier*1 + 2,
 		},
 		{
 			"no data, one accesslist, not contract creation, not homestead, not istanbul",
@@ -435,15 +435,15 @@ func (suite *KeeperTestSuite) TestRefundGas() {
 
 			vmdb.AddRefund(params.TxGas)
 
-			if tc.leftoverGas > m.Gas() {
+			if tc.leftoverGas > m.GasLimit {
 				return
 			}
 
 			if tc.malleate != nil {
 				tc.malleate()
 			}
 
-			gasUsed := m.Gas() - tc.leftoverGas
+			gasUsed := m.GasLimit - tc.leftoverGas
 			refund := keeper.GasToRefund(vmdb.GetRefund(), gasUsed, tc.refundQuotient)
 			suite.Require().Equal(tc.expGasRefund, refund)
 
@@ -667,10 +667,10 @@ func (suite *KeeperTestSuite) TestApplyMessageWithConfig() {
 func (suite *KeeperTestSuite) createContractGethMsg(nonce uint64, signer ethtypes.Signer, cfg *params.ChainConfig, gasPrice *big.Int) (core.Message, error) {
 	ethMsg, err := suite.createContractMsgTx(nonce, signer, cfg, gasPrice)
 	if err != nil {
-		return nil, err
+		return core.Message{}, err
 	}
 
-	msgSigner := ethtypes.MakeSigner(cfg, big.NewInt(suite.ctx.BlockHeight()))
+	msgSigner := ethtypes.MakeSigner(cfg, big.NewInt(suite.ctx.BlockHeight()), 0)
 	return ethMsg.AsMessage(msgSigner, nil)
 }