From 4653d0961528f2cf34fe090a4b40e1aeda837df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Friedemann=20F=C3=BCrst?= <59653747+friedemannf@users.noreply.github.com> Date: Mon, 18 Nov 2024 22:02:10 +0100 Subject: [PATCH] Enable AutoPurge feature on all affected chains (#1524) ## Motivation Same as https://github.com/smartcontractkit/chainlink/pull/15157 ## Solution --- .../config/toml/defaults/Linea_Mainnet.toml | 5 ++++ .../config/toml/defaults/Linea_Sepolia.toml | 7 ++++- .../toml/defaults/Polygon_Zkevm_Cardona.toml | 4 +++ .../toml/defaults/Polygon_Zkevm_Mainnet.toml | 4 +++ .../config/toml/defaults/Scroll_Mainnet.toml | 4 +++ .../config/toml/defaults/Scroll_Sepolia.toml | 4 +++ .../config/toml/defaults/XLayer_Mainnet.toml | 4 +++ .../config/toml/defaults/XLayer_Sepolia.toml | 4 +++ .../config/toml/defaults/Zircuit_Mainnet.toml | 2 +- .../config/toml/defaults/Zircuit_Sepolia.toml | 2 +- docs/CONFIG.md | 26 +++++++++++++------ 11 files changed, 55 insertions(+), 11 deletions(-) diff --git a/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml b/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml index 97570a0d21..54fedca215 100644 --- a/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Linea_Mainnet.toml @@ -15,3 +15,8 @@ ResendAfterThreshold = '3m' # set greater than finality depth [HeadTracker] HistoryDepth = 350 + +[Transactions.AutoPurge] +Enabled = true +Threshold = 50 # 50 blocks at 3s block time ~2.5 minutes +MinAttempts = 3 diff --git a/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml b/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml index af70f7ceba..4397b19c77 100644 --- a/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/Linea_Sepolia.toml @@ -10,4 +10,9 @@ PriceMin = '1 wei' ResendAfterThreshold = '3m' [HeadTracker] -HistoryDepth = 1000 \ No newline at end of file +HistoryDepth = 1000 + +[Transactions.AutoPurge] +Enabled = true +Threshold = 50 # 50 blocks at 3s block time ~2.5 minutes +MinAttempts = 3 diff --git a/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml index 46ce80e29f..5e5bc57370 100644 --- a/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml +++ b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml @@ -24,3 +24,7 @@ CacheTimeout = '4s' [HeadTracker] HistoryDepth = 2000 + +[Transactions.AutoPurge] +Enabled = true +MinAttempts = 3 diff --git a/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Mainnet.toml b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Mainnet.toml index 7402d54835..d42ef9b057 100644 --- a/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Mainnet.toml @@ -26,3 +26,7 @@ CacheTimeout = '4s' [HeadTracker] # Polygon suffers from a tremendous number of re-orgs, we need to set this to something very large to be conservative enough HistoryDepth = 2000 + +[Transactions.AutoPurge] +Enabled = true +MinAttempts = 3 diff --git a/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml b/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml index 4a887b504d..b8e7bd09e8 100644 --- a/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml @@ -20,3 +20,7 @@ HistoryDepth = 50 [OCR] ContractConfirmations = 1 + +[Transactions.AutoPurge] +Enabled = true +DetectionApiUrl = 'https://venus.scroll.io' diff --git a/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml b/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml index b2e1cfbd73..baee2080d9 100644 --- a/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml @@ -20,3 +20,7 @@ HistoryDepth = 50 [OCR] ContractConfirmations = 1 + +[Transactions.AutoPurge] +Enabled = true +DetectionApiUrl = 'https://sepolia-venus.scroll.io' diff --git a/core/chains/evm/config/toml/defaults/XLayer_Mainnet.toml b/core/chains/evm/config/toml/defaults/XLayer_Mainnet.toml index 426c0204e9..28f7819276 100644 --- a/core/chains/evm/config/toml/defaults/XLayer_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/XLayer_Mainnet.toml @@ -23,3 +23,7 @@ BlockHistorySize = 12 [HeadTracker] HistoryDepth = 2000 + +[Transactions.AutoPurge] +Enabled = true +MinAttempts = 3 diff --git a/core/chains/evm/config/toml/defaults/XLayer_Sepolia.toml b/core/chains/evm/config/toml/defaults/XLayer_Sepolia.toml index 62e2c1e8ad..2aa6e58469 100644 --- a/core/chains/evm/config/toml/defaults/XLayer_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/XLayer_Sepolia.toml @@ -23,3 +23,7 @@ BlockHistorySize = 12 [HeadTracker] HistoryDepth = 2000 + +[Transactions.AutoPurge] +Enabled = true +MinAttempts = 3 diff --git a/core/chains/evm/config/toml/defaults/Zircuit_Mainnet.toml b/core/chains/evm/config/toml/defaults/Zircuit_Mainnet.toml index ec336d3efe..9ec1dd0d6a 100644 --- a/core/chains/evm/config/toml/defaults/Zircuit_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Zircuit_Mainnet.toml @@ -33,4 +33,4 @@ GasLimit = 6500000 [Transactions.AutoPurge] Enabled = true Threshold = 90 # 90 blocks at 2s block time ~3 minutes -MinAttempts = 3 \ No newline at end of file +MinAttempts = 3 diff --git a/core/chains/evm/config/toml/defaults/Zircuit_Sepolia.toml b/core/chains/evm/config/toml/defaults/Zircuit_Sepolia.toml index d6934d533d..d439d98162 100644 --- a/core/chains/evm/config/toml/defaults/Zircuit_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/Zircuit_Sepolia.toml @@ -33,4 +33,4 @@ GasLimit = 6500000 [Transactions.AutoPurge] Enabled = true Threshold = 90 # 90 blocks at 2s block time ~3 minutes -MinAttempts = 3 \ No newline at end of file +MinAttempts = 3 diff --git a/docs/CONFIG.md b/docs/CONFIG.md index e700d94a14..0dca7763d4 100644 --- a/docs/CONFIG.md +++ b/docs/CONFIG.md @@ -3640,7 +3640,8 @@ ReaperThreshold = '168h0m0s' ResendAfterThreshold = '3m0s' [Transactions.AutoPurge] -Enabled = false +Enabled = true +MinAttempts = 3 [BalanceMonitor] Enabled = true @@ -3743,7 +3744,8 @@ ReaperThreshold = '168h0m0s' ResendAfterThreshold = '3m0s' [Transactions.AutoPurge] -Enabled = false +Enabled = true +MinAttempts = 3 [BalanceMonitor] Enabled = true @@ -5186,7 +5188,8 @@ ReaperThreshold = '168h0m0s' ResendAfterThreshold = '3m0s' [Transactions.AutoPurge] -Enabled = false +Enabled = true +MinAttempts = 3 [BalanceMonitor] Enabled = true @@ -6216,7 +6219,8 @@ ReaperThreshold = '168h0m0s' ResendAfterThreshold = '3m0s' [Transactions.AutoPurge] -Enabled = false +Enabled = true +MinAttempts = 3 [BalanceMonitor] Enabled = true @@ -8078,7 +8082,9 @@ ReaperThreshold = '168h0m0s' ResendAfterThreshold = '3m0s' [Transactions.AutoPurge] -Enabled = false +Enabled = true +Threshold = 50 +MinAttempts = 3 [BalanceMonitor] Enabled = true @@ -8180,7 +8186,9 @@ ReaperThreshold = '168h0m0s' ResendAfterThreshold = '3m0s' [Transactions.AutoPurge] -Enabled = false +Enabled = true +Threshold = 50 +MinAttempts = 3 [BalanceMonitor] Enabled = true @@ -9522,7 +9530,8 @@ ReaperThreshold = '168h0m0s' ResendAfterThreshold = '1m0s' [Transactions.AutoPurge] -Enabled = false +Enabled = true +DetectionApiUrl = 'https://sepolia-venus.scroll.io' [BalanceMonitor] Enabled = true @@ -9625,7 +9634,8 @@ ReaperThreshold = '168h0m0s' ResendAfterThreshold = '1m0s' [Transactions.AutoPurge] -Enabled = false +Enabled = true +DetectionApiUrl = 'https://venus.scroll.io' [BalanceMonitor] Enabled = true