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

update bumpThresholds for chains using suggestedPrice estimator #13078

Merged
merged 15 commits into from
May 15, 2024
Merged

update bumpThresholds for chains using suggestedPrice estimator #13078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6f8c180
update bumpThresholds for chains using suggestedPrice estimator
finleydecker May 2, 2024
8ea6fd9
added changeset
finleydecker May 2, 2024
9e65304
added changeset
finleydecker May 2, 2024
afb82ca
added tag to changeset
finleydecker May 2, 2024
f48193f
Merge branch 'develop' into fix-bump-threshold
prashantkumar1982 May 2, 2024
81fc11c
Merge branch 'develop' into fix-bump-threshold
finleydecker May 2, 2024
622ea0c
Merge branch 'develop' into fix-bump-threshold
prashantkumar1982 May 3, 2024
59d2a96
Merge branch 'develop' into fix-bump-threshold
prashantkumar1982 May 6, 2024
4eb84eb
Merge branch 'develop' into fix-bump-threshold
prashantkumar1982 May 7, 2024
dbd0561
Merge branch 'develop' into fix-bump-threshold
prashantkumar1982 May 7, 2024
7be92b0
Merge branch 'develop' into fix-bump-threshold
finleydecker May 10, 2024
a529368
updated config docs
finleydecker May 10, 2024
a0b2566
Merge branch 'develop' into fix-bump-threshold
prashantkumar1982 May 10, 2024
8bcb472
Merge branch 'develop' into fix-bump-threshold
finleydecker May 10, 2024
7733d28
Merge branch 'develop' into fix-bump-threshold
finleydecker May 15, 2024
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
5 changes: 5 additions & 0 deletions .changeset/silver-birds-wave.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

bumpThreshold config setting for chains using suggestPrice estimator #updated
3 changes: 1 addition & 2 deletions core/chains/evm/config/toml/defaults/Arbitrum_Goerli.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ PriceMin = '0'
PriceDefault = '0.1 gwei'
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
FeeCapDefault = '1000 gwei'
# Disable gas bumping on arbitrum
BumpThreshold = 0
BumpThreshold = 5

[GasEstimator.BlockHistory]
# Force an error if someone set GAS_UPDATER_ENABLED=true by accident; we never want to run the block history estimator on arbitrum
Expand Down
3 changes: 1 addition & 2 deletions core/chains/evm/config/toml/defaults/Arbitrum_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ PriceMin = '0'
PriceDefault = '0.1 gwei'
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
FeeCapDefault = '1000 gwei'
# Disable gas bumping on arbitrum
BumpThreshold = 0
BumpThreshold = 5

[GasEstimator.BlockHistory]
# Force an error if someone set GAS_UPDATER_ENABLED=true by accident; we never want to run the block history estimator on arbitrum
Expand Down
3 changes: 1 addition & 2 deletions core/chains/evm/config/toml/defaults/Arbitrum_Rinkeby.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ PriceMin = '0'
PriceDefault = '0.1 gwei'
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
FeeCapDefault = '1000 gwei'
# Disable gas bumping on arbitrum
BumpThreshold = 0
BumpThreshold = 5

[GasEstimator.BlockHistory]
# Force an error if someone set GAS_UPDATER_ENABLED=true by accident; we never want to run the block history estimator on arbitrum
Expand Down
3 changes: 1 addition & 2 deletions core/chains/evm/config/toml/defaults/Arbitrum_Sepolia.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ PriceMin = '0'
PriceDefault = '0.1 gwei'
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
FeeCapDefault = '1000 gwei'
# Disable gas bumping on arbitrum
BumpThreshold = 0
BumpThreshold = 5

[GasEstimator.BlockHistory]
# Force an error if someone set GAS_UPDATER_ENABLED=true by accident; we never want to run the block history estimator on arbitrum
Expand Down
2 changes: 1 addition & 1 deletion core/chains/evm/config/toml/defaults/Klaytn_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ OCR.ContractConfirmations = 1
[GasEstimator]
Mode = 'SuggestedPrice'
PriceDefault = '750 gwei' # gwei = ston
BumpThreshold = 0
BumpThreshold = 5
2 changes: 1 addition & 1 deletion core/chains/evm/config/toml/defaults/Klaytn_Testnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ OCR.ContractConfirmations = 1
[GasEstimator]
Mode = 'SuggestedPrice'
PriceDefault = '750 gwei' # gwei = ston
BumpThreshold = 0
BumpThreshold = 5
3 changes: 1 addition & 2 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,8 +11,7 @@ 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'
# Never bump gas on metis
BumpThreshold = 0
BumpThreshold = 3

[BalanceMonitor]
Enabled = true
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -11,7 +11,7 @@ Enabled = true
[GasEstimator]
Mode = 'SuggestedPrice'
PriceMin = '0'
BumpThreshold = 0
BumpThreshold = 3
Copy link
Contributor

Choose a reason for hiding this comment

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

The fallback BumpThresholed is already 3, so these overrides can be omitted.
https://github.com/smartcontractkit/chainlink/blob/develop/core/chains/evm/config/toml/defaults/fallback.toml#L40


[GasEstimator.BlockHistory]
BlockHistorySize = 0
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -11,7 +11,7 @@ Enabled = true
[GasEstimator]
Mode = 'SuggestedPrice'
PriceMin = '0'
BumpThreshold = 0
BumpThreshold = 3

[GasEstimator.BlockHistory]
BlockHistorySize = 0
Expand Down
2 changes: 0 additions & 2 deletions core/chains/evm/config/toml/defaults/Scroll_Mainnet.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ OCR.ContractConfirmations = 1
Mode = 'SuggestedPrice'
# Scroll uses the SuggestedPrice estimator; we don't want to place any limits on the minimum gas price
PriceMin = '0'
# Never bump gas on Scroll
BumpThreshold = 0

[GasEstimator.BlockHistory]
# Force an error if someone enables the estimator by accident; we never want to run the block history estimator on Scroll
Expand Down
2 changes: 0 additions & 2 deletions core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ OCR.ContractConfirmations = 1
Mode = 'SuggestedPrice'
# Scroll uses the SuggestedPrice estimator; we don't want to place any limits on the minimum gas price
PriceMin = '0'
# Never bump gas on Scroll
BumpThreshold = 0

[GasEstimator.BlockHistory]
# Force an error if someone enables the estimator by accident; we never want to run the block history estimator on Scroll
Expand Down
22 changes: 11 additions & 11 deletions docs/CONFIG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3729,7 +3729,7 @@ LimitMultiplier = '1'
LimitTransfer = 21000
BumpMin = '5 gwei'
BumpPercent = 20
BumpThreshold = 0
BumpThreshold = 3
EIP1559DynamicFees = false
FeeCapDefault = '100 gwei'
TipCapDefault = '1 wei'
Expand Down Expand Up @@ -3813,7 +3813,7 @@ LimitMultiplier = '1'
LimitTransfer = 21000
BumpMin = '5 gwei'
BumpPercent = 20
BumpThreshold = 0
BumpThreshold = 5
EIP1559DynamicFees = false
FeeCapDefault = '100 gwei'
TipCapDefault = '1 wei'
Expand Down Expand Up @@ -3898,7 +3898,7 @@ LimitMultiplier = '1'
LimitTransfer = 21000
BumpMin = '5 gwei'
BumpPercent = 20
BumpThreshold = 0
BumpThreshold = 3
EIP1559DynamicFees = false
FeeCapDefault = '100 gwei'
TipCapDefault = '1 wei'
Expand Down Expand Up @@ -4658,7 +4658,7 @@ LimitMultiplier = '1'
LimitTransfer = 21000
BumpMin = '5 gwei'
BumpPercent = 20
BumpThreshold = 0
BumpThreshold = 5
EIP1559DynamicFees = false
FeeCapDefault = '100 gwei'
TipCapDefault = '1 wei'
Expand Down Expand Up @@ -4914,7 +4914,7 @@ LimitMultiplier = '1'
LimitTransfer = 21000
BumpMin = '5 gwei'
BumpPercent = 20
BumpThreshold = 0
BumpThreshold = 5
EIP1559DynamicFees = false
FeeCapDefault = '1 micro'
TipCapDefault = '1 wei'
Expand Down Expand Up @@ -5591,7 +5591,7 @@ LimitMultiplier = '1'
LimitTransfer = 21000
BumpMin = '5 gwei'
BumpPercent = 20
BumpThreshold = 0
BumpThreshold = 3
EIP1559DynamicFees = false
FeeCapDefault = '100 gwei'
TipCapDefault = '1 wei'
Expand Down Expand Up @@ -6016,7 +6016,7 @@ LimitMultiplier = '1'
LimitTransfer = 21000
BumpMin = '5 gwei'
BumpPercent = 20
BumpThreshold = 0
BumpThreshold = 5
EIP1559DynamicFees = false
FeeCapDefault = '1 micro'
TipCapDefault = '1 wei'
Expand Down Expand Up @@ -6102,7 +6102,7 @@ LimitMultiplier = '1'
LimitTransfer = 21000
BumpMin = '5 gwei'
BumpPercent = 20
BumpThreshold = 0
BumpThreshold = 5
EIP1559DynamicFees = false
FeeCapDefault = '1 micro'
TipCapDefault = '1 wei'
Expand Down Expand Up @@ -6187,7 +6187,7 @@ LimitMultiplier = '1'
LimitTransfer = 21000
BumpMin = '5 gwei'
BumpPercent = 20
BumpThreshold = 0
BumpThreshold = 5
EIP1559DynamicFees = false
FeeCapDefault = '1 micro'
TipCapDefault = '1 wei'
Expand Down Expand Up @@ -6272,7 +6272,7 @@ LimitMultiplier = '1'
LimitTransfer = 21000
BumpMin = '5 gwei'
BumpPercent = 20
BumpThreshold = 0
BumpThreshold = 3
EIP1559DynamicFees = false
FeeCapDefault = '100 gwei'
TipCapDefault = '1 wei'
Expand Down Expand Up @@ -6357,7 +6357,7 @@ LimitMultiplier = '1'
LimitTransfer = 21000
BumpMin = '5 gwei'
BumpPercent = 20
BumpThreshold = 0
BumpThreshold = 3
EIP1559DynamicFees = false
FeeCapDefault = '100 gwei'
TipCapDefault = '1 wei'
Expand Down
Loading