use registry in swap

Author: fadeev

examples/swap/commands/deploy.ts

@@ -22,7 +22,7 @@ const main = async (opts: any) => {
 
     const initData = new ethers.utils.Interface(abi).encodeFunctionData(
       "initialize",
-      [opts.uniswapRouter, opts.gasLimit, signer.address]
+      [opts.gasLimit, signer.address]
     );
 
     const { abi: proxyAbi, bytecode: proxyBytecode } = getAbi("ERC1967Proxy");
@@ -74,16 +74,6 @@ export const deploy = new Command("deploy")
   )
   .requiredOption("-k, --private-key <key>", "Private key")
   .option("-n, --name <name>", "Contract name", "Swap")
-  .requiredOption(
-    "-u, --uniswap-router <address>",
-    "Uniswap V2 Router address (default: testnet)",
-    "0x2ca7d64A7EFE2D62A725E2B35Cf7230D6677FfEe"
-  )
-  .option(
-    "-g, --gateway <address>",
-    "Gateway address (default: testnet)",
-    "0x6c533f7fe93fae114d0954697069df33c9b74fd7"
-  )
   .option("--gas-limit <number>", "Gas limit for the transaction", "1000000")
   .option(
     "--tx-gas-limit <number>",

examples/swap/contracts/Swap.sol

@@ -40,13 +40,15 @@ contract Swap is
     }
 
     function initialize(
-        address uniswapRouterAddress,
         uint256 gasLimitAmount,
         address owner
     ) external initializer {
         __UUPSUpgradeable_init();
         __Ownable_init(owner);
-        uniswapRouter = uniswapRouterAddress;
+        (bool active, bytes memory uniswapRouterBytes) = registry
+          .getContractInfo(block.chainid, "uniswapV2Router02");
+        if (!active) revert InvalidAddress();
+        uniswapRouter = address(uint160(bytes20(uniswapRouterBytes)));
         gasLimit = gasLimitAmount;
     }
 

examples/swap/scripts/localnet.sh

@@ -13,18 +13,14 @@ ZRC20_ETHEREUM=$(jq -r '."11155112".zrc20Tokens[] | select(.coinType == "gas" an
 USDC_ETHEREUM=$(jq -r '."11155112".zrc20Tokens[] | select(.symbol == "USDC.ETH") | .address' ~/.zetachain/localnet/registry.json) && echo $USDC_ETHEREUM
 GATEWAY_ETHEREUM=$(jq -r '.["11155112"].contracts[] | select(.contractType == "gateway") | .address' ~/.zetachain/localnet/registry.json) && echo $GATEWAY_ETHEREUM
 GATEWAY_BNB=$(jq -r '."98".contracts[] | select(.contractType == "gateway") | .address' ~/.zetachain/localnet/registry.json) && echo $GATEWAY_BNB
-GATEWAY_ZETACHAIN=$(jq -r '.["31337"].contracts[] | select(.contractType == "gateway") | .address' ~/.zetachain/localnet/registry.json) && echo $GATEWAY_ZETACHAIN
-UNISWAP_ROUTER=$(jq -r '."31337".contracts[] | select(.contractType == "uniswapV2Router02") | .address' ~/.zetachain/localnet/registry.json) && echo $UNISWAP_ROUTER
 WZETA=$(jq -r '."31337".contracts[] | select(.contractType == "zetaToken") | .address' ~/.zetachain/localnet/registry.json) && echo $WZETA
 PRIVATE_KEY=$(jq -r '.private_keys[0]' ~/.zetachain/localnet/anvil.json) && echo $PRIVATE_KEY
 RECIPIENT=$(cast wallet address $PRIVATE_KEY) && echo $RECIPIENT
 RPC=http://localhost:8545
 
 UNIVERSAL=$(npx ts-node commands/index.ts deploy \
   --private-key $PRIVATE_KEY \
-  --gateway $GATEWAY_ZETACHAIN \
-  --rpc $RPC \
-  --uniswap-router $UNISWAP_ROUTER | jq -r .contractAddress)
+  --rpc $RPC | jq -r .contractAddress)
 
 npx zetachain evm deposit-and-call \
   --rpc http://localhost:8545 \