From 7dc7c91a745770a0631249e1f47856265412ca0f Mon Sep 17 00:00:00 2001 From: Jason McInerney Date: Thu, 28 Sep 2023 17:27:00 -0700 Subject: [PATCH 01/12] Update contracts.json *Avax Fuji: updated token, bridge token, toke pool to use USDC contracts *Optimism: updated token, bridge tokken, token pool for the same --- .../contracts/ccip/laneconfig/contracts.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/integration-tests/contracts/ccip/laneconfig/contracts.json b/integration-tests/contracts/ccip/laneconfig/contracts.json index 2ec42fd333..4891905b7e 100644 --- a/integration-tests/contracts/ccip/laneconfig/contracts.json +++ b/integration-tests/contracts/ccip/laneconfig/contracts.json @@ -236,12 +236,12 @@ } }, "Avalanche Fuji": { - "fee_token": "0x0b9d5D9136855f6FEc3c0993feE6E9CE8a297846", + "fee_token": "0x5425890298aed601595a70AB815c96711a31Bc65", "bridge_tokens": [ - "0x0b9d5D9136855f6FEc3c0993feE6E9CE8a297846" + "0x5425890298aed601595a70AB815c96711a31Bc65" ], "bridge_tokens_pools": [ - "0x658af0d8ecbb13c5fd5b545ac7316e50cc07cf6e" + "0x35e08285cfed1ef159236728f843286c55fc0861" ], "arm": "0x0ea0d7b2b78dd3a926fc76d6875a287f0aeb158f", "arm_proxy": "0xac8cfc3762a979628334a0e4c1026244498e821b", @@ -353,12 +353,12 @@ } }, "Optimism Goerli": { - "fee_token": "0xdc2CC710e42857672E7907CF474a69B63B93089f", + "fee_token": "0xe05606174bac4A6364B31bd0eCA4bf4dD368f8C6", "bridge_tokens": [ - "0xdc2CC710e42857672E7907CF474a69B63B93089f" + "0xe05606174bac4A6364B31bd0eCA4bf4dD368f8C6" ], "bridge_tokens_pools": [ - "0xdecfaf632175915bdf38c00d9d9746e8a90a56c4" + "0x6cb3ed9b441eb674b58495c8b3324b59faff5243" ], "arm": "0xeaf6968fab9c54ac31c3679f120705b5019d3546", "arm_proxy": "0x4eb4dbdb3c3b56e5e209abf9c424a3834f2087d0", From dbd70bfb9bf45b87f0782c01e22e482bac8114bd Mon Sep 17 00:00:00 2001 From: Jason McInerney Date: Fri, 29 Sep 2023 12:35:23 -0700 Subject: [PATCH 02/12] Updating contracts for testing Update Avax and Optimism testnets with USDC addresses --- .../contracts/ccip/laneconfig/contracts.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/integration-tests/contracts/ccip/laneconfig/contracts.json b/integration-tests/contracts/ccip/laneconfig/contracts.json index 4891905b7e..d99591133b 100644 --- a/integration-tests/contracts/ccip/laneconfig/contracts.json +++ b/integration-tests/contracts/ccip/laneconfig/contracts.json @@ -367,8 +367,8 @@ "wrapped_native": "0x4200000000000000000000000000000000000006", "src_contracts": { "43113": { - "on_ramp": "0xf33303166911ff86ad1a5ea94d459b4ba0ba8cc9", - "deployed_at": 11482157 + "on_ramp": "0x9f68d3ce6fafac72723348f284f8961e0d3b80ad", + "deployed_at": 14980444 }, "11155111": { "on_ramp": "0x64877f0b53e801adeb8d65f9706f7b134b82971c", @@ -389,9 +389,9 @@ }, "dest_contracts": { "43113": { - "off_ramp": "0xee8ce182ea0c0edecf06c2a032a17b2058fc5a04", - "commit_store": "0x2980de4ce178bc8bb6840abd2ef0e2a7c8e7272f", - "receiver_dapp": "0x18992693d445f70dc931e5711b0732c569951397" + "off_ramp": "0x688f944c37abee17e0de9df89fb4bd85dacd9dfd", + "commit_store": "0x31f243a32291096413899a480ed781b27ad4de75", + "receiver_dapp": "0xda9e8e71bB750a996Af33ebB8aBb18cd9EB9DC75" }, "11155111": { "off_ramp": "0xdc4606e96c37b877f2c9ddda82104c85a198a82d", From 8c155a9106cdef9641ad6d2d7c8cb88ac932850e Mon Sep 17 00:00:00 2001 From: Jason McInerney Date: Fri, 29 Sep 2023 12:38:30 -0700 Subject: [PATCH 03/12] Finish adding AvaxToOptimism config --- .../contracts/ccip/laneconfig/contracts.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/integration-tests/contracts/ccip/laneconfig/contracts.json b/integration-tests/contracts/ccip/laneconfig/contracts.json index d99591133b..95d0f51a1d 100644 --- a/integration-tests/contracts/ccip/laneconfig/contracts.json +++ b/integration-tests/contracts/ccip/laneconfig/contracts.json @@ -254,8 +254,8 @@ "deployed_at": 23753755 }, "420": { - "on_ramp": "0x097076fbd8573418c77d2600606ad063c0e3cc7c", - "deployed_at": 23755228 + "on_ramp": "0x75a4a11d0839ab3983e0205e2eadfe5197f0c3ee", + "deployed_at": 26089413 }, "80001": { "on_ramp": "0x762aabc808270fadfdd9e4186739920d68106673", @@ -269,9 +269,9 @@ "receiver_dapp": "0x19910CB895d3F611c4143B80bC194C52ebFaA60A" }, "420": { - "off_ramp": "0x0f287140d86335b37ae2ad0707992ecd4202d5b7", - "commit_store": "0x5a7fa03e52628a0a6f0ab637f10ba45b68f9ad33", - "receiver_dapp": "0x1C23955C7770E4fF85Cd806520A7Ce6A69745E96" + "off_ramp": "0x8cd9e1a0192862746037d751afbf07fb103c9ae6", + "commit_store": "0xc016efee15f75ef18c7db523cea63b3f01f8ca37", + "receiver_dapp": "0xda9e8e71bB750a996Af33ebB8aBb18cd9EB9DC75" }, "80001": { "off_ramp": "0x31cf2040d53f178d168997c658d1a7fc5fa7d215", From b1755ee46994942bf5bddfe716e113804991e4b8 Mon Sep 17 00:00:00 2001 From: Jason McInerney Date: Fri, 29 Sep 2023 12:56:10 -0700 Subject: [PATCH 04/12] Add contracts.json to a filter to trigger a build --- .github/workflows/integration-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index d47edbdfd7..39dbd5a800 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -39,6 +39,7 @@ jobs: - '**/*go.sum' - '**/*go.mod' - '.github/workflows/integration-tests.yml' + - '**/*contracts.json" - name: Collect Metrics if: always() id: collect-gha-metrics From 944690e75dd4cbd6cb6263ba8eeb252d44cdf9e9 Mon Sep 17 00:00:00 2001 From: Jason McInerney Date: Fri, 29 Sep 2023 12:57:58 -0700 Subject: [PATCH 05/12] Add contracts.json to a filter to trigger a build --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 39dbd5a800..9b08786fdb 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -39,7 +39,7 @@ jobs: - '**/*go.sum' - '**/*go.mod' - '.github/workflows/integration-tests.yml' - - '**/*contracts.json" + - '**/*contracts.json' - name: Collect Metrics if: always() id: collect-gha-metrics From 3702937476f19197977d82e09b75d28232e560d4 Mon Sep 17 00:00:00 2001 From: Jason McInerney Date: Fri, 29 Sep 2023 14:11:10 -0700 Subject: [PATCH 06/12] Use link as fee token on both avax and optimism --- integration-tests/contracts/ccip/laneconfig/contracts.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-tests/contracts/ccip/laneconfig/contracts.json b/integration-tests/contracts/ccip/laneconfig/contracts.json index 95d0f51a1d..0306875062 100644 --- a/integration-tests/contracts/ccip/laneconfig/contracts.json +++ b/integration-tests/contracts/ccip/laneconfig/contracts.json @@ -236,7 +236,7 @@ } }, "Avalanche Fuji": { - "fee_token": "0x5425890298aed601595a70AB815c96711a31Bc65", + "fee_token": "0x0b9d5D9136855f6FEc3c0993feE6E9CE8a297846", "bridge_tokens": [ "0x5425890298aed601595a70AB815c96711a31Bc65" ], @@ -353,7 +353,7 @@ } }, "Optimism Goerli": { - "fee_token": "0xe05606174bac4A6364B31bd0eCA4bf4dD368f8C6", + "fee_token": "0xdc2CC710e42857672E7907CF474a69B63B93089f", "bridge_tokens": [ "0xe05606174bac4A6364B31bd0eCA4bf4dD368f8C6" ], From 364afc769fe4b2f4bb30297148f61dcff00ade7e Mon Sep 17 00:00:00 2001 From: Jason McInerney Date: Fri, 29 Sep 2023 14:40:11 -0700 Subject: [PATCH 07/12] Adding avax native as fee token. LINK is not an option --- integration-tests/contracts/ccip/laneconfig/contracts.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/contracts/ccip/laneconfig/contracts.json b/integration-tests/contracts/ccip/laneconfig/contracts.json index 0306875062..75f56aa461 100644 --- a/integration-tests/contracts/ccip/laneconfig/contracts.json +++ b/integration-tests/contracts/ccip/laneconfig/contracts.json @@ -236,7 +236,7 @@ } }, "Avalanche Fuji": { - "fee_token": "0x0b9d5D9136855f6FEc3c0993feE6E9CE8a297846", + "fee_token": "0xd00ae08403B9bbb9124bB305C09058E32C39A48c", "bridge_tokens": [ "0x5425890298aed601595a70AB815c96711a31Bc65" ], From 6c3f2a2e1386e62c53355530638531d11dca962b Mon Sep 17 00:00:00 2001 From: Jason McInerney Date: Fri, 29 Sep 2023 15:02:20 -0700 Subject: [PATCH 08/12] Set native fee token to true --- integration-tests/contracts/ccip/laneconfig/contracts.json | 1 + 1 file changed, 1 insertion(+) diff --git a/integration-tests/contracts/ccip/laneconfig/contracts.json b/integration-tests/contracts/ccip/laneconfig/contracts.json index 75f56aa461..2f68c43a6b 100644 --- a/integration-tests/contracts/ccip/laneconfig/contracts.json +++ b/integration-tests/contracts/ccip/laneconfig/contracts.json @@ -237,6 +237,7 @@ }, "Avalanche Fuji": { "fee_token": "0xd00ae08403B9bbb9124bB305C09058E32C39A48c", + "is_native_fee_token": true, "bridge_tokens": [ "0x5425890298aed601595a70AB815c96711a31Bc65" ], From b29a719f36d4c35e224cc580285123e6ac4a4671 Mon Sep 17 00:00:00 2001 From: Jason McInerney Date: Fri, 29 Sep 2023 16:27:26 -0700 Subject: [PATCH 09/12] Add a valid address for WAVAX --- integration-tests/contracts/ccip/laneconfig/contracts.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/contracts/ccip/laneconfig/contracts.json b/integration-tests/contracts/ccip/laneconfig/contracts.json index 2f68c43a6b..81ea06ba42 100644 --- a/integration-tests/contracts/ccip/laneconfig/contracts.json +++ b/integration-tests/contracts/ccip/laneconfig/contracts.json @@ -237,7 +237,7 @@ }, "Avalanche Fuji": { "fee_token": "0xd00ae08403B9bbb9124bB305C09058E32C39A48c", - "is_native_fee_token": true, + "is_native_fee_token":true, "bridge_tokens": [ "0x5425890298aed601595a70AB815c96711a31Bc65" ], From 055af88fa6ffcf8667ce7eb04c3dec2416166040 Mon Sep 17 00:00:00 2001 From: Jason McInerney Date: Fri, 29 Sep 2023 17:07:40 -0700 Subject: [PATCH 10/12] Update all the contracts --- .../contracts/ccip/laneconfig/contracts.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-tests/contracts/ccip/laneconfig/contracts.json b/integration-tests/contracts/ccip/laneconfig/contracts.json index 81ea06ba42..6b99c833d2 100644 --- a/integration-tests/contracts/ccip/laneconfig/contracts.json +++ b/integration-tests/contracts/ccip/laneconfig/contracts.json @@ -361,10 +361,10 @@ "bridge_tokens_pools": [ "0x6cb3ed9b441eb674b58495c8b3324b59faff5243" ], - "arm": "0xeaf6968fab9c54ac31c3679f120705b5019d3546", - "arm_proxy": "0x4eb4dbdb3c3b56e5e209abf9c424a3834f2087d0", - "router": "0xeb52e9ae4a9fb37172978642d4c141ef53876f26", - "price_registry": "0x490f3b46fba6af0d7499867a73469a077251c2bb", + "arm": "0x7103f9da75f04dd452b257aaca23842895ae1920", + "arm_proxy": "0xb140855a247c139710d17ef0eef71e08b7515952", + "router": "0x42415975c9cbcc0a73f8fa90018b55ed3b239273", + "price_registry": "0x85eeae3b41c36819d4fa89d4d74dc45b41b749cc", "wrapped_native": "0x4200000000000000000000000000000000000006", "src_contracts": { "43113": { From 23100edfb00fd26723fbbbf392c4466b1db5b720 Mon Sep 17 00:00:00 2001 From: Jason McInerney Date: Tue, 3 Oct 2023 12:40:47 -0700 Subject: [PATCH 11/12] Getting all the contracts right this time --- .../contracts/ccip/laneconfig/contracts.json | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/integration-tests/contracts/ccip/laneconfig/contracts.json b/integration-tests/contracts/ccip/laneconfig/contracts.json index fa13872338..282d5efa71 100644 --- a/integration-tests/contracts/ccip/laneconfig/contracts.json +++ b/integration-tests/contracts/ccip/laneconfig/contracts.json @@ -352,10 +352,10 @@ "bridge_tokens_pools": [ "0x35e08285cfed1ef159236728f843286c55fc0861" ], - "arm": "0x0ea0d7b2b78dd3a926fc76d6875a287f0aeb158f", - "arm_proxy": "0xac8cfc3762a979628334a0e4c1026244498e821b", - "router": "0x554472a2720e5e7d5d3c817529aba05eed5f82d8", - "price_registry": "0xe42ecce39ce5bd2bbf2443660ba6979eeafd48df", + "arm": "0x7103f9da75f04dd452b257aaca23842895ae1920", + "arm_proxy": "0xb140855a247c139710d17ef0eef71e08b7515952", + "router": "0x42415975c9cbcc0a73f8fa90018b55ed3b239273", + "price_registry": "0x85eeae3b41c36819d4fa89d4d74dc45b41b749cc", "wrapped_native": "0xd00ae08403B9bbb9124bB305C09058E32C39A48c", "src_contracts": { "11155111": { @@ -463,16 +463,17 @@ }, "Optimism Goerli": { "fee_token": "0xdc2CC710e42857672E7907CF474a69B63B93089f", + "is_native_fee_token":true, "bridge_tokens": [ "0xe05606174bac4A6364B31bd0eCA4bf4dD368f8C6" ], "bridge_tokens_pools": [ "0x6cb3ed9b441eb674b58495c8b3324b59faff5243" ], - "arm": "0x7103f9da75f04dd452b257aaca23842895ae1920", - "arm_proxy": "0xb140855a247c139710d17ef0eef71e08b7515952", - "router": "0x42415975c9cbcc0a73f8fa90018b55ed3b239273", - "price_registry": "0x85eeae3b41c36819d4fa89d4d74dc45b41b749cc", + "arm": "0x270dc4218d51bcaa422af27fa9fef7b1025f4822", + "arm_proxy": "0xbf93cf175dad548528829d2558445eea200131c9", + "router": "0xdb12517bc81108f332cfcbe6739c7ab9a4621979", + "price_registry": "0xe7acd5003f2aefceb8499b7acbc05bf8187837ae", "wrapped_native": "0x4200000000000000000000000000000000000006", "src_contracts": { "43113": { From caae895db727b38b0a11173f6da182db27888fe4 Mon Sep 17 00:00:00 2001 From: Jason McInerney Date: Thu, 5 Oct 2023 14:58:50 -0700 Subject: [PATCH 12/12] Update contracts.json for USDC smoke and load --- integration-tests/contracts/ccip/laneconfig/contracts.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-tests/contracts/ccip/laneconfig/contracts.json b/integration-tests/contracts/ccip/laneconfig/contracts.json index 282d5efa71..d2122020a7 100644 --- a/integration-tests/contracts/ccip/laneconfig/contracts.json +++ b/integration-tests/contracts/ccip/laneconfig/contracts.json @@ -380,7 +380,7 @@ "420": { "off_ramp": "0x8cd9e1a0192862746037d751afbf07fb103c9ae6", "commit_store": "0xc016efee15f75ef18c7db523cea63b3f01f8ca37", - "receiver_dapp": "0xda9e8e71bB750a996Af33ebB8aBb18cd9EB9DC75" + "receiver_dapp": "0x8Ed27Ab67aea9BC50628fba25ab52D23ae8d0eae" }, "80001": { "off_ramp": "0x31cf2040d53f178d168997c658d1a7fc5fa7d215", @@ -501,7 +501,7 @@ "43113": { "off_ramp": "0x688f944c37abee17e0de9df89fb4bd85dacd9dfd", "commit_store": "0x31f243a32291096413899a480ed781b27ad4de75", - "receiver_dapp": "0xda9e8e71bB750a996Af33ebB8aBb18cd9EB9DC75" + "receiver_dapp": "0x8Ed27Ab67aea9BC50628fba25ab52D23ae8d0eae" }, "11155111": { "off_ramp": "0xdc4606e96c37b877f2c9ddda82104c85a198a82d",