@shapeshiftoss/swapper 20.4.0 → 20.6.0

package/dist/esm/utils/evm/getEvmNetworkFeeCryptoBaseUnit.test.js

@@ -0,0 +1,101 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { getEvmNetworkFeeCryptoBaseUnit, getEvmRateNetworkFeeCryptoBaseUnit, } from './getEvmNetworkFeeCryptoBaseUnit.js';
+import { estimateGasWithStateOverride, EstimationTimeoutError, getMinimalStateOverride, } from './stateOverride.js';
+vi.mock('./stateOverride', async (importActual) => ({
+    ...(await importActual()),
+    getMinimalStateOverride: vi.fn(),
+    estimateGasWithStateOverride: vi.fn(),
+}));
+const gasFees = { gasPrice: '10' };
+const makeTransactionData = () => ({ type: 'evm', to: '0x1', data: '0x', value: '0' });
+const makeArgs = (adapter) => ({
+    adapter: adapter,
+    supportsEIP1559: false,
+    transactionData: makeTransactionData(),
+    from: '0x0000000000000000000000000000000000000001',
+    stateOverride: { sellAsset: {}, sellAmountCryptoBaseUnit: '1' },
+});
+describe('getEvmNetworkFeeCryptoBaseUnit state override', () => {
+    beforeEach(() => {
+        vi.mocked(getMinimalStateOverride).mockReset();
+        vi.mocked(estimateGasWithStateOverride).mockReset();
+    });
+    it('buffers the override gas limit onto the tx and prices the buffered limit', async () => {
+        vi.mocked(getMinimalStateOverride).mockResolvedValue([]);
+        vi.mocked(estimateGasWithStateOverride).mockResolvedValue('200');
+        const args = makeArgs({ getGasFeeData: vi.fn().mockResolvedValue({ average: gasFees }) });
+        await expect(getEvmNetworkFeeCryptoBaseUnit(args)).resolves.toBe('2400');
+        expect(args.transactionData.gasLimit).toBe('240');
+    });
+    it('falls back to plain estimation when the override simulation times out', async () => {
+        vi.mocked(getMinimalStateOverride).mockResolvedValue([]);
+        vi.mocked(estimateGasWithStateOverride).mockRejectedValue(new EstimationTimeoutError());
+        const getFeeData = vi.fn().mockResolvedValue({
+            average: { chainSpecific: { gasLimit: '100', ...gasFees } },
+        });
+        const args = makeArgs({
+            getGasFeeData: vi.fn().mockResolvedValue({ average: gasFees }),
+            getFeeData,
+        });
+        await expect(getEvmNetworkFeeCryptoBaseUnit(args)).resolves.toBe('1200');
+        expect(args.transactionData.gasLimit).toBe('120');
+    });
+    it('estimates over a provider gas limit already set on the tx', async () => {
+        vi.mocked(getMinimalStateOverride).mockResolvedValue([]);
+        vi.mocked(estimateGasWithStateOverride).mockResolvedValue('200');
+        const args = makeArgs({ getGasFeeData: vi.fn().mockResolvedValue({ average: gasFees }) });
+        args.transactionData.gasLimit = '150';
+        await expect(getEvmNetworkFeeCryptoBaseUnit(args)).resolves.toBe('2400');
+        expect(args.transactionData.gasLimit).toBe('240');
+    });
+    it('signs the buffered provider limit when the needed override cannot be built', async () => {
+        vi.mocked(getMinimalStateOverride).mockRejectedValue(new Error('Unable to locate allowance slot'));
+        const args = {
+            ...makeArgs({ getGasFeeData: vi.fn().mockResolvedValue({ average: gasFees }) }),
+            providerGasLimit: '300',
+        };
+        await expect(getEvmNetworkFeeCryptoBaseUnit(args)).resolves.toBe('3600');
+        expect(args.transactionData.gasLimit).toBe('360');
+        expect(estimateGasWithStateOverride).not.toHaveBeenCalled();
+    });
+    it('fails rather than trusting the provider limit when the overridden simulation reverts', async () => {
+        vi.mocked(getMinimalStateOverride).mockResolvedValue([]);
+        vi.mocked(estimateGasWithStateOverride).mockRejectedValue(new Error('execution reverted'));
+        const getFeeData = vi.fn();
+        const args = {
+            ...makeArgs({ getGasFeeData: vi.fn().mockResolvedValue({ average: gasFees }), getFeeData }),
+            providerGasLimit: '300',
+        };
+        await expect(getEvmNetworkFeeCryptoBaseUnit(args)).rejects.toThrow('execution reverted');
+        expect(getFeeData).not.toHaveBeenCalled();
+    });
+});
+describe('getEvmRateNetworkFeeCryptoBaseUnit', () => {
+    beforeEach(() => {
+        vi.mocked(getMinimalStateOverride).mockReset();
+        vi.mocked(estimateGasWithStateOverride).mockReset();
+    });
+    it('prices the provider limit as given without simulating', async () => {
+        const { transactionData, from, stateOverride, ...feeArgs } = makeArgs({
+            getGasFeeData: vi.fn().mockResolvedValue({ average: gasFees }),
+        });
+        await expect(getEvmRateNetworkFeeCryptoBaseUnit({
+            ...feeArgs,
+            providerGasLimit: '300',
+            simulation: { transactionData, from, stateOverride },
+        })).resolves.toBe('3000');
+        expect(getMinimalStateOverride).not.toHaveBeenCalled();
+    });
+    it('simulates when the provider has no gas limit', async () => {
+        vi.mocked(getMinimalStateOverride).mockResolvedValue([]);
+        vi.mocked(estimateGasWithStateOverride).mockResolvedValue('200');
+        const { transactionData, from, stateOverride, ...feeArgs } = makeArgs({
+            getGasFeeData: vi.fn().mockResolvedValue({ average: gasFees }),
+        });
+        await expect(getEvmRateNetworkFeeCryptoBaseUnit({
+            ...feeArgs,
+            providerGasLimit: undefined,
+            simulation: { transactionData, from, stateOverride },
+        })).resolves.toBe('2400');
+    });
+});

package/dist/esm/utils/evm/stateOverride.d.ts

@@ -1,5 +1,8 @@
 import type { Asset } from '@shapeshiftoss/types';
 import type { StateOverride } from 'viem';
+export declare class EstimationTimeoutError extends Error {
+    constructor();
+}
 export declare const withTimeout: <T>(promise: Promise<T>) => Promise<T>;
 export type GetMinimalStateOverrideArgs = {
     sellAsset: Asset;

package/dist/esm/utils/evm/stateOverride.js

@@ -26,13 +26,18 @@ const discoveredSlots = new Map();
 const rawDiscoveredSlots = new Map();
 const failedSlotDiscoveries = new Map();
 const FAILED_DISCOVERY_TTL_MS = 60_000;
+export class EstimationTimeoutError extends Error {
+    constructor() {
+        super('State override estimation timed out');
+    }
+}
 export const withTimeout = async (promise) => {
     let timer;
     try {
         return await Promise.race([
             promise,
             new Promise((_, reject) => {
-                timer = setTimeout(() => reject(new Error('State override estimation timed out')), ESTIMATION_TIMEOUT_MS);
+                timer = setTimeout(() => reject(new EstimationTimeoutError()), ESTIMATION_TIMEOUT_MS);
             }),
         ]);
     }
@@ -288,7 +293,7 @@ export const getMinimalStateOverride = async ({ sellAsset, sellAmountCryptoBaseU
 // only the missing state. Estimation runs on our own RPCs - the node applies the same engine over
 // the patched pre-state, so the only systematic delta is the unrealized allowance-decrement refund
 // (a few k gas high, conservative).
-export const estimateGasWithStateOverride = ({ to, data, stateOverride: prebuiltStateOverride, ...overrideArgs }) => withTimeout((async () => {
+export const estimateGasWithStateOverride = async ({ to, data, stateOverride: prebuiltStateOverride, ...overrideArgs }) => {
     const client = assertGetViemClient(overrideArgs.sellAsset.chainId);
     const stateOverride = prebuiltStateOverride ?? (await getMinimalStateOverride(overrideArgs));
     const gasLimit = await client.estimateGas({
@@ -299,4 +304,4 @@ export const estimateGasWithStateOverride = ({ to, data, stateOverride: prebuilt
         ...(stateOverride ? { stateOverride } : {}),
     });
     return gasLimit.toString();
-})());
+};

package/dist/esm/utils/helpers.js

@@ -1,6 +1,6 @@
 import { CHAIN_NAMESPACE, fromAssetId } from '@shapeshiftoss/caip';
 import { KnownChainIds } from '@shapeshiftoss/types';
-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, 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_ELYSIUM, 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';
 export const getTradeAmount = (input) => 'buyAmountCryptoBaseUnit' in input
     ? { direction: 'exactOut', cryptoBaseUnit: input.buyAmountCryptoBaseUnit }
@@ -38,6 +38,8 @@ 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,
+    [KnownChainIds.ElysiumMainnet]: DAO_TREASURY_ELYSIUM,
 };
 export const getTreasuryAddressFromChainId = (chainId) => {
     const maybeTreasuryChainId = isTreasuryChainId(chainId) ? chainId : undefined;

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

@@ -23,6 +23,8 @@ describe('getTreasuryAddressFromChainId', () => {
         [KnownChainIds.RobinhoodMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
         [KnownChainIds.PlasmaMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
         [KnownChainIds.MegaEthMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
+        [KnownChainIds.UnichainMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
+        [KnownChainIds.ElysiumMainnet]: '0xF5AA59151bE6515C4Ca68A0282CF68B3eA4846fC',
         [KnownChainIds.BitcoinMainnet]: 'bc1q9xrjfet2a05r3jvsxx66rru7pysevk5dvqasdw9eeea3rfqlk33qr4hghh',
         [KnownChainIds.SolanaMainnet]: 'FxXyPB5RH4uHLPPJR5H89zGwZp19juBetmRwrxfsLj2j',
         [KnownChainIds.StarknetMainnet]: '0x07ac2252f2da7cbf085e7a5ddc1318243aa818607cdd430dd2e17dd5d487606a',

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.4.0",
+  "version": "20.6.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.3",
     "@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/chain-adapters": "^11.7.0",
-    "@shapeshiftoss/caip": "^8.17.2",
-    "@shapeshiftoss/types": "^9.1.0",
-    "@shapeshiftoss/contracts": "^1.1.0",
-    "@shapeshiftoss/utils": "^1.4.0",
+    "@shapeshiftoss/caip": "^8.19.0",
     "@shapeshiftoss/hdwallet-core": "^1.62.41",
-    "@shapeshiftoss/unchained-client": "^10.16.0"
+    "@shapeshiftoss/chain-adapters": "^11.9.0",
+    "@shapeshiftoss/types": "^9.3.0",
+    "@shapeshiftoss/unchained-client": "^10.17.0",
+    "@shapeshiftoss/utils": "^2.1.0",
+    "@shapeshiftoss/contracts": "^2.1.0"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.178",