Temporary Commit

x/evm/genesis.go

@@ -36,16 +36,7 @@ func InitGenesis(
 	accountKeeper types.AccountKeeper,
 	data types.GenesisState,
 	registeredModules []precompile_modules.Module,
-	// evmKeeper statedb.Keeper,
 ) []abci.ValidatorUpdate {
-	//txConfig := statedb.TxConfig{
-	//	BlockHash: common.Hash{},
-	//	TxHash:    common.Hash{},
-	//	TxIndex:   0,
-	//	LogIndex:  0,
-	//}
-	//stateDB := statedb.New(ctx, evmKeeper, txConfig)
-
 	k.WithChainID(ctx)
 
 	err := types.ValidatePrecompileRegistration(
@@ -56,7 +47,10 @@ func InitGenesis(
 		panic(err)
 	}
 
-	//oldParams := k.GetParams(ctx)
+	err = k.SyncEnabledPrecompiles(ctx, data.Params.GetEnabledPrecompiles())
+	if err != nil {
+		panic(fmt.Errorf("can't sync enabled precompiles: %v", err))
+	}
 
 	err = k.SetParams(ctx, data.Params)
 	if err != nil {

x/evm/keeper/precompile.go

@@ -3,7 +3,9 @@ package keeper
 import (
 	"bytes"
 	"fmt"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/evmos/ethermint/x/evm/statedb"
 )
 
 const PrecompileNonce uint64 = 1
@@ -24,6 +26,29 @@ type InitializationConfig struct {
 	Uninitialize          []common.Address
 }
 
+func (k *Keeper) SyncEnabledPrecompiles(ctx sdk.Context, enabledPrecompiles []string) error {
+	txConfig := statedb.TxConfig{
+		BlockHash: common.Hash{},
+		TxHash:    common.Hash{},
+		TxIndex:   0,
+		LogIndex:  0,
+	}
+	stateDB := statedb.New(ctx, k, txConfig)
+
+	oldParams := k.GetParams(ctx)
+
+	return SyncEnabledPrecompiles(stateDB, hexToAddresses(oldParams.EnabledPrecompiles), hexToAddresses(enabledPrecompiles))
+}
+
+func hexToAddresses(hexAddrs []string) []common.Address {
+	addrs := make([]common.Address, len(hexAddrs))
+	for i, hexAddr := range hexAddrs {
+		addrs[i] = common.HexToAddress(hexAddr)
+	}
+
+	return addrs
+}
+
 func SyncEnabledPrecompiles(stateDB StateDB, old []common.Address, new []common.Address) error {
 	cfg := DetermineInitializationConfig(old, new)
 	return ApplyInitializationConfig(stateDB, cfg)