@subwallet/extension-base 1.2.32-0 → 1.2.33-0

package/cjs/services/request-service/index.js

@@ -1,9 +1,11 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _TonRequestHandler = _interopRequireDefault(require("./handler/TonRequestHandler"));
 var _handler = require("./handler");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -16,6 +18,7 @@ class RequestService {
   #authRequestHandler;
   #substrateRequestHandler;
   #evmRequestHandler;
+  #tonRequestHandler;
   #connectWCRequestHandler;
   #notSupportWCRequestHandler;
 
@@ -29,6 +32,7 @@ class RequestService {
     this.#authRequestHandler = new _handler.AuthRequestHandler(this, this.#chainService, this.keyringService);
     this.#substrateRequestHandler = new _handler.SubstrateRequestHandler(this);
     this.#evmRequestHandler = new _handler.EvmRequestHandler(this);
+    this.#tonRequestHandler = new _TonRequestHandler.default(this);
     this.#connectWCRequestHandler = new _handler.ConnectWCRequestHandler(this);
     this.#notSupportWCRequestHandler = new _handler.NotSupportWCRequestHandler(this);
 
@@ -36,14 +40,14 @@ class RequestService {
     this.updateIconV2();
   }
   get numAllRequests() {
-    return this.allSubstrateRequests.length + this.numEvmRequests;
+    return this.allSubstrateRequests.length + this.numEvmRequests + this.numTonRequests;
   }
   updateIconV2(shouldClose) {
     this.#popupHandler.updateIconV2(shouldClose);
   }
   getAddressList() {
     let value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    const addressList = Object.keys(this.keyringService.accounts);
+    const addressList = Object.keys(this.keyringService.context.pairs);
     return addressList.reduce((addressList, v) => ({
       ...addressList,
       [v]: value
@@ -132,8 +136,8 @@ class RequestService {
   get allSubstrateRequests() {
     return this.#substrateRequestHandler.allSubstrateRequests;
   }
-  sign(url, request, account, id) {
-    return this.#substrateRequestHandler.sign(url, request, account, id);
+  sign(url, request, id) {
+    return this.#substrateRequestHandler.sign(url, request, id);
   }
   get numSubstrateRequests() {
     return this.#substrateRequestHandler.numSubstrateRequests;
@@ -143,9 +147,15 @@ class RequestService {
   get numEvmRequests() {
     return this.#evmRequestHandler.numEvmRequests;
   }
+  get numTonRequests() {
+    return this.#tonRequestHandler.numTonRequests;
+  }
   get confirmationsQueueSubject() {
     return this.#evmRequestHandler.getConfirmationsQueueSubject();
   }
+  get confirmationsQueueSubjectTon() {
+    return this.#tonRequestHandler.getConfirmationsQueueSubjectTon();
+  }
   getSignRequest(id) {
     return this.#substrateRequestHandler.getSignRequest(id);
   }
@@ -157,9 +167,17 @@ class RequestService {
     let validator = arguments.length > 5 ? arguments[5] : undefined;
     return this.#evmRequestHandler.addConfirmation(id, url, type, payload, options, validator);
   }
+  addConfirmationTon(id, url, type, payload) {
+    let options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+    let validator = arguments.length > 5 ? arguments[5] : undefined;
+    return this.#tonRequestHandler.addConfirmationTon(id, url, type, payload, options, validator);
+  }
   async completeConfirmation(request) {
     return await this.#evmRequestHandler.completeConfirmation(request);
   }
+  async completeConfirmationTon(request) {
+    return await this.#tonRequestHandler.completeConfirmationTon(request);
+  }
   updateConfirmation(id, type, payload) {
     let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
     let validator = arguments.length > 4 ? arguments[4] : undefined;
@@ -202,12 +220,13 @@ class RequestService {
 
   // General methods
   get numRequests() {
-    return this.numMetaRequests + this.numAuthRequests + this.numSubstrateRequests + this.numEvmRequests + this.numConnectWCRequests + this.numNotSupportWCRequests;
+    return this.numMetaRequests + this.numAuthRequests + this.numSubstrateRequests + this.numEvmRequests + this.numConnectWCRequests + this.numNotSupportWCRequests + this.numTonRequests;
   }
   resetWallet() {
     this.#authRequestHandler.resetWallet();
     this.#substrateRequestHandler.resetWallet();
     this.#evmRequestHandler.resetWallet();
+    this.#tonRequestHandler.resetWallet();
     this.#metadataRequestHandler.resetWallet();
     this.#connectWCRequestHandler.resetWallet();
     this.#notSupportWCRequestHandler.resetWallet();

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

@@ -12,6 +12,7 @@ var _swap = require("@subwallet/extension-base/core/logic-validation/swap");
 var _xcm = require("@subwallet/extension-base/services/balance-service/transfer/xcm");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
+var _types = require("@subwallet/extension-base/types");
 var _serviceBase = require("@subwallet/extension-base/types/service-base");
 var _swap2 = require("@subwallet/extension-base/types/swap");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -261,7 +262,7 @@ class AssetHubSwapHandler {
       case _swap2.SwapStepType.SWAP:
         return this.handleSubmitStep(params);
       default:
-        return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.UNSUPPORTED));
+        return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.UNSUPPORTED));
     }
   }
   async validateSwapStep(params, isXcmOk, stepIndex) {
@@ -269,7 +270,7 @@ class AssetHubSwapHandler {
     // check balance to pay transaction fee
     // check balance against spending amount
     if (!params.selectedQuote) {
-      return Promise.resolve([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]);
+      return Promise.resolve([new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR)]);
     }
     const selectedQuote = params.selectedQuote;
     const currentTimestamp = +Date.now();
@@ -279,7 +280,7 @@ class AssetHubSwapHandler {
     const stepFee = params.process.totalFee[stepIndex].feeComponent;
     const networkFee = stepFee.find(fee => fee.feeType === _swap2.SwapFeeType.NETWORK_FEE);
     if (!networkFee) {
-      return Promise.resolve([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]);
+      return Promise.resolve([new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR)]);
     }
     const fromAsset = this.chainService.getAssetBySlug(params.selectedQuote.pair.from);
     const feeTokenInfo = this.chainService.getAssetBySlug(networkFee.tokenSlug);
@@ -308,7 +309,7 @@ class AssetHubSwapHandler {
     const amount = params.selectedQuote.fromAmount;
     const bnAmount = new _bignumber.default(amount);
     if (bnAmount.lte(0)) {
-      return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS, 'Amount must be greater than 0')];
+      return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, 'Amount must be greater than 0')];
     }
     let isXcmOk = false;
     for (const [index, step] of params.process.steps.entries()) {
@@ -321,7 +322,7 @@ class AssetHubSwapHandler {
           case _swap2.SwapStepType.SWAP:
             return this.validateSwapStep(params, isXcmOk, index);
           default:
-            return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.UNSUPPORTED));
+            return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.UNSUPPORTED));
         }
       };
       const errors = await getErrors();

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

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SwapBaseHandler = void 0;
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
-var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _swap = require("@subwallet/extension-base/core/logic-validation/swap");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
+var _types = require("@subwallet/extension-base/types");
 var _serviceBase = require("@subwallet/extension-base/types/service-base");
 var _swap2 = require("@subwallet/extension-base/types/swap");
 var _utils3 = require("@subwallet/extension-base/utils");
@@ -59,7 +59,7 @@ class SwapBaseHandler {
     const swapPair = params.selectedQuote.pair;
     const alternativeAssetSlug = (0, _utils2.getSwapAlternativeAsset)(swapPair);
     if (!alternativeAssetSlug) {
-      return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)];
+      return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR)];
     }
     const alternativeAsset = this.chainService.getAssetBySlug(alternativeAssetSlug);
     const fromAsset = this.chainService.getAssetBySlug(swapPair.from);
@@ -87,9 +87,9 @@ class SwapBaseHandler {
       const bnMaxXCM = new _bignumber.default(alternativeAssetBalance.value).minus((0, _utils._isNativeToken)(alternativeAsset) ? editedXcmFee : xcmFee);
       const maxXCMValue = (0, _utils3.formatNumber)(bnMaxXCM.toString(), fromAsset.decimals || 0);
       if (maxBn.lte(0) || bnFromAssetBalance.lte(0) || bnMaxXCM.lte(0)) {
-        return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_BALANCE, (0, _i18next.t)(`Insufficient balance. Deposit ${fromAsset.symbol} and try again.`))];
+        return [new _TransactionError.TransactionError(_types.BasicTxErrorType.NOT_ENOUGH_BALANCE, (0, _i18next.t)(`Insufficient balance. Deposit ${fromAsset.symbol} and try again.`))];
       }
-      return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_BALANCE, (0, _i18next.t)('You can only enter a maximum of {{maxValue}} {{symbol}}, which is {{currentValue}} {{symbol}} ({{inputNetworkName}}) and {{maxXCMValue}} {{symbol}} ({{altNetworkName}}). Lower your amount and try again.', {
+      return [new _TransactionError.TransactionError(_types.BasicTxErrorType.NOT_ENOUGH_BALANCE, (0, _i18next.t)('You can only enter a maximum of {{maxValue}} {{symbol}}, which is {{currentValue}} {{symbol}} ({{inputNetworkName}}) and {{maxXCMValue}} {{symbol}} ({{altNetworkName}}). Lower your amount and try again.', {
         replace: {
           symbol,
           maxValue,
@@ -107,7 +107,7 @@ class SwapBaseHandler {
   }
   async validateSetFeeTokenStep(params, stepIndex) {
     if (!params.selectedQuote) {
-      return Promise.resolve([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]);
+      return Promise.resolve([new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR)]);
     }
     const feeInfo = params.process.totalFee[stepIndex];
     const feeAmount = feeInfo.feeComponent[0];
@@ -116,7 +116,7 @@ class SwapBaseHandler {
     const bnFeeTokenBalance = new _bignumber.default(feeTokenBalance.value);
     const bnFeeAmount = new _bignumber.default(feeAmount.amount);
     if (bnFeeAmount.gte(bnFeeTokenBalance)) {
-      return Promise.resolve([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_BALANCE)]);
+      return Promise.resolve([new _TransactionError.TransactionError(_types.BasicTxErrorType.NOT_ENOUGH_BALANCE)]);
     }
     return [];
   }
@@ -125,7 +125,7 @@ class SwapBaseHandler {
     // check balance to pay transaction fee
     // check balance against spending amount
     if (!params.selectedQuote) {
-      return Promise.resolve([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]);
+      return Promise.resolve([new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR)]);
     }
     const selectedQuote = params.selectedQuote;
     const currentTimestamp = +Date.now();
@@ -135,7 +135,7 @@ class SwapBaseHandler {
     const stepFee = params.process.totalFee[stepIndex].feeComponent;
     const networkFee = stepFee.find(fee => fee.feeType === _swap2.SwapFeeType.NETWORK_FEE);
     if (!networkFee) {
-      return Promise.resolve([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]);
+      return Promise.resolve([new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR)]);
     }
     const fromAsset = this.chainService.getAssetBySlug(params.selectedQuote.pair.from);
     const feeTokenInfo = this.chainService.getAssetBySlug(networkFee.tokenSlug);

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

@@ -16,6 +16,7 @@ var _token = require("@subwallet/extension-base/services/balance-service/transfe
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _baseHandler = require("@subwallet/extension-base/services/swap-service/handler/base-handler");
 var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
+var _types = require("@subwallet/extension-base/types");
 var _serviceBase = require("@subwallet/extension-base/types/service-base");
 var _swap3 = require("@subwallet/extension-base/types/swap");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -315,7 +316,7 @@ class ChainflipSwapHandler {
     const amount = params.selectedQuote.fromAmount;
     const bnAmount = new _bignumber.default(amount);
     if (bnAmount.lte(0)) {
-      return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS, 'Amount must be greater than 0')];
+      return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, 'Amount must be greater than 0')];
     }
     let isXcmOk = false;
     for (const [index, step] of params.process.steps.entries()) {
@@ -324,7 +325,7 @@ class ChainflipSwapHandler {
           case _serviceBase.CommonStepType.DEFAULT:
             return Promise.resolve([]);
           case _serviceBase.CommonStepType.TOKEN_APPROVAL:
-            return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.UNSUPPORTED));
+            return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.UNSUPPORTED));
           default:
             return this.swapBaseHandler.validateSwapStep(params, isXcmOk, index);
         }
@@ -348,7 +349,7 @@ class ChainflipSwapHandler {
     const fromAsset = this.chainService.getAssetBySlug(pair.from);
     const toAsset = this.chainService.getAssetBySlug(pair.to);
     const chainInfo = this.chainService.getChainInfoByKey(fromAsset.originChain);
-    const chainType = (0, _utils._isSubstrateChain)(chainInfo) ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM;
+    const chainType = (0, _utils._isChainSubstrateCompatible)(chainInfo) ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM;
     const receiver = recipient !== null && recipient !== void 0 ? recipient : address;
     const srcChainId = this.chainMapping[fromAsset.originChain];
     const destChainId = this.chainMapping[toAsset.originChain];
@@ -414,7 +415,7 @@ class ChainflipSwapHandler {
     const type = process.steps[currentStep].type;
     switch (type) {
       case _serviceBase.CommonStepType.DEFAULT:
-        return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.UNSUPPORTED));
+        return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.UNSUPPORTED));
       case _swap3.SwapStepType.SWAP:
         return this.handleSubmitStep(params);
       default:

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

@@ -16,6 +16,7 @@ var _xcm = require("@subwallet/extension-base/services/balance-service/transfer/
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _baseHandler = require("@subwallet/extension-base/services/swap-service/handler/base-handler");
 var _utils2 = require("@subwallet/extension-base/services/swap-service/utils");
+var _types2 = require("@subwallet/extension-base/types");
 var _serviceBase = require("@subwallet/extension-base/types/service-base");
 var _swap2 = require("@subwallet/extension-base/types/swap");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
@@ -348,7 +349,7 @@ class HydradxHandler {
     const chainApi = await substrateApi.isReady;
     const swapStepIndex = params.process.steps.findIndex(step => step.type === _swap2.SwapStepType.SWAP);
     if (swapStepIndex <= -1) {
-      return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR));
+      return Promise.reject(new _TransactionError.TransactionError(_types2.BasicTxErrorType.INTERNAL_ERROR));
     }
     const swapFeeInfo = params.process.totalFee[swapStepIndex];
     const selectedFeeTokenSlug = (_swapFeeInfo$selected = swapFeeInfo.selectedFeeToken) !== null && _swapFeeInfo$selected !== void 0 ? _swapFeeInfo$selected : swapFeeInfo.defaultFeeToken;
@@ -418,7 +419,7 @@ class HydradxHandler {
     const type = process.steps[currentStep].type;
     switch (type) {
       case _serviceBase.CommonStepType.DEFAULT:
-        return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.UNSUPPORTED));
+        return Promise.reject(new _TransactionError.TransactionError(_types2.BasicTxErrorType.UNSUPPORTED));
       case _serviceBase.CommonStepType.XCM:
         return this.handleXcmStep(params);
       case _serviceBase.CommonStepType.SET_FEE_TOKEN:
@@ -433,7 +434,7 @@ class HydradxHandler {
     const amount = params.selectedQuote.fromAmount;
     const bnAmount = new _bignumber.default(amount);
     if (bnAmount.lte(0)) {
-      return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS, 'Amount must be greater than 0')];
+      return [new _TransactionError.TransactionError(_types2.BasicTxErrorType.INVALID_PARAMS, 'Amount must be greater than 0')];
     }
     let isXcmOk = false;
     for (const [index, step] of params.process.steps.entries()) {

package/cjs/services/swap-service/index.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.SwapService = void 0;
 var _SwapError = require("@subwallet/extension-base/background/errors/SwapError");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
-var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _types = require("@subwallet/extension-base/services/base/types");
 var _assetHub = require("@subwallet/extension-base/services/swap-service/handler/asset-hub");
 var _chainflipHandler = require("@subwallet/extension-base/services/swap-service/handler/chainflip-handler");
 var _hydradxHandler = require("@subwallet/extension-base/services/swap-service/handler/hydradx-handler");
 var _utils = require("@subwallet/extension-base/services/swap-service/utils");
+var _types2 = require("@subwallet/extension-base/types");
 var _serviceBase = require("@subwallet/extension-base/types/service-base");
 var _swap = require("@subwallet/extension-base/types/swap");
 var _utils2 = require("@subwallet/extension-base/utils");
@@ -230,19 +230,19 @@ class SwapService {
     if (handler) {
       return handler.validateSwapProcess(params);
     } else {
-      return [new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)];
+      return [new _TransactionError.TransactionError(_types2.BasicTxErrorType.INTERNAL_ERROR)];
     }
   }
   async handleSwapProcess(params) {
     const handler = this.handlers[params.quote.provider.id];
     if (params.process.steps.length === 1) {
       // todo: do better to handle error generating steps
-      return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR, 'Please check your network and try again'));
+      return Promise.reject(new _TransactionError.TransactionError(_types2.BasicTxErrorType.INTERNAL_ERROR, 'Please check your network and try again'));
     }
     if (handler) {
       return handler.handleSwapProcess(params);
     } else {
-      return Promise.reject(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR));
+      return Promise.reject(new _TransactionError.TransactionError(_types2.BasicTxErrorType.INTERNAL_ERROR));
     }
   }
   subscribeSwapPairs(callback) {

package/cjs/services/transaction-service/helpers/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isSubstrateTransaction = exports.getValidationId = exports.getTransactionId = exports.getBaseTransactionInfo = void 0;
+exports.isTonTransaction = exports.isSubstrateTransaction = exports.getValidationId = exports.getTransactionId = exports.getBaseTransactionInfo = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -23,6 +23,11 @@ const isSubstrateTransaction = tx => {
   return !!tx.send;
 };
 exports.isSubstrateTransaction = isSubstrateTransaction;
+const isTonTransaction = tx => {
+  const tonTransactionConfig = tx;
+  return Boolean(tonTransactionConfig.messagePayload) && tonTransactionConfig.seqno >= 0;
+};
+exports.isTonTransaction = isTonTransaction;
 const typeName = type => {
   switch (type) {
     case _KoniTypes.ExtrinsicType.TRANSFER_BALANCE: