additional changes from diff

evmos · Nov 1, 2022 · 1699efb · 1699efb
1 parent 58205ac
commit 1699efb
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 25 deletions.
diff --git a/ethereum/eip712/eip712.go b/ethereum/eip712/eip712.go
@@ -20,28 +20,9 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/math"
-	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/signer/core/apitypes"
 )
 
-// ComputeTypedDataHash computes keccak hash of typed data for signing.
-func ComputeTypedDataHash(typedData apitypes.TypedData) ([]byte, error) {
-	domainSeparator, err := typedData.HashStruct("EIP712Domain", typedData.Domain.Map())
-	if err != nil {
-		err = sdkerrors.Wrap(err, "failed to pack and hash typedData EIP712Domain")
-		return nil, err
-	}
-
-	typedDataHash, err := typedData.HashStruct(typedData.PrimaryType, typedData.Message)
-	if err != nil {
-		err = sdkerrors.Wrap(err, "failed to pack and hash typedData primary type")
-		return nil, err
-	}
-
-	rawData := []byte(fmt.Sprintf("\x19\x01%s%s", string(domainSeparator), string(typedDataHash)))
-	return crypto.Keccak256(rawData), nil
-}
-
 // WrapTxToTypedData is an ultimate method that wraps Amino-encoded Cosmos Tx JSON data
 // into an EIP712-compatible TypedData request.
 func WrapTxToTypedData(

diff --git a/rpc/backend/chain_info.go b/rpc/backend/chain_info.go
@@ -153,11 +153,13 @@ func (b *Backend) FeeHistory(
 		}
 		blockEnd = int64(blockNumber)
 	}
+
 	userBlockCountInt := int64(userBlockCount)
 	maxBlockCount := int64(b.cfg.JSONRPC.FeeHistoryCap)
 	if userBlockCountInt > maxBlockCount {
 		return nil, fmt.Errorf("FeeHistory user block count %d higher than %d", userBlockCountInt, maxBlockCount)
 	}
+
 	blockStart := blockEnd - userBlockCountInt
 	if blockStart < 0 {
 		blockStart = 0
@@ -173,6 +175,7 @@ func (b *Backend) FeeHistory(
 	for i := 0; i < int(blockCount); i++ {
 		reward[i] = make([]*hexutil.Big, rewardCount)
 	}
+
 	thisBaseFee := make([]*hexutil.Big, blockCount)
 	thisGasUsedRatio := make([]float64, blockCount)
 

diff --git a/rpc/backend/sign_tx.go b/rpc/backend/sign_tx.go
@@ -4,18 +4,20 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/pkg/errors"
+
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/signer/core/apitypes"
-	"github.com/evmos/ethermint/ethereum/eip712"
+
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
-	"github.com/pkg/errors"
 )
 
 // SendTransaction sends transaction based on received args using Node's key to sign it
@@ -135,7 +137,7 @@ func (b *Backend) SignTypedData(address common.Address, typedData apitypes.Typed
 		return nil, fmt.Errorf("%s; %s", keystore.ErrNoMatch, err.Error())
 	}
 
-	sigHash, err := eip712.ComputeTypedDataHash(typedData)
+	sigHash, _, err := apitypes.TypedDataAndHash(typedData)
 	if err != nil {
 		return nil, err
 	}

diff --git a/rpc/types/block.go b/rpc/types/block.go
@@ -33,6 +33,7 @@ const (
 	BlockParamEarliest  = "earliest"
 	BlockParamLatest    = "latest"
 	BlockParamFinalized = "finalized"
+	BlockParamSafe      = "safe"
 	BlockParamPending   = "pending"
 )
 
@@ -73,7 +74,7 @@ func (bn *BlockNumber) UnmarshalJSON(data []byte) error {
 	case BlockParamEarliest:
 		*bn = EthEarliestBlockNumber
 		return nil
-	case BlockParamLatest, BlockParamFinalized:
+	case BlockParamLatest, BlockParamFinalized, BlockParamSafe:
 		*bn = EthLatestBlockNumber
 		return nil
 	case BlockParamPending:

diff --git a/x/evm/keeper/state_transition.go b/x/evm/keeper/state_transition.go
@@ -423,7 +423,8 @@ func (k *Keeper) ApplyMessageWithConfig(ctx sdk.Context,
 		return nil, sdkerrors.Wrap(types.ErrGasOverflow, "apply message")
 	}
 	// refund gas
-	leftoverGas += GasToRefund(stateDB.GetRefund(), msg.Gas()-leftoverGas, refundQuotient)
+	temporaryGasUsed := msg.Gas() - leftoverGas
+	leftoverGas += GasToRefund(stateDB.GetRefund(), temporaryGasUsed, refundQuotient)
 
 	// EVM execution error needs to be available for the JSON-RPC client
 	var vmError string
@@ -448,7 +449,7 @@ func (k *Keeper) ApplyMessageWithConfig(ctx sdk.Context,
 	if msg.Gas() < leftoverGas {
 		return nil, sdkerrors.Wrapf(types.ErrGasOverflow, "message gas limit < leftover gas (%d < %d)", msg.Gas(), leftoverGas)
 	}
-	temporaryGasUsed := msg.Gas() - leftoverGas
+
 	gasUsed := sdk.MaxDec(minimumGasUsed, sdk.NewDec(int64(temporaryGasUsed))).TruncateInt().Uint64()
 	// reset leftoverGas, to be used by the tracer
 	leftoverGas = msg.Gas() - gasUsed

diff --git a/x/evm/types/chain_config.go b/x/evm/types/chain_config.go
@@ -35,6 +35,8 @@ func (cc ChainConfig) EthereumConfig(chainID *big.Int) *params.ChainConfig {
 		ArrowGlacierBlock:       getBlockValue(cc.ArrowGlacierBlock),
 		GrayGlacierBlock:        getBlockValue(cc.GrayGlacierBlock),
 		MergeNetsplitBlock:      getBlockValue(cc.MergeNetsplitBlock),
+		ShanghaiBlock:           nil, // TODO: add shanghai block
+		CancunBlock:             nil, // TODO: add cancun block
 		TerminalTotalDifficulty: nil,
 		Ethash:                  nil,
 		Clique:                  nil,