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.

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

cherry-pick: CCIP-4408: E2E test for LBTC #1578

Merged
merged 5 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 26 additions & 0 deletions .github/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,32 @@ runner-test-matrix:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
test_config_override_path: integration-tests/ccip-tests/testconfig/tomls/usdc_mock_deployment.toml

- id: ccip-smoke-lbtc-32bytes-destination-pool-data
path: integration-tests/ccip-tests/smoke/ccip_test.go
test_env_type: docker
runs_on: ubuntu-latest
triggers:
- PR E2E CCIP Tests
- Merge Queue E2E CCIP Tests
- Nightly E2E Tests
test_cmd: cd integration-tests/ccip-tests/smoke && go test ccip_test.go -test.run ^TestSmokeCCIPForBidirectionalLane$ -timeout 30m -count=1 -test.parallel=1 -json
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
test_config_override_path: integration-tests/ccip-tests/testconfig/tomls/lbtc_mock_deployment_with_32bytes_data.toml

- id: ccip-smoke-lbtc-non32bytes-destination-pool-data
path: integration-tests/ccip-tests/smoke/ccip_test.go
test_env_type: docker
runs_on: ubuntu-latest
triggers:
- PR E2E CCIP Tests
- Merge Queue E2E CCIP Tests
- Nightly E2E Tests
test_cmd: cd integration-tests/ccip-tests/smoke && go test ccip_test.go -test.run ^TestSmokeCCIPForBidirectionalLane$ -timeout 30m -count=1 -test.parallel=1 -json
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
test_config_override_path: integration-tests/ccip-tests/testconfig/tomls/lbtc_mock_deployment_with_non32bytes_data.toml

- id: ccip-smoke-db-compatibility
path: integration-tests/ccip-tests/smoke/ccip_test.go
test_env_type: docker
Expand Down
7 changes: 6 additions & 1 deletion ccip/config/evm/Astar_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,9 @@ LogPollInterval = '6s'
[GasEstimator]
EIP1559DynamicFees = false
PriceMax = '100000 gwei'
LimitDefault = 8000000
LimitDefault = 8000000

[HeadTracker]
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
7 changes: 6 additions & 1 deletion ccip/config/evm/Astar_Shibuya.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,9 @@ LogPollInterval = '6s'
[GasEstimator]
EIP1559DynamicFees = false
PriceMax = '100000 gwei'
LimitDefault = 8000000
LimitDefault = 8000000

[HeadTracker]
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
5 changes: 5 additions & 0 deletions ccip/config/evm/Avalanche_ANZ_testnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,8 @@ PriceMin = '25 gwei'

[GasEstimator.BlockHistory]
BlockHistorySize = 24

[HeadTracker]
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
5 changes: 5 additions & 0 deletions ccip/config/evm/Avalanche_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,8 @@ PriceMin = '25 gwei'
[GasEstimator.BlockHistory]
# Average block time of 2s
BlockHistorySize = 24

[HeadTracker]
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
5 changes: 5 additions & 0 deletions ccip/config/evm/BSC_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@ ObservationGracePeriod = '500ms'

[NodePool]
SyncThreshold = 10

[HeadTracker]
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
3 changes: 3 additions & 0 deletions ccip/config/evm/Base_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ ResendAfterThreshold = '30s'

[HeadTracker]
HistoryDepth = 300
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false

[NodePool]
SyncThreshold = 10
Expand Down
3 changes: 3 additions & 0 deletions ccip/config/evm/Base_Sepolia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ ResendAfterThreshold = '30s'

[HeadTracker]
HistoryDepth = 300
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false

[NodePool]
SyncThreshold = 10
Expand Down
3 changes: 3 additions & 0 deletions ccip/config/evm/Blast_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ EIP1559FeeCapBufferBlocks = 0

[HeadTracker]
HistoryDepth = 300
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false

[NodePool]
# 4 block sync time between nodes to ensure they aren't labelled unreachable too soon
Expand Down
3 changes: 3 additions & 0 deletions ccip/config/evm/Blast_Sepolia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ EIP1559FeeCapBufferBlocks = 0

[HeadTracker]
HistoryDepth = 300
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false

[NodePool]
# 4 block sync time between nodes to ensure they aren't labelled unreachable too soon
Expand Down
3 changes: 3 additions & 0 deletions ccip/config/evm/Celo_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ BlockHistorySize = 12

[HeadTracker]
HistoryDepth = 50
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
5 changes: 5 additions & 0 deletions ccip/config/evm/Gnosis_Chiado.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ NoNewFinalizedHeadsThreshold = '2m'
[GasEstimator]
EIP1559DynamicFees = true
PriceMax = '500 gwei'

[HeadTracker]
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
3 changes: 3 additions & 0 deletions ccip/config/evm/Kroma_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ ResendAfterThreshold = '30s'

[HeadTracker]
HistoryDepth = 400
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false

[NodePool]
SyncThreshold = 10
Expand Down
3 changes: 3 additions & 0 deletions ccip/config/evm/Kroma_Sepolia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ ResendAfterThreshold = '30s'

[HeadTracker]
HistoryDepth = 400
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false

[NodePool]
SyncThreshold = 10
Expand Down
5 changes: 5 additions & 0 deletions ccip/config/evm/L3X_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,8 @@ PriceMin = '0'
PriceDefault = '0.1 gwei'
FeeCapDefault = '1000 gwei'
BumpThreshold = 5

[HeadTracker]
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
5 changes: 5 additions & 0 deletions ccip/config/evm/L3X_Sepolia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,8 @@ PriceMin = '0'
PriceDefault = '0.1 gwei'
FeeCapDefault = '1000 gwei'
BumpThreshold = 5

[HeadTracker]
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
3 changes: 3 additions & 0 deletions ccip/config/evm/Linea_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ ResendAfterThreshold = '3m'
# set greater than finality depth
[HeadTracker]
HistoryDepth = 350
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
5 changes: 4 additions & 1 deletion ccip/config/evm/Linea_Sepolia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,7 @@ PriceMin = '1 wei'
ResendAfterThreshold = '3m'

[HeadTracker]
HistoryDepth = 1000
HistoryDepth = 1000
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
5 changes: 4 additions & 1 deletion ccip/config/evm/Mantle_Sepolia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ MinIncomingConfirmations = 1

[HeadTracker]
HistoryDepth = 600
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false

[GasEstimator]
[GasEstimator]
Mode = 'L2Suggested'
PriceMax = '200 gwei'
LimitDefault = 100000000
Expand Down
5 changes: 5 additions & 0 deletions ccip/config/evm/Metis_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@ BlockHistorySize = 0

[NodePool]
SyncThreshold = 10

[HeadTracker]
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
5 changes: 5 additions & 0 deletions ccip/config/evm/Metis_Sepolia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ BlockHistorySize = 0

[NodePool]
SyncThreshold = 10

[HeadTracker]
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
3 changes: 3 additions & 0 deletions ccip/config/evm/Mode_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ EIP1559FeeCapBufferBlocks = 0

[HeadTracker]
HistoryDepth = 300
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false

[NodePool]
PollFailureThreshold = 2
Expand Down
3 changes: 3 additions & 0 deletions ccip/config/evm/Mode_Sepolia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ EIP1559FeeCapBufferBlocks = 0

[HeadTracker]
HistoryDepth = 300
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false

[NodePool]
PollFailureThreshold = 2
Expand Down
3 changes: 3 additions & 0 deletions ccip/config/evm/Optimism_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ ResendAfterThreshold = '30s'

[HeadTracker]
HistoryDepth = 300
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false

[NodePool]
SyncThreshold = 10
Expand Down
3 changes: 3 additions & 0 deletions ccip/config/evm/Optimism_Sepolia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ ResendAfterThreshold = '30s'

[HeadTracker]
HistoryDepth = 300
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false

[NodePool]
SyncThreshold = 10
Expand Down
3 changes: 3 additions & 0 deletions ccip/config/evm/Polygon_Amoy.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ BlockHistorySize = 24

[HeadTracker]
HistoryDepth = 2000
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false

[NodePool]
SyncThreshold = 10
3 changes: 3 additions & 0 deletions ccip/config/evm/Polygon_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ 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
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false

[NodePool]
SyncThreshold = 10
3 changes: 3 additions & 0 deletions ccip/config/evm/Polygon_Zkevm_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ BlockHistorySize = 12
[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
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
3 changes: 3 additions & 0 deletions ccip/config/evm/Scroll_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ BlockHistorySize = 24

[HeadTracker]
HistoryDepth = 50
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false

[OCR]
ContractConfirmations = 1
3 changes: 3 additions & 0 deletions ccip/config/evm/Scroll_Sepolia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ BlockHistorySize = 24

[HeadTracker]
HistoryDepth = 50
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false

[OCR]
ContractConfirmations = 1
3 changes: 3 additions & 0 deletions ccip/config/evm/Simulated.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ PriceMax = '100 micro'
HistoryDepth = 10
MaxBufferSize = 100
SamplingInterval = '0s'
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false

[OCR]
ContractConfirmations = 1
5 changes: 5 additions & 0 deletions ccip/config/evm/WeMix_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,8 @@ ContractConfirmations = 1
[GasEstimator]
EIP1559DynamicFees = true
TipCapDefault = '100 gwei'

[HeadTracker]
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
2 changes: 2 additions & 0 deletions ccip/config/evm/WeMix_Testnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ EIP1559DynamicFees = true
TipCapDefault = '100 gwei'

[HeadTracker]
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
3 changes: 3 additions & 0 deletions ccip/config/evm/XLayer_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ BlockHistorySize = 12

[HeadTracker]
HistoryDepth = 2000
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
3 changes: 3 additions & 0 deletions ccip/config/evm/XLayer_Sepolia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ BlockHistorySize = 12

[HeadTracker]
HistoryDepth = 2000
# FinalityDepth < 1k => FinalityTagBypass = false
# https://smartcontract-it.atlassian.net/browse/SHIP-4078
FinalityTagBypass = false
1 change: 1 addition & 0 deletions contracts/scripts/native_solc_compile_all_ccip
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ compileContract ccip/test/helpers/receivers/MaybeRevertMessageReceiver.sol
compileContract ccip/test/helpers/MultiOCR3Helper.sol
compileContract ccip/test/mocks/MockE2EUSDCTokenMessenger.sol
compileContract ccip/test/mocks/MockE2EUSDCTransmitter.sol
compileContract ccip/test/mocks/MockLBTCTokenPool.sol
compileContract ccip/test/WETH9.sol


Expand Down
Loading
Loading