@shapeshiftoss/swapper 20.3.0 → 20.5.0

package/dist/esm/utils/helpers.d.ts

@@ -1,7 +1,6 @@
 import type { AssetId, ChainId } from '@shapeshiftoss/caip';
 import type { TradeAmount, TradeStepCommon } from '../types.js';
 import { SwapperName } from '../types.js';
-export declare const FALLBACK_QUOTE_DEADLINE_MS = 60000;
 export declare const getTradeAmount: (input: {
     sellAmountIncludingProtocolFeesCryptoBaseUnit: string;
 } | {
@@ -10,5 +9,5 @@ export declare const getTradeAmount: (input: {
 export declare const normalizeEpochToMs: (value: number) => number;
 export declare const isNativeEvmAsset: (assetId: AssetId) => boolean;
 export declare const getTreasuryAddressFromChainId: (chainId: ChainId) => string;
-export type DepositAddressStep = Pick<TradeStepCommon, 'chainflipSpecific' | 'swapperMetadata'>;
+export type DepositAddressStep = Pick<TradeStepCommon, 'swapperMetadata'>;
 export declare const getDepositAddress: (step: DepositAddressStep, swapperName: SwapperName) => string | undefined;

package/dist/esm/utils/helpers.js

@@ -1,9 +1,7 @@
-import { arbitrumAssetId, avalancheAssetId, baseAssetId, bscAssetId, ethAssetId, fromAssetId, gnosisAssetId, katanaAssetId, monadAssetId, optimismAssetId, plasmaAssetId, polygonAssetId, } from '@shapeshiftoss/caip';
+import { CHAIN_NAMESPACE, fromAssetId } from '@shapeshiftoss/caip';
 import { KnownChainIds } from '@shapeshiftoss/types';
-import { DAO_TREASURY_ARBITRUM, DAO_TREASURY_AVALANCHE, DAO_TREASURY_BASE, DAO_TREASURY_BITCOIN, DAO_TREASURY_BOB, DAO_TREASURY_BSC, DAO_TREASURY_ETHEREUM_MAINNET, DAO_TREASURY_GNOSIS, DAO_TREASURY_HYPEREVM, DAO_TREASURY_MEGAETH, DAO_TREASURY_MONAD, DAO_TREASURY_OPTIMISM, DAO_TREASURY_PLASMA, DAO_TREASURY_POLYGON, DAO_TREASURY_ROBINHOOD, DAO_TREASURY_SOLANA, DAO_TREASURY_STARKNET, DAO_TREASURY_TON, isTreasuryChainId, } from '@shapeshiftoss/utils';
+import { chainIdToFeeAssetId, DAO_TREASURY_ARBITRUM, DAO_TREASURY_AVALANCHE, DAO_TREASURY_BASE, DAO_TREASURY_BITCOIN, DAO_TREASURY_BOB, DAO_TREASURY_BSC, DAO_TREASURY_ETHEREUM_MAINNET, DAO_TREASURY_GNOSIS, DAO_TREASURY_HYPEREVM, DAO_TREASURY_MEGAETH, DAO_TREASURY_MONAD, DAO_TREASURY_OPTIMISM, DAO_TREASURY_PLASMA, DAO_TREASURY_POLYGON, DAO_TREASURY_ROBINHOOD, DAO_TREASURY_SOLANA, DAO_TREASURY_STARKNET, DAO_TREASURY_TON, DAO_TREASURY_UNICHAIN, isTreasuryChainId, } from '@shapeshiftoss/utils';
 import { SwapperName } from '../types.js';
-// Deadline for providers without their own expiry - short enough to keep priced amounts honest
-export const FALLBACK_QUOTE_DEADLINE_MS = 60_000;
 export const getTradeAmount = (input) => 'buyAmountCryptoBaseUnit' in input
     ? { direction: 'exactOut', cryptoBaseUnit: input.buyAmountCryptoBaseUnit }
     : { direction: 'exactIn', cryptoBaseUnit: input.sellAmountIncludingProtocolFeesCryptoBaseUnit };
@@ -18,33 +16,8 @@ export const normalizeEpochToMs = (value) => {
     return Math.floor(value / 1e6);
 };
 export const isNativeEvmAsset = (assetId) => {
-    const { chainId } = fromAssetId(assetId);
-    switch (chainId) {
-        case KnownChainIds.EthereumMainnet:
-            return assetId === ethAssetId;
-        case KnownChainIds.AvalancheMainnet:
-            return assetId === avalancheAssetId;
-        case KnownChainIds.OptimismMainnet:
-            return assetId === optimismAssetId;
-        case KnownChainIds.BnbSmartChainMainnet:
-            return assetId === bscAssetId;
-        case KnownChainIds.PolygonMainnet:
-            return assetId === polygonAssetId;
-        case KnownChainIds.GnosisMainnet:
-            return assetId === gnosisAssetId;
-        case KnownChainIds.ArbitrumMainnet:
-            return assetId === arbitrumAssetId;
-        case KnownChainIds.BaseMainnet:
-            return assetId === baseAssetId;
-        case KnownChainIds.MonadMainnet:
-            return assetId === monadAssetId;
-        case KnownChainIds.PlasmaMainnet:
-            return assetId === plasmaAssetId;
-        case KnownChainIds.KatanaMainnet:
-            return assetId === katanaAssetId;
-        default:
-            return false;
-    }
+    const { chainId, chainNamespace } = fromAssetId(assetId);
+    return chainNamespace === CHAIN_NAMESPACE.Evm && assetId === chainIdToFeeAssetId(chainId);
 };
 const DAO_TREASURY_BY_CHAIN_ID = {
     [KnownChainIds.EthereumMainnet]: DAO_TREASURY_ETHEREUM_MAINNET,
@@ -65,6 +38,7 @@ const DAO_TREASURY_BY_CHAIN_ID = {
     [KnownChainIds.RobinhoodMainnet]: DAO_TREASURY_ROBINHOOD,
     [KnownChainIds.PlasmaMainnet]: DAO_TREASURY_PLASMA,
     [KnownChainIds.MegaEthMainnet]: DAO_TREASURY_MEGAETH,
+    [KnownChainIds.UnichainMainnet]: DAO_TREASURY_UNICHAIN,
 };
 export const getTreasuryAddressFromChainId = (chainId) => {
     const maybeTreasuryChainId = isTreasuryChainId(chainId) ? chainId : undefined;
@@ -77,8 +51,11 @@ export const getTreasuryAddressFromChainId = (chainId) => {
 };
 export const getDepositAddress = (step, swapperName) => {
     switch (swapperName) {
-        case SwapperName.Chainflip:
-            return step.chainflipSpecific?.depositAddress || undefined;
+        case SwapperName.Chainflip: {
+            if (step.swapperMetadata?.name !== 'chainflip')
+                return;
+            return step.swapperMetadata.depositAddress || undefined;
+        }
         case SwapperName.NearIntents: {
             if (step.swapperMetadata?.name !== 'nearIntents')
                 return;

package/dist/esm/utils/helpers.test.js

@@ -23,6 +23,7 @@ describe('getTreasuryAddressFromChainId', () => {
         [KnownChainIds.RobinhoodMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
         [KnownChainIds.PlasmaMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
         [KnownChainIds.MegaEthMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
+        [KnownChainIds.UnichainMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
         [KnownChainIds.BitcoinMainnet]: 'bc1q9xrjfet2a05r3jvsxx66rru7pysevk5dvqasdw9eeea3rfqlk33qr4hghh',
         [KnownChainIds.SolanaMainnet]: 'FxXyPB5RH4uHLPPJR5H89zGwZp19juBetmRwrxfsLj2j',
         [KnownChainIds.StarknetMainnet]: '0x07ac2252f2da7cbf085e7a5ddc1318243aa818607cdd430dd2e17dd5d487606a',
@@ -55,7 +56,9 @@ describe('normalizeEpochToMs', () => {
 const makeStep = (step) => step;
 describe('getDepositAddress', () => {
     it('reads the chainflip deposit address', () => {
-        const step = makeStep({ chainflipSpecific: { depositAddress: 'bc1qdeposit' } });
+        const step = makeStep({
+            swapperMetadata: { name: 'chainflip', swapId: 1, depositAddress: 'bc1qdeposit' },
+        });
         expect(getDepositAddress(step, SwapperName.Chainflip)).toBe('bc1qdeposit');
     });
     it('returns undefined when chainflip has no deposit address', () => {
@@ -78,7 +81,9 @@ describe('getDepositAddress', () => {
         expect(getDepositAddress(step, SwapperName.NearIntents)).toBeUndefined();
     });
     it('returns undefined for swappers that do not use deposit addresses', () => {
-        const step = makeStep({ chainflipSpecific: { depositAddress: 'bc1qdeposit' } });
+        const step = makeStep({
+            swapperMetadata: { name: 'chainflip', swapId: 1, depositAddress: 'bc1qdeposit' },
+        });
         expect(getDepositAddress(step, SwapperName.Relay)).toBeUndefined();
     });
 });

package/dist/esm/utils/index.d.ts

@@ -1,13 +1,13 @@
 import type { AssetId, ChainId } from '@shapeshiftoss/caip';
 import type { EvmChainAdapter, near, SignTx, solana, starknet, sui, ton } from '@shapeshiftoss/chain-adapters';
 import type { TronSignTx } from '@shapeshiftoss/chain-adapters/src/tron/types';
-import type { SolanaSignTx, StarknetSignTx, SuiSignTx } from '@shapeshiftoss/hdwallet-core';
+import type { AptosSignTx, 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 { TypedData } from 'eip-712';
-import type { CommonSwapMetadata, EvmTransactionExecutionProps, NearTransactionExecutionProps, SolanaTransactionExecutionProps, StarknetTransactionExecutionProps, SuiTransactionExecutionProps, SupportedTradeQuoteStepIndex, SwapErrorRight, SwapMetadata, SwapperMetadata, TonTransactionExecutionProps, TradeQuote, TradeQuoteStep, TradeRate, TradeRateStep, TradeStatus, TronTransactionExecutionProps } from '../types.js';
+import type { AptosTransactionExecutionProps, CommonSwapMetadata, EvmTransactionExecutionProps, NearTransactionExecutionProps, SolanaTransactionExecutionProps, StarknetTransactionExecutionProps, SuiTransactionExecutionProps, SupportedTradeQuoteStepIndex, SwapErrorRight, SwapMetadata, SwapperMetadata, TonTransactionExecutionProps, TradeQuote, TradeQuoteStep, TradeRate, TradeRateStep, TradeStatus, TronTransactionExecutionProps } from '../types.js';
 import { TradeQuoteError } from '../types.js';
 export declare const getPermit2Eip712: (step: TradeQuoteStep | TradeRateStep | undefined) => TypedData | undefined;
 export declare const makeSwapErrorRight: ({ details, cause, code, message, }: {
@@ -43,6 +43,7 @@ export declare const executeSuiTransaction: (txToSign: SuiSignTx, callbacks: Sui
 export declare const executeNearTransaction: (txToSign: near.NearSignTx, callbacks: NearTransactionExecutionProps) => Promise<string>;
 export declare const executeStarknetTransaction: (txToSign: StarknetSignTx, callbacks: StarknetTransactionExecutionProps) => Promise<string>;
 export declare const executeTonTransaction: (txToSign: ton.TonSignTx, callbacks: TonTransactionExecutionProps) => Promise<string>;
+export declare const executeAptosTransaction: (txToSign: AptosSignTx, callbacks: AptosTransactionExecutionProps) => Promise<string>;
 export declare const createDefaultStatusResponse: (buyTxHash?: string) => {
     status: TxStatus;
     buyTxHash: string | undefined;

package/dist/esm/utils/index.js

@@ -129,6 +129,9 @@ export const executeStarknetTransaction = (txToSign, callbacks) => {
 export const executeTonTransaction = (txToSign, callbacks) => {
     return callbacks.signAndBroadcastTransaction(txToSign);
 };
+export const executeAptosTransaction = (txToSign, callbacks) => {
+    return callbacks.signAndBroadcastTransaction(txToSign);
+};
 export const createDefaultStatusResponse = (buyTxHash) => ({
     status: TxStatus.Unknown,
     buyTxHash,
@@ -246,34 +249,14 @@ export const checkSuiSwapStatus = async ({ txHash, address, assertGetSuiChainAda
             throw new Error('Missing address');
         const adapter = assertGetSuiChainAdapter(suiChainId);
         const client = adapter.getSuiClient();
-        const txResponse = await client.getTransactionBlock({
+        const txResponse = await client.getTransaction({
             digest: txHash,
-            options: {
-                showEffects: true,
-                showBalanceChanges: true,
-            },
+            include: { balanceChanges: true },
         });
-        const status = txResponse.effects?.status?.status === 'success' ? TxStatus.Confirmed : 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;
-            }
-        }
+        const status = txResponse.Transaction ? TxStatus.Confirmed : TxStatus.Failed;
+        // For swaps, we expect exactly one positive balance change for the receiver (the buy asset)
+        const actualBuyAmountCryptoBaseUnit = (txResponse.Transaction ?? txResponse.FailedTransaction).balanceChanges.find(change => change.address === address && BigInt(change.amount) > 0n)
+            ?.amount;
         return {
             status,
             buyTxHash: txHash,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "20.3.0",
+  "version": "20.5.0",
   "repository": "https://github.com/shapeshift/web",
   "license": "MIT",
   "type": "module",
@@ -23,14 +23,13 @@
   "dependencies": {
     "@arbitrum/sdk": "^4.0.1",
     "@avnu/avnu-sdk": "^4.0.1",
-    "@cetusprotocol/aggregator-sdk": "^1.4.2",
-    "@cetusprotocol/cetus-sui-clmm-sdk": "5.4.0",
+    "@cetusprotocol/aggregator-sdk": "1.7.5",
     "@coral-xyz/anchor": "0.29.0",
     "@cowprotocol/app-data": "^2.3.0",
     "@defuse-protocol/one-click-sdk-typescript": "^0.1.1-0.2",
     "@gobob/bob-sdk": "6.0.1",
-    "@mysten/sui": "^1.45.2",
-    "@shapeshiftoss/bitcoinjs-lib": "7.0.0-shapeshift.0",
+    "@mysten/sui": "2.31.2",
+    "@shapeshiftoss/bitcoinjs-lib": "7.0.0-shapeshift.2",
     "@sniptt/monads": "^0.5.10",
     "@solana/web3.js": "1.98.0",
     "@ston-fi/omniston-sdk": "^0.7.8",
@@ -50,13 +49,13 @@
     "retry-axios": "^2.6.0",
     "uuid": "^9.0.0",
     "viem": "2.55.11",
-    "@shapeshiftoss/caip": "^8.17.1",
-    "@shapeshiftoss/chain-adapters": "^11.6.0",
+    "@shapeshiftoss/chain-adapters": "^11.8.0",
     "@shapeshiftoss/hdwallet-core": "^1.62.41",
-    "@shapeshiftoss/contracts": "^1.1.0",
-    "@shapeshiftoss/types": "^9.1.0",
-    "@shapeshiftoss/utils": "^1.3.1",
-    "@shapeshiftoss/unchained-client": "^10.15.0"
+    "@shapeshiftoss/contracts": "^2.0.0",
+    "@shapeshiftoss/utils": "^2.0.0",
+    "@shapeshiftoss/types": "^9.2.0",
+    "@shapeshiftoss/unchained-client": "^10.17.0",
+    "@shapeshiftoss/caip": "^8.18.0"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.178",