@shapeshiftoss/swapper 17.6.6-alpha.1 → 17.6.7

package/dist/esm/types.d.ts

@@ -1,15 +1,15 @@
 import type { QuoteResponse } from '@jup-ag/api';
 import type { AccountId, AssetId, ChainId, Nominal } from '@shapeshiftoss/caip';
-import type { ChainAdapter, CosmosSdkChainAdapter, EvmChainAdapter, SignTx, solana, UtxoChainAdapter } from '@shapeshiftoss/chain-adapters';
-import type { HDWallet, SolanaSignTx } from '@shapeshiftoss/hdwallet-core';
-import type { AccountMetadata, Asset, AssetsByIdPartial, CosmosSdkChainId, EvmChainId, KnownChainIds, OrderQuoteResponse, PartialRecord, UtxoAccountType, UtxoChainId } from '@shapeshiftoss/types';
+import type { ChainAdapter, CosmosSdkChainAdapter, EvmChainAdapter, SignTx, solana, sui, tron, UtxoChainAdapter } from '@shapeshiftoss/chain-adapters';
+import type { HDWallet, SolanaSignTx, SuiSignTx } from '@shapeshiftoss/hdwallet-core';
+import type { AccountMetadata, Asset, AssetsByIdPartial, CosmosSdkChainId, EvmChainId, KnownChainIds, OrderQuoteResponse, PartialRecord, TronChainId, UtxoAccountType, UtxoChainId } from '@shapeshiftoss/types';
 import type { TxStatus } from '@shapeshiftoss/unchained-client';
 import type { Result } from '@sniptt/monads';
 import type { TransactionInstruction } from '@solana/web3.js';
 import type { TypedData } from 'eip-712';
 import type { Mixpanel } from 'mixpanel-browser';
-import type { InterpolationOptions } from 'node-polyglot';
 import type Polyglot from 'node-polyglot';
+import type { InterpolationOptions } from 'node-polyglot';
 import type { Address, Hex } from 'viem';
 import type { CowMessageToSign } from './swappers/CowSwapper/types.js';
 import type { RelayTransactionMetadata } from './swappers/RelaySwapper/utils/types.js';
@@ -59,7 +59,8 @@ export declare enum SwapperName {
     Relay = "Relay",
     ButterSwap = "ButterSwap",
     Bebop = "Bebop",
-    NearIntents = "NEAR Intents"
+    NearIntents = "NEAR Intents",
+    Cetus = "Cetus"
 }
 export type SwapSource = SwapperName | `${SwapperName} • ${string}`;
 export type SwapErrorRight = {
@@ -97,6 +98,10 @@ export type SolanaFeeData = {
     computeUnits: string;
     priorityFee: string;
 };
+export type SuiFeeData = {
+    gasBudget: string;
+    gasPrice: string;
+};
 export type AmountDisplayMeta = {
     amountCryptoBaseUnit: string;
     asset: Partial<Asset> & Pick<Asset, 'symbol' | 'chainId' | 'precision'>;
@@ -107,7 +112,7 @@ export type ProtocolFee = {
 export type QuoteFeeData = {
     networkFeeCryptoBaseUnit: string | undefined;
     protocolFees: PartialRecord<AssetId, ProtocolFee> | undefined;
-    chainSpecific?: UtxoFeeData | CosmosSdkFeeData | SolanaFeeData;
+    chainSpecific?: UtxoFeeData | CosmosSdkFeeData | SolanaFeeData | SuiFeeData;
 };
 export type BuyAssetBySellIdInput = {
     sellAsset: Asset;
@@ -153,9 +158,18 @@ export type GetCosmosSdkTradeQuoteInputBase = CommonTradeQuoteInput & {
 export type GetCosmosSdkTradeQuoteInput = CommonTradeInput & {
     chainId: CosmosSdkChainId;
 };
+export type GetTronTradeQuoteInputBase = CommonTradeInput & {
+    chainId: TronChainId;
+};
+export type GetTronTradeQuoteInput = CommonTradeInput & {
+    chainId: TronChainId;
+};
 export type GetCosmosSdkTradeRateInput = CommonTradeRateInput & {
     chainId: CosmosSdkChainId;
 };
+export type GetTronTradeRateInput = CommonTradeRateInput & {
+    chainId: TronChainId;
+};
 type GetUtxoTradeQuoteWithWallet = CommonTradeQuoteInput & {
     chainId: UtxoChainId;
     accountType: UtxoAccountType;
@@ -169,9 +183,9 @@ export type GetUtxoTradeRateInput = CommonTradeRateInput & {
     xpub: string | undefined;
 };
 export type GetUtxoTradeQuoteInput = GetUtxoTradeQuoteWithWallet;
-export type GetTradeQuoteInput = GetUtxoTradeQuoteInput | GetEvmTradeQuoteInput | GetCosmosSdkTradeQuoteInput;
-export type GetTradeRateInput = GetEvmTradeRateInput | GetCosmosSdkTradeRateInput | GetUtxoTradeRateInput;
-export type GetTradeQuoteInputWithWallet = GetUtxoTradeQuoteWithWallet | GetEvmTradeQuoteInputBase | GetCosmosSdkTradeQuoteInputBase;
+export type GetTradeQuoteInput = GetUtxoTradeQuoteInput | GetEvmTradeQuoteInput | GetCosmosSdkTradeQuoteInput | GetTronTradeQuoteInput;
+export type GetTradeRateInput = GetEvmTradeRateInput | GetCosmosSdkTradeRateInput | GetUtxoTradeRateInput | GetTronTradeRateInput;
+export type GetTradeQuoteInputWithWallet = GetUtxoTradeQuoteWithWallet | GetEvmTradeQuoteInputBase | GetCosmosSdkTradeQuoteInputBase | GetTronTradeQuoteInputBase;
 export type EvmSwapperDeps = {
     assertGetEvmChainAdapter: (chainId: ChainId) => EvmChainAdapter;
     fetchIsSmartContractAddressQuery: (userAddress: string, chainId: ChainId) => Promise<boolean>;
@@ -185,12 +199,18 @@ export type CosmosSdkSwapperDeps = {
 export type SolanaSwapperDeps = {
     assertGetSolanaChainAdapter: (chainId: ChainId) => solana.ChainAdapter;
 };
+export type TronSwapperDeps = {
+    assertGetTronChainAdapter: (chainId: ChainId) => tron.ChainAdapter;
+};
+export type SuiSwapperDeps = {
+    assertGetSuiChainAdapter: (chainId: ChainId) => sui.ChainAdapter;
+};
 export type SwapperDeps = {
     assetsById: AssetsByIdPartial;
     config: SwapperConfig;
     mixPanel: Mixpanel | undefined;
     assertGetChainAdapter: (chainId: ChainId) => ChainAdapter<KnownChainIds>;
-} & EvmSwapperDeps & UtxoSwapperDeps & CosmosSdkSwapperDeps & SolanaSwapperDeps;
+} & EvmSwapperDeps & UtxoSwapperDeps & CosmosSdkSwapperDeps & SolanaSwapperDeps & TronSwapperDeps & SuiSwapperDeps;
 export type TradeQuoteStep = {
     buyAmountBeforeFeesCryptoBaseUnit: string;
     buyAmountAfterFeesCryptoBaseUnit: string;
@@ -296,6 +316,7 @@ export type SwapExecutionMetadata = {
     buyTxHash?: string;
     streamingSwap?: StreamingSwapMetadata;
     message?: string | [string, InterpolationOptions];
+    inboundAddress?: string;
 };
 export type SwapperSpecificMetadata = {
     chainflipSwapId: number | undefined;
@@ -335,6 +356,7 @@ export type Swap = {
     swapperName: SwapperName;
     sellAmountCryptoBaseUnit: string;
     expectedBuyAmountCryptoBaseUnit: string;
+    actualBuyAmountCryptoBaseUnit?: string;
     sellAmountCryptoPrecision: string;
     expectedBuyAmountCryptoPrecision: string;
     txLink?: string;
@@ -398,12 +420,24 @@ export type CosmosSdkTransactionExecutionProps = {
 export type SolanaTransactionExecutionProps = {
     signAndBroadcastTransaction: (txToSign: SolanaSignTx) => Promise<string>;
 };
+export type TronTransactionExecutionProps = {
+    signAndBroadcastTransaction: (txToSign: tron.TronSignTx) => Promise<string>;
+};
+export type SuiTransactionExecutionProps = {
+    signAndBroadcastTransaction: (txToSign: SuiSignTx) => Promise<string>;
+};
 type EvmAccountMetadata = {
     from: string;
 };
 type SolanaAccountMetadata = {
     from: string;
 };
+type TronAccountMetadata = {
+    from: string;
+};
+type SuiAccountMetadata = {
+    from: string;
+};
 type UtxoAccountMetadata = {
     senderAddress: string;
     xpub: string;
@@ -424,6 +458,8 @@ export type GetUnsignedEvmTransactionArgs = CommonGetUnsignedTransactionArgs & E
     supportsEIP1559: boolean;
 };
 export type GetUnsignedSolanaTransactionArgs = CommonGetUnsignedTransactionArgs & SolanaAccountMetadata & SolanaSwapperDeps;
+export type GetUnsignedTronTransactionArgs = CommonGetUnsignedTransactionArgs & TronAccountMetadata & TronSwapperDeps;
+export type GetUnsignedSuiTransactionArgs = CommonGetUnsignedTransactionArgs & SuiAccountMetadata & SuiSwapperDeps;
 export type GetUnsignedEvmMessageArgs = CommonGetUnsignedTransactionArgs & EvmAccountMetadata & Omit<EvmSwapperDeps, 'fetchIsSmartContractAddressQuery'>;
 export type GetUnsignedUtxoTransactionArgs = CommonGetUnsignedTransactionArgs & UtxoAccountMetadata & UtxoSwapperDeps;
 export type GetUnsignedCosmosSdkTransactionArgs = CommonGetUnsignedTransactionArgs & CosmosSdkAccountMetadata & CosmosSdkSwapperDeps;
@@ -442,13 +478,14 @@ export type CheckTradeStatusInput = {
     stepIndex: SupportedTradeQuoteStepIndex;
     config: SwapperConfig;
     swap: Swap | undefined;
-} & EvmSwapperDeps & UtxoSwapperDeps & CosmosSdkSwapperDeps & SolanaSwapperDeps;
+} & EvmSwapperDeps & UtxoSwapperDeps & CosmosSdkSwapperDeps & SolanaSwapperDeps & SuiSwapperDeps;
 export type TradeStatus = {
     status: TxStatus;
     buyTxHash: string | undefined;
     relayerTxHash?: string | undefined;
     relayerExplorerTxLink?: string | undefined;
     message: string | [string, InterpolationOptions] | undefined;
+    actualBuyAmountCryptoBaseUnit?: string;
 };
 export type TradeQuoteResult = Result<TradeQuote[], SwapErrorRight>;
 export type TradeRateResult = Result<TradeRate[], SwapErrorRight>;
@@ -460,6 +497,8 @@ export type Swapper = {
     executeUtxoTransaction?: (txToSign: SignTx<UtxoChainId>, callbacks: UtxoTransactionExecutionProps) => Promise<string>;
     executeCosmosSdkTransaction?: (txToSign: SignTx<CosmosSdkChainId>, callbacks: CosmosSdkTransactionExecutionProps) => Promise<string>;
     executeSolanaTransaction?: (txToSign: SolanaSignTx, callbacks: SolanaTransactionExecutionProps) => Promise<string>;
+    executeTronTransaction?: (txToSign: tron.TronSignTx, callbacks: TronTransactionExecutionProps) => Promise<string>;
+    executeSuiTransaction?: (txToSign: SuiSignTx, callbacks: SuiTransactionExecutionProps) => Promise<string>;
 };
 export type SwapperApi = {
     checkTradeStatus: (input: CheckTradeStatusInput) => Promise<TradeStatus>;
@@ -471,10 +510,14 @@ export type SwapperApi = {
     getUnsignedUtxoTransaction?: (input: GetUnsignedUtxoTransactionArgs) => Promise<SignTx<UtxoChainId>>;
     getUnsignedCosmosSdkTransaction?: (input: GetUnsignedCosmosSdkTransactionArgs) => Promise<SignTx<CosmosSdkChainId>>;
     getUnsignedSolanaTransaction?: (input: GetUnsignedSolanaTransactionArgs) => Promise<SolanaSignTx>;
+    getUnsignedTronTransaction?: (input: GetUnsignedTronTransactionArgs) => Promise<tron.TronSignTx>;
+    getUnsignedSuiTransaction?: (input: GetUnsignedSuiTransactionArgs) => Promise<SuiSignTx>;
     getEvmTransactionFees?: (input: GetUnsignedEvmTransactionArgs) => Promise<string>;
     getSolanaTransactionFees?: (input: GetUnsignedSolanaTransactionArgs) => Promise<string>;
+    getSuiTransactionFees?: (input: GetUnsignedSuiTransactionArgs) => Promise<string>;
     getUtxoTransactionFees?: (input: GetUnsignedUtxoTransactionArgs) => Promise<string>;
     getCosmosSdkTransactionFees?: (input: GetUnsignedCosmosSdkTransactionArgs) => Promise<string>;
+    getTronTransactionFees?: (input: GetUnsignedTronTransactionArgs) => Promise<string>;
 };
 export type QuoteResult = Result<TradeQuote[], SwapErrorRight> & {
     swapperName: SwapperName;
@@ -497,6 +540,8 @@ export type EvmMessageExecutionInput = CommonTradeExecutionInput & EvmMessageExe
 export type UtxoTransactionExecutionInput = CommonTradeExecutionInput & UtxoTransactionExecutionProps & UtxoAccountMetadata;
 export type CosmosSdkTransactionExecutionInput = CommonTradeExecutionInput & CosmosSdkTransactionExecutionProps & CosmosSdkAccountMetadata;
 export type SolanaTransactionExecutionInput = CommonTradeExecutionInput & SolanaTransactionExecutionProps & SolanaAccountMetadata;
+export type TronTransactionExecutionInput = CommonTradeExecutionInput & TronTransactionExecutionProps & TronAccountMetadata;
+export type SuiTransactionExecutionInput = CommonTradeExecutionInput & SuiTransactionExecutionProps & SuiAccountMetadata;
 export declare enum TradeExecutionEvent {
     SellTxHash = "sellTxHash",
     RelayerTxHash = "relayerTxHash",

package/dist/esm/types.js

@@ -13,6 +13,7 @@ export var SwapperName;
     SwapperName["ButterSwap"] = "ButterSwap";
     SwapperName["Bebop"] = "Bebop";
     SwapperName["NearIntents"] = "NEAR Intents";
+    SwapperName["Cetus"] = "Cetus";
 })(SwapperName || (SwapperName = {}));
 export var TradeQuoteError;
 (function (TradeQuoteError) {

package/dist/esm/utils.d.ts

@@ -1,11 +1,12 @@
 import type { AssetId, ChainId } from '@shapeshiftoss/caip';
-import type { EvmChainAdapter, SignTx, solana } from '@shapeshiftoss/chain-adapters';
-import type { SolanaSignTx } from '@shapeshiftoss/hdwallet-core';
+import type { EvmChainAdapter, SignTx, solana, sui } from '@shapeshiftoss/chain-adapters';
+import type { SolanaSignTx, 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 { EvmTransactionExecutionProps, ExecutableTradeStep, SolanaTransactionExecutionProps, SupportedTradeQuoteStepIndex, SwapErrorRight, TradeQuote, TradeQuoteStep, TradeRate, TradeStatus } from './types.js';
+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.js';
 import { TradeQuoteError } from './types.js';
 export declare const makeSwapErrorRight: ({ details, cause, code, message, }: {
     message: string;
@@ -27,6 +28,8 @@ export declare const makeSwapperAxiosServiceMonadic: (service: AxiosInstance) =>
 export declare const getHopByIndex: (quote: TradeQuote | TradeRate | undefined, index: SupportedTradeQuoteStepIndex) => TradeQuoteStep | undefined;
 export declare const executeEvmTransaction: (txToSign: SignTx<EvmChainId>, callbacks: EvmTransactionExecutionProps) => Promise<string>;
 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 createDefaultStatusResponse: (buyTxHash?: string) => {
     status: TxStatus;
     buyTxHash: string | undefined;
@@ -60,3 +63,8 @@ export declare const checkSolanaSwapStatus: ({ txHash, address, assertGetSolanaC
     address: string | undefined;
     assertGetSolanaChainAdapter: (chainId: ChainId) => solana.ChainAdapter;
 }) => Promise<TradeStatus>;
+export declare const checkSuiSwapStatus: ({ txHash, address, assertGetSuiChainAdapter, }: {
+    txHash: string;
+    address: string | undefined;
+    assertGetSuiChainAdapter: (chainId: ChainId) => sui.ChainAdapter;
+}) => Promise<TradeStatus>;

package/dist/esm/utils.js

@@ -1,4 +1,4 @@
-import { solanaChainId } from '@shapeshiftoss/caip';
+import { solanaChainId, suiChainId } from '@shapeshiftoss/caip';
 import { evm, TxStatus } from '@shapeshiftoss/unchained-client';
 import { bn, fromBaseUnit } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
@@ -83,6 +83,12 @@ export const executeEvmTransaction = (txToSign, callbacks) => {
 export const executeSolanaTransaction = (txToSign, callbacks) => {
     return callbacks.signAndBroadcastTransaction(txToSign);
 };
+export const executeTronTransaction = (txToSign, callbacks) => {
+    return callbacks.signAndBroadcastTransaction(txToSign);
+};
+export const executeSuiTransaction = (txToSign, callbacks) => {
+    return callbacks.signAndBroadcastTransaction(txToSign);
+};
 export const createDefaultStatusResponse = (buyTxHash) => ({
     status: TxStatus.Unknown,
     buyTxHash,
@@ -181,3 +187,27 @@ export const checkSolanaSwapStatus = async ({ txHash, address, assertGetSolanaCh
         return createDefaultStatusResponse(txHash);
     }
 };
+export const checkSuiSwapStatus = async ({ txHash, address, assertGetSuiChainAdapter, }) => {
+    try {
+        if (!address)
+            throw new Error('Missing address');
+        const adapter = assertGetSuiChainAdapter(suiChainId);
+        const client = adapter.getSuiClient();
+        const txResponse = await client.getTransactionBlock({
+            digest: txHash,
+            options: {
+                showEffects: true,
+            },
+        });
+        const status = txResponse.effects?.status?.status === 'success' ? TxStatus.Confirmed : TxStatus.Failed;
+        return {
+            status,
+            buyTxHash: txHash,
+            message: undefined,
+        };
+    }
+    catch (e) {
+        console.error(e);
+        return createDefaultStatusResponse(txHash);
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "17.6.6-alpha.1",
+  "version": "17.6.7",
   "packageManager": "yarn@3.5.0",
   "repository": "https://github.com/shapeshift/web",
   "license": "MIT",
@@ -35,14 +35,14 @@
     "@cowprotocol/app-data": "^2.3.0",
     "@defuse-protocol/one-click-sdk-typescript": "^0.1.1-0.2",
     "@jup-ag/api": "^6.0.30",
-    "@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2",
-    "@shapeshiftoss/caip": "^8.16.4-alpha.1",
-    "@shapeshiftoss/chain-adapters": "^11.3.5-alpha.1",
-    "@shapeshiftoss/contracts": "^1.0.3-alpha.1",
-    "@shapeshiftoss/hdwallet-core": "1.62.9",
-    "@shapeshiftoss/types": "^8.6.4-alpha.1",
-    "@shapeshiftoss/unchained-client": "^10.14.7-alpha.1",
-    "@shapeshiftoss/utils": "^1.0.3-alpha.1",
+    "@shapeshiftoss/bitcoinjs-lib": "7.0.0-shapeshift.0",
+    "@shapeshiftoss/caip": "^8.16.5",
+    "@shapeshiftoss/chain-adapters": "^11.3.6",
+    "@shapeshiftoss/contracts": "^1.0.4",
+    "@shapeshiftoss/hdwallet-core": "1.62.21",
+    "@shapeshiftoss/types": "^8.6.5",
+    "@shapeshiftoss/unchained-client": "^10.14.8",
+    "@shapeshiftoss/utils": "^1.0.4",
     "@sniptt/monads": "^0.5.10",
     "@solana/web3.js": "^1.98.0",
     "@uniswap/sdk-core": "^5.3.1",
@@ -60,6 +60,13 @@
     "qs": "^6.10.5",
     "retry-axios": "^2.6.0",
     "uuid": "^9.0.0",
-    "viem": "^2.10.9"
+    "viem": "^2.40.3"
+  },
+  "devDependencies": {
+    "@types/lodash": "^4.14.178",
+    "@types/mixpanel-browser": "^2.38.1",
+    "@types/node-polyglot": "^2.4.2",
+    "@types/qs": "^6.9.18",
+    "@types/uuid": "^9.0.5"
   }
 }