@shapeshiftoss/swapper 9.16.1 → 9.17.1

package/dist/api.d.ts

@@ -79,7 +79,6 @@ declare type CommonTradeInput = {
     sellAmount: string;
     sendMax: boolean;
     sellAssetAccountNumber: number;
-    wallet: HDWallet;
     receiveAddress: string;
 };
 export declare type EvmSupportedChainIds = KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet;
@@ -97,7 +96,7 @@ export declare type GetUtxoTradeQuoteInput = CommonTradeInput & {
     chainId: UtxoSupportedChainIds;
     accountType: UtxoAccountType;
     bip44Params: BIP44Params;
-    wallet: HDWallet;
+    xpub: string;
 };
 export declare type GetTradeQuoteInput = GetUtxoTradeQuoteInput | GetEvmTradeQuoteInput | GetCosmosSdkTradeQuoteInput;
 export declare type BuildTradeInput = GetTradeQuoteInput & {

package/dist/swappercli.js

@@ -116,7 +116,6 @@ const main = async () => {
             sellAssetAccountNumber: 0,
             sendMax: false,
             receiveAddress: '0xc770eefad204b5180df6a14ee197d99d808ee52d',
-            wallet,
         });
     }
     catch (e) {

package/dist/swappers/cow/cowApprovalNeeded/cowApprovalNeeded.js

@@ -27,7 +27,7 @@ async function cowApprovalNeeded({ adapter, web3 }, { quote, wallet }) {
         });
         const allowanceOnChain = (0, bignumber_1.bnOrZero)(allowanceResult);
         return {
-            approvalNeeded: allowanceOnChain.lte((0, bignumber_1.bnOrZero)(quote.sellAmount)),
+            approvalNeeded: allowanceOnChain.lt((0, bignumber_1.bnOrZero)(quote.sellAmount)),
         };
     }
     catch (e) {

package/dist/swappers/cow/getCowSwapTradeQuote/getCowSwapTradeQuote.js

@@ -17,7 +17,7 @@ const helpers_2 = require("../utils/helpers/helpers");
 async function getCowSwapTradeQuote(deps, input) {
     var _a, _b;
     try {
-        const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber, wallet } = input;
+        const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber, receiveAddress } = input;
         const { adapter, web3 } = deps;
         const { assetReference: sellAssetErc20Address, assetNamespace: sellAssetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const { assetReference: buyAssetErc20Address, chainId: buyAssetChainId } = (0, caip_1.fromAssetId)(buyAsset.assetId);
@@ -68,7 +68,6 @@ async function getCowSwapTradeQuote(deps, input) {
         const buyCryptoAmount = (0, bignumber_1.bn)(quote.buyAmount).div((0, bignumber_1.bn)(10).exponentiatedBy(buyAsset.precision));
         const sellCryptoAmount = (0, bignumber_1.bn)(quote.sellAmount).div((0, bignumber_1.bn)(10).exponentiatedBy(sellAsset.precision));
         const rate = buyCryptoAmount.div(sellCryptoAmount).toString();
-        const receiveAddress = wallet ? await adapter.getAddress({ wallet }) : constants_1.DEFAULT_ADDRESS;
         const data = (0, helpers_1.getApproveContractData)({
             web3,
             spenderAddress: constants_1.COW_SWAP_VAULT_RELAYER_ADDRESS,

package/dist/swappers/osmosis/OsmosisSwapper.d.ts

@@ -1,14 +1,14 @@
 import { Asset } from '@shapeshiftoss/asset-service';
 import { AssetId, ChainId } from '@shapeshiftoss/caip';
-import { ApprovalNeededOutput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, MinMaxOutput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
-import { OsmoSwapperDeps } from './utils/types';
+import { ApprovalNeededOutput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, MinMaxOutput, Swapper, SwapperType, Trade, TradeQuote, TradeTxs } from '../../api';
+import { OsmosisTradeResult, OsmoSwapperDeps } from './utils/types';
 export declare class OsmosisSwapper implements Swapper<ChainId> {
     readonly name = "Osmosis";
     supportedAssetIds: string[];
     deps: OsmoSwapperDeps;
     getType(): SwapperType;
     constructor(deps: OsmoSwapperDeps);
-    getTradeTxs(tradeResult: TradeResult): Promise<TradeTxs>;
+    getTradeTxs(tradeResult: OsmosisTradeResult): Promise<TradeTxs>;
     getUsdRate(input: Pick<Asset, 'symbol' | 'assetId'>): Promise<string>;
     getMinMax(input: {
         sellAsset: Asset;
@@ -20,5 +20,5 @@ export declare class OsmosisSwapper implements Swapper<ChainId> {
     filterAssetIdsBySellable(): AssetId[];
     buildTrade(args: BuildTradeInput): Promise<Trade<ChainId>>;
     getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<ChainId>>;
-    executeTrade({ trade, wallet }: ExecuteTradeInput<ChainId>): Promise<TradeResult>;
+    executeTrade({ trade, wallet }: ExecuteTradeInput<ChainId>): Promise<OsmosisTradeResult>;
 }

package/dist/swappers/osmosis/OsmosisSwapper.js

@@ -16,10 +16,31 @@ class OsmosisSwapper {
         return api_1.SwapperType.Osmosis;
     }
     async getTradeTxs(tradeResult) {
-        return {
-            sellTxid: tradeResult.tradeId,
-            buyTxid: tradeResult.tradeId,
-        };
+        if (tradeResult.cosmosAddress) {
+            const cosmosAdapter = this.deps.adapterManager.get(caip_1.cosmosChainId);
+            if (!cosmosAdapter)
+                throw new api_1.SwapError('OsmosisSwapper: couldnt get cosmos adapter', {
+                    code: api_1.SwapErrorTypes.GET_TRADE_TXS_FAILED,
+                });
+            const cosmosTxHistory = await cosmosAdapter.getTxHistory({
+                pubkey: tradeResult.cosmosAddress,
+                pageSize: 1,
+            });
+            const currentCosmosTxid = cosmosTxHistory === null || cosmosTxHistory === void 0 ? void 0 : cosmosTxHistory.transactions[0].txid;
+            return {
+                sellTxid: tradeResult.tradeId,
+                // This logic assumes there are the next cosmos tx will be the correct ibc transfer
+                // a random incoming tx COULD cause this logic to fail but its unlikely
+                // TODO find a better solution (may require unchained and parser additions)
+                buyTxid: currentCosmosTxid !== tradeResult.previousCosmosTxid ? currentCosmosTxid : '',
+            };
+        }
+        else {
+            return {
+                sellTxid: tradeResult.previousCosmosTxid,
+                buyTxid: tradeResult.tradeId,
+            };
+        }
     }
     async getUsdRate(input) {
         const { symbol } = input;
@@ -137,9 +158,10 @@ class OsmosisSwapper {
                 code: api_1.SwapErrorTypes.EXECUTE_TRADE_FAILED,
             });
         }
-        let sellAddress;
         const feeData = await osmosisAdapter.getFeeData({});
         const gas = feeData.fast.chainSpecific.gasLimit;
+        let sellAddress;
+        let cosmosIbcTradeId = '';
         if (!isFromOsmo) {
             const sellBip44Params = cosmosAdapter.buildBIP44Params({
                 accountNumber: Number(sellAssetAccountNumber),
@@ -157,7 +179,8 @@ class OsmosisSwapper {
             const responseAccount = await cosmosAdapter.getAccount(sellAddress);
             const accountNumber = responseAccount.chainSpecific.accountNumber || '0';
             const sequence = responseAccount.chainSpecific.sequence || '0';
-            const { tradeId } = await (0, helpers_1.performIbcTransfer)(transfer, cosmosAdapter, wallet, this.deps.osmoUrl, 'uatom', constants_1.COSMO_OSMO_CHANNEL, '0', accountNumber, sequence, gas);
+            const { tradeId } = await (0, helpers_1.performIbcTransfer)(transfer, cosmosAdapter, wallet, this.deps.osmoUrl, 'uatom', constants_1.COSMO_OSMO_CHANNEL, feeData.fast.txFee, accountNumber, sequence, gas, 'uatom');
+            cosmosIbcTradeId = tradeId;
             // wait till confirmed
             const pollResult = await (0, helpers_1.pollForComplete)(tradeId, this.deps.cosmosUrl);
             if (pollResult !== 'success')
@@ -167,7 +190,7 @@ class OsmosisSwapper {
             ibcSellAmount = await (0, helpers_1.pollForAtomChannelBalance)(receiveAddress, this.deps.osmoUrl);
             // delay to ensure all nodes we interact with are up to date at this point
             // seeing intermittent bugs that suggest the balances and sequence numbers were sometimes off
-            await new Promise((resolve) => setTimeout(resolve, 3000));
+            await new Promise((resolve) => setTimeout(resolve, 5000));
         }
         else {
             const sellBip44Params = osmosisAdapter.buildBIP44Params({
@@ -180,6 +203,7 @@ class OsmosisSwapper {
                 });
         }
         const osmoAddress = isFromOsmo ? sellAddress : receiveAddress;
+        const cosmosAddress = isFromOsmo ? receiveAddress : sellAddress;
         const signTxInput = await (0, helpers_1.buildTradeTx)({
             osmoAddress,
             adapter: osmosisAdapter,
@@ -208,10 +232,15 @@ class OsmosisSwapper {
             const ibcSequence = ibcResponseAccount.chainSpecific.sequence || '0';
             // delay to ensure all nodes we interact with are up to date at this point
             // seeing intermittent bugs that suggest the balances and sequence numbers were sometimes off
-            await new Promise((resolve) => setTimeout(resolve, 3000));
-            await (0, helpers_1.performIbcTransfer)(transfer, osmosisAdapter, wallet, this.deps.cosmosUrl, buyAssetDenom, constants_1.OSMO_COSMO_CHANNEL, '0', ibcAccountNumber, ibcSequence, gas);
+            await new Promise((resolve) => setTimeout(resolve, 5000));
+            const cosmosTxHistory = await cosmosAdapter.getTxHistory({
+                pubkey: cosmosAddress,
+                pageSize: 1,
+            });
+            await (0, helpers_1.performIbcTransfer)(transfer, osmosisAdapter, wallet, this.deps.cosmosUrl, buyAssetDenom, constants_1.OSMO_COSMO_CHANNEL, '0', ibcAccountNumber, ibcSequence, gas, 'uosmo');
+            return { tradeId, previousCosmosTxid: cosmosTxHistory.transactions[0].txid, cosmosAddress };
         }
-        return { tradeId: tradeId || 'error' };
+        return { tradeId, previousCosmosTxid: cosmosIbcTradeId };
     }
 }
 exports.OsmosisSwapper = OsmosisSwapper;

package/dist/swappers/osmosis/utils/helpers.d.ts

@@ -21,7 +21,7 @@ export declare const getRateInfo: (sellAsset: string, buyAsset: string, sellAmou
     tradeFee: string;
     buyAmount: string;
 }>;
-export declare const performIbcTransfer: (input: IbcTransferInput, adapter: CosmosSdkSupportedChainAdapters, wallet: HDWallet, blockBaseUrl: string, denom: string, sourceChannel: string, feeAmount: string, accountNumber: string, sequence: string, gas: string) => Promise<TradeResult>;
+export declare const performIbcTransfer: (input: IbcTransferInput, adapter: CosmosSdkSupportedChainAdapters, wallet: HDWallet, blockBaseUrl: string, denom: string, sourceChannel: string, feeAmount: string, accountNumber: string, sequence: string, gas: string, feeDenom: string) => Promise<TradeResult>;
 export declare const buildTradeTx: ({ osmoAddress, adapter, buyAssetDenom, sellAssetDenom, sellAmount, gas, wallet, }: {
     osmoAddress: string;
     adapter: osmosis.ChainAdapter;

package/dist/swappers/osmosis/utils/helpers.js

@@ -160,7 +160,7 @@ const getRateInfo = async (sellAsset, buyAsset, sellAmount, osmoUrl) => {
 };
 exports.getRateInfo = getRateInfo;
 // TODO: move to chain adapters
-const performIbcTransfer = async (input, adapter, wallet, blockBaseUrl, denom, sourceChannel, feeAmount, accountNumber, sequence, gas) => {
+const performIbcTransfer = async (input, adapter, wallet, blockBaseUrl, denom, sourceChannel, feeAmount, accountNumber, sequence, gas, feeDenom) => {
     const { sender, receiver, amount } = input;
     const responseLatestBlock = await (async () => {
         try {
@@ -184,7 +184,7 @@ const performIbcTransfer = async (input, adapter, wallet, blockBaseUrl, denom, s
             amount: [
                 {
                     amount: feeAmount.toString(),
-                    denom: 'uosmo',
+                    denom: feeDenom,
                 },
             ],
             gas,

package/dist/swappers/osmosis/utils/types.d.ts

@@ -1,4 +1,5 @@
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
+import { TradeResult } from '../../../api';
 export declare type OsmoSwapperDeps = {
     adapterManager: ChainAdapterManager;
     osmoUrl: string;
@@ -20,3 +21,7 @@ export declare type PoolAssetInfo = {
         amount: string;
     };
 };
+export interface OsmosisTradeResult extends TradeResult {
+    previousCosmosTxid: string;
+    cosmosAddress?: string;
+}

package/dist/swappers/thorchain/buildThorTrade/buildThorTrade.js

@@ -55,9 +55,7 @@ const buildTrade = async ({ deps, input, }) => {
                 sellAmount,
                 slippageTolerance,
                 destinationAddress,
-                wallet,
-                bip44Params: input.bip44Params,
-                accountType: input.accountType,
+                xpub: input.xpub,
                 tradeFee: quote.feeData.tradeFee,
             });
             const buildTxResponse = await sellAdapter.buildSendTransaction({

package/dist/swappers/thorchain/getThorTradeQuote/getTradeQuote.js

@@ -13,11 +13,7 @@ const getTradeRate_1 = require("../utils/getTradeRate/getTradeRate");
 const getBtcTxFees_1 = require("../utils/txFeeHelpers/btcTxFees/getBtcTxFees");
 const getEthTxFees_1 = require("../utils/txFeeHelpers/ethTxFees/getEthTxFees");
 const getThorTradeQuote = async ({ deps, input }) => {
-    const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber, wallet, chainId, receiveAddress, } = input;
-    if (!wallet)
-        throw new api_1.SwapError('[getThorTradeQuote] - wallet is required', {
-            code: api_1.SwapErrorTypes.VALIDATION_FAILED,
-        });
+    const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber, chainId, receiveAddress } = input;
     try {
         const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const sellAdapter = deps.adapterManager.get(chainId);
@@ -77,9 +73,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         sellAmount,
                         slippageTolerance: constants_1.DEFAULT_SLIPPAGE,
                         destinationAddress: receiveAddress,
-                        wallet,
-                        bip44Params: input.bip44Params,
-                        accountType: input.accountType,
+                        xpub: input.xpub,
                         tradeFee,
                     });
                     const feeData = await (0, getBtcTxFees_1.getBtcTxFees)({

package/dist/swappers/thorchain/thorTradeApprovalNeeded/thorTradeApprovalNeeded.js

@@ -49,7 +49,7 @@ const thorTradeApprovalNeeded = async ({ deps, input, }) => {
                 details: { feeData: quote.feeData },
             });
         return {
-            approvalNeeded: allowanceOnChain.lte((0, bignumber_1.bnOrZero)(quote.sellAmount)),
+            approvalNeeded: allowanceOnChain.lt((0, bignumber_1.bnOrZero)(quote.sellAmount)),
         };
     }
     catch (e) {

package/dist/swappers/thorchain/utils/bitcoin/utils/getThorTxData.d.ts

@@ -1,6 +1,4 @@
 import { Asset } from '@shapeshiftoss/asset-service';
-import { HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { BIP44Params, UtxoAccountType } from '@shapeshiftoss/types';
 import { ThorchainSwapperDeps } from '../../../types';
 declare type GetBtcThorTxInfoArgs = {
     deps: ThorchainSwapperDeps;
@@ -9,9 +7,7 @@ declare type GetBtcThorTxInfoArgs = {
     sellAmount: string;
     slippageTolerance: string;
     destinationAddress: string;
-    wallet: HDWallet;
-    bip44Params: BIP44Params;
-    accountType: UtxoAccountType;
+    xpub: string;
     tradeFee: string;
 };
 declare type GetBtcThorTxInfoReturn = Promise<{

package/dist/swappers/thorchain/utils/bitcoin/utils/getThorTxData.js

@@ -5,7 +5,7 @@ const api_1 = require("../../../../../api");
 const getLimit_1 = require("../../getLimit/getLimit");
 const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
 const thorService_1 = require("../../thorService");
-const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, wallet, bip44Params, accountType, tradeFee, }) => {
+const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, xpub, tradeFee, }) => {
     try {
         const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.midgardUrl}/thorchain/inbound_addresses`);
         const sellAssetInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === sellAsset.symbol.toUpperCase());
@@ -30,12 +30,10 @@ const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTo
             destinationAddress,
             limit,
         });
-        const adapter = deps.adapterManager.get(sellAsset.chainId);
-        const pubkey = await adapter.getPublicKey(wallet, bip44Params, accountType);
         return {
             opReturnData: memo,
             vault,
-            pubkey: pubkey.xpub,
+            pubkey: xpub,
         };
     }
     catch (e) {

package/dist/swappers/utils/test-data/setupSwapQuote.d.ts

@@ -15,7 +15,6 @@ export declare const setupBuildTrade: () => {
         sellAmount: string;
         sendMax: boolean;
         sellAssetAccountNumber: number;
-        wallet: HDWallet;
         receiveAddress: string;
     } & {
         chainId: import("../../../api").EvmSupportedChainIds;

package/dist/swappers/utils/test-data/setupSwapQuote.js

@@ -27,7 +27,6 @@ const setupQuote = () => {
         sellAssetAccountNumber: 0,
         sendMax: false,
         receiveAddress: '0xc770eefad204b5180df6a14ee197d99d808ee52d',
-        wallet: {},
     };
     return { quoteInput, tradeQuote, buyAsset, sellAsset };
 };

package/dist/swappers/zrx/zrxApprovalNeeded/zrxApprovalNeeded.js

@@ -44,7 +44,7 @@ async function zrxApprovalNeeded({ adapter, web3 }, { quote, wallet }) {
                 details: { feeData: quote.feeData },
             });
         return {
-            approvalNeeded: allowanceOnChain.lte((0, bignumber_1.bnOrZero)(quote.sellAmount)),
+            approvalNeeded: allowanceOnChain.lt((0, bignumber_1.bnOrZero)(quote.sellAmount)),
         };
     }
     catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "9.16.1",
+  "version": "9.17.1",
   "description": "An interface and implementations to trade coins via various protocols",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",