v1.0.11 (#38)

* bump v1.0.11, include utils in dist

* refactor

* use Awaited

Author: shunjizhan

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/asset-router",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "main": "dist/index.js",
   "repository": "[email protected]:AcalaNetwork/asset-router.git",
   "author": "Acala Developers <[email protected]>",

scripts/deploy-fee.ts

@@ -1,7 +1,8 @@
-import { ethers, run, network } from 'hardhat';
-import { ROUTER_TOKEN_INFO } from './consts';
+import { ethers, network, run } from 'hardhat';
 import { parseUnits } from 'ethers/lib/utils';
+
 import { FeeStruct } from '../typechain-types/src/FeeRegistry';
+import { ROUTER_TOKEN_INFO } from './consts';
 
 async function main() {
   const isAcala = network.name === 'acala';

scripts/route-wormhole.ts

@@ -1,7 +1,37 @@
 import { CHAIN_ID_ETH, tryNativeToHexString } from '@certusone/wormhole-sdk';
-import { ethers } from 'hardhat';
 import { WormholeInstructionsStruct } from '../typechain-types/src/Factory';
-import { loadSetups } from './utils';
+import { ethers, network } from 'hardhat';
+
+import { ADDRESSES } from './consts';
+
+export const loadSetups = async () => {
+  const [[deployer, user, relayer], FeeRegistry, Factory, Token] = await Promise.all([
+    ethers.getSigners(),
+    ethers.getContractFactory('FeeRegistry'),
+    ethers.getContractFactory('Factory'),
+    ethers.getContractFactory('MockToken'),
+  ]);
+
+  const { usdcAddr, factoryAddr, feeAddr } = ADDRESSES[network.name];
+
+  const usdt = Token.attach(usdcAddr);
+  const fee = FeeRegistry.attach(feeAddr);
+  const factory = Factory.attach(factoryAddr).connect(relayer);
+
+  console.log('setup finished');
+  console.log({
+    deployerAddr: deployer.address,
+    userAddr: user.address,
+    relayerAddr: relayer.address,
+    factoryAddr: factory.address,
+    usdcAddr: usdcAddr,
+    feeRegistryAddr: fee.address,
+    routerFee: ethers.utils.formatEther(await fee.getFee(usdcAddr)),
+  });
+  console.log('');
+
+  return { deployer, user, relayer, usdt, fee, factory, ...ADDRESSES[network.name] };
+};
 
 async function main() {
   const { deployer, user, relayer, usdt, fee, factory, tokenBridgeAddr } = await loadSetups();

scripts/utils.ts

@@ -1,48 +1,14 @@
 
 import { BigNumber } from 'ethers';
 import { decodeAddress } from '@polkadot/util-crypto';
-import { ethers, network } from 'hardhat';
 import { formatUnits, parseEther } from 'ethers/lib/utils';
 
-import { ADDRESSES } from './consts';
-
-export const loadSetups = async () => {
-  const [[deployer, user, relayer], FeeRegistry, Factory, Token] = await Promise.all([
-    ethers.getSigners(),
-    ethers.getContractFactory('FeeRegistry'),
-    ethers.getContractFactory('Factory'),
-    ethers.getContractFactory('MockToken'),
-  ]);
-
-  const { usdcAddr, factoryAddr, feeAddr } = ADDRESSES[network.name];
-
-  const usdt = Token.attach(usdcAddr);
-  const fee = FeeRegistry.attach(feeAddr);
-  const factory = Factory.attach(factoryAddr).connect(relayer);
-
-  console.log('setup finished');
-  console.log({
-    deployerAddr: deployer.address,
-    userAddr: user.address,
-    relayerAddr: relayer.address,
-    factoryAddr: factory.address,
-    usdcAddr: usdcAddr,
-    feeRegistryAddr: fee.address,
-    routerFee: ethers.utils.formatEther(await fee.getFee(usdcAddr)),
-  });
-  console.log('');
-
-  return { deployer, user, relayer, usdt, fee, factory, ...ADDRESSES[network.name] };
-};
-
 // convert evm addr to bytes32 with prefix of `evm:` and suffix of 8 bytes of zeros
 const EVM_PREFIX = '65766d3a';    // evm:
 export const evmToAddr32 = (addr: string) => `0x${EVM_PREFIX}${addr.slice(2)}${'0'.repeat(16)}`;
 
 export const nativeToAddr32 = (addr: string) => '0x' + Buffer.from(decodeAddress(addr)).toString('hex');
 
-export type Resolved<T> = T extends Promise<infer U> ? U : T;
-
 export const toHuman = (amount: BigNumber, decimals: number) => Number(formatUnits(amount, decimals));
 
 export const almostEq = (a: BigNumber, b: BigNumber) => {

test/config.test.ts

@@ -1,15 +1,16 @@
+import { Bridge__factory } from '@certusone/wormhole-sdk/lib/cjs/ethers-contracts';
+import { CONTRACTS, ChainName, tryNativeToHexString } from '@certusone/wormhole-sdk';
+import { JsonRpcProvider } from '@ethersproject/providers';
 import { expect } from 'chai';
+
 import {
   CHAIN,
   CHAIN_NAME,
   CHAIN_NAME_TO_WORMHOLE_CHAIN_ID,
-  ROUTER_TOKEN_INFO,
   ROUTER_CHAIN,
+  ROUTER_TOKEN_INFO,
 } from '../scripts/consts';
 import { MockToken__factory } from '../dist/typechain-types';
-import { JsonRpcProvider } from '@ethersproject/providers';
-import { Bridge__factory } from '@certusone/wormhole-sdk/lib/cjs/ethers-contracts';
-import { CONTRACTS, ChainName, tryNativeToHexString } from '@certusone/wormhole-sdk';
 
 const getProvider = (networkName: string) => {
   const ethRpc = ({

test/homa-router.test.ts

@@ -9,7 +9,7 @@ import { formatEther, parseEther, parseUnits } from 'ethers/lib/utils';
 
 import { ADDRESSES } from '../scripts/consts';
 import { FeeRegistry, HomaFactory, MockToken } from '../typechain-types';
-import { ONE_ACA, Resolved, almostEq, evmToAddr32, nativeToAddr32, toHuman } from '../scripts/utils';
+import { ONE_ACA, almostEq, evmToAddr32, nativeToAddr32, toHuman } from '../scripts/utils';
 
 const { homaFactoryAddr, feeAddr, accountHelperAddr } = ADDRESSES.ACALA;
 
@@ -28,8 +28,8 @@ describe('Homa Router', () => {
 
   // dynamic
   let routerAddr: string;
-  let bal0: Resolved<ReturnType<typeof fetchTokenBalances>>;
-  let bal1: Resolved<ReturnType<typeof fetchTokenBalances>>;
+  let bal0: Awaited<ReturnType<typeof fetchTokenBalances>>;
+  let bal1: Awaited<ReturnType<typeof fetchTokenBalances>>;
 
   const fetchTokenBalances = async () => {
     const [

test/xcm-route.test.ts

@@ -1,15 +1,13 @@
-import { expect } from 'chai';
-import { ethers } from 'hardhat';
-import { Xtokens__factory } from '@acala-network/contracts/typechain';
-import { XTOKENS } from '@acala-network/contracts/utils/Predeploy';
 import { BigNumber, Contract } from 'ethers';
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
+import { XTOKENS } from '@acala-network/contracts/utils/Predeploy';
+import { Xtokens__factory } from '@acala-network/contracts/typechain';
+import { ethers } from 'hardhat';
+import { expect } from 'chai';
 
-import { FeeRegistry, MockToken } from '../typechain-types';
-import { Factory, XcmInstructionsStruct } from '../typechain-types/src/Factory';
 import { ADDRESSES } from '../scripts/consts';
-
-type Resolved<T> = T extends Promise<infer U> ? U : T;
+import { Factory, XcmInstructionsStruct } from '../typechain-types/src/Factory';
+import { FeeRegistry, MockToken } from '../typechain-types';
 
 const {
   feeAddr,
@@ -30,9 +28,9 @@ describe('XcmRouter', () => {
 
   // dynamic
   let routerAddr: string;
-  let bal0: Resolved<ReturnType<typeof fetchTokenBalances>>;
-  let bal1: Resolved<ReturnType<typeof fetchTokenBalances>>;
-  let bal2: Resolved<ReturnType<typeof fetchTokenBalances>>;
+  let bal0: Awaited<ReturnType<typeof fetchTokenBalances>>;
+  let bal1: Awaited<ReturnType<typeof fetchTokenBalances>>;
+  let bal2: Awaited<ReturnType<typeof fetchTokenBalances>>;
   let xcmInstruction: XcmInstructionsStruct;
 
   const fetchTokenBalances = async () => {

tsconfig-cjs.json

@@ -7,6 +7,7 @@
   },
   "include": [
     "./typechain-types",
-    "./scripts/consts.ts"
+    "./scripts/consts.ts",
+    "./scripts/utils.ts",
   ]
 }