@shapeshiftoss/unchained-client 6.12.0 → 8.0.0

package/dist/bitcoin/parser/index.d.ts

@@ -1,12 +1,13 @@
 import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
+import { AssetId, ChainId } from '@shapeshiftoss/caip';
 import { Tx as ParsedTx } from '../../types';
-import { Network } from '../types';
 export interface TransactionParserArgs {
-    network?: Network;
+    chainId: ChainId;
     rpcUrl: string;
 }
 export declare class TransactionParser {
-    network: Network;
+    chainId: ChainId;
+    assetId: AssetId;
     constructor(args: TransactionParserArgs);
     parse(tx: BlockbookTx, address: string): Promise<ParsedTx>;
 }

package/dist/bitcoin/parser/index.js

@@ -2,32 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionParser = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
-const types_1 = require("@shapeshiftoss/types");
 const bignumber_js_1 = require("bignumber.js");
-const types_2 = require("../../types");
+const types_1 = require("../../types");
 const utils_1 = require("../../utils");
-const utils_2 = require("./utils");
 class TransactionParser {
     constructor(args) {
-        var _a;
-        this.network = (_a = args.network) !== null && _a !== void 0 ? _a : 'mainnet';
+        this.chainId = args.chainId;
+        this.assetId = (0, caip_1.toAssetId)({
+            ...(0, caip_1.fromChainId)(this.chainId),
+            assetNamespace: 'slip44',
+            assetReference: caip_1.ASSET_REFERENCE.Bitcoin
+        });
     }
     async parse(tx, address) {
-        const caip19Bitcoin = (0, caip_1.toCAIP19)({
-            chain: types_1.ChainTypes.Bitcoin,
-            network: (0, utils_2.toNetworkType)(this.network),
-            assetNamespace: caip_1.AssetNamespace.Slip44,
-            assetReference: caip_1.AssetReference.Bitcoin
-        });
         const parsedTx = {
             address,
             blockHash: tx.blockHash,
             blockHeight: tx.blockHeight,
             blockTime: tx.blockTime,
-            caip2: (0, caip_1.toCAIP2)({ chain: types_1.ChainTypes.Bitcoin, network: (0, utils_2.toNetworkType)(this.network) }),
-            chainId: (0, caip_1.toCAIP2)({ chain: types_1.ChainTypes.Bitcoin, network: (0, utils_2.toNetworkType)(this.network) }),
+            chainId: this.chainId,
             confirmations: tx.confirmations,
-            status: tx.confirmations > 0 ? types_2.Status.Confirmed : types_2.Status.Pending,
+            status: tx.confirmations > 0 ? types_1.Status.Confirmed : types_1.Status.Pending,
             transfers: [],
             txid: tx.txid
         };
@@ -37,12 +32,12 @@ class TransactionParser {
                 // send amount
                 const sendValue = new bignumber_js_1.BigNumber((_b = vin.value) !== null && _b !== void 0 ? _b : 0);
                 if (sendValue.gt(0)) {
-                    parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_2.TransferType.Send, caip19Bitcoin, (_d = (_c = vin.addresses) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : '', (_f = (_e = tx.vout[0].addresses) === null || _e === void 0 ? void 0 : _e[0]) !== null && _f !== void 0 ? _f : '', sendValue.toString(10));
+                    parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Send, this.assetId, (_d = (_c = vin.addresses) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : '', (_f = (_e = tx.vout[0].addresses) === null || _e === void 0 ? void 0 : _e[0]) !== null && _f !== void 0 ? _f : '', sendValue.toString(10));
                 }
                 // network fee
                 const fees = new bignumber_js_1.BigNumber((_g = tx.fees) !== null && _g !== void 0 ? _g : 0);
                 if (fees.gt(0)) {
-                    parsedTx.fee = { caip19: caip19Bitcoin, assetId: caip19Bitcoin, value: fees.toString(10) };
+                    parsedTx.fee = { assetId: this.assetId, value: fees.toString(10) };
                 }
             }
         });
@@ -52,7 +47,7 @@ class TransactionParser {
                 // receive amount
                 const receiveValue = new bignumber_js_1.BigNumber((_b = vout.value) !== null && _b !== void 0 ? _b : 0);
                 if (receiveValue.gt(0)) {
-                    parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_2.TransferType.Receive, caip19Bitcoin, (_d = (_c = tx.vin[0].addresses) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : '', (_f = (_e = vout.addresses) === null || _e === void 0 ? void 0 : _e[0]) !== null && _f !== void 0 ? _f : '', receiveValue.toString(10));
+                    parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Receive, this.assetId, (_d = (_c = tx.vin[0].addresses) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : '', (_f = (_e = vout.addresses) === null || _e === void 0 ? void 0 : _e[0]) !== null && _f !== void 0 ? _f : '', receiveValue.toString(10));
                 }
             }
         });

package/dist/cosmos/parser/index.js

@@ -8,10 +8,10 @@ const utils_1 = require("./utils");
 class TransactionParser {
     constructor(args) {
         this.chainId = args.chainId;
-        this.assetId = (0, caip_1.toCAIP19)({
-            ...(0, caip_1.fromCAIP2)(this.chainId),
-            assetNamespace: caip_1.AssetNamespace.Slip44,
-            assetReference: caip_1.AssetReference.Cosmos
+        this.assetId = (0, caip_1.toAssetId)({
+            ...(0, caip_1.fromChainId)(this.chainId),
+            assetNamespace: 'slip44',
+            assetReference: caip_1.ASSET_REFERENCE.Cosmos
         });
     }
     async parse(tx, address) {
@@ -21,7 +21,6 @@ class TransactionParser {
             blockHash: tx.blockHash,
             blockHeight: (_a = tx.blockHeight) !== null && _a !== void 0 ? _a : -1,
             blockTime: (_b = tx.timestamp) !== null && _b !== void 0 ? _b : Math.floor(Date.now() / 1000),
-            caip2: this.chainId,
             chainId: this.chainId,
             confirmations: tx.confirmations,
             status: tx.confirmations > 0 ? types_1.Status.Confirmed : types_1.Status.Pending,
@@ -36,7 +35,6 @@ class TransactionParser {
             parsedTx.transfers = [
                 {
                     type: types_1.TransferType.Send,
-                    caip19: this.assetId,
                     assetId: this.assetId,
                     from,
                     to,
@@ -49,7 +47,6 @@ class TransactionParser {
             parsedTx.transfers = [
                 {
                     type: types_1.TransferType.Receive,
-                    caip19: this.assetId,
                     assetId: this.assetId,
                     from,
                     to,
@@ -63,7 +60,7 @@ class TransactionParser {
             // network fee
             const fees = new bignumber_js_1.BigNumber(tx.fee.amount);
             if (fees.gt(0)) {
-                parsedTx.fee = { caip19: this.assetId, assetId: this.assetId, value: fees.toString(10) };
+                parsedTx.fee = { assetId: this.assetId, value: fees.toString(10) };
             }
         }
         return parsedTx;

package/dist/cosmos/parser/utils.js

@@ -32,7 +32,6 @@ const metaData = (msg, assetId) => {
                 delegator: msg.origin,
                 destinationValidator: msg.to,
                 value: (_b = msg === null || msg === void 0 ? void 0 : msg.value) === null || _b === void 0 ? void 0 : _b.amount,
-                caip19: assetId,
                 assetId
             };
         case 'withdraw_delegator_reward':
@@ -41,7 +40,6 @@ const metaData = (msg, assetId) => {
                 method: msg.type,
                 destinationValidator: msg.to,
                 value: (_c = msg === null || msg === void 0 ? void 0 : msg.value) === null || _c === void 0 ? void 0 : _c.amount,
-                caip19: assetId,
                 assetId
             };
         case 'ibc_send':
@@ -51,7 +49,6 @@ const metaData = (msg, assetId) => {
                 method: msg.type,
                 ibcDestination: msg.to,
                 ibcSource: msg.from,
-                caip19: assetId,
                 assetId,
                 value: (_d = msg === null || msg === void 0 ? void 0 : msg.value) === null || _d === void 0 ? void 0 : _d.amount
             };

package/dist/cosmos/types.d.ts

@@ -4,10 +4,6 @@ export interface TxMetadata extends Omit<StandardTxMetadata, 'parser'> {
     delegator?: string;
     sourceValidator?: string;
     destinationValidator?: string;
-    /**
-     * @deprecated use 'assetId' instead
-     */
-    caip19?: string;
     assetId?: string;
     value?: string;
     ibcDestination?: string;

package/dist/ethereum/parser/index.d.ts

@@ -1,11 +1,13 @@
 import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
-import { InternalTx, Network, ParsedTx } from '../types';
+import { AssetId, ChainId } from '@shapeshiftoss/caip';
+import { InternalTx, ParsedTx } from '../types';
 export interface TransactionParserArgs {
-    network?: Network;
+    chainId: ChainId;
     rpcUrl: string;
 }
 export declare class TransactionParser {
-    network: Network;
+    chainId: ChainId;
+    assetId: AssetId;
     private readonly thor;
     private readonly uniV2;
     private readonly zrx;

package/dist/ethereum/parser/index.js

@@ -25,10 +25,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionParser = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
-const types_1 = require("@shapeshiftoss/types");
+const src_1 = require("@shapeshiftoss/caip/src");
 const bignumber_js_1 = require("bignumber.js");
 const ethers_1 = require("ethers");
-const types_2 = require("../../types");
+const types_1 = require("../../types");
 const utils_1 = require("../../utils");
 const foxy = __importStar(require("./foxy"));
 const thor = __importStar(require("./thor"));
@@ -39,15 +39,19 @@ const yearn = __importStar(require("./yearn"));
 const zrx = __importStar(require("./zrx"));
 class TransactionParser {
     constructor(args) {
-        var _a;
+        this.chainId = args.chainId;
+        this.assetId = (0, caip_1.toAssetId)({
+            ...(0, caip_1.fromChainId)(this.chainId),
+            assetNamespace: 'slip44',
+            assetReference: src_1.ASSET_REFERENCE.Ethereum
+        });
         const provider = new ethers_1.ethers.providers.JsonRpcProvider(args.rpcUrl);
-        this.network = (_a = args.network) !== null && _a !== void 0 ? _a : 'mainnet';
-        this.thor = new thor.Parser({ network: this.network, rpcUrl: args.rpcUrl });
-        this.uniV2 = new uniV2.Parser({ network: this.network, provider });
+        this.thor = new thor.Parser({ chainId: this.chainId, rpcUrl: args.rpcUrl });
+        this.uniV2 = new uniV2.Parser({ chainId: this.chainId, provider });
         this.zrx = new zrx.Parser();
-        this.yearn = new yearn.Parser({ provider, network: this.network });
+        this.yearn = new yearn.Parser({ provider, chainId: this.chainId });
         this.foxy = new foxy.Parser();
-        this.weth = new weth.Parser({ network: this.network, provider });
+        this.weth = new weth.Parser({ chainId: this.chainId, provider });
         this.parsers = [this.zrx, this.thor, this.uniV2, this.yearn, this.foxy, this.weth];
     }
     // return any addresses that can be detected
@@ -70,8 +74,7 @@ class TransactionParser {
             blockHash: tx.blockHash,
             blockHeight: tx.blockHeight,
             blockTime: tx.blockTime,
-            caip2: (0, caip_1.toCAIP2)({ chain: types_1.ChainTypes.Ethereum, network: (0, utils_2.toNetworkType)(this.network) }),
-            chainId: (0, caip_1.toCAIP2)({ chain: types_1.ChainTypes.Ethereum, network: (0, utils_2.toNetworkType)(this.network) }),
+            chainId: this.chainId,
             confirmations: tx.confirmations,
             status: TransactionParser.getStatus(tx),
             trade: contractParserResult === null || contractParserResult === void 0 ? void 0 : contractParserResult.trade,
@@ -85,40 +88,34 @@ class TransactionParser {
         var _a;
         const status = (_a = tx.ethereumSpecific) === null || _a === void 0 ? void 0 : _a.status;
         if (status === -1 && tx.confirmations <= 0)
-            return types_2.Status.Pending;
+            return types_1.Status.Pending;
         if (status === 1 && tx.confirmations > 0)
-            return types_2.Status.Confirmed;
+            return types_1.Status.Confirmed;
         if (status === 0)
-            return types_2.Status.Failed;
-        return types_2.Status.Unknown;
+            return types_1.Status.Failed;
+        return types_1.Status.Unknown;
     }
     getParsedTxWithTransfers(tx, parsedTx, address, internalTxs) {
         var _a, _b, _c, _d, _e, _f;
-        const caip19Ethereum = (0, caip_1.toCAIP19)({
-            chain: types_1.ChainTypes.Ethereum,
-            network: (0, utils_2.toNetworkType)(this.network),
-            assetNamespace: caip_1.AssetNamespace.Slip44,
-            assetReference: caip_1.AssetReference.Ethereum
-        });
         const sendAddress = (_b = (_a = tx.vin[0].addresses) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : '';
         const receiveAddress = (_d = (_c = tx.vout[0].addresses) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : '';
         if (address === sendAddress) {
             // send amount
             const sendValue = new bignumber_js_1.BigNumber(tx.value);
             if (sendValue.gt(0)) {
-                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_2.TransferType.Send, caip19Ethereum, sendAddress, receiveAddress, sendValue.toString(10));
+                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Send, this.assetId, sendAddress, receiveAddress, sendValue.toString(10));
             }
             // network fee
             const fees = new bignumber_js_1.BigNumber((_e = tx.fees) !== null && _e !== void 0 ? _e : 0);
             if (fees.gt(0)) {
-                parsedTx.fee = { caip19: caip19Ethereum, assetId: caip19Ethereum, value: fees.toString(10) };
+                parsedTx.fee = { assetId: this.assetId, value: fees.toString(10) };
             }
         }
         if (address === receiveAddress) {
             // receive amount
             const receiveValue = new bignumber_js_1.BigNumber(tx.value);
             if (receiveValue.gt(0)) {
-                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_2.TransferType.Receive, caip19Ethereum, sendAddress, receiveAddress, receiveValue.toString(10));
+                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Receive, this.assetId, sendAddress, receiveAddress, receiveValue.toString(10));
             }
         }
         (_f = tx.tokenTransfers) === null || _f === void 0 ? void 0 : _f.forEach((transfer) => {
@@ -134,10 +131,9 @@ class TransactionParser {
                 symbol: transfer.symbol
             };
             const transferArgs = [
-                (0, caip_1.toCAIP19)({
-                    chain: types_1.ChainTypes.Ethereum,
-                    network: (0, utils_2.toNetworkType)(this.network),
-                    assetNamespace: caip_1.AssetNamespace.ERC20,
+                (0, caip_1.toAssetId)({
+                    ...(0, caip_1.fromChainId)(this.chainId),
+                    assetNamespace: 'erc20',
                     assetReference: transfer.token
                 }),
                 transfer.from,
@@ -147,20 +143,19 @@ class TransactionParser {
             ];
             // token send amount
             if (address === transfer.from) {
-                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_2.TransferType.Send, ...transferArgs);
+                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Send, ...transferArgs);
             }
             // token receive amount
             if (address === transfer.to) {
-                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_2.TransferType.Receive, ...transferArgs);
+                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Receive, ...transferArgs);
             }
         });
         internalTxs === null || internalTxs === void 0 ? void 0 : internalTxs.forEach((internalTx) => {
             const transferArgs = [
-                (0, caip_1.toCAIP19)({
-                    chain: types_1.ChainTypes.Ethereum,
-                    network: (0, utils_2.toNetworkType)(this.network),
-                    assetNamespace: caip_1.AssetNamespace.Slip44,
-                    assetReference: caip_1.AssetReference.Ethereum
+                (0, caip_1.toAssetId)({
+                    ...(0, caip_1.fromChainId)(this.chainId),
+                    assetNamespace: 'slip44',
+                    assetReference: src_1.ASSET_REFERENCE.Ethereum
                 }),
                 internalTx.from,
                 internalTx.to,
@@ -168,11 +163,11 @@ class TransactionParser {
             ];
             // internal eth send
             if (address === internalTx.from) {
-                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_2.TransferType.Send, ...transferArgs);
+                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Send, ...transferArgs);
             }
             // internal eth receive
             if (address === internalTx.to) {
-                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_2.TransferType.Receive, ...transferArgs);
+                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Receive, ...transferArgs);
             }
         });
         return parsedTx;

package/dist/ethereum/parser/thor.d.ts

@@ -1,8 +1,9 @@
 import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
+import { ChainId } from '@shapeshiftoss/caip';
 import { ethers } from 'ethers';
-import { Network, SubParser, TxSpecific } from '../types';
+import { SubParser, TxSpecific } from '../types';
 export interface ParserArgs {
-    network: Network;
+    chainId: ChainId;
     rpcUrl: string;
 }
 export declare class Parser implements SubParser {

package/dist/ethereum/parser/thor.js

@@ -17,11 +17,18 @@ class Parser {
             depositSigHash: this.abiInterface.getSighash('deposit'),
             transferOutSigHash: this.abiInterface.getSighash('transferOut')
         };
-        // TODO: Router contract can change, use /inbound_addresses endpoint to determine current router contract
-        this.routerContract = {
-            mainnet: constants_1.THOR_ROUTER_CONTRACT_MAINNET,
-            ropsten: constants_1.THOR_ROUTER_CONTRACT_ROPSTEN
-        }[args.network];
+        // TODO: Router contract can change, use /inbound_addresses endpoint to determine current router contract.
+        // We will also need to know all past router contract addresses if we intend on using receive address as the means for detection
+        switch (args.chainId) {
+            case 'eip155:1':
+                this.routerContract = constants_1.THOR_ROUTER_CONTRACT_MAINNET;
+                break;
+            case 'eip155:3':
+                this.routerContract = constants_1.THOR_ROUTER_CONTRACT_ROPSTEN;
+                break;
+            default:
+                throw new Error('chainId is not supported. (supported chainIds: eip155:1, eip155:3)');
+        }
     }
     // detect address associated with transferOut internal transaction
     getInternalAddress(inputData) {

package/dist/ethereum/parser/uniV2.d.ts

@@ -1,13 +1,14 @@
 import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
+import { ChainId } from '@shapeshiftoss/caip';
 import { ethers } from 'ethers';
-import { Network, SubParser, TxSpecific } from '../types';
+import { SubParser, TxSpecific } from '../types';
 export interface ParserArgs {
-    network: Network;
+    chainId: ChainId;
     provider: ethers.providers.JsonRpcProvider;
 }
 export declare class Parser implements SubParser {
-    network: Network;
     provider: ethers.providers.JsonRpcProvider;
+    readonly chainId: ChainId;
     readonly wethContract: string;
     readonly abiInterface: ethers.utils.Interface;
     readonly supportedFunctions: {

package/dist/ethereum/parser/uniV2.js

@@ -5,9 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Parser = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
-const types_1 = require("@shapeshiftoss/types");
 const ethers_1 = require("ethers");
-const types_2 = require("../../types");
+const types_1 = require("../../types");
 const erc20_1 = __importDefault(require("./abi/erc20"));
 const uniV2_1 = __importDefault(require("./abi/uniV2"));
 const constants_1 = require("./constants");
@@ -19,12 +18,18 @@ class Parser {
             addLiquidityEthSigHash: this.abiInterface.getSighash('addLiquidityETH'),
             removeLiquidityEthSigHash: this.abiInterface.getSighash('removeLiquidityETH')
         };
-        this.network = args.network;
+        this.chainId = args.chainId;
         this.provider = args.provider;
-        this.wethContract = {
-            mainnet: constants_1.WETH_CONTRACT_MAINNET,
-            ropsten: constants_1.WETH_CONTRACT_ROPSTEN
-        }[this.network];
+        switch (args.chainId) {
+            case 'eip155:1':
+                this.wethContract = constants_1.WETH_CONTRACT_MAINNET;
+                break;
+            case 'eip155:3':
+                this.wethContract = constants_1.WETH_CONTRACT_ROPSTEN;
+                break;
+            default:
+                throw new Error('chainId is not supported. (supported chainIds: eip155:1, eip155:3)');
+        }
     }
     async parse(tx) {
         var _a, _b, _c;
@@ -53,18 +58,16 @@ class Parser {
                     const name = await contract.name();
                     const symbol = await contract.symbol();
                     const value = decoded.args.amountTokenDesired.toString();
-                    const assetId = (0, caip_1.toCAIP19)({
-                        chain: types_1.ChainTypes.Ethereum,
-                        network: (0, utils_1.toNetworkType)(this.network),
-                        assetNamespace: caip_1.AssetNamespace.ERC20,
+                    const assetId = (0, caip_1.toAssetId)({
+                        ...(0, caip_1.fromChainId)(this.chainId),
+                        assetNamespace: 'erc20',
                         assetReference: tokenAddress
                     });
                     return [
                         {
-                            type: types_2.TransferType.Send,
+                            type: types_1.TransferType.Send,
                             from: sendAddress,
                             to: lpTokenAddress,
-                            caip19: assetId,
                             assetId,
                             totalValue: value,
                             components: [{ value }],
@@ -78,18 +81,16 @@ class Parser {
                     const name = await contract.name();
                     const symbol = await contract.symbol();
                     const value = decoded.args.liquidity.toString();
-                    const assetId = (0, caip_1.toCAIP19)({
-                        chain: types_1.ChainTypes.Ethereum,
-                        network: (0, utils_1.toNetworkType)(this.network),
-                        assetNamespace: caip_1.AssetNamespace.ERC20,
+                    const assetId = (0, caip_1.toAssetId)({
+                        ...(0, caip_1.fromChainId)(this.chainId),
+                        assetNamespace: 'erc20',
                         assetReference: lpTokenAddress
                     });
                     return [
                         {
-                            type: types_2.TransferType.Send,
+                            type: types_1.TransferType.Send,
                             from: sendAddress,
                             to: lpTokenAddress,
-                            caip19: assetId,
                             assetId,
                             totalValue: value,
                             components: [{ value }],
@@ -107,7 +108,7 @@ class Parser {
         return {
             transfers,
             data: {
-                parser: types_2.TxParser.UniV2,
+                parser: types_1.TxParser.UniV2,
                 method: decoded.name
             }
         };

package/dist/ethereum/parser/utils.d.ts

@@ -1,7 +1,4 @@
 import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
-import { NetworkTypes } from '@shapeshiftoss/types';
-import { Network } from '../types';
-export declare const toNetworkType: (network: Network) => NetworkTypes;
 export declare const getSigHash: (inputData: string | undefined) => string | undefined;
 export declare const txInteractsWithContract: (tx: BlockbookTx, contract: string) => boolean;
 export declare const SENDMULTISIG_SIG_HASH: string;

package/dist/ethereum/parser/utils.js

@@ -3,21 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInternalMultisigAddress = exports.SENDMULTISIG_SIG_HASH = exports.txInteractsWithContract = exports.getSigHash = exports.toNetworkType = void 0;
-const types_1 = require("@shapeshiftoss/types");
+exports.getInternalMultisigAddress = exports.SENDMULTISIG_SIG_HASH = exports.txInteractsWithContract = exports.getSigHash = void 0;
 const ethers_1 = require("ethers");
 const multiSig_1 = __importDefault(require("./abi/multiSig"));
-const toNetworkType = (network) => {
-    switch (network) {
-        case 'mainnet':
-            return types_1.NetworkTypes.MAINNET;
-        case 'ropsten':
-            return types_1.NetworkTypes.ETH_ROPSTEN;
-        default:
-            throw new Error('unsupported network');
-    }
-};
-exports.toNetworkType = toNetworkType;
 const getSigHash = (inputData) => {
     if (!inputData)
         return;

package/dist/ethereum/parser/weth.d.ts

@@ -1,13 +1,14 @@
 import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
+import { ChainId } from '@shapeshiftoss/caip';
 import { ethers } from 'ethers';
-import { Network, SubParser, TxSpecific } from '../types';
+import { SubParser, TxSpecific } from '../types';
 export interface ParserArgs {
-    network: Network;
+    chainId: ChainId;
     provider: ethers.providers.JsonRpcProvider;
 }
 export declare class Parser implements SubParser {
     provider: ethers.providers.JsonRpcProvider;
-    readonly network: Network;
+    readonly chainId: ChainId;
     readonly wethContract: string;
     readonly abiInterface: ethers.utils.Interface;
     readonly supportedFunctions: {

package/dist/ethereum/parser/weth.js

@@ -5,9 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Parser = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
-const types_1 = require("@shapeshiftoss/types");
 const ethers_1 = require("ethers");
-const types_2 = require("../../types");
+const types_1 = require("../../types");
 const erc20_1 = __importDefault(require("./abi/erc20"));
 const weth_1 = __importDefault(require("./abi/weth"));
 const constants_1 = require("./constants");
@@ -19,12 +18,18 @@ class Parser {
             depositSigHash: this.abiInterface.getSighash('deposit'),
             withdrawalSigHash: this.abiInterface.getSighash('withdraw')
         };
-        this.network = args.network;
+        this.chainId = args.chainId;
         this.provider = args.provider;
-        this.wethContract = {
-            mainnet: constants_1.WETH_CONTRACT_MAINNET,
-            ropsten: constants_1.WETH_CONTRACT_ROPSTEN
-        }[this.network];
+        switch (args.chainId) {
+            case 'eip155:1':
+                this.wethContract = constants_1.WETH_CONTRACT_MAINNET;
+                break;
+            case 'eip155:3':
+                this.wethContract = constants_1.WETH_CONTRACT_ROPSTEN;
+                break;
+            default:
+                throw new Error('chainId is not supported. (supported chainIds: eip155:1, eip155:3)');
+        }
     }
     async parse(tx) {
         var _a, _b, _c;
@@ -42,10 +47,9 @@ class Parser {
             return;
         const sendAddress = (_c = (_b = tx.vin[0].addresses) === null || _b === void 0 ? void 0 : _b[0]) !== null && _c !== void 0 ? _c : '';
         const contract = new ethers_1.ethers.Contract(this.wethContract, erc20_1.default, this.provider);
-        const assetId = (0, caip_1.toCAIP19)({
-            chain: types_1.ChainTypes.Ethereum,
-            network: (0, utils_1.toNetworkType)(this.network),
-            assetNamespace: caip_1.AssetNamespace.ERC20,
+        const assetId = (0, caip_1.toAssetId)({
+            ...(0, caip_1.fromChainId)(this.chainId),
+            assetNamespace: 'erc20',
             assetReference: this.wethContract
         });
         const token = {
@@ -59,10 +63,9 @@ class Parser {
                 case this.supportedFunctions.depositSigHash: {
                     return [
                         {
-                            type: types_2.TransferType.Receive,
+                            type: types_1.TransferType.Receive,
                             from: this.wethContract,
                             to: sendAddress,
-                            caip19: assetId,
                             assetId,
                             totalValue: tx.value,
                             components: [{ value: tx.value }],
@@ -73,10 +76,9 @@ class Parser {
                 case this.supportedFunctions.withdrawalSigHash:
                     return [
                         {
-                            type: types_2.TransferType.Send,
+                            type: types_1.TransferType.Send,
                             from: sendAddress,
                             to: this.wethContract,
-                            caip19: assetId,
                             assetId,
                             totalValue: decoded.args.wad.toString(),
                             components: [{ value: decoded.args.wad.toString() }],
@@ -93,7 +95,7 @@ class Parser {
         return {
             transfers,
             data: {
-                parser: types_2.TxParser.WETH,
+                parser: types_1.TxParser.WETH,
                 method: decoded.name
             }
         };

package/dist/ethereum/parser/yearn.d.ts

@@ -1,14 +1,15 @@
 import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
-import { ChainId, Yearn } from '@yfi/sdk';
+import { ChainId } from '@shapeshiftoss/caip';
+import { ChainId as YearnChainId, Yearn } from '@yfi/sdk';
 import { ethers } from 'ethers';
-import { Network, SubParser, TxSpecific } from '../types';
+import { SubParser, TxSpecific } from '../types';
 interface ParserArgs {
-    network: Network;
+    chainId: ChainId;
     provider: ethers.providers.JsonRpcProvider;
 }
 export declare class Parser implements SubParser {
     provider: ethers.providers.JsonRpcProvider;
-    yearnSdk: Yearn<ChainId> | undefined;
+    yearnSdk: Yearn<YearnChainId> | undefined;
     yearnTokenVaultAddresses: string[] | undefined;
     readonly shapeShiftInterface: ethers.utils.Interface;
     readonly yearnInterface: ethers.utils.Interface;

package/dist/ethereum/parser/yearn.js

@@ -27,7 +27,7 @@ class Parser {
         };
         this.provider = args.provider;
         // The only Yearn-supported chain we currently support is mainnet
-        if (args.network === 'mainnet') {
+        if (args.chainId === 'eip155:1') {
             // 1 for EthMain (@yfi/sdk/dist/chain.d.ts)
             this.yearnSdk = new sdk_1.Yearn(1, { provider: this.provider });
         }

package/dist/ethereum/types.d.ts

@@ -20,7 +20,6 @@ export interface ParsedTx extends StandardTx {
     data?: StandardTxMetadata;
 }
 export declare type TxSpecific = Partial<Pick<ParsedTx, 'trade' | 'transfers' | 'data'>>;
-export declare type Network = 'mainnet' | 'ropsten';
 export interface SubParser {
     parse(tx: BlockbookTx): Promise<TxSpecific | undefined>;
 }

package/dist/types.d.ts

@@ -3,10 +3,6 @@ export declare enum Dex {
     Zrx = "zrx"
 }
 export interface Fee {
-    /**
-     * @deprecated use 'assetId' instead
-     */
-    caip19: string;
     assetId: string;
     value: string;
 }
@@ -34,10 +30,6 @@ export declare enum TradeType {
 export interface Transfer {
     from: string;
     to: string;
-    /**
-     * @deprecated use 'assetId' instead
-     */
-    caip19: string;
     assetId: string;
     type: TransferType;
     totalValue: string;
@@ -68,10 +60,6 @@ export interface StandardTx {
     blockHash?: string;
     blockHeight: number;
     blockTime: number;
-    /**
-     * @deprecated use 'chainId' instead
-     */
-    caip2: string;
     chainId: string;
     confirmations: number;
     fee?: Fee;

package/dist/utils.js

@@ -28,7 +28,6 @@ function aggregateTransfer(transfers, type, assetId, from, to, value, token) {
             ...transfers,
             {
                 type,
-                caip19: assetId,
                 assetId,
                 from,
                 to,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/unchained-client",
-  "version": "6.12.0",
+  "version": "8.0.0",
   "license": "MIT",
   "main": "dist/index.js",
   "source": "src/index.ts",
@@ -13,7 +13,7 @@
     "build:public": "yarn clean && yarn generate:public && tsc -p tsconfig.build.json",
     "build:local": "yarn clean && yarn generate:local && tsc -p tsconfig.build.json",
     "dev": "tsc --watch",
-    "clean": "rm -rf dist node_modules src/generated tsconfig.build.tsbuildinfo",
+    "clean": "rm -rf dist src/generated tsconfig.build.tsbuildinfo",
     "generate": "./generator/generate.sh -e dev",
     "generate:public": "./generator/generate.sh -e public",
     "generate:local": "./generator/generate.sh -e local",
@@ -28,15 +28,15 @@
     "ws": "^8.3.0"
   },
   "peerDependencies": {
-    "@shapeshiftoss/caip": "^2.2.3",
+    "@shapeshiftoss/caip": "^3.0.0",
     "@shapeshiftoss/logger": "^1.1.2",
-    "@shapeshiftoss/types": "3.1.3"
+    "@shapeshiftoss/types": "^4.0.0"
   },
   "devDependencies": {
-    "@shapeshiftoss/caip": "^2.2.3",
+    "@shapeshiftoss/caip": "^3.0.0",
     "@shapeshiftoss/common-api": "^6.11.0",
     "@shapeshiftoss/logger": "^1.1.2",
-    "@shapeshiftoss/types": "3.1.3",
+    "@shapeshiftoss/types": "^4.0.0",
     "@types/ws": "^8.2.1"
   }
 }

package/dist/bitcoin/parser/utils.d.ts

@@ -1,3 +0,0 @@
-import { NetworkTypes } from '@shapeshiftoss/types';
-import { Network } from '../types';
-export declare const toNetworkType: (network: Network) => NetworkTypes;

package/dist/bitcoin/parser/utils.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.toNetworkType = void 0;
-const types_1 = require("@shapeshiftoss/types");
-const toNetworkType = (network) => {
-    switch (network) {
-        case 'mainnet':
-            return types_1.NetworkTypes.MAINNET;
-        case 'testnet':
-            return types_1.NetworkTypes.TESTNET;
-        default:
-            throw new Error('unsupported network');
-    }
-};
-exports.toNetworkType = toNetworkType;