@swapkit/core 1.0.0-rc.21 → 1.0.0-rc.23

package/package.json

@@ -2,7 +2,7 @@
   "author": "swapkit-oss-team",
   "dependencies": {
     "@swapkit/types": "1.0.0-rc.7",
-    "@swapkit/helpers": "1.0.0-rc.16"
+    "@swapkit/helpers": "1.0.0-rc.17"
   },
   "description": "SwapKit Lib core",
   "devDependencies": {
@@ -15,16 +15,16 @@
     "@internal/config": "0.0.0-internal.0",
     "@swapkit/api": "1.0.0-rc.7",
     "@swapkit/tokens": "1.0.0-rc.7",
-    "@swapkit/toolbox-cosmos": "1.0.0-rc.18",
-    "@swapkit/toolbox-evm": "1.0.0-rc.17",
-    "@swapkit/toolbox-utxo": "1.0.0-rc.17"
+    "@swapkit/toolbox-cosmos": "1.0.0-rc.19",
+    "@swapkit/toolbox-evm": "1.0.0-rc.19",
+    "@swapkit/toolbox-utxo": "1.0.0-rc.18"
   },
   "peerDependencies": {
     "@swapkit/api": "1.0.0-rc.7",
     "@swapkit/tokens": "1.0.0-rc.7",
-    "@swapkit/toolbox-cosmos": "1.0.0-rc.18",
-    "@swapkit/toolbox-evm": "1.0.0-rc.17",
-    "@swapkit/toolbox-utxo": "1.0.0-rc.17"
+    "@swapkit/toolbox-cosmos": "1.0.0-rc.19",
+    "@swapkit/toolbox-evm": "1.0.0-rc.19",
+    "@swapkit/toolbox-utxo": "1.0.0-rc.18"
   },
   "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.21",
+  "version": "1.0.0-rc.23",
   "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

@@ -105,7 +105,7 @@ export class SwapKitCore<T = ''> {
           value: value
             ? new SwapKitNumber({
                 value: !isHexString(value) ? parseUnits(value, 'wei').toString(16) : value,
-              }).baseValueBigInt
+              }).getBaseValue('bigint')
             : 0n,
         };
 
@@ -177,18 +177,24 @@ export class SwapKitCore<T = ''> {
   getWalletByChain = async (chain: Chain, potentialScamFilter?: boolean) => {
     const address = this.getAddress(chain);
     if (!address) return null;
+    const defaultBalance = [AssetValue.fromChainOrSignature(chain)];
+    const walletType = this.connectedChains[chain]?.walletType as WalletOption;
 
-    const balance = (await this.getWallet(chain)?.getBalance(address, potentialScamFilter)) ?? [
-      AssetValue.fromChainOrSignature(chain),
-    ];
+    try {
+      const balance = await this.getWallet(chain)?.getBalance(address, potentialScamFilter);
 
-    this.connectedChains[chain] = {
-      address,
-      balance,
-      walletType: this.connectedChains[chain]?.walletType as WalletOption,
-    };
+      this.connectedChains[chain] = {
+        address,
+        balance: balance?.length ? balance : defaultBalance,
+        walletType,
+      };
 
-    return { ...this.connectedChains[chain] };
+      return { ...this.connectedChains[chain] };
+    } catch (error) {
+      console.error(error);
+
+      return { address, balance: defaultBalance, walletType };
+    }
   };
 
   approveAssetValue = (assetValue: AssetValue, contractAddress?: string) =>
@@ -489,7 +495,7 @@ export class SwapKitCore<T = ''> {
       type === 'bond' ? MemoType.BOND : type === 'unbond' ? MemoType.UNBOND : MemoType.LEAVE;
     const memo = getMemoFor(memoType, {
       address,
-      unbondAmount: type === 'unbond' ? assetValue.baseValueNumber : undefined,
+      unbondAmount: type === 'unbond' ? assetValue.getBaseValue('number') : undefined,
     });
 
     return this.#thorchainTransfer({
@@ -621,7 +627,7 @@ export class SwapKitCore<T = ''> {
   };
 
   #approve = async <T = string>({
-    assetValue: { baseValueBigInt, address, chain, isGasAsset, isSynthetic },
+    assetValue: { getBaseValue, address, chain, isGasAsset, isSynthetic },
     type = 'checkOnly',
     contractAddress,
   }: {
@@ -647,7 +653,7 @@ export class SwapKitCore<T = ''> {
       contractAddress || ((await this.#getInboundDataByChain(chain)).router as string);
 
     return walletAction({
-      amount: baseValueBigInt,
+      amount: getBaseValue('bigint'),
       assetAddress: address,
       from,
       spenderAddress,