@swapkit/core 1.0.0-rc.76 → 1.0.0-rc.78

package/package.json

@@ -10,17 +10,17 @@
     "vite": "5.0.7",
     "vitest": "1.0.4",
     "@internal/config": "null-rc.0",
-    "@swapkit/api": "1.0.0-rc.31",
+    "@swapkit/api": "1.0.0-rc.32",
     "@swapkit/tokens": "1.0.0-rc.32",
-    "@swapkit/toolbox-cosmos": "1.0.0-rc.64",
-    "@swapkit/toolbox-evm": "1.0.0-rc.63",
+    "@swapkit/toolbox-cosmos": "1.0.0-rc.65",
+    "@swapkit/toolbox-evm": "1.0.0-rc.64",
     "@swapkit/toolbox-utxo": "1.0.0-rc.62"
   },
   "peerDependencies": {
-    "@swapkit/api": "1.0.0-rc.31",
+    "@swapkit/api": "1.0.0-rc.32",
     "@swapkit/tokens": "1.0.0-rc.32",
-    "@swapkit/toolbox-cosmos": "1.0.0-rc.64",
-    "@swapkit/toolbox-evm": "1.0.0-rc.63",
+    "@swapkit/toolbox-cosmos": "1.0.0-rc.65",
+    "@swapkit/toolbox-evm": "1.0.0-rc.64",
     "@swapkit/toolbox-utxo": "1.0.0-rc.62"
   },
   "eslintConfig": {
@@ -49,7 +49,7 @@
   "repository": "https://github.com/thorswap/SwapKit.git",
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "1.0.0-rc.76",
+  "version": "1.0.0-rc.78",
   "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

@@ -87,17 +87,44 @@ export class SwapKitCore<T = ''> {
   };
 
   swap = async ({ streamSwap, recipient, route, feeOptionKey }: SwapParams) => {
-    const { quoteMode } = route.meta;
+    const {
+      meta: { quoteMode },
+      evmTransactionDetails: contractCallParams,
+    } = route;
     const evmChain = quoteMode.startsWith('ERC20-')
       ? Chain.Ethereum
       : quoteMode.startsWith('ARC20-')
         ? Chain.Avalanche
-        : Chain.BinanceSmartChain;
+        : quoteMode.startsWith('BEP20-')
+          ? Chain.BinanceSmartChain
+          : undefined;
 
     if (!route.complete) throw new SwapKitError('core_swap_route_not_complete');
 
     try {
-      if (AGG_SWAP.includes(quoteMode)) {
+      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');
@@ -143,7 +170,7 @@ export class SwapKitCore<T = ''> {
         });
       }
 
-      if (SWAP_IN.includes(quoteMode)) {
+      if (SWAP_IN.includes(quoteMode) && evmChain) {
         const { calldata, contract: contractAddress } = route;
         if (!contractAddress) throw new SwapKitError('core_swap_contract_not_found');
 
@@ -439,7 +466,7 @@ export class SwapKitCore<T = ''> {
     to: 'sym' | 'rune' | 'asset';
   }) => {
     const targetAsset =
-      to === 'rune'
+      to === 'rune' && from !== 'rune'
         ? AssetValue.fromChainOrSignature(Chain.THORChain)
         : (from === 'sym' && to === 'sym') || from === 'rune' || from === 'asset'
           ? undefined