@swapkit/core 1.0.0-rc.89 → 1.0.0-rc.90

package/package.json

@@ -1,8 +1,8 @@
 {
   "author": "swapkit-oss-team",
   "dependencies": {
-    "@swapkit/helpers": "1.0.0-rc.64",
-    "@swapkit/types": "1.0.0-rc.33"
+    "@swapkit/helpers": "1.0.0-rc.65",
+    "@swapkit/types": "1.0.0-rc.34"
   },
   "description": "SwapKit Lib core",
   "devDependencies": {
@@ -11,15 +11,15 @@
     "vitest": "1.2.1",
     "@internal/config": "0.0.2-rc.0",
     "@swapkit/tokens": "1.0.0-rc.33",
-    "@swapkit/toolbox-cosmos": "1.0.0-rc.72",
-    "@swapkit/toolbox-evm": "1.0.0-rc.70",
-    "@swapkit/toolbox-utxo": "1.0.0-rc.69"
+    "@swapkit/toolbox-cosmos": "1.0.0-rc.73",
+    "@swapkit/toolbox-evm": "1.0.0-rc.71",
+    "@swapkit/toolbox-utxo": "1.0.0-rc.70"
   },
   "peerDependencies": {
     "@swapkit/tokens": "1.0.0-rc.33",
-    "@swapkit/toolbox-cosmos": "1.0.0-rc.72",
-    "@swapkit/toolbox-evm": "1.0.0-rc.70",
-    "@swapkit/toolbox-utxo": "1.0.0-rc.69"
+    "@swapkit/toolbox-cosmos": "1.0.0-rc.73",
+    "@swapkit/toolbox-evm": "1.0.0-rc.71",
+    "@swapkit/toolbox-utxo": "1.0.0-rc.70"
   },
   "eslintConfig": {
     "extends": "../../../internal/eslint-config"
@@ -47,7 +47,7 @@
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "1.0.0-rc.89",
+  "version": "1.0.0-rc.90",
   "scripts": {
     "build": "NODE_OPTIONS=--max_old_space_size=16384 vite build",
     "clean": "rm -rf dist vite.config.ts.* .turbo node_modules",

package/src/client/index.ts

@@ -1,4 +1,4 @@
-import type { Keys, ThornameRegisterParam } from '@swapkit/helpers';
+import type { ErrorKeys, ThornameRegisterParam } from '@swapkit/helpers';
 import {
   AssetValue,
   gasFeeMultiplier,
@@ -101,112 +101,109 @@ export class SwapKitCore<T = ''> {
 
     if (!route.complete) throw new SwapKitError('core_swap_route_not_complete');
 
-    try {
-      // TODO enable when BE is ready
-      //   if (contractCallParams && evmChain) {
-      //     const walletMethods = this.connectedWallets[evmChain];
-
-      //     if (!walletMethods?.call) {
-      //       throw new SwapKitError('core_wallet_connection_not_found');
-      //     }
-
-      //     const { contractAddress, contractMethod, contractParams, contractParamsStreaming } =
-      //       contractCallParams;
-
-      //     if (!(streamSwap ? contractParamsStreaming : contractParams)) {
-      //       throw new SwapKitError('core_swap_route_transaction_not_found');
-      //     }
-
-      //     return await walletMethods.call<string>({
-      //       contractAddress,
-      //       abi: lowercasedContractAbiMapping[contractAddress.toLowerCase()],
-      //       funcName: contractMethod,
-      //       funcParams: streamSwap ? contractParamsStreaming : contractParams,
-      //     });
-      //   }
-
-      if (AGG_SWAP.includes(quoteMode) && evmChain) {
-        const walletMethods = this.connectedWallets[evmChain];
-        if (!walletMethods?.sendTransaction) {
-          throw new SwapKitError('core_wallet_connection_not_found');
-        }
+    // TODO enable when BE is ready
+    //   if (contractCallParams && evmChain) {
+    //     const walletMethods = this.connectedWallets[evmChain];
+
+    //     if (!walletMethods?.call) {
+    //       throw new SwapKitError('core_wallet_connection_not_found');
+    //     }
+
+    //     const { contractAddress, contractMethod, contractParams, contractParamsStreaming } =
+    //       contractCallParams;
+
+    //     if (!(streamSwap ? contractParamsStreaming : contractParams)) {
+    //       throw new SwapKitError('core_swap_route_transaction_not_found');
+    //     }
+
+    //     return await walletMethods.call<string>({
+    //       contractAddress,
+    //       abi: lowercasedContractAbiMapping[contractAddress.toLowerCase()],
+    //       funcName: contractMethod,
+    //       funcParams: streamSwap ? contractParamsStreaming : contractParams,
+    //     });
+    //   }
+
+    if (AGG_SWAP.includes(quoteMode) && evmChain) {
+      const walletMethods = this.connectedWallets[evmChain];
+      if (!walletMethods?.sendTransaction) {
+        throw new SwapKitError('core_wallet_connection_not_found');
+      }
 
-        const transaction = streamSwap ? route?.streamingSwap?.transaction : route?.transaction;
-        if (!transaction) throw new SwapKitError('core_swap_route_transaction_not_found');
+      const transaction = streamSwap ? route?.streamingSwap?.transaction : route?.transaction;
+      if (!transaction) throw new SwapKitError('core_swap_route_transaction_not_found');
 
-        const { data, from, to, value } = route.transaction;
+      const { data, from, to, value } = route.transaction;
 
-        const params = {
-          data,
-          from,
-          to: to.toLowerCase(),
-          chainId: BigInt(ChainToChainId[evmChain]),
-          value: value ? BigInt(value) : 0n,
-        };
+      const params = {
+        data,
+        from,
+        to: to.toLowerCase(),
+        chainId: BigInt(ChainToChainId[evmChain]),
+        value: value ? BigInt(value) : 0n,
+      };
 
-        return walletMethods.sendTransaction(params, feeOptionKey) as Promise<string>;
-      }
+      return walletMethods.sendTransaction(params, feeOptionKey) as Promise<string>;
+    }
 
-      if (SWAP_OUT.includes(quoteMode)) {
-        if (!route.calldata.fromAsset) throw new SwapKitError('core_swap_asset_not_recognized');
-        const asset = await AssetValue.fromString(route.calldata.fromAsset);
-        if (!asset) throw new SwapKitError('core_swap_asset_not_recognized');
+    if (SWAP_OUT.includes(quoteMode)) {
+      if (!route.calldata.fromAsset) throw new SwapKitError('core_swap_asset_not_recognized');
+      const asset = await AssetValue.fromString(route.calldata.fromAsset);
+      if (!asset) throw new SwapKitError('core_swap_asset_not_recognized');
 
-        const { address: recipient } = await this.#getInboundDataByChain(asset.chain);
-        const {
-          contract: router,
-          calldata: { expiration, amountIn, memo, memoStreamingSwap },
-        } = route;
+      const { address: recipient } = await this.#getInboundDataByChain(asset.chain);
+      const {
+        contract: router,
+        calldata: { expiration, amountIn, memo, memoStreamingSwap },
+      } = route;
 
-        const assetValue = asset.add(SwapKitNumber.fromBigInt(BigInt(amountIn), asset.decimal));
-        const swapMemo = (streamSwap ? memoStreamingSwap || memo : memo) as string;
+      const assetValue = asset.add(SwapKitNumber.fromBigInt(BigInt(amountIn), asset.decimal));
+      const swapMemo = (streamSwap ? memoStreamingSwap || memo : memo) as string;
 
-        return this.deposit({
-          expiration,
-          assetValue,
-          memo: swapMemo,
-          feeOptionKey,
-          router,
-          recipient,
-        });
-      }
+      return this.deposit({
+        expiration,
+        assetValue,
+        memo: swapMemo,
+        feeOptionKey,
+        router,
+        recipient,
+      });
+    }
 
-      if (SWAP_IN.includes(quoteMode) && evmChain) {
-        const { calldata, contract: contractAddress } = route;
-        if (!contractAddress) throw new SwapKitError('core_swap_contract_not_found');
+    if (SWAP_IN.includes(quoteMode) && evmChain) {
+      const { calldata, contract: contractAddress } = route;
+      if (!contractAddress) throw new SwapKitError('core_swap_contract_not_found');
 
-        const walletMethods = this.connectedWallets[evmChain];
-        const from = this.getAddress(evmChain);
-        if (!walletMethods?.sendTransaction || !from) {
-          throw new SwapKitError('core_wallet_connection_not_found');
-        }
+      const walletMethods = this.connectedWallets[evmChain];
+      const from = this.getAddress(evmChain);
 
-        const { getProvider, toChecksumAddress } = await import('@swapkit/toolbox-evm');
-        const provider = getProvider(evmChain);
-        const abi = lowercasedContractAbiMapping[contractAddress.toLowerCase()];
+      if (!walletMethods?.sendTransaction || !from) {
+        throw new SwapKitError('core_wallet_connection_not_found');
+      }
 
-        if (!abi) throw new SwapKitError('core_swap_contract_not_supported', { contractAddress });
+      const { getProvider, toChecksumAddress } = await import('@swapkit/toolbox-evm');
+      const provider = getProvider(evmChain);
+      const abi = lowercasedContractAbiMapping[contractAddress.toLowerCase()];
 
-        const contract = await walletMethods.createContract?.(contractAddress, abi, provider);
+      if (!abi) throw new SwapKitError('core_swap_contract_not_supported', { contractAddress });
 
-        const tx = await contract.getFunction('swapIn').populateTransaction(
-          ...getSwapInParams({
-            streamSwap,
-            toChecksumAddress,
-            contractAddress: contractAddress as AGG_CONTRACT_ADDRESS,
-            recipient,
-            calldata,
-          }),
-          { from },
-        );
+      const contract = await walletMethods.createContract?.(contractAddress, abi, provider);
 
-        return walletMethods.sendTransaction(tx, feeOptionKey) as Promise<string>;
-      }
+      const tx = await contract.getFunction('swapIn').populateTransaction(
+        ...getSwapInParams({
+          streamSwap,
+          toChecksumAddress,
+          contractAddress: contractAddress as AGG_CONTRACT_ADDRESS,
+          recipient,
+          calldata,
+        }),
+        { from },
+      );
 
-      throw new SwapKitError('core_swap_quote_mode_not_supported', { quoteMode });
-    } catch (error) {
-      throw new SwapKitError('core_swap_transaction_error', error);
+      return walletMethods.sendTransaction(tx, feeOptionKey) as Promise<string>;
     }
+
+    throw new SwapKitError('core_swap_quote_mode_not_supported', { quoteMode });
   };
 
   getWalletByChain = async (chain: Chain, potentialScamFilter?: boolean) => {
@@ -260,15 +257,23 @@ export class SwapKitCore<T = ''> {
   }: CoreTxParams & { router?: string }) => {
     const { chain, symbol, ticker } = assetValue;
     const walletInstance = this.connectedWallets[chain];
-    if (!(await validateAddressType({ address: await walletInstance?.getAddress(), chain })))
+    const isAddressValidated = await validateAddressType({
+      address: await walletInstance?.getAddress(),
+      chain,
+    });
+
+    if (!isAddressValidated) {
       throw new SwapKitError('core_transaction_invalid_sender_address');
+    }
+
     if (!walletInstance) throw new SwapKitError('core_wallet_connection_not_found');
 
     const params = this.#prepareTxParams({ assetValue, recipient, router, ...rest });
 
     try {
       switch (chain) {
-        case Chain.THORChain: {
+        case Chain.THORChain:
+        case Chain.Maya: {
           const wallet = walletInstance as ThorchainWallet;
           return await (recipient === '' ? wallet.deposit(params) : wallet.transfer(params));
         }
@@ -317,13 +322,16 @@ export class SwapKitCore<T = ''> {
       const isInsufficientFunds = errorMessage?.includes('insufficient funds');
       const isGas = errorMessage?.includes('gas');
       const isServer = errorMessage?.includes('server');
-      const errorKey: Keys = isInsufficientFunds
+      const isUserRejected = errorMessage?.includes('user rejected');
+      const errorKey: ErrorKeys = isInsufficientFunds
         ? 'core_transaction_deposit_insufficient_funds_error'
         : isGas
           ? 'core_transaction_deposit_gas_error'
           : isServer
             ? 'core_transaction_deposit_server_error'
-            : 'core_transaction_deposit_error';
+            : isUserRejected
+              ? 'core_transaction_user_rejected'
+              : 'core_transaction_deposit_error';
 
       throw new SwapKitError(errorKey, error);
     }
@@ -659,22 +667,21 @@ export class SwapKitCore<T = ''> {
   };
 
   #getInboundDataByChain = async (chain: Chain) => {
-    if (chain === Chain.THORChain) {
-      return {
-        gas_rate: '0',
-        router: '0',
-        address: '',
-        halted: false,
-        chain: Chain.THORChain,
-      };
-    }
-    const inboundData = await getInboundData(this.stagenet);
-    const chainAddressData = inboundData.find((item) => item.chain === chain);
+    switch (chain) {
+      case Chain.Maya:
+      case Chain.THORChain:
+        return { gas_rate: '0', router: '', address: '', halted: false, chain };
+
+      default: {
+        const inboundData = await getInboundData(this.stagenet);
+        const chainAddressData = inboundData.find((item) => item.chain === chain);
 
-    if (!chainAddressData) throw new SwapKitError('core_inbound_data_not_found');
-    if (chainAddressData?.halted) throw new SwapKitError('core_chain_halted');
+        if (!chainAddressData) throw new SwapKitError('core_inbound_data_not_found');
+        if (chainAddressData?.halted) throw new SwapKitError('core_chain_halted');
 
-    return chainAddressData;
+        return chainAddressData;
+      }
+    }
   };
 
   #addConnectedChain = ({ chain, wallet, walletMethods }: AddChainWalletParams) => {