bug: Pass precompiles to evm implementaion

b-harvest · Sep 27, 2024 · 3673909 · 3673909
1 parent e3895d3
commit 3673909
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/x/evm/keeper/state_transition.go b/x/evm/keeper/state_transition.go
@@ -89,7 +89,7 @@ func (k *Keeper) NewEVM(
 		return bytes.Compare(active[i].Bytes(), active[j].Bytes()) < 0
 	})
 
-	return k.evmConstructor(blockCtx, txCtx, stateDB, cfg.ChainConfig, vmConfig, k.customPrecompiles)
+	return k.evmConstructor(blockCtx, txCtx, stateDB, cfg.ChainConfig, vmConfig, contracts, active)
 }
 
 // GetHashFn implements vm.GetHashFunc for Ethermint. It handles 3 cases:

diff --git a/x/evm/vm/geth/geth.go b/x/evm/vm/geth/geth.go
@@ -44,11 +44,14 @@ func NewEVM(
 	stateDB vm.StateDB,
 	chainConfig *params.ChainConfig,
 	config vm.Config,
-	_ evm.PrecompiledContracts, // unused
+	precompiles evm.PrecompiledContracts,
+	activePrecompiles []common.Address,
 ) evm.EVM {
-	return &EVM{
+	evm := &EVM{
 		EVM: vm.NewEVM(blockCtx, txCtx, stateDB, chainConfig, config),
 	}
+	evm.WithPrecompiles(precompiles, activePrecompiles)
+	return evm
 }
 
 // Context returns the EVM's Block Context

diff --git a/x/evm/vm/interface.go b/x/evm/vm/interface.go
@@ -77,5 +77,6 @@ type Constructor func(
 	stateDB vm.StateDB,
 	chainConfig *params.ChainConfig,
 	config vm.Config,
-	customPrecompiles PrecompiledContracts,
+	precompiles PrecompiledContracts,
+	activePrecompiles []common.Address,
 ) EVM