diff --git a/charts/chainlink-cluster/templates/chainlink-cm.yaml b/charts/chainlink-cluster/templates/chainlink-cm.yaml index 6f8b043e3d1..56e01fa69dd 100644 --- a/charts/chainlink-cluster/templates/chainlink-cm.yaml +++ b/charts/chainlink-cluster/templates/chainlink-cm.yaml @@ -32,7 +32,6 @@ data: UICSAKeys = true [OCR] Enabled = true - DefaultTransactionQueueDepth = 0 [P2P] [P2P.V2] Enabled = true @@ -46,6 +45,7 @@ data: MinContractPayment = '0' AutoCreateKey = true FinalityDepth = 1 + DefaultTransactionQueueDepth = 0 {{- if (hasKey $chainCfg "customEVMConfigToml") }} {{- $chainCfg.customEVMConfigToml | nindent 4 }} {{- end }} diff --git a/core/chains/evm/config/chain_scoped.go b/core/chains/evm/config/chain_scoped.go index 2201831feaf..1920c970555 100644 --- a/core/chains/evm/config/chain_scoped.go +++ b/core/chains/evm/config/chain_scoped.go @@ -201,3 +201,11 @@ func (e *EVMConfig) OperatorFactoryAddress() string { func (e *EVMConfig) LogPrunePageSize() uint32 { return *e.C.LogPrunePageSize } + +func (e *EVMConfig) SimulateTransactions() bool { + return *e.C.SimulateTransactions +} + +func (e *EVMConfig) DefaultTransactionQueueDepth() uint32 { + return *e.C.DefaultTransactionQueueDepth +} diff --git a/core/chains/evm/config/config.go b/core/chains/evm/config/config.go index b9ff9ea9f8e..8f3de2064b6 100644 --- a/core/chains/evm/config/config.go +++ b/core/chains/evm/config/config.go @@ -45,6 +45,8 @@ type EVM interface { OperatorFactoryAddress() string RPCDefaultBatchSize() uint32 NodeNoNewHeadsThreshold() time.Duration + SimulateTransactions() bool + DefaultTransactionQueueDepth() uint32 IsEnabled() bool TOMLString() (string, error) diff --git a/core/chains/evm/config/toml/config.go b/core/chains/evm/config/toml/config.go index 0f647034162..22276405bdb 100644 --- a/core/chains/evm/config/toml/config.go +++ b/core/chains/evm/config/toml/config.go @@ -342,26 +342,28 @@ func (c *EVMConfig) TOMLString() (string, error) { } type Chain struct { - AutoCreateKey *bool - BlockBackfillDepth *uint32 - BlockBackfillSkip *bool - ChainType *string - FinalityDepth *uint32 - FinalityTagEnabled *bool - FlagsContractAddress *types.EIP55Address - LinkContractAddress *types.EIP55Address - LogBackfillBatchSize *uint32 - LogPollInterval *commonconfig.Duration - LogKeepBlocksDepth *uint32 - LogPrunePageSize *uint32 - BackupLogPollerBlockDelay *uint64 - MinIncomingConfirmations *uint32 - MinContractPayment *commonassets.Link - NonceAutoSync *bool - NoNewHeadsThreshold *commonconfig.Duration - OperatorFactoryAddress *types.EIP55Address - RPCDefaultBatchSize *uint32 - RPCBlockQueryDelay *uint16 + AutoCreateKey *bool + BlockBackfillDepth *uint32 + BlockBackfillSkip *bool + ChainType *string + FinalityDepth *uint32 + FinalityTagEnabled *bool + FlagsContractAddress *types.EIP55Address + LinkContractAddress *types.EIP55Address + LogBackfillBatchSize *uint32 + LogPollInterval *commonconfig.Duration + LogKeepBlocksDepth *uint32 + LogPrunePageSize *uint32 + BackupLogPollerBlockDelay *uint64 + MinIncomingConfirmations *uint32 + MinContractPayment *commonassets.Link + NonceAutoSync *bool + NoNewHeadsThreshold *commonconfig.Duration + OperatorFactoryAddress *types.EIP55Address + RPCDefaultBatchSize *uint32 + RPCBlockQueryDelay *uint16 + SimulateTransactions *bool + DefaultTransactionQueueDepth *uint32 Transactions Transactions `toml:",omitempty"` BalanceMonitor BalanceMonitor `toml:",omitempty"` diff --git a/core/chains/evm/config/toml/defaults.go b/core/chains/evm/config/toml/defaults.go index 951246eeb22..13bd2c132b1 100644 --- a/core/chains/evm/config/toml/defaults.go +++ b/core/chains/evm/config/toml/defaults.go @@ -164,6 +164,12 @@ func (c *Chain) SetFrom(f *Chain) { if v := f.RPCBlockQueryDelay; v != nil { c.RPCBlockQueryDelay = v } + if v:= f.SimulateTransactions; v != nil { + c.SimulateTransactions = v + } + if v:= f.DefaultTransactionQueueDepth; v != nil { + c.DefaultTransactionQueueDepth = v + } c.Transactions.setFrom(&f.Transactions) c.BalanceMonitor.setFrom(&f.BalanceMonitor) diff --git a/core/chains/evm/config/toml/defaults/fallback.toml b/core/chains/evm/config/toml/defaults/fallback.toml index d65d0a1b0c1..31fc7338916 100644 --- a/core/chains/evm/config/toml/defaults/fallback.toml +++ b/core/chains/evm/config/toml/defaults/fallback.toml @@ -14,6 +14,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '3m' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false diff --git a/core/config/app_config.go b/core/config/app_config.go index 869477218db..60d5aeec0e5 100644 --- a/core/config/app_config.go +++ b/core/config/app_config.go @@ -38,7 +38,6 @@ type AppConfig interface { Capabilities() Capabilities Database() Database Feature() Feature - FluxMonitor() FluxMonitor Insecure() Insecure JobPipeline() JobPipeline Keeper() Keeper diff --git a/core/config/docs/chains-evm.toml b/core/config/docs/chains-evm.toml index dd63edaf694..c4627c6d73a 100644 --- a/core/config/docs/chains-evm.toml +++ b/core/config/docs/chains-evm.toml @@ -87,6 +87,10 @@ RPCDefaultBatchSize = 250 # Default # available from the connected node via RPC, due to race conditions in the code of the remote ETH node. In this case you will get false # "zero" blocks that are missing transactions. RPCBlockQueryDelay = 1 # Default +# DefaultTransactionQueueDepth controls the queue size for `DropOldestStrategy` in TXM. Set to 0 to use `SendEvery` strategy instead. +DefaultTransactionQueueDepth = 1 # Default +# SimulateTransactions enables transaction simulation for TransmitChecker. +SimulateTransactions = false # Default [EVM.Transactions] # ForwardersEnabled enables or disables sending transactions through forwarder contracts. diff --git a/core/config/docs/core.toml b/core/config/docs/core.toml index a7574a5d9d4..24562f306bf 100644 --- a/core/config/docs/core.toml +++ b/core/config/docs/core.toml @@ -293,13 +293,6 @@ DefaultTimeout = '15s' # Default # MaxSize defines the maximum size for HTTP requests and responses made by `http` and `bridge` adapters. MaxSize = '32768' # Default -[FluxMonitor] -# **ADVANCED** -# DefaultTransactionQueueDepth controls the queue size for `DropOldestStrategy` in Flux Monitor. Set to 0 to use `SendEvery` strategy instead. -DefaultTransactionQueueDepth = 1 # Default -# SimulateTransactions enables transaction simulation for Flux Monitor. -SimulateTransactions = false # Default - [OCR2] # Enabled enables OCR2 jobs. Enabled = false # Default @@ -355,10 +348,6 @@ KeyBundleID = '7a5f66bbe6594259325bf2b4f5b1a9c900000000000000000000000000000000' CaptureEATelemetry = false # Default # CaptureAutomationCustomTelemetry toggles collecting automation specific telemetry CaptureAutomationCustomTelemetry = true # Default -# DefaultTransactionQueueDepth controls the queue size for `DropOldestStrategy` in OCR2. Set to 0 to use `SendEvery` strategy instead. -DefaultTransactionQueueDepth = 1 # Default -# SimulateTransactions enables transaction simulation for OCR2. -SimulateTransactions = false # Default # TraceLogging enables trace level logging. TraceLogging = false # Default @@ -382,13 +371,8 @@ ContractPollInterval = '1m' # Default # ContractSubscribeInterval is the interval at which we try to establish a subscription on ContractConfigTracker # if one doesn't exist. Recommended values are between two and five minutes. ContractSubscribeInterval = '2m' # Default -# **ADVANCED** -# DefaultTransactionQueueDepth controls the queue size for `DropOldestStrategy` in OCR. Set to 0 to use `SendEvery` strategy instead. -DefaultTransactionQueueDepth = 1 # Default # KeyBundleID is the default key bundle ID to use for OCR jobs. If you have an OCR job that does not explicitly specify a key bundle ID, it will fall back to this value. KeyBundleID = 'acdd42797a8b921b2910497badc5000600000000000000000000000000000000' # Example -# SimulateTransactions enables transaction simulation for OCR. -SimulateTransactions = false # Default # TransmitterAddress is the default sending address to use for OCR. If you have an OCR job that does not explicitly specify a transmitter address, it will fall back to this value. TransmitterAddress = '0xa0788FC17B1dEe36f057c42B6F373A34B014687e' # Example # CaptureEATelemetry toggles collecting extra information from External Adaptares @@ -483,9 +467,6 @@ ListenAddresses = ['1.2.3.4:9999', '[a52d:0:a88:1274::abcd]:1337'] # Example [Keeper] # **ADVANCED** -# DefaultTransactionQueueDepth controls the queue size for `DropOldestStrategy` in Keeper. Set to 0 to use `SendEvery` strategy instead. -DefaultTransactionQueueDepth = 1 # Default -# **ADVANCED** # GasPriceBufferPercent specifies the percentage to add to the gas price used for checking whether to perform an upkeep. Only applies in legacy mode (EIP-1559 off). GasPriceBufferPercent = 20 # Default # **ADVANCED** diff --git a/core/config/keeper_config.go b/core/config/keeper_config.go index 565e70dc25d..f280a49c0af 100644 --- a/core/config/keeper_config.go +++ b/core/config/keeper_config.go @@ -11,7 +11,6 @@ type Registry interface { } type Keeper interface { - DefaultTransactionQueueDepth() uint32 GasPriceBufferPercent() uint16 GasTipCapBufferPercent() uint16 BaseFeeBufferPercent() uint16 diff --git a/core/config/ocr2_config.go b/core/config/ocr2_config.go index a2ea79741b4..aea6454bd92 100644 --- a/core/config/ocr2_config.go +++ b/core/config/ocr2_config.go @@ -18,7 +18,5 @@ type OCR2 interface { // OCR2 config, cannot override in jobs TraceLogging() bool CaptureEATelemetry() bool - DefaultTransactionQueueDepth() uint32 - SimulateTransactions() bool CaptureAutomationCustomTelemetry() bool } diff --git a/core/config/ocr_config.go b/core/config/ocr_config.go index bde2142c846..91a0417dafb 100644 --- a/core/config/ocr_config.go +++ b/core/config/ocr_config.go @@ -15,10 +15,8 @@ type OCR interface { ContractSubscribeInterval() time.Duration KeyBundleID() (string, error) ObservationTimeout() time.Duration - SimulateTransactions() bool TransmitterAddress() (types.EIP55Address, error) // OCR2 can support non-evm changes // OCR1 config, cannot override in jobs TraceLogging() bool - DefaultTransactionQueueDepth() uint32 CaptureEATelemetry() bool } diff --git a/core/config/toml/types.go b/core/config/toml/types.go index ed52c21e34e..f520dc48a2b 100644 --- a/core/config/toml/types.go +++ b/core/config/toml/types.go @@ -45,7 +45,6 @@ type Core struct { Log Log `toml:",omitempty"` WebServer WebServer `toml:",omitempty"` JobPipeline JobPipeline `toml:",omitempty"` - FluxMonitor FluxMonitor `toml:",omitempty"` OCR2 OCR2 `toml:",omitempty"` OCR OCR `toml:",omitempty"` P2P P2P `toml:",omitempty"` @@ -80,7 +79,6 @@ func (c *Core) SetFrom(f *Core) { c.WebServer.setFrom(&f.WebServer) c.JobPipeline.setFrom(&f.JobPipeline) - c.FluxMonitor.setFrom(&f.FluxMonitor) c.OCR2.setFrom(&f.OCR2) c.OCR.setFrom(&f.OCR) c.P2P.setFrom(&f.P2P) @@ -899,20 +897,6 @@ func (j *JobPipelineHTTPRequest) setFrom(f *JobPipelineHTTPRequest) { } } -type FluxMonitor struct { - DefaultTransactionQueueDepth *uint32 - SimulateTransactions *bool -} - -func (m *FluxMonitor) setFrom(f *FluxMonitor) { - if v := f.DefaultTransactionQueueDepth; v != nil { - m.DefaultTransactionQueueDepth = v - } - if v := f.SimulateTransactions; v != nil { - m.SimulateTransactions = v - } -} - type OCR2 struct { Enabled *bool ContractConfirmations *uint32 @@ -924,8 +908,6 @@ type OCR2 struct { KeyBundleID *models.Sha256Hash CaptureEATelemetry *bool CaptureAutomationCustomTelemetry *bool - DefaultTransactionQueueDepth *uint32 - SimulateTransactions *bool TraceLogging *bool } @@ -960,12 +942,6 @@ func (o *OCR2) setFrom(f *OCR2) { if v := f.CaptureAutomationCustomTelemetry; v != nil { o.CaptureAutomationCustomTelemetry = v } - if v := f.DefaultTransactionQueueDepth; v != nil { - o.DefaultTransactionQueueDepth = v - } - if v := f.SimulateTransactions; v != nil { - o.SimulateTransactions = v - } if v := f.TraceLogging; v != nil { o.TraceLogging = v } @@ -977,10 +953,8 @@ type OCR struct { BlockchainTimeout *commonconfig.Duration ContractPollInterval *commonconfig.Duration ContractSubscribeInterval *commonconfig.Duration - DefaultTransactionQueueDepth *uint32 // Optional KeyBundleID *models.Sha256Hash - SimulateTransactions *bool TransmitterAddress *types.EIP55Address CaptureEATelemetry *bool TraceLogging *bool @@ -1002,15 +976,9 @@ func (o *OCR) setFrom(f *OCR) { if v := f.ContractSubscribeInterval; v != nil { o.ContractSubscribeInterval = v } - if v := f.DefaultTransactionQueueDepth; v != nil { - o.DefaultTransactionQueueDepth = v - } if v := f.KeyBundleID; v != nil { o.KeyBundleID = v } - if v := f.SimulateTransactions; v != nil { - o.SimulateTransactions = v - } if v := f.TransmitterAddress; v != nil { o.TransmitterAddress = v } @@ -1079,7 +1047,6 @@ func (p *P2PV2) setFrom(f *P2PV2) { } type Keeper struct { - DefaultTransactionQueueDepth *uint32 GasPriceBufferPercent *uint16 GasTipCapBufferPercent *uint16 BaseFeeBufferPercent *uint16 @@ -1090,9 +1057,6 @@ type Keeper struct { } func (k *Keeper) setFrom(f *Keeper) { - if v := f.DefaultTransactionQueueDepth; v != nil { - k.DefaultTransactionQueueDepth = v - } if v := f.GasPriceBufferPercent; v != nil { k.GasPriceBufferPercent = v } diff --git a/core/services/chainlink/config_flux_monitor.go b/core/services/chainlink/config_flux_monitor.go deleted file mode 100644 index ccf72c93b34..00000000000 --- a/core/services/chainlink/config_flux_monitor.go +++ /dev/null @@ -1,15 +0,0 @@ -package chainlink - -import "github.com/smartcontractkit/chainlink/v2/core/config/toml" - -type fluxMonitorConfig struct { - c toml.FluxMonitor -} - -func (f *fluxMonitorConfig) DefaultTransactionQueueDepth() uint32 { - return *f.c.DefaultTransactionQueueDepth -} - -func (f *fluxMonitorConfig) SimulateTransactions() bool { - return *f.c.SimulateTransactions -} diff --git a/core/services/chainlink/config_flux_monitor_test.go b/core/services/chainlink/config_flux_monitor_test.go deleted file mode 100644 index f502a378f94..00000000000 --- a/core/services/chainlink/config_flux_monitor_test.go +++ /dev/null @@ -1,21 +0,0 @@ -package chainlink - -import ( - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestFluxMonitorConfig(t *testing.T) { - opts := GeneralConfigOpts{ - ConfigStrings: []string{fullTOML}, - } - cfg, err := opts.New() - require.NoError(t, err) - - fm := cfg.FluxMonitor() - - assert.Equal(t, uint32(100), fm.DefaultTransactionQueueDepth()) - assert.Equal(t, true, fm.SimulateTransactions()) -} diff --git a/core/services/chainlink/config_general.go b/core/services/chainlink/config_general.go index cae01c01cb7..caab2582771 100644 --- a/core/services/chainlink/config_general.go +++ b/core/services/chainlink/config_general.go @@ -409,10 +409,6 @@ func (g *generalConfig) ShutdownGracePeriod() time.Duration { return g.c.ShutdownGracePeriod.Duration() } -func (g *generalConfig) FluxMonitor() config.FluxMonitor { - return &fluxMonitorConfig{c: g.c.FluxMonitor} -} - func (g *generalConfig) InsecureFastScrypt() bool { return *g.c.InsecureFastScrypt } diff --git a/core/services/chainlink/config_keeper.go b/core/services/chainlink/config_keeper.go index e56de0a69d1..216959fc3cc 100644 --- a/core/services/chainlink/config_keeper.go +++ b/core/services/chainlink/config_keeper.go @@ -41,10 +41,6 @@ func (k *keeperConfig) Registry() config.Registry { return ®istryConfig{c: k.c.Registry} } -func (k *keeperConfig) DefaultTransactionQueueDepth() uint32 { - return *k.c.DefaultTransactionQueueDepth -} - func (k *keeperConfig) GasPriceBufferPercent() uint16 { return *k.c.GasPriceBufferPercent } diff --git a/core/services/chainlink/config_keeper_test.go b/core/services/chainlink/config_keeper_test.go index 7fd571c8880..3db29a2f914 100644 --- a/core/services/chainlink/config_keeper_test.go +++ b/core/services/chainlink/config_keeper_test.go @@ -17,7 +17,6 @@ func TestKeeperConfig(t *testing.T) { keeper := cfg.Keeper() - assert.Equal(t, uint32(17), keeper.DefaultTransactionQueueDepth()) assert.Equal(t, uint16(12), keeper.GasPriceBufferPercent()) assert.Equal(t, uint16(43), keeper.GasTipCapBufferPercent()) assert.Equal(t, uint16(89), keeper.BaseFeeBufferPercent()) diff --git a/core/services/chainlink/config_ocr.go b/core/services/chainlink/config_ocr.go index cf6127e713a..301caccc16a 100644 --- a/core/services/chainlink/config_ocr.go +++ b/core/services/chainlink/config_ocr.go @@ -44,10 +44,6 @@ func (o *ocrConfig) ObservationTimeout() time.Duration { return o.c.ObservationTimeout.Duration() } -func (o *ocrConfig) SimulateTransactions() bool { - return *o.c.SimulateTransactions -} - func (o *ocrConfig) TransmitterAddress() (types.EIP55Address, error) { a := *o.c.TransmitterAddress if a.IsZero() { @@ -60,10 +56,6 @@ func (o *ocrConfig) TraceLogging() bool { return *o.c.TraceLogging } -func (o *ocrConfig) DefaultTransactionQueueDepth() uint32 { - return *o.c.DefaultTransactionQueueDepth -} - func (o *ocrConfig) CaptureEATelemetry() bool { return *o.c.CaptureEATelemetry } diff --git a/core/services/chainlink/config_ocr2.go b/core/services/chainlink/config_ocr2.go index 801abb380d6..8e0aded5ac5 100644 --- a/core/services/chainlink/config_ocr2.go +++ b/core/services/chainlink/config_ocr2.go @@ -60,11 +60,3 @@ func (o *ocr2Config) CaptureEATelemetry() bool { func (o *ocr2Config) CaptureAutomationCustomTelemetry() bool { return *o.c.CaptureAutomationCustomTelemetry } - -func (o *ocr2Config) DefaultTransactionQueueDepth() uint32 { - return *o.c.DefaultTransactionQueueDepth -} - -func (o *ocr2Config) SimulateTransactions() bool { - return *o.c.SimulateTransactions -} diff --git a/core/services/chainlink/config_ocr2_test.go b/core/services/chainlink/config_ocr2_test.go index 5bf84934d13..8a553a63a67 100644 --- a/core/services/chainlink/config_ocr2_test.go +++ b/core/services/chainlink/config_ocr2_test.go @@ -34,9 +34,7 @@ func TestOCR2Config(t *testing.T) { require.Equal(t, expectedDatabaseTimeout, ocr2Cfg.DatabaseTimeout()) require.Equal(t, expectedContractPollInterval, ocr2Cfg.ContractPollInterval()) require.Equal(t, expectedContractSubscribeInterval, ocr2Cfg.ContractSubscribeInterval()) - require.Equal(t, false, ocr2Cfg.SimulateTransactions()) require.Equal(t, false, ocr2Cfg.TraceLogging()) - require.Equal(t, uint32(1), ocr2Cfg.DefaultTransactionQueueDepth()) require.Equal(t, false, ocr2Cfg.CaptureEATelemetry()) require.Equal(t, true, ocr2Cfg.CaptureAutomationCustomTelemetry()) diff --git a/core/services/chainlink/config_ocr_test.go b/core/services/chainlink/config_ocr_test.go index 169fd0c7e0a..4f568134d62 100644 --- a/core/services/chainlink/config_ocr_test.go +++ b/core/services/chainlink/config_ocr_test.go @@ -30,9 +30,7 @@ func TestOCRConfig(t *testing.T) { require.Equal(t, expectedBlockchainTimeout, ocrCfg.BlockchainTimeout()) require.Equal(t, expectedContractPollInterval, ocrCfg.ContractPollInterval()) require.Equal(t, expectedContractSubscribeInterval, ocrCfg.ContractSubscribeInterval()) - require.Equal(t, true, ocrCfg.SimulateTransactions()) require.Equal(t, false, ocrCfg.TraceLogging()) - require.Equal(t, uint32(12), ocrCfg.DefaultTransactionQueueDepth()) require.Equal(t, false, ocrCfg.CaptureEATelemetry()) keyBundleID, err := ocrCfg.KeyBundleID() diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go index ad5c7e8c33d..eb5b806f176 100644 --- a/core/services/chainlink/config_test.go +++ b/core/services/chainlink/config_test.go @@ -376,10 +376,6 @@ func TestConfig_Marshal(t *testing.T) { DefaultTimeout: commoncfg.MustNewDuration(time.Minute), }, } - full.FluxMonitor = toml.FluxMonitor{ - DefaultTransactionQueueDepth: ptr[uint32](100), - SimulateTransactions: ptr(true), - } full.OCR2 = toml.OCR2{ Enabled: ptr(true), ContractConfirmations: ptr[uint32](11), @@ -391,22 +387,18 @@ func TestConfig_Marshal(t *testing.T) { KeyBundleID: ptr(models.MustSha256HashFromHex("7a5f66bbe6594259325bf2b4f5b1a9c9")), CaptureEATelemetry: ptr(false), CaptureAutomationCustomTelemetry: ptr(true), - DefaultTransactionQueueDepth: ptr[uint32](1), - SimulateTransactions: ptr(false), TraceLogging: ptr(false), } full.OCR = toml.OCR{ - Enabled: ptr(true), - ObservationTimeout: commoncfg.MustNewDuration(11 * time.Second), - BlockchainTimeout: commoncfg.MustNewDuration(3 * time.Second), - ContractPollInterval: commoncfg.MustNewDuration(time.Hour), - ContractSubscribeInterval: commoncfg.MustNewDuration(time.Minute), - DefaultTransactionQueueDepth: ptr[uint32](12), - KeyBundleID: ptr(models.MustSha256HashFromHex("acdd42797a8b921b2910497badc50006")), - SimulateTransactions: ptr(true), - TransmitterAddress: ptr(types.MustEIP55Address("0xa0788FC17B1dEe36f057c42B6F373A34B014687e")), - CaptureEATelemetry: ptr(false), - TraceLogging: ptr(false), + Enabled: ptr(true), + ObservationTimeout: commoncfg.MustNewDuration(11 * time.Second), + BlockchainTimeout: commoncfg.MustNewDuration(3 * time.Second), + ContractPollInterval: commoncfg.MustNewDuration(time.Hour), + ContractSubscribeInterval: commoncfg.MustNewDuration(time.Minute), + KeyBundleID: ptr(models.MustSha256HashFromHex("acdd42797a8b921b2910497badc50006")), + TransmitterAddress: ptr(types.MustEIP55Address("0xa0788FC17B1dEe36f057c42B6F373A34B014687e")), + CaptureEATelemetry: ptr(false), + TraceLogging: ptr(false), } full.P2P = toml.P2P{ IncomingMessageBufferSize: ptr[int64](13), @@ -445,12 +437,11 @@ func TestConfig_Marshal(t *testing.T) { }, } full.Keeper = toml.Keeper{ - DefaultTransactionQueueDepth: ptr[uint32](17), - GasPriceBufferPercent: ptr[uint16](12), - GasTipCapBufferPercent: ptr[uint16](43), - BaseFeeBufferPercent: ptr[uint16](89), - MaxGracePeriod: ptr[int64](31), - TurnLookBack: ptr[int64](91), + GasPriceBufferPercent: ptr[uint16](12), + GasTipCapBufferPercent: ptr[uint16](43), + BaseFeeBufferPercent: ptr[uint16](89), + MaxGracePeriod: ptr[int64](31), + TurnLookBack: ptr[int64](91), Registry: toml.KeeperRegistry{ CheckGasOverhead: ptr[uint32](90), PerformGasOverhead: ptr[uint32](math.MaxUint32), @@ -835,10 +826,6 @@ Host = 'tls-host' HTTPSPort = 6789 KeyPath = 'tls/key/path' ListenIP = '192.158.1.38' -`}, - {"FluxMonitor", Config{Core: toml.Core{FluxMonitor: full.FluxMonitor}}, `[FluxMonitor] -DefaultTransactionQueueDepth = 100 -SimulateTransactions = true `}, {"JobPipeline", Config{Core: toml.Core{JobPipeline: full.JobPipeline}}, `[JobPipeline] ExternalInitiatorsEnabled = true @@ -859,9 +846,7 @@ ObservationTimeout = '11s' BlockchainTimeout = '3s' ContractPollInterval = '1h0m0s' ContractSubscribeInterval = '1m0s' -DefaultTransactionQueueDepth = 12 KeyBundleID = 'acdd42797a8b921b2910497badc5000600000000000000000000000000000000' -SimulateTransactions = true TransmitterAddress = '0xa0788FC17B1dEe36f057c42B6F373A34B014687e' CaptureEATelemetry = false TraceLogging = false @@ -877,8 +862,6 @@ DatabaseTimeout = '8s' KeyBundleID = '7a5f66bbe6594259325bf2b4f5b1a9c900000000000000000000000000000000' CaptureEATelemetry = false CaptureAutomationCustomTelemetry = true -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false TraceLogging = false `}, {"P2P", Config{Core: toml.Core{P2P: full.P2P}}, `[P2P] @@ -896,7 +879,6 @@ DeltaReconcile = '1s' ListenAddresses = ['foo', 'bar'] `}, {"Keeper", Config{Core: toml.Core{Keeper: full.Keeper}}, `[Keeper] -DefaultTransactionQueueDepth = 17 GasPriceBufferPercent = 12 GasTipCapBufferPercent = 43 BaseFeeBufferPercent = 89 diff --git a/core/services/chainlink/testdata/config-empty-effective.toml b/core/services/chainlink/testdata/config-empty-effective.toml index f1b3ef56514..18c4e800361 100644 --- a/core/services/chainlink/testdata/config-empty-effective.toml +++ b/core/services/chainlink/testdata/config-empty-effective.toml @@ -122,10 +122,6 @@ VerboseLogging = true DefaultTimeout = '15s' MaxSize = '32.77kb' -[FluxMonitor] -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false - [OCR2] Enabled = false ContractConfirmations = 3 @@ -137,8 +133,6 @@ DatabaseTimeout = '10s' KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' CaptureEATelemetry = false CaptureAutomationCustomTelemetry = true -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false TraceLogging = false [OCR] @@ -147,9 +141,7 @@ ObservationTimeout = '5s' BlockchainTimeout = '20s' ContractPollInterval = '1m0s' ContractSubscribeInterval = '2m0s' -DefaultTransactionQueueDepth = 1 KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' -SimulateTransactions = false TransmitterAddress = '' CaptureEATelemetry = false TraceLogging = false @@ -169,7 +161,6 @@ DeltaReconcile = '1m0s' ListenAddresses = [] [Keeper] -DefaultTransactionQueueDepth = 1 GasPriceBufferPercent = 20 GasTipCapBufferPercent = 20 BaseFeeBufferPercent = 20 diff --git a/core/services/chainlink/testdata/config-full.toml b/core/services/chainlink/testdata/config-full.toml index 087a7e971fc..d329c0f7cfe 100644 --- a/core/services/chainlink/testdata/config-full.toml +++ b/core/services/chainlink/testdata/config-full.toml @@ -128,10 +128,6 @@ VerboseLogging = false DefaultTimeout = '1m0s' MaxSize = '100.00mb' -[FluxMonitor] -DefaultTransactionQueueDepth = 100 -SimulateTransactions = true - [OCR2] Enabled = true ContractConfirmations = 11 @@ -143,8 +139,6 @@ DatabaseTimeout = '8s' KeyBundleID = '7a5f66bbe6594259325bf2b4f5b1a9c900000000000000000000000000000000' CaptureEATelemetry = false CaptureAutomationCustomTelemetry = true -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false TraceLogging = false [OCR] @@ -153,9 +147,7 @@ ObservationTimeout = '11s' BlockchainTimeout = '3s' ContractPollInterval = '1h0m0s' ContractSubscribeInterval = '1m0s' -DefaultTransactionQueueDepth = 12 KeyBundleID = 'acdd42797a8b921b2910497badc5000600000000000000000000000000000000' -SimulateTransactions = true TransmitterAddress = '0xa0788FC17B1dEe36f057c42B6F373A34B014687e' CaptureEATelemetry = false TraceLogging = false @@ -175,7 +167,6 @@ DeltaReconcile = '1s' ListenAddresses = ['foo', 'bar'] [Keeper] -DefaultTransactionQueueDepth = 17 GasPriceBufferPercent = 12 GasTipCapBufferPercent = 43 BaseFeeBufferPercent = 89 diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml index 046ff28be22..e35bf0036e5 100644 --- a/core/services/chainlink/testdata/config-multi-chain-effective.toml +++ b/core/services/chainlink/testdata/config-multi-chain-effective.toml @@ -122,10 +122,6 @@ VerboseLogging = true DefaultTimeout = '30s' MaxSize = '32.77kb' -[FluxMonitor] -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false - [OCR2] Enabled = true ContractConfirmations = 3 @@ -137,8 +133,6 @@ DatabaseTimeout = '20s' KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' CaptureEATelemetry = false CaptureAutomationCustomTelemetry = true -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false TraceLogging = false [OCR] @@ -147,9 +141,7 @@ ObservationTimeout = '5s' BlockchainTimeout = '5s' ContractPollInterval = '1m0s' ContractSubscribeInterval = '2m0s' -DefaultTransactionQueueDepth = 1 KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' -SimulateTransactions = false TransmitterAddress = '' CaptureEATelemetry = false TraceLogging = false @@ -169,7 +161,6 @@ DeltaReconcile = '1m0s' ListenAddresses = [] [Keeper] -DefaultTransactionQueueDepth = 1 GasPriceBufferPercent = 10 GasTipCapBufferPercent = 20 BaseFeeBufferPercent = 20 diff --git a/core/services/fluxmonitorv2/config.go b/core/services/fluxmonitorv2/config.go index 585c3f3f329..86d5ea9367c 100644 --- a/core/services/fluxmonitorv2/config.go +++ b/core/services/fluxmonitorv2/config.go @@ -23,10 +23,6 @@ type EvmTransactionsConfig interface { MaxQueued() uint64 // Evm } -type FluxMonitorConfig interface { - DefaultTransactionQueueDepth() uint32 -} - type JobPipelineConfig interface { DefaultHTTPTimeout() commonconfig.Duration } diff --git a/core/services/fluxmonitorv2/delegate.go b/core/services/fluxmonitorv2/delegate.go index 1e2eba8d000..b436160330d 100644 --- a/core/services/fluxmonitorv2/delegate.go +++ b/core/services/fluxmonitorv2/delegate.go @@ -71,9 +71,9 @@ func (d *Delegate) ServicesForSpec(ctx context.Context, jb job.Job) (services [] return nil, err } cfg := chain.Config() - strategy := txmgrcommon.NewQueueingTxStrategy(jb.ExternalJobID, cfg.FluxMonitor().DefaultTransactionQueueDepth(), cfg.Database().DefaultQueryTimeout()) + strategy := txmgrcommon.NewQueueingTxStrategy(jb.ExternalJobID, cfg.EVM().DefaultTransactionQueueDepth(), cfg.Database().DefaultQueryTimeout()) var checker txmgr.TransmitCheckerSpec - if chain.Config().FluxMonitor().SimulateTransactions() { + if chain.Config().EVM().SimulateTransactions() { checker.CheckerType = txmgr.TransmitCheckerTypeSimulate } @@ -90,7 +90,6 @@ func (d *Delegate) ServicesForSpec(ctx context.Context, jb job.Job) (services [] chain.Config().EVM(), chain.Config().EVM().GasEstimator(), chain.Config().EVM().Transactions(), - chain.Config().FluxMonitor(), chain.Config().JobPipeline(), chain.Config().Database(), d.lggr, diff --git a/core/services/fluxmonitorv2/flux_monitor.go b/core/services/fluxmonitorv2/flux_monitor.go index 73034faa3ce..508627992df 100644 --- a/core/services/fluxmonitorv2/flux_monitor.go +++ b/core/services/fluxmonitorv2/flux_monitor.go @@ -160,7 +160,6 @@ func NewFromJobSpec( cfg Config, fcfg EvmFeeConfig, ecfg EvmTransactionsConfig, - fmcfg FluxMonitorConfig, jcfg JobPipelineConfig, dbCfg pg.QConfig, lggr logger.Logger, diff --git a/core/services/ocr/delegate.go b/core/services/ocr/delegate.go index bcdda397e20..2dd4636a178 100644 --- a/core/services/ocr/delegate.go +++ b/core/services/ocr/delegate.go @@ -199,10 +199,10 @@ func (d *Delegate) ServicesForSpec(ctx context.Context, jb job.Job) (services [] } cfg := chain.Config() - strategy := txmgrcommon.NewQueueingTxStrategy(jb.ExternalJobID, cfg.OCR().DefaultTransactionQueueDepth(), cfg.Database().DefaultQueryTimeout()) + strategy := txmgrcommon.NewQueueingTxStrategy(jb.ExternalJobID, cfg.EVM().DefaultTransactionQueueDepth(), cfg.Database().DefaultQueryTimeout()) var checker txmgr.TransmitCheckerSpec - if chain.Config().OCR().SimulateTransactions() { + if chain.Config().EVM().SimulateTransactions() { checker.CheckerType = txmgr.TransmitCheckerTypeSimulate } diff --git a/core/services/relay/evm/evm.go b/core/services/relay/evm/evm.go index ddddb82aaed..fe6ffc8b5bf 100644 --- a/core/services/relay/evm/evm.go +++ b/core/services/relay/evm/evm.go @@ -514,10 +514,10 @@ func newOnChainContractTransmitter(ctx context.Context, lggr logger.Logger, rarg subject = *opts.subjectID } scoped := configWatcher.chain.Config() - strategy := txmgrcommon.NewQueueingTxStrategy(subject, scoped.OCR2().DefaultTransactionQueueDepth(), scoped.Database().DefaultQueryTimeout()) + strategy := txmgrcommon.NewQueueingTxStrategy(subject, scoped.EVM().DefaultTransactionQueueDepth(), scoped.Database().DefaultQueryTimeout()) var checker txm.TransmitCheckerSpec - if configWatcher.chain.Config().OCR2().SimulateTransactions() { + if configWatcher.chain.Config().EVM().SimulateTransactions() { checker.CheckerType = txm.TransmitCheckerTypeSimulate } diff --git a/core/services/relay/evm/functions.go b/core/services/relay/evm/functions.go index da423c6d5fc..4b591b39b26 100644 --- a/core/services/relay/evm/functions.go +++ b/core/services/relay/evm/functions.go @@ -184,10 +184,10 @@ func newFunctionsContractTransmitter(ctx context.Context, contractVersion uint32 } scoped := configWatcher.chain.Config() - strategy := txmgrcommon.NewQueueingTxStrategy(rargs.ExternalJobID, scoped.OCR2().DefaultTransactionQueueDepth(), scoped.Database().DefaultQueryTimeout()) + strategy := txmgrcommon.NewQueueingTxStrategy(rargs.ExternalJobID, scoped.EVM().DefaultTransactionQueueDepth(), scoped.Database().DefaultQueryTimeout()) var checker txm.TransmitCheckerSpec - if configWatcher.chain.Config().OCR2().SimulateTransactions() { + if configWatcher.chain.Config().EVM().SimulateTransactions() { checker.CheckerType = txm.TransmitCheckerTypeSimulate } diff --git a/core/web/resolver/testdata/config-empty-effective.toml b/core/web/resolver/testdata/config-empty-effective.toml index f1b3ef56514..18c4e800361 100644 --- a/core/web/resolver/testdata/config-empty-effective.toml +++ b/core/web/resolver/testdata/config-empty-effective.toml @@ -122,10 +122,6 @@ VerboseLogging = true DefaultTimeout = '15s' MaxSize = '32.77kb' -[FluxMonitor] -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false - [OCR2] Enabled = false ContractConfirmations = 3 @@ -137,8 +133,6 @@ DatabaseTimeout = '10s' KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' CaptureEATelemetry = false CaptureAutomationCustomTelemetry = true -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false TraceLogging = false [OCR] @@ -147,9 +141,7 @@ ObservationTimeout = '5s' BlockchainTimeout = '20s' ContractPollInterval = '1m0s' ContractSubscribeInterval = '2m0s' -DefaultTransactionQueueDepth = 1 KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' -SimulateTransactions = false TransmitterAddress = '' CaptureEATelemetry = false TraceLogging = false @@ -169,7 +161,6 @@ DeltaReconcile = '1m0s' ListenAddresses = [] [Keeper] -DefaultTransactionQueueDepth = 1 GasPriceBufferPercent = 20 GasTipCapBufferPercent = 20 BaseFeeBufferPercent = 20 diff --git a/core/web/resolver/testdata/config-full.toml b/core/web/resolver/testdata/config-full.toml index 068931099ca..da84cd1a5e7 100644 --- a/core/web/resolver/testdata/config-full.toml +++ b/core/web/resolver/testdata/config-full.toml @@ -128,10 +128,6 @@ VerboseLogging = false DefaultTimeout = '1m0s' MaxSize = '100.00mb' -[FluxMonitor] -DefaultTransactionQueueDepth = 100 -SimulateTransactions = true - [OCR2] Enabled = true ContractConfirmations = 11 @@ -143,8 +139,6 @@ DatabaseTimeout = '8s' KeyBundleID = '7a5f66bbe6594259325bf2b4f5b1a9c900000000000000000000000000000000' CaptureEATelemetry = false CaptureAutomationCustomTelemetry = true -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false TraceLogging = false [OCR] @@ -153,9 +147,7 @@ ObservationTimeout = '11s' BlockchainTimeout = '3s' ContractPollInterval = '1h0m0s' ContractSubscribeInterval = '1m0s' -DefaultTransactionQueueDepth = 12 KeyBundleID = 'acdd42797a8b921b2910497badc5000600000000000000000000000000000000' -SimulateTransactions = true TransmitterAddress = '0xa0788FC17B1dEe36f057c42B6F373A34B014687e' CaptureEATelemetry = false TraceLogging = false @@ -175,7 +167,6 @@ DeltaReconcile = '1s' ListenAddresses = ['foo', 'bar'] [Keeper] -DefaultTransactionQueueDepth = 17 GasPriceBufferPercent = 12 GasTipCapBufferPercent = 43 BaseFeeBufferPercent = 89 diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml index 046ff28be22..e35bf0036e5 100644 --- a/core/web/resolver/testdata/config-multi-chain-effective.toml +++ b/core/web/resolver/testdata/config-multi-chain-effective.toml @@ -122,10 +122,6 @@ VerboseLogging = true DefaultTimeout = '30s' MaxSize = '32.77kb' -[FluxMonitor] -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false - [OCR2] Enabled = true ContractConfirmations = 3 @@ -137,8 +133,6 @@ DatabaseTimeout = '20s' KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' CaptureEATelemetry = false CaptureAutomationCustomTelemetry = true -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false TraceLogging = false [OCR] @@ -147,9 +141,7 @@ ObservationTimeout = '5s' BlockchainTimeout = '5s' ContractPollInterval = '1m0s' ContractSubscribeInterval = '2m0s' -DefaultTransactionQueueDepth = 1 KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' -SimulateTransactions = false TransmitterAddress = '' CaptureEATelemetry = false TraceLogging = false @@ -169,7 +161,6 @@ DeltaReconcile = '1m0s' ListenAddresses = [] [Keeper] -DefaultTransactionQueueDepth = 1 GasPriceBufferPercent = 10 GasTipCapBufferPercent = 20 BaseFeeBufferPercent = 20 diff --git a/docs/CONFIG.md b/docs/CONFIG.md index 84f60207b37..c92cb054fcf 100644 --- a/docs/CONFIG.md +++ b/docs/CONFIG.md @@ -854,27 +854,6 @@ MaxSize = '32768' # Default ``` MaxSize defines the maximum size for HTTP requests and responses made by `http` and `bridge` adapters. -## FluxMonitor -```toml -[FluxMonitor] -DefaultTransactionQueueDepth = 1 # Default -SimulateTransactions = false # Default -``` - - -### DefaultTransactionQueueDepth -:warning: **_ADVANCED_**: _Do not change this setting unless you know what you are doing._ -```toml -DefaultTransactionQueueDepth = 1 # Default -``` -DefaultTransactionQueueDepth controls the queue size for `DropOldestStrategy` in Flux Monitor. Set to 0 to use `SendEvery` strategy instead. - -### SimulateTransactions -```toml -SimulateTransactions = false # Default -``` -SimulateTransactions enables transaction simulation for Flux Monitor. - ## OCR2 ```toml [OCR2] @@ -888,8 +867,6 @@ DatabaseTimeout = '10s' # Default KeyBundleID = '7a5f66bbe6594259325bf2b4f5b1a9c900000000000000000000000000000000' # Example CaptureEATelemetry = false # Default CaptureAutomationCustomTelemetry = true # Default -DefaultTransactionQueueDepth = 1 # Default -SimulateTransactions = false # Default TraceLogging = false # Default ``` @@ -988,18 +965,6 @@ CaptureAutomationCustomTelemetry = true # Default ``` CaptureAutomationCustomTelemetry toggles collecting automation specific telemetry -### DefaultTransactionQueueDepth -```toml -DefaultTransactionQueueDepth = 1 # Default -``` -DefaultTransactionQueueDepth controls the queue size for `DropOldestStrategy` in OCR2. Set to 0 to use `SendEvery` strategy instead. - -### SimulateTransactions -```toml -SimulateTransactions = false # Default -``` -SimulateTransactions enables transaction simulation for OCR2. - ### TraceLogging ```toml TraceLogging = false # Default @@ -1014,9 +979,7 @@ ObservationTimeout = '5s' # Default BlockchainTimeout = '20s' # Default ContractPollInterval = '1m' # Default ContractSubscribeInterval = '2m' # Default -DefaultTransactionQueueDepth = 1 # Default KeyBundleID = 'acdd42797a8b921b2910497badc5000600000000000000000000000000000000' # Example -SimulateTransactions = false # Default TransmitterAddress = '0xa0788FC17B1dEe36f057c42B6F373A34B014687e' # Example CaptureEATelemetry = false # Default TraceLogging = false # Default @@ -1061,25 +1024,12 @@ ContractSubscribeInterval = '2m' # Default ContractSubscribeInterval is the interval at which we try to establish a subscription on ContractConfigTracker if one doesn't exist. Recommended values are between two and five minutes. -### DefaultTransactionQueueDepth -:warning: **_ADVANCED_**: _Do not change this setting unless you know what you are doing._ -```toml -DefaultTransactionQueueDepth = 1 # Default -``` -DefaultTransactionQueueDepth controls the queue size for `DropOldestStrategy` in OCR. Set to 0 to use `SendEvery` strategy instead. - ### KeyBundleID ```toml KeyBundleID = 'acdd42797a8b921b2910497badc5000600000000000000000000000000000000' # Example ``` KeyBundleID is the default key bundle ID to use for OCR jobs. If you have an OCR job that does not explicitly specify a key bundle ID, it will fall back to this value. -### SimulateTransactions -```toml -SimulateTransactions = false # Default -``` -SimulateTransactions enables transaction simulation for OCR. - ### TransmitterAddress ```toml TransmitterAddress = '0xa0788FC17B1dEe36f057c42B6F373A34B014687e' # Example @@ -1301,7 +1251,6 @@ but the host and port must be fully specified and cannot be empty. You can speci ## Keeper ```toml [Keeper] -DefaultTransactionQueueDepth = 1 # Default GasPriceBufferPercent = 20 # Default GasTipCapBufferPercent = 20 # Default BaseFeeBufferPercent = 20 # Default @@ -1310,13 +1259,6 @@ TurnLookBack = 1_000 # Default ``` -### DefaultTransactionQueueDepth -:warning: **_ADVANCED_**: _Do not change this setting unless you know what you are doing._ -```toml -DefaultTransactionQueueDepth = 1 # Default -``` -DefaultTransactionQueueDepth controls the queue size for `DropOldestStrategy` in Keeper. Set to 0 to use `SendEvery` strategy instead. - ### GasPriceBufferPercent :warning: **_ADVANCED_**: _Do not change this setting unless you know what you are doing._ ```toml @@ -1722,6 +1664,8 @@ NoNewHeadsThreshold = '3m0s' OperatorFactoryAddress = '0x3E64Cd889482443324F91bFA9c84fE72A511f48A' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -1807,6 +1751,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '3m0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -1892,6 +1838,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '3m0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -1977,6 +1925,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '3m0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -2063,6 +2013,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '40s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -2148,6 +2100,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '3m0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -2233,6 +2187,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '3m0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -2319,6 +2275,8 @@ NoNewHeadsThreshold = '3m0s' OperatorFactoryAddress = '0x8007e24251b1D2Fc518Eb843A701d9cD21fe0aA3' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -2404,6 +2362,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '30s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 2 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -2488,6 +2448,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '3m0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -2572,6 +2534,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '3m0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -2657,6 +2621,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '30s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 2 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -2743,6 +2709,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '3m0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -2828,6 +2796,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '30s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 2 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -2913,6 +2883,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '30s' RPCDefaultBatchSize = 100 RPCBlockQueryDelay = 10 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -2998,6 +2970,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '30s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 2 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -3083,6 +3057,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '40s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -3168,6 +3144,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '1m0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -3253,6 +3231,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '1m0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -3338,6 +3318,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '1m0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -3424,6 +3406,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '40s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -3509,6 +3493,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -3593,6 +3579,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '30s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -3678,6 +3666,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -3762,6 +3752,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '6m0s' RPCDefaultBatchSize = 100 RPCBlockQueryDelay = 15 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -3847,6 +3839,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '30s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -3932,6 +3926,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '30s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -4016,6 +4012,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -4100,6 +4098,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '12m0s' RPCDefaultBatchSize = 100 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -4185,6 +4185,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '40s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -4269,6 +4271,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '12m0s' RPCDefaultBatchSize = 100 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -4354,6 +4358,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 2 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -4438,6 +4444,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '30s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -4523,6 +4531,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '40s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -4608,6 +4618,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '3m0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -4694,6 +4706,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -4779,6 +4793,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '1m0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -4864,6 +4880,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '30s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 2 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -4949,6 +4967,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '30s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 2 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -5034,6 +5054,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '1m0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -5118,6 +5140,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -5202,6 +5226,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -5287,6 +5313,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '30s' RPCDefaultBatchSize = 100 RPCBlockQueryDelay = 10 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -5372,6 +5400,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '40s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -5457,6 +5487,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '40s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -5543,6 +5575,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -5629,6 +5663,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -5714,6 +5750,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -5799,6 +5837,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -5884,6 +5924,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -5969,6 +6011,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '3m0s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -6054,6 +6098,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '40s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -6139,6 +6185,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '30s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -6224,6 +6272,8 @@ NonceAutoSync = true NoNewHeadsThreshold = '30s' RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 +SimulateTransactions = false +DefaultTransactionQueueDepth = 1 [Transactions] ForwardersEnabled = false @@ -6463,6 +6513,18 @@ block, but it is possible to receive a head BEFORE that block is actually available from the connected node via RPC, due to race conditions in the code of the remote ETH node. In this case you will get false "zero" blocks that are missing transactions. +### DefaultTransactionQueueDepth +```toml +DefaultTransactionQueueDepth = 1 # Default +``` +DefaultTransactionQueueDepth controls the queue size for `DropOldestStrategy` in TXM. Set to 0 to use `SendEvery` strategy instead. + +### SimulateTransactions +```toml +SimulateTransactions = false # Default +``` +SimulateTransactions enables transaction simulation for TransmitChecker. + ## EVM.Transactions ```toml [EVM.Transactions] diff --git a/integration-tests/types/config/node/defaults/sample.toml b/integration-tests/types/config/node/defaults/sample.toml index b0e1bc2a07d..15b1dc5d8d2 100644 --- a/integration-tests/types/config/node/defaults/sample.toml +++ b/integration-tests/types/config/node/defaults/sample.toml @@ -7,11 +7,9 @@ MaxOpenConns = 50 [OCR2] Enabled = true -DefaultTransactionQueueDepth = 0 [OCR] Enabled = false -DefaultTransactionQueueDepth = 0 [P2P] [P2P.V2] diff --git a/testdata/scripts/node/validate/default.txtar b/testdata/scripts/node/validate/default.txtar index 15e0950d6f2..2b63797765f 100644 --- a/testdata/scripts/node/validate/default.txtar +++ b/testdata/scripts/node/validate/default.txtar @@ -134,10 +134,6 @@ VerboseLogging = true DefaultTimeout = '15s' MaxSize = '32.77kb' -[FluxMonitor] -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false - [OCR2] Enabled = false ContractConfirmations = 3 @@ -149,8 +145,6 @@ DatabaseTimeout = '10s' KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' CaptureEATelemetry = false CaptureAutomationCustomTelemetry = true -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false TraceLogging = false [OCR] @@ -159,9 +153,7 @@ ObservationTimeout = '5s' BlockchainTimeout = '20s' ContractPollInterval = '1m0s' ContractSubscribeInterval = '2m0s' -DefaultTransactionQueueDepth = 1 KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' -SimulateTransactions = false TransmitterAddress = '' CaptureEATelemetry = false TraceLogging = false @@ -181,7 +173,6 @@ DeltaReconcile = '1m0s' ListenAddresses = [] [Keeper] -DefaultTransactionQueueDepth = 1 GasPriceBufferPercent = 20 GasTipCapBufferPercent = 20 BaseFeeBufferPercent = 20 diff --git a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar index cb8fba9d59e..852e69e2219 100644 --- a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar +++ b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar @@ -178,10 +178,6 @@ VerboseLogging = true DefaultTimeout = '15s' MaxSize = '32.77kb' -[FluxMonitor] -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false - [OCR2] Enabled = false ContractConfirmations = 3 @@ -193,8 +189,6 @@ DatabaseTimeout = '10s' KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' CaptureEATelemetry = false CaptureAutomationCustomTelemetry = true -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false TraceLogging = false [OCR] @@ -203,9 +197,7 @@ ObservationTimeout = '5s' BlockchainTimeout = '20s' ContractPollInterval = '1m0s' ContractSubscribeInterval = '2m0s' -DefaultTransactionQueueDepth = 1 KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' -SimulateTransactions = false TransmitterAddress = '' CaptureEATelemetry = false TraceLogging = false @@ -225,7 +217,6 @@ DeltaReconcile = '1m0s' ListenAddresses = [] [Keeper] -DefaultTransactionQueueDepth = 1 GasPriceBufferPercent = 20 GasTipCapBufferPercent = 20 BaseFeeBufferPercent = 20 diff --git a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar index 2b9cc653d6d..3fb5c45c8a9 100644 --- a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar +++ b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar @@ -178,10 +178,6 @@ VerboseLogging = true DefaultTimeout = '15s' MaxSize = '32.77kb' -[FluxMonitor] -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false - [OCR2] Enabled = false ContractConfirmations = 3 @@ -193,8 +189,6 @@ DatabaseTimeout = '10s' KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' CaptureEATelemetry = false CaptureAutomationCustomTelemetry = true -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false TraceLogging = false [OCR] @@ -203,9 +197,7 @@ ObservationTimeout = '5s' BlockchainTimeout = '20s' ContractPollInterval = '1m0s' ContractSubscribeInterval = '2m0s' -DefaultTransactionQueueDepth = 1 KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' -SimulateTransactions = false TransmitterAddress = '' CaptureEATelemetry = false TraceLogging = false @@ -225,7 +217,6 @@ DeltaReconcile = '1m0s' ListenAddresses = [] [Keeper] -DefaultTransactionQueueDepth = 1 GasPriceBufferPercent = 20 GasTipCapBufferPercent = 20 BaseFeeBufferPercent = 20 diff --git a/testdata/scripts/node/validate/disk-based-logging.txtar b/testdata/scripts/node/validate/disk-based-logging.txtar index dc679ad7dbb..50920feb6d9 100644 --- a/testdata/scripts/node/validate/disk-based-logging.txtar +++ b/testdata/scripts/node/validate/disk-based-logging.txtar @@ -178,10 +178,6 @@ VerboseLogging = true DefaultTimeout = '15s' MaxSize = '32.77kb' -[FluxMonitor] -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false - [OCR2] Enabled = false ContractConfirmations = 3 @@ -193,8 +189,6 @@ DatabaseTimeout = '10s' KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' CaptureEATelemetry = false CaptureAutomationCustomTelemetry = true -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false TraceLogging = false [OCR] @@ -203,9 +197,7 @@ ObservationTimeout = '5s' BlockchainTimeout = '20s' ContractPollInterval = '1m0s' ContractSubscribeInterval = '2m0s' -DefaultTransactionQueueDepth = 1 KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' -SimulateTransactions = false TransmitterAddress = '' CaptureEATelemetry = false TraceLogging = false @@ -225,7 +217,6 @@ DeltaReconcile = '1m0s' ListenAddresses = [] [Keeper] -DefaultTransactionQueueDepth = 1 GasPriceBufferPercent = 20 GasTipCapBufferPercent = 20 BaseFeeBufferPercent = 20 diff --git a/testdata/scripts/node/validate/invalid-ocr-p2p.txtar b/testdata/scripts/node/validate/invalid-ocr-p2p.txtar index 7068c8b6f99..8ea704e06d3 100644 --- a/testdata/scripts/node/validate/invalid-ocr-p2p.txtar +++ b/testdata/scripts/node/validate/invalid-ocr-p2p.txtar @@ -163,10 +163,6 @@ VerboseLogging = true DefaultTimeout = '15s' MaxSize = '32.77kb' -[FluxMonitor] -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false - [OCR2] Enabled = true ContractConfirmations = 3 @@ -178,8 +174,6 @@ DatabaseTimeout = '10s' KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' CaptureEATelemetry = false CaptureAutomationCustomTelemetry = true -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false TraceLogging = false [OCR] @@ -188,9 +182,7 @@ ObservationTimeout = '5s' BlockchainTimeout = '20s' ContractPollInterval = '1m0s' ContractSubscribeInterval = '2m0s' -DefaultTransactionQueueDepth = 1 KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' -SimulateTransactions = false TransmitterAddress = '' CaptureEATelemetry = false TraceLogging = false @@ -210,7 +202,6 @@ DeltaReconcile = '1m0s' ListenAddresses = [] [Keeper] -DefaultTransactionQueueDepth = 1 GasPriceBufferPercent = 20 GasTipCapBufferPercent = 20 BaseFeeBufferPercent = 20 diff --git a/testdata/scripts/node/validate/invalid.txtar b/testdata/scripts/node/validate/invalid.txtar index 1631ac88cfb..c923744a56a 100644 --- a/testdata/scripts/node/validate/invalid.txtar +++ b/testdata/scripts/node/validate/invalid.txtar @@ -168,10 +168,6 @@ VerboseLogging = true DefaultTimeout = '15s' MaxSize = '32.77kb' -[FluxMonitor] -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false - [OCR2] Enabled = false ContractConfirmations = 3 @@ -183,8 +179,6 @@ DatabaseTimeout = '10s' KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' CaptureEATelemetry = false CaptureAutomationCustomTelemetry = true -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false TraceLogging = false [OCR] @@ -193,9 +187,7 @@ ObservationTimeout = '5s' BlockchainTimeout = '20s' ContractPollInterval = '1m0s' ContractSubscribeInterval = '2m0s' -DefaultTransactionQueueDepth = 1 KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' -SimulateTransactions = false TransmitterAddress = '' CaptureEATelemetry = false TraceLogging = false @@ -215,7 +207,6 @@ DeltaReconcile = '1m0s' ListenAddresses = [] [Keeper] -DefaultTransactionQueueDepth = 1 GasPriceBufferPercent = 20 GasTipCapBufferPercent = 20 BaseFeeBufferPercent = 20 diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar index 85ac9640363..44ba0639c98 100644 --- a/testdata/scripts/node/validate/valid.txtar +++ b/testdata/scripts/node/validate/valid.txtar @@ -175,10 +175,6 @@ VerboseLogging = true DefaultTimeout = '15s' MaxSize = '32.77kb' -[FluxMonitor] -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false - [OCR2] Enabled = false ContractConfirmations = 3 @@ -190,8 +186,6 @@ DatabaseTimeout = '10s' KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' CaptureEATelemetry = false CaptureAutomationCustomTelemetry = true -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false TraceLogging = false [OCR] @@ -200,9 +194,7 @@ ObservationTimeout = '5s' BlockchainTimeout = '20s' ContractPollInterval = '1m0s' ContractSubscribeInterval = '2m0s' -DefaultTransactionQueueDepth = 1 KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' -SimulateTransactions = false TransmitterAddress = '' CaptureEATelemetry = false TraceLogging = false @@ -222,7 +214,6 @@ DeltaReconcile = '1m0s' ListenAddresses = [] [Keeper] -DefaultTransactionQueueDepth = 1 GasPriceBufferPercent = 20 GasTipCapBufferPercent = 20 BaseFeeBufferPercent = 20 diff --git a/testdata/scripts/node/validate/warnings.txtar b/testdata/scripts/node/validate/warnings.txtar index f58217fff8b..4d364fe7f46 100644 --- a/testdata/scripts/node/validate/warnings.txtar +++ b/testdata/scripts/node/validate/warnings.txtar @@ -157,10 +157,6 @@ VerboseLogging = true DefaultTimeout = '15s' MaxSize = '32.77kb' -[FluxMonitor] -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false - [OCR2] Enabled = false ContractConfirmations = 3 @@ -172,8 +168,6 @@ DatabaseTimeout = '10s' KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' CaptureEATelemetry = false CaptureAutomationCustomTelemetry = true -DefaultTransactionQueueDepth = 1 -SimulateTransactions = false TraceLogging = false [OCR] @@ -182,9 +176,7 @@ ObservationTimeout = '5s' BlockchainTimeout = '20s' ContractPollInterval = '1m0s' ContractSubscribeInterval = '2m0s' -DefaultTransactionQueueDepth = 1 KeyBundleID = '0000000000000000000000000000000000000000000000000000000000000000' -SimulateTransactions = false TransmitterAddress = '' CaptureEATelemetry = false TraceLogging = false @@ -204,7 +196,6 @@ DeltaReconcile = '1m0s' ListenAddresses = [] [Keeper] -DefaultTransactionQueueDepth = 1 GasPriceBufferPercent = 20 GasTipCapBufferPercent = 20 BaseFeeBufferPercent = 20