From ffe8e512d1766213c20f458447aaf84ed58ccf3d Mon Sep 17 00:00:00 2001 From: Finley Decker Date: Wed, 6 Nov 2024 11:16:31 -1000 Subject: [PATCH] Update celo alfajores config (#1515) New config for Celo Alfajores now that it is an L2. --- ccip/config/evm/Celo_Testnet.toml | 32 ++++++++++++------- .../config/toml/defaults/Celo_Testnet.toml | 31 +++++++++++------- docs/CONFIG.md | 22 ++++++------- 3 files changed, 52 insertions(+), 33 deletions(-) diff --git a/ccip/config/evm/Celo_Testnet.toml b/ccip/config/evm/Celo_Testnet.toml index eb43f080b7..0e4594150d 100644 --- a/ccip/config/evm/Celo_Testnet.toml +++ b/ccip/config/evm/Celo_Testnet.toml @@ -1,20 +1,30 @@ ChainID = '44787' ChainType = 'celo' -FinalityDepth = 10 -LogPollInterval = '5s' -MinIncomingConfirmations = 1 +FinalityTagEnabled = true +FinalityDepth = 2750 # mean finality time of ~37 minutes + 500 block buffer +LogPollInterval = '1s' # 1 sec block rate NoNewHeadsThreshold = '1m' -OCR.ContractConfirmations = 1 -NoNewFinalizedHeadsThreshold = '1m' +MinIncomingConfirmations = 1 +NoNewFinalizedHeadsThreshold = '45m' # Set slightly higher than mean finality time [GasEstimator] -PriceDefault = '5 gwei' -PriceMax = '500 gwei' -PriceMin = '5 gwei' -BumpMin = '2 gwei' +EIP1559DynamicFees = true +PriceMin = '5 gwei' # Mean gas price around 5 gwei and celo txns are extremely cheap at ~0.00088 CELO per txn ($0.000058) +PriceMax = '1000 gwei' # DS&A recommendation [GasEstimator.BlockHistory] -BlockHistorySize = 24 +# Default is 8, which leads to bumpy gas prices. In CCIP +# we want to smooth out the gas prices, so we increase the sample size. +BlockHistorySize = 200 + +[Transactions] +ResendAfterThreshold = '30s' [HeadTracker] -HistoryDepth = 50 +HistoryDepth = 300 + +[NodePool] +SyncThreshold = 10 # recommended for OP stack chains + +[OCR] +ContractConfirmations = 1 # recommended for OP stack chains \ No newline at end of file diff --git a/core/chains/evm/config/toml/defaults/Celo_Testnet.toml b/core/chains/evm/config/toml/defaults/Celo_Testnet.toml index 55ee9fa930..c03d855acf 100644 --- a/core/chains/evm/config/toml/defaults/Celo_Testnet.toml +++ b/core/chains/evm/config/toml/defaults/Celo_Testnet.toml @@ -3,22 +3,31 @@ ChainType = 'celo' # FT and FD are both present here because the dev effort rely only on FinalityTagEnabled are still in progress. # We expect to be able to rely only on FinalityTagEnabled=true in the short future. # https://chainlink-core.slack.com/archives/C05CS33N08N/p1715102940763339?thread_ts=1715102478.537529&cid=C05CS33N08N -FinalityDepth = 10 FinalityTagEnabled = true -LogPollInterval = '5s' -MinIncomingConfirmations = 1 +FinalityDepth = 2750 # mean finality time of ~37 minutes + 500 block buffer +LogPollInterval = '1s' # 1 sec block rate NoNewHeadsThreshold = '1m' -OCR.ContractConfirmations = 1 -NoNewFinalizedHeadsThreshold = '1m' +MinIncomingConfirmations = 1 +NoNewFinalizedHeadsThreshold = '45m' # Set slightly higher than mean finality time [GasEstimator] -PriceDefault = '5 gwei' -PriceMax = '500 gwei' -PriceMin = '5 gwei' -BumpMin = '2 gwei' +EIP1559DynamicFees = true +PriceMin = '5 gwei' # Mean gas price around 5 gwei and celo txns are extremely cheap at ~0.00088 CELO per txn ($0.000058) +PriceMax = '1000 gwei' # DS&A recommendation [GasEstimator.BlockHistory] -BlockHistorySize = 24 +# Default is 8, which leads to bumpy gas prices. In CCIP +# we want to smooth out the gas prices, so we increase the sample size. +BlockHistorySize = 200 + +[Transactions] +ResendAfterThreshold = '30s' [HeadTracker] -HistoryDepth = 50 +HistoryDepth = 300 + +[NodePool] +SyncThreshold = 10 # recommended for OP stack chains + +[OCR] +ContractConfirmations = 1 # recommended for OP stack chains \ No newline at end of file diff --git a/docs/CONFIG.md b/docs/CONFIG.md index 53154468f7..0cd17fd90b 100644 --- a/docs/CONFIG.md +++ b/docs/CONFIG.md @@ -6915,10 +6915,10 @@ AutoCreateKey = true BlockBackfillDepth = 10 BlockBackfillSkip = false ChainType = 'celo' -FinalityDepth = 10 +FinalityDepth = 2750 FinalityTagEnabled = true LogBackfillBatchSize = 1000 -LogPollInterval = '5s' +LogPollInterval = '1s' LogKeepBlocksDepth = 100000 LogPrunePageSize = 10000 BackupLogPollerBlockDelay = 100 @@ -6930,7 +6930,7 @@ LogBroadcasterEnabled = true RPCDefaultBatchSize = 250 RPCBlockQueryDelay = 1 FinalizedBlockOffset = 0 -NoNewFinalizedHeadsThreshold = '1m0s' +NoNewFinalizedHeadsThreshold = '45m0s' [Transactions] ForwardersEnabled = false @@ -6938,7 +6938,7 @@ MaxInFlight = 16 MaxQueued = 250 ReaperInterval = '1h0m0s' ReaperThreshold = '168h0m0s' -ResendAfterThreshold = '1m0s' +ResendAfterThreshold = '30s' [Transactions.AutoPurge] Enabled = false @@ -6948,25 +6948,25 @@ Enabled = true [GasEstimator] Mode = 'BlockHistory' -PriceDefault = '5 gwei' -PriceMax = '500 gwei' +PriceDefault = '20 gwei' +PriceMax = '1 micro' PriceMin = '5 gwei' LimitDefault = 8000000 LimitMax = 8000000 LimitMultiplier = '1' LimitTransfer = 21000 EstimateLimit = false -BumpMin = '2 gwei' +BumpMin = '5 gwei' BumpPercent = 20 BumpThreshold = 3 -EIP1559DynamicFees = false +EIP1559DynamicFees = true FeeCapDefault = '100 gwei' TipCapDefault = '1 wei' TipCapMin = '1 wei' [GasEstimator.BlockHistory] BatchSize = 25 -BlockHistorySize = 24 +BlockHistorySize = 200 CheckInclusionBlocks = 12 CheckInclusionPercentile = 90 TransactionPercentile = 60 @@ -6975,7 +6975,7 @@ TransactionPercentile = 60 CacheTimeout = '10s' [HeadTracker] -HistoryDepth = 50 +HistoryDepth = 300 MaxBufferSize = 3 SamplingInterval = '1s' MaxAllowedFinalityDepth = 10000 @@ -6985,7 +6985,7 @@ FinalityTagBypass = true PollFailureThreshold = 5 PollInterval = '10s' SelectionMode = 'HighestHead' -SyncThreshold = 5 +SyncThreshold = 10 LeaseDuration = '0s' NodeIsSyncingEnabled = false FinalizedBlockPollInterval = '5s'