Merge branch 'main' into gprusak-dh

Author: pompon0

app/app.go

@@ -104,6 +104,7 @@ import (
 	evmrpcconfig "github.com/sei-protocol/sei-chain/evmrpc/config"
 	gigaexecutor "github.com/sei-protocol/sei-chain/giga/executor"
 	gigaconfig "github.com/sei-protocol/sei-chain/giga/executor/config"
+	gigalib "github.com/sei-protocol/sei-chain/giga/executor/lib"
 	"github.com/sei-protocol/sei-chain/precompiles"
 	putils "github.com/sei-protocol/sei-chain/precompiles/utils"
 	"github.com/sei-protocol/sei-chain/sei-db/state_db/ss"
@@ -679,6 +680,11 @@ func New(
 	app.EvmKeeper.GigaExecutorEnabled = gigaExecutorConfig.Enabled
 	app.EvmKeeper.GigaOCCEnabled = gigaExecutorConfig.OCCEnabled
 	if gigaExecutorConfig.Enabled {
+		evmoneVM, err := gigalib.InitEvmoneVM()
+		if err != nil {
+			panic(fmt.Sprintf("failed to load evmone: %s", err))
+		}
+		app.EvmKeeper.EvmoneVM = evmoneVM
 		if gigaExecutorConfig.OCCEnabled {
 			logger.Info("benchmark: Giga Executor with OCC is ENABLED - using new EVM execution path with parallel execution")
 		} else {
@@ -1677,7 +1683,7 @@ func (app *App) executeEVMTxWithGigaExecutor(ctx sdk.Context, txIndex int, msg *
 	cfg := evmtypes.DefaultChainConfig().EthereumConfigWithSstore(app.EvmKeeper.ChainID(ctx), &sstore)
 
 	// Create Giga executor VM (wraps evmone)
-	gigaExecutor := gigaexecutor.NewEvmoneExecutor(*blockCtx, stateDB, cfg, vm.Config{}, app.EvmKeeper.CustomPrecompiles(ctx))
+	gigaExecutor := gigaexecutor.NewEvmoneExecutor(app.EvmKeeper.EvmoneVM, *blockCtx, stateDB, cfg, vm.Config{}, app.EvmKeeper.CustomPrecompiles(ctx))
 
 	// Execute the transaction through giga VM
 	execResult, execErr := gigaExecutor.ExecuteTransaction(ethTx, sender, app.EvmKeeper.GetBaseFee(ctx), &gp)

giga/executor/executor.go

@@ -3,6 +3,7 @@ package executor
 import (
 	"math/big"
 
+	"github.com/ethereum/evmc/v12/bindings/go/evmc"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -15,10 +16,9 @@ type Executor struct {
 	evm *vm.EVM
 }
 
-func NewEvmoneExecutor(blockCtx vm.BlockContext, stateDB vm.StateDB, chainConfig *params.ChainConfig, config vm.Config, customPrecompiles map[common.Address]vm.PrecompiledContract) *Executor {
+func NewEvmoneExecutor(evmoneVM *evmc.VM, blockCtx vm.BlockContext, stateDB vm.StateDB, chainConfig *params.ChainConfig, config vm.Config, customPrecompiles map[common.Address]vm.PrecompiledContract) *Executor {
 	evm := vm.NewEVM(blockCtx, stateDB, chainConfig, config, customPrecompiles)
-	// TODO(pdrobnjak): populate evmc.VM and integrate evmone for direct bytecode execution
-	hostContext := internal.NewHostContext(nil, evm)
+	hostContext := internal.NewHostContext(evmoneVM, evm)
 	evm.EVMInterpreter = internal.NewEVMInterpreter(hostContext, evm)
 	return &Executor{
 		evm: evm,

giga/executor/lib/evmlib.go

@@ -0,0 +1,26 @@
+package lib
+
+import (
+	"fmt"
+	"path/filepath"
+	"runtime"
+
+	"github.com/ethereum/evmc/v12/bindings/go/evmc"
+)
+
+// InitEvmoneVM initializes the EVMC VM by loading the platform-specific evmone library.
+// It does not verify that the loaded version is compatible with evmc version.
+func InitEvmoneVM() (*evmc.VM, error) {
+	_, path, _, ok := runtime.Caller(0)
+	if !ok {
+		return nil, fmt.Errorf("failed to get caller information")
+	}
+
+	libPath := filepath.Join(filepath.Dir(path), libName)
+	vm, err := evmc.Load(libPath)
+	if err != nil {
+		return nil, fmt.Errorf("evmc.Load(%q): %w", libPath, err)
+	}
+
+	return vm, nil
+}

giga/executor/lib/lib_darwin_arm64.go

@@ -0,0 +1,5 @@
+//go:build darwin && arm64
+
+package lib
+
+const libName = "libevmone.0.12.0_darwin_arm64.dylib"

giga/executor/lib/lib_linux_amd64.go

@@ -0,0 +1,5 @@
+//go:build linux && amd64
+
+package lib
+
+const libName = "libevmone.0.12.0_linux_amd64.so"

giga/executor/lib/lib_unsupported.go

@@ -0,0 +1,10 @@
+//go:build !((linux && amd64) || (darwin && arm64))
+
+package lib
+
+// evmone is not available for this platform.
+// Supported platforms: linux/amd64, darwin/arm64
+//
+// If you see a compile error referencing this file, you are building
+// for an unsupported OS/architecture combination.
+const libName = evmone_unsupported_platform__only_linux_amd64_and_darwin_arm64_are_supported