From 57d3ddbebaa02ca6119a649936918cba6f5e7934 Mon Sep 17 00:00:00 2001 From: artemijspavlovs <19916123+artemijspavlovs@users.noreply.github.com> Date: Tue, 19 Nov 2024 18:51:24 +0700 Subject: [PATCH 1/7] chore: retrieve sequencer update interval from config --- block/sequencers.go | 2 +- config/config.go | 6 ++++++ config/config_test.go | 13 +++++++------ config/defaults.go | 15 +++++++++------ testutil/block.go | 9 +++++---- testutil/node.go | 9 +++++---- 6 files changed, 33 insertions(+), 21 deletions(-) diff --git a/block/sequencers.go b/block/sequencers.go index 85513cfd1..c8b50db95 100644 --- a/block/sequencers.go +++ b/block/sequencers.go @@ -35,7 +35,7 @@ func (m *Manager) MonitorProposerRotation(ctx context.Context) { } func (m *Manager) MonitorSequencerSetUpdates(ctx context.Context) error { - ticker := time.NewTicker(3 * time.Minute) // TODO: make this configurable + ticker := time.NewTicker(m.Conf.SequencerUpdateInterval) defer ticker.Stop() for { diff --git a/config/config.go b/config/config.go index bca5dace6..ef61f12b8 100644 --- a/config/config.go +++ b/config/config.go @@ -59,6 +59,8 @@ type BlockManagerConfig struct { BatchSkew uint64 `mapstructure:"max_batch_skew"` // The size of the batch of blocks and commits in Bytes. We'll write every batch to the DA and the settlement layer. BatchSubmitBytes uint64 `mapstructure:"batch_submit_bytes"` + // SequencerUpdateInterval defines the interval at which to fetch sequencer updates from the settlement layer + SequencerUpdateInterval time.Duration `mapstructure:"sequencer_update_interval"` } // GetViperConfig reads configuration parameters from Viper instance. @@ -163,6 +165,10 @@ func (c BlockManagerConfig) Validate() error { return fmt.Errorf("max_batch_skew must be positive") } + if c.SequencerUpdateInterval <= 0 { + return fmt.Errorf("sequencer_update_interval must be positive") + } + return nil } diff --git a/config/config_test.go b/config/config_test.go index f2eea6fd2..74ff8de86 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -183,12 +183,13 @@ func TestNodeConfig_Validate(t *testing.T) { func fullNodeConfig() config.NodeConfig { return config.NodeConfig{ BlockManagerConfig: config.BlockManagerConfig{ - BlockTime: 1 * time.Second, - MaxIdleTime: 20 * time.Second, - MaxProofTime: 20 * time.Second, - BatchSubmitTime: 20 * time.Second, - BatchSkew: 10, - BatchSubmitBytes: 10000, + BlockTime: 1 * time.Second, + MaxIdleTime: 20 * time.Second, + MaxProofTime: 20 * time.Second, + BatchSubmitTime: 20 * time.Second, + BatchSkew: 10, + BatchSubmitBytes: 10000, + SequencerUpdateInterval: config.DefaultSequencerUpdateInterval, }, DAConfig: "da-config", SettlementLayer: "dymension", diff --git a/config/defaults.go b/config/defaults.go index 4342be555..7159e3bd4 100644 --- a/config/defaults.go +++ b/config/defaults.go @@ -13,6 +13,8 @@ const ( DefaultListenAddress = "/ip4/0.0.0.0/tcp/26656" DefaultHomeDir = "sequencer_keys" + + DefaultSequencerUpdateInterval = 3 * time.Minute ) // DefaultNodeConfig keeps default values of NodeConfig @@ -22,12 +24,13 @@ var DefaultNodeConfig = *DefaultConfig("") func DefaultConfig(home string) *NodeConfig { cfg := &NodeConfig{ BlockManagerConfig: BlockManagerConfig{ - BlockTime: 200 * time.Millisecond, - MaxIdleTime: 3600 * time.Second, - MaxProofTime: 100 * time.Second, - BatchSubmitTime: 3600 * time.Second, - BatchSkew: 10, - BatchSubmitBytes: 500000, + BlockTime: 200 * time.Millisecond, + MaxIdleTime: 3600 * time.Second, + MaxProofTime: 100 * time.Second, + BatchSubmitTime: 3600 * time.Second, + BatchSkew: 10, + BatchSubmitBytes: 500000, + SequencerUpdateInterval: DefaultSequencerUpdateInterval, }, SettlementLayer: "mock", Instrumentation: &InstrumentationConfig{ diff --git a/testutil/block.go b/testutil/block.go index db3eddf3a..1755bf487 100644 --- a/testutil/block.go +++ b/testutil/block.go @@ -172,10 +172,11 @@ func initSettlementLayerMock(rollappId string, settlementlc settlement.ClientI, func GetManagerConfig() config.BlockManagerConfig { return config.BlockManagerConfig{ - BlockTime: 100 * time.Millisecond, - BatchSubmitBytes: 1000000, - BatchSubmitTime: 30 * time.Minute, - BatchSkew: 10, + BlockTime: 100 * time.Millisecond, + BatchSubmitBytes: 1000000, + BatchSubmitTime: 30 * time.Minute, + BatchSkew: 10, + SequencerUpdateInterval: config.DefaultSequencerUpdateInterval, } } diff --git a/testutil/node.go b/testutil/node.go index 2c8d88d0c..5a5b1a5b9 100644 --- a/testutil/node.go +++ b/testutil/node.go @@ -53,10 +53,11 @@ func CreateNode(isSequencer bool, blockManagerConfig *config.BlockManagerConfig, if blockManagerConfig == nil { blockManagerConfig = &config.BlockManagerConfig{ - BlockTime: 100 * time.Millisecond, - BatchSubmitTime: 60 * time.Second, - BatchSubmitBytes: 1000, - BatchSkew: 10, + BlockTime: 100 * time.Millisecond, + BatchSubmitTime: 60 * time.Second, + BatchSubmitBytes: 1000, + BatchSkew: 10, + SequencerUpdateInterval: config.DefaultSequencerUpdateInterval, } } nodeConfig.BlockManagerConfig = *blockManagerConfig From acd9df0ba08242f9d2d2fdf6aae853863778ada8 Mon Sep 17 00:00:00 2001 From: artemijspavlovs <19916123+artemijspavlovs@users.noreply.github.com> Date: Tue, 19 Nov 2024 21:52:16 +0700 Subject: [PATCH 2/7] refactor: update the name of the config parameter --- block/sequencers.go | 2 +- config/config.go | 6 +++--- config/config_test.go | 14 +++++++------- config/defaults.go | 16 ++++++++-------- testutil/block.go | 10 +++++----- testutil/node.go | 10 +++++----- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/block/sequencers.go b/block/sequencers.go index c8b50db95..ca3dff074 100644 --- a/block/sequencers.go +++ b/block/sequencers.go @@ -35,7 +35,7 @@ func (m *Manager) MonitorProposerRotation(ctx context.Context) { } func (m *Manager) MonitorSequencerSetUpdates(ctx context.Context) error { - ticker := time.NewTicker(m.Conf.SequencerUpdateInterval) + ticker := time.NewTicker(m.Conf.SequencerSetUpdateInterval) defer ticker.Stop() for { diff --git a/config/config.go b/config/config.go index ef61f12b8..9c7a6e783 100644 --- a/config/config.go +++ b/config/config.go @@ -59,8 +59,8 @@ type BlockManagerConfig struct { BatchSkew uint64 `mapstructure:"max_batch_skew"` // The size of the batch of blocks and commits in Bytes. We'll write every batch to the DA and the settlement layer. BatchSubmitBytes uint64 `mapstructure:"batch_submit_bytes"` - // SequencerUpdateInterval defines the interval at which to fetch sequencer updates from the settlement layer - SequencerUpdateInterval time.Duration `mapstructure:"sequencer_update_interval"` + // SequencerSetUpdateInterval defines the interval at which to fetch sequencer updates from the settlement layer + SequencerSetUpdateInterval time.Duration `mapstructure:"sequencer_update_interval"` } // GetViperConfig reads configuration parameters from Viper instance. @@ -165,7 +165,7 @@ func (c BlockManagerConfig) Validate() error { return fmt.Errorf("max_batch_skew must be positive") } - if c.SequencerUpdateInterval <= 0 { + if c.SequencerSetUpdateInterval <= 0 { return fmt.Errorf("sequencer_update_interval must be positive") } diff --git a/config/config_test.go b/config/config_test.go index 74ff8de86..dd1bfaa3a 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -183,13 +183,13 @@ func TestNodeConfig_Validate(t *testing.T) { func fullNodeConfig() config.NodeConfig { return config.NodeConfig{ BlockManagerConfig: config.BlockManagerConfig{ - BlockTime: 1 * time.Second, - MaxIdleTime: 20 * time.Second, - MaxProofTime: 20 * time.Second, - BatchSubmitTime: 20 * time.Second, - BatchSkew: 10, - BatchSubmitBytes: 10000, - SequencerUpdateInterval: config.DefaultSequencerUpdateInterval, + BlockTime: 1 * time.Second, + MaxIdleTime: 20 * time.Second, + MaxProofTime: 20 * time.Second, + BatchSubmitTime: 20 * time.Second, + BatchSkew: 10, + BatchSubmitBytes: 10000, + SequencerSetUpdateInterval: config.DefaultSequencerSetUpdateInterval, }, DAConfig: "da-config", SettlementLayer: "dymension", diff --git a/config/defaults.go b/config/defaults.go index 7159e3bd4..828994e1b 100644 --- a/config/defaults.go +++ b/config/defaults.go @@ -14,7 +14,7 @@ const ( DefaultHomeDir = "sequencer_keys" - DefaultSequencerUpdateInterval = 3 * time.Minute + DefaultSequencerSetUpdateInterval = 3 * time.Minute ) // DefaultNodeConfig keeps default values of NodeConfig @@ -24,13 +24,13 @@ var DefaultNodeConfig = *DefaultConfig("") func DefaultConfig(home string) *NodeConfig { cfg := &NodeConfig{ BlockManagerConfig: BlockManagerConfig{ - BlockTime: 200 * time.Millisecond, - MaxIdleTime: 3600 * time.Second, - MaxProofTime: 100 * time.Second, - BatchSubmitTime: 3600 * time.Second, - BatchSkew: 10, - BatchSubmitBytes: 500000, - SequencerUpdateInterval: DefaultSequencerUpdateInterval, + BlockTime: 200 * time.Millisecond, + MaxIdleTime: 3600 * time.Second, + MaxProofTime: 100 * time.Second, + BatchSubmitTime: 3600 * time.Second, + BatchSkew: 10, + BatchSubmitBytes: 500000, + SequencerSetUpdateInterval: DefaultSequencerSetUpdateInterval, }, SettlementLayer: "mock", Instrumentation: &InstrumentationConfig{ diff --git a/testutil/block.go b/testutil/block.go index 1755bf487..df4e9922e 100644 --- a/testutil/block.go +++ b/testutil/block.go @@ -172,11 +172,11 @@ func initSettlementLayerMock(rollappId string, settlementlc settlement.ClientI, func GetManagerConfig() config.BlockManagerConfig { return config.BlockManagerConfig{ - BlockTime: 100 * time.Millisecond, - BatchSubmitBytes: 1000000, - BatchSubmitTime: 30 * time.Minute, - BatchSkew: 10, - SequencerUpdateInterval: config.DefaultSequencerUpdateInterval, + BlockTime: 100 * time.Millisecond, + BatchSubmitBytes: 1000000, + BatchSubmitTime: 30 * time.Minute, + BatchSkew: 10, + SequencerSetUpdateInterval: config.DefaultSequencerSetUpdateInterval, } } diff --git a/testutil/node.go b/testutil/node.go index 5a5b1a5b9..49bd4a820 100644 --- a/testutil/node.go +++ b/testutil/node.go @@ -53,11 +53,11 @@ func CreateNode(isSequencer bool, blockManagerConfig *config.BlockManagerConfig, if blockManagerConfig == nil { blockManagerConfig = &config.BlockManagerConfig{ - BlockTime: 100 * time.Millisecond, - BatchSubmitTime: 60 * time.Second, - BatchSubmitBytes: 1000, - BatchSkew: 10, - SequencerUpdateInterval: config.DefaultSequencerUpdateInterval, + BlockTime: 100 * time.Millisecond, + BatchSubmitTime: 60 * time.Second, + BatchSubmitBytes: 1000, + BatchSkew: 10, + SequencerSetUpdateInterval: config.DefaultSequencerSetUpdateInterval, } } nodeConfig.BlockManagerConfig = *blockManagerConfig From 9f5817374ef2715fd843dd46f17a67b7b0d0e9a9 Mon Sep 17 00:00:00 2001 From: artemijspavlovs <19916123+artemijspavlovs@users.noreply.github.com> Date: Tue, 19 Nov 2024 21:58:15 +0700 Subject: [PATCH 3/7] chore: update rdk to version with whitelisted relayer query --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9f60622d3..f359a0a2d 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/cosmos/cosmos-sdk v0.46.16 github.com/dgraph-io/badger/v4 v4.3.0 github.com/dymensionxyz/cosmosclient v0.4.2-beta.0.20240821081230-b4018b2bac13 - github.com/dymensionxyz/dymension-rdk v1.6.1-0.20241115090119-5216362174e3 + github.com/dymensionxyz/dymension-rdk v1.6.1-0.20241119103059-def6322e4345 github.com/dymensionxyz/gerr-cosmos v1.0.0 github.com/go-kit/kit v0.12.0 github.com/gofrs/uuid v4.3.0+incompatible diff --git a/go.sum b/go.sum index 4550e03a6..9c07ca61f 100644 --- a/go.sum +++ b/go.sum @@ -330,6 +330,8 @@ github.com/dymensionxyz/cosmosclient v0.4.2-beta.0.20240821081230-b4018b2bac13 h github.com/dymensionxyz/cosmosclient v0.4.2-beta.0.20240821081230-b4018b2bac13/go.mod h1:jabDQYXrccscSE0fXkh7eQFYPWJCRiuWKonFGObVq6s= github.com/dymensionxyz/dymension-rdk v1.6.1-0.20241115090119-5216362174e3 h1:sXTU7h2Qu8XZL4J11V2Z2ADUemQ38KWd1oujQFSCatk= github.com/dymensionxyz/dymension-rdk v1.6.1-0.20241115090119-5216362174e3/go.mod h1:y89w1OG4C4aF7yyW8bv9PwV3o1KkCx1hyt34ap04Rnk= +github.com/dymensionxyz/dymension-rdk v1.6.1-0.20241119103059-def6322e4345 h1:FcHidPgGEHh9ELwodNJkGcHqsG+mdPiGdughzG4W+X8= +github.com/dymensionxyz/dymension-rdk v1.6.1-0.20241119103059-def6322e4345/go.mod h1:y89w1OG4C4aF7yyW8bv9PwV3o1KkCx1hyt34ap04Rnk= github.com/dymensionxyz/evmos/v12 v12.1.6-dymension-v0.3 h1:vmAdUGUc4rTIiO3Phezr7vGq+0uPDVKSA4WAe8+yl6w= github.com/dymensionxyz/evmos/v12 v12.1.6-dymension-v0.3/go.mod h1:LfPv2O1HXMgETpka81Pg3nXy+U/7urq8dn85ZnSXK5Y= github.com/dymensionxyz/gerr-cosmos v1.0.0 h1:oi91rgOkpJWr41oX9JOyjvvBnhGY54tj513x8VlDAEc= From 67958febe13cd8b46c9c64003df56ac334e34289 Mon Sep 17 00:00:00 2001 From: artemijspavlovs <19916123+artemijspavlovs@users.noreply.github.com> Date: Tue, 19 Nov 2024 22:02:17 +0700 Subject: [PATCH 4/7] fix: tests --- node/node_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/node/node_test.go b/node/node_test.go index 57aecf762..1be75f1e3 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -75,10 +75,11 @@ func TestMempoolDirectly(t *testing.T) { RPC: config.RPCConfig{}, MempoolConfig: *tmcfg.DefaultMempoolConfig(), BlockManagerConfig: config.BlockManagerConfig{ - BlockTime: 1 * time.Second, - BatchSubmitTime: 60 * time.Second, - BatchSubmitBytes: 100000, - BatchSkew: 10, + BlockTime: 1 * time.Second, + BatchSubmitTime: 60 * time.Second, + BatchSubmitBytes: 100000, + BatchSkew: 10, + SequencerSetUpdateInterval: config.DefaultSequencerSetUpdateInterval, }, DAConfig: "", SettlementLayer: "mock", From ffa9129fb93cb1ac9a5cbc035f0a0ca9d576bf57 Mon Sep 17 00:00:00 2001 From: artemijspavlovs <19916123+artemijspavlovs@users.noreply.github.com> Date: Tue, 19 Nov 2024 22:46:27 +0700 Subject: [PATCH 5/7] fix: tests --- .tool-versions | 1 - rpc/client/client_test.go | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 .tool-versions diff --git a/.tool-versions b/.tool-versions deleted file mode 100644 index f3ab91414..000000000 --- a/.tool-versions +++ /dev/null @@ -1 +0,0 @@ -golang 1.20 diff --git a/rpc/client/client_test.go b/rpc/client/client_test.go index afb1a915c..865c121e3 100644 --- a/rpc/client/client_test.go +++ b/rpc/client/client_test.go @@ -105,10 +105,11 @@ func TestGenesisChunked(t *testing.T) { }, RPC: config.RPCConfig{}, BlockManagerConfig: config.BlockManagerConfig{ - BlockTime: 100 * time.Millisecond, - BatchSubmitTime: 60 * time.Second, - BatchSubmitBytes: 1000, - BatchSkew: 10, + BlockTime: 100 * time.Millisecond, + BatchSubmitTime: 60 * time.Second, + BatchSubmitBytes: 1000, + BatchSkew: 10, + SequencerSetUpdateInterval: config.DefaultSequencerSetUpdateInterval, }, DAConfig: "", SettlementLayer: "mock", @@ -1015,10 +1016,11 @@ func getRPCInternal(t *testing.T, sequencer bool) (*tmmocks.MockApplication, *cl RPC: config.RPCConfig{}, MempoolConfig: *tmcfg.DefaultMempoolConfig(), BlockManagerConfig: config.BlockManagerConfig{ - BlockTime: 100 * time.Millisecond, - BatchSubmitTime: 60 * time.Second, - BatchSubmitBytes: 1000, - BatchSkew: 10, + BlockTime: 100 * time.Millisecond, + BatchSubmitTime: 60 * time.Second, + BatchSubmitBytes: 1000, + BatchSkew: 10, + SequencerSetUpdateInterval: config.DefaultSequencerSetUpdateInterval, }, DAConfig: "", SettlementLayer: "mock", From 96c493a9e755b8b2e1e048d47920f7fd00618a40 Mon Sep 17 00:00:00 2001 From: artemijspavlovs <19916123+artemijspavlovs@users.noreply.github.com> Date: Tue, 19 Nov 2024 22:50:37 +0700 Subject: [PATCH 6/7] fix: gomod --- go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.sum b/go.sum index 9c07ca61f..435e18a78 100644 --- a/go.sum +++ b/go.sum @@ -328,8 +328,6 @@ github.com/dymensionxyz/cometbft v0.34.29-0.20241104165035-feade34f8f89 h1:rGkCc github.com/dymensionxyz/cometbft v0.34.29-0.20241104165035-feade34f8f89/go.mod h1:L9shMfbkZ8B+7JlwANEr+NZbBcn+hBpwdbeYvA5rLCw= github.com/dymensionxyz/cosmosclient v0.4.2-beta.0.20240821081230-b4018b2bac13 h1:u5yeve5jZR6TdRjjR+vYT/8PWKbhwCZxUmAu+/Tnxyg= github.com/dymensionxyz/cosmosclient v0.4.2-beta.0.20240821081230-b4018b2bac13/go.mod h1:jabDQYXrccscSE0fXkh7eQFYPWJCRiuWKonFGObVq6s= -github.com/dymensionxyz/dymension-rdk v1.6.1-0.20241115090119-5216362174e3 h1:sXTU7h2Qu8XZL4J11V2Z2ADUemQ38KWd1oujQFSCatk= -github.com/dymensionxyz/dymension-rdk v1.6.1-0.20241115090119-5216362174e3/go.mod h1:y89w1OG4C4aF7yyW8bv9PwV3o1KkCx1hyt34ap04Rnk= github.com/dymensionxyz/dymension-rdk v1.6.1-0.20241119103059-def6322e4345 h1:FcHidPgGEHh9ELwodNJkGcHqsG+mdPiGdughzG4W+X8= github.com/dymensionxyz/dymension-rdk v1.6.1-0.20241119103059-def6322e4345/go.mod h1:y89w1OG4C4aF7yyW8bv9PwV3o1KkCx1hyt34ap04Rnk= github.com/dymensionxyz/evmos/v12 v12.1.6-dymension-v0.3 h1:vmAdUGUc4rTIiO3Phezr7vGq+0uPDVKSA4WAe8+yl6w= From b2952ce154466ea5ac69ac24e521cb5a55244cd0 Mon Sep 17 00:00:00 2001 From: artemijspavlovs <19916123+artemijspavlovs@users.noreply.github.com> Date: Tue, 19 Nov 2024 23:00:21 +0700 Subject: [PATCH 7/7] fix: tests --- block/submit_test.go | 11 ++++++----- rpc/client/client_test.go | 27 +++++++++++++++------------ rpc/json/service_test.go | 11 ++++++----- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/block/submit_test.go b/block/submit_test.go index de2ddd071..6d1c8c748 100644 --- a/block/submit_test.go +++ b/block/submit_test.go @@ -245,11 +245,12 @@ func TestSubmissionByTime(t *testing.T) { // Init manager with empty blocks feature enabled managerConfig := config.BlockManagerConfig{ - BlockTime: blockTime, - MaxIdleTime: 0, - BatchSkew: 10, - BatchSubmitTime: submitTimeout, - BatchSubmitBytes: 1000, + BlockTime: blockTime, + MaxIdleTime: 0, + BatchSkew: 10, + BatchSubmitTime: submitTimeout, + BatchSubmitBytes: 1000, + SequencerSetUpdateInterval: config.DefaultSequencerSetUpdateInterval, } manager, err := testutil.GetManager(managerConfig, nil, 1, 1, 0, proxyApp, nil) diff --git a/rpc/client/client_test.go b/rpc/client/client_test.go index 865c121e3..34d4b69ff 100644 --- a/rpc/client/client_test.go +++ b/rpc/client/client_test.go @@ -854,10 +854,11 @@ func TestValidatorSetHandling(t *testing.T) { BlockSyncRequestIntervalTime: 30 * time.Second, }, BlockManagerConfig: config.BlockManagerConfig{ - BlockTime: 10 * time.Millisecond, - BatchSubmitTime: 60 * time.Second, - BatchSubmitBytes: 1000, - BatchSkew: 10, + BlockTime: 10 * time.Millisecond, + BatchSubmitTime: 60 * time.Second, + BatchSubmitBytes: 1000, + BatchSkew: 10, + SequencerSetUpdateInterval: config.DefaultSequencerSetUpdateInterval, }, SettlementConfig: settlement.Config{ ProposerPubKey: hex.EncodeToString(proposerPubKeyBytes), @@ -1123,10 +1124,11 @@ func TestMempool2Nodes(t *testing.T) { BlockSyncRequestIntervalTime: 30 * time.Second, }, BlockManagerConfig: config.BlockManagerConfig{ - BlockTime: 100 * time.Millisecond, - BatchSubmitTime: 60 * time.Second, - BatchSubmitBytes: 1000, - BatchSkew: 10, + BlockTime: 100 * time.Millisecond, + BatchSubmitTime: 60 * time.Second, + BatchSubmitBytes: 1000, + BatchSkew: 10, + SequencerSetUpdateInterval: config.DefaultSequencerSetUpdateInterval, }, MempoolConfig: *tmcfg.DefaultMempoolConfig(), }, key1, signingKey1, proxy.NewLocalClientCreator(app), genesis, "", log.TestingLogger(), mempool.NopMetrics()) @@ -1139,10 +1141,11 @@ func TestMempool2Nodes(t *testing.T) { ProposerPubKey: hex.EncodeToString(proposerPK), }, BlockManagerConfig: config.BlockManagerConfig{ - BlockTime: 100 * time.Millisecond, - BatchSubmitTime: 60 * time.Second, - BatchSubmitBytes: 1000, - BatchSkew: 10, + BlockTime: 100 * time.Millisecond, + BatchSubmitTime: 60 * time.Second, + BatchSubmitBytes: 1000, + BatchSkew: 10, + SequencerSetUpdateInterval: config.DefaultSequencerSetUpdateInterval, }, P2PConfig: config.P2PConfig{ ListenAddress: "/ip4/127.0.0.1/tcp/9002", diff --git a/rpc/json/service_test.go b/rpc/json/service_test.go index 24115951b..7f0243bca 100644 --- a/rpc/json/service_test.go +++ b/rpc/json/service_test.go @@ -314,11 +314,12 @@ func getRPC(t *testing.T) (*tmmocks.MockApplication, *client.Client) { config := config.NodeConfig{ SettlementLayer: "mock", BlockManagerConfig: config.BlockManagerConfig{ - BlockTime: 1 * time.Second, - MaxIdleTime: 0, - BatchSkew: 10, - BatchSubmitTime: 30 * time.Minute, - BatchSubmitBytes: 1000, + BlockTime: 1 * time.Second, + MaxIdleTime: 0, + BatchSkew: 10, + BatchSubmitTime: 30 * time.Minute, + BatchSubmitBytes: 1000, + SequencerSetUpdateInterval: config.DefaultSequencerSetUpdateInterval, }, SettlementConfig: settlement.Config{ ProposerPubKey: hex.EncodeToString(proposerPubKeyBytes),