@hyperlane-xyz/sdk 3.20.0-beta0 → 4.0.0-alpha

package/dist/token/contracts.js

@@ -1,28 +1,29 @@
-import { FastHypERC20Collateral__factory, FastHypERC20__factory, HypERC20CollateralVaultDeposit__factory, HypERC20Collateral__factory, HypERC20__factory, HypERC721Collateral__factory, HypERC721URICollateral__factory, HypERC721URIStorage__factory, HypERC721__factory, HypNativeScaled__factory, HypNative__factory, } from '@hyperlane-xyz/core';
-import { proxiedFactories } from '../router/types.js';
+import { FastHypERC20Collateral__factory, FastHypERC20__factory, HypERC20CollateralVaultDeposit__factory, HypERC20Collateral__factory, HypERC20__factory, HypERC721Collateral__factory, HypERC721URICollateral__factory, HypERC721URIStorage__factory, HypERC721__factory, HypFiatToken__factory, HypNativeScaled__factory, HypNative__factory, HypXERC20Lockbox__factory, HypXERC20__factory, } from '@hyperlane-xyz/core';
 import { TokenType } from './config.js';
 export const hypERC20contracts = {
     [TokenType.fastCollateral]: 'FastHypERC20Collateral',
     [TokenType.fastSynthetic]: 'FastHypERC20',
     [TokenType.synthetic]: 'HypERC20',
     [TokenType.collateral]: 'HypERC20Collateral',
+    [TokenType.collateralFiat]: 'HypFiatToken',
+    [TokenType.XERC20]: 'HypXERC20',
+    [TokenType.XERC20Lockbox]: 'HypXERC20Lockbox',
     [TokenType.collateralVault]: 'HypERC20CollateralVaultDeposit',
     [TokenType.native]: 'HypNative',
     [TokenType.nativeScaled]: 'HypNativeScaled',
 };
-export const hypERC20Tokenfactories = {
+export const hypERC20factories = {
     [TokenType.fastCollateral]: new FastHypERC20Collateral__factory(),
     [TokenType.fastSynthetic]: new FastHypERC20__factory(),
     [TokenType.synthetic]: new HypERC20__factory(),
     [TokenType.collateral]: new HypERC20Collateral__factory(),
     [TokenType.collateralVault]: new HypERC20CollateralVaultDeposit__factory(),
+    [TokenType.collateralFiat]: new HypFiatToken__factory(),
+    [TokenType.XERC20]: new HypXERC20__factory(),
+    [TokenType.XERC20Lockbox]: new HypXERC20Lockbox__factory(),
     [TokenType.native]: new HypNative__factory(),
     [TokenType.nativeScaled]: new HypNativeScaled__factory(),
 };
-export const hypERC20factories = {
-    ...hypERC20Tokenfactories,
-    ...proxiedFactories,
-};
 export const hypERC721contracts = {
     [TokenType.collateralUri]: 'HypERC721URICollateral',
     [TokenType.collateral]: 'HypERC721Collateral',
@@ -34,6 +35,5 @@ export const hypERC721factories = {
     [TokenType.collateral]: new HypERC721Collateral__factory(),
     [TokenType.syntheticUri]: new HypERC721URIStorage__factory(),
     [TokenType.synthetic]: new HypERC721__factory(),
-    ...proxiedFactories,
 };
 //# sourceMappingURL=contracts.js.map

package/dist/token/contracts.js.map

@@ -1 +1 @@
-{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../src/token/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,EAC/B,qBAAqB,EACrB,uCAAuC,EACvC,2BAA2B,EAC3B,iBAAiB,EACjB,4BAA4B,EAC5B,+BAA+B,EAC/B,4BAA4B,EAC5B,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,wBAAwB;IACpD,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,cAAc;IACzC,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,UAAU;IACjC,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,oBAAoB;IAC5C,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,gCAAgC;IAC7D,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,WAAW;IAC/B,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,iBAAiB;CAC5C,CAAC;AAGF,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,IAAI,+BAA+B,EAAE;IACjE,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,IAAI,qBAAqB,EAAE;IACtD,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,IAAI,iBAAiB,EAAE;IAC9C,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,IAAI,2BAA2B,EAAE;IACzD,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,IAAI,uCAAuC,EAAE;IAC1E,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI,kBAAkB,EAAE;IAC5C,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,IAAI,wBAAwB,EAAE;CACzD,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,GAAG,sBAAsB;IACzB,GAAG,gBAAgB;CACpB,CAAC;AAGF,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,wBAAwB;IACnD,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,qBAAqB;IAC7C,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,qBAAqB;IAC/C,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,WAAW;CACnC,CAAC;AAIF,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,IAAI,+BAA+B,EAAE;IAChE,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,IAAI,4BAA4B,EAAE;IAC1D,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,IAAI,4BAA4B,EAAE;IAC5D,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,IAAI,kBAAkB,EAAE;IAC/C,GAAG,gBAAgB;CACpB,CAAC"}
+{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../src/token/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,EAC/B,qBAAqB,EACrB,uCAAuC,EACvC,2BAA2B,EAC3B,iBAAiB,EACjB,4BAA4B,EAC5B,+BAA+B,EAC/B,4BAA4B,EAC5B,kBAAkB,EAClB,qBAAqB,EACrB,wBAAwB,EACxB,kBAAkB,EAClB,yBAAyB,EACzB,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,wBAAwB;IACpD,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,cAAc;IACzC,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,UAAU;IACjC,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,oBAAoB;IAC5C,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,cAAc;IAC1C,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,WAAW;IAC/B,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,kBAAkB;IAC7C,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,gCAAgC;IAC7D,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,WAAW;IAC/B,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,iBAAiB;CAC5C,CAAC;AAGF,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,IAAI,+BAA+B,EAAE;IACjE,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,IAAI,qBAAqB,EAAE;IACtD,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,IAAI,iBAAiB,EAAE;IAC9C,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,IAAI,2BAA2B,EAAE;IACzD,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,IAAI,uCAAuC,EAAE;IAC1E,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,IAAI,qBAAqB,EAAE;IACvD,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI,kBAAkB,EAAE;IAC5C,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,IAAI,yBAAyB,EAAE;IAC1D,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI,kBAAkB,EAAE;IAC5C,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,IAAI,wBAAwB,EAAE;CACzD,CAAC;AAGF,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,wBAAwB;IACnD,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,qBAAqB;IAC7C,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,qBAAqB;IAC/C,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,WAAW;CACnC,CAAC;AAIF,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,IAAI,+BAA+B,EAAE;IAChE,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,IAAI,4BAA4B,EAAE;IAC1D,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,IAAI,4BAA4B,EAAE;IAC5D,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,IAAI,kBAAkB,EAAE;CAChD,CAAC"}

package/dist/token/deploy.d.ts

@@ -1,58 +1,34 @@
-import { providers } from 'ethers';
 import { GasRouter } from '@hyperlane-xyz/core';
 import { HyperlaneContracts } from '../contracts/types.js';
 import { ContractVerifier } from '../deploy/verify/ContractVerifier.js';
 import { HyperlaneIsmFactory } from '../ism/HyperlaneIsmFactory.js';
 import { MultiProvider } from '../providers/MultiProvider.js';
 import { GasRouterDeployer } from '../router/GasRouterDeployer.js';
-import { GasConfig, RouterConfig } from '../router/types.js';
-import { ChainMap, ChainName } from '../types.js';
-import { CollateralConfig, ERC20Metadata, ERC20RouterConfig, ERC721RouterConfig, HypERC20Config, HypERC721Config, TokenConfig, TokenMetadata, TokenType } from './config.js';
-import { HypERC20Factories, HypERC721Factories, HypERC721contracts } from './contracts.js';
-export declare class HypERC20Deployer extends GasRouterDeployer<ERC20RouterConfig, HypERC20Factories> {
-    constructor(multiProvider: MultiProvider, ismFactory?: HyperlaneIsmFactory, contractVerifier?: ContractVerifier);
-    routerContractName(config: ERC20RouterConfig): string;
-    routerContractKey(config: ERC20RouterConfig): TokenType.synthetic | TokenType.fastSynthetic | TokenType.collateral | TokenType.collateralVault | TokenType.fastCollateral | TokenType.native | TokenType.nativeScaled;
-    constructorArgs<K extends keyof HypERC20Factories>(_: ChainName, config: ERC20RouterConfig): Promise<Parameters<HypERC20Factories[K]['deploy']>>;
-    initializeArgs(_: ChainName, config: HypERC20Config): Promise<any>;
-    static fetchMetadata(provider: providers.Provider, config: CollateralConfig): Promise<ERC20Metadata>;
-    static gasOverheadDefault(config: TokenConfig): number;
-    getCollateralMetadata(chain: ChainName, config: CollateralConfig): Promise<ERC20Metadata>;
-    router(contracts: HyperlaneContracts<HypERC20Factories>): GasRouter;
-    deployContracts(chain: ChainName, config: HypERC20Config): Promise<any>;
-    buildTokenMetadata(configMap: ChainMap<TokenConfig>): Promise<ChainMap<ERC20Metadata>>;
-    buildGasOverhead(configMap: ChainMap<TokenConfig>): ChainMap<GasConfig>;
-    deploy(configMap: ChainMap<TokenConfig & RouterConfig>): Promise<import("../contracts/types.js").HyperlaneContractsMap<{
+import { ChainName } from '../types.js';
+import { HypERC20Factories, HypERC721Factories, TokenFactories } from './contracts.js';
+import { TokenRouterConfig } from './schemas.js';
+import { TokenMetadata, WarpRouteDeployConfig } from './types.js';
+declare abstract class TokenDeployer<Factories extends TokenFactories> extends GasRouterDeployer<TokenRouterConfig, Factories> {
+    constructor(multiProvider: MultiProvider, factories: Factories, loggerName: string, ismFactory?: HyperlaneIsmFactory, contractVerifier?: ContractVerifier);
+    constructorArgs(_: ChainName, config: TokenRouterConfig): Promise<any>;
+    initializeArgs(_: ChainName, config: TokenRouterConfig): Promise<any>;
+    static deriveTokenMetadata(multiProvider: MultiProvider, configMap: WarpRouteDeployConfig): Promise<TokenMetadata | undefined>;
+    deploy(configMap: WarpRouteDeployConfig): Promise<import("../contracts/types.js").HyperlaneContractsMap<Factories & import("../contracts/types.js").HyperlaneFactories & {
         proxyAdmin: import("@hyperlane-xyz/core").ProxyAdmin__factory;
         timelockController: import("@hyperlane-xyz/core").TimelockController__factory;
-        fastCollateral: import("@hyperlane-xyz/core").FastHypERC20Collateral__factory;
-        fastSynthetic: import("@hyperlane-xyz/core").FastHypERC20__factory;
-        synthetic: import("@hyperlane-xyz/core").HypERC20__factory;
-        collateral: import("@hyperlane-xyz/core").HypERC20Collateral__factory;
-        collateralVault: import("@hyperlane-xyz/core").HypERC20CollateralVaultDeposit__factory;
-        native: import("@hyperlane-xyz/core").HypNative__factory;
-        nativeScaled: import("@hyperlane-xyz/core").HypNativeScaled__factory;
     }>>;
 }
-export declare class HypERC721Deployer extends GasRouterDeployer<ERC721RouterConfig, HypERC721Factories> {
-    constructor(multiProvider: MultiProvider, contractVerifier?: ContractVerifier);
-    routerContractName(config: ERC721RouterConfig): string;
-    routerContractKey<K extends keyof HypERC721contracts>(config: ERC721RouterConfig): K;
-    constructorArgs(_: ChainName, config: ERC721RouterConfig): Promise<any>;
-    initializeArgs(_: ChainName, config: ERC721RouterConfig): Promise<any>;
-    static fetchMetadata(provider: providers.Provider, config: CollateralConfig): Promise<TokenMetadata>;
-    static gasOverheadDefault(config: TokenConfig): number;
+export declare class HypERC20Deployer extends TokenDeployer<HypERC20Factories> {
+    constructor(multiProvider: MultiProvider, ismFactory?: HyperlaneIsmFactory, contractVerifier?: ContractVerifier);
+    router(contracts: HyperlaneContracts<HypERC20Factories>): GasRouter;
+    routerContractKey(config: TokenRouterConfig): keyof HypERC20Factories;
+    routerContractName(config: TokenRouterConfig): string;
+}
+export declare class HypERC721Deployer extends TokenDeployer<HypERC721Factories> {
+    constructor(multiProvider: MultiProvider, ismFactory?: HyperlaneIsmFactory, contractVerifier?: ContractVerifier);
     router(contracts: HyperlaneContracts<HypERC721Factories>): GasRouter;
-    deployContracts(chain: ChainName, config: HypERC721Config): Promise<any>;
-    buildTokenMetadata(configMap: ChainMap<TokenConfig>): Promise<ChainMap<TokenMetadata>>;
-    buildGasOverhead(configMap: ChainMap<TokenConfig>): ChainMap<GasConfig>;
-    deploy(configMap: ChainMap<TokenConfig & RouterConfig>): Promise<import("../contracts/types.js").HyperlaneContractsMap<{
-        proxyAdmin: import("@hyperlane-xyz/core").ProxyAdmin__factory;
-        timelockController: import("@hyperlane-xyz/core").TimelockController__factory;
-        collateralUri: import("@hyperlane-xyz/core").HypERC721URICollateral__factory;
-        collateral: import("@hyperlane-xyz/core").HypERC721Collateral__factory;
-        syntheticUri: import("@hyperlane-xyz/core").HypERC721URIStorage__factory;
-        synthetic: import("@hyperlane-xyz/core").HypERC721__factory;
-    }>>;
+    routerContractKey(config: TokenRouterConfig): keyof HypERC721Factories;
+    routerContractName(config: TokenRouterConfig): string;
 }
+export {};
 //# sourceMappingURL=deploy.d.ts.map

package/dist/token/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/token/deploy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/token/deploy.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,SAAS,EACV,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,EAKf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,iBAAiB,EAKlB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAElE,uBAAe,aAAa,CAC1B,SAAS,SAAS,cAAc,CAChC,SAAQ,iBAAiB,CAAC,iBAAiB,EAAE,SAAS,CAAC;gBAErD,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,mBAAmB,EAChC,gBAAgB,CAAC,EAAE,gBAAgB;IAS/B,eAAe,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC;IAatE,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC;WAmB9D,mBAAmB,CAC9B,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,qBAAqB,GAC/B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAgD/B,MAAM,CAAC,SAAS,EAAE,qBAAqB;;;;CAY9C;AAED,qBAAa,gBAAiB,SAAQ,aAAa,CAAC,iBAAiB,CAAC;gBAElE,aAAa,EAAE,aAAa,EAC5B,UAAU,CAAC,EAAE,mBAAmB,EAChC,gBAAgB,CAAC,EAAE,gBAAgB;IAWrC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,iBAAiB,CAAC,GAAG,SAAS;IASnE,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,iBAAiB;IAKrE,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM;CAGtD;AAED,qBAAa,iBAAkB,SAAQ,aAAa,CAAC,kBAAkB,CAAC;gBAEpE,aAAa,EAAE,aAAa,EAC5B,UAAU,CAAC,EAAE,mBAAmB,EAChC,gBAAgB,CAAC,EAAE,gBAAgB;IAWrC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,kBAAkB,CAAC,GAAG,SAAS;IASpE,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,kBAAkB;IAKtE,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM;CAGtD"}

package/dist/token/deploy.hardhat-test.js

@@ -1,22 +1,23 @@
 import { expect } from 'chai';
 import hre from 'hardhat';
-import { ERC20Test__factory, Mailbox__factory, } from '@hyperlane-xyz/core';
-import { TestChainName } from '@hyperlane-xyz/sdk';
+import { ERC20Test__factory } from '@hyperlane-xyz/core';
 import { objMap } from '@hyperlane-xyz/utils';
+import { TestChainName } from '../consts/testChains.js';
 import { TestCoreDeployer } from '../core/TestCoreDeployer.js';
 import { HyperlaneProxyFactoryDeployer } from '../deploy/HyperlaneProxyFactoryDeployer.js';
 import { HyperlaneIsmFactory } from '../ism/HyperlaneIsmFactory.js';
 import { MultiProvider } from '../providers/MultiProvider.js';
-import { TokenType, } from './config.js';
+import { EvmERC20WarpRouteReader } from './EvmERC20WarpRouteReader.js';
+import { TokenType } from './config.js';
 import { HypERC20Deployer } from './deploy.js';
-import { EvmERC20WarpRouteReader } from './read.js';
+const chain = TestChainName.test1;
 describe('TokenDeployer', async () => {
     let signer;
     let deployer;
     let multiProvider;
     let coreApp;
-    let routerConfigMap;
     let config;
+    let token;
     before(async () => {
         [signer] = await hre.ethers.getSigners();
         multiProvider = MultiProvider.createTestMultiProvider({ signer });
@@ -24,16 +25,18 @@ describe('TokenDeployer', async () => {
         const factories = await ismFactoryDeployer.deploy(multiProvider.mapKnownChains(() => ({})));
         const ismFactory = new HyperlaneIsmFactory(factories, multiProvider);
         coreApp = await new TestCoreDeployer(multiProvider, ismFactory).deployApp();
-        routerConfigMap = coreApp.getRouterConfig(signer.address);
+        const routerConfigMap = coreApp.getRouterConfig(signer.address);
         config = objMap(routerConfigMap, (chain, c) => ({
             type: TokenType.synthetic,
             name: chain,
             symbol: `u${chain}`,
             decimals: 18,
-            totalSupply: 100000,
-            gas: 65000,
+            totalSupply: '100000',
             ...c,
         }));
+        const { name, decimals, symbol, totalSupply } = config[chain];
+        const contract = await new ERC20Test__factory(signer).deploy(name, symbol, totalSupply, decimals);
+        token = contract.address;
     });
     beforeEach(async () => {
         deployer = new HypERC20Deployer(multiProvider);
@@ -41,46 +44,28 @@ describe('TokenDeployer', async () => {
     it('deploys', async () => {
         await deployer.deploy(config);
     });
-    describe('ERC20WarpRouterReader', async () => {
-        const TOKEN_NAME = 'fake';
-        const TOKEN_SUPPLY = '100000000000000000000';
-        const TOKEN_DECIMALS = 18;
-        let erc20Factory;
-        let token;
-        before(async () => {
-            erc20Factory = new ERC20Test__factory(signer);
-            token = await erc20Factory.deploy(TOKEN_NAME, TOKEN_NAME, TOKEN_SUPPLY, TOKEN_DECIMALS);
+    for (const type of [TokenType.collateral, TokenType.synthetic]) {
+        describe('ERC20WarpRouterReader', async () => {
+            let reader;
+            let routerAddress;
+            before(() => {
+                reader = new EvmERC20WarpRouteReader(multiProvider, TestChainName.test1);
+            });
+            beforeEach(async () => {
+                config[chain] = {
+                    ...config[chain],
+                    type,
+                    // @ts-ignore
+                    token: type === TokenType.collateral ? token : undefined,
+                };
+                const warpRoute = await deployer.deploy(config);
+                routerAddress = warpRoute[chain][type].address;
+            });
+            it(`should derive TokenRouterConfig from ${type} correctly`, async () => {
+                const derivedConfig = await reader.deriveWarpRouteConfig(routerAddress, type);
+                expect(derivedConfig).to.include(config[chain]);
+            });
         });
-        async function deriveWarpConfig(chainName, address) {
-            return new EvmERC20WarpRouteReader(multiProvider, chainName).deriveWarpRouteConfig(address);
-        }
-        it('should derive ERC20RouterConfig from collateral correctly', async () => {
-            const baseConfig = routerConfigMap[TestChainName.test1];
-            const mailbox = Mailbox__factory.connect(baseConfig.mailbox, signer);
-            // Create config
-            const config = {
-                [TestChainName.test1]: {
-                    type: TokenType.collateral,
-                    token: token.address,
-                    hook: await mailbox.defaultHook(),
-                    gas: 65000,
-                    ...baseConfig,
-                },
-            };
-            // Deploy with config
-            const warpRoute = await deployer.deploy(config);
-            // Derive config and check if each value matches
-            const derivedConfig = await deriveWarpConfig(TestChainName.test1, warpRoute[TestChainName.test1].collateral.address);
-            for (const [key, value] of Object.entries(derivedConfig)) {
-                const deployedValue = config[TestChainName.test1][key];
-                if (deployedValue)
-                    expect(deployedValue).to.equal(value);
-            }
-            // Check if token values matches
-            expect(derivedConfig.name).to.equal(TOKEN_NAME);
-            expect(derivedConfig.symbol).to.equal(TOKEN_NAME);
-            expect(derivedConfig.decimals).to.equal(TOKEN_DECIMALS);
-        });
-    });
+    }
 });
 //# sourceMappingURL=deploy.hardhat-test.js.map

package/dist/token/deploy.hardhat-test.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.hardhat-test.js","sourceRoot":"","sources":["../../src/token/deploy.hardhat-test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deploy.hardhat-test.js","sourceRoot":"","sources":["../../src/token/deploy.hardhat-test.ts"],"names":[],"mappings":"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"}