@swapkit/core 1.0.0-rc.12 → 1.0.0-rc.14

package/package.json

@@ -1,8 +1,8 @@
 {
   "author": "swapkit-oss-team",
   "dependencies": {
-    "@swapkit/types": "1.0.0-rc.5",
-    "@swapkit/helpers": "1.0.0-rc.7"
+    "@swapkit/types": "1.0.0-rc.6",
+    "@swapkit/helpers": "1.0.0-rc.9"
   },
   "description": "SwapKit Lib core",
   "devDependencies": {
@@ -13,18 +13,18 @@
     "vite-plugin-wasm": "3.2.2",
     "vitest": "0.34.4",
     "@internal/config": "0.0.0-internal.0",
-    "@swapkit/api": "1.0.0-rc.5",
-    "@swapkit/tokens": "1.0.0-rc.5",
-    "@swapkit/toolbox-cosmos": "1.0.0-rc.9",
-    "@swapkit/toolbox-evm": "1.0.0-rc.8",
-    "@swapkit/toolbox-utxo": "1.0.0-rc.8"
+    "@swapkit/api": "1.0.0-rc.6",
+    "@swapkit/tokens": "1.0.0-rc.6",
+    "@swapkit/toolbox-cosmos": "1.0.0-rc.11",
+    "@swapkit/toolbox-evm": "1.0.0-rc.10",
+    "@swapkit/toolbox-utxo": "1.0.0-rc.10"
   },
   "peerDependencies": {
-    "@swapkit/api": "1.0.0-rc.5",
-    "@swapkit/tokens": "1.0.0-rc.5",
-    "@swapkit/toolbox-cosmos": "1.0.0-rc.9",
-    "@swapkit/toolbox-evm": "1.0.0-rc.8",
-    "@swapkit/toolbox-utxo": "1.0.0-rc.8"
+    "@swapkit/api": "1.0.0-rc.6",
+    "@swapkit/tokens": "1.0.0-rc.6",
+    "@swapkit/toolbox-cosmos": "1.0.0-rc.11",
+    "@swapkit/toolbox-evm": "1.0.0-rc.10",
+    "@swapkit/toolbox-utxo": "1.0.0-rc.10"
   },
   "eslintConfig": {
     "extends": "../../../internal/eslint-config"
@@ -52,7 +52,7 @@
   "repository": "https://github.com/thorswap/SwapKit.git",
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "1.0.0-rc.12",
+  "version": "1.0.0-rc.14",
   "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

@@ -120,13 +120,20 @@ export class SwapKitCore<T = ''> {
         const { address: recipient } = await this.#getInboundDataByChain(asset.chain);
         const {
           contract: router,
-          calldata: { amountIn, memo, memoStreamingSwap },
+          calldata: { expiration, amountIn, memo, memoStreamingSwap },
         } = route;
 
         const assetValue = asset.add(SwapKitNumber.fromBigInt(BigInt(amountIn), asset.decimal));
         const swapMemo = (streamSwap ? memoStreamingSwap || memo : memo) as string;
 
-        return this.deposit({ assetValue, memo: swapMemo, feeOptionKey, router, recipient });
+        return this.deposit({
+          expiration,
+          assetValue,
+          memo: swapMemo,
+          feeOptionKey,
+          router,
+          recipient,
+        });
       }
 
       if (SWAP_IN.includes(quoteMode)) {
@@ -147,9 +154,7 @@ export class SwapKitCore<T = ''> {
 
         const contract = await walletMethods.createContract?.(contractAddress, abi, provider);
 
-        // TODO: (@Towan) Contract evm methods should be generic
-        // @ts-expect-error
-        const tx = await contract.populateTransaction.swapIn?.(
+        const tx = await contract.getFunction('swapIn').populateTransaction(
           ...getSwapInParams({
             streamSwap,
             toChecksumAddress,
@@ -237,7 +242,7 @@ export class SwapKitCore<T = ''> {
               ? TCBscDepositABI
               : TCEthereumVaultAbi;
 
-          return (await (
+          const response = await (
             walletInstance as EVMWallet<typeof AVAXToolbox | typeof ETHToolbox | typeof BSCToolbox>
           ).call({
             abi,
@@ -248,12 +253,17 @@ export class SwapKitCore<T = ''> {
               recipient,
               getChecksumAddressFromAsset({ chain, symbol, ticker }, chain),
               // TODO: (@Towan) Re-Check on that conversion 🙏
-              assetValue.baseValueBigInt.toString(),
+              assetValue.getBaseValue('bigint').toString(),
               params.memo,
               rest.expiration,
             ],
-            txOverrides: { from: params.from, value: assetValue.baseValueBigInt },
-          })) as Promise<string>;
+            txOverrides: {
+              from: params.from,
+              value: assetValue.isGasAsset ? assetValue.getBaseValue('bigint') : undefined,
+            },
+          });
+
+          return response as string;
         }
 
         default: {

package/src/client/thornode.ts

@@ -1,4 +1,4 @@
-import { getRequest } from '@swapkit/helpers';
+import { RequestClient } from '@swapkit/helpers';
 import type { Chain } from '@swapkit/types';
 import { ApiUrl } from '@swapkit/types';
 
@@ -21,11 +21,11 @@ type InboundAddressData = {
 export const getInboundData = (stagenet: boolean) => {
   const baseUrl = stagenet ? ApiUrl.ThornodeStagenet : ApiUrl.ThornodeMainnet;
 
-  return getRequest<InboundAddressData>(`${baseUrl}/thorchain/inbound_addresses`);
+  return RequestClient.get<InboundAddressData>(`${baseUrl}/thorchain/inbound_addresses`);
 };
 
 export const getMimirData = (stagenet: boolean) => {
   const baseUrl = stagenet ? ApiUrl.ThornodeStagenet : ApiUrl.ThornodeMainnet;
 
-  return getRequest<Record<string, number>>(`${baseUrl}/thorchain/mimir`);
+  return RequestClient.get<Record<string, number>>(`${baseUrl}/thorchain/mimir`);
 };