@subwallet/extension-base 1.3.18-0 → 1.3.19-0

package/cjs/koni/background/handlers/Extension.js

@@ -1484,25 +1484,29 @@ class KoniExtension {
       return tokensCanPayFee;
     }
     await Promise.all(tokenInfos.map(async tokenInfo => {
-      const tokenSlug = tokenInfo.slug;
-      const reserve = await (0, _utils6.getReserveForPool)(substrateApi.api, nativeTokenInfo, tokenInfo);
-      if (!reserve || !reserve[0] || !reserve[1] || reserve[0] === '0' || reserve[1] === '0') {
-        return;
-      }
-      const rate = new _bignumber.default(reserve[1]).div(reserve[0]).toFixed();
-      const tokenCanPayFee = {
-        slug: tokenSlug,
-        free: tokensHasBalanceInfoMap[tokenSlug].free,
-        rate
-      };
-      if (feeAmount === undefined) {
-        tokensCanPayFee.push(tokenCanPayFee);
-      } else {
-        const amount = (0, _utils6.estimateTokensForPool)(feeAmount, reserve);
-        const liquidityError = (0, _utils6.checkLiquidityForPool)(amount, reserve[0], reserve[1]);
-        if (!liquidityError) {
+      try {
+        const tokenSlug = tokenInfo.slug;
+        const reserve = await (0, _utils6.getReserveForPool)(substrateApi.api, nativeTokenInfo, tokenInfo);
+        if (!reserve || !reserve[0] || !reserve[1] || reserve[0] === '0' || reserve[1] === '0') {
+          return;
+        }
+        const rate = new _bignumber.default(reserve[1]).div(reserve[0]).toFixed();
+        const tokenCanPayFee = {
+          slug: tokenSlug,
+          free: tokensHasBalanceInfoMap[tokenSlug].free,
+          rate
+        };
+        if (feeAmount === undefined) {
           tokensCanPayFee.push(tokenCanPayFee);
+        } else {
+          const amount = (0, _utils6.estimateTokensForPool)(feeAmount, reserve);
+          const liquidityError = (0, _utils6.checkLiquidityForPool)(amount, reserve[0], reserve[1]);
+          if (!liquidityError) {
+            tokensCanPayFee.push(tokenCanPayFee);
+          }
         }
+      } catch (e) {
+        console.error('error when fetching pool with token', tokenInfo.slug, e);
       }
     }));
     return tokensCanPayFee;

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.3.18-0'
+  version: '1.3.19-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/fee-service/service.js

@@ -107,7 +107,9 @@ class FeeService {
             clearInterval(interval);
           } else {
             const api = this.state.getEvmApi(chain);
-            if (api) {
+
+            // TODO: Handle case type === evm and not have api
+            if (type === 'evm' && api) {
               (0, _utils2.calculateGasFeeParams)(api, chain).then(info => {
                 observer.next(info);
               }).catch(e => {

package/cjs/services/swap-service/handler/asset-hub/handler.js

@@ -121,6 +121,7 @@ class AssetHubSwapHandler {
       };
       return [step, fee];
     } catch (e) {
+      console.error('Error creating xcm step', e);
       return undefined;
     }
   }
@@ -135,7 +136,7 @@ class AssetHubSwapHandler {
     return Promise.resolve(undefined);
   }
   generateOptimalProcess(params) {
-    return this.swapBaseHandler.generateOptimalProcess(params, [this.getXcmStep, this.getSubmitStep]);
+    return this.swapBaseHandler.generateOptimalProcess(params, [this.getXcmStep.bind(this), this.getSubmitStep.bind(this)]);
   }
   async getSwapQuote(request) {
     const fromAsset = this.chainService.getAssetBySlug(request.pair.from);

package/cjs/services/swap-service/handler/base-handler.js

@@ -42,7 +42,7 @@ class SwapBaseHandler {
     };
     try {
       for (const genStepFunc of genStepFuncList) {
-        const step = await genStepFunc.bind(this, params)();
+        const step = await genStepFunc(params);
         if (step) {
           result.steps.push({
             id: result.steps.length,

package/cjs/services/swap-service/handler/chainflip-handler.js

@@ -461,7 +461,7 @@ class ChainflipSwapHandler {
     return Promise.resolve(undefined);
   }
   generateOptimalProcess(params) {
-    return this.swapBaseHandler.generateOptimalProcess(params, [this.getSubmitStep]);
+    return this.swapBaseHandler.generateOptimalProcess(params, [this.getSubmitStep.bind(this)]);
   }
 }
 exports.ChainflipSwapHandler = ChainflipSwapHandler;

package/cjs/services/swap-service/handler/hydradx-handler.js

@@ -136,6 +136,7 @@ class HydradxHandler {
       };
       return [step, fee];
     } catch (e) {
+      console.error('Error creating xcm step', e);
       return undefined;
     }
   }
@@ -190,9 +191,9 @@ class HydradxHandler {
     return Promise.resolve(undefined);
   }
   generateOptimalProcess(params) {
-    return this.swapBaseHandler.generateOptimalProcess(params, [this.getXcmStep,
+    return this.swapBaseHandler.generateOptimalProcess(params, [this.getXcmStep.bind(this),
     // this.getFeeOptionStep.bind(this),
-    this.getSubmitStep]);
+    this.getSubmitStep.bind(this)]);
   }
   getSwapPathErrors(swapList) {
     return swapList.reduce((prev, current) => {

package/cjs/services/swap-service/handler/simpleswap-handler.js

@@ -243,7 +243,7 @@ class SimpleSwapHandler {
     }
   }
   generateOptimalProcess(params) {
-    return this.swapBaseHandler.generateOptimalProcess(params, [this.getSubmitStep]);
+    return this.swapBaseHandler.generateOptimalProcess(params, [this.getSubmitStep.bind(this)]);
   }
   async getSubmitStep(params) {
     if (params.selectedQuote) {

package/koni/background/handlers/Extension.js

@@ -1444,25 +1444,29 @@ export default class KoniExtension {
       return tokensCanPayFee;
     }
     await Promise.all(tokenInfos.map(async tokenInfo => {
-      const tokenSlug = tokenInfo.slug;
-      const reserve = await getReserveForPool(substrateApi.api, nativeTokenInfo, tokenInfo);
-      if (!reserve || !reserve[0] || !reserve[1] || reserve[0] === '0' || reserve[1] === '0') {
-        return;
-      }
-      const rate = new BigN(reserve[1]).div(reserve[0]).toFixed();
-      const tokenCanPayFee = {
-        slug: tokenSlug,
-        free: tokensHasBalanceInfoMap[tokenSlug].free,
-        rate
-      };
-      if (feeAmount === undefined) {
-        tokensCanPayFee.push(tokenCanPayFee);
-      } else {
-        const amount = estimateTokensForPool(feeAmount, reserve);
-        const liquidityError = checkLiquidityForPool(amount, reserve[0], reserve[1]);
-        if (!liquidityError) {
+      try {
+        const tokenSlug = tokenInfo.slug;
+        const reserve = await getReserveForPool(substrateApi.api, nativeTokenInfo, tokenInfo);
+        if (!reserve || !reserve[0] || !reserve[1] || reserve[0] === '0' || reserve[1] === '0') {
+          return;
+        }
+        const rate = new BigN(reserve[1]).div(reserve[0]).toFixed();
+        const tokenCanPayFee = {
+          slug: tokenSlug,
+          free: tokensHasBalanceInfoMap[tokenSlug].free,
+          rate
+        };
+        if (feeAmount === undefined) {
           tokensCanPayFee.push(tokenCanPayFee);
+        } else {
+          const amount = estimateTokensForPool(feeAmount, reserve);
+          const liquidityError = checkLiquidityForPool(amount, reserve[0], reserve[1]);
+          if (!liquidityError) {
+            tokensCanPayFee.push(tokenCanPayFee);
+          }
         }
+      } catch (e) {
+        console.error('error when fetching pool with token', tokenInfo.slug, e);
       }
     }));
     return tokensCanPayFee;

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.18-0",
+  "version": "1.3.19-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2564,10 +2564,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.99-beta.14",
-    "@subwallet/extension-base": "^1.3.18-0",
-    "@subwallet/extension-chains": "^1.3.18-0",
-    "@subwallet/extension-dapp": "^1.3.18-0",
-    "@subwallet/extension-inject": "^1.3.18-0",
+    "@subwallet/extension-base": "^1.3.19-0",
+    "@subwallet/extension-chains": "^1.3.19-0",
+    "@subwallet/extension-dapp": "^1.3.19-0",
+    "@subwallet/extension-inject": "^1.3.19-0",
     "@subwallet/keyring": "^0.1.8-beta.0",
     "@subwallet/ui-keyring": "^0.1.8-beta.0",
     "@ton/core": "^0.56.3",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.18-0'
+  version: '1.3.19-0'
 };

package/services/fee-service/service.js

@@ -101,7 +101,9 @@ export default class FeeService {
             clearInterval(interval);
           } else {
             const api = this.state.getEvmApi(chain);
-            if (api) {
+
+            // TODO: Handle case type === evm and not have api
+            if (type === 'evm' && api) {
               calculateGasFeeParams(api, chain).then(info => {
                 observer.next(info);
               }).catch(e => {

package/services/swap-service/handler/asset-hub/handler.js

@@ -114,6 +114,7 @@ export class AssetHubSwapHandler {
       };
       return [step, fee];
     } catch (e) {
+      console.error('Error creating xcm step', e);
       return undefined;
     }
   }
@@ -128,7 +129,7 @@ export class AssetHubSwapHandler {
     return Promise.resolve(undefined);
   }
   generateOptimalProcess(params) {
-    return this.swapBaseHandler.generateOptimalProcess(params, [this.getXcmStep, this.getSubmitStep]);
+    return this.swapBaseHandler.generateOptimalProcess(params, [this.getXcmStep.bind(this), this.getSubmitStep.bind(this)]);
   }
   async getSwapQuote(request) {
     const fromAsset = this.chainService.getAssetBySlug(request.pair.from);

package/services/swap-service/handler/base-handler.js

@@ -34,7 +34,7 @@ export class SwapBaseHandler {
     };
     try {
       for (const genStepFunc of genStepFuncList) {
-        const step = await genStepFunc.bind(this, params)();
+        const step = await genStepFunc(params);
         if (step) {
           result.steps.push({
             id: result.steps.length,

package/services/swap-service/handler/chainflip-handler.js

@@ -453,6 +453,6 @@ export class ChainflipSwapHandler {
     return Promise.resolve(undefined);
   }
   generateOptimalProcess(params) {
-    return this.swapBaseHandler.generateOptimalProcess(params, [this.getSubmitStep]);
+    return this.swapBaseHandler.generateOptimalProcess(params, [this.getSubmitStep.bind(this)]);
   }
 }

package/services/swap-service/handler/hydradx-handler.js

@@ -128,6 +128,7 @@ export class HydradxHandler {
       };
       return [step, fee];
     } catch (e) {
+      console.error('Error creating xcm step', e);
       return undefined;
     }
   }
@@ -182,9 +183,9 @@ export class HydradxHandler {
     return Promise.resolve(undefined);
   }
   generateOptimalProcess(params) {
-    return this.swapBaseHandler.generateOptimalProcess(params, [this.getXcmStep,
+    return this.swapBaseHandler.generateOptimalProcess(params, [this.getXcmStep.bind(this),
     // this.getFeeOptionStep.bind(this),
-    this.getSubmitStep]);
+    this.getSubmitStep.bind(this)]);
   }
   getSwapPathErrors(swapList) {
     return swapList.reduce((prev, current) => {

package/services/swap-service/handler/simpleswap-handler.js

@@ -234,7 +234,7 @@ export class SimpleSwapHandler {
     }
   }
   generateOptimalProcess(params) {
-    return this.swapBaseHandler.generateOptimalProcess(params, [this.getSubmitStep]);
+    return this.swapBaseHandler.generateOptimalProcess(params, [this.getSubmitStep.bind(this)]);
   }
   async getSubmitStep(params) {
     if (params.selectedQuote) {