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

Updating live environments contracts to 1.5 #1547

Merged
merged 1 commit into from
Nov 27, 2024
+1,309 −1,495
Merged

Updating live environments contracts to 1.5 #1547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions .github/workflows/ccip-live-network-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ jobs:
- name: 'METIS_ANDROMEDA'
pairs: 'METIS_ANDROMEDA,ARBITRUM_MAINNET'
enabled: true
phaseTimeout: 60m
phaseTimeout: 300m
Copy link
Contributor

Choose a reason for hiding this comment

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

Such a big increase?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes. Metis and ZKSync has very slower finality. Close to 5hrs.

- name: 'MODE_MAINNET'
pairs: 'MODE_MAINNET,OPTIMISM_MAINNET;MODE_MAINNET,ARBITRUM_MAINNET;MODE_MAINNET,BASE_MAINNET;MODE_MAINNET,BSC_MAINNET'
enabled: true
Expand All @@ -311,7 +311,7 @@ jobs:
- name: 'ZKSYNC_MAINNET'
pairs: 'ZKSYNC_MAINNET,ARBITRUM_MAINNET'
enabled: true
phaseTimeout: 90m
phaseTimeout: 300m
steps:
- name: Collect Metrics
if: ${{ matrix.lanes.enabled == true }}
Expand Down Expand Up @@ -399,7 +399,7 @@ jobs:
# Custom reporting Jobs
start-slack-thread:
name: Start Slack Thread
if: ${{ always() && needs.ccip-smoke-test.result != 'skipped' && needs.ccip-smoke-test.result != 'cancelled' }}
if: ${{ failure() && needs.ccip-smoke-test.result != 'skipped' && needs.ccip-smoke-test.result != 'cancelled' }}
environment: integration
outputs:
thread_ts: ${{ steps.slack.outputs.thread_ts }}
Expand Down Expand Up @@ -451,7 +451,7 @@ jobs:

post-test-results-to-slack:
name: Post Test Results
if: ${{ always() && needs.start-slack-thread.result != 'skipped' && needs.start-slack-thread.result != 'cancelled' }}
if: ${{ failure() && needs.start-slack-thread.result != 'skipped' && needs.start-slack-thread.result != 'cancelled' }}
environment: integration
permissions:
checks: write
Expand All @@ -473,7 +473,7 @@ jobs:
workflow_run_id: ${{ github.run_id }}
github_job_name_regex: ^CCIP Smoke (.*)$
message_title: CCIP Mainnet Smoke test
slack_channel_id: "#test-run-notifications"
slack_channel_id: "#ccip-testing"
slack_bot_token: ${{ secrets.QA_SLACK_API_KEY }}
slack_thread_ts: ${{ needs.start-slack-thread.outputs.thread_ts }}

Expand Down
794 changes: 397 additions & 397 deletions integration-tests/ccip-tests/testconfig/override/mainnet.toml
View file
Open in desktop

Large diffs are not rendered by default.

173 changes: 38 additions & 135 deletions integration-tests/ccip-tests/testconfig/tomls/beta-testnet/testnet-beta-workinglane.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,119 +13,68 @@ Data = """
"Arbitrum Sepolia": {
"is_mock_arm": true,
"fee_token": "0xb1D4538B4571d411F07960EF2838Ce337FE1E80E",
"bridge_tokens": null,
"bridge_tokens_pools": null,
"price_aggregators": null,
"arm": "0x2aE6d5495fc20226F433be50e37D59c05D186AaA",
"router": "0x0fF6b6F3Ad10D66600Fd5CC25b98542A05Aa7Bc2",
"price_registry": "0x25d997d8618e1299418b3D905E40bC353ec89F61",
"arm": "0x5261Eac6b2A158b1eafed0144B4894f41b67b01f",
"router": "0x32C3C32B1b3858e45AFc53e1D0D4607463d47d1C",
"price_registry": "0x845A8190d31602fD0862467880468339E04d885b",
"wrapped_native": "0xE591bf0A0CF924A0674d7792db046B23CEbF5f34",
"src_contracts": {
"Base Sepolia": {
"on_ramp": "0x6BD0f1efA261Ea84DB219c1284b538A65E530ea1",
"deployed_at": 29428386
"Avalanche Fuji": {
"on_ramp": "0x59f2492ebDfdD3E99b9198A2313AB0A4113014c8",
"deployed_at": 85949437
},
"Optimism Sepolia": {
"on_ramp": "0x94cd0d171eF08924F0008305e5Bb90b0fC1b61AB",
"deployed_at": 13945916
},
"Sepolia Testnet": {
"on_ramp": "0x44225eb3B73B1b52Dd2ecD258F9b63418eC6Bf79",
"deployed_at": 13730868
"on_ramp": "0x3FF2852A4597E6Ac363340Cadbf1666C4246b4B9",
"deployed_at": 87452680
}
},
"dest_contracts": {
"Base Sepolia": {
"off_ramp": "0x21560B4ACAEdb8AA2Dd935618F15da43197bdc12",
"commit_store": "0x27B882c393151ADD910F3557849AF0bb09c7d5A6",
"Avalanche Fuji": {
"off_ramp": "0x1b3841f8923195F1E438B471D0415bBE8b3c133D",
"commit_store": "0x55F4a33AC60D994c2F1A3b400Fc2C40140CF50D9",
"receiver_dapp": "0xea387241d834D04CC408f4C2FE7ef2c477E4B3E7"
},
"Optimism Sepolia": {
"off_ramp": "0xAE32FD8Ae148BD88E3da6FaE8Cd7561Eed3ec5Cc",
"commit_store": "0x1f1160Ac7828B647A85c9a6b3A58A232C59D67Ab",
"receiver_dapp": "0xea387241d834D04CC408f4C2FE7ef2c477E4B3E7"
},
"Sepolia Testnet": {
"off_ramp": "0xc136114F379b812345bb7e467ECDdb6D0c87De8b",
"commit_store": "0x42b3EbEA14F6CB803e3C7df84392Efb85CE90168",
"off_ramp": "0x695C84498573AEE9A2Be410Aaf7C275535A337D7",
"commit_store": "0xCBDdCEaE1d51F9C40640fa17fb7a2FeEB51DB702",
"receiver_dapp": "0xea387241d834D04CC408f4C2FE7ef2c477E4B3E7"
}
}
},
"Avalanche Fuji": {
"is_mock_arm": true,
"fee_token": "0x0b9d5D9136855f6FEc3c0993feE6E9CE8a297846",
"bridge_tokens": null,
"bridge_tokens_pools": null,
"price_aggregators": null,
"arm": "0xD4A51dC0F5C680A8A18eA4Ec3A2f25C6db9424B7",
"router": "0xa62e685aDFF45f38eC94378513D128F168964E99",
"price_registry": "0xdbeA1a10AC6a2B729bF128aE9281Ed420dbE7113",
"arm": "0xd550342aE3f8d5D3D38509900034C8b01f556f0e",
"router": "0x13b766d0fe3e01fa5b02b378DF31724dD5368B37",
"price_registry": "0xAEc164EDF7Be32c6d38565BD09c24DAAA5b5887f",
"wrapped_native": "0xd00ae08403B9bbb9124bB305C09058E32C39A48c",
"src_contracts": {
"BSC Testnet": {
"on_ramp": "0xe4f1F7750352f1c37C15C4A314554d6A79d7d146",
"deployed_at": 31437550
}
},
"dest_contracts": {
"BSC Testnet": {
"off_ramp": "0x796D720ea9D4326ff356eadE13b123B267C03C80",
"commit_store": "0xaDb37cFd91fa9b6Df1DaAcbAfB4cDFF41e06c956",
"receiver_dapp": "0xea387241d834D04CC408f4C2FE7ef2c477E4B3E7"
}
}
},
"BSC Testnet": {
"is_mock_arm": true,
"fee_token": "0x84b9B910527Ad5C03A9Ca831909E21e236EA7b06",
"bridge_tokens": null,
"bridge_tokens_pools": null,
"price_aggregators": null,
"arm": "0xbBF534D89d9640e3886db25FE1ffE603Fe160D75",
"router": "0x9CdA5b77eA23459eBaf2e3092c570a6B5605850A",
"price_registry": "0x9213967a47FC3F15A16A0b813208e8Ccb63Dbba6",
"wrapped_native": "0xae13d989daC2f0dEbFf460aC112a837C89BAa7cd",
"src_contracts": {
"Avalanche Fuji": {
"on_ramp": "0x0B4F541a7fcE5c251993Bc19D5A40B661e0463f5",
"deployed_at": 39097639
"Arbitrum Sepolia": {
"on_ramp": "0x2Df17a22794499963EC0DDD43699B1020fdDD4d3",
"deployed_at": 36151865
}
},
"dest_contracts": {
"Avalanche Fuji": {
"off_ramp": "0x41E59DCdDec18d7f79DA5F76Ce567d2c5e301E6B",
"commit_store": "0x9487C01D4b3Ae1c9Ac8740A07f3862D646548A14",
"Arbitrum Sepolia": {
"off_ramp": "0xFFBf82f59e5A7E1f92CE3565A6d6C835dEA19D1A",
"commit_store": "0x79357546378F29Ffcf3B7f3492Ee2Bcb9dB4d847",
"receiver_dapp": "0xea387241d834D04CC408f4C2FE7ef2c477E4B3E7"
}
}
},
"Base Sepolia": {
"is_mock_arm": true,
"fee_token": "0xE4aB69C077896252FAFBD49EFD26B5D171A32410",
"bridge_tokens": null,
"bridge_tokens_pools": null,
"price_aggregators": null,
"arm": "0x866faB92E04bAE5EDa238A9cbFf1e56E09508Ade",
"router": "0x2aE6d5495fc20226F433be50e37D59c05D186AaA",
"price_registry": "0xD886E2286Fd1073df82462ea1822119600Af80b6",
"wrapped_native": "0x4200000000000000000000000000000000000006",
"src_contracts": {
"Arbitrum Sepolia": {
"on_ramp": "0xAE32FD8Ae148BD88E3da6FaE8Cd7561Eed3ec5Cc",
"deployed_at": 8133125
},
"Optimism Sepolia": {
"on_ramp": "0x9213967a47FC3F15A16A0b813208e8Ccb63Dbba6",
"deployed_at": 11607777
}
},
"dest_contracts": {
"Arbitrum Sepolia": {
"off_ramp": "0x34433469A4d6c8b1B0a1a7B91a5C5C2Dd74c67Fb",
"commit_store": "0xFEE7c8E229F538a98437b9A7D0Dd8fCd8A1Ab569",
"receiver_dapp": "0xea387241d834D04CC408f4C2FE7ef2c477E4B3E7"
},
"Optimism Sepolia": {
"off_ramp": "0x0f30449bcCaCCaA7221B3f7C3304c4AaD68068E8",
"commit_store": "0x17a5746c9cf7eAf23533F060F395B2E38eb976ea",
Expand All @@ -136,75 +85,30 @@ Data = """
"Optimism Sepolia": {
"is_mock_arm": true,
"fee_token": "0xE4aB69C077896252FAFBD49EFD26B5D171A32410",
"bridge_tokens": null,
"bridge_tokens_pools": null,
"price_aggregators": null,
"arm": "0x2aE6d5495fc20226F433be50e37D59c05D186AaA",
"router": "0x0fF6b6F3Ad10D66600Fd5CC25b98542A05Aa7Bc2",
"price_registry": "0x3B80b7Ef5c00Eb892CBe72800C028C47AD6380EF",
"arm": "0xb665817485727D670dABD0F03A155401778C26ea",
"router": "0xF66f5c1417159eb38F622006eDE421BbF5262905",
"price_registry": "0x2dF2c61821A7BCcC851B15ee26BB06307d3bEE2d",
"wrapped_native": "0x4200000000000000000000000000000000000006",
"src_contracts": {
"Arbitrum Sepolia": {
"on_ramp": "0x622CB640F52bFfA68b78b2BD12c1940Ca4899621",
"deployed_at": 8020540
"on_ramp": "0x21ce68614782BF139bF21d7D2566A0d900c8638C",
"deployed_at": 18379535
},
"Base Sepolia": {
"on_ramp": "0x12c164d0778E215873A062cEE2814507417339cB",
"deployed_at": 13590651
},
"Sepolia Testnet": {
"on_ramp": "0x0c2c8D4266C98f1b9333D5E1a42f3f775A0005d4",
"deployed_at": 8020948
}
},
"dest_contracts": {
"Arbitrum Sepolia": {
"off_ramp": "0x37004c1245a2D5541377e87cA29699492a4114D5",
"commit_store": "0x51158Ca439feA9E809Bc063CfA6701747b05254e",
"off_ramp": "0xbeBD1F1f92a739810C102E5E5dc844E7efDbd747",
"commit_store": "0x39DEf7c3E3F2306012B96C1a4Cb1D574CA912CCa",
"receiver_dapp": "0xea387241d834D04CC408f4C2FE7ef2c477E4B3E7"
},
"Base Sepolia": {
"off_ramp": "0xB3F3f362FbeD49fA0086B434051C822B55BaADbD",
"commit_store": "0xD4995B99c484CCABc868b26c0B2C2Ef10ecde3d7",
"receiver_dapp": "0xea387241d834D04CC408f4C2FE7ef2c477E4B3E7"
},
"Sepolia Testnet": {
"off_ramp": "0x80C2aa80F202FeFdFEEF80f516cFd89768c54057",
"commit_store": "0xc1fE981A040D679511ccb9139ca107aCA67520ef",
"receiver_dapp": "0xea387241d834D04CC408f4C2FE7ef2c477E4B3E7"
}
}
},
"Sepolia Testnet": {
"is_mock_arm": true,
"fee_token": "0x779877A7B0D9E8603169DdbD7836e478b4624789",
"bridge_tokens": null,
"bridge_tokens_pools": null,
"price_aggregators": null,
"arm": "0x9912a7389382ff55f85A29C9378B38F7B992c4aE",
"router": "0x1E1F3d8Ac7Df65fCcFcc52dbF03929cEE95430ac",
"price_registry": "0x4358e81f88bB27222779c1BC85003A11A1c66f6F",
"wrapped_native": "0x097D90c9d3E0B50Ca60e1ae45F6A81010f9FB534",
"src_contracts": {
"Arbitrum Sepolia": {
"on_ramp": "0x420a7B5ABB8CF27A70E1906F797e24509B11093D",
"deployed_at": 5275652
},
"Optimism Sepolia": {
"on_ramp": "0xEb4EBC1930bA81416A48a59142D89722163D85ae",
"deployed_at": 5281150
}
},
"dest_contracts": {
"Arbitrum Sepolia": {
"off_ramp": "0x224D1eB3aB2b7F23b66f093F9cBBC68dA77a1986",
"commit_store": "0x35c54cF12FF9B29dBa60dc23EdD1de0F13CC7fc5",
"receiver_dapp": "0xea387241d834D04CC408f4C2FE7ef2c477E4B3E7"
},
"Optimism Sepolia": {
"off_ramp": "0xF21d01D6Ef822FBC56FC6c8F23f74fE3A0cb39aa",
"commit_store": "0x7F6AF440Bcc54f70Fd8AC2E534d37196c0bA1A38",
"receiver_dapp": "0xea387241d834D04CC408f4C2FE7ef2c477E4B3E7"
}
}
}
Expand All @@ -219,23 +123,23 @@ TTL = '8h'
selected_networks = [
'ARBITRUM_SEPOLIA',
'AVALANCHE_FUJI',
'BASE_SEPOLIA',
'BSC_TESTNET',
# 'BASE_SEPOLIA',
'OPTIMISM_SEPOLIA',
'SEPOLIA'
]



[CCIP.Groups.smoke]
# these are all the valid network pairs
NetworkPairs = [
'BSC_TESTNET,AVALANCHE_FUJI',
'SEPOLIA,ARBITRUM_SEPOLIA',
'BASE_SEPOLIA,OPTIMISM_SEPOLIA'
# 'ARBITRUM_SEPOLIA,AVALANCHE_FUJI',
'ARBITRUM_SEPOLIA,OPTIMISM_SEPOLIA',
'OPTIMISM_SEPOLIA,ARBITRUM_SEPOLIA',
'AVALANCHE_FUJI,ARBITRUM_SEPOLIA',
# 'BASE_SEPOLIA,OPTIMISM_SEPOLIA'
]

BiDirectionalLane = true
BiDirectionalLane = false
PhaseTimeout = '40m'
LocalCluster = false
ExistingDeployment = true
Expand All @@ -255,8 +159,7 @@ AmountPerToken = 1

[CCIP.Groups.load]
NetworkPairs = [
'AVALANCHE_FUJI,BSC_TESTNET',
'SEPOLIA,ARBITRUM_SEPOLIA',
'ARBITRUM_SEPOLIA,AVALANCHE_FUJI',
'BASE_SEPOLIA,OPTIMISM_SEPOLIA'
]

Expand All @@ -272,7 +175,7 @@ NoOfTokensPerChain = 1
RequestPerUnitTime = [1]
TimeUnit = '6m'
TestDuration = '3h'
TestRunName = 'BetaSoakTest_CCIPV1dot5'
TestRunName = 'BetaSoakTest_CCIPV1dot5dot4'
FailOnFirstErrorInLoad = true

[[CCIP.Groups.load.LoadProfile.MsgProfile.MsgDetails]]
Expand Down
Loading
Loading