@shapeshiftoss/caip 5.2.1 → 5.3.0

package/dist/accountId/accountId.d.ts

@@ -1,5 +1,6 @@
 import { ChainId, ChainNamespace, ChainReference } from '../chainId/chainId';
-export declare type AccountId = string;
+import { Nominal } from '../utils';
+export declare type AccountId = Nominal<string, 'AccountId'>;
 declare type ToAccountIdWithChainId = {
     chainId: ChainId;
     account: string;

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

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

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

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

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

@@ -1,6 +1,5 @@
 import { AssetId } from './../../assetId/assetId';
 export declare const poolAssetIdToAssetId: (id: string) => AssetId | undefined;
-export declare const assetIdToPoolAssetId: ({ assetId, symbol }: {
+export declare const assetIdToPoolAssetId: ({ assetId }: {
     assetId: AssetId;
-    symbol?: string | undefined;
 }) => string | undefined;

package/dist/adapters/thortrading/index.js

@@ -1,80 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assetIdToPoolAssetId = exports.poolAssetIdToAssetId = void 0;
-const assetId_1 = require("../../assetId/assetId");
-const constants_1 = require("../../constants");
-const constants_2 = require("./../../constants");
-// naming convention for regex variables are taken from thorchian docs
-// https://dev.thorchain.org/thorchain-dev/memos#asset-notation
-// https://regex101.com/r/MAj4WA/1
-const thorIdRegex = /(?<chain>[A-Za-z]+)\.(?<ticker>[A-Za-z]+)(-(?<id>[A-Za-z0-9]+))?/;
-/*
- * Note: this only works with thorchain assets we support
- * see https://dev.thorchain.org/thorchain-dev/memos#asset-notation for reference
- *
- * We are also not supporting asset abbreviations using fuzzy logic at this time
- * see https://dev.thorchain.org/thorchain-dev/memos#asset-abbreviations
- */
-const poolAssetIdToAssetId = (id) => {
-    var _a;
-    const matches = (_a = thorIdRegex.exec(id)) === null || _a === void 0 ? void 0 : _a.groups;
-    // To avoid any case sensitive issues, uppercase both chain and ticker.
-    const chain = matches === null || matches === void 0 ? void 0 : matches.chain.toUpperCase();
-    const ticker = matches === null || matches === void 0 ? void 0 : matches.ticker.toUpperCase();
-    const contractAddress = matches === null || matches === void 0 ? void 0 : matches.id;
-    switch (chain) {
-        case 'ETH': {
-            if (ticker === 'ETH')
-                return constants_1.ethAssetId;
-            // We make Eth contract addresses lower case to simplify comparisons
-            const assetReference = contractAddress === null || contractAddress === void 0 ? void 0 : contractAddress.toLowerCase();
-            if (!assetReference)
-                return undefined;
-            const chainId = constants_1.ethChainId;
-            const assetNamespace = 'erc20';
-            try {
-                return (0, assetId_1.toAssetId)({ chainId, assetNamespace, assetReference });
-            }
-            catch (e) {
-                console.error(e);
-                return undefined;
-            }
-        }
-        case 'BTC': {
-            return constants_1.btcAssetId;
-        }
-        default: {
-            return undefined;
-        }
-    }
+// derived from https://midgard.thorchain.info/v2/pools
+// Rarely changes. Will need to be updated as we add additional assets to thor swapper
+const thorPoolIdAssetIdSymbolMap = {
+    'ETH.YFI-0X0BC529C00C6401AEF6D220BE8C6EA1667F6AD93E': 'eip155:1/erc20:0x0bc529c00c6401aef6d220be8c6ea1667f6ad93e',
+    'ETH.XRUNE-0X69FA0FEE221AD11012BAB0FDB45D444D3D2CE71C': 'eip155:1/erc20:0x69fa0fee221ad11012bab0fdb45d444d3d2ce71c',
+    'ETH.XDEFI-0X72B886D09C117654AB7DA13A14D603001DE0B777': 'eip155:1/erc20:0x72b886d09c117654ab7da13a14d603001de0b777',
+    'ETH.WBTC-0X2260FAC5E5542A773AA44FBCFEDF7C193BC2C599': 'eip155:1/erc20:0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
+    'ETH.USDT-0XDAC17F958D2EE523A2206206994597C13D831EC7': 'eip155:1/erc20:0xdac17f958d2ee523a2206206994597c13d831ec7',
+    'ETH.USDC-0XA0B86991C6218B36C1D19D4A2E9EB0CE3606EB48': 'eip155:1/erc20:0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+    'ETH.UOS-0XD13C7342E1EF687C5AD21B27C2B65D772CAB5C8C': 'eip155:1/erc20:0xd13c7342e1ef687c5ad21b27c2b65d772cab5c8c',
+    'ETH.THOR-0XA5F2211B9B8170F694421F2046281775E8468044': 'eip155:1/erc20:0xa5f2211b9b8170f694421f2046281775e8468044',
+    'ETH.TGT-0X108A850856DB3F85D0269A2693D896B394C80325': 'eip155:1/erc20:0x108a850856db3f85d0269a2693d896b394c80325',
+    'ETH.SUSHI-0X6B3595068778DD592E39A122F4F5A5CF09C90FE2': 'eip155:1/erc20:0x6b3595068778dd592e39a122f4f5a5cf09c90fe2',
+    'ETH.SNX-0XC011A73EE8576FB46F5E1C5751CA3B9FE0AF2A6F': 'eip155:1/erc20:0xc011a73ee8576fb46f5e1c5751ca3b9fe0af2a6f',
+    'ETH.RAZE-0X5EAA69B29F99C84FE5DE8200340B4E9B4AB38EAC"': 'eip155:1/erc20:0x5eaa69b29f99c84fe5de8200340b4e9b4ab38eac',
+    'ETH.PERP-0XBC396689893D065F41BC2C6ECBEE5E0085233447': 'eip155:1/erc20:0xbc396689893d065f41bc2c6ecbee5e0085233447',
+    'ETH.KYL-0X67B6D479C7BB412C54E03DCA8E1BC6740CE6B99C': 'eip155:1/erc20:0x67b6d479c7bb412c54e03dca8e1bc6740ce6b99c',
+    'ETH.HOT-0X6C6EE5E31D828DE241282B9606C8E98EA48526E2': 'eip155:1/erc20:0x6c6ee5e31d828de241282b9606c8e98ea48526e2',
+    'ETH.HEGIC-0X584BC13C7D411C00C01A62E8019472DE68768430': 'eip155:1/erc20:0x584bc13c7d411c00c01a62e8019472de68768430',
+    'ETH.FOX-0XC770EEFAD204B5180DF6A14EE197D99D808EE52D': 'eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d',
+    'ETH.DAI-0X6B175474E89094C44DA98B954EEDEAC495271D0F': 'eip155:1/erc20:0x6b175474e89094c44da98b954eedeac495271d0f',
+    'ETH.CREAM-0X2BA592F78DB6436527729929AAF6C908497CB200': 'eip155:1/erc20:0x2ba592f78db6436527729929aaf6c908497cb200',
+    'ETH.ALPHA-0XA1FAA113CBE53436DF28FF0AEE54275C13B40975': 'eip155:1/erc20:0xa1faa113cbe53436df28ff0aee54275c13b40975',
+    'ETH.ALCX-0XDBDB4D16EDA451D0503B854CF79D55697F90C8DF': 'eip155:1/erc20:0xdbdb4d16eda451d0503b854cf79d55697f90c8df',
+    'ETH.AAVE-0X7FC66500C84A76AD7E9C93437BFC5AC33E2DDAE9': 'eip155:1/erc20:0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9',
+    'BTC.BTC': 'bip122:000000000019d6689c085ae165831e93/slip44:0',
+    'ETH.ETH': 'eip155:1/slip44:60'
 };
+const invert = (data) => Object.entries(data).reduce((acc, [k, v]) => ((acc[v] = k), acc), {});
+const assetIdToPoolAssetIdMap = invert(thorPoolIdAssetIdSymbolMap);
+const poolAssetIdToAssetId = (id) => thorPoolIdAssetIdSymbolMap[id.toUpperCase()];
 exports.poolAssetIdToAssetId = poolAssetIdToAssetId;
-const assetIdToPoolAssetId = ({ assetId, symbol }) => {
-    try {
-        const { chainId, assetReference } = (0, assetId_1.fromAssetId)(assetId);
-        // https://dev.thorchain.org/thorchain-dev/memos#asset-notation
-        switch (chainId) {
-            case constants_1.ethChainId: {
-                if (assetId === constants_1.ethAssetId)
-                    return 'ETH.ETH';
-                if (!symbol)
-                    return undefined;
-                // this is predicated on the assumption that the symbol from the asset service
-                // and the contract address are static, correct, and won't ever change. Midgard
-                // also returns the asset notation with the assetReference in uppercase format,
-                // so we will keep that consistent here and uppercase it.
-                return `ETH.${symbol}-${assetReference.toUpperCase()}`;
-            }
-            case constants_2.btcChainId: {
-                return 'BTC.BTC';
-            }
-            default: {
-                return undefined;
-            }
-        }
-    }
-    catch (e) {
-        return undefined;
-    }
-};
+const assetIdToPoolAssetId = ({ assetId }) => assetIdToPoolAssetIdMap[assetId.toLowerCase()];
 exports.assetIdToPoolAssetId = assetIdToPoolAssetId;

package/dist/assetId/assetId.d.ts

@@ -1,6 +1,7 @@
 import { ChainId, ChainNamespace, ChainReference } from '../chainId/chainId';
 import { ASSET_NAMESPACE_STRINGS, ASSET_REFERENCE } from '../constants';
-export declare type AssetId = string;
+import { Nominal } from '../utils';
+export declare type AssetId = Nominal<string, 'AssetId'>;
 export declare type AssetNamespace = typeof ASSET_NAMESPACE_STRINGS[number];
 export declare type AssetReference = typeof ASSET_REFERENCE[keyof typeof ASSET_REFERENCE];
 declare type ToAssetIdWithChainId = {

package/dist/chainId/chainId.d.ts

@@ -1,5 +1,6 @@
 import { CHAIN_NAMESPACE, CHAIN_REFERENCE } from '../constants';
-export declare type ChainId = string;
+import { Nominal } from '../utils';
+export declare type ChainId = Nominal<string, 'ChainId'>;
 export declare type ChainNamespace = typeof CHAIN_NAMESPACE[keyof typeof CHAIN_NAMESPACE];
 export declare type ChainReference = typeof CHAIN_REFERENCE[keyof typeof CHAIN_REFERENCE];
 declare type ToChainIdArgs = {

package/dist/constants.d.ts

@@ -1,13 +1,13 @@
-import { AssetNamespace } from './assetId/assetId';
-import { ChainNamespace, ChainReference } 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";
-export declare const osmosisAssetId = "cosmos:osmosis-1/slip44:118";
-export declare const ethChainId = "eip155:1";
-export declare const btcChainId = "bip122:000000000019d6689c085ae165831e93";
-export declare const cosmosChainId = "cosmos:cosmoshub-4";
-export declare const osmosisChainId = "cosmos:osmosis-1";
+import { AssetId, AssetNamespace } from './assetId/assetId';
+import { ChainId, ChainNamespace, ChainReference } from './chainId/chainId';
+export declare const btcAssetId: AssetId;
+export declare const ethAssetId: AssetId;
+export declare const cosmosAssetId: AssetId;
+export declare const osmosisAssetId: AssetId;
+export declare const ethChainId: ChainId;
+export declare const btcChainId: ChainId;
+export declare const cosmosChainId: ChainId;
+export declare const osmosisChainId: ChainId;
 export declare const CHAIN_NAMESPACE: {
     readonly Ethereum: "eip155";
     readonly Bitcoin: "bip122";

package/dist/typeGuards.d.ts

@@ -5,7 +5,7 @@ export declare const isChainReference: (maybeChainReference: ChainReference | st
 export declare const isAssetNamespace: (maybeAssetNamespace: AssetNamespace | string) => maybeAssetNamespace is "cw20" | "cw721" | "erc20" | "erc721" | "slip44" | "native" | "ibc";
 export declare const isAssetReference: (maybeAssetReference: AssetReference | string) => maybeAssetReference is AssetReference;
 export declare const isAssetId: (maybeAssetId: AssetId | string) => maybeAssetId is AssetReference;
-export declare const isChainId: (maybeChainId: ChainId | string) => maybeChainId is string;
+export declare const isChainId: (maybeChainId: ChainId | string) => maybeChainId is ChainId;
 export declare const assertIsChainId: (value: ChainId | string | undefined) => asserts value is ChainId;
 export declare const assertIsChainNamespace: (value: ChainNamespace | string | undefined) => asserts value is ChainNamespace;
 export declare const assertIsChainReference: (value: ChainReference | string | undefined) => asserts value is ChainReference;

package/dist/utils.d.ts

@@ -17,3 +17,8 @@ export declare const makeCosmosHubData: () => {
 export declare const makeOsmosisData: () => {
     [x: string]: string;
 };
+interface Flavoring<FlavorT> {
+    _type?: FlavorT;
+}
+export declare type Nominal<T, FlavorT> = T & Flavoring<FlavorT>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/caip",
-  "version": "5.2.1",
+  "version": "5.3.0",
   "description": "CAIP Implementation",
   "homepage": "",
   "license": "MIT",
@@ -31,10 +31,10 @@
     "type-check": "tsc --project ./tsconfig.build.json --noEmit"
   },
   "peerDependencies": {
-    "@shapeshiftoss/types": "^4.3.1"
+    "@shapeshiftoss/types": "^4.4.0"
   },
   "devDependencies": {
-    "@shapeshiftoss/types": "^4.3.1",
+    "@shapeshiftoss/types": "^4.4.0",
     "@yfi/sdk": "^1.0.30",
     "axios": "^0.26.1",
     "ts-node": "^10.7.0"