From df0b06ee1ce28a8a7977bd3c9bdd8c9c307bef79 Mon Sep 17 00:00:00 2001 From: Kodey Thomas Date: Wed, 3 Jul 2024 11:44:28 +0100 Subject: [PATCH] [SHIP-2208] Enable EIP-1559 Transactions on Scroll (#13687) * Enable EIP-1559 Transactions on Scroll * docs * Update to 1 gwei bump min * Update BlockHistorySize * docs * Reduce BlockHistorySize --- .changeset/curly-zebras-agree.md | 5 ++++ .../config/toml/defaults/Scroll_Mainnet.toml | 16 ++++++----- .../config/toml/defaults/Scroll_Sepolia.toml | 16 ++++++----- .../evm/gas/block_history_estimator_test.go | 9 ++++++ core/chains/evm/gas/chain_specific.go | 2 +- docs/CONFIG.md | 28 +++++++++---------- 6 files changed, 47 insertions(+), 29 deletions(-) create mode 100644 .changeset/curly-zebras-agree.md diff --git a/.changeset/curly-zebras-agree.md b/.changeset/curly-zebras-agree.md new file mode 100644 index 00000000000..a57b379d2a3 --- /dev/null +++ b/.changeset/curly-zebras-agree.md @@ -0,0 +1,5 @@ +--- +"chainlink": patch +--- + +#added support for EIP-1559 transactions for Scroll diff --git a/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml b/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml index 47895e6a6d5..4a887b504df 100644 --- a/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml @@ -1,20 +1,22 @@ ChainID = '534352' FinalityDepth = 10 +FinalityTagEnabled = true ChainType = 'scroll' -LogPollInterval = '3s' +LogPollInterval = '5s' MinIncomingConfirmations = 1 # Scroll only emits blocks when a new tx is received, so this method of liveness detection is not useful NoNewHeadsThreshold = '0' -OCR.ContractConfirmations = 1 [GasEstimator] -Mode = 'SuggestedPrice' -# Scroll uses the SuggestedPrice estimator; we don't want to place any limits on the minimum gas price -PriceMin = '0' +EIP1559DynamicFees = true +PriceMin = '1 wei' +BumpMin = '1 gwei' [GasEstimator.BlockHistory] -# Force an error if someone enables the estimator by accident; we never want to run the block history estimator on Scroll -BlockHistorySize = 0 +BlockHistorySize = 24 [HeadTracker] HistoryDepth = 50 + +[OCR] +ContractConfirmations = 1 diff --git a/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml b/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml index d2626a86bd4..b2e1cfbd733 100644 --- a/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml @@ -1,20 +1,22 @@ ChainID = '534351' FinalityDepth = 10 +FinalityTagEnabled = true ChainType = 'scroll' -LogPollInterval = '3s' +LogPollInterval = '5s' MinIncomingConfirmations = 1 # Scroll only emits blocks when a new tx is received, so this method of liveness detection is not useful NoNewHeadsThreshold = '0' -OCR.ContractConfirmations = 1 [GasEstimator] -Mode = 'SuggestedPrice' -# Scroll uses the SuggestedPrice estimator; we don't want to place any limits on the minimum gas price -PriceMin = '0' +EIP1559DynamicFees = true +PriceMin = '1 wei' +BumpMin = '1 gwei' [GasEstimator.BlockHistory] -# Force an error if someone enables the estimator by accident; we never want to run the block history estimator on Scroll -BlockHistorySize = 0 +BlockHistorySize = 24 [HeadTracker] HistoryDepth = 50 + +[OCR] +ContractConfirmations = 1 diff --git a/core/chains/evm/gas/block_history_estimator_test.go b/core/chains/evm/gas/block_history_estimator_test.go index 714d82aa8c6..c2f4a2219cb 100644 --- a/core/chains/evm/gas/block_history_estimator_test.go +++ b/core/chains/evm/gas/block_history_estimator_test.go @@ -1506,6 +1506,15 @@ func TestBlockHistoryEstimator_IsUsable(t *testing.T) { cfg.ChainTypeF = "" assert.Equal(t, true, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t))) }) + + t.Run("returns false if transaction is of type 0x7e only on Scroll", func(t *testing.T) { + cfg.ChainTypeF = string(chaintype.ChainScroll) + tx := evmtypes.Transaction{Type: 0x7e, GasPrice: assets.NewWeiI(10), GasLimit: 42, Hash: utils.NewHash()} + assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t))) + + cfg.ChainTypeF = "" + assert.Equal(t, true, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t))) + }) } func TestBlockHistoryEstimator_EffectiveTipCap(t *testing.T) { diff --git a/core/chains/evm/gas/chain_specific.go b/core/chains/evm/gas/chain_specific.go index fba2eda66a0..4be7d1972f8 100644 --- a/core/chains/evm/gas/chain_specific.go +++ b/core/chains/evm/gas/chain_specific.go @@ -19,7 +19,7 @@ func chainSpecificIsUsable(tx evmtypes.Transaction, baseFee *assets.Wei, chainTy return false } } - if chainType == chaintype.ChainOptimismBedrock || chainType == chaintype.ChainKroma { + if chainType == chaintype.ChainOptimismBedrock || chainType == chaintype.ChainKroma || chainType == chaintype.ChainScroll { // This is a special deposit transaction type introduced in Bedrock upgrade. // This is a system transaction that it will occur at least one time per block. // We should discard this type before even processing it to avoid flooding the diff --git a/docs/CONFIG.md b/docs/CONFIG.md index c35d90211a8..9e10615a010 100644 --- a/docs/CONFIG.md +++ b/docs/CONFIG.md @@ -6691,9 +6691,9 @@ BlockBackfillDepth = 10 BlockBackfillSkip = false ChainType = 'scroll' FinalityDepth = 10 -FinalityTagEnabled = false +FinalityTagEnabled = true LogBackfillBatchSize = 1000 -LogPollInterval = '3s' +LogPollInterval = '5s' LogKeepBlocksDepth = 100000 LogPrunePageSize = 0 BackupLogPollerBlockDelay = 100 @@ -6720,25 +6720,25 @@ Enabled = false Enabled = true [GasEstimator] -Mode = 'SuggestedPrice' +Mode = 'BlockHistory' PriceDefault = '20 gwei' PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether' -PriceMin = '0' +PriceMin = '1 wei' LimitDefault = 500000 LimitMax = 500000 LimitMultiplier = '1' LimitTransfer = 21000 -BumpMin = '5 gwei' +BumpMin = '1 gwei' BumpPercent = 20 BumpThreshold = 3 -EIP1559DynamicFees = false +EIP1559DynamicFees = true FeeCapDefault = '100 gwei' TipCapDefault = '1 wei' TipCapMin = '1 wei' [GasEstimator.BlockHistory] BatchSize = 25 -BlockHistorySize = 0 +BlockHistorySize = 24 CheckInclusionBlocks = 12 CheckInclusionPercentile = 90 TransactionPercentile = 60 @@ -6784,9 +6784,9 @@ BlockBackfillDepth = 10 BlockBackfillSkip = false ChainType = 'scroll' FinalityDepth = 10 -FinalityTagEnabled = false +FinalityTagEnabled = true LogBackfillBatchSize = 1000 -LogPollInterval = '3s' +LogPollInterval = '5s' LogKeepBlocksDepth = 100000 LogPrunePageSize = 0 BackupLogPollerBlockDelay = 100 @@ -6813,25 +6813,25 @@ Enabled = false Enabled = true [GasEstimator] -Mode = 'SuggestedPrice' +Mode = 'BlockHistory' PriceDefault = '20 gwei' PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether' -PriceMin = '0' +PriceMin = '1 wei' LimitDefault = 500000 LimitMax = 500000 LimitMultiplier = '1' LimitTransfer = 21000 -BumpMin = '5 gwei' +BumpMin = '1 gwei' BumpPercent = 20 BumpThreshold = 3 -EIP1559DynamicFees = false +EIP1559DynamicFees = true FeeCapDefault = '100 gwei' TipCapDefault = '1 wei' TipCapMin = '1 wei' [GasEstimator.BlockHistory] BatchSize = 25 -BlockHistorySize = 0 +BlockHistorySize = 24 CheckInclusionBlocks = 12 CheckInclusionPercentile = 90 TransactionPercentile = 60