@swapkit/core 1.0.0-rc.2 → 1.0.0-rc.20

package/package.json

@@ -1,8 +1,8 @@
 {
   "author": "swapkit-oss-team",
   "dependencies": {
-    "@swapkit/helpers": "1.0.0-rc.1",
-    "@swapkit/types": "1.0.0-rc.0"
+    "@swapkit/types": "1.0.0-rc.6",
+    "@swapkit/helpers": "1.0.0-rc.15"
   },
   "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/tokens": "1.0.0-rc.0",
-    "@swapkit/toolbox-cosmos": "1.0.0-rc.2",
-    "@swapkit/toolbox-evm": "1.0.0-rc.2",
-    "@swapkit/toolbox-utxo": "1.0.0-rc.1",
-    "@swapkit/api": "1.0.0-rc.0"
+    "@swapkit/api": "1.0.0-rc.6",
+    "@swapkit/tokens": "1.0.0-rc.7",
+    "@swapkit/toolbox-cosmos": "1.0.0-rc.17",
+    "@swapkit/toolbox-evm": "1.0.0-rc.16",
+    "@swapkit/toolbox-utxo": "1.0.0-rc.16"
   },
   "peerDependencies": {
-    "@swapkit/api": "1.0.0-rc.0",
-    "@swapkit/tokens": "1.0.0-rc.0",
-    "@swapkit/toolbox-cosmos": "1.0.0-rc.2",
-    "@swapkit/toolbox-evm": "1.0.0-rc.2",
-    "@swapkit/toolbox-utxo": "1.0.0-rc.1"
+    "@swapkit/api": "1.0.0-rc.6",
+    "@swapkit/tokens": "1.0.0-rc.7",
+    "@swapkit/toolbox-cosmos": "1.0.0-rc.17",
+    "@swapkit/toolbox-evm": "1.0.0-rc.16",
+    "@swapkit/toolbox-utxo": "1.0.0-rc.16"
   },
   "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.2",
+  "version": "1.0.0-rc.20",
   "scripts": {
     "build": "NODE_OPTIONS=--max_old_space_size=16384 vite build",
     "clean": "rm -rf dist vite.config.ts.* .turbo node_modules",

package/src/client/explorerUrls.ts

@@ -8,6 +8,7 @@ export const getExplorerTxUrl = ({ chain, txHash }: { txHash: string; chain: Cha
     case Chain.Bitcoin:
     case Chain.BitcoinCash:
     case Chain.Maya:
+    case Chain.Kujira:
     case Chain.THORChain:
       return `${baseUrl}/tx/${txHash}`;
 
@@ -46,6 +47,7 @@ export const getExplorerAddressUrl = ({ chain, address }: { address: string; cha
     case Chain.Maya:
     case Chain.Optimism:
     case Chain.Polygon:
+    case Chain.Kujira:
     case Chain.THORChain:
       return `${baseUrl}/address/${address}`;
 

package/src/client/index.ts

@@ -68,9 +68,8 @@ export class SwapKitCore<T = ''> {
   getWallet = <T extends Chain>(chain: Chain) => this.connectedWallets[chain] as WalletMethods[T];
   getExplorerAddressUrl = (chain: Chain, address: string) =>
     getExplorerAddressUrl({ chain, address });
-  getBalance = async (chain: Chain, refresh?: boolean) => {
-    if (!refresh) return this.connectedChains[chain]?.balance || [];
-    const wallet = await this.getWalletByChain(chain);
+  getBalance = async (chain: Chain, potentialScamFilter?: boolean) => {
+    const wallet = await this.getWalletByChain(chain, potentialScamFilter);
 
     return wallet?.balance || [];
   };
@@ -121,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)) {
@@ -148,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,
@@ -170,11 +174,11 @@ export class SwapKitCore<T = ''> {
     }
   };
 
-  getWalletByChain = async (chain: Chain) => {
+  getWalletByChain = async (chain: Chain, potentialScamFilter?: boolean) => {
     const address = this.getAddress(chain);
     if (!address) return null;
 
-    const balance = (await this.getWallet(chain)?.getBalance(address)) ?? [
+    const balance = (await this.getWallet(chain)?.getBalance(address, potentialScamFilter)) ?? [
       AssetValue.fromChainOrSignature(chain),
     ];
 
@@ -238,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,
@@ -249,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: {
@@ -393,7 +402,7 @@ export class SwapKitCore<T = ''> {
     assetValue: AssetValue;
     percent: number;
     from: 'sym' | 'rune' | 'asset';
-    to: 'sym' | 'rune';
+    to: 'sym' | 'rune' | 'asset';
   }) => {
     const targetAsset =
       to === 'rune'
@@ -576,7 +585,7 @@ export class SwapKitCore<T = ''> {
   connectTrezor = async (_chains: Chain, _derivationPath: number[]): Promise<void> => {
     throw new SwapKitError('core_wallet_trezor_not_installed');
   };
-  connectKeplr = async (): Promise<void> => {
+  connectKeplr = async (_chain: Chain): Promise<void> => {
     throw new SwapKitError('core_wallet_keplr_not_installed');
   };
   connectOkx = async (_chains: Chain[]): Promise<void> => {

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`);
 };

package/src/client/types.ts

@@ -4,6 +4,7 @@ import type {
   BinanceToolbox,
   DepositParam,
   GaiaToolbox,
+  KujiraToolbox,
   ThorchainToolboxType,
 } from '@swapkit/toolbox-cosmos';
 import type {
@@ -86,6 +87,7 @@ export type WalletMethods = {
   [Chain.Cosmos]: CosmosBasedWallet<typeof GaiaToolbox> | null;
   [Chain.Dogecoin]: UTXOWallet<typeof DOGEToolbox> | null;
   [Chain.Ethereum]: EVMWallet<typeof ETHToolbox> | null;
+  [Chain.Kujira]: CosmosBasedWallet<typeof KujiraToolbox> | null;
   [Chain.Litecoin]: UTXOWallet<typeof LTCToolbox> | null;
   [Chain.Maya]: ThorchainWallet | null;
   [Chain.Optimism]: EVMWallet<typeof OPToolbox> | null;