Merge pull request #8 from cosmos/development

update development

CHANGELOG.md

@@ -43,6 +43,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (evm) [\#670](https://github.com/cosmos/ethermint/pull/670) Migrate types to the ones defined by the protobuf messages, which are required for the stargate release.
 
 ### Bug Fixes
+
+* (evm) [\#730](https://github.com/cosmos/ethermint/issues/730) Fix 'EIP2028' not open when Istanbul version has been enabled. 
 * (evm) [\#749](https://github.com/cosmos/ethermint/issues/749) Fix panic in `AnteHandler` when gas price larger than 100000
 * (evm) [\#747](https://github.com/cosmos/ethermint/issues/747) Fix format errors in String() of QueryETHLogs
 * (evm) [\#742](https://github.com/cosmos/ethermint/issues/742) Add parameter check for evm query func. 

app/ante/eth.go

@@ -119,7 +119,7 @@ func (emfd EthMempoolFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simula
  if !ctx.MinGasPrices().IsZero() && !hasEnoughFees {
  return ctx, sdkerrors.Wrap(
  sdkerrors.ErrInsufficientFee,
- fmt.Sprintf("insufficient fee, got: %q required: %q", fee, ctx.MinGasPrices()),
+ fmt.Sprintf("insufficient fee, got: %q required: %q", fee, minFees),
  )
  }
 

tests/rpc_test.go

@@ -558,7 +558,7 @@ func TestEth_EstimateGas_ContractDeployment(t *testing.T) {
  err := json.Unmarshal(rpcRes.Result, &gas)
  require.NoError(t, err, string(rpcRes.Result))
 
- require.Equal(t, "0x1c2c4", gas.String())
+ require.Equal(t, "0x1a724", gas.String())
 }
 
 func TestEth_GetBlockByNumber(t *testing.T) {

x/evm/types/chain_config.go

@@ -66,6 +66,16 @@ func (cc ChainConfig) EthereumConfig(chainID *big.Int) *params.ChainConfig {
  }
 }
 
+// IsIstanbul returns whether the Istanbul version is enabled.
+func (cc ChainConfig) IsIstanbul() bool {
+ return getBlockValue(cc.IstanbulBlock) != nil
+}
+
+// IsHomestead returns whether the Homestead version is enabled.
+func (cc ChainConfig) IsHomestead() bool {
+ return getBlockValue(cc.HomesteadBlock) != nil
+}
+
 // String implements the fmt.Stringer interface
 func (cc ChainConfig) String() string {
  out, _ := yaml.Marshal(cc)

x/evm/types/state_transition.go

@@ -115,7 +115,7 @@ func (st StateTransition) newEVM(
 func (st StateTransition) TransitionDb(ctx sdk.Context, config ChainConfig) (*ExecutionResult, error) {
  contractCreation := st.Recipient == nil
 
- cost, err := core.IntrinsicGas(st.Payload, contractCreation, true, false)
+ cost, err := core.IntrinsicGas(st.Payload, contractCreation, config.IsHomestead(), config.IsIstanbul())
  if err != nil {
  return nil, sdkerrors.Wrap(err, "invalid intrinsic gas for transaction")
  }