@shapeshiftoss/swapper 17.6.7 → 17.6.9

package/dist/cjs/utils.d.ts

@@ -1,12 +1,12 @@
 import type { AssetId, ChainId } from '@shapeshiftoss/caip';
-import type { EvmChainAdapter, SignTx, solana, sui } from '@shapeshiftoss/chain-adapters';
-import type { SolanaSignTx, SuiSignTx } from '@shapeshiftoss/hdwallet-core';
+import type { EvmChainAdapter, near, SignTx, solana, starknet, sui } from '@shapeshiftoss/chain-adapters';
+import type { SolanaSignTx, StarknetSignTx, SuiSignTx } from '@shapeshiftoss/hdwallet-core';
 import type { Asset, EvmChainId } from '@shapeshiftoss/types';
 import { TxStatus } from '@shapeshiftoss/unchained-client';
 import type { Result } from '@sniptt/monads';
 import type { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
-import type { TronSignTx } from 'packages/chain-adapters/src/tron/types';
-import type { EvmTransactionExecutionProps, ExecutableTradeStep, SolanaTransactionExecutionProps, SuiTransactionExecutionProps, SupportedTradeQuoteStepIndex, SwapErrorRight, TradeQuote, TradeQuoteStep, TradeRate, TradeStatus, TronTransactionExecutionProps } from './types';
+import type { TronSignTx } from '@shapeshiftoss/chain-adapters/src/tron/types';
+import type { EvmTransactionExecutionProps, ExecutableTradeStep, NearTransactionExecutionProps, SolanaTransactionExecutionProps, StarknetTransactionExecutionProps, SuiTransactionExecutionProps, SupportedTradeQuoteStepIndex, SwapErrorRight, TradeQuote, TradeQuoteStep, TradeRate, TradeStatus, TronTransactionExecutionProps } from './types';
 import { TradeQuoteError } from './types';
 export declare const makeSwapErrorRight: ({ details, cause, code, message, }: {
     message: string;
@@ -30,6 +30,8 @@ export declare const executeEvmTransaction: (txToSign: SignTx<EvmChainId>, callb
 export declare const executeSolanaTransaction: (txToSign: SolanaSignTx, callbacks: SolanaTransactionExecutionProps) => Promise<string>;
 export declare const executeTronTransaction: (txToSign: TronSignTx, callbacks: TronTransactionExecutionProps) => Promise<string>;
 export declare const executeSuiTransaction: (txToSign: SuiSignTx, callbacks: SuiTransactionExecutionProps) => Promise<string>;
+export declare const executeNearTransaction: (txToSign: near.NearSignTx, callbacks: NearTransactionExecutionProps) => Promise<string>;
+export declare const executeStarknetTransaction: (txToSign: StarknetSignTx, callbacks: StarknetTransactionExecutionProps) => Promise<string>;
 export declare const createDefaultStatusResponse: (buyTxHash?: string) => {
     status: TxStatus;
     buyTxHash: string | undefined;
@@ -68,3 +70,7 @@ export declare const checkSuiSwapStatus: ({ txHash, address, assertGetSuiChainAd
     address: string | undefined;
     assertGetSuiChainAdapter: (chainId: ChainId) => sui.ChainAdapter;
 }) => Promise<TradeStatus>;
+export declare const checkStarknetSwapStatus: ({ txHash, assertGetStarknetChainAdapter, }: {
+    txHash: string;
+    assertGetStarknetChainAdapter: (chainId: ChainId) => starknet.ChainAdapter;
+}) => Promise<TradeStatus>;

package/dist/cjs/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkSuiSwapStatus = exports.checkSolanaSwapStatus = exports.getExecutableTradeStep = exports.isExecutableTradeStep = exports.isExecutableTradeQuote = exports.getInputOutputRate = exports.checkEvmSwapStatus = exports.checkSafeTransactionStatus = exports.createDefaultStatusResponse = exports.executeSuiTransaction = exports.executeTronTransaction = exports.executeSolanaTransaction = exports.executeEvmTransaction = exports.getHopByIndex = exports.makeSwapperAxiosServiceMonadic = exports.AsyncResultOf = exports.createCache = exports.createTradeAmountTooSmallErr = exports.makeSwapErrorRight = void 0;
+exports.checkStarknetSwapStatus = exports.checkSuiSwapStatus = exports.checkSolanaSwapStatus = exports.getExecutableTradeStep = exports.isExecutableTradeStep = exports.isExecutableTradeQuote = exports.getInputOutputRate = exports.checkEvmSwapStatus = exports.checkSafeTransactionStatus = exports.createDefaultStatusResponse = exports.executeStarknetTransaction = exports.executeNearTransaction = exports.executeSuiTransaction = exports.executeTronTransaction = exports.executeSolanaTransaction = exports.executeEvmTransaction = exports.getHopByIndex = exports.makeSwapperAxiosServiceMonadic = exports.AsyncResultOf = exports.createCache = exports.createTradeAmountTooSmallErr = exports.makeSwapErrorRight = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const unchained_client_1 = require("@shapeshiftoss/unchained-client");
 const utils_1 = require("@shapeshiftoss/utils");
@@ -105,6 +105,14 @@ const executeSuiTransaction = (txToSign, callbacks) => {
     return callbacks.signAndBroadcastTransaction(txToSign);
 };
 exports.executeSuiTransaction = executeSuiTransaction;
+const executeNearTransaction = (txToSign, callbacks) => {
+    return callbacks.signAndBroadcastTransaction(txToSign);
+};
+exports.executeNearTransaction = executeNearTransaction;
+const executeStarknetTransaction = (txToSign, callbacks) => {
+    return callbacks.signAndBroadcastTransaction(txToSign);
+};
+exports.executeStarknetTransaction = executeStarknetTransaction;
 const createDefaultStatusResponse = (buyTxHash) => ({
     status: unchained_client_1.TxStatus.Unknown,
     buyTxHash,
@@ -221,13 +229,35 @@ const checkSuiSwapStatus = async ({ txHash, address, assertGetSuiChainAdapter, }
             digest: txHash,
             options: {
                 showEffects: true,
+                showBalanceChanges: true,
             },
         });
         const status = txResponse.effects?.status?.status === 'success' ? unchained_client_1.TxStatus.Confirmed : unchained_client_1.TxStatus.Failed;
+        // Extract actual buy amount from balance changes
+        let actualBuyAmountCryptoBaseUnit;
+        if (txResponse.balanceChanges) {
+            // Balance changes show the net effect on the user's balances
+            // Positive amounts are received, negative are sent
+            const receivedChanges = txResponse.balanceChanges.filter(change => {
+                // The owner field is a discriminated union - check for AddressOwner variant
+                // Handle both object and string cases
+                const ownerAddress = change.owner && typeof change.owner === 'object' && 'AddressOwner' in change.owner
+                    ? change.owner.AddressOwner
+                    : change.owner && typeof change.owner === 'object' && 'ObjectOwner' in change.owner
+                        ? change.owner.ObjectOwner
+                        : null;
+                return ownerAddress === address && Number(change.amount) > 0;
+            });
+            if (receivedChanges.length > 0) {
+                // For swaps, we expect exactly one positive balance change (the buy asset)
+                actualBuyAmountCryptoBaseUnit = receivedChanges[0].amount;
+            }
+        }
         return {
             status,
             buyTxHash: txHash,
             message: undefined,
+            actualBuyAmountCryptoBaseUnit,
         };
     }
     catch (e) {
@@ -236,3 +266,25 @@ const checkSuiSwapStatus = async ({ txHash, address, assertGetSuiChainAdapter, }
     }
 };
 exports.checkSuiSwapStatus = checkSuiSwapStatus;
+const checkStarknetSwapStatus = async ({ txHash, assertGetStarknetChainAdapter, }) => {
+    try {
+        const adapter = assertGetStarknetChainAdapter(caip_1.starknetChainId);
+        const provider = adapter.getStarknetProvider();
+        const receipt = await provider.getTransactionReceipt(txHash);
+        const status = receipt.execution_status === 'SUCCEEDED'
+            ? unchained_client_1.TxStatus.Confirmed
+            : receipt.execution_status === 'REVERTED'
+                ? unchained_client_1.TxStatus.Failed
+                : unchained_client_1.TxStatus.Pending;
+        return {
+            status,
+            buyTxHash: txHash,
+            message: undefined,
+        };
+    }
+    catch (e) {
+        console.error(e);
+        return (0, exports.createDefaultStatusResponse)(txHash);
+    }
+};
+exports.checkStarknetSwapStatus = checkStarknetSwapStatus;