@shapeshiftoss/caip 2.5.0 → 2.5.1

package/README.md

@@ -4,37 +4,37 @@ This package is ShapeShift's partial implementation of [CAIPs](https://github.co
 
 It is not exhaustive and is currently only used internally.
 
-## CAIP-2 - Blockchain ID Specification
+## ChainId - Blockchain ID Specification
 
 https://github.com/ChainAgnostic/CAIPs/blob/master/CAIPs/caip-2.md
 
 Usage
 
-### `toCAIP2`
+### `toChainId`
 
 ```ts
 const chain = ChainTypes.Ethereum
 const network = NetworkTypes.MAINNET
-const result = toCAIP2({ chain, network })
+const result = toChainId({ chain, network })
 expect(result).toEqual('eip155:1')
 ```
 
-### `fromCAIP2`
+### `fromChainId`
 
 ```ts
-const ethCaip2 = 'eip155:1'
-const { chain, network } = fromCAIP2(ethCaip2)
+const ethChainId = 'eip155:1'
+const { chain, network } = fromChainId(ethChainId)
 expect(chain).toEqual(ChainTypes.Ethereum)
 expect(network).toEqual(NetworkTypes.MAINNET)
 ```
 
-## CAIP-19 - Asset Type and Asset ID Specification
+## AssetId - Asset Type and Asset ID Specification
 
 https://github.com/ChainAgnostic/CAIPs/blob/master/CAIPs/caip-19.md
 
 Usage
 
-### `toCAIP19`
+### `toAssetId`
 
 Ether
 
@@ -43,7 +43,7 @@ const chain = ChainTypes.Ethereum
 const network = NetworkTypes.MAINNET
 const assetNamespace = AssetNamespace.Slip44
 const assetReference = AssetReference.Ethereum
-const result = toCAIP19({ chain, network, assetNamespace, assetReference })
+const result = toAssetId({ chain, network, assetNamespace, assetReference })
 expect(result).toEqual('eip155:1/slip44:60')
 ```
 
@@ -54,17 +54,17 @@ const chain = ChainTypes.Ethereum
 const network = NetworkTypes.MAINNET
 const contractType = AssetNamespace.ERC20
 const tokenId = '0xc770eefad204b5180df6a14ee197d99d808ee52d'
-const result = toCAIP19({ chain, network, contractType, tokenId })
+const result = toAssetId({ chain, network, contractType, tokenId })
 expect(result).toEqual('eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d')
 ```
 
-### `fromCAIP19`
+### `fromAssetId`
 
 Ether
 
 ```ts
-const caip19 = 'eip155:1/slip44:60'
-const { chain, network, contractType, tokenId } = fromCAIP19(caip19)
+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(AssetNamespace.Slip44)
@@ -74,8 +74,8 @@ expect(tokenId).toEqual(AssetReference.Ethereum)
 ERC20 token
 
 ```ts
-const caip19 = 'eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d'
-const { chain, network, contractType, tokenId } = fromCAIP19(caip19)
+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(AssetNamespace.ERC20)
@@ -84,9 +84,9 @@ expect(tokenId).toEqual('0xc770eefad204b5180df6a14ee197d99d808ee52d')
 
 ## Adapters
 
-Adapters map CAIP-19 asset ids and map them to vendor-specific (e.g. CoinGecko) IDs.
+Adapters map asset IDs and map them to vendor-specific (e.g. CoinGecko) IDs.
 
-This allows us to use CAIP-19 IDs internally and keep any vendor IDs at the boundary.
+This allows us to use asset IDs internally and keep any vendor IDs at the boundary.
 
 ### Generate
 
@@ -102,11 +102,11 @@ and commit the generated `adapter.json` files.
 ### Usage
 
 ```ts
-console.log(coingeckoToCAIP19('shapeshift-fox-token'))
+console.log(coingeckoToAssetId('shapeshift-fox-token'))
 
 eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d
 
-console.log(CAIP19ToCoingecko('bip122:000000000019d6689c085ae165831e93/slip44:0'))
+console.log(assetIdToCoingecko('bip122:000000000019d6689c085ae165831e93/slip44:0'))
 
 bitcoin
 ```

package/dist/accountId/accountId.d.ts

@@ -0,0 +1,15 @@
+import { ChainId } from '../chainId/chainId';
+export declare type AccountId = string;
+declare type ToAccountIdArgs = {
+    chainId: ChainId;
+    account: string;
+};
+declare type ToAccountId = (args: ToAccountIdArgs) => string;
+export declare const toAccountId: ToAccountId;
+declare type FromAccountIdReturn = {
+    chainId: string;
+    account: string;
+};
+declare type FromAccountId = (accountId: string) => FromAccountIdReturn;
+export declare const fromAccountId: FromAccountId;
+export {};

package/dist/accountId/accountId.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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) {
+        throw new Error(`toAccountId: account is 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.ChainNamespace.Ethereum ? account.toLowerCase() : account;
+    return `${chainId}:${outputAccount}`;
+};
+exports.toAccountId = toAccountId;
+const fromAccountId = (accountId) => {
+    const parts = accountId.split(':');
+    if (parts.length !== 3) {
+        throw new Error(`fromAccountId: invalid AccountId ${accountId}`);
+    }
+    const chainId = parts.slice(0, 2).join(':');
+    if (!(0, chainId_1.isChainId)(chainId)) {
+        throw new Error(`fromAccountId: invalid ChainId ${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.ChainNamespace.Ethereum ? account.toLowerCase() : account;
+    return { chainId, account: outputAccount };
+};
+exports.fromAccountId = fromAccountId;

package/dist/adapters/banxa/index.d.ts

@@ -1,7 +1,7 @@
-export declare const banxaTickerToCAIP19: (id: string) => string | undefined;
-export declare const CAIP19ToBanxaTicker: (caip19: string) => string | undefined;
+export declare const banxaTickerToAssetId: (id: string) => string | undefined;
+export declare const AssetIdToBanxaTicker: (assetId: string) => string | undefined;
 export declare const getSupportedBanxaAssets: () => {
-    CAIP19: string;
+    assetId: string;
     ticker: string;
 }[];
 /**

package/dist/adapters/banxa/index.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.getBanxaBlockchainFromBanxaAssetTicker = exports.getSupportedBanxaAssets = exports.CAIP19ToBanxaTicker = exports.banxaTickerToCAIP19 = void 0;
+exports.getBanxaBlockchainFromBanxaAssetTicker = exports.getSupportedBanxaAssets = exports.AssetIdToBanxaTicker = exports.banxaTickerToAssetId = void 0;
 const entries_1 = __importDefault(require("lodash/entries"));
 const toLower_1 = __importDefault(require("lodash/toLower"));
-const caip2_1 = require("../../caip2/caip2");
-const caip19_1 = require("../../caip19/caip19");
-const CAIP19ToBanxaTickerMap = {
+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',
     'eip155:1/slip44:60': 'eth',
@@ -39,13 +39,13 @@ const CAIP19ToBanxaTickerMap = {
     'eip155:1/erc20:0x2260fac5e5542a773aa44fbcfedf7c193bc2c599': 'wbtc'
 };
 const invert = (data) => Object.entries(data).reduce((acc, [k, v]) => ((acc[v] = k), acc), {});
-const banxaTickerToCAIP19Map = invert(CAIP19ToBanxaTickerMap);
-const banxaTickerToCAIP19 = (id) => banxaTickerToCAIP19Map[id];
-exports.banxaTickerToCAIP19 = banxaTickerToCAIP19;
-const CAIP19ToBanxaTicker = (caip19) => CAIP19ToBanxaTickerMap[(0, toLower_1.default)(caip19)];
-exports.CAIP19ToBanxaTicker = CAIP19ToBanxaTicker;
-const getSupportedBanxaAssets = () => (0, entries_1.default)(CAIP19ToBanxaTickerMap).map(([CAIP19, ticker]) => ({
-    CAIP19,
+const banxaTickerToAssetIdMap = invert(AssetIdToBanxaTickerMap);
+const banxaTickerToAssetId = (id) => banxaTickerToAssetIdMap[id];
+exports.banxaTickerToAssetId = banxaTickerToAssetId;
+const AssetIdToBanxaTicker = (assetId) => AssetIdToBanxaTickerMap[(0, toLower_1.default)(assetId)];
+exports.AssetIdToBanxaTicker = AssetIdToBanxaTicker;
+const getSupportedBanxaAssets = () => (0, entries_1.default)(AssetIdToBanxaTickerMap).map(([assetId, ticker]) => ({
+    assetId,
     ticker
 }));
 exports.getSupportedBanxaAssets = getSupportedBanxaAssets;
@@ -66,11 +66,11 @@ const chainIdToBanxaBlockchainCodeMap = {
  * @returns {string} - a Banxa chain identifier; e.g., 'cosmos'
  */
 const getBanxaBlockchainFromBanxaAssetTicker = (banxaAssetId) => {
-    const assetCAIP19 = (0, exports.banxaTickerToCAIP19)(banxaAssetId.toLowerCase());
-    if (!assetCAIP19)
+    const assetAssetId = (0, exports.banxaTickerToAssetId)(banxaAssetId.toLowerCase());
+    if (!assetAssetId)
         throw new Error(`getBanxaBlockchainFromBanxaAssetTicker: ${banxaAssetId} is not supported`);
-    const { chain, network } = (0, caip19_1.fromCAIP19)(assetCAIP19);
-    const chainId = (0, caip2_1.toCAIP2)({ network, chain });
+    const { chain, network } = (0, assetId_1.fromAssetId)(assetAssetId);
+    const chainId = (0, chainId_1.toChainId)({ network, chain });
     return chainIdToBanxaBlockchainCodeMap[chainId];
 };
 exports.getBanxaBlockchainFromBanxaAssetTicker = getBanxaBlockchainFromBanxaAssetTicker;

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

@@ -1,3 +1,3 @@
 export declare const coincapUrl = "https://api.coincap.io/v2/assets?limit=2000";
-export declare const coincapToCAIP19: (id: string) => string | undefined;
-export declare const CAIP19ToCoinCap: (caip19: string) => string | undefined;
+export declare const coincapToAssetId: (id: string) => string | undefined;
+export declare const assetIdToCoinCap: (assetId: string) => string | undefined;

package/dist/adapters/coincap/index.js

@@ -26,17 +26,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CAIP19ToCoinCap = exports.coincapToCAIP19 = exports.coincapUrl = void 0;
+exports.assetIdToCoinCap = exports.coincapToAssetId = exports.coincapUrl = void 0;
 const toLower_1 = __importDefault(require("lodash/toLower"));
 const adapters = __importStar(require("./generated"));
 exports.coincapUrl = 'https://api.coincap.io/v2/assets?limit=2000';
-const generatedCAIP19ToCoinCapMap = Object.values(adapters).reduce((acc, cur) => ({
+const generatedAssetIdToCoinCapMap = Object.values(adapters).reduce((acc, cur) => ({
     ...acc,
     ...cur
 }));
 const invert = (data) => Object.entries(data).reduce((acc, [k, v]) => ((acc[v] = k), acc), {});
-const generatedCoinCapToCAIP19Map = invert(generatedCAIP19ToCoinCapMap);
-const coincapToCAIP19 = (id) => generatedCoinCapToCAIP19Map[id];
-exports.coincapToCAIP19 = coincapToCAIP19;
-const CAIP19ToCoinCap = (caip19) => generatedCAIP19ToCoinCapMap[(0, toLower_1.default)(caip19)];
-exports.CAIP19ToCoinCap = CAIP19ToCoinCap;
+const generatedCoinCapToAssetIdMap = invert(generatedAssetIdToCoinCapMap);
+const coincapToAssetId = (id) => generatedCoinCapToAssetIdMap[id];
+exports.coincapToAssetId = coincapToAssetId;
+const assetIdToCoinCap = (assetId) => generatedAssetIdToCoinCapMap[(0, toLower_1.default)(assetId)];
+exports.assetIdToCoinCap = assetIdToCoinCap;

package/dist/adapters/coincap/utils.js

@@ -7,14 +7,14 @@ exports.parseData = exports.makeOsmosisData = exports.makeCosmosHubData = export
 const types_1 = require("@shapeshiftoss/types");
 const axios_1 = __importDefault(require("axios"));
 const fs_1 = __importDefault(require("fs"));
-const caip2_1 = require("../../caip2/caip2");
-const caip19_1 = require("../../caip19/caip19");
+const assetId_1 = require("../../assetId/assetId");
+const chainId_1 = require("../../chainId/chainId");
 const writeFiles = async (data) => {
     const path = './src/adapters/coincap/generated/';
     const file = '/adapter.json';
     const writeFile = async ([k, v]) => await fs_1.default.promises.writeFile(`${path}${k}${file}`.replace(':', '_'), JSON.stringify(v));
     await Promise.all(Object.entries(data).map(writeFile));
-    console.info('Generated CoinCap CAIP19 adapter data.');
+    console.info('Generated CoinCap AssetId adapter data.');
 };
 exports.writeFiles = writeFiles;
 const fetchData = async (URL) => (await axios_1.default.get(URL)).data.data;
@@ -24,16 +24,16 @@ const parseEthData = (data) => {
     const chain = types_1.ChainTypes.Ethereum;
     const network = types_1.NetworkTypes.MAINNET;
     return ethCoins.reduce((acc, { id, explorer }) => {
-        let assetReference = caip19_1.AssetReference.Ethereum;
-        const assetNamespace = id === 'ethereum' ? caip19_1.AssetNamespace.Slip44 : caip19_1.AssetNamespace.ERC20;
+        let assetReference = assetId_1.AssetReference.Ethereum;
+        const assetNamespace = id === 'ethereum' ? assetId_1.AssetNamespace.Slip44 : assetId_1.AssetNamespace.ERC20;
         if (id !== 'ethereum' && explorer) {
             assetReference = explorer
                 .replace('https://etherscan.io/token/', '')
                 .split('#')[0]
                 .split('?')[0];
         }
-        const caip19 = (0, caip19_1.toCAIP19)({ chain, network, assetNamespace, assetReference });
-        acc[caip19] = id;
+        const assetId = (0, assetId_1.toAssetId)({ chain, network, assetNamespace, assetReference });
+        acc[assetId] = id;
         return acc;
     }, {});
 };
@@ -41,47 +41,47 @@ exports.parseEthData = parseEthData;
 const makeBtcData = () => {
     const chain = types_1.ChainTypes.Bitcoin;
     const network = types_1.NetworkTypes.MAINNET;
-    const caip19 = (0, caip19_1.toCAIP19)({
+    const assetId = (0, assetId_1.toAssetId)({
         chain,
         network,
-        assetNamespace: caip19_1.AssetNamespace.Slip44,
-        assetReference: caip19_1.AssetReference.Bitcoin
+        assetNamespace: assetId_1.AssetNamespace.Slip44,
+        assetReference: assetId_1.AssetReference.Bitcoin
     });
-    return { [caip19]: 'bitcoin' };
+    return { [assetId]: 'bitcoin' };
 };
 exports.makeBtcData = makeBtcData;
 const makeCosmosHubData = () => {
     const chain = types_1.ChainTypes.Cosmos;
     const network = types_1.NetworkTypes.COSMOSHUB_MAINNET;
-    const caip19 = (0, caip19_1.toCAIP19)({
+    const assetId = (0, assetId_1.toAssetId)({
         chain,
         network,
-        assetNamespace: caip19_1.AssetNamespace.Slip44,
-        assetReference: caip19_1.AssetReference.Cosmos
+        assetNamespace: assetId_1.AssetNamespace.Slip44,
+        assetReference: assetId_1.AssetReference.Cosmos
     });
-    return { [caip19]: 'cosmos' };
+    return { [assetId]: 'cosmos' };
 };
 exports.makeCosmosHubData = makeCosmosHubData;
 const makeOsmosisData = () => {
     const chain = types_1.ChainTypes.Osmosis;
     const network = types_1.NetworkTypes.OSMOSIS_MAINNET;
-    const caip19 = (0, caip19_1.toCAIP19)({
+    const assetId = (0, assetId_1.toAssetId)({
         chain,
         network,
-        assetNamespace: caip19_1.AssetNamespace.Slip44,
-        assetReference: caip19_1.AssetReference.Osmosis
+        assetNamespace: assetId_1.AssetNamespace.Slip44,
+        assetReference: assetId_1.AssetReference.Osmosis
     });
-    return { [caip19]: 'osmosis' };
+    return { [assetId]: 'osmosis' };
 };
 exports.makeOsmosisData = makeOsmosisData;
 const parseData = (d) => {
-    const ethereumMainnet = (0, caip2_1.toCAIP2)({ chain: types_1.ChainTypes.Ethereum, network: types_1.NetworkTypes.MAINNET });
-    const bitcoinMainnet = (0, caip2_1.toCAIP2)({ chain: types_1.ChainTypes.Bitcoin, network: types_1.NetworkTypes.MAINNET });
-    const cosmosHubMainnet = (0, caip2_1.toCAIP2)({
+    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, caip2_1.toCAIP2)({
+    const osmosisMainnet = (0, chainId_1.toChainId)({
         chain: types_1.ChainTypes.Osmosis,
         network: types_1.NetworkTypes.OSMOSIS_MAINNET
     });

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

@@ -1,3 +1,3 @@
 export declare const coingeckoUrl = "https://api.coingecko.com/api/v3/coins/list?include_platform=true";
-export declare const coingeckoToCAIP19: (id: string) => string | undefined;
-export declare const CAIP19ToCoingecko: (caip19: string) => string | undefined;
+export declare const coingeckoToAssetId: (id: string) => string | undefined;
+export declare const assetIdToCoingecko: (assetId: string) => string | undefined;

package/dist/adapters/coingecko/index.js

@@ -26,17 +26,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CAIP19ToCoingecko = exports.coingeckoToCAIP19 = exports.coingeckoUrl = void 0;
+exports.assetIdToCoingecko = exports.coingeckoToAssetId = exports.coingeckoUrl = void 0;
 const toLower_1 = __importDefault(require("lodash/toLower"));
 const adapters = __importStar(require("./generated"));
 exports.coingeckoUrl = 'https://api.coingecko.com/api/v3/coins/list?include_platform=true';
-const generatedCAIP19ToCoingeckoMap = Object.values(adapters).reduce((acc, cur) => ({
+const generatedAssetIdToCoingeckoMap = Object.values(adapters).reduce((acc, cur) => ({
     ...acc,
     ...cur
 }));
 const invert = (data) => Object.entries(data).reduce((acc, [k, v]) => ((acc[v] = k), acc), {});
-const generatedCoingeckoToCAIP19Map = invert(generatedCAIP19ToCoingeckoMap);
-const coingeckoToCAIP19 = (id) => generatedCoingeckoToCAIP19Map[id];
-exports.coingeckoToCAIP19 = coingeckoToCAIP19;
-const CAIP19ToCoingecko = (caip19) => generatedCAIP19ToCoingeckoMap[(0, toLower_1.default)(caip19)];
-exports.CAIP19ToCoingecko = CAIP19ToCoingecko;
+const generatedCoingeckoToAssetIdMap = invert(generatedAssetIdToCoingeckoMap);
+const coingeckoToAssetId = (id) => generatedCoingeckoToAssetIdMap[id];
+exports.coingeckoToAssetId = coingeckoToAssetId;
+const assetIdToCoingecko = (assetId) => generatedAssetIdToCoingeckoMap[(0, toLower_1.default)(assetId)];
+exports.assetIdToCoingecko = assetIdToCoingecko;

package/dist/adapters/coingecko/utils.js

@@ -7,14 +7,14 @@ exports.parseData = exports.makeOsmosisData = exports.makeCosmosHubData = export
 const types_1 = require("@shapeshiftoss/types");
 const axios_1 = __importDefault(require("axios"));
 const fs_1 = __importDefault(require("fs"));
-const caip2_1 = require("../../caip2/caip2");
-const caip19_1 = require("../../caip19/caip19");
+const assetId_1 = require("../../assetId/assetId");
+const chainId_1 = require("../../chainId/chainId");
 const writeFiles = async (data) => {
     const path = './src/adapters/coingecko/generated/';
     const file = '/adapter.json';
     const writeFile = async ([k, v]) => await fs_1.default.promises.writeFile(`${path}${k}${file}`.replace(':', '_'), JSON.stringify(v));
     await Promise.all(Object.entries(data).map(writeFile));
-    console.info('Generated CoinGecko CAIP19 adapter data.');
+    console.info('Generated CoinGecko AssetId adapter data.');
 };
 exports.writeFiles = writeFiles;
 const fetchData = async (URL) => (await axios_1.default.get(URL)).data;
@@ -24,10 +24,10 @@ const parseEthData = (data) => {
     const chain = types_1.ChainTypes.Ethereum;
     const network = types_1.NetworkTypes.MAINNET;
     return ethCoins.reduce((acc, { id, platforms }) => {
-        const assetNamespace = id === 'ethereum' ? caip19_1.AssetNamespace.Slip44 : caip19_1.AssetNamespace.ERC20;
-        const assetReference = id === 'ethereum' ? caip19_1.AssetReference.Ethereum : platforms === null || platforms === void 0 ? void 0 : platforms.ethereum;
-        const caip19 = (0, caip19_1.toCAIP19)({ chain, network, assetNamespace, assetReference });
-        acc[caip19] = id;
+        const assetNamespace = id === 'ethereum' ? assetId_1.AssetNamespace.Slip44 : assetId_1.AssetNamespace.ERC20;
+        const assetReference = id === 'ethereum' ? assetId_1.AssetReference.Ethereum : platforms === null || platforms === void 0 ? void 0 : platforms.ethereum;
+        const assetId = (0, assetId_1.toAssetId)({ chain, network, assetNamespace, assetReference });
+        acc[assetId] = id;
         return acc;
     }, {});
 };
@@ -35,47 +35,47 @@ exports.parseEthData = parseEthData;
 const makeBtcData = () => {
     const chain = types_1.ChainTypes.Bitcoin;
     const network = types_1.NetworkTypes.MAINNET;
-    const caip19 = (0, caip19_1.toCAIP19)({
+    const assetId = (0, assetId_1.toAssetId)({
         chain,
         network,
-        assetNamespace: caip19_1.AssetNamespace.Slip44,
-        assetReference: caip19_1.AssetReference.Bitcoin
+        assetNamespace: assetId_1.AssetNamespace.Slip44,
+        assetReference: assetId_1.AssetReference.Bitcoin
     });
-    return { [caip19]: 'bitcoin' };
+    return { [assetId]: 'bitcoin' };
 };
 exports.makeBtcData = makeBtcData;
 const makeCosmosHubData = () => {
     const chain = types_1.ChainTypes.Cosmos;
     const network = types_1.NetworkTypes.COSMOSHUB_MAINNET;
-    const caip19 = (0, caip19_1.toCAIP19)({
+    const assetId = (0, assetId_1.toAssetId)({
         chain,
         network,
-        assetNamespace: caip19_1.AssetNamespace.Slip44,
-        assetReference: caip19_1.AssetReference.Cosmos
+        assetNamespace: assetId_1.AssetNamespace.Slip44,
+        assetReference: assetId_1.AssetReference.Cosmos
     });
-    return { [caip19]: 'cosmos' };
+    return { [assetId]: 'cosmos' };
 };
 exports.makeCosmosHubData = makeCosmosHubData;
 const makeOsmosisData = () => {
     const chain = types_1.ChainTypes.Osmosis;
     const network = types_1.NetworkTypes.OSMOSIS_MAINNET;
-    const caip19 = (0, caip19_1.toCAIP19)({
+    const assetId = (0, assetId_1.toAssetId)({
         chain,
         network,
-        assetNamespace: caip19_1.AssetNamespace.Slip44,
-        assetReference: caip19_1.AssetReference.Osmosis
+        assetNamespace: assetId_1.AssetNamespace.Slip44,
+        assetReference: assetId_1.AssetReference.Osmosis
     });
-    return { [caip19]: 'osmosis' };
+    return { [assetId]: 'osmosis' };
 };
 exports.makeOsmosisData = makeOsmosisData;
 const parseData = (d) => {
-    const ethereumMainnet = (0, caip2_1.toCAIP2)({ chain: types_1.ChainTypes.Ethereum, network: types_1.NetworkTypes.MAINNET });
-    const bitcoinMainnet = (0, caip2_1.toCAIP2)({ chain: types_1.ChainTypes.Bitcoin, network: types_1.NetworkTypes.MAINNET });
-    const cosmosHubMainnet = (0, caip2_1.toCAIP2)({
+    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, caip2_1.toCAIP2)({
+    const osmosisMainnet = (0, chainId_1.toChainId)({
         chain: types_1.ChainTypes.Osmosis,
         network: types_1.NetworkTypes.OSMOSIS_MAINNET
     });

package/dist/adapters/gem/index.d.ts

@@ -1,2 +1,2 @@
-export declare const gemAssetIdToCAIP19: (id: string) => string | undefined;
-export declare const CAIP19ToGemAssetId: (caip19: string) => string | undefined;
+export declare const gemAssetIdToAssetId: (id: string) => string | undefined;
+export declare const assetIdToGemAssetId: (assetId: string) => string | undefined;

package/dist/adapters/gem/index.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CAIP19ToGemAssetId = exports.gemAssetIdToCAIP19 = void 0;
+exports.assetIdToGemAssetId = exports.gemAssetIdToAssetId = void 0;
 const toLower_1 = __importDefault(require("lodash/toLower"));
-const CAIP19ToGemAssetIdMap = {
+const assetIdToGemAssetIdMap = {
     'bip122:000000000019d6689c085ae165831e93/slip44:0': 'bitcoin',
     'eip155:1/slip44:60': 'ethereum',
     'eip155:1/erc20:0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9': 'aave',
@@ -29,8 +29,8 @@ const CAIP19ToGemAssetIdMap = {
     'eip155:1/erc20:0x0bc529c00c6401aef6d220be8c6ea1667f6ad93e': 'yearn-finance'
 };
 const invert = (data) => Object.entries(data).reduce((acc, [k, v]) => ((acc[v] = k), acc), {});
-const gemAssetIdToCAIP19Map = invert(CAIP19ToGemAssetIdMap);
-const gemAssetIdToCAIP19 = (id) => gemAssetIdToCAIP19Map[id];
-exports.gemAssetIdToCAIP19 = gemAssetIdToCAIP19;
-const CAIP19ToGemAssetId = (caip19) => CAIP19ToGemAssetIdMap[(0, toLower_1.default)(caip19)];
-exports.CAIP19ToGemAssetId = CAIP19ToGemAssetId;
+const gemAssetIdToAssetIdMap = invert(assetIdToGemAssetIdMap);
+const gemAssetIdToAssetId = (id) => gemAssetIdToAssetIdMap[id];
+exports.gemAssetIdToAssetId = gemAssetIdToAssetId;
+const assetIdToGemAssetId = (assetId) => assetIdToGemAssetIdMap[(0, toLower_1.default)(assetId)];
+exports.assetIdToGemAssetId = assetIdToGemAssetId;

package/dist/adapters/osmosis/index.d.ts

@@ -1,3 +1,3 @@
 export declare const osmosisUrl = "https://api-osmosis.imperator.co/tokens/v2/all";
-export declare const osmosisToCAIP19: (id: string) => string | undefined;
-export declare const CAIP19ToOsmosis: (caip19: string) => string | undefined;
+export declare const osmosisToAssetId: (id: string) => string | undefined;
+export declare const assetIdToOsmosis: (assetId: string) => string | undefined;

package/dist/adapters/osmosis/index.js

@@ -23,16 +23,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CAIP19ToOsmosis = exports.osmosisToCAIP19 = exports.osmosisUrl = void 0;
+exports.assetIdToOsmosis = exports.osmosisToAssetId = exports.osmosisUrl = void 0;
 const adapters = __importStar(require("./generated"));
 exports.osmosisUrl = 'https://api-osmosis.imperator.co/tokens/v2/all';
-const generatedCAIP19ToOsmosisMap = Object.values(adapters).reduce((acc, cur) => ({
+const generatedAssetIdToOsmosisMap = Object.values(adapters).reduce((acc, cur) => ({
     ...acc,
     ...cur
 }));
 const invert = (data) => Object.entries(data).reduce((acc, [k, v]) => ((acc[v] = k), acc), {});
-const generatedOsmosisToCAIP19Map = invert(generatedCAIP19ToOsmosisMap);
-const osmosisToCAIP19 = (id) => generatedOsmosisToCAIP19Map[id];
-exports.osmosisToCAIP19 = osmosisToCAIP19;
-const CAIP19ToOsmosis = (caip19) => generatedCAIP19ToOsmosisMap[caip19];
-exports.CAIP19ToOsmosis = CAIP19ToOsmosis;
+const generatedOsmosisToAssetIdMap = invert(generatedAssetIdToOsmosisMap);
+const osmosisToAssetId = (id) => generatedOsmosisToAssetIdMap[id];
+exports.osmosisToAssetId = osmosisToAssetId;
+const assetIdToOsmosis = (assetId) => generatedAssetIdToOsmosisMap[assetId];
+exports.assetIdToOsmosis = assetIdToOsmosis;

package/dist/adapters/osmosis/utils.js

@@ -7,14 +7,14 @@ exports.parseData = exports.parseOsmosisData = exports.fetchData = exports.write
 const types_1 = require("@shapeshiftoss/types");
 const axios_1 = __importDefault(require("axios"));
 const fs_1 = __importDefault(require("fs"));
-const caip2_1 = require("../../caip2/caip2");
-const caip19_1 = require("./../../caip19/caip19");
+const assetId_1 = require("../../assetId/assetId");
+const chainId_1 = require("../../chainId/chainId");
 const writeFiles = async (data) => {
     const path = './src/adapters/osmosis/generated/';
     const file = '/adapter.json';
     const writeFile = async ([k, v]) => await fs_1.default.promises.writeFile(`${path}${k}${file}`.replace(':', '_'), JSON.stringify(v));
     await Promise.all(Object.entries(data).map(writeFile));
-    console.info('Generated Osmosis CAIP19 adapter data.');
+    console.info('Generated Osmosis AssetId adapter data.');
 };
 exports.writeFiles = writeFiles;
 const fetchData = async (URL) => (await axios_1.default.get(URL)).data;
@@ -28,24 +28,24 @@ const parseOsmosisData = (data) => {
         let assetReference;
         if (isNativeAsset) {
             // TODO(ryankk): remove `toString` when AssetReferences are changed to strings
-            assetReference = isOsmo ? caip19_1.AssetReference.Osmosis.toString() : denom;
-            assetNamespace = isOsmo ? caip19_1.AssetNamespace.Slip44 : caip19_1.AssetNamespace.NATIVE;
+            assetReference = isOsmo ? assetId_1.AssetReference.Osmosis.toString() : denom;
+            assetNamespace = isOsmo ? assetId_1.AssetNamespace.Slip44 : assetId_1.AssetNamespace.NATIVE;
         }
         else {
             assetReference = denom.split('/')[1];
-            assetNamespace = caip19_1.AssetNamespace.IBC;
+            assetNamespace = assetId_1.AssetNamespace.IBC;
         }
         const chain = types_1.ChainTypes.Osmosis;
         const network = types_1.NetworkTypes.OSMOSIS_MAINNET;
-        const caip19 = (0, caip19_1.toCAIP19)({ chain, network, assetNamespace, assetReference });
-        acc[caip19] = symbol;
+        const assetId = (0, assetId_1.toAssetId)({ chain, network, assetNamespace, assetReference });
+        acc[assetId] = symbol;
         return acc;
     }, {});
     return results;
 };
 exports.parseOsmosisData = parseOsmosisData;
 const parseData = (d) => {
-    const osmosisMainnet = (0, caip2_1.toCAIP2)({
+    const osmosisMainnet = (0, chainId_1.toChainId)({
         chain: types_1.ChainTypes.Osmosis,
         network: types_1.NetworkTypes.OSMOSIS_MAINNET
     });

package/dist/adapters/yearn/index.d.ts

@@ -1,2 +1,2 @@
-export declare const yearnToCAIP19: (id: string) => string;
-export declare const CAIP19ToYearn: (caip19: string) => string | undefined;
+export declare const yearnToAssetId: (id: string) => string;
+export declare const assetIdToYearn: (assetId: string) => string | undefined;

package/dist/adapters/yearn/index.js

@@ -26,16 +26,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CAIP19ToYearn = exports.yearnToCAIP19 = void 0;
+exports.assetIdToYearn = exports.yearnToAssetId = void 0;
 const toLower_1 = __importDefault(require("lodash/toLower"));
 const adapters = __importStar(require("./generated"));
-const generatedCAIP19ToYearnMap = Object.values(adapters).reduce((acc, cur) => ({
+const generatedAssedIdToYearnMap = Object.values(adapters).reduce((acc, cur) => ({
     ...acc,
     ...cur
 }));
 const invert = (data) => Object.entries(data).reduce((acc, [k, v]) => ((acc[v] = k), acc), {});
-const generatedYearnToCAIP19Map = invert(generatedCAIP19ToYearnMap);
-const yearnToCAIP19 = (id) => generatedYearnToCAIP19Map[id];
-exports.yearnToCAIP19 = yearnToCAIP19;
-const CAIP19ToYearn = (caip19) => generatedCAIP19ToYearnMap[(0, toLower_1.default)(caip19)];
-exports.CAIP19ToYearn = CAIP19ToYearn;
+const generatedYearnToAssetIdMap = invert(generatedAssedIdToYearnMap);
+const yearnToAssetId = (id) => generatedYearnToAssetIdMap[id];
+exports.yearnToAssetId = yearnToAssetId;
+const assetIdToYearn = (assetId) => generatedAssedIdToYearnMap[(0, toLower_1.default)(assetId)];
+exports.assetIdToYearn = assetIdToYearn;

package/dist/adapters/yearn/utils.js

@@ -10,8 +10,8 @@ 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 caip2_1 = require("../../caip2/caip2");
-const caip19_1 = require("../../caip19/caip19");
+const assetId_1 = require("../../assetId/assetId");
+const chainId_1 = require("../../chainId/chainId");
 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 });
@@ -20,7 +20,7 @@ const writeFiles = async (data) => {
     const file = '/adapter.json';
     const writeFile = async ([k, v]) => await fs_1.default.promises.writeFile(`${path}${k}${file}`.replace(':', '_'), JSON.stringify(v));
     await Promise.all(Object.entries(data).map(writeFile));
-    console.info('Generated Yearn CAIP19 adapter data.');
+    console.info('Generated Yearn AssetId adapter data.');
 };
 exports.writeFiles = writeFiles;
 const fetchData = async () => {
@@ -36,24 +36,24 @@ const fetchData = async () => {
 exports.fetchData = fetchData;
 const parseEthData = (data) => {
     const chain = types_1.ChainTypes.Ethereum;
-    const assetNamespace = caip19_1.AssetNamespace.ERC20;
+    const assetNamespace = assetId_1.AssetNamespace.ERC20;
     return data.reduce((acc, datum) => {
         const { address } = datum;
         const id = address;
         const assetReference = (0, toLower_1.default)(address);
-        const caip19 = (0, caip19_1.toCAIP19)({
+        const assetId = (0, assetId_1.toAssetId)({
             chain,
             network: types_1.NetworkTypes.MAINNET,
             assetNamespace,
             assetReference
         });
-        acc[caip19] = id;
+        acc[assetId] = id;
         return acc;
     }, {});
 };
 exports.parseEthData = parseEthData;
 const parseData = (d) => {
-    const ethMainnet = (0, caip2_1.toCAIP2)({ chain: types_1.ChainTypes.Ethereum, network: types_1.NetworkTypes.MAINNET });
+    const ethMainnet = (0, chainId_1.toChainId)({ chain: types_1.ChainTypes.Ethereum, network: types_1.NetworkTypes.MAINNET });
     return { [ethMainnet]: (0, exports.parseEthData)(d) };
 };
 exports.parseData = parseData;

package/dist/{caip19/caip19.d.ts → assetId/assetId.d.ts}

@@ -1,9 +1,5 @@
 import { ChainTypes, NetworkTypes } from '@shapeshiftoss/types';
-import { ChainReference } from '../caip2/caip2';
-/**
- * @deprecated - Temporarily left in place for backwards compatibility, to be replaced with AssetId
- */
-export declare type CAIP19 = string;
+import { ChainReference } from '../chainId/chainId';
 export declare type AssetId = string;
 export declare enum AssetNamespace {
     CW20 = "cw20",
@@ -20,19 +16,19 @@ export declare enum AssetReference {
     Cosmos = "118",
     Osmosis = "118"
 }
-declare type ToCAIP19Args = {
+declare type ToAssetIdArgs = {
     chain: ChainTypes;
     network: NetworkTypes | ChainReference;
     assetNamespace: AssetNamespace;
     assetReference: AssetReference | string;
 };
-declare type ToCAIP19 = (args: ToCAIP19Args) => string;
-export declare const toCAIP19: ToCAIP19;
-declare type FromCAIP19Return = {
+declare type ToAssetId = (args: ToAssetIdArgs) => string;
+export declare const toAssetId: ToAssetId;
+declare type FromAssetIdReturn = {
     chain: ChainTypes;
     network: NetworkTypes;
     assetNamespace: AssetNamespace;
     assetReference: AssetReference | string;
 };
-export declare const fromCAIP19: (caip19: string) => FromCAIP19Return;
+export declare const fromAssetId: (assetId: string) => FromAssetIdReturn;
 export {};

package/dist/{caip19/caip19.js → assetId/assetId.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromCAIP19 = exports.toCAIP19 = exports.AssetReference = exports.AssetNamespace = void 0;
+exports.fromAssetId = exports.toAssetId = exports.AssetReference = exports.AssetNamespace = void 0;
 // https://github.com/ChainAgnostic/CAIPs/blob/master/CAIPs/caip-19.md
 const types_1 = require("@shapeshiftoss/types");
-const caip2_1 = require("../caip2/caip2");
+const chainId_1 = require("../chainId/chainId");
 var AssetNamespace;
 (function (AssetNamespace) {
     AssetNamespace["CW20"] = "cw20";
@@ -55,45 +55,45 @@ const isValidSlip44 = (value) => {
     // slip44 has a max value of an unsigned 32-bit integer
     return !isNaN(n) && n >= 0 && n < 4294967296;
 };
-const toCAIP19 = (args) => {
+const toAssetId = (args) => {
     const { chain, network, assetNamespace } = args;
     let { assetReference } = args;
     if (!chain)
-        throw new Error('toCAIP19: No chain provided');
+        throw new Error('toAssetId: No chain provided');
     if (!network)
-        throw new Error('toCAIP19: No chainReference Provided');
+        throw new Error('toAssetId: No chainReference Provided');
     if (!assetNamespace)
-        throw new Error('toCAIP19: No assetNamespace provided');
+        throw new Error('toAssetId: No assetNamespace provided');
     if (!assetReference)
-        throw new Error('toCAIP19: No assetReference provided');
-    const caip2 = (0, caip2_1.toCAIP2)({ chain, network });
+        throw new Error('toAssetId: No assetReference provided');
+    const chainId = (0, chainId_1.toChainId)({ chain, network });
     if (!validAssetNamespaces[chain].includes(assetNamespace)) {
-        throw new Error(`toCAIP19: Asset Namespace ${assetNamespace} not supported for chain ${chain}`);
+        throw new Error(`toAssetId: Asset Namespace ${assetNamespace} not supported for chain ${chain}`);
     }
     if (assetNamespace === AssetNamespace.Slip44 && !isValidSlip44(String(assetReference))) {
         throw new Error(`Invalid reference for namespace slip44`);
     }
     if ([AssetNamespace.ERC20, AssetNamespace.ERC721].includes(assetNamespace)) {
         if (!assetReference.startsWith('0x')) {
-            throw new Error(`toCAIP19: assetReference must start with 0x: ${assetReference}`);
+            throw new Error(`toAssetId: assetReference must start with 0x: ${assetReference}`);
         }
         if (assetReference.length !== 42) {
-            throw new Error(`toCAIP19: assetReference length must be 42, length: ${assetReference.length}`);
+            throw new Error(`toAssetId: assetReference length must be 42, length: ${assetReference.length}`);
         }
         // We make Eth contract addresses lower case to simplify comparisons
         assetReference = assetReference.toLowerCase();
     }
-    return `${caip2}/${assetNamespace}:${assetReference}`;
+    return `${chainId}/${assetNamespace}:${assetReference}`;
 };
-exports.toCAIP19 = toCAIP19;
-const parseCaip19RegExp = /([-a-z\d]{3,8}):([-a-zA-Z\d]{1,32})\/([-a-z\d]{3,8}):([-a-zA-Z\d]+)/;
-const fromCAIP19 = (caip19) => {
+exports.toAssetId = toAssetId;
+const parseAssetIdRegExp = /([-a-z\d]{3,8}):([-a-zA-Z\d]{1,32})\/([-a-z\d]{3,8}):([-a-zA-Z\d]+)/;
+const fromAssetId = (assetId) => {
     var _a;
-    const matches = (_a = parseCaip19RegExp.exec(caip19)) !== null && _a !== void 0 ? _a : [];
+    const matches = (_a = parseAssetIdRegExp.exec(assetId)) !== null && _a !== void 0 ? _a : [];
     // We're okay casting these strings to enums because we check to make sure
     // they are valid enum values
-    let chain = caip2_1.chainNamespaceToChainType[matches[1]];
-    const network = caip2_1.chainReferenceToNetworkType[matches[2]];
+    let chain = chainId_1.chainNamespaceToChainType[matches[1]];
+    const network = chainId_1.chainReferenceToNetworkType[matches[2]];
     const assetNamespace = stringToEnum(AssetNamespace, matches[3]);
     let assetReference = matches[4];
     if (chain && network && assetNamespace && assetReference) {
@@ -110,6 +110,6 @@ const fromCAIP19 = (caip19) => {
         }
         return { chain, network, assetNamespace, assetReference };
     }
-    throw new Error(`fromCAIP19: invalid CAIP19: ${caip19}`);
+    throw new Error(`fromAssetId: invalid AssetId: ${assetId}`);
 };
-exports.fromCAIP19 = fromCAIP19;
+exports.fromAssetId = fromAssetId;

package/dist/{caip2/caip2.d.ts → chainId/chainId.d.ts}

@@ -1,8 +1,4 @@
 import { ChainTypes, NetworkTypes } from '@shapeshiftoss/types';
-/**
- * @deprecated - Temporarily left in place for backwards compatibility, to be replaced with ChainId
- */
-export declare type CAIP2 = string;
 export declare type ChainId = string;
 export declare enum ChainNamespace {
     Ethereum = "eip155",
@@ -20,19 +16,19 @@ export declare enum ChainReference {
     OsmosisMainnet = "osmosis-1",
     OsmosisTestnet = "osmo-testnet-1"
 }
-declare type ToCAIP2Args = {
+declare type ToChainIdArgs = {
     chain: ChainTypes;
     network: NetworkTypes | ChainReference;
 };
-export declare const toCAIP2: (args: ToCAIP2Args) => string;
-declare type FromCAIP2Return = {
+export declare const toChainId: (args: ToChainIdArgs) => string;
+declare type FromChainIdReturn = {
     chain: ChainTypes;
     network: NetworkTypes;
 };
-declare type FromCAIP2 = (caip2: string) => FromCAIP2Return;
-export declare const fromCAIP2: FromCAIP2;
-declare type IsCAIP2 = (caip2: string) => boolean;
-export declare const isCAIP2: IsCAIP2;
+declare type FromChainId = (chainId: string) => FromChainIdReturn;
+export declare const fromChainId: FromChainId;
+declare type IsChainId = (chainId: string) => boolean;
+export declare const isChainId: IsChainId;
 export declare const chainReferenceToNetworkType: Record<ChainReference, NetworkTypes>;
 export declare const networkTypeToChainReference: Record<NetworkTypes, ChainReference>;
 export declare const chainNamespaceToChainType: Record<ChainNamespace, ChainTypes>;

package/dist/{caip2/caip2.js → chainId/chainId.js}

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.chainNamespaceToChainType = exports.networkTypeToChainReference = exports.chainReferenceToNetworkType = exports.isCAIP2 = exports.fromCAIP2 = exports.toCAIP2 = exports.ChainReference = exports.ChainNamespace = void 0;
+exports.chainNamespaceToChainType = exports.networkTypeToChainReference = exports.chainReferenceToNetworkType = exports.isChainId = exports.fromChainId = exports.toChainId = exports.ChainReference = exports.ChainNamespace = void 0;
 const types_1 = require("@shapeshiftoss/types");
 const invert_1 = __importDefault(require("lodash/invert"));
 var ChainNamespace;
@@ -18,9 +18,9 @@ var ChainReference;
     ChainReference["EthereumMainnet"] = "1";
     ChainReference["EthereumRopsten"] = "3";
     ChainReference["EthereumRinkeby"] = "4";
-    // EthereumKovan = '42', // currently unsupported by shapeshift
+    // EthereumKovan = '42', // currently unsupported by ShapeShift
     // https://github.com/bitcoin/bips/blob/master/bip-0122.mediawiki#definition-of-chain-id
-    // caip2 uses max length of 32 chars of the genesis block
+    // chainId uses max length of 32 chars of the genesis block
     ChainReference["BitcoinMainnet"] = "000000000019d6689c085ae165831e93";
     ChainReference["BitcoinTestnet"] = "000000000933ea01ad0ee984209779ba";
     ChainReference["CosmosHubMainnet"] = "cosmoshub-4";
@@ -28,7 +28,7 @@ var ChainReference;
     ChainReference["OsmosisMainnet"] = "osmosis-1";
     ChainReference["OsmosisTestnet"] = "osmo-testnet-1";
 })(ChainReference = exports.ChainReference || (exports.ChainReference = {}));
-const shapeShiftToCAIP2 = Object.freeze({
+const shapeShiftToChainId = Object.freeze({
     [types_1.ChainTypes.Ethereum]: {
         namespace: ChainNamespace.Ethereum,
         reference: {
@@ -59,12 +59,12 @@ const shapeShiftToCAIP2 = Object.freeze({
         }
     }
 });
-const toCAIP2 = (args) => {
+const toChainId = (args) => {
     const { chain, network } = args;
-    const namespace = shapeShiftToCAIP2[chain].namespace;
+    const namespace = shapeShiftToChainId[chain].namespace;
     switch (chain) {
         case types_1.ChainTypes.Ethereum: {
-            const referenceMap = shapeShiftToCAIP2[chain].reference;
+            const referenceMap = shapeShiftToChainId[chain].reference;
             switch (network) {
                 case types_1.NetworkTypes.MAINNET:
                 case types_1.NetworkTypes.ETH_ROPSTEN:
@@ -76,7 +76,7 @@ const toCAIP2 = (args) => {
             break;
         }
         case types_1.ChainTypes.Bitcoin: {
-            const referenceMap = shapeShiftToCAIP2[chain].reference;
+            const referenceMap = shapeShiftToChainId[chain].reference;
             switch (network) {
                 case types_1.NetworkTypes.MAINNET:
                 case types_1.NetworkTypes.TESTNET: {
@@ -87,7 +87,7 @@ const toCAIP2 = (args) => {
             break;
         }
         case types_1.ChainTypes.Cosmos: {
-            const referenceMap = shapeShiftToCAIP2[chain].reference;
+            const referenceMap = shapeShiftToChainId[chain].reference;
             switch (network) {
                 case types_1.NetworkTypes.COSMOSHUB_MAINNET:
                 case types_1.NetworkTypes.COSMOSHUB_VEGA: {
@@ -98,7 +98,7 @@ const toCAIP2 = (args) => {
             break;
         }
         case types_1.ChainTypes.Osmosis: {
-            const referenceMap = shapeShiftToCAIP2[chain].reference;
+            const referenceMap = shapeShiftToChainId[chain].reference;
             switch (network) {
                 case types_1.NetworkTypes.OSMOSIS_MAINNET:
                 case types_1.NetworkTypes.OSMOSIS_TESTNET: {
@@ -109,13 +109,13 @@ const toCAIP2 = (args) => {
             break;
         }
     }
-    throw new Error(`toCAIP2: unsupported ${chain} network: ${network}`);
+    throw new Error(`toChainId: unsupported ${chain} network: ${network}`);
 };
-exports.toCAIP2 = toCAIP2;
-const fromCAIP2 = (caip2) => {
-    const [c, n] = caip2.split(':');
+exports.toChainId = toChainId;
+const fromChainId = (chainId) => {
+    const [c, n] = chainId.split(':');
     if (!(c && n)) {
-        throw new Error(`fromCAIP19: error parsing caip19, chain: ${c}, network: ${n}`);
+        throw new Error(`fromChainId: error parsing chainId, chain: ${c}, network: ${n}`);
     }
     switch (c) {
         case ChainNamespace.Cosmos: {
@@ -133,7 +133,7 @@ const fromCAIP2 = (caip2) => {
                     return { chain: types_1.ChainTypes.Osmosis, network: types_1.NetworkTypes.OSMOSIS_TESTNET };
                 }
                 default: {
-                    throw new Error(`fromCAIP19: unsupported ${c} network: ${n}`);
+                    throw new Error(`fromChainId: unsupported ${c} network: ${n}`);
                 }
             }
         }
@@ -153,7 +153,7 @@ const fromCAIP2 = (caip2) => {
                     return { chain, network };
                 }
                 default: {
-                    throw new Error(`fromCAIP19: unsupported ${c} network: ${n}`);
+                    throw new Error(`fromChainId: unsupported ${c} network: ${n}`);
                 }
             }
         }
@@ -169,18 +169,18 @@ const fromCAIP2 = (caip2) => {
                     return { chain, network };
                 }
                 default: {
-                    throw new Error(`fromCAIP19: unsupported ${c} network: ${n}`);
+                    throw new Error(`fromChainId: unsupported ${c} network: ${n}`);
                 }
             }
         }
     }
-    throw new Error(`fromCAIP19: unsupported chain: ${c}`);
+    throw new Error(`fromChainId: unsupported chain: ${c}`);
 };
-exports.fromCAIP2 = fromCAIP2;
-const isCAIP2 = (caip2) => {
-    const [c, n] = caip2.split(':');
+exports.fromChainId = fromChainId;
+const isChainId = (chainId) => {
+    const [c, n] = chainId.split(':');
     if (!(c && n)) {
-        throw new Error(`isCAIP2: error parsing caip19, chain: ${c}, network: ${n}`);
+        throw new Error(`isChainId: error parsing chainId, chain: ${c}, network: ${n}`);
     }
     switch (c) {
         case ChainNamespace.Cosmos: {
@@ -211,9 +211,9 @@ const isCAIP2 = (caip2) => {
             break;
         }
     }
-    throw new Error(`isCAIP2: invalid caip2 ${caip2}`);
+    throw new Error(`isChainId: invalid ChainId ${chainId}`);
 };
-exports.isCAIP2 = isCAIP2;
+exports.isChainId = isChainId;
 exports.chainReferenceToNetworkType = Object.freeze({
     [ChainReference.BitcoinMainnet]: types_1.NetworkTypes.MAINNET,
     [ChainReference.BitcoinTestnet]: types_1.NetworkTypes.TESTNET,

package/dist/index.d.ts

@@ -1,8 +1,4 @@
-import * as adapters from './adapters';
-import * as caip2 from './caip2/caip2';
-import * as caip10 from './caip10/caip10';
-import * as caip19 from './caip19/caip19';
-export { adapters, caip2, caip19, caip10 };
-export * from './caip2/caip2';
-export * from './caip10/caip10';
-export * from './caip19/caip19';
+export * as adapters from './adapters';
+export * from './chainId/chainId';
+export * from './accountId/accountId';
+export * from './assetId/assetId';

package/dist/index.js

@@ -26,17 +26,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.caip10 = exports.caip19 = exports.caip2 = exports.adapters = void 0;
-const adapters = __importStar(require("./adapters"));
-exports.adapters = adapters;
-// TODO: These all go away on the caip breaking change PR
-const caip2 = __importStar(require("./caip2/caip2"));
-exports.caip2 = caip2;
-const caip10 = __importStar(require("./caip10/caip10"));
-exports.caip10 = caip10;
-const caip19 = __importStar(require("./caip19/caip19"));
-exports.caip19 = caip19;
-// ENDTODO
-__exportStar(require("./caip2/caip2"), exports);
-__exportStar(require("./caip10/caip10"), exports);
-__exportStar(require("./caip19/caip19"), exports);
+exports.adapters = void 0;
+exports.adapters = __importStar(require("./adapters"));
+__exportStar(require("./chainId/chainId"), exports);
+__exportStar(require("./accountId/accountId"), exports);
+__exportStar(require("./assetId/assetId"), exports);

package/dist/utils.d.ts

@@ -1,6 +1,6 @@
-import { ChainId } from './caip2/caip2';
-import { AccountId } from './caip10/caip10';
-import { AssetId } from './caip19/caip19';
+import { AccountId } from './accountId/accountId';
+import { AssetId } from './assetId/assetId';
+import { ChainId } from './chainId/chainId';
 export declare const btcAssetId = "bip122:000000000019d6689c085ae165831e93/slip44:0";
 export declare const ethAssetId = "eip155:1/slip44:60";
 export declare const cosmosAssetId = "cosmos:cosmoshub-4/slip44:118";
@@ -11,4 +11,4 @@ export declare const chainIdToAssetId: Record<ChainId, AssetId>;
 export declare const assetIdToChainId: (assetId: AssetId) => string;
 export declare const accountIdToChainId: (accountId: AccountId) => ChainId;
 export declare const accountIdToSpecifier: (accountId: AccountId) => string;
-export declare const getChainReferenceFromChainId: (chainId: ChainId) => import("./caip2/caip2").ChainReference;
+export declare const getChainReferenceFromChainId: (chainId: ChainId) => import("./chainId/chainId").ChainReference;

package/dist/utils.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getChainReferenceFromChainId = exports.accountIdToSpecifier = exports.accountIdToChainId = exports.assetIdToChainId = exports.chainIdToAssetId = exports.cosmosChainId = exports.btcChainId = exports.ethChainId = exports.cosmosAssetId = exports.ethAssetId = exports.btcAssetId = void 0;
-const caip2_1 = require("./caip2/caip2");
-const caip10_1 = require("./caip10/caip10");
-const caip19_1 = require("./caip19/caip19");
+const accountId_1 = require("./accountId/accountId");
+const assetId_1 = require("./assetId/assetId");
+const chainId_1 = require("./chainId/chainId");
 exports.btcAssetId = 'bip122:000000000019d6689c085ae165831e93/slip44:0';
 exports.ethAssetId = 'eip155:1/slip44:60';
 exports.cosmosAssetId = 'cosmos:cosmoshub-4/slip44:118';
@@ -16,13 +16,13 @@ exports.chainIdToAssetId = {
     [exports.cosmosChainId]: 'cosmos:cosmoshub-4/slip44:118'
 };
 const assetIdToChainId = (assetId) => {
-    const { chain, network } = (0, caip19_1.fromCAIP19)(assetId);
-    return (0, caip2_1.toCAIP2)({ chain, network });
+    const { chain, network } = (0, assetId_1.fromAssetId)(assetId);
+    return (0, chainId_1.toChainId)({ chain, network });
 };
 exports.assetIdToChainId = assetIdToChainId;
-const accountIdToChainId = (accountId) => (0, caip10_1.fromCAIP10)(accountId).caip2;
+const accountIdToChainId = (accountId) => (0, accountId_1.fromAccountId)(accountId).chainId;
 exports.accountIdToChainId = accountIdToChainId;
-const accountIdToSpecifier = (accountId) => (0, caip10_1.fromCAIP10)(accountId).account;
+const accountIdToSpecifier = (accountId) => (0, accountId_1.fromAccountId)(accountId).account;
 exports.accountIdToSpecifier = accountIdToSpecifier;
-const getChainReferenceFromChainId = (chainId) => caip2_1.networkTypeToChainReference[(0, caip2_1.fromCAIP2)(chainId).network];
+const getChainReferenceFromChainId = (chainId) => chainId_1.networkTypeToChainReference[(0, chainId_1.fromChainId)(chainId).network];
 exports.getChainReferenceFromChainId = getChainReferenceFromChainId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/caip",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "CAIP Implementation",
   "homepage": "",
   "license": "MIT",

package/dist/caip10/caip10.d.ts

@@ -1,19 +0,0 @@
-import { CAIP2 } from './../caip2/caip2';
-/**
- * @deprecated - Temporarily left in place for backwards compatibility, to be replaced with AccountId
- */
-export declare type CAIP10 = string;
-export declare type AccountId = string;
-declare type ToCAIP19Args = {
-    caip2: CAIP2;
-    account: string;
-};
-declare type ToCAIP10 = (args: ToCAIP19Args) => string;
-export declare const toCAIP10: ToCAIP10;
-declare type FromCAIP10Return = {
-    caip2: string;
-    account: string;
-};
-declare type FromCAIP10 = (caip10: string) => FromCAIP10Return;
-export declare const fromCAIP10: FromCAIP10;
-export {};

package/dist/caip10/caip10.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromCAIP10 = exports.toCAIP10 = void 0;
-const caip2_1 = require("./../caip2/caip2");
-const toCAIP10 = ({ caip2, account }) => {
-    if (!(0, caip2_1.isCAIP2)(caip2)) {
-        throw new Error(`toCAIP10: invalid caip2 ${caip2}`);
-    }
-    if (!account) {
-        throw new Error(`toCAIP10: account is required`);
-    }
-    const [namespace] = caip2.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 === caip2_1.ChainNamespace.Ethereum ? account.toLowerCase() : account;
-    return `${caip2}:${outputAccount}`;
-};
-exports.toCAIP10 = toCAIP10;
-const fromCAIP10 = (caip10) => {
-    const parts = caip10.split(':');
-    if (parts.length !== 3) {
-        throw new Error(`fromCAIP10: invalid caip10 ${caip10}`);
-    }
-    const caip2 = parts.slice(0, 2).join(':');
-    if (!(0, caip2_1.isCAIP2)(caip2)) {
-        throw new Error(`fromCAIP10: invalid caip2 ${caip2}`);
-    }
-    const account = parts[2];
-    if (!account) {
-        throw new Error(`fromCAIP10: account required`);
-    }
-    const [namespace] = caip2.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 === caip2_1.ChainNamespace.Ethereum ? account.toLowerCase() : account;
-    return { caip2, account: outputAccount };
-};
-exports.fromCAIP10 = fromCAIP10;