Skip to content
This repository was archived by the owner on Mar 14, 2025. It is now read-only.

Commit 84f59e8

Browse files
dimkouvdimkouv
authored
Merge branch 'ccip-develop' into ng/attempt-fix-bgworker-timeout
2 parents 8468443 + ea7c200 commit 84f59e8

File tree

15 files changed

+110
-22
lines changed

15 files changed

+110
-22
lines changed

‎.github/workflows/client-compatibility-tests.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: Client Compatibility Tests
22
on:
3-
schedule:
4-
- cron: "30 5 * * TUE,FRI" # Run every Tuesday and Friday at midnight + 30min EST
5-
push:
6-
tags:
7-
- "*"
8-
merge_group:
9-
pull_request:
3+
# schedule:
4+
# - cron: "30 5 * * TUE,FRI" # Run every Tuesday and Friday at midnight + 30min EST
5+
# push:
6+
# tags:
7+
# - "*"
8+
# merge_group:
9+
# pull_request:
1010
workflow_dispatch:
1111
inputs:
1212
chainlinkVersion:

‎ccip/config/evm/Hashkey_Mainnet.toml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
ChainID = '177'
2+
ChainType = 'optimismBedrock'
3+
FinalityTagEnabled = true
4+
5+
[GasEstimator]
6+
PriceMax = '1000 gwei'
7+
LimitDefault = 8000000
8+
FeeCapDefault = '1000 gwei'
9+
10+
[NodePool]
11+
PollFailureThreshold = 2
12+
PollInterval = '8s'
13+
14+
[GasEstimator.DAOracle]
15+
OracleType = 'opstack'
16+
OracleAddress = '0x420000000000000000000000000000000000000F'

‎ccip/config/evm/Hashkey_Testnet.toml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
ChainID = '133'
2+
ChainType = 'optimismBedrock'
3+
FinalityTagEnabled = true
4+
5+
[GasEstimator]
6+
PriceMax = '1000 gwei'
7+
LimitDefault = 8000000
8+
FeeCapDefault = '1000 gwei'
9+
10+
[NodePool]
11+
PollFailureThreshold = 2
12+
PollInterval = '8s'
13+
14+
[GasEstimator.DAOracle]
15+
OracleType = 'opstack'
16+
OracleAddress = '0x420000000000000000000000000000000000000F'

‎ccip/config/evm/Sonic_Mainnet.toml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
ChainId = '146'
2+
FinalityDepth = 10
3+
FinalityTagEnabled = false
4+
LogPollInterval = "1s" #1s block rate
5+
MinIncomingConfirmations = 5
6+
RPCBlockQueryDelay = 10
7+
RPCDefaultBatchSize = 100
8+
9+
[GasEstimator]
10+
Mode = 'FeeHistory'
11+
EIP1559DynamicFees = true
12+
BumpPercent = 10
13+
LimitDefault = 8000000 # default ccip value
14+
15+
[GasEstimator.FeeHistory]
16+
CacheTimeout = '2s'
17+
18+
[GasEstimator.BlockHistory]
19+
BlockHistorySize = 100
20+
21+
[HeadTracker]
22+
HistoryDepth = 50
23+
24+
[NodePool]
25+
SyncThreshold = 10
26+
27+
[Transactions]
28+
MaxQueued = 500

‎ccip/config/evm/Sonic_Testnet.toml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
ChainId = '57054'
2+
FinalityDepth = 10
3+
FinalityTagEnabled = false
4+
LogPollInterval = "1s" #1s block rate
5+
MinIncomingConfirmations = 5
6+
RPCBlockQueryDelay = 10
7+
RPCDefaultBatchSize = 100
8+
9+
[GasEstimator]
10+
Mode = 'FeeHistory'
11+
EIP1559DynamicFees = true
12+
BumpPercent = 10
13+
LimitDefault = 8000000 # default ccip value
14+
15+
[GasEstimator.FeeHistory]
16+
CacheTimeout = '2s'
17+
18+
[GasEstimator.BlockHistory]
19+
BlockHistorySize = 100
20+
21+
[HeadTracker]
22+
HistoryDepth = 50
23+
24+
[NodePool]
25+
SyncThreshold = 10
26+
27+
[Transactions]
28+
MaxQueued = 500

‎core/scripts/ccip/manual-execution/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.20
55
require (
66
github.com/ethereum/go-ethereum v1.11.3
77
github.com/pkg/errors v0.9.1
8-
github.com/smartcontractkit/chain-selectors v1.0.34
8+
github.com/smartcontractkit/chain-selectors v1.0.35
99
go.uber.org/multierr v1.1.0
1010
golang.org/x/crypto v0.1.0
1111
)

‎core/scripts/ccip/manual-execution/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
7272
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
7373
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU=
7474
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
75-
github.com/smartcontractkit/chain-selectors v1.0.34 h1:MJ17OGu8+jjl426pcKrJkCf3fePb3eCreuAnUA3RBj4=
76-
github.com/smartcontractkit/chain-selectors v1.0.34/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
75+
github.com/smartcontractkit/chain-selectors v1.0.35 h1:k7iJqChFbH10WFpahjDtDJoYyDz4qRNq6ReIB41M8Tg=
76+
github.com/smartcontractkit/chain-selectors v1.0.35/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
7777
github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA=
7878
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
7979
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=

‎core/scripts/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/pkg/errors v0.9.1
2323
github.com/prometheus/client_golang v1.20.0
2424
github.com/shopspring/decimal v1.4.0
25-
github.com/smartcontractkit/chain-selectors v1.0.34
25+
github.com/smartcontractkit/chain-selectors v1.0.35
2626
github.com/smartcontractkit/chainlink-automation v1.0.4
2727
github.com/smartcontractkit/chainlink-common v0.2.3-0.20240925085218-aded1b263ecc
2828
github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000

‎core/scripts/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,8 +1073,8 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
10731073
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
10741074
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
10751075
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
1076-
github.com/smartcontractkit/chain-selectors v1.0.34 h1:MJ17OGu8+jjl426pcKrJkCf3fePb3eCreuAnUA3RBj4=
1077-
github.com/smartcontractkit/chain-selectors v1.0.34/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
1076+
github.com/smartcontractkit/chain-selectors v1.0.35 h1:k7iJqChFbH10WFpahjDtDJoYyDz4qRNq6ReIB41M8Tg=
1077+
github.com/smartcontractkit/chain-selectors v1.0.35/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
10781078
github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8=
10791079
github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
10801080
github.com/smartcontractkit/chainlink-common v0.2.3-0.20240925085218-aded1b263ecc h1:ALbyaoRzUSXQ2NhGFKVOyJqO22IB5yQjhjKWbIZGbrI=

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ require (
7373
github.com/scylladb/go-reflectx v1.0.1
7474
github.com/shirou/gopsutil/v3 v3.24.3
7575
github.com/shopspring/decimal v1.4.0
76-
github.com/smartcontractkit/chain-selectors v1.0.34
76+
github.com/smartcontractkit/chain-selectors v1.0.35
7777
github.com/smartcontractkit/chainlink-automation v1.0.4
7878
github.com/smartcontractkit/chainlink-common v0.2.3-0.20240925085218-aded1b263ecc
7979
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240911175228-daf2600bb7b7

0 commit comments

Comments
 (0)