From 68825a29d35a6aae8508531dda7dabffdbe9e88f Mon Sep 17 00:00:00 2001 From: Aayush Rajasekaran Date: Fri, 29 May 2026 10:41:42 -0400 Subject: [PATCH] feat(giga): use giga executor with OCC by default --- cmd/seid/cmd/blocktest.go | 9 +++++++++ giga/executor/config/config.go | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/cmd/seid/cmd/blocktest.go b/cmd/seid/cmd/blocktest.go index 180ca9de24..dfd2a26482 100644 --- a/cmd/seid/cmd/blocktest.go +++ b/cmd/seid/cmd/blocktest.go @@ -15,6 +15,7 @@ import ( ethtests "github.com/ethereum/go-ethereum/tests" "github.com/sei-protocol/sei-chain/app" + gigaconfig "github.com/sei-protocol/sei-chain/giga/executor/config" "github.com/sei-protocol/sei-chain/sei-cosmos/baseapp" "github.com/sei-protocol/sei-chain/sei-cosmos/client/flags" "github.com/sei-protocol/sei-chain/sei-cosmos/server" @@ -45,6 +46,14 @@ func BlocktestCmd(defaultNodeHome string) *cobra.Command { if err := serverCtx.Viper.BindPFlags(cmd.Flags()); err != nil { return err } + // The block test harness drives FinalizeBlock directly and verifies + // state through the standard EvmKeeper. The Giga executor is a + // separate parallel execution engine (and falls back to v2 for the + // unassociated raw-eth addresses these tests use), so force it off + // here to keep blocktests on the reference EVM path regardless of + // the node's default Giga configuration. + serverCtx.Viper.Set(gigaconfig.FlagEnabled, false) + serverCtx.Viper.Set(gigaconfig.FlagOCCEnabled, false) home := serverCtx.Viper.GetString(flags.FlagHome) cache := store.NewCommitKVStoreCacheManager() diff --git a/giga/executor/config/config.go b/giga/executor/config/config.go index 6d282c4654..4ba2ccbf80 100644 --- a/giga/executor/config/config.go +++ b/giga/executor/config/config.go @@ -14,8 +14,8 @@ type Config struct { } var DefaultConfig = Config{ - Enabled: false, // disabled by default, opt-in - OCCEnabled: false, // OCC disabled by default + Enabled: true, + OCCEnabled: true, } const ( @@ -47,11 +47,11 @@ const ConfigTemplate = ` [giga_executor] # enabled controls whether to use the Giga executor for improved EVM throughput. -# Default: false +# Default: true enabled = {{ .GigaExecutor.Enabled }} # occ_enabled controls whether to use OCC (Optimistic Concurrency Control) with the Giga executor. # When true, transactions are executed in parallel with conflict detection and retry. -# Default: false +# Default: true occ_enabled = {{ .GigaExecutor.OCCEnabled }} `