Skip to content

Bump EVM and introduce Meter() #23726

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

Merged
mostlyconsistent merged 6 commits into from
Sep 15, 2026
Merged

Bump EVM and introduce Meter() #23726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f4b4e9a
Bump EVM and introduce Meter()
mostlyconsistent Sep 11, 2026
920efff
missing gosums
mostlyconsistent Sep 14, 2026
6054988
more mod changes
mostlyconsistent Sep 14, 2026
258c92f
missing gomods
mostlyconsistent Sep 15, 2026
c457e90
fix plugins yaml
mostlyconsistent Sep 15, 2026
485f092
Fix golden tests
mostlyconsistent Sep 15, 2026
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
6 changes: 0 additions & 6 deletions core/config/docs/chains-evm.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,6 @@ DR = 100_000 # Example
VRF = 100_000 # Example
# FM overrides LimitDefault for Flux Monitor jobs.
FM = 100_000 # Example
# Keeper overrides LimitDefault for Keeper jobs.
Keeper = 100_000 # Example


# These settings allow you to configure how your node calculates gas prices when using the block history estimator.
Expand Down Expand Up @@ -587,10 +585,6 @@ Order = 100 # Default
# If false and its the only node in the nodes list, we will mark it alive even when its out of sync, because it might still be able to send txs.
IsLoadBalancedRPC = false # Default

[EVM.OCR2.Automation]
# GasLimit controls the gas limit for transmit transactions from ocr2automation job.
GasLimit = 5400000 # Default

[EVM.Workflow]
# FromAddress is Address of the transmitter key to use for workflow writes.
FromAddress = '0x2a3e23c6f242F5345320814aC8a1b4E58707D292' # Example
Expand Down
5 changes: 2 additions & 3 deletions core/scripts/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ require (
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260910195529-801eb99e80b2
github.com/smartcontractkit/chainlink-common/keystore v1.3.0
github.com/smartcontractkit/chainlink-deployments-framework v0.122.2
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260810110946-8174b6bb7fc9
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260914143713-424babc506ab
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260713161920-de075095648b
github.com/smartcontractkit/chainlink-protos/job-distributor v0.20.1-0.20260701185448-696c075849ea
github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.8
Expand Down Expand Up @@ -513,7 +513,6 @@ require (
github.com/smartcontractkit/ccip-owner-contracts v0.2.1 // indirect
github.com/smartcontractkit/chainlink-aptos v0.0.0-20260828090428-9828cc37ebc2 // indirect
github.com/smartcontractkit/chainlink-aptos/codec v0.0.0-20260716230027-bd85997bc03c // indirect
github.com/smartcontractkit/chainlink-automation v0.8.1 // indirect
github.com/smartcontractkit/chainlink-canton/contracts/v2 v2.0.0 // indirect
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260908155618-50f521d70e62 // indirect
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260908155618-50f521d70e62 // indirect
Expand Down Expand Up @@ -596,7 +595,7 @@ require (
github.com/transparency-dev/merkle v0.0.2 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
github.com/ugorji/go/codec v1.3.1 // indirect
github.com/ugorji/go/codec v1.3.2 // indirect
github.com/ulule/limiter/v3 v3.11.2 // indirect
github.com/unrolled/secure v1.13.0 // indirect
github.com/urfave/cli/v2 v2.27.7 // indirect
Expand Down
6 changes: 2 additions & 4 deletions core/scripts/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions core/services/chainlink/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,9 @@ func NewApplication(ctx context.Context, opts ApplicationOpts) (Application, err
FeatureConfig: cfg.Feature(),
MailMon: mailMon,
DS: opts.DS,
// The global beholder client is initialized before this point
// (initGlobals, during BeforeNode), so chains get a real meter.
Meter: beholder.GetMeter(),
},
EthKeystore: keyStore.Eth(),
CSAKeystore: csaKeystore,
Expand Down
11 changes: 0 additions & 11 deletions core/services/chainlink/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,6 @@ func TestConfig_Marshal(t *testing.T) {
DR: new(uint32(1002)),
VRF: new(uint32(1003)),
FM: new(uint32(1004)),
Keeper: new(uint32(1005)),
OCR2: new(uint32(1006)),
},

Expand Down Expand Up @@ -819,11 +818,6 @@ func TestConfig_Marshal(t *testing.T) {
DeltaCJitterOverride: commoncfg.MustNewDuration(time.Second),
ObservationGracePeriod: &second,
},
OCR2: evmcfg.OCR2{
Automation: evmcfg.Automation{
GasLimit: new(uint32(540)),
},
},
Workflow: evmcfg.Workflow{
GasLimitDefault: new(uint64(400000)),
TxAcceptanceState: new(commontypes.Unconfirmed),
Expand Down Expand Up @@ -1193,7 +1187,6 @@ OCR2 = 1006
DR = 1002
VRF = 1003
FM = 1004
Keeper = 1005

[EVM.GasEstimator.BlockHistory]
BatchSize = 17
Expand Down Expand Up @@ -1265,10 +1258,6 @@ DeltaCOverride = '1h0m0s'
DeltaCJitterOverride = '1s'
ObservationGracePeriod = '1s'

[EVM.OCR2]
[EVM.OCR2.Automation]
GasLimit = 540

[EVM.Workflow]
GasLimitDefault = 400000
TxAcceptanceState = 2
Expand Down
5 changes: 0 additions & 5 deletions core/services/chainlink/testdata/config-full.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,6 @@ OCR2 = 1006
DR = 1002
VRF = 1003
FM = 1004
Keeper = 1005

[EVM.GasEstimator.BlockHistory]
BatchSize = 17
Expand Down Expand Up @@ -630,10 +629,6 @@ DeltaCOverride = '1h0m0s'
DeltaCJitterOverride = '1s'
ObservationGracePeriod = '1s'

[EVM.OCR2]
[EVM.OCR2.Automation]
GasLimit = 540

[EVM.Workflow]
GasLimitDefault = 400000
TxAcceptanceState = 2
Expand Down
12 changes: 0 additions & 12 deletions core/services/chainlink/testdata/config-multi-chain-effective.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,10 +554,6 @@ DeltaCOverride = '168h0m0s'
DeltaCJitterOverride = '1h0m0s'
ObservationGracePeriod = '1s'

[EVM.OCR2]
[EVM.OCR2.Automation]
GasLimit = 10500000

[EVM.Workflow]
GasLimitDefault = 400000
TxAcceptanceState = 2
Expand Down Expand Up @@ -682,10 +678,6 @@ DeltaCOverride = '168h0m0s'
DeltaCJitterOverride = '1h0m0s'
ObservationGracePeriod = '1s'

[EVM.OCR2]
[EVM.OCR2.Automation]
GasLimit = 5400000

[EVM.Workflow]
GasLimitDefault = 400000
TxAcceptanceState = 2
Expand Down Expand Up @@ -806,10 +798,6 @@ DeltaCOverride = '168h0m0s'
DeltaCJitterOverride = '1h0m0s'
ObservationGracePeriod = '1s'

[EVM.OCR2]
[EVM.OCR2.Automation]
GasLimit = 5400000

[EVM.Workflow]
GasLimitDefault = 400000
TxAcceptanceState = 2
Expand Down
5 changes: 0 additions & 5 deletions core/web/resolver/testdata/config-full.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,6 @@ OCR = 1001
DR = 1002
VRF = 1003
FM = 1004
Keeper = 1005

[EVM.GasEstimator.BlockHistory]
BatchSize = 17
Expand Down Expand Up @@ -606,10 +605,6 @@ DeltaCOverride = '1h0m0s'
DeltaCJitterOverride = '1s'
ObservationGracePeriod = '1s'

[EVM.OCR2]
[EVM.OCR2.Automation]
GasLimit = 540

[EVM.Workflow]
GasLimitDefault = 400000
TxAcceptanceState = 2
Expand Down
12 changes: 0 additions & 12 deletions core/web/resolver/testdata/config-multi-chain-effective.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,10 +554,6 @@ DeltaCOverride = '168h0m0s'
DeltaCJitterOverride = '1h0m0s'
ObservationGracePeriod = '1s'

[EVM.OCR2]
[EVM.OCR2.Automation]
GasLimit = 10500000

[EVM.Workflow]
GasLimitDefault = 400000
TxAcceptanceState = 2
Expand Down Expand Up @@ -682,10 +678,6 @@ DeltaCOverride = '168h0m0s'
DeltaCJitterOverride = '1h0m0s'
ObservationGracePeriod = '1s'

[EVM.OCR2]
[EVM.OCR2.Automation]
GasLimit = 5400000

[EVM.Workflow]
GasLimitDefault = 400000
TxAcceptanceState = 2
Expand Down Expand Up @@ -806,10 +798,6 @@ DeltaCOverride = '168h0m0s'
DeltaCJitterOverride = '1h0m0s'
ObservationGracePeriod = '1s'

[EVM.OCR2]
[EVM.OCR2.Automation]
GasLimit = 5400000

[EVM.Workflow]
GasLimitDefault = 400000
TxAcceptanceState = 2
Expand Down
4 changes: 0 additions & 4 deletions core/web/resolver/testdata/config-multi-chain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ SafeDepth = 0
FinalityTagEnabled = true
FinalizedBlockOffset = 0

[EVM.OCR2]
[EVM.OCR2.Automation]
GasLimit = 10500000

[[EVM.Nodes]]
Name = 'primary'
WSURL = 'wss://web.socket/mainnet'
Expand Down
5 changes: 2 additions & 3 deletions deployment/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ require (
github.com/smartcontractkit/chainlink-common/keystore v1.3.0
github.com/smartcontractkit/chainlink-data-streams v1.1.1
github.com/smartcontractkit/chainlink-deployments-framework v0.122.2
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260810110946-8174b6bb7fc9
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260914143713-424babc506ab
github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260713161920-de075095648b
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260804200254-c1accce563a8
Expand Down Expand Up @@ -435,7 +435,6 @@ require (
github.com/shopspring/decimal v1.4.0 // indirect
github.com/sigurn/crc16 v0.0.0-20211026045750-20ab5afb07e3 // indirect
github.com/sirupsen/logrus v1.9.4 // indirect
github.com/smartcontractkit/chainlink-automation v0.8.1 // indirect
github.com/smartcontractkit/chainlink-canton/contracts/v2 v2.0.0 // indirect
github.com/smartcontractkit/chainlink-ccv v0.9.1 // indirect
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260724142814-45996a1bcb72 // indirect
Expand Down Expand Up @@ -490,7 +489,7 @@ require (
github.com/tklauser/numcpus v0.12.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
github.com/ugorji/go/codec v1.3.1 // indirect
github.com/ugorji/go/codec v1.3.2 // indirect
github.com/urfave/cli/v2 v2.27.7 // indirect
github.com/valyala/fastjson v1.6.10 // indirect
github.com/vektah/gqlparser/v2 v2.5.19 // indirect
Expand Down
6 changes: 2 additions & 4 deletions deployment/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading