diff --git a/packages/localnet/src/createToken.ts b/packages/localnet/src/createToken.ts index a25c08e..4417b84 100644 --- a/packages/localnet/src/createToken.ts +++ b/packages/localnet/src/createToken.ts @@ -84,8 +84,6 @@ export const createToken = async ({ .connect(fungibleModuleSigner) .setGasCoinZRC20(1, zrc20.target); (systemContract as any).connect(fungibleModuleSigner).setGasPrice(1, 1); - - console.log("!!!", "erc20", symbol, erc20.target); } foreignCoins.push({ @@ -141,5 +139,4 @@ export const createToken = async ({ Math.floor(Date.now() / 1000) + 60 * 10, // Deadline deployOpts ); - console.log("!!!", "zrc20", symbol, zrc20.target); }; diff --git a/packages/localnet/src/index.ts b/packages/localnet/src/index.ts index 2fe9538..b3d6c68 100755 --- a/packages/localnet/src/index.ts +++ b/packages/localnet/src/index.ts @@ -204,7 +204,7 @@ const deployProtocolContracts = async ( await uniswapRouterInstance.getAddress() ); - createToken({ + await createToken({ fungibleModuleSigner, deployer, systemContract, @@ -219,7 +219,7 @@ const deployProtocolContracts = async ( isGasToken: false, }); - createToken({ + await createToken({ fungibleModuleSigner, deployer, systemContract, @@ -256,9 +256,6 @@ const deployProtocolContracts = async ( testEVMZeta, wzeta, tss, - zrc20Eth: "", - zrc20Usdc: "", - testERC20USDC: "", uniswapFactoryInstance, uniswapRouterInstance, uniswapFactoryAddressZetaChain: await uniswapFactoryInstance.getAddress(), @@ -346,12 +343,10 @@ export const initLocalnet = async (port: number) => { gatewayZetaChain: protocolContracts.gatewayZEVM.target, zetaEVM: protocolContracts.testEVMZeta.target, zetaZetaChain: protocolContracts.wzeta.target, - zrc20ETHZetaChain: protocolContracts.zrc20Eth.target, - zrc20USDCZetaChain: protocolContracts.zrc20Usdc.target, - erc20UsdcEVM: protocolContracts.testERC20USDC.target, uniswapFactory: protocolContracts.uniswapFactoryInstance.target, uniswapRouter: protocolContracts.uniswapRouterInstance.target, fungibleModuleZetaChain: FUNGIBLE_MODULE_ADDRESS, + foreignCoins, sytemContractZetaChain: protocolContracts.systemContract.target, custodyEVM: protocolContracts.custodyEVM.target, tssEVM: await tss.getAddress(), diff --git a/packages/tasks/src/localnet.ts b/packages/tasks/src/localnet.ts index 89da6b0..a58366b 100644 --- a/packages/tasks/src/localnet.ts +++ b/packages/tasks/src/localnet.ts @@ -30,9 +30,13 @@ EVM Contract Addresses Gateway EVM: ${addr.gatewayEVM} ERC-20 custody: ${addr.custodyEVM} TSS: ${addr.tssEVM} -ZETA: ${addr.zetaEVM} -ERC-20 USDC: ${addr.erc20UsdcEVM} -`); +ZETA: ${addr.zetaEVM}`); + + addr.foreignCoins + .filter((coin: any) => coin.asset !== "") + .forEach((coin: any) => { + console.log(ansis.cyan`ERC-20 ${coin.symbol}: ${coin.asset}`); + }); console.log(ansis.green` ZetaChain Contract Addresses @@ -40,11 +44,14 @@ ZetaChain Contract Addresses Gateway ZetaChain: ${addr.gatewayZetaChain} ZETA: ${addr.zetaZetaChain} -ZRC-20 ETH: ${addr.zrc20ETHZetaChain} -ZRC-20 USDC: ${addr.zrc20USDCZetaChain} Fungible module: ${addr.fungibleModuleZetaChain} -System contract: ${addr.sytemContractZetaChain} -`); +System contract: ${addr.sytemContractZetaChain}`); + + addr.foreignCoins.forEach((coin: any) => { + console.log( + ansis.green`ZRC-20 ${coin.symbol}: ${coin.zrc20_contract_address}` + ); + }); process.on("SIGINT", () => { console.log("\nReceived Ctrl-C, shutting down anvil...");