@shapeshiftoss/swapper 17.6.9 → 17.6.10

package/dist/esm/utils.js

@@ -1,6 +1,7 @@
 import { solanaChainId, starknetChainId, suiChainId } from '@shapeshiftoss/caip';
+import { isSecondClassEvmAdapter } from '@shapeshiftoss/chain-adapters';
 import { evm, TxStatus } from '@shapeshiftoss/unchained-client';
-import { bn, fromBaseUnit } from '@shapeshiftoss/utils';
+import { BigAmount, bn } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import Axios from 'axios';
 import { setupCache } from 'axios-cache-interceptor';
@@ -95,6 +96,9 @@ export const executeNearTransaction = (txToSign, callbacks) => {
 export const executeStarknetTransaction = (txToSign, callbacks) => {
     return callbacks.signAndBroadcastTransaction(txToSign);
 };
+export const executeTonTransaction = (txToSign, callbacks) => {
+    return callbacks.signAndBroadcastTransaction(txToSign);
+};
 export const createDefaultStatusResponse = (buyTxHash) => ({
     status: TxStatus.Unknown,
     buyTxHash,
@@ -126,7 +130,9 @@ export const checkSafeTransactionStatus = async ({ address, txHash, chainId, ass
     // Transaction executed on-chain
     if (isExecutedSafeTx) {
         const adapter = assertGetEvmChainAdapter(chainId);
-        const tx = await adapter.httpProvider.getTransaction({ txid: transaction.transactionHash });
+        const tx = await adapter.httpProvider.getTransaction({
+            txid: transaction.transactionHash,
+        });
         const status = evm.getTxStatus(tx);
         return {
             status,
@@ -137,6 +143,15 @@ export const checkSafeTransactionStatus = async ({ address, txHash, chainId, ass
 };
 export const checkEvmSwapStatus = async ({ txHash, chainId, address, assertGetEvmChainAdapter, fetchIsSmartContractAddressQuery, }) => {
     try {
+        const adapter = assertGetEvmChainAdapter(chainId);
+        if (isSecondClassEvmAdapter(adapter)) {
+            const status = await adapter.getTransactionStatus(txHash);
+            return {
+                status,
+                buyTxHash: txHash,
+                message: undefined,
+            };
+        }
         const maybeSafeTransactionStatus = await checkSafeTransactionStatus({
             address,
             txHash,
@@ -146,7 +161,6 @@ export const checkEvmSwapStatus = async ({ txHash, chainId, address, assertGetEv
         });
         if (maybeSafeTransactionStatus)
             return maybeSafeTransactionStatus;
-        const adapter = assertGetEvmChainAdapter(chainId);
         const tx = await adapter.httpProvider.getTransaction({ txid: txHash });
         const status = evm.getTxStatus(tx);
         return {
@@ -161,8 +175,14 @@ export const checkEvmSwapStatus = async ({ txHash, chainId, address, assertGetEv
     }
 };
 export const getInputOutputRate = ({ sellAmountCryptoBaseUnit, buyAmountCryptoBaseUnit, sellAsset, buyAsset, }) => {
-    const sellAmountCryptoHuman = fromBaseUnit(sellAmountCryptoBaseUnit, sellAsset.precision);
-    const buyAmountCryptoHuman = fromBaseUnit(buyAmountCryptoBaseUnit, buyAsset.precision);
+    const sellAmountCryptoHuman = BigAmount.fromBaseUnit({
+        value: sellAmountCryptoBaseUnit,
+        precision: sellAsset.precision,
+    }).toPrecision();
+    const buyAmountCryptoHuman = BigAmount.fromBaseUnit({
+        value: buyAmountCryptoBaseUnit,
+        precision: buyAsset.precision,
+    }).toPrecision();
     return bn(buyAmountCryptoHuman).div(sellAmountCryptoHuman).toFixed();
 };
 export const isExecutableTradeQuote = (quote) => quote.quoteOrRate === 'quote';
@@ -243,7 +263,14 @@ export const checkStarknetSwapStatus = async ({ txHash, assertGetStarknetChainAd
     try {
         const adapter = assertGetStarknetChainAdapter(starknetChainId);
         const provider = adapter.getStarknetProvider();
-        const receipt = await provider.getTransactionReceipt(txHash);
+        // Use raw RPC call for better compatibility with various RPC providers
+        const response = await provider.fetch('starknet_getTransactionReceipt', [txHash]);
+        const result = await response.json();
+        // If there's an error or no result, transaction might still be pending
+        if (result.error || !result.result) {
+            return createDefaultStatusResponse(txHash);
+        }
+        const receipt = result.result;
         const status = receipt.execution_status === 'SUCCEEDED'
             ? TxStatus.Confirmed
             : receipt.execution_status === 'REVERTED'
@@ -256,7 +283,7 @@ export const checkStarknetSwapStatus = async ({ txHash, assertGetStarknetChainAd
         };
     }
     catch (e) {
-        console.error(e);
+        // Don't log expected errors during status polling (tx might still be pending)
         return createDefaultStatusResponse(txHash);
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "17.6.9",
+  "version": "17.6.10",
   "packageManager": "yarn@3.5.0",
   "repository": "https://github.com/shapeshift/web",
   "license": "MIT",
@@ -10,9 +10,9 @@
   "types": "dist/esm/index.d.ts",
   "exports": {
     ".": {
+      "types": "./dist/esm/index.d.ts",
       "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js",
-      "types": "./dist/esm/index.d.ts"
+      "require": "./dist/cjs/index.js"
     }
   },
   "files": [
@@ -36,32 +36,34 @@
     "@cowprotocol/app-data": "^2.3.0",
     "@defuse-protocol/one-click-sdk-typescript": "^0.1.1-0.2",
     "@jup-ag/api": "^6.0.30",
+    "@mysten/sui": "^1.45.2",
     "@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.39",
-    "@shapeshiftoss/types": "^8.6.5",
-    "@shapeshiftoss/unchained-client": "^10.14.8",
-    "@shapeshiftoss/utils": "^1.0.4",
+    "@shapeshiftoss/caip": "^8.16.7",
+    "@shapeshiftoss/chain-adapters": "^11.3.9",
+    "@shapeshiftoss/contracts": "^1.0.6",
+    "@shapeshiftoss/hdwallet-core": "^1.62.41",
+    "@shapeshiftoss/types": "^8.6.7",
+    "@shapeshiftoss/unchained-client": "^10.14.10",
+    "@shapeshiftoss/utils": "^1.0.6",
     "@sniptt/monads": "^0.5.10",
-    "@solana/web3.js": "^1.98.0",
+    "@solana/web3.js": "1.98.0",
+    "@ston-fi/omniston-sdk": "^0.7.8",
     "@uniswap/sdk-core": "^5.3.1",
     "@uniswap/v3-sdk": "^3.13.1",
-    "axios": "^1.13.0",
+    "axios": "^1.13.5",
     "axios-cache-interceptor": "^1.11.1",
     "bignumber.js": "^9.3.1",
     "eip-712": "^1.0.0",
     "ethers": "6.11.1",
     "ethers5": "npm:ethers@5.7.2",
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.23",
     "mixpanel-browser": "^2.67.0",
     "node-polyglot": "^2.4.0",
     "pretty-ms": "7.0.1",
-    "qs": "^6.14.1",
+    "qs": "^6.14.2",
     "retry-axios": "^2.6.0",
     "uuid": "^9.0.0",
-    "viem": "^2.40.3"
+    "viem": "2.43.5"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.178",