@shapeshiftoss/swapper 9.17.0 → 11.0.0

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/ThorchainSwapper.js

@@ -116,7 +116,7 @@ class ThorchainSwapper {
                     fn: 'executeTrade',
                 });
             const { chainNamespace } = (0, caip_1.fromAssetId)(trade.sellAsset.assetId);
-            if (chainNamespace === caip_1.CHAIN_NAMESPACE.Ethereum) {
+            if (chainNamespace === caip_1.CHAIN_NAMESPACE.Evm) {
                 const signedTx = await adapter.signTransaction({
                     txToSign: trade.txData,
                     wallet,
@@ -124,7 +124,7 @@ class ThorchainSwapper {
                 const txid = await adapter.broadcastTransaction(signedTx);
                 return { tradeId: txid };
             }
-            else if (chainNamespace === caip_1.CHAIN_NAMESPACE.Bitcoin) {
+            else if (chainNamespace === caip_1.CHAIN_NAMESPACE.Utxo) {
                 const signedTx = await adapter.signTransaction({
                     txToSign: trade.txData,
                     wallet,
@@ -132,7 +132,7 @@ class ThorchainSwapper {
                 const txid = await adapter.broadcastTransaction(signedTx);
                 return { tradeId: txid };
             }
-            else if (chainNamespace === caip_1.CHAIN_NAMESPACE.Cosmos) {
+            else if (chainNamespace === caip_1.CHAIN_NAMESPACE.CosmosSdk) {
                 const signedTx = await adapter.signTransaction({
                     txToSign: trade.txData,
                     wallet,

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

@@ -22,7 +22,7 @@ const buildTrade = async ({ deps, input, }) => {
                 details: { sellAsset },
             });
         const { chainNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
-        if (chainNamespace === caip_1.CHAIN_NAMESPACE.Ethereum) {
+        if (chainNamespace === caip_1.CHAIN_NAMESPACE.Evm) {
             const sellAssetBip44Params = sellAdapter.buildBIP44Params({
                 accountNumber: sellAssetAccountNumber,
             });
@@ -47,7 +47,7 @@ const buildTrade = async ({ deps, input, }) => {
                 txData: ethTradeTx.txToSign,
             };
         }
-        else if (chainNamespace === caip_1.CHAIN_NAMESPACE.Bitcoin) {
+        else if (chainNamespace === caip_1.CHAIN_NAMESPACE.Utxo) {
             const { vault, opReturnData } = await (0, getThorTxData_1.getThorTxInfo)({
                 deps,
                 sellAsset,
@@ -77,7 +77,7 @@ const buildTrade = async ({ deps, input, }) => {
                 txData: buildTxResponse.txToSign,
             };
         }
-        else if (chainNamespace === caip_1.CHAIN_NAMESPACE.Cosmos) {
+        else if (chainNamespace === caip_1.CHAIN_NAMESPACE.CosmosSdk) {
             const txData = await (0, cosmosTxData_1.cosmosTxData)({
                 deps,
                 sellAdapter: sellAdapter,

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

@@ -42,7 +42,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
         };
         const { chainNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         switch (chainNamespace) {
-            case caip_1.CHAIN_NAMESPACE.Ethereum:
+            case caip_1.CHAIN_NAMESPACE.Evm:
                 return (async () => {
                     const { router } = await (0, getThorTxData_2.getThorTxInfo)({
                         deps,
@@ -64,7 +64,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         feeData,
                     };
                 })();
-            case caip_1.CHAIN_NAMESPACE.Bitcoin:
+            case caip_1.CHAIN_NAMESPACE.Utxo:
                 return (async () => {
                     const { vault, opReturnData, pubkey } = await (0, getThorTxData_1.getThorTxInfo)({
                         deps,
@@ -90,7 +90,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         feeData,
                     };
                 })();
-            case caip_1.CHAIN_NAMESPACE.Cosmos:
+            case caip_1.CHAIN_NAMESPACE.CosmosSdk:
                 return (async () => {
                     const feeData = await sellAdapter.getFeeData({});
                     return {

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

@@ -14,7 +14,7 @@ const thorTradeApprovalNeeded = async ({ deps, input, }) => {
         const { adapterManager, web3 } = deps;
         const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const { chainNamespace } = (0, caip_1.fromChainId)(sellAsset.chainId);
-        if (chainNamespace !== caip_1.CHAIN_NAMESPACE.Ethereum)
+        if (chainNamespace !== caip_1.CHAIN_NAMESPACE.Evm)
             return { approvalNeeded: false };
         const accountNumber = quote.sellAssetAccountNumber;
         const adapter = adapterManager.get(sellAsset.chainId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "9.17.0",
+  "version": "11.0.0",
   "description": "An interface and implementations to trade coins via various protocols",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",
@@ -31,7 +31,7 @@
   },
   "peerDependencies": {
     "@shapeshiftoss/asset-service": "^7.1.0",
-    "@shapeshiftoss/caip": "^6.7.0",
+    "@shapeshiftoss/caip": "^7.0.0",
     "@shapeshiftoss/chain-adapters": "^7.13.0",
     "@shapeshiftoss/errors": "^1.1.2",
     "@shapeshiftoss/hdwallet-core": "^1.27.0",
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@shapeshiftoss/asset-service": "^7.1.0",
-    "@shapeshiftoss/caip": "^6.7.0",
+    "@shapeshiftoss/caip": "^7.0.0",
     "@shapeshiftoss/chain-adapters": "^7.13.0",
     "@shapeshiftoss/errors": "^1.1.2",
     "@shapeshiftoss/hdwallet-core": "^1.27.0",