Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: update config #1387

Open
wants to merge 7 commits into
base: ccip-develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions core/chains/evm/config/toml/defaults/Linea_Mainnet.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
ChainID = '59144'
# Block time 12s, finality < 60m
FinalityDepth = 300
# Blocks are only emitted when a transaction happens / no empty blocks
NoNewHeadsThreshold = '0'
FinalityTagEnabled = false
FinalityDepth = 600 #3s block time ~ 20m finality based on committee decision
NoNewHeadsThreshold = '0' #No empty blocks

[GasEstimator]
BumpPercent = 40
PriceMin = '400 mwei'
[HeadTracker]
HistoryDepth = 1000

[Transactions]
# increase resend time to align with finality
ResendAfterThreshold = '3m'
ResendAfterThreshold = '30s'

# set greater than finality depth
[HeadTracker]
HistoryDepth = 350
[GasEstimator]
BumpPercent = 10
BumpThreshold = 10
EIP1559DynamicFees = true
FeeCapDefault = '2500 gwei'
TipCapDefault = '5 gwei'
TipCapMin = '1 gwei'
Comment on lines +17 to +18
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need such high tip? This was set for testnet as it fluctuates a lot more.
Shall we have the DS&A values here instead?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also same comment for other mainnets as well

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes what are the DS&A values again?

LimitDefault = 8000000

[GasEstimator.BlockHistory]
BlockHistorySize = 200
CheckInclusionBlocks = 0 #required for AutoPurge zkoverflow replacement

[Transactions.AutoPurge]
Enabled = true
Threshold = 50 # 50 blocks at 3s block time ~2.5 minutes
MinAttempts = 3
29 changes: 22 additions & 7 deletions core/chains/evm/config/toml/defaults/Linea_Sepolia.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
ChainID = '59141'
FinalityDepth = 900
NoNewHeadsThreshold = '0'
FinalityTagEnabled = false
FinalityDepth = 600 #3s block time ~ 20m finality based on committee decision
NoNewHeadsThreshold = '0' #No empty blocks

[HeadTracker]
HistoryDepth = 1000

[Transactions]
ResendAfterThreshold = '30s'

[GasEstimator]
BumpPercent = 10
BumpThreshold = 10
EIP1559DynamicFees = true
PriceMin = '1 wei'
FeeCapDefault = '2500 gwei'
TipCapDefault = '5 gwei'
TipCapMin = '1 gwei'
LimitDefault = 8000000

[Transactions]
ResendAfterThreshold = '3m'
[GasEstimator.BlockHistory]
BlockHistorySize = 200
CheckInclusionBlocks = 0 #required for AutoPurge zkoverflow replacement

[HeadTracker]
HistoryDepth = 1000
[Transactions.AutoPurge]
Enabled = true
Threshold = 50 # 50 blocks at 3s block time ~2.5 minutes
MinAttempts = 3
18 changes: 15 additions & 3 deletions core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,29 @@
ChainID = '2442'
ChainType = 'zkevm'
FinalityDepth = 500
NoNewHeadsThreshold = '12m'
MinIncomingConfirmations = 1
FinalityTagEnabled = true
FinalityDepth = 1000
# checks how long to wait before after receiving "NoHeads" & marking RPC out of sync.
# This chain in the past have had inconsistent block rate
# average block rate of zkEVM based on past data
LogPollInterval = '30s'
# some concerns that subscription gave Heads much earlier than the RPC polling so
# setting this to 15
RPCBlockQueryDelay = 15
# node configured default batch size.
# ref: https://github.com/smartcontractkit/chainlink/pull/11962
RPCDefaultBatchSize = 100

[OCR]
ContractConfirmations = 1

[Transactions]
# chain in the past have had inconsistent block rate
ResendAfterThreshold = '3m'

[Transactions.AutoPurge]
Enabled = true
MinAttempts = 3

[GasEstimator]
Mode = 'FeeHistory'
# The FeeHistory estimator does not enforce PriceMin, setting it to 0 to not place any limits on the price
Expand Down
20 changes: 15 additions & 5 deletions core/chains/evm/config/toml/defaults/Polygon_Zkevm_Mainnet.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,29 @@
ChainID = '1101'
ChainType = 'zkevm'
FinalityDepth = 500
NoNewHeadsThreshold = '6m'
MinIncomingConfirmations = 1
FinalityTagEnabled = true
FinalityDepth = 1000
# checks how long to wait before after receiving "NoHeads" & marking RPC out of sync.
# This chain in the past have had inconsistent block rate
# average block rate of zkEVM based on past data
LogPollInterval = '30s'
# some concerns that subscription gave Heads much earlier than the RPC polling so
# setting this to 15
RPCBlockQueryDelay = 15
# node configured default batch size.
# ref: https://github.com/smartcontractkit/chainlink/pull/11962
RPCDefaultBatchSize = 100

[OCR]
ContractConfirmations = 1

[Transactions]
# chain in the past have had inconsistent block rate
ResendAfterThreshold = '3m'

[Transactions.AutoPurge]
Enabled = true
MinAttempts = 3

[GasEstimator]
Mode = 'FeeHistory'
# The FeeHistory estimator does not enforce PriceMin, setting it to 0 to not place any limits on the price
Expand All @@ -24,5 +35,4 @@ BumpPercent = 40
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
HistoryDepth = 2000
21 changes: 16 additions & 5 deletions core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,26 @@ MinIncomingConfirmations = 1
NoNewHeadsThreshold = '0'

[GasEstimator]
# BumpThreshold can be removed from here when core enables bumping for Scroll.
BumpThreshold = 3
LimitDefault = 8000000
EIP1559DynamicFees = true
PriceMin = '1 wei'
BumpMin = '1 gwei'
FeeCapDefault = '1000 gwei'
TipCapDefault = '5 gwei'
TipCapMin = '1 gwei'

[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

# Scroll has avg finality time of 1 hour and 3 sec/block block rate.
[HeadTracker]
HistoryDepth = 50
HistoryDepth = 1200

[Transactions.AutoPurge]
Enabled = true
DetectionApiUrl = 'https://venus.scroll.io'

[OCR]
ContractConfirmations = 1
ContractConfirmations = 1
21 changes: 16 additions & 5 deletions core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,26 @@ MinIncomingConfirmations = 1
NoNewHeadsThreshold = '0'

[GasEstimator]
# BumpThreshold can be removed from here when core enables bumping for Scroll.
BumpThreshold = 3
LimitDefault = 8000000
EIP1559DynamicFees = true
PriceMin = '1 wei'
BumpMin = '1 gwei'
FeeCapDefault = '1000 gwei'
TipCapDefault = '5 gwei'
TipCapMin = '1 gwei'

[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

# Scroll has avg finality time of 1 hour and 3 sec/block block rate.
[HeadTracker]
HistoryDepth = 50
HistoryDepth = 1200

[Transactions.AutoPurge]
Enabled = true
DetectionApiUrl = 'https://sepolia-venus.scroll.io'

[OCR]
ContractConfirmations = 1
ContractConfirmations = 1
25 changes: 0 additions & 25 deletions core/chains/evm/config/toml/defaults/XLayer_Mainnet.toml

This file was deleted.

25 changes: 0 additions & 25 deletions core/chains/evm/config/toml/defaults/XLayer_Sepolia.toml

This file was deleted.

Loading
Loading