Skip to content

Commit

Permalink
Merge pull request #16615 from smartcontractkit/cherrypick-a3c81570
Browse files Browse the repository at this point in the history
Cherry Pick - Bump version and update CHANGELOG for core v2.21.0
  • Loading branch information
Bwest981 authored Feb 27, 2025
2 parents 3954db5 + f78892a commit a0e61bb
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 17 deletions.
2 changes: 1 addition & 1 deletion core/scripts/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ require (
github.com/smartcontractkit/chainlink-automation v0.8.1
github.com/smartcontractkit/chainlink-common v0.4.2-0.20250205141137-8f50d72601bb
github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250128203428-08031923fbe5
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250227012921-08252fd61672
github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.22
github.com/smartcontractkit/libocr v0.0.0-20241223215956-e5b78d8e3919
github.com/spf13/cobra v1.8.1
Expand Down
4 changes: 2 additions & 2 deletions core/scripts/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1127,8 +1127,8 @@ github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250207205350-420
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250207205350-420ccacab78a/go.mod h1:tHem58EihQh63kR2LlAOKDAs9Vbghf1dJKZRGy6LG8g=
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250211162441-3d6cea220efb h1:LWijSyJ2lhppkFLN19EGsLHZXQ5wen2DEk1cyR0tV+o=
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250211162441-3d6cea220efb/go.mod h1:4JqpgFy01LaqG1yM2iFTzwX3ZgcAvW9WdstBZQgPHzU=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4 h1:CKZiyp/5U9Y+PCBknwy1KmiqZwn6T3coJXGSHmEDgRc=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4/go.mod h1:UAWEMU4mLuxvr86sN8XFMtFRjkuYQnr+d6iGIbNC36s=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250227012921-08252fd61672 h1:BfoSgTdYXkz4Ke2QneANdwphaAzpSNY6M4JU6YqfAfg=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250227012921-08252fd61672/go.mod h1:7DbPnG0E39eZaX1CXKxRiJ1NOWHwTZYDWR9ys3kZZuU=
github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0 h1:0ewLMbAz3rZrovdRUCgd028yOXX8KigB4FndAUdI2kM=
github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0 h1:ZBat8EBvE2LpSQR9U1gEbRV6PfAkiFdINmQ8nVnXIAQ=
Expand Down
2 changes: 1 addition & 1 deletion deployment/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ require (
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250211204327-6aca485891a7
github.com/smartcontractkit/chainlink-common v0.4.2-0.20250205141137-8f50d72601bb
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250211162441-3d6cea220efb
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250227012921-08252fd61672
github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250211201734-3ea6680f8db5
github.com/smartcontractkit/chainlink-testing-framework/framework v0.4.7
Expand Down
4 changes: 2 additions & 2 deletions deployment/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1124,8 +1124,8 @@ github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250207205350-420
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250207205350-420ccacab78a/go.mod h1:tHem58EihQh63kR2LlAOKDAs9Vbghf1dJKZRGy6LG8g=
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250211162441-3d6cea220efb h1:LWijSyJ2lhppkFLN19EGsLHZXQ5wen2DEk1cyR0tV+o=
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250211162441-3d6cea220efb/go.mod h1:4JqpgFy01LaqG1yM2iFTzwX3ZgcAvW9WdstBZQgPHzU=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4 h1:CKZiyp/5U9Y+PCBknwy1KmiqZwn6T3coJXGSHmEDgRc=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4/go.mod h1:UAWEMU4mLuxvr86sN8XFMtFRjkuYQnr+d6iGIbNC36s=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250227012921-08252fd61672 h1:BfoSgTdYXkz4Ke2QneANdwphaAzpSNY6M4JU6YqfAfg=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250227012921-08252fd61672/go.mod h1:7DbPnG0E39eZaX1CXKxRiJ1NOWHwTZYDWR9ys3kZZuU=
github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0 h1:0ewLMbAz3rZrovdRUCgd028yOXX8KigB4FndAUdI2kM=
github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0 h1:ZBat8EBvE2LpSQR9U1gEbRV6PfAkiFdINmQ8nVnXIAQ=
Expand Down
12 changes: 10 additions & 2 deletions docs/CONFIG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5476,7 +5476,7 @@ ObservationGracePeriod = '1s'

[OCR2]
[OCR2.Automation]
GasLimit = 6000000
GasLimit = 11000000

[Workflow]
GasLimitDefault = 400000
Expand Down Expand Up @@ -5588,7 +5588,7 @@ ObservationGracePeriod = '1s'

[OCR2]
[OCR2.Automation]
GasLimit = 6000000
GasLimit = 11000000

[Workflow]
GasLimitDefault = 400000
Expand Down Expand Up @@ -6330,6 +6330,10 @@ TransactionPercentile = 60
[GasEstimator.FeeHistory]
CacheTimeout = '10s'

[GasEstimator.DAOracle]
OracleType = 'opstack'
OracleAddress = '0x420000000000000000000000000000000000000F'

[HeadTracker]
HistoryDepth = 100
MaxBufferSize = 3
Expand Down Expand Up @@ -11070,6 +11074,10 @@ TransactionPercentile = 60
[GasEstimator.FeeHistory]
CacheTimeout = '10s'

[GasEstimator.DAOracle]
OracleType = 'opstack'
OracleAddress = '0x420000000000000000000000000000000000000F'

[HeadTracker]
HistoryDepth = 100
MaxBufferSize = 3
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ require (
github.com/smartcontractkit/chainlink-feeds v0.1.1
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250207205350-420ccacab78a
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250211162441-3d6cea220efb
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250227012921-08252fd61672
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250211201734-3ea6680f8db5
github.com/smartcontractkit/libocr v0.0.0-20241223215956-e5b78d8e3919
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1024,8 +1024,8 @@ github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250207205350-420
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250207205350-420ccacab78a/go.mod h1:tHem58EihQh63kR2LlAOKDAs9Vbghf1dJKZRGy6LG8g=
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250211162441-3d6cea220efb h1:LWijSyJ2lhppkFLN19EGsLHZXQ5wen2DEk1cyR0tV+o=
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250211162441-3d6cea220efb/go.mod h1:4JqpgFy01LaqG1yM2iFTzwX3ZgcAvW9WdstBZQgPHzU=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4 h1:CKZiyp/5U9Y+PCBknwy1KmiqZwn6T3coJXGSHmEDgRc=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4/go.mod h1:UAWEMU4mLuxvr86sN8XFMtFRjkuYQnr+d6iGIbNC36s=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250227012921-08252fd61672 h1:BfoSgTdYXkz4Ke2QneANdwphaAzpSNY6M4JU6YqfAfg=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250227012921-08252fd61672/go.mod h1:7DbPnG0E39eZaX1CXKxRiJ1NOWHwTZYDWR9ys3kZZuU=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0 h1:ZBat8EBvE2LpSQR9U1gEbRV6PfAkiFdINmQ8nVnXIAQ=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0/go.mod h1:m/A3lqD7ms/RsQ9BT5P2uceYY0QX5mIt4KQxT2G6qEo=
github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 h1:L6KJ4kGv/yNNoCk8affk7Y1vAY0qglPMXC/hevV/IsA=
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ require (
github.com/smartcontractkit/chainlink-automation v0.8.1
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250212131315-e9b53b05b02a
github.com/smartcontractkit/chainlink-common v0.4.2-0.20250205141137-8f50d72601bb
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250227012921-08252fd61672
github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0
github.com/smartcontractkit/chainlink-testing-framework/framework v0.4.7
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1374,8 +1374,8 @@ github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250207205350-420
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250207205350-420ccacab78a/go.mod h1:tHem58EihQh63kR2LlAOKDAs9Vbghf1dJKZRGy6LG8g=
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250211162441-3d6cea220efb h1:LWijSyJ2lhppkFLN19EGsLHZXQ5wen2DEk1cyR0tV+o=
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250211162441-3d6cea220efb/go.mod h1:4JqpgFy01LaqG1yM2iFTzwX3ZgcAvW9WdstBZQgPHzU=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4 h1:CKZiyp/5U9Y+PCBknwy1KmiqZwn6T3coJXGSHmEDgRc=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4/go.mod h1:UAWEMU4mLuxvr86sN8XFMtFRjkuYQnr+d6iGIbNC36s=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250227012921-08252fd61672 h1:BfoSgTdYXkz4Ke2QneANdwphaAzpSNY6M4JU6YqfAfg=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250227012921-08252fd61672/go.mod h1:7DbPnG0E39eZaX1CXKxRiJ1NOWHwTZYDWR9ys3kZZuU=
github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0 h1:0ewLMbAz3rZrovdRUCgd028yOXX8KigB4FndAUdI2kM=
github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0 h1:ZBat8EBvE2LpSQR9U1gEbRV6PfAkiFdINmQ8nVnXIAQ=
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/load/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ require (
github.com/smartcontractkit/chain-selectors v1.0.40
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250212131315-e9b53b05b02a
github.com/smartcontractkit/chainlink-common v0.4.2-0.20250205141137-8f50d72601bb
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250227012921-08252fd61672
github.com/smartcontractkit/chainlink-testing-framework/lib v1.51.0
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.10
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/load/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1357,8 +1357,8 @@ github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250207205350-420
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250207205350-420ccacab78a/go.mod h1:tHem58EihQh63kR2LlAOKDAs9Vbghf1dJKZRGy6LG8g=
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250211162441-3d6cea220efb h1:LWijSyJ2lhppkFLN19EGsLHZXQ5wen2DEk1cyR0tV+o=
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250211162441-3d6cea220efb/go.mod h1:4JqpgFy01LaqG1yM2iFTzwX3ZgcAvW9WdstBZQgPHzU=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4 h1:CKZiyp/5U9Y+PCBknwy1KmiqZwn6T3coJXGSHmEDgRc=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4/go.mod h1:UAWEMU4mLuxvr86sN8XFMtFRjkuYQnr+d6iGIbNC36s=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250227012921-08252fd61672 h1:BfoSgTdYXkz4Ke2QneANdwphaAzpSNY6M4JU6YqfAfg=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250227012921-08252fd61672/go.mod h1:7DbPnG0E39eZaX1CXKxRiJ1NOWHwTZYDWR9ys3kZZuU=
github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0 h1:0ewLMbAz3rZrovdRUCgd028yOXX8KigB4FndAUdI2kM=
github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0 h1:ZBat8EBvE2LpSQR9U1gEbRV6PfAkiFdINmQ8nVnXIAQ=
Expand Down

0 comments on commit a0e61bb

Please sign in to comment.