@shapeshiftoss/caip 4.0.1 → 5.1.0

package/README.md

@@ -1,4 +1,4 @@
-# CAIPs
+# @shapeshiftoss/caip
 
 This package is ShapeShift's partial implementation of [CAIPs](https://github.com/ChainAgnostic/CAIPs) - Chain Agnostic Improvement Protocols.
 It is not exhaustive and is currently only used internally.
@@ -12,19 +12,19 @@ Usage
 ### `toChainId` | `toCAIP2`
 
 ```ts
-const chain = ChainTypes.Ethereum
-const network = NetworkTypes.MAINNET
-const result = toChainId({ chain, network })
+const chainNamespace = CHAIN_NAMESPACE.Ethereum
+const chainReference = CHAIN_REFERENCE.EthereumMainnet
+const result = toChainId({ chainNamespace, chainReference })
 expect(result).toEqual('eip155:1')
 ```
 
 ### `fromChainId` | `fromCAIP2`
 
 ```ts
-const ethChainId = 'eip155:1'
-const { chain, network } = fromChainId(ethChainId)
-expect(chain).toEqual(ChainTypes.Ethereum)
-expect(network).toEqual(NetworkTypes.MAINNET)
+const ethereumChainId = 'eip155:1'
+const { chainNamespace, chainReference } = fromChainId(ethereumChainId)
+expect(chainNamespace).toEqual(CHAIN_NAMESPACE.Ethereum)
+expect(chainReference).toEqual(CHAIN_REFERENCE.EthereumMainnet)
 ```
 
 ## AccountId (CAIP10) - Blockchain ID Specification
@@ -36,19 +36,24 @@ Usage
 ### `toAccountId` | `toCAIP10`
 
 ```ts
-const chainId = 'eip155:1'
-const account = '0xA44C286BA83Bb771cd0107B2c1Df678435Bd1535'
-const result = (toAccountId({ chainId, account }))
-expect(result).toEqual('eip155:1:0xa44c286ba83bb771cd0107b2c1df678435bd1535')
+const chainNamespace = CHAIN_NAMESPACE.Ethereum
+const chainReference = CHAIN_REFERENCE.EthereumMainnet
+const chainId = toChainId({ chainNamespace, chainReference })
+const account = '0xa44c286ba83bb771cd0107b2c1df678435bd1535'
+const expectedAccountId = `${chainId}:${account}`
+expect(toAccountId({ chainId, account })).toEqual('eip155:1:0xa44c286ba83bb771cd0107b2c1df678435bd1535')
+expect(toAccountId({ chainNamespace, chainReference, account })).toEqual('eip155:1:0xa44c286ba83bb771cd0107b2c1df678435bd1535')
 ```
 
 ### `fromAccountId` | `fromCAIP10`
 
 ```ts
 const accountId = 'eip155:1:0xa44c286ba83bb771cd0107b2c1df678435bd1535'
-const { chainId, account } = fromAccountId(accountId)
+const { account, chainId, chainNamespace, chainReference } = fromAccountId(accountId)
+expect(account).toEqual(0xa44c286ba83bb771cd0107b2c1df678435bd1535)
+expect(chainNamespace).toEqual('eip155')
+expect(chainReference).toEqual('1')
 expect(chainId).toEqual('eip155:1')
-expect(account).toEqual('0xa44c286ba83bb771cd0107b2c1df678435bd1535')
 ```
 
 ## AssetId (CAIP19) - Asset Type and Asset ID Specification
@@ -62,23 +67,25 @@ Usage
 Ether
 
 ```ts
-const chain = ChainTypes.Ethereum
-const network = NetworkTypes.MAINNET
+const chainNamespace = CHAIN_NAMESPACE.Ethereum
+const chainReference = CHAIN_REFERENCE.EthereumMainnet
+const chainId = toChainId({ chainNamespace, chainReference })
 const assetNamespace = 'slip44'
 const assetReference = ASSET_REFERENCE.Ethereum
-const result = toAssetId({ chain, network, assetNamespace, assetReference })
-expect(result).toEqual('eip155:1/slip44:60')
+expect(toAssetId({ chainNamespace, chainReference, assetNamespace, assetReference })).toEqual('eip155:1/slip44:60')
+expect(toAssetId({ chainId, assetNamespace, assetReference })).toEqual('eip155:1/slip44:60')
 ```
 
 ERC20 token
 
 ```ts
-const chain = ChainTypes.Ethereum
-const network = NetworkTypes.MAINNET
-const contractType = 'erc20'
-const tokenId = '0xc770eefad204b5180df6a14ee197d99d808ee52d'
-const result = toAssetId({ chain, network, contractType, tokenId })
-expect(result).toEqual('eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d')
+const chainNamespace = CHAIN_NAMESPACE.Ethereum
+const chainReference = CHAIN_REFERENCE.EthereumMainnet
+const chainId = toChainId({ chainNamespace, chainReference })
+const assetNamespace = 'erc20'
+const assetReference = '0xc770eefad204b5180df6a14ee197d99d808ee52d'
+expect(toAssetId({ chainNamespace, chainReference, assetNamespace, assetReference })).toEqual('eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d')
+expect(toAssetId({ chainId, assetNamespace, assetReference })).toEqual('eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d')
 ```
 
 ### `fromAssetId` | `fromCAIP19`
@@ -87,22 +94,24 @@ Ether
 
 ```ts
 const assetId = 'eip155:1/slip44:60'
-const { chain, network, contractType, tokenId } = fromAssetId(assetId)
-expect(chain).toEqual(ChainTypes.Ethereum)
-expect(network).toEqual(NetworkTypes.MAINNET)
-expect(contractType).toEqual('slip44')
-expect(tokenId).toEqual(ASSET_REFERENCE.Ethereum)
+const { chainId, chainReference, chainNamespace, assetNamespace, assetReference } = fromAssetId(AssetId)
+expect(chainNamespace).toEqual('eip155')
+expect(chainReference).toEqual('1')
+expect(chainId).toEqual('eip155:1')
+expect(assetNamespace).toEqual('slip44')
+expect(assetReference).toEqual('60')
 ```
 
 ERC20 token
 
 ```ts
 const assetId = 'eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d'
-const { chain, network, contractType, tokenId } = fromAssetId(assetId)
-expect(chain).toEqual(ChainTypes.Ethereum)
-expect(network).toEqual(NetworkTypes.MAINNET)
-expect(contractType).toEqual('erc20')
-expect(tokenId).toEqual('0xc770eefad204b5180df6a14ee197d99d808ee52d')
+const { chainId, chainReference, chainNamespace, assetNamespace, assetReference } = fromAssetId(AssetId)
+expect(chainNamespace).toEqual('eip155')
+expect(chainReference).toEqual('1')
+expect(chainId).toEqual('eip155:1')
+expect(assetNamespace).toEqual('erc20')
+expect(assetReference).toEqual('0xc770eefad204b5180df6a14ee197d99d808ee52d')
 ```
 
 ## Adapters

package/dist/accountId/accountId.d.ts

@@ -1,16 +1,27 @@
-import { ChainId } from '../chainId/chainId';
+import { ChainId, ChainNamespace, ChainReference } from '../chainId/chainId';
 export declare type AccountId = string;
-declare type ToAccountIdArgs = {
+declare type ToAccountIdWithChainId = {
     chainId: ChainId;
     account: string;
+    chainNamespace?: never;
+    chainReference?: never;
 };
-declare type ToAccountId = (args: ToAccountIdArgs) => string;
+declare type ToAccountIdWithChainIdParts = {
+    chainId?: never;
+    account: string;
+    chainNamespace: ChainNamespace;
+    chainReference: ChainReference;
+};
+declare type ToAccountIdArgs = ToAccountIdWithChainId | ToAccountIdWithChainIdParts;
+declare type ToAccountId = (args: ToAccountIdArgs) => AccountId;
 export declare const toAccountId: ToAccountId;
 declare type FromAccountIdReturn = {
-    chainId: string;
+    chainId: ChainId;
     account: string;
+    chainNamespace: ChainNamespace;
+    chainReference: ChainReference;
 };
-declare type FromAccountId = (accountId: string) => FromAccountIdReturn;
+declare type FromAccountId = (accountId: AccountId) => FromAccountIdReturn;
 export declare const fromAccountId: FromAccountId;
 export declare const toCAIP10: ToAccountId;
 export declare const fromCAIP10: FromAccountId;

package/dist/accountId/accountId.js

@@ -2,18 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fromCAIP10 = exports.toCAIP10 = exports.fromAccountId = exports.toAccountId = void 0;
 const chainId_1 = require("../chainId/chainId");
-const toAccountId = ({ chainId, account }) => {
-    if (!(0, chainId_1.isChainId)(chainId)) {
-        throw new Error(`toAccountId: invalid ChainId ${chainId}`);
-    }
-    if (!account) {
+const constants_1 = require("../constants");
+const typeGuards_1 = require("../typeGuards");
+const toAccountId = ({ chainId: maybeChainId, chainNamespace: maybeChainNamespace, chainReference: maybeChainReference, account }) => {
+    if (!account)
         throw new Error(`toAccountId: account is required`);
-    }
-    const [namespace] = chainId.split(':');
+    const chainId = maybeChainId !== null && maybeChainId !== void 0 ? maybeChainId : (0, chainId_1.toChainId)({ chainNamespace: maybeChainNamespace, chainReference: maybeChainReference });
+    (0, typeGuards_1.assertIsChainId)(chainId);
+    const { chainNamespace } = (0, chainId_1.fromChainId)(chainId);
     // we lowercase eth accounts as per the draft spec
     // it's not explicit, but cHecKsUM can be recovered from lowercase eth accounts
     // we don't lowercase bitcoin addresses as they'll fail checksum
-    const outputAccount = namespace === chainId_1.CHAIN_NAMESPACE.Ethereum ? account.toLowerCase() : account;
+    const outputAccount = chainNamespace === constants_1.CHAIN_NAMESPACE.Ethereum ? account.toLowerCase() : account;
     return `${chainId}:${outputAccount}`;
 };
 exports.toAccountId = toAccountId;
@@ -22,20 +22,21 @@ const fromAccountId = (accountId) => {
     if (parts.length !== 3) {
         throw new Error(`fromAccountId: invalid AccountId ${accountId}`);
     }
+    const chainNamespace = parts[0];
+    const chainReference = parts[1];
     const chainId = parts.slice(0, 2).join(':');
-    if (!(0, chainId_1.isChainId)(chainId)) {
-        throw new Error(`fromAccountId: invalid ChainId ${chainId}`);
-    }
+    (0, typeGuards_1.assertIsChainNamespace)(chainNamespace);
+    (0, typeGuards_1.assertIsChainReference)(chainReference);
+    (0, typeGuards_1.assertIsChainId)(chainId);
     const account = parts[2];
     if (!account) {
         throw new Error(`fromAccountId: account required`);
     }
-    const [namespace] = chainId.split(':');
     // we lowercase eth accounts as per the draft spec
     // it's not explicit, but cHecKsUM can be recovered from lowercase eth accounts
     // we don't lowercase bitcoin addresses as they'll fail checksum
-    const outputAccount = namespace === chainId_1.CHAIN_NAMESPACE.Ethereum ? account.toLowerCase() : account;
-    return { chainId, account: outputAccount };
+    const outputAccount = chainNamespace === constants_1.CHAIN_NAMESPACE.Ethereum ? account.toLowerCase() : account;
+    return { chainId, account: outputAccount, chainNamespace, chainReference };
 };
 exports.fromAccountId = fromAccountId;
 exports.toCAIP10 = exports.toAccountId;

package/dist/adapters/banxa/index.js

@@ -7,7 +7,6 @@ exports.getBanxaBlockchainFromBanxaAssetTicker = exports.getSupportedBanxaAssets
 const entries_1 = __importDefault(require("lodash/entries"));
 const toLower_1 = __importDefault(require("lodash/toLower"));
 const assetId_1 = require("../../assetId/assetId");
-const chainId_1 = require("../../chainId/chainId");
 const AssetIdToBanxaTickerMap = {
     'bip122:000000000019d6689c085ae165831e93/slip44:0': 'btc',
     'cosmos:cosmoshub-4/slip44:118': 'atom',
@@ -66,11 +65,10 @@ const chainIdToBanxaBlockchainCodeMap = {
  * @returns {string} - a Banxa chain identifier; e.g., 'cosmos'
  */
 const getBanxaBlockchainFromBanxaAssetTicker = (banxaAssetId) => {
-    const assetAssetId = (0, exports.banxaTickerToAssetId)(banxaAssetId.toLowerCase());
-    if (!assetAssetId)
+    const assetId = (0, exports.banxaTickerToAssetId)(banxaAssetId.toLowerCase());
+    if (!assetId)
         throw new Error(`getBanxaBlockchainFromBanxaAssetTicker: ${banxaAssetId} is not supported`);
-    const { chain, network } = (0, assetId_1.fromAssetId)(assetAssetId);
-    const chainId = (0, chainId_1.toChainId)({ network, chain });
+    const { chainId } = (0, assetId_1.fromAssetId)(assetId);
     return chainIdToBanxaBlockchainCodeMap[chainId];
 };
 exports.getBanxaBlockchainFromBanxaAssetTicker = getBanxaBlockchainFromBanxaAssetTicker;

package/dist/adapters/coincap/utils.d.ts

@@ -15,15 +15,15 @@ export declare type CoinCapCoin = {
 export declare const writeFiles: (data: Record<string, Record<string, string>>) => Promise<void>;
 export declare const fetchData: (URL: string) => Promise<CoinCapCoin[]>;
 export declare const parseEthData: (data: CoinCapCoin[]) => Record<string, string>;
-export declare const makeBtcData: () => {
-    [x: string]: string;
-};
-export declare const makeCosmosHubData: () => {
-    [x: string]: string;
-};
-export declare const makeOsmosisData: () => {
-    [x: string]: string;
-};
 export declare const parseData: (d: CoinCapCoin[]) => {
-    [x: string]: Record<string, string>;
+    "eip155:1": Record<string, string>;
+    "bip122:000000000019d6689c085ae165831e93": {
+        [x: string]: string;
+    };
+    "cosmos:cosmoshub-4": {
+        [x: string]: string;
+    };
+    "cosmos:osmosis-1": {
+        [x: string]: string;
+    };
 };

package/dist/adapters/coincap/utils.js

@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseData = exports.makeOsmosisData = exports.makeCosmosHubData = exports.makeBtcData = exports.parseEthData = exports.fetchData = exports.writeFiles = void 0;
-const types_1 = require("@shapeshiftoss/types");
+exports.parseData = exports.parseEthData = exports.fetchData = exports.writeFiles = void 0;
 const axios_1 = __importDefault(require("axios"));
 const fs_1 = __importDefault(require("fs"));
 const assetId_1 = require("../../assetId/assetId");
-const chainId_1 = require("../../chainId/chainId");
+const constants_1 = require("../../constants");
+const utils_1 = require("../../utils");
 const writeFiles = async (data) => {
     const path = './src/adapters/coincap/generated/';
     const file = '/adapter.json';
@@ -21,10 +21,10 @@ const fetchData = async (URL) => (await axios_1.default.get(URL)).data.data;
 exports.fetchData = fetchData;
 const parseEthData = (data) => {
     const ethCoins = data.filter(({ id, explorer }) => (explorer && explorer.startsWith('https://etherscan.io/token/0x')) || id === 'ethereum');
-    const chain = types_1.ChainTypes.Ethereum;
-    const network = types_1.NetworkTypes.MAINNET;
     return ethCoins.reduce((acc, { id, explorer }) => {
-        let assetReference = assetId_1.ASSET_REFERENCE.Ethereum;
+        const chainNamespace = constants_1.CHAIN_NAMESPACE.Ethereum;
+        const chainReference = constants_1.CHAIN_REFERENCE.EthereumMainnet;
+        let assetReference = constants_1.ASSET_REFERENCE.Ethereum;
         const assetNamespace = id === 'ethereum' ? 'slip44' : 'erc20';
         if (id !== 'ethereum' && explorer) {
             assetReference = explorer
@@ -32,64 +32,18 @@ const parseEthData = (data) => {
                 .split('#')[0]
                 .split('?')[0];
         }
-        const assetId = (0, assetId_1.toAssetId)({ chain, network, assetNamespace, assetReference });
+        const assetId = (0, assetId_1.toAssetId)({ chainNamespace, chainReference, assetNamespace, assetReference });
         acc[assetId] = id;
         return acc;
     }, {});
 };
 exports.parseEthData = parseEthData;
-const makeBtcData = () => {
-    const chain = types_1.ChainTypes.Bitcoin;
-    const network = types_1.NetworkTypes.MAINNET;
-    const assetId = (0, assetId_1.toAssetId)({
-        chain,
-        network,
-        assetNamespace: 'slip44',
-        assetReference: assetId_1.ASSET_REFERENCE.Bitcoin
-    });
-    return { [assetId]: 'bitcoin' };
-};
-exports.makeBtcData = makeBtcData;
-const makeCosmosHubData = () => {
-    const chain = types_1.ChainTypes.Cosmos;
-    const network = types_1.NetworkTypes.COSMOSHUB_MAINNET;
-    const assetId = (0, assetId_1.toAssetId)({
-        chain,
-        network,
-        assetNamespace: 'slip44',
-        assetReference: assetId_1.ASSET_REFERENCE.Cosmos
-    });
-    return { [assetId]: 'cosmos' };
-};
-exports.makeCosmosHubData = makeCosmosHubData;
-const makeOsmosisData = () => {
-    const chain = types_1.ChainTypes.Osmosis;
-    const network = types_1.NetworkTypes.OSMOSIS_MAINNET;
-    const assetId = (0, assetId_1.toAssetId)({
-        chain,
-        network,
-        assetNamespace: 'slip44',
-        assetReference: assetId_1.ASSET_REFERENCE.Osmosis
-    });
-    return { [assetId]: 'osmosis' };
-};
-exports.makeOsmosisData = makeOsmosisData;
 const parseData = (d) => {
-    const ethereumMainnet = (0, chainId_1.toChainId)({ chain: types_1.ChainTypes.Ethereum, network: types_1.NetworkTypes.MAINNET });
-    const bitcoinMainnet = (0, chainId_1.toChainId)({ chain: types_1.ChainTypes.Bitcoin, network: types_1.NetworkTypes.MAINNET });
-    const cosmosHubMainnet = (0, chainId_1.toChainId)({
-        chain: types_1.ChainTypes.Cosmos,
-        network: types_1.NetworkTypes.COSMOSHUB_MAINNET
-    });
-    const osmosisMainnet = (0, chainId_1.toChainId)({
-        chain: types_1.ChainTypes.Osmosis,
-        network: types_1.NetworkTypes.OSMOSIS_MAINNET
-    });
     return {
-        [ethereumMainnet]: (0, exports.parseEthData)(d),
-        [bitcoinMainnet]: (0, exports.makeBtcData)(),
-        [cosmosHubMainnet]: (0, exports.makeCosmosHubData)(),
-        [osmosisMainnet]: (0, exports.makeOsmosisData)()
+        [constants_1.ethChainId]: (0, exports.parseEthData)(d),
+        [constants_1.btcChainId]: (0, utils_1.makeBtcData)(),
+        [constants_1.cosmosChainId]: (0, utils_1.makeCosmosHubData)(),
+        [constants_1.osmosisChainId]: (0, utils_1.makeOsmosisData)()
     };
 };
 exports.parseData = parseData;

package/dist/adapters/coingecko/utils.d.ts

@@ -9,15 +9,15 @@ export declare type CoingeckoCoin = {
 export declare const writeFiles: (data: Record<string, Record<string, string>>) => Promise<void>;
 export declare const fetchData: (URL: string) => Promise<CoingeckoCoin[]>;
 export declare const parseEthData: (data: CoingeckoCoin[]) => Record<string, string>;
-export declare const makeBtcData: () => {
-    [x: string]: string;
-};
-export declare const makeCosmosHubData: () => {
-    [x: string]: string;
-};
-export declare const makeOsmosisData: () => {
-    [x: string]: string;
-};
 export declare const parseData: (d: CoingeckoCoin[]) => {
-    [x: string]: Record<string, string>;
+    "eip155:1": Record<string, string>;
+    "bip122:000000000019d6689c085ae165831e93": {
+        [x: string]: string;
+    };
+    "cosmos:cosmoshub-4": {
+        [x: string]: string;
+    };
+    "cosmos:osmosis-1": {
+        [x: string]: string;
+    };
 };

package/dist/adapters/coingecko/utils.js

@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseData = exports.makeOsmosisData = exports.makeCosmosHubData = exports.makeBtcData = exports.parseEthData = exports.fetchData = exports.writeFiles = void 0;
-const types_1 = require("@shapeshiftoss/types");
+exports.parseData = exports.parseEthData = exports.fetchData = exports.writeFiles = void 0;
 const axios_1 = __importDefault(require("axios"));
 const fs_1 = __importDefault(require("fs"));
 const assetId_1 = require("../../assetId/assetId");
-const chainId_1 = require("../../chainId/chainId");
+const constants_1 = require("../../constants");
+const utils_1 = require("../../utils");
 const writeFiles = async (data) => {
     const path = './src/adapters/coingecko/generated/';
     const file = '/adapter.json';
@@ -21,69 +21,23 @@ const fetchData = async (URL) => (await axios_1.default.get(URL)).data;
 exports.fetchData = fetchData;
 const parseEthData = (data) => {
     const ethCoins = data.filter(({ id, platforms }) => Boolean(platforms === null || platforms === void 0 ? void 0 : platforms.ethereum) || id === 'ethereum');
-    const chain = types_1.ChainTypes.Ethereum;
-    const network = types_1.NetworkTypes.MAINNET;
+    const chainNamespace = constants_1.CHAIN_NAMESPACE.Ethereum;
+    const chainReference = constants_1.CHAIN_REFERENCE.EthereumMainnet;
     return ethCoins.reduce((acc, { id, platforms }) => {
         const assetNamespace = id === 'ethereum' ? 'slip44' : 'erc20';
-        const assetReference = id === 'ethereum' ? assetId_1.ASSET_REFERENCE.Ethereum : platforms === null || platforms === void 0 ? void 0 : platforms.ethereum;
-        const assetId = (0, assetId_1.toAssetId)({ chain, network, assetNamespace, assetReference });
+        const assetReference = id === 'ethereum' ? constants_1.ASSET_REFERENCE.Ethereum : platforms === null || platforms === void 0 ? void 0 : platforms.ethereum;
+        const assetId = (0, assetId_1.toAssetId)({ chainNamespace, chainReference, assetNamespace, assetReference });
         acc[assetId] = id;
         return acc;
     }, {});
 };
 exports.parseEthData = parseEthData;
-const makeBtcData = () => {
-    const chain = types_1.ChainTypes.Bitcoin;
-    const network = types_1.NetworkTypes.MAINNET;
-    const assetId = (0, assetId_1.toAssetId)({
-        chain,
-        network,
-        assetNamespace: 'slip44',
-        assetReference: assetId_1.ASSET_REFERENCE.Bitcoin
-    });
-    return { [assetId]: 'bitcoin' };
-};
-exports.makeBtcData = makeBtcData;
-const makeCosmosHubData = () => {
-    const chain = types_1.ChainTypes.Cosmos;
-    const network = types_1.NetworkTypes.COSMOSHUB_MAINNET;
-    const assetId = (0, assetId_1.toAssetId)({
-        chain,
-        network,
-        assetNamespace: 'slip44',
-        assetReference: assetId_1.ASSET_REFERENCE.Cosmos
-    });
-    return { [assetId]: 'cosmos' };
-};
-exports.makeCosmosHubData = makeCosmosHubData;
-const makeOsmosisData = () => {
-    const chain = types_1.ChainTypes.Osmosis;
-    const network = types_1.NetworkTypes.OSMOSIS_MAINNET;
-    const assetId = (0, assetId_1.toAssetId)({
-        chain,
-        network,
-        assetNamespace: 'slip44',
-        assetReference: assetId_1.ASSET_REFERENCE.Osmosis
-    });
-    return { [assetId]: 'osmosis' };
-};
-exports.makeOsmosisData = makeOsmosisData;
 const parseData = (d) => {
-    const ethereumMainnet = (0, chainId_1.toChainId)({ chain: types_1.ChainTypes.Ethereum, network: types_1.NetworkTypes.MAINNET });
-    const bitcoinMainnet = (0, chainId_1.toChainId)({ chain: types_1.ChainTypes.Bitcoin, network: types_1.NetworkTypes.MAINNET });
-    const cosmosHubMainnet = (0, chainId_1.toChainId)({
-        chain: types_1.ChainTypes.Cosmos,
-        network: types_1.NetworkTypes.COSMOSHUB_MAINNET
-    });
-    const osmosisMainnet = (0, chainId_1.toChainId)({
-        chain: types_1.ChainTypes.Osmosis,
-        network: types_1.NetworkTypes.OSMOSIS_MAINNET
-    });
     return {
-        [ethereumMainnet]: (0, exports.parseEthData)(d),
-        [bitcoinMainnet]: (0, exports.makeBtcData)(),
-        [cosmosHubMainnet]: (0, exports.makeCosmosHubData)(),
-        [osmosisMainnet]: (0, exports.makeOsmosisData)()
+        [constants_1.ethChainId]: (0, exports.parseEthData)(d),
+        [constants_1.btcChainId]: (0, utils_1.makeBtcData)(),
+        [constants_1.cosmosChainId]: (0, utils_1.makeCosmosHubData)(),
+        [constants_1.osmosisChainId]: (0, utils_1.makeOsmosisData)()
     };
 };
 exports.parseData = parseData;

package/dist/adapters/osmosis/utils.js

@@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseData = exports.parseOsmosisData = exports.fetchData = exports.writeFiles = void 0;
-const types_1 = require("@shapeshiftoss/types");
 const axios_1 = __importDefault(require("axios"));
 const fs_1 = __importDefault(require("fs"));
 const assetId_1 = require("../../assetId/assetId");
 const chainId_1 = require("../../chainId/chainId");
+const constants_1 = require("../../constants");
 const writeFiles = async (data) => {
     const path = './src/adapters/osmosis/generated/';
     const file = '/adapter.json';
@@ -27,16 +27,16 @@ const parseOsmosisData = (data) => {
         let assetNamespace;
         let assetReference;
         if (isNativeAsset) {
-            assetReference = isOsmo ? assetId_1.ASSET_REFERENCE.Osmosis : denom;
+            assetReference = isOsmo ? constants_1.ASSET_REFERENCE.Osmosis : denom;
             assetNamespace = isOsmo ? 'slip44' : 'native';
         }
         else {
             assetReference = denom.split('/')[1];
             assetNamespace = 'ibc';
         }
-        const chain = types_1.ChainTypes.Osmosis;
-        const network = types_1.NetworkTypes.OSMOSIS_MAINNET;
-        const assetId = (0, assetId_1.toAssetId)({ chain, network, assetNamespace, assetReference });
+        const chainNamespace = constants_1.CHAIN_NAMESPACE.Cosmos;
+        const chainReference = constants_1.CHAIN_REFERENCE.OsmosisMainnet;
+        const assetId = (0, assetId_1.toAssetId)({ chainNamespace, chainReference, assetNamespace, assetReference });
         acc[assetId] = symbol;
         return acc;
     }, {});
@@ -45,8 +45,8 @@ const parseOsmosisData = (data) => {
 exports.parseOsmosisData = parseOsmosisData;
 const parseData = (d) => {
     const osmosisMainnet = (0, chainId_1.toChainId)({
-        chain: types_1.ChainTypes.Osmosis,
-        network: types_1.NetworkTypes.OSMOSIS_MAINNET
+        chainNamespace: constants_1.CHAIN_NAMESPACE.Cosmos,
+        chainReference: constants_1.CHAIN_REFERENCE.OsmosisMainnet
     });
     return {
         [osmosisMainnet]: (0, exports.parseOsmosisData)(d)

package/dist/adapters/yearn/utils.js

@@ -5,13 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseData = exports.parseEthData = exports.fetchData = exports.writeFiles = void 0;
 const providers_1 = require("@ethersproject/providers");
-const types_1 = require("@shapeshiftoss/types");
 const sdk_1 = require("@yfi/sdk");
 const fs_1 = __importDefault(require("fs"));
 const toLower_1 = __importDefault(require("lodash/toLower"));
 const uniqBy_1 = __importDefault(require("lodash/uniqBy"));
 const assetId_1 = require("../../assetId/assetId");
 const chainId_1 = require("../../chainId/chainId");
+const constants_1 = require("../../constants");
 const network = 1; // 1 for mainnet
 const provider = new providers_1.JsonRpcProvider(process.env.REACT_APP_ETHEREUM_NODE_URL);
 const yearnSdk = new sdk_1.Yearn(network, { provider });
@@ -35,15 +35,16 @@ const fetchData = async () => {
 };
 exports.fetchData = fetchData;
 const parseEthData = (data) => {
-    const chain = types_1.ChainTypes.Ethereum;
     const assetNamespace = 'erc20';
+    const chainNamespace = constants_1.CHAIN_NAMESPACE.Ethereum;
+    const chainReference = constants_1.CHAIN_REFERENCE.EthereumMainnet;
     return data.reduce((acc, datum) => {
         const { address } = datum;
         const id = address;
         const assetReference = (0, toLower_1.default)(address);
         const assetId = (0, assetId_1.toAssetId)({
-            chain,
-            network: types_1.NetworkTypes.MAINNET,
+            chainNamespace,
+            chainReference,
             assetNamespace,
             assetReference
         });
@@ -53,7 +54,10 @@ const parseEthData = (data) => {
 };
 exports.parseEthData = parseEthData;
 const parseData = (d) => {
-    const ethMainnet = (0, chainId_1.toChainId)({ chain: types_1.ChainTypes.Ethereum, network: types_1.NetworkTypes.MAINNET });
+    const ethMainnet = (0, chainId_1.toChainId)({
+        chainNamespace: constants_1.CHAIN_NAMESPACE.Ethereum,
+        chainReference: constants_1.CHAIN_REFERENCE.EthereumMainnet
+    });
     return { [ethMainnet]: (0, exports.parseEthData)(d) };
 };
 exports.parseData = parseData;

package/dist/assetId/assetId.d.ts

@@ -1,26 +1,29 @@
-import { ChainTypes, NetworkTypes } from '@shapeshiftoss/types';
-import { ChainReference } from '../chainId/chainId';
+import { ChainId, ChainNamespace, ChainReference } from '../chainId/chainId';
+import { ASSET_NAMESPACE_STRINGS, ASSET_REFERENCE } from '../constants';
 export declare type AssetId = string;
-declare const assetNamespaceStrings: readonly ["cw20", "cw721", "erc20", "erc721", "slip44", "native", "ibc"];
-export declare type AssetNamespace = typeof assetNamespaceStrings[number];
-export declare const ASSET_REFERENCE: {
-    readonly Bitcoin: "0";
-    readonly Ethereum: "60";
-    readonly Cosmos: "118";
-    readonly Osmosis: "118";
-};
+export declare type AssetNamespace = typeof ASSET_NAMESPACE_STRINGS[number];
 export declare type AssetReference = typeof ASSET_REFERENCE[keyof typeof ASSET_REFERENCE];
-declare type ToAssetIdArgs = {
-    chain: ChainTypes;
-    network: NetworkTypes | ChainReference;
+declare type ToAssetIdWithChainId = {
+    chainNamespace?: never;
+    chainReference?: never;
+    chainId: ChainId;
+    assetNamespace: AssetNamespace;
+    assetReference: AssetReference | string;
+};
+declare type ToAssetIdWithChainIdParts = {
+    chainNamespace: ChainNamespace;
+    chainReference: ChainReference;
+    chainId?: never;
     assetNamespace: AssetNamespace;
     assetReference: AssetReference | string;
 };
-declare type ToAssetId = (args: ToAssetIdArgs) => string;
+export declare type ToAssetIdArgs = ToAssetIdWithChainId | ToAssetIdWithChainIdParts;
+declare type ToAssetId = (args: ToAssetIdArgs) => AssetId;
 export declare const toAssetId: ToAssetId;
 declare type FromAssetIdReturn = {
-    chain: ChainTypes;
-    network: NetworkTypes;
+    chainNamespace: ChainNamespace;
+    chainReference: ChainReference;
+    chainId: ChainId;
     assetNamespace: AssetNamespace;
     assetReference: AssetReference | string;
 };