Redeploy swap (#110)

* Redeploy swap * upgrade protocol-contracts * redeploy contracts * update deployParams log * update yarn
zeta-chain · Aug 1, 2023 · 715d418 · 715d418
1 parent 2df7647
commit 715d418
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 40 deletions.
diff --git a/packages/addresses-tools/src/networks.ts b/packages/addresses-tools/src/networks.ts
@@ -18,7 +18,7 @@ export const getHardhatConfigNetworks = (PRIVATE_KEYS: string[]): NetworksUserCo
     accounts: PRIVATE_KEYS,
     gas: 5000000,
     gasPrice: 80000000000,
-    url: `https://data-seed-prebsc-1-s1.binance.org:8545`,
+    url: `https://rpc.ankr.com/bsc_testnet_chapel`,
   },
   "eth-localnet": {
     gas: 2100000,

diff --git a/packages/addresses/src/addresses.athens.json b/packages/addresses/src/addresses.athens.json
@@ -5,19 +5,19 @@
     "crossChainNft": "",
     "dai": "",
     "immutableCreate2Factory": "0x095a03c6a68137fE9a566bBc3e552F299d8b886d",
-    "multiChainSwap": "",
+    "multiChainSwap": "0x8BD7144Ddb59c9Fa3Dcf809998521E9cAD946fa1",
     "multiChainSwapZetaConnector": "",
     "multiChainValue": "0x064516547ECd3b2D1709e1b2798Aae92b1C8a84C",
     "tridentPoolFactory": "",
     "tss": "0x8531a5aB847ff5B22D855633C25ED1DA3255247e",
     "tssUpdater": "0x55122f7590164Ac222504436943FAB17B62F5d7d",
     "uniswapV2Factory": "",
-    "uniswapV2Router02": "0x9Ac64Cc6e4415144C455BD8E4837Fea55603e5c3",
-    "uniswapV3NftManager": "",
-    "uniswapV3Quoter": "",
-    "uniswapV3Router": "",
+    "uniswapV2Router02": "0xD99D1c33F9fC3444f8101754aBC46c52416550D1",
+    "uniswapV3PoolFactory": "",
+    "uniswapV3Quoter": "0x10ed43c718714eb63d5aa57b78b54704e256024e",
+    "uniswapV3Router": "0x10ed43c718714eb63d5aa57b78b54704e256024e",
     "usdc": "",
-    "weth9": "",
+    "weth9": "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c",
     "zetaSwap": "",
     "zetaSwapBtcInbound": "",
     "zetaToken": "0x0000c9ec4042283e8139c74f4c64bcd1e0b9b54f",
@@ -30,15 +30,15 @@
     "crossChainNft": "",
     "dai": "",
     "immutableCreate2Factory": "0x095a03c6a68137fE9a566bBc3e552F299d8b886d",
-    "multiChainSwap": "",
+    "multiChainSwap": "0x323745f16C93e56a98012970c28788498d8B3a14",
     "multiChainSwapZetaConnector": "",
     "multiChainValue": "0x14BeC0E4A8e7bF7A02Af54Ad81a57a9fcA4D37Fd",
     "tridentPoolFactory": "",
     "tss": "0x8531a5aB847ff5B22D855633C25ED1DA3255247e",
     "tssUpdater": "0x55122f7590164Ac222504436943FAB17B62F5d7d",
     "uniswapV2Factory": "",
     "uniswapV2Router02": "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
-    "uniswapV3NftManager": "",
+    "uniswapV3PoolFactory": "",
     "uniswapV3Quoter": "",
     "uniswapV3Router": "",
     "usdc": "",
@@ -50,20 +50,20 @@
     "zetaTokenConsumerUniV3": ""
   },
   "polygon-mumbai": {
-    "connector": "0x00005e3125aba53c5652f9f0ce1a4cf91d8b15ea",
+    "connector": "0x0000ecb8cdd25a18f12daa23f6422e07fbf8b9e1",
     "crossChainCounter": "",
     "crossChainNft": "",
     "dai": "",
     "immutableCreate2Factory": "0x095a03c6a68137fE9a566bBc3e552F299d8b886d",
-    "multiChainSwap": "",
+    "multiChainSwap": "0xb1b812b664c28E1bA1d35De925Ae88b7Bc7cdCF5",
     "tridentPoolFactory": "",
     "multiChainSwapZetaConnector": "",
     "multiChainValue": "0x14BeC0E4A8e7bF7A02Af54Ad81a57a9fcA4D37Fd",
     "tss": "0x8531a5aB847ff5B22D855633C25ED1DA3255247e",
     "tssUpdater": "0x55122f7590164Ac222504436943FAB17B62F5d7d",
     "uniswapV2Factory": "",
     "uniswapV2Router02": "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
-    "uniswapV3NftManager": "",
+    "uniswapV3PoolFactory": "0x1F98431c8aD98523631AE4a59f267346ea31F984",
     "uniswapV3Quoter": "0xb27308f9F90D607463bb33eA1BeBb41C27CE5AB6",
     "uniswapV3Router": "0xE592427A0AEce92De3Edee1F18E0157C05861564",
     "usdc": "",
@@ -87,7 +87,7 @@
     "tssUpdater": "",
     "uniswapV2Factory": "",
     "uniswapV2Router02": "",
-    "uniswapV3NftManager": "",
+    "uniswapV3PoolFactory": "",
     "uniswapV3Quoter": "",
     "uniswapV3Router": "",
     "usdc": "",
@@ -112,7 +112,7 @@
     "tssUpdater": "",
     "uniswapV2Factory": "0x9fd96203f7b22bCF72d9DCb40ff98302376cE09c",
     "uniswapV2Router02": "0x2ca7d64A7EFE2D62A725E2B35Cf7230D6677FfEe",
-    "uniswapV3NftManager": "",
+    "uniswapV3PoolFactory": "",
     "uniswapV3Quoter": "",
     "uniswapV3Router": "",
     "usdc": "",
@@ -137,7 +137,7 @@
     "tssUpdater": "",
     "uniswapV2Factory": "",
     "uniswapV2Router02": "",
-    "uniswapV3NftManager": "",
+    "uniswapV3PoolFactory": "",
     "uniswapV3Quoter": "",
     "uniswapV3Router": "",
     "usdc": "",

diff --git a/packages/addresses/src/addresses.helpers.ts b/packages/addresses/src/addresses.helpers.ts
@@ -16,7 +16,7 @@ export type ZetaAddress =
   | "tssUpdater"
   | "uniswapV2Factory"
   | "uniswapV2Router02"
-  | "uniswapV3NftManager"
+  | "uniswapV3PoolFactory"
   | "uniswapV3Quoter"
   | "uniswapV3Router"
   | "usdc"
@@ -42,7 +42,7 @@ const zetaAddresses: Record<ZetaAddress, boolean> = {
   tssUpdater: true,
   uniswapV2Factory: true,
   uniswapV2Router02: true,
-  uniswapV3NftManager: true,
+  uniswapV3PoolFactory: true,
   uniswapV3Quoter: true,
   uniswapV3Router: true,
   usdc: true,

diff --git a/packages/addresses/src/addresses.mainnet.json b/packages/addresses/src/addresses.mainnet.json
@@ -8,7 +8,7 @@
     "tss": "",
     "tssUpdater": "",
     "uniswapV2Router02": "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
-    "uniswapV3NftManager": "0xC36442b4a4522E871399CD717aBDD847Ab11FE88",
+    "uniswapV3PoolFactory": "0xC36442b4a4522E871399CD717aBDD847Ab11FE88",
     "uniswapV3Quoter": "0xb27308f9F90D607463bb33eA1BeBb41C27CE5AB6",
     "uniswapV3Router": "0xE592427A0AEce92De3Edee1F18E0157C05861564",
     "usdc": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
@@ -31,7 +31,7 @@
     "tss": "",
     "tssUpdater": "",
     "uniswapV2Router02": "",
-    "uniswapV3NftManager": "",
+    "uniswapV3PoolFactory": "",
     "uniswapV3Quoter": "",
     "uniswapV3Router": "",
     "usdc": "",
@@ -45,4 +45,4 @@
     "uniswapV2Factory": "",
     "zetaSwap": ""
   }
-}
+}
diff --git a/packages/addresses/src/addresses.troy.json b/packages/addresses/src/addresses.troy.json
@@ -9,7 +9,7 @@
     "tss": "0x70997970c51812dc3a010c7d01b50e0d17dc79c8",
     "tssUpdater": "0x70997970c51812dc3a010c7d01b50e0d17dc79c8",
     "uniswapV2Router02": "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
-    "uniswapV3NftManager": "",
+    "uniswapV3PoolFactory": "",
     "uniswapV3Quoter": "",
     "uniswapV3Router": "",
     "usdc": "",
@@ -27,12 +27,12 @@
     "crossChainCounter": "",
     "crossChainNft": "",
     "dai": "",
-    "multiChainSwap":"",
+    "multiChainSwap": "",
     "multiChainValue": "",
     "tss": "0x8C001e2204000D8ED10cAcf0F68106b68e036A26",
     "tssUpdater": "0xfBec4048e09749515110c89D881EcDcA4460D377",
     "uniswapV2Router02": "",
-    "uniswapV3NftManager": "",
+    "uniswapV3PoolFactory": "",
     "uniswapV3Quoter": "",
     "uniswapV3Router": "",
     "usdc": "",
@@ -50,12 +50,12 @@
     "crossChainCounter": "",
     "crossChainNft": "",
     "dai": "",
-    "multiChainSwap":"",
+    "multiChainSwap": "",
     "multiChainValue": "",
     "tss": "0x8C001e2204000D8ED10cAcf0F68106b68e036A26",
     "tssUpdater": "0x12Dc2227AA4b98b00Ff8148fDA9Ef750929B0F68",
     "uniswapV2Router02": "",
-    "uniswapV3NftManager": "",
+    "uniswapV3PoolFactory": "",
     "uniswapV3Quoter": "",
     "uniswapV3Router": "",
     "usdc": "",
@@ -73,12 +73,12 @@
     "crossChainCounter": "",
     "crossChainNft": "",
     "dai": "",
-    "multiChainSwap":"",
+    "multiChainSwap": "",
     "multiChainValue": "",
     "tss": "0x8C001e2204000D8ED10cAcf0F68106b68e036A26",
     "tssUpdater": "0x78C18E214174A08Fc32e174fb203Aba05B016789",
     "uniswapV2Router02": "",
-    "uniswapV3NftManager": "",
+    "uniswapV3PoolFactory": "",
     "uniswapV3Quoter": "",
     "uniswapV3Router": "",
     "usdc": "",

diff --git a/packages/example-contracts/contracts/multi-chain-swap/MultiChainSwapUniV3.strategy.sol b/packages/example-contracts/contracts/multi-chain-swap/MultiChainSwapUniV3.strategy.sol
@@ -16,12 +16,19 @@ contract MultiChainSwapUniV3 is MultiChainSwap, ZetaInteractor, MultiChainSwapEr
         address zetaConnector_,
         address zetaToken_,
         address uniswapV3Router_,
-        address quoter_,
+        address uniswapV3Factory_,
         address WETH9Address_,
         uint24 zetaPoolFee_,
         uint24 tokenPoolFee_
     )
-        ZetaTokenConsumerUniV3(zetaToken_, uniswapV3Router_, quoter_, WETH9Address_, zetaPoolFee_, tokenPoolFee_)
+        ZetaTokenConsumerUniV3(
+            zetaToken_,
+            uniswapV3Router_,
+            uniswapV3Factory_,
+            WETH9Address_,
+            zetaPoolFee_,
+            tokenPoolFee_
+        )
         ZetaInteractor(zetaConnector_)
     {}
 

diff --git a/packages/example-contracts/package.json b/packages/example-contracts/package.json
@@ -36,7 +36,7 @@
     "@uniswap/v3-periphery": "1.1.0",
     "@zetachain/addresses": "workspace:^",
     "@zetachain/addresses-tools": "workspace:^",
-    "@zetachain/protocol-contracts": "^0.0.7",
+    "@zetachain/protocol-contracts": "^0.0.8",
     "ethers": "5.6.8"
   }
-}
+}
diff --git a/packages/example-contracts/scripts/multi-chain-swap/deploy-multi-chain-swap-v3.ts b/packages/example-contracts/scripts/multi-chain-swap/deploy-multi-chain-swap-v3.ts
@@ -4,6 +4,8 @@ import { network } from "hardhat";
 
 import { getMultiChainSwapUniV3 } from "../../lib/multi-chain-swap/MultiChainSwap.helpers";
 import { getAddress } from "../../lib/shared/address.helpers";
+import { GetContractParams } from "../../lib/shared/deploy.helpers";
+import { MultiChainSwapUniV3__factory } from "../../typechain-types";
 
 export async function deployMultiChainSwap() {
   if (!isNetworkName(network.name) || !network.name) throw new Error("Invalid network name");
@@ -12,15 +14,19 @@ export async function deployMultiChainSwap() {
 
   const ZETA_TOKEN = getAddress("zetaToken");
 
-  const UNI_QUOTER_V3 = getAddress("uniswapV3Quoter");
+  const UNI_FACTORY_V3 = getAddress("uniswapV3PoolFactory");
 
   const UNI_ROUTER_V3 = getAddress("uniswapV3Router");
 
   const WETH = getAddress("weth9");
 
-  const multiChainSwapContract = await getMultiChainSwapUniV3({
-    deployParams: [CONNECTOR, ZETA_TOKEN, UNI_ROUTER_V3, UNI_QUOTER_V3, WETH, 500, 3000]
-  });
+  const deployParams: GetContractParams<MultiChainSwapUniV3__factory> = {
+    deployParams: [CONNECTOR, ZETA_TOKEN, UNI_ROUTER_V3, UNI_FACTORY_V3, WETH, 500, 3000]
+  };
+
+  console.log(deployParams);
+
+  const multiChainSwapContract = await getMultiChainSwapUniV3(deployParams);
 
   saveAddress("multiChainSwap", multiChainSwapContract.address);
 }

diff --git a/packages/example-contracts/scripts/multi-chain-swap/deploy-multi-chain-swap.ts b/packages/example-contracts/scripts/multi-chain-swap/deploy-multi-chain-swap.ts
@@ -7,6 +7,7 @@ import { getAddress } from "../../lib/shared/address.helpers";
 
 export async function deployMultiChainSwap() {
   if (!isNetworkName(network.name) || !network.name) throw new Error("Invalid network name");
+  console.log([getAddress("connector"), getAddress("zetaToken"), getAddress("uniswapV2Router02")]);
 
   const multiChainSwapContract = await getMultiChainSwapUniV2({
     deployParams: [getAddress("connector"), getAddress("zetaToken"), getAddress("uniswapV2Router02")]

diff --git a/yarn.lock b/yarn.lock
@@ -2726,7 +2726,7 @@ __metadata:
     "@uniswap/v3-periphery": 1.1.0
     "@zetachain/addresses": "workspace:^"
     "@zetachain/addresses-tools": "workspace:^"
-    "@zetachain/protocol-contracts": ^0.0.7
+    "@zetachain/protocol-contracts": ^0.0.8
     ethers: 5.6.8
     hardhat-gas-reporter: ^1.0.8
     solidity-coverage: ^0.7.20
@@ -2741,10 +2741,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@zetachain/protocol-contracts@npm:^0.0.7":
-  version: 0.0.7
-  resolution: "@zetachain/protocol-contracts@npm:0.0.7"
-  checksum: 83cf3d534878b5748479a18aec8702c45db74b92473cc1ab693562623e5e11a5270f4b5bd9ca52c1adc1ebeea5f5e5ebb9089be7d171a975cefbf37f586f8bd5
+"@zetachain/protocol-contracts@npm:^0.0.8":
+  version: 0.0.8
+  resolution: "@zetachain/protocol-contracts@npm:0.0.8"
+  checksum: 050d31604636ba09e1ff7a0ba4d8341c50d0b78883b67c90018957697791afed41d0428f0423591d22bf6c088d0499c075243bb88860953376b539c25966bc2c
   languageName: node
   linkType: hard