@shapeshiftoss/unchained-client 8.5.0 → 9.0.0-alpha.2

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

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

package/dist/bitcoin/parser/index.js

@@ -19,7 +19,7 @@ class TransactionParser {
             address,
             blockHash: tx.blockHash,
             blockHeight: tx.blockHeight,
-            blockTime: tx.blockTime,
+            blockTime: tx.timestamp,
             chainId: this.chainId,
             confirmations: tx.confirmations,
             status: tx.confirmations > 0 ? types_1.Status.Confirmed : types_1.Status.Pending,
@@ -28,14 +28,14 @@ class TransactionParser {
         };
         tx.vin.forEach((vin) => {
             var _a, _b, _c, _d, _e, _f, _g;
-            if (vin.isAddress && ((_a = vin.addresses) === null || _a === void 0 ? void 0 : _a.includes(address))) {
+            if ((_a = vin.addresses) === null || _a === void 0 ? void 0 : _a.includes(address)) {
                 // 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_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);
+                const fees = new bignumber_js_1.BigNumber((_g = tx.fee) !== null && _g !== void 0 ? _g : 0);
                 if (fees.gt(0)) {
                     parsedTx.fee = { assetId: this.assetId, value: fees.toString(10) };
                 }
@@ -43,7 +43,7 @@ class TransactionParser {
         });
         tx.vout.forEach((vout) => {
             var _a, _b, _c, _d, _e, _f;
-            if (vout.isAddress && ((_a = vout.addresses) === null || _a === void 0 ? void 0 : _a.includes(address))) {
+            if ((_a = vout.addresses) === null || _a === void 0 ? void 0 : _a.includes(address)) {
                 // receive amount
                 const receiveValue = new bignumber_js_1.BigNumber((_b = vout.value) !== null && _b !== void 0 ? _b : 0);
                 if (receiveValue.gt(0)) {

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

@@ -1,5 +1,5 @@
-import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
 import { ethers } from 'ethers';
+import { EthereumTx } from '../../generated/ethereum';
 import { SubParser, TxSpecific } from '../types';
 export declare class Parser implements SubParser {
     readonly abiInterface: ethers.utils.Interface;
@@ -9,5 +9,5 @@ export declare class Parser implements SubParser {
         instantUnstakeSigHash: string;
         claimWithdrawSigHash: string;
     };
-    parse(tx: BlockbookTx): Promise<TxSpecific | undefined>;
+    parse(tx: EthereumTx): Promise<TxSpecific | undefined>;
 }

package/dist/ethereum/parser/foxy.js

@@ -20,16 +20,14 @@ class Parser {
         };
     }
     async parse(tx) {
-        var _a;
-        const txData = (_a = tx.ethereumSpecific) === null || _a === void 0 ? void 0 : _a.data;
         if (!(0, utils_1.txInteractsWithContract)(tx, constants_1.FOXY_STAKING_CONTRACT))
             return;
-        if (!txData)
+        if (!tx.inputData)
             return;
-        const txSigHash = (0, utils_1.getSigHash)(txData);
+        const txSigHash = (0, utils_1.getSigHash)(tx.inputData);
         if (!Object.values(this.supportedFunctions).some((hash) => hash === txSigHash))
             return;
-        const decoded = this.abiInterface.parseTransaction({ data: txData });
+        const decoded = this.abiInterface.parseTransaction({ data: tx.inputData });
         // failed to decode input data
         if (!decoded)
             return;

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

@@ -1,6 +1,6 @@
-import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
 import { AssetId, ChainId } from '@shapeshiftoss/caip';
-import { InternalTx, ParsedTx } from '../types';
+import { EthereumTx } from '../../generated/ethereum';
+import { ParsedTx } from '../types';
 export interface TransactionParserArgs {
     chainId: ChainId;
     rpcUrl: string;
@@ -16,8 +16,7 @@ export declare class TransactionParser {
     private readonly weth;
     private readonly parsers;
     constructor(args: TransactionParserArgs);
-    getInternalAddress(inputData: string): string | undefined;
-    parse(tx: BlockbookTx, address: string, internalTxs?: Array<InternalTx>): Promise<ParsedTx>;
+    parse(tx: EthereumTx, address: string): Promise<ParsedTx>;
     private static getStatus;
     private getParsedTxWithTransfers;
 }

package/dist/ethereum/parser/index.js

@@ -32,7 +32,6 @@ const utils_1 = require("../../utils");
 const foxy = __importStar(require("./foxy"));
 const thor = __importStar(require("./thor"));
 const uniV2 = __importStar(require("./uniV2"));
-const utils_2 = require("./utils");
 const weth = __importStar(require("./weth"));
 const yearn = __importStar(require("./yearn"));
 const zrx = __importStar(require("./zrx"));
@@ -51,28 +50,19 @@ class TransactionParser {
         this.yearn = new yearn.Parser({ provider, chainId: this.chainId });
         this.foxy = new foxy.Parser();
         this.weth = new weth.Parser({ chainId: this.chainId, provider });
-        this.parsers = [this.zrx, this.thor, this.uniV2, this.yearn, this.foxy, this.weth];
+        // order here matters currently as weth and yearn have the same sigHash for deposit() and the weth parser is stricter resulting in faster processing times
+        this.parsers = [this.zrx, this.thor, this.uniV2, this.weth, this.foxy, this.yearn];
     }
-    // return any addresses that can be detected
-    getInternalAddress(inputData) {
-        switch ((0, utils_2.getSigHash)(inputData)) {
-            case this.thor.supportedFunctions.transferOutSigHash:
-                return this.thor.getInternalAddress(inputData);
-            case utils_2.SENDMULTISIG_SIG_HASH:
-                return (0, utils_2.getInternalMultisigAddress)(inputData);
-            default:
-                return;
-        }
-    }
-    async parse(tx, address, internalTxs) {
+    async parse(tx, address) {
         var _a;
+        address = ethers_1.ethers.utils.getAddress(address);
         // We expect only one Parser to return a result. If multiple do, we take the first and early exit.
         const contractParserResult = await (0, utils_1.findAsyncSequential)(this.parsers, async (parser) => await parser.parse(tx));
         const parsedTx = {
             address,
             blockHash: tx.blockHash,
             blockHeight: tx.blockHeight,
-            blockTime: tx.blockTime,
+            blockTime: tx.timestamp,
             chainId: this.chainId,
             confirmations: tx.confirmations,
             status: TransactionParser.getStatus(tx),
@@ -81,11 +71,10 @@ class TransactionParser {
             txid: tx.txid,
             data: contractParserResult === null || contractParserResult === void 0 ? void 0 : contractParserResult.data
         };
-        return this.getParsedTxWithTransfers(tx, parsedTx, address, internalTxs);
+        return this.getParsedTxWithTransfers(tx, parsedTx, address);
     }
     static getStatus(tx) {
-        var _a;
-        const status = (_a = tx.ethereumSpecific) === null || _a === void 0 ? void 0 : _a.status;
+        const status = tx.status;
         if (status === -1 && tx.confirmations <= 0)
             return types_1.Status.Pending;
         if (status === 1 && tx.confirmations > 0)
@@ -94,37 +83,35 @@ class TransactionParser {
             return types_1.Status.Failed;
         return types_1.Status.Unknown;
     }
-    getParsedTxWithTransfers(tx, parsedTx, address, internalTxs) {
-        var _a, _b, _c, _d, _e, _f;
-        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) {
+    getParsedTxWithTransfers(tx, parsedTx, address) {
+        var _a, _b;
+        if (address === tx.from) {
             // send amount
             const sendValue = new bignumber_js_1.BigNumber(tx.value);
             if (sendValue.gt(0)) {
-                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Send, this.assetId, sendAddress, receiveAddress, sendValue.toString(10));
+                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Send, this.assetId, tx.from, tx.to, sendValue.toString(10));
             }
             // network fee
-            const fees = new bignumber_js_1.BigNumber((_e = tx.fees) !== null && _e !== void 0 ? _e : 0);
+            const fees = new bignumber_js_1.BigNumber(tx.fee);
             if (fees.gt(0)) {
                 parsedTx.fee = { assetId: this.assetId, value: fees.toString(10) };
             }
         }
-        if (address === receiveAddress) {
+        if (address === tx.to) {
             // receive amount
             const receiveValue = new bignumber_js_1.BigNumber(tx.value);
             if (receiveValue.gt(0)) {
-                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Receive, this.assetId, sendAddress, receiveAddress, receiveValue.toString(10));
+                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Receive, this.assetId, tx.from, tx.to, receiveValue.toString(10));
             }
         }
-        (_f = tx.tokenTransfers) === null || _f === void 0 ? void 0 : _f.forEach((transfer) => {
+        (_a = tx.tokenTransfers) === null || _a === void 0 ? void 0 : _a.forEach((transfer) => {
             // FTX Token (FTT) name and symbol was set backwards on the ERC20 contract
-            if (transfer.token === '0x50D1c9771902476076eCFc8B2A83Ad6b9355a4c9') {
+            if (transfer.contract === '0x50D1c9771902476076eCFc8B2A83Ad6b9355a4c9') {
                 transfer.name = transfer.symbol;
                 transfer.symbol = transfer.name;
             }
             const token = {
-                contract: transfer.token,
+                contract: transfer.contract,
                 decimals: transfer.decimals,
                 name: transfer.name,
                 symbol: transfer.symbol
@@ -133,7 +120,7 @@ class TransactionParser {
                 (0, caip_1.toAssetId)({
                     ...(0, caip_1.fromChainId)(this.chainId),
                     assetNamespace: 'erc20',
-                    assetReference: transfer.token
+                    assetReference: transfer.contract
                 }),
                 transfer.from,
                 transfer.to,
@@ -149,7 +136,7 @@ class TransactionParser {
                 parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Receive, ...transferArgs);
             }
         });
-        internalTxs === null || internalTxs === void 0 ? void 0 : internalTxs.forEach((internalTx) => {
+        (_b = tx.internalTxs) === null || _b === void 0 ? void 0 : _b.forEach((internalTx) => {
             const transferArgs = [
                 (0, caip_1.toAssetId)({
                     ...(0, caip_1.fromChainId)(this.chainId),

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

@@ -1,6 +1,6 @@
-import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
 import { ChainId } from '@shapeshiftoss/caip';
 import { ethers } from 'ethers';
+import { EthereumTx } from '../../generated/ethereum';
 import { SubParser, TxSpecific } from '../types';
 export interface ParserArgs {
     chainId: ChainId;
@@ -14,6 +14,5 @@ export declare class Parser implements SubParser {
         transferOutSigHash: string;
     };
     constructor(args: ParserArgs);
-    getInternalAddress(inputData: string): string | undefined;
-    parse(tx: BlockbookTx): Promise<TxSpecific | undefined>;
+    parse(tx: EthereumTx): Promise<TxSpecific | undefined>;
 }

package/dist/ethereum/parser/thor.js

@@ -30,27 +30,15 @@ class Parser {
                 throw new Error('chainId is not supported. (supported chainIds: eip155:1, eip155:3)');
         }
     }
-    // detect address associated with transferOut internal transaction
-    getInternalAddress(inputData) {
-        if ((0, utils_1.getSigHash)(inputData) !== this.supportedFunctions.transferOutSigHash)
-            return;
-        const result = this.abiInterface.decodeFunctionData(this.supportedFunctions.transferOutSigHash, inputData);
-        const [type] = result.memo.split(':');
-        if (type !== 'OUT' || type !== 'REFUND')
-            return;
-        return result.to;
-    }
     async parse(tx) {
-        var _a;
-        const txData = (_a = tx.ethereumSpecific) === null || _a === void 0 ? void 0 : _a.data;
         if (!(0, utils_1.txInteractsWithContract)(tx, this.routerContract))
             return;
-        if (!txData)
+        if (!tx.inputData)
             return;
-        const txSigHash = (0, utils_1.getSigHash)(txData);
+        const txSigHash = (0, utils_1.getSigHash)(tx.inputData);
         if (!Object.values(this.supportedFunctions).some((hash) => hash === txSigHash))
             return;
-        const decoded = this.abiInterface.parseTransaction({ data: txData });
+        const decoded = this.abiInterface.parseTransaction({ data: tx.inputData });
         // failed to decode input data
         if (!decoded)
             return;

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

@@ -1,6 +1,6 @@
-import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
 import { ChainId } from '@shapeshiftoss/caip';
 import { ethers } from 'ethers';
+import { EthereumTx } from '../../generated/ethereum';
 import { SubParser, TxSpecific } from '../types';
 export interface ParserArgs {
     chainId: ChainId;
@@ -21,8 +21,8 @@ export declare class Parser implements SubParser {
         exitSigHash: string;
     };
     constructor(args: ParserArgs);
-    parseUniV2(tx: BlockbookTx): Promise<TxSpecific | undefined>;
-    parseStakingRewards(tx: BlockbookTx): Promise<TxSpecific | undefined>;
-    parse(tx: BlockbookTx): Promise<TxSpecific | undefined>;
+    parseUniV2(tx: EthereumTx): Promise<TxSpecific | undefined>;
+    parseStakingRewards(tx: EthereumTx): Promise<TxSpecific | undefined>;
+    parse(tx: EthereumTx): Promise<TxSpecific | undefined>;
     private static pairFor;
 }

package/dist/ethereum/parser/uniV2.js

@@ -38,24 +38,21 @@ class Parser {
         }
     }
     async parseUniV2(tx) {
-        var _a, _b, _c;
-        const txData = (_a = tx.ethereumSpecific) === null || _a === void 0 ? void 0 : _a.data;
-        if (!txData)
+        if (!tx.inputData)
             return;
         if (tx.confirmations)
             return;
-        const txSigHash = (0, utils_1.getSigHash)(txData);
+        const txSigHash = (0, utils_1.getSigHash)(tx.inputData);
         if (!Object.values(this.supportedFunctions).some((hash) => hash === txSigHash))
             return;
-        const decoded = this.abiInterface.parseTransaction({ data: txData });
+        const decoded = this.abiInterface.parseTransaction({ data: tx.inputData });
         // failed to decode input data
         if (!decoded)
             return;
-        const sendAddress = (_c = (_b = tx.vin[0].addresses) === null || _b === void 0 ? void 0 : _b[0]) !== null && _c !== void 0 ? _c : '';
         const tokenAddress = ethers_1.ethers.utils.getAddress(decoded.args.token.toLowerCase());
         const lpTokenAddress = Parser.pairFor(tokenAddress, this.wethContract);
         const transfers = await (async () => {
-            switch ((0, utils_1.getSigHash)(txData)) {
+            switch ((0, utils_1.getSigHash)(tx.inputData)) {
                 case this.supportedFunctions.addLiquidityEthSigHash: {
                     const contract = new ethers_1.ethers.Contract(tokenAddress, erc20_1.default, this.provider);
                     const decimals = await contract.decimals();
@@ -70,7 +67,7 @@ class Parser {
                     return [
                         {
                             type: types_1.TransferType.Send,
-                            from: sendAddress,
+                            from: tx.from,
                             to: lpTokenAddress,
                             assetId,
                             totalValue: value,
@@ -93,7 +90,7 @@ class Parser {
                     return [
                         {
                             type: types_1.TransferType.Send,
-                            from: sendAddress,
+                            from: tx.from,
                             to: lpTokenAddress,
                             assetId,
                             totalValue: value,
@@ -118,14 +115,12 @@ class Parser {
         };
     }
     async parseStakingRewards(tx) {
-        var _a;
-        const txData = (_a = tx.ethereumSpecific) === null || _a === void 0 ? void 0 : _a.data;
-        if (!txData)
+        if (!tx.inputData)
             return;
-        const txSigHash = (0, utils_1.getSigHash)(txData);
+        const txSigHash = (0, utils_1.getSigHash)(tx.inputData);
         if (!Object.values(this.supportedStakingRewardsFunctions).some((hash) => hash === txSigHash))
             return;
-        const decoded = this.stakingRewardsInterface.parseTransaction({ data: txData });
+        const decoded = this.stakingRewardsInterface.parseTransaction({ data: tx.inputData });
         // failed to decode input data
         if (!decoded)
             return;

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

@@ -1,5 +1,3 @@
-import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
+import { EthereumTx } from '../../generated/ethereum';
 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;
-export declare const getInternalMultisigAddress: (inputData: string) => string | undefined;
+export declare const txInteractsWithContract: (tx: EthereumTx, contract: string) => boolean;

package/dist/ethereum/parser/utils.js

@@ -1,11 +1,6 @@
 "use strict";
-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 = void 0;
-const ethers_1 = require("ethers");
-const multiSig_1 = __importDefault(require("./abi/multiSig"));
+exports.txInteractsWithContract = exports.getSigHash = void 0;
 const getSigHash = (inputData) => {
     if (!inputData)
         return;
@@ -14,21 +9,6 @@ const getSigHash = (inputData) => {
 };
 exports.getSigHash = getSigHash;
 const txInteractsWithContract = (tx, contract) => {
-    var _a, _b;
-    const receiveAddress = (_b = (_a = tx.vout[0].addresses) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : '';
-    return receiveAddress === contract;
+    return tx.to === contract;
 };
 exports.txInteractsWithContract = txInteractsWithContract;
-exports.SENDMULTISIG_SIG_HASH = (() => {
-    const abiInterface = new ethers_1.ethers.utils.Interface(multiSig_1.default);
-    return abiInterface.getSighash('sendMultiSig');
-})();
-// detect address associated with sendMultiSig internal transaction
-const getInternalMultisigAddress = (inputData) => {
-    const abiInterface = new ethers_1.ethers.utils.Interface(multiSig_1.default);
-    if ((0, exports.getSigHash)(inputData) !== exports.SENDMULTISIG_SIG_HASH)
-        return;
-    const result = abiInterface.decodeFunctionData(exports.SENDMULTISIG_SIG_HASH, inputData);
-    return result.toAddress;
-};
-exports.getInternalMultisigAddress = getInternalMultisigAddress;

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

@@ -1,6 +1,6 @@
-import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
 import { ChainId } from '@shapeshiftoss/caip';
 import { ethers } from 'ethers';
+import { EthereumTx } from '../../generated/ethereum';
 import { SubParser, TxSpecific } from '../types';
 export interface ParserArgs {
     chainId: ChainId;
@@ -8,6 +8,7 @@ export interface ParserArgs {
 }
 export declare class Parser implements SubParser {
     provider: ethers.providers.JsonRpcProvider;
+    readonly name = "weth";
     readonly chainId: ChainId;
     readonly wethContract: string;
     readonly abiInterface: ethers.utils.Interface;
@@ -16,5 +17,5 @@ export declare class Parser implements SubParser {
         withdrawalSigHash: string;
     };
     constructor(args: ParserArgs);
-    parse(tx: BlockbookTx): Promise<TxSpecific | undefined>;
+    parse(tx: EthereumTx): Promise<TxSpecific | undefined>;
 }

package/dist/ethereum/parser/weth.js

@@ -7,12 +7,12 @@ exports.Parser = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const ethers_1 = require("ethers");
 const types_1 = require("../../types");
-const erc20_1 = __importDefault(require("./abi/erc20"));
 const weth_1 = __importDefault(require("./abi/weth"));
 const constants_1 = require("./constants");
 const utils_1 = require("./utils");
 class Parser {
     constructor(args) {
+        this.name = 'weth';
         this.abiInterface = new ethers_1.ethers.utils.Interface(weth_1.default);
         this.supportedFunctions = {
             depositSigHash: this.abiInterface.getSighash('deposit'),
@@ -32,21 +32,17 @@ class Parser {
         }
     }
     async parse(tx) {
-        var _a, _b, _c;
-        const txData = (_a = tx.ethereumSpecific) === null || _a === void 0 ? void 0 : _a.data;
         if (!(0, utils_1.txInteractsWithContract)(tx, this.wethContract))
             return;
-        if (!txData)
+        if (!tx.inputData)
             return;
-        const txSigHash = (0, utils_1.getSigHash)(txData);
+        const txSigHash = (0, utils_1.getSigHash)(tx.inputData);
         if (!Object.values(this.supportedFunctions).some((hash) => hash === txSigHash))
             return;
-        const decoded = this.abiInterface.parseTransaction({ data: txData });
+        const decoded = this.abiInterface.parseTransaction({ data: tx.inputData });
         // failed to decode input data
         if (!decoded)
             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.toAssetId)({
             ...(0, caip_1.fromChainId)(this.chainId),
             assetNamespace: 'erc20',
@@ -54,9 +50,9 @@ class Parser {
         });
         const token = {
             contract: this.wethContract,
-            decimals: await contract.decimals(),
-            name: await contract.name(),
-            symbol: await contract.symbol()
+            decimals: 18,
+            name: 'Wrapped Ether',
+            symbol: 'WETH'
         };
         const transfers = (() => {
             switch (txSigHash) {
@@ -65,7 +61,7 @@ class Parser {
                         {
                             type: types_1.TransferType.Receive,
                             from: this.wethContract,
-                            to: sendAddress,
+                            to: tx.from,
                             assetId,
                             totalValue: tx.value,
                             components: [{ value: tx.value }],
@@ -77,7 +73,7 @@ class Parser {
                     return [
                         {
                             type: types_1.TransferType.Send,
-                            from: sendAddress,
+                            from: tx.from,
                             to: this.wethContract,
                             assetId,
                             totalValue: decoded.args.wad.toString(),

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

@@ -1,7 +1,7 @@
-import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
 import { ChainId } from '@shapeshiftoss/caip';
 import { ChainId as YearnChainId, Yearn } from '@yfi/sdk';
 import { ethers } from 'ethers';
+import { EthereumTx } from '../../generated/ethereum';
 import { SubParser, TxSpecific } from '../types';
 interface ParserArgs {
     chainId: ChainId;
@@ -24,7 +24,7 @@ export declare class Parser implements SubParser {
         depositSigHash: string;
     };
     constructor(args: ParserArgs);
-    parse(tx: BlockbookTx): Promise<TxSpecific | undefined>;
+    parse(tx: EthereumTx): Promise<TxSpecific | undefined>;
     getAbiInterface(txSigHash: string | undefined): ethers.utils.Interface | undefined;
 }
 export {};

package/dist/ethereum/parser/yearn.js

@@ -33,37 +33,35 @@ class Parser {
         }
     }
     async parse(tx) {
-        var _a, _b, _c, _d, _e;
-        const txData = (_a = tx.ethereumSpecific) === null || _a === void 0 ? void 0 : _a.data;
-        if (!txData)
+        var _a, _b;
+        if (!tx.inputData)
             return;
-        const txSigHash = (0, utils_1.getSigHash)(txData);
+        const txSigHash = (0, utils_1.getSigHash)(tx.inputData);
         const abiInterface = this.getAbiInterface(txSigHash);
         if (!abiInterface)
             return;
         if (!this.yearnTokenVaultAddresses) {
-            const vaults = await ((_b = this.yearnSdk) === null || _b === void 0 ? void 0 : _b.vaults.get());
+            const vaults = await ((_a = this.yearnSdk) === null || _a === void 0 ? void 0 : _a.vaults.get());
             this.yearnTokenVaultAddresses = vaults === null || vaults === void 0 ? void 0 : vaults.map((vault) => vault.address);
         }
-        const decoded = abiInterface.parseTransaction({ data: txData });
+        const decoded = abiInterface.parseTransaction({ data: tx.inputData });
         // failed to decode input data
         if (!decoded)
             return;
-        const receiveAddress = (_d = (_c = tx.vout) === null || _c === void 0 ? void 0 : _c[0].addresses) === null || _d === void 0 ? void 0 : _d[0];
         switch (txSigHash) {
             case this.supportedYearnFunctions.approveSigHash:
                 if ((decoded === null || decoded === void 0 ? void 0 : decoded.args._spender) !== constants_1.SHAPE_SHIFT_ROUTER_CONTRACT)
                     return;
                 break;
             case this.supportedShapeShiftFunctions.depositSigHash:
-                if (receiveAddress !== constants_1.SHAPE_SHIFT_ROUTER_CONTRACT)
+                if (tx.to !== constants_1.SHAPE_SHIFT_ROUTER_CONTRACT)
                     return;
                 break;
             case this.supportedYearnFunctions.withdrawSigHash:
             case this.supportedYearnFunctions.depositSigHash:
             case this.supportedYearnFunctions.depositAmountSigHash:
             case this.supportedYearnFunctions.depositAmountAndRecipientSigHash:
-                if (receiveAddress && !((_e = this.yearnTokenVaultAddresses) === null || _e === void 0 ? void 0 : _e.includes(receiveAddress)))
+                if (tx.to && !((_b = this.yearnTokenVaultAddresses) === null || _b === void 0 ? void 0 : _b.includes(tx.to)))
                     return;
                 break;
             default:

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

@@ -1,5 +1,5 @@
-import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
+import { EthereumTx } from '../../generated/ethereum';
 import { SubParser, TxSpecific } from '../types';
 export declare class Parser implements SubParser {
-    parse(tx: BlockbookTx): Promise<TxSpecific | undefined>;
+    parse(tx: EthereumTx): Promise<TxSpecific | undefined>;
 }

package/dist/ethereum/types.d.ts

@@ -1,25 +1,9 @@
-import { Tx as BlockbookTx } from '@shapeshiftoss/blockbook';
+import { EthereumTx } from '../generated/ethereum';
 import { StandardTx, StandardTxMetadata } from '../types';
-export interface InternalTx {
-    blockNumber: string;
-    timeStamp: string;
-    hash: string;
-    from: string;
-    to: string;
-    value: string;
-    contractAddress: string;
-    input: string;
-    type: string;
-    gas: string;
-    gasUsed: string;
-    traceId: string;
-    isError: string;
-    errCode: string;
-}
 export interface ParsedTx extends StandardTx {
     data?: StandardTxMetadata;
 }
 export declare type TxSpecific = Partial<Pick<ParsedTx, 'trade' | 'transfers' | 'data'>>;
 export interface SubParser {
-    parse(tx: BlockbookTx): Promise<TxSpecific | undefined>;
+    parse(tx: EthereumTx): Promise<TxSpecific | undefined>;
 }