evm: add missing genesis fields and export genesis state logic

CHANGELOG.md

@@ -50,6 +50,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
   * (app/ante) Moved `AnteHandler` implementation to `app/ante`
   * (keys) Marked `ExportEthKeyCommand` as **UNSAFE**
   * (x/evm) Moved `BeginBlock` and `EndBlock` to `x/evm/abci.go`
+* (`x/evm`) [\#255](https://github.com/ChainSafe/ethermint/pull/255) Add `ExportGenesis` functionality.
 
 ### Features
 

app/ethermint.go

@@ -236,7 +236,7 @@ func NewEthermintApp(
 		slashing.NewAppModule(app.SlashingKeeper, app.AccountKeeper, app.StakingKeeper),
 		distr.NewAppModule(app.DistrKeeper, app.AccountKeeper, app.SupplyKeeper, app.StakingKeeper),
 		staking.NewAppModule(app.StakingKeeper, app.AccountKeeper, app.SupplyKeeper),
-		evm.NewAppModule(app.EvmKeeper),
+		evm.NewAppModule(app.EvmKeeper, app.AccountKeeper),
 	)
 
 	// During begin block slashing happens after distr.BeginBlocker so that

x/evm/genesis.go

@@ -1,20 +1,61 @@
 package evm
 
 import (
+	"github.com/ethereum/go-ethereum/common"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	emint "github.com/cosmos/ethermint/types"
+	"github.com/cosmos/ethermint/x/evm/types"
 	abci "github.com/tendermint/tendermint/abci/types"
 )
 
 // InitGenesis initializes genesis state based on exported genesis
 func InitGenesis(ctx sdk.Context, k Keeper, data GenesisState) []abci.ValidatorUpdate {
-	for _, record := range data.Accounts {
-		k.SetCode(ctx, record.Address, record.Code)
-		k.CreateGenesisAccount(ctx, record)
+	for _, account := range data.Accounts {
+		csdb := k.CommitStateDB.WithContext(ctx)
+		csdb.SetBalance(account.Address, account.Balance)
+		csdb.SetCode(account.Address, account.Code)
+		for _, key := range account.Storage {
+			csdb.SetState(account.Address, key, account.Storage[key])
+		}
 	}
 	return []abci.ValidatorUpdate{}
 }
 
 // ExportGenesis exports genesis state
-func ExportGenesis(ctx sdk.Context, _ Keeper) GenesisState {
-	return GenesisState{Accounts: nil}
+func ExportGenesis(ctx sdk.Context, k Keeper, ak types.AccountKeeper) GenesisState {
+	var ethGenAccounts []types.GenesisAccount
+
+	accounts := ak.GetAllAccounts(ctx)
+
+	var err error
+	for _, account := range accounts {
+		ethAccount, ok := account.(emint.Account)
+		if !ok {
+			continue
+		}
+
+		addr := common.BytesToAddress(ethAccount.GetAddress().Bytes())
+
+		var storage emint.Storage
+		err = k.CommitStateDB.ForEachStorage(addr, func(key, value common.Hash) bool {
+			storage[key] = value
+			return false
+		})
+		if err != nil {
+			panic(err)
+		}
+
+		genAccount := types.GenesisAccount{
+			Address: addr,
+			Balance: k.GetBalance(ctx, addr),
+			Code:    k.GetCode(ctx, addr),
+			Storage: storage,
+		}
+
+		ethGenAccounts = append(ethGenAccounts, genAccount)
+	}
+
+	return GenesisState{Accounts: ethGenAccounts}
 }

x/evm/genesis_test.go

@@ -0,0 +1,15 @@
+package evm_test
+
+import (
+	"github.com/cosmos/ethermint/x/evm"
+	"github.com/cosmos/ethermint/x/evm/types"
+)
+
+func (suite *EvmTestSuite) TestExportImport() {
+	var genState types.GenesisState
+	suite.Require().NotPanics(func() {
+		genState = evm.ExportGenesis(suite.ctx, suite.app.EvmKeeper, suite.app.AccountKeeper)
+	})
+
+	_ = evm.InitGenesis(suite.ctx, suite.app.EvmKeeper, genState)
+}

x/evm/handler.go

@@ -76,10 +76,7 @@ func HandleMsgEthereumTx(ctx sdk.Context, k Keeper, msg types.MsgEthereumTx) sdk
 	k.Bloom.Or(k.Bloom, returnData.Bloom)
 
 	// update transaction logs in KVStore
-	err = k.SetTransactionLogs(ctx, returnData.Logs, txHash[:])
-	if err != nil {
-		return sdk.ResultFromError(err)
-	}
+	k.SetTransactionLogs(ctx, txHash[:], returnData.Logs)
 
 	ctx.EventManager().EmitEvents(sdk.Events{
 		sdk.NewEvent(
@@ -145,6 +142,12 @@ func HandleMsgEthermint(ctx sdk.Context, k Keeper, msg types.MsgEthermint) sdk.R
 		return sdk.ResultFromError(err)
 	}
 
+	// update block bloom filter
+	k.Bloom.Or(k.Bloom, returnData.Bloom)
+
+	// update transaction logs in KVStore
+	k.SetTransactionLogs(ctx, txHash[:], returnData.Logs)
+
 	ctx.EventManager().EmitEvents(sdk.Events{
 		sdk.NewEvent(
 			types.EventTypeEthermint,

x/evm/handler_test.go

@@ -86,7 +86,7 @@ func (suite *EvmTestSuite) TestHandler_Logs() {
 	suite.Require().Equal(len(resultData.Logs[0].Topics), 2)
 
 	hash := []byte{1}
-	err = suite.app.EvmKeeper.SetTransactionLogs(suite.ctx, resultData.Logs, hash)
+	suite.app.EvmKeeper.SetTransactionLogs(suite.ctx, hash, resultData.Logs)
 	suite.Require().NoError(err, "failed to set logs")
 
 	logs, err := suite.app.EvmKeeper.GetTransactionLogs(suite.ctx, hash)