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.

Sign up for GitHub

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

core/chains/evm/config/toml/defaults: remove ineffectual overrides #13243

Merged
merged 1 commit into from
May 28, 2024
Merged

core/chains/evm/config/toml/defaults: remove ineffectual overrides #13243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion core/chains/evm/config/toml/defaults/Avalanche_Fuji.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ OCR.ContractConfirmations = 1
RPCBlockQueryDelay = 2

[GasEstimator]
Mode = 'BlockHistory'
PriceDefault = '25 gwei'
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
PriceMin = '25 gwei'
Expand Down
1 change: 0 additions & 1 deletion core/chains/evm/config/toml/defaults/Avalanche_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ OCR.ContractConfirmations = 1
RPCBlockQueryDelay = 2

[GasEstimator]
Mode = 'BlockHistory'
PriceDefault = '25 gwei'
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
PriceMin = '25 gwei'
Expand Down
13 changes: 0 additions & 13 deletions core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,19 @@
# Clique offers finality within (N/2)+1 blocks where N is number of signers
# There are 21 BSC validators so theoretically finality should occur after 21/2+1 = 11 blocks
ChainID = '56'
# Keeping this >> 11 because it's not expensive and gives us a safety margin
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe this comment ought to remain, to show why we chose to go with eth's depth for BSC too?

FinalityDepth = 50
LinkContractAddress = '0x404460C6A5EdE2D891e8297795264fDe62ADBB75'
LogPollInterval = '3s'
MinIncomingConfirmations = 3
NoNewHeadsThreshold = '30s'
RPCBlockQueryDelay = 2
Transactions.ResendAfterThreshold = '1m'

[BalanceMonitor]
Enabled = true

[GasEstimator]
PriceDefault = '5 gwei'
PriceMin = '1 gwei'
BumpMin = '5 gwei'
# 15s delay since feeds update every minute in volatile situations
BumpThreshold = 5

[GasEstimator.BlockHistory]
BlockHistorySize = 24

[HeadTracker]
HistoryDepth = 100
SamplingInterval = '1s'

[OCR]
DatabaseTimeout = '2s'
ContractTransmitterTransmitTimeout = '2s'
Expand Down
13 changes: 0 additions & 13 deletions core/chains/evm/config/toml/defaults/BSC_Testnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,19 @@
# Clique offers finality within (N/2)+1 blocks where N is number of signers
# There are 21 BSC validators so theoretically finality should occur after 21/2+1 = 11 blocks
ChainID = '97'
# Keeping this >> 11 because it's not expensive and gives us a safety margin
FinalityDepth = 50
LinkContractAddress = '0x84b9B910527Ad5C03A9Ca831909E21e236EA7b06'
LogPollInterval = '3s'
MinIncomingConfirmations = 3
NoNewHeadsThreshold = '30s'
RPCBlockQueryDelay = 2
Transactions.ResendAfterThreshold = '1m'

[BalanceMonitor]
Enabled = true

[GasEstimator]
PriceDefault = '5 gwei'
PriceMin = '1 gwei'
BumpMin = '5 gwei'
# 15s delay since feeds update every minute in volatile situations
BumpThreshold = 5

[GasEstimator.BlockHistory]
BlockHistorySize = 24

[HeadTracker]
HistoryDepth = 100
SamplingInterval = '1s'

[OCR]
DatabaseTimeout = '2s'
ContractTransmitterTransmitTimeout = '2s'
Expand Down
1 change: 0 additions & 1 deletion core/chains/evm/config/toml/defaults/Ethereum_Goerli.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ MinContractPayment = '0.1 link'
EIP1559DynamicFees = true

[GasEstimator.BlockHistory]
BatchSize = 25
BlockHistorySize = 4
TransactionPercentile = 50
1 change: 0 additions & 1 deletion core/chains/evm/config/toml/defaults/Ethereum_Kovan.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ OperatorFactoryAddress = '0x8007e24251b1D2Fc518Eb843A701d9cD21fe0aA3'
EIP1559DynamicFees = false

[GasEstimator.BlockHistory]
BatchSize = 25
BlockHistorySize = 4
TransactionPercentile = 50
1 change: 0 additions & 1 deletion core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ OperatorFactoryAddress = '0x3E64Cd889482443324F91bFA9c84fE72A511f48A'
EIP1559DynamicFees = true

[GasEstimator.BlockHistory]
BatchSize = 25
# EIP-1559 does well on a smaller block history size
BlockHistorySize = 4
TransactionPercentile = 50
Expand Down
1 change: 0 additions & 1 deletion core/chains/evm/config/toml/defaults/Ethereum_Rinkeby.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ MinContractPayment = '0.1 link'
EIP1559DynamicFees = false

[GasEstimator.BlockHistory]
BatchSize = 25
BlockHistorySize = 4
TransactionPercentile = 50
1 change: 0 additions & 1 deletion core/chains/evm/config/toml/defaults/Ethereum_Ropsten.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ MinContractPayment = '0.1 link'
EIP1559DynamicFees = true

[GasEstimator.BlockHistory]
BatchSize = 25
BlockHistorySize = 4
TransactionPercentile = 50
1 change: 0 additions & 1 deletion core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ MinContractPayment = '0.1 link'
EIP1559DynamicFees = true

[GasEstimator.BlockHistory]
BatchSize = 25
BlockHistorySize = 4
TransactionPercentile = 50

Expand Down
4 changes: 0 additions & 4 deletions core/chains/evm/config/toml/defaults/Fantom_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
ChainID = '250'
LinkContractAddress = '0x6F43FF82CCA38001B6699a8AC47A2d0E66939407'
LogPollInterval = '1s'
MinIncomingConfirmations = 3
NoNewHeadsThreshold = '30s'
RPCBlockQueryDelay = 2

[BalanceMonitor]
Enabled = true

[GasEstimator]
# Fantom network has been slow to include txs at times when using the BlockHistory estimator, and the recommendation is to use SuggestedPrice mode.
Mode = 'SuggestedPrice'
Expand Down
1 change: 0 additions & 1 deletion core/chains/evm/config/toml/defaults/Fantom_Testnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
ChainID = '4002'
LinkContractAddress = '0xfaFedb041c0DD4fA2Dc0d87a6B0979Ee6FA7af5F'
LogPollInterval = '1s'
MinIncomingConfirmations = 3
# Fantom testnet only emits blocks when a new tx is received, so this method of liveness detection is not useful
NoNewHeadsThreshold = '0'
RPCBlockQueryDelay = 2
Expand Down
2 changes: 0 additions & 2 deletions core/chains/evm/config/toml/defaults/Gnosis_Chiado.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@ LogPollInterval = '5s'
[GasEstimator]
EIP1559DynamicFees = true
PriceMax = '500 gwei'
# 15s delay since feeds update every minute in volatile situations
BumpThreshold = 3
2 changes: 0 additions & 2 deletions core/chains/evm/config/toml/defaults/Gnosis_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,3 @@ PriceDefault = '1 gwei'
PriceMax = '500 gwei'
# 1 Gwei is the minimum accepted by the validators (unless whitelisted)
jmank88 marked this conversation as resolved.
Show resolved Hide resolved
PriceMin = '1 gwei'
# 15s delay since feeds update every minute in volatile situations
BumpThreshold = 3
13 changes: 0 additions & 13 deletions core/chains/evm/config/toml/defaults/Heco_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,17 @@
# Heco uses BSC's settings.
ChainID = '128'
FinalityDepth = 50
LinkContractAddress = '0x404460C6A5EdE2D891e8297795264fDe62ADBB75'
LogPollInterval = '3s'
MinIncomingConfirmations = 3
NoNewHeadsThreshold = '30s'
RPCBlockQueryDelay = 2
Transactions.ResendAfterThreshold = '1m'


[BalanceMonitor]
Enabled = true

[GasEstimator]
PriceDefault = '5 gwei'
PriceMin = '1 gwei'
BumpMin = '5 gwei'
BumpThreshold = 5

[GasEstimator.BlockHistory]
BlockHistorySize = 24

[HeadTracker]
HistoryDepth = 100
SamplingInterval = '1s'

[OCR]
DatabaseTimeout = '2s'
ContractTransmitterTransmitTimeout = '2s'
Expand Down
4 changes: 0 additions & 4 deletions core/chains/evm/config/toml/defaults/Metis_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ OCR.ContractConfirmations = 1
Mode = 'SuggestedPrice'
# Metis uses the SuggestedPrice estimator; we don't want to place any limits on the minimum gas price
PriceMin = '0'
BumpThreshold = 3

[BalanceMonitor]
Enabled = true

[GasEstimator.BlockHistory]
# Force an error if someone enables the estimator by accident; we never want to run the block history estimator on metisaa
Expand Down
4 changes: 0 additions & 4 deletions core/chains/evm/config/toml/defaults/Metis_Rinkeby.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@ MinIncomingConfirmations = 1
NoNewHeadsThreshold = '0'
OCR.ContractConfirmations = 1

[BalanceMonitor]
Enabled = true

[GasEstimator]
Mode = 'SuggestedPrice'
PriceMin = '0'
BumpThreshold = 3

[GasEstimator.BlockHistory]
BlockHistorySize = 0
Expand Down
4 changes: 0 additions & 4 deletions core/chains/evm/config/toml/defaults/Metis_Sepolia.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@ MinIncomingConfirmations = 1
NoNewHeadsThreshold = '0'
OCR.ContractConfirmations = 1

[BalanceMonitor]
Enabled = true

[GasEstimator]
Mode = 'SuggestedPrice'
PriceMin = '0'
BumpThreshold = 3

[GasEstimator.BlockHistory]
BlockHistorySize = 0
Expand Down
6 changes: 0 additions & 6 deletions core/chains/evm/config/toml/defaults/Polygon_Amoy.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,11 @@ RPCBlockQueryDelay = 10
RPCDefaultBatchSize = 100

[Transactions]
ResendAfterThreshold = '1m'
MaxQueued = 5000

[BalanceMonitor]
Enabled = true

[GasEstimator]
EIP1559DynamicFees = true
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
PriceMin = '1 gwei'
BumpMin = '20 gwei'
BumpThreshold = 5

Expand All @@ -25,7 +20,6 @@ BlockHistorySize = 24

[HeadTracker]
HistoryDepth = 2000
SamplingInterval = '1s'

[NodePool]
SyncThreshold = 10
5 changes: 0 additions & 5 deletions core/chains/evm/config/toml/defaults/Polygon_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,9 @@ RPCDefaultBatchSize = 100

[Transactions]
# Matic nodes under high mempool pressure are liable to drop txes, we need to ensure we keep sending them
ResendAfterThreshold = '1m'
# Since re-orgs on Polygon can be so large, we need a large safety buffer to allow time for the queue to clear down before we start dropping transactions
MaxQueued = 5000

[BalanceMonitor]
Enabled = true

[GasEstimator]
# Many Polygon RPC providers set a minimum of 30 GWei on mainnet to prevent spam
PriceDefault = '30 gwei'
Expand All @@ -35,7 +31,6 @@ BlockHistorySize = 24
[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
SamplingInterval = '1s'

[NodePool]
SyncThreshold = 10
6 changes: 0 additions & 6 deletions core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,11 @@ RPCBlockQueryDelay = 10
RPCDefaultBatchSize = 100

[Transactions]
ResendAfterThreshold = '1m'
MaxQueued = 5000

[BalanceMonitor]
Enabled = true

[GasEstimator]
PriceDefault = '1 gwei'
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
PriceMin = '1 gwei'
BumpMin = '20 gwei'
BumpThreshold = 5

Expand All @@ -26,7 +21,6 @@ BlockHistorySize = 24

[HeadTracker]
HistoryDepth = 2000
SamplingInterval = '1s'

[NodePool]
SyncThreshold = 10
3 changes: 0 additions & 3 deletions core/chains/evm/config/toml/defaults/Simulated.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ NoNewHeadsThreshold = '0s'
ReaperThreshold = '0s'
ResendAfterThreshold = '0s'

[BalanceMonitor]
Enabled = true

[GasEstimator]
Mode = 'FixedPrice'
PriceMin = '0'
Expand Down
Loading