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

package/services/request-service/index.js

@@ -1,6 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import TonRequestHandler from "./handler/TonRequestHandler.js";
 import { AuthRequestHandler, ConnectWCRequestHandler, EvmRequestHandler, MetadataRequestHandler, NotSupportWCRequestHandler, PopupHandler, SubstrateRequestHandler } from "./handler/index.js";
 export default class RequestService {
   // Common
@@ -10,6 +11,7 @@ export default class RequestService {
   #authRequestHandler;
   #substrateRequestHandler;
   #evmRequestHandler;
+  #tonRequestHandler;
   #connectWCRequestHandler;
   #notSupportWCRequestHandler;
 
@@ -23,6 +25,7 @@ export default class RequestService {
     this.#authRequestHandler = new AuthRequestHandler(this, this.#chainService, this.keyringService);
     this.#substrateRequestHandler = new SubstrateRequestHandler(this);
     this.#evmRequestHandler = new EvmRequestHandler(this);
+    this.#tonRequestHandler = new TonRequestHandler(this);
     this.#connectWCRequestHandler = new ConnectWCRequestHandler(this);
     this.#notSupportWCRequestHandler = new NotSupportWCRequestHandler(this);
 
@@ -30,13 +33,13 @@ export default 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(value = false) {
-    const addressList = Object.keys(this.keyringService.accounts);
+    const addressList = Object.keys(this.keyringService.context.pairs);
     return addressList.reduce((addressList, v) => ({
       ...addressList,
       [v]: value
@@ -125,8 +128,8 @@ export default 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;
@@ -136,9 +139,15 @@ export default 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);
   }
@@ -148,9 +157,17 @@ export default class RequestService {
   addConfirmation(id, url, type, payload, options = {}, validator) {
     return this.#evmRequestHandler.addConfirmation(id, url, type, payload, options, validator);
   }
+  addConfirmationTon(id, url, type, payload,
+  // todo: messages <-> payload
+  options = {}, validator) {
+    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, options = {}, validator) {
     return this.#evmRequestHandler.updateConfirmation(id, type, payload, options, validator);
   }
@@ -191,12 +208,13 @@ export default 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/services/request-service/types.d.ts

@@ -1,7 +1,7 @@
-import { AccountAuthType, AccountJson, RequestSign, Resolver, ResponseSigning } from '@subwallet/extension-base/background/types';
+import { AccountAuthType, RequestSign, Resolver, ResponseSigning } from '@subwallet/extension-base/background/types';
 import { MetadataDef } from '@subwallet/extension-inject/types';
 export interface SignRequest extends Resolver<ResponseSigning> {
-    account: AccountJson;
+    address: string;
     id: string;
     request: RequestSign;
     url: string;
@@ -17,8 +17,11 @@ export interface AuthUrlInfo {
     isAllowed: boolean;
     origin: string;
     url: string;
-    accountAuthType?: AccountAuthType;
+    accountAuthTypes: AccountAuthType[];
     isAllowedMap: Record<string, boolean>;
     currentEvmNetworkKey?: string;
 }
+export interface AuthUrlInfoNeedMigration extends Omit<AuthUrlInfo, 'accountAuthTypes'> {
+    accountAuthType?: AccountAuthType | 'both';
+}
 export declare type AuthUrls = Record<string, AuthUrlInfo>;

package/services/swap-service/handler/asset-hub/handler.d.ts

@@ -14,7 +14,7 @@ export declare class AssetHubSwapHandler implements SwapBaseInterface {
     constructor(chainService: ChainService, balanceService: BalanceService, chain: string);
     get chainService(): ChainService;
     get balanceService(): BalanceService;
-    get providerInfo(): import("@subwallet/extension-base/types/swap").SwapProvider;
+    get providerInfo(): import("@subwallet/extension-base/types").SwapProvider;
     get name(): string;
     get slug(): string;
     init(): Promise<void>;

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

@@ -3,11 +3,12 @@
 
 import { SwapError } from '@subwallet/extension-base/background/errors/SwapError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { BasicTxErrorType, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { _getEarlyAssetHubValidationError, _validateBalanceToSwapOnAssetHub, _validateSwapRecipient } from '@subwallet/extension-base/core/logic-validation/swap';
 import { createXcmExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
 import { _getChainNativeTokenSlug, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { convertSwapRate, getSwapAlternativeAsset, SWAP_QUOTE_TIMEOUT_MAP } from '@subwallet/extension-base/services/swap-service/utils';
+import { BasicTxErrorType } from '@subwallet/extension-base/types';
 import { CommonStepType } from '@subwallet/extension-base/types/service-base';
 import { SwapErrorType, SwapFeeType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types/swap';
 import BigN from 'bignumber.js';

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

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { BasicTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
 import { _validateBalanceToSwap, _validateSwapRecipient } from '@subwallet/extension-base/core/logic-validation/swap';
 import { _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { getSwapAlternativeAsset } from '@subwallet/extension-base/services/swap-service/utils';
+import { BasicTxErrorType } from '@subwallet/extension-base/types';
 import { DEFAULT_FIRST_STEP, MOCK_STEP_FEE } from '@subwallet/extension-base/types/service-base';
 import { SwapErrorType, SwapFeeType } from '@subwallet/extension-base/types/swap';
 import { formatNumber } from '@subwallet/extension-base/utils';

package/services/swap-service/handler/chainflip-handler.d.ts

@@ -16,7 +16,7 @@ export declare class ChainflipSwapHandler implements SwapBaseInterface {
     constructor(chainService: ChainService, balanceService: BalanceService, isTestnet?: boolean);
     get chainService(): ChainService;
     get balanceService(): BalanceService;
-    get providerInfo(): import("@subwallet/extension-base/types/swap").SwapProvider;
+    get providerInfo(): import("@subwallet/extension-base/types").SwapProvider;
     get name(): string;
     get slug(): string;
     get assetMapping(): Record<string, Asset>;

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

@@ -5,13 +5,14 @@ import { SwapSDK } from '@chainflip/sdk/swap';
 import { COMMON_ASSETS } from '@subwallet/chain-list';
 import { SwapError } from '@subwallet/extension-base/background/errors/SwapError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { BasicTxErrorType, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { _getChainflipEarlyValidationError } from '@subwallet/extension-base/core/logic-validation/swap';
 import { getERC20TransactionObject, getEVMTransactionObject } from '@subwallet/extension-base/services/balance-service/transfer/smart-contract';
 import { createTransferExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/token';
-import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenSlug, _getContractAddressOfToken, _isNativeToken, _isSmartContractToken, _isSubstrateChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenSlug, _getContractAddressOfToken, _isChainSubstrateCompatible, _isNativeToken, _isSmartContractToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { SwapBaseHandler } from '@subwallet/extension-base/services/swap-service/handler/base-handler';
 import { calculateSwapRate, CHAIN_FLIP_SUPPORTED_MAINNET_ASSET_MAPPING, CHAIN_FLIP_SUPPORTED_MAINNET_MAPPING, CHAIN_FLIP_SUPPORTED_TESTNET_ASSET_MAPPING, CHAIN_FLIP_SUPPORTED_TESTNET_MAPPING, getChainflipOptions, SWAP_QUOTE_TIMEOUT_MAP } from '@subwallet/extension-base/services/swap-service/utils';
+import { BasicTxErrorType } from '@subwallet/extension-base/types';
 import { CommonStepType } from '@subwallet/extension-base/types/service-base';
 import { SwapErrorType, SwapFeeType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types/swap';
 import BigNumber from 'bignumber.js';
@@ -340,7 +341,7 @@ export 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 = _isSubstrateChain(chainInfo) ? ChainType.SUBSTRATE : ChainType.EVM;
+    const chainType = _isChainSubstrateCompatible(chainInfo) ? ChainType.SUBSTRATE : ChainType.EVM;
     const receiver = recipient !== null && recipient !== void 0 ? recipient : address;
     const srcChainId = this.chainMapping[fromAsset.originChain];
     const destChainId = this.chainMapping[toAsset.originChain];

package/services/swap-service/handler/hydradx-handler.d.ts

@@ -16,7 +16,7 @@ export declare class HydradxHandler implements SwapBaseInterface {
     chain: () => string;
     get chainService(): ChainService;
     get balanceService(): BalanceService;
-    get providerInfo(): import("@subwallet/extension-base/types/swap").SwapProvider;
+    get providerInfo(): import("@subwallet/extension-base/types").SwapProvider;
     get name(): string;
     get slug(): string;
     getXcmStep(params: OptimalSwapPathParams): Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;

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

@@ -6,12 +6,13 @@ import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { _AssetType } from '@subwallet/chain-list/types';
 import { SwapError } from '@subwallet/extension-base/background/errors/SwapError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { BasicTxErrorType, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { _getEarlyHydradxValidationError } from '@subwallet/extension-base/core/logic-validation/swap';
 import { createXcmExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
 import { _getAssetDecimals, _getChainNativeTokenSlug, _getTokenOnChainAssetId, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { SwapBaseHandler } from '@subwallet/extension-base/services/swap-service/handler/base-handler';
 import { calculateSwapRate, getSwapAlternativeAsset, SWAP_QUOTE_TIMEOUT_MAP } from '@subwallet/extension-base/services/swap-service/utils';
+import { BasicTxErrorType } from '@subwallet/extension-base/types';
 import { CommonStepType } from '@subwallet/extension-base/types/service-base';
 import { SwapErrorType, SwapFeeType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types/swap';
 import BigNumber from 'bignumber.js';

package/services/swap-service/index.js

@@ -3,12 +3,12 @@
 
 import { SwapError } from '@subwallet/extension-base/background/errors/SwapError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { BasicTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import { AssetHubSwapHandler } from '@subwallet/extension-base/services/swap-service/handler/asset-hub';
 import { ChainflipSwapHandler } from '@subwallet/extension-base/services/swap-service/handler/chainflip-handler';
 import { HydradxHandler } from '@subwallet/extension-base/services/swap-service/handler/hydradx-handler';
 import { _PROVIDER_TO_SUPPORTED_PAIR_MAP, getSwapAltToken, SWAP_QUOTE_TIMEOUT_MAP } from '@subwallet/extension-base/services/swap-service/utils';
+import { BasicTxErrorType } from '@subwallet/extension-base/types';
 import { DEFAULT_FIRST_STEP, MOCK_STEP_FEE } from '@subwallet/extension-base/types/service-base';
 import { _SUPPORTED_SWAP_PROVIDERS, SwapErrorType, SwapProviderId, SwapStepType } from '@subwallet/extension-base/types/swap';
 import { createPromiseHandler } from '@subwallet/extension-base/utils';

package/services/transaction-service/helpers/index.d.ts

@@ -1,7 +1,9 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
+import { TonTransactionConfig } from '@subwallet/extension-base/services/balance-service/transfer/ton-transfer';
 import { SWTransaction } from '@subwallet/extension-base/services/transaction-service/types';
 import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
 export declare const getTransactionId: (chainType: string, chain: string, isInternal: boolean, isWalletConnect?: boolean) => string;
 export declare const getValidationId: (chainType: string, chain: string) => string;
 export declare const isSubstrateTransaction: (tx: SWTransaction['transaction']) => tx is SubmittableExtrinsic;
+export declare const isTonTransaction: (tx: SWTransaction['transaction']) => tx is TonTransactionConfig;
 export declare const getBaseTransactionInfo: (transaction: SWTransaction, chainInfoMap: Record<string, _ChainInfo>) => string;

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

@@ -13,6 +13,10 @@ export const getValidationId = (chainType, chain) => {
 export const isSubstrateTransaction = tx => {
   return !!tx.send;
 };
+export const isTonTransaction = tx => {
+  const tonTransactionConfig = tx;
+  return Boolean(tonTransactionConfig.messagePayload) && tonTransactionConfig.seqno >= 0;
+};
 const typeName = type => {
   switch (type) {
     case ExtrinsicType.TRANSFER_BALANCE:

package/services/transaction-service/index.d.ts

@@ -39,6 +39,7 @@ export default class TransactionService {
     generateHashPayload(chain: string, transaction: TransactionConfig): HexString;
     private signAndSendEvmTransaction;
     private signAndSendSubstrateTransaction;
+    private signAndSendTonTransaction;
     private handleTransactionTimeout;
     private handlePostEarningTransaction;
     resetWallet(): void;

package/services/transaction-service/index.js

@@ -3,18 +3,19 @@
 
 import { EvmProviderError } from '@subwallet/extension-base/background/errors/EvmProviderError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
-import { BasicTxErrorType, ChainType, EvmProviderErrorType, ExtrinsicStatus, ExtrinsicType, NotificationType, TransactionDirection } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainType, EvmProviderErrorType, ExtrinsicStatus, ExtrinsicType, NotificationType, TransactionDirection } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY, fetchLastestBlockedActionsAndFeatures } from '@subwallet/extension-base/constants';
 import { checkBalanceWithTransactionFee, checkSigningAccountForTransaction, checkSupportForAction, checkSupportForFeature, checkSupportForTransaction, estimateFeeForTransaction } from '@subwallet/extension-base/core/logic-validation/transfer';
+import { cellToBase64Str, externalMessage, getTransferCellPromise } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils';
 import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getEvmChainId, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
 import { TRANSACTION_TIMEOUT } from '@subwallet/extension-base/services/transaction-service/constants';
 import { parseLiquidStakingEvents, parseLiquidStakingFastUnstakeEvents, parseTransferEventLogs, parseXcmEventLogs } from '@subwallet/extension-base/services/transaction-service/event-parser';
-import { getBaseTransactionInfo, getTransactionId, isSubstrateTransaction } from '@subwallet/extension-base/services/transaction-service/helpers';
+import { getBaseTransactionInfo, getTransactionId, isSubstrateTransaction, isTonTransaction } from '@subwallet/extension-base/services/transaction-service/helpers';
 import { getExplorerLink, parseTransactionData } from '@subwallet/extension-base/services/transaction-service/utils';
 import { isWalletConnectRequest } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
-import { YieldPoolType } from '@subwallet/extension-base/types';
-import { _isRuntimeUpdated, anyNumberToBN, reformatAddress } from '@subwallet/extension-base/utils';
+import { BasicTxErrorType, YieldPoolType } from '@subwallet/extension-base/types';
+import { _isRuntimeUpdated, anyNumberToBN, pairToAccount, reformatAddress } from '@subwallet/extension-base/utils';
 import { mergeTransactionAndSignature } from '@subwallet/extension-base/utils/eth/mergeTransactionAndSignature';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { BN_ZERO } from '@subwallet/extension-base/utils/number';
@@ -24,7 +25,7 @@ import { ethers } from 'ethers';
 import EventEmitter from 'eventemitter3';
 import { t } from 'i18next';
 import { BehaviorSubject, interval as rxjsInterval } from 'rxjs';
-import { isHex } from '@polkadot/util';
+import { hexToU8a, isHex } from '@polkadot/util';
 export default class TransactionService {
   transactionSubject = new BehaviorSubject({});
   watchTransactionSubscribes = {};
@@ -86,22 +87,30 @@ export default class TransactionService {
       validationResponse.errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR, t('Cannot find network')));
     }
     const evmApi = this.state.chainService.getEvmApi(chainInfo.slug);
-    const isNeedEvmApi = transaction && !isSubstrateTransaction(transaction) && !evmApi;
-    if (isNeedEvmApi) {
+    const tonApi = this.state.chainService.getTonApi(chainInfo.slug);
+    const isNoEvmApi = transaction && !isSubstrateTransaction(transaction) && !isTonTransaction(transaction) && !evmApi; // todo: should split isEvmTx && isNoEvmApi. Because other chains type also has no Evm Api
+    const isNoTonApi = transaction && isTonTransaction(transaction) && !tonApi;
+    if (isNoEvmApi || isNoTonApi) {
       validationResponse.errors.push(new TransactionError(BasicTxErrorType.CHAIN_DISCONNECTED, undefined));
     }
 
     // Estimate fee for transaction
     validationResponse.estimateFee = await estimateFeeForTransaction(validationResponse, transaction, chainInfo, evmApi);
+    const chainInfoMap = this.state.chainService.getChainInfoMap();
 
     // Check account signing transaction
-    checkSigningAccountForTransaction(validationResponse);
+    checkSigningAccountForTransaction(validationResponse, chainInfoMap);
     const nativeTokenInfo = this.state.chainService.getNativeTokenInfo(chain);
     const nativeTokenAvailable = await this.state.balanceService.getTransferableBalance(address, chain, nativeTokenInfo.slug, extrinsicType);
 
     // Check available balance against transaction fee
     checkBalanceWithTransactionFee(validationResponse, transactionInput, nativeTokenInfo, nativeTokenAvailable);
 
+    // Warnings Ton address if bounceable and not active
+    // if (transaction && isTonTransaction(transaction) && tonApi) {
+    //   await checkTonAddressBounceableAndAccountNotActive(tonApi, validationResponse);
+    // }
+
     // Check additional validations
     additionalValidator && (await additionalValidator(validationResponse));
     return validationResponse;
@@ -153,8 +162,9 @@ export default class TransactionService {
   }
   async handleTransaction(transaction) {
     const validatedTransaction = await this.validateTransaction(transaction);
+    const ignoreWarnings = validatedTransaction.ignoreWarnings || [];
     const stopByErrors = validatedTransaction.errors.length > 0;
-    const stopByWarnings = validatedTransaction.warnings.length > 0 && !validatedTransaction.ignoreWarnings;
+    const stopByWarnings = validatedTransaction.warnings.length > 0 && validatedTransaction.warnings.some(warning => !ignoreWarnings.includes(warning.warningType));
     if (stopByErrors || stopByWarnings) {
       // @ts-ignore
       'transaction' in validatedTransaction && delete validatedTransaction.transaction;
@@ -195,7 +205,7 @@ export default class TransactionService {
   }
   async sendTransaction(transaction) {
     // Send Transaction
-    const emitter = await (transaction.chainType === 'substrate' ? this.signAndSendSubstrateTransaction(transaction) : this.signAndSendEvmTransaction(transaction));
+    const emitter = await (transaction.chainType === 'substrate' ? this.signAndSendSubstrateTransaction(transaction) : transaction.chainType === 'evm' ? this.signAndSendEvmTransaction(transaction) : this.signAndSendTonTransaction(transaction));
     const {
       eventsHandler
     } = transaction;
@@ -829,13 +839,7 @@ export default class TransactionService {
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
     const hasError = !!(payload.errors && payload.errors.length > 0);
     const accountPair = keyring.getPair(address);
-    const account = {
-      address,
-      ...accountPair.meta
-    };
-    if (!payload.account) {
-      payload.account = account;
-    }
+    const account = pairToAccount(accountPair);
 
     // Allow sign transaction
     payload.canSign = true;
@@ -851,6 +855,9 @@ export default class TransactionService {
         payload.parseData = payload.data;
       }
     }
+    if (!payload.address) {
+      payload.address = address;
+    }
     if ('data' in payload && payload.data === undefined) {
       delete payload.data;
     }
@@ -1117,6 +1124,96 @@ export default class TransactionService {
     });
     return emitter;
   }
+  signAndSendTonTransaction({
+    address,
+    chain,
+    extrinsicType,
+    id,
+    transaction,
+    url
+  }) {
+    const walletContract = keyring.getPair(address).ton.currentContract;
+    const emitter = new EventEmitter();
+    const eventData = {
+      id,
+      errors: [],
+      warnings: [],
+      extrinsicHash: id
+    };
+    const payload = transaction;
+    const signer = message => {
+      return new Promise(resolve => {
+        this.state.requestService.addConfirmationTon(id, url || EXTENSION_REQUEST_URL, 'tonSendTransactionRequest', {
+          ...payload,
+          messagePayload: cellToBase64Str(message),
+          messages: []
+        }, {}).then(({
+          isApproved,
+          payload
+        }) => {
+          if (!isApproved) {
+            this.removeTransaction(id);
+            eventData.errors.push(new TransactionError(BasicTxErrorType.USER_REJECT_REQUEST));
+            emitter.emit('error', eventData);
+          } else {
+            if (!payload) {
+              throw new Error('Bad signature');
+            }
+            resolve(Buffer.from(hexToU8a(payload)));
+          }
+        }).catch(e => {
+          this.removeTransaction(id);
+          eventData.errors.push(new TransactionError(BasicTxErrorType.UNABLE_TO_SIGN, t(e.message)));
+          emitter.emit('error', eventData);
+        });
+      });
+    };
+    const tonTransactionConfig = transaction;
+    const seqno = tonTransactionConfig.seqno;
+    const messages = tonTransactionConfig.messages;
+    const transferObjectPromise = getTransferCellPromise(walletContract, signer, payload, seqno, messages);
+    transferObjectPromise.then(tx => {
+      // Emit signed event
+      emitter.emit('signed', eventData);
+      const boc = externalMessage(walletContract, seqno, tx).toBoc().toString('base64');
+      this.handleTransactionTimeout(emitter, eventData);
+      emitter.emit('send', eventData); // This event is needed after sending transaction with queue
+
+      const tonApi = this.state.chainService.getTonApi(chain);
+      tonApi.sendTonTransaction(boc).then(externalMsgHash => {
+        // the externalMsgHash is the hash of first message, not the hash of transaction.
+        if (!externalMsgHash) {
+          return;
+        }
+        tonApi.getStatusByExtMsgHash(externalMsgHash, extrinsicType).then(([status, hex]) => {
+          if (status && hex) {
+            eventData.extrinsicHash = hex;
+            emitter.emit('extrinsicHash', eventData);
+            emitter.emit('success', eventData);
+          }
+          if (!status && hex) {
+            eventData.extrinsicHash = hex;
+            emitter.emit('extrinsicHash', eventData);
+            eventData.errors.push(new TransactionError(BasicTxErrorType.SEND_TRANSACTION_FAILED));
+            emitter.emit('error', eventData);
+          }
+        }).catch(e => {
+          eventData.errors.push(new TransactionError(BasicTxErrorType.SEND_TRANSACTION_FAILED, e.message));
+          emitter.emit('error', eventData);
+        });
+
+        // todo: handle status of externalMsgHash
+      }).catch(e => {
+        eventData.errors.push(new TransactionError(BasicTxErrorType.SEND_TRANSACTION_FAILED, e.message));
+        emitter.emit('error', eventData);
+      });
+    }).catch(e => {
+      this.removeTransaction(id);
+      eventData.errors.push(new TransactionError(BasicTxErrorType.UNABLE_TO_SIGN, e.message));
+      emitter.emit('error', eventData);
+    });
+    return emitter;
+  }
   handleTransactionTimeout(emitter, eventData) {
     const timeout = setTimeout(() => {
       const transaction = this.getTransaction(eventData.id);

package/services/transaction-service/types.d.ts

@@ -1,4 +1,6 @@
-import { BaseRequestSign, ChainType, ExtrinsicDataTypeMap, ExtrinsicStatus, ExtrinsicType, FeeData, ValidateTransactionResponse } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainType, ExtrinsicDataTypeMap, ExtrinsicStatus, ExtrinsicType, FeeData, ValidateTransactionResponse } from '@subwallet/extension-base/background/KoniTypes';
+import { TonTransactionConfig } from '@subwallet/extension-base/services/balance-service/transfer/ton-transfer';
+import { BaseRequestSign } from '@subwallet/extension-base/types';
 import EventEmitter from 'eventemitter3';
 import { TransactionConfig } from 'web3-core';
 import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
@@ -17,7 +19,7 @@ export interface SWTransaction extends ValidateTransactionResponse, Partial<Pick
     createdAt: number;
     updatedAt: number;
     estimateFee?: FeeData;
-    transaction: SubmittableExtrinsic | TransactionConfig;
+    transaction: SubmittableExtrinsic | TransactionConfig | TonTransactionConfig;
     additionalValidator?: (inputTransaction: SWTransactionResponse) => Promise<void>;
     eventsHandler?: (eventEmitter: TransactionEmitter) => void;
 }

package/services/wallet-connect-service/handler/PolkadotRequestHandler.js

@@ -56,10 +56,7 @@ export default class PolkadotRequestHandler {
         address: address,
         data: param.message,
         type: 'bytes'
-      }), {
-        address,
-        ...pair.meta
-      }, getWCId(id)).then(async ({
+      }), getWCId(id)).then(async ({
         signature
       }) => {
         await _classPrivateFieldLooseBase(this, _walletConnectService)[_walletConnectService].responseRequest({
@@ -74,12 +71,7 @@ export default class PolkadotRequestHandler {
     } else if (method === POLKADOT_SIGNING_METHODS.POLKADOT_SIGN_TRANSACTION) {
       const param = parseRequestParams(request.params);
       _classPrivateFieldLooseBase(this, _checkAccount)[_checkAccount](param.address, sessionAccounts);
-      const pair = keyring.getPair(param.address);
-      const address = pair.address;
-      _classPrivateFieldLooseBase(this, _requestService)[_requestService].sign(url, new RequestExtrinsicSign(param.transactionPayload), {
-        address,
-        ...pair.meta
-      }, getWCId(id)).then(async ({
+      _classPrivateFieldLooseBase(this, _requestService)[_requestService].sign(url, new RequestExtrinsicSign(param.transactionPayload), getWCId(id)).then(async ({
         signature
       }) => {
         await _classPrivateFieldLooseBase(this, _walletConnectService)[_walletConnectService].responseRequest({

package/stores/AccountProxyStore.d.ts

@@ -0,0 +1,5 @@
+import SubscribableStore from '@subwallet/extension-base/stores/SubscribableStore';
+import { AccountProxyStoreData } from '@subwallet/extension-base/types';
+export default class AccountProxyStore extends SubscribableStore<AccountProxyStoreData> {
+    constructor();
+}

package/stores/AccountProxyStore.js

@@ -0,0 +1,10 @@
+// Copyright 2019-2022 @subwallet/extension-koni-ui authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { EXTENSION_PREFIX } from '@subwallet/extension-base/defaults';
+import SubscribableStore from '@subwallet/extension-base/stores/SubscribableStore';
+export default class AccountProxyStore extends SubscribableStore {
+  constructor() {
+    super(EXTENSION_PREFIX ? `${EXTENSION_PREFIX}account_proxy` : null);
+  }
+}

package/stores/Authorize.d.ts

@@ -1,4 +1,4 @@
-import { AuthUrls } from '@subwallet/extension-base/background/handlers/State';
+import { AuthUrls } from '@subwallet/extension-base/services/request-service/types';
 import SubscribableStore from '@subwallet/extension-base/stores/SubscribableStore';
 export default class AuthorizeStore extends SubscribableStore<AuthUrls> {
     constructor();

package/stores/CurrentAccountStore.d.ts

@@ -1,5 +1,5 @@
-import { CurrentAccountInfo } from '@subwallet/extension-base/background/KoniTypes';
 import SubscribableStore from '@subwallet/extension-base/stores/SubscribableStore';
+import { CurrentAccountInfo } from '@subwallet/extension-base/types';
 export default class CurrentAccountStore extends SubscribableStore<CurrentAccountInfo> {
     constructor();
 }

package/stores/ModifyPairStore.d.ts

@@ -0,0 +1,5 @@
+import SubscribableStore from '@subwallet/extension-base/stores/SubscribableStore';
+import { ModifyPairStoreData } from '@subwallet/extension-base/types';
+export default class ModifyPairStore extends SubscribableStore<ModifyPairStoreData> {
+    constructor();
+}

package/stores/ModifyPairStore.js

@@ -0,0 +1,10 @@
+// Copyright 2019-2022 @subwallet/extension-koni-ui authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { EXTENSION_PREFIX } from '@subwallet/extension-base/defaults';
+import SubscribableStore from '@subwallet/extension-base/stores/SubscribableStore';
+export default class ModifyPairStore extends SubscribableStore {
+  constructor() {
+    super(EXTENSION_PREFIX ? `${EXTENSION_PREFIX}pair_modify` : null);
+  }
+}

package/stores/index.d.ts

@@ -1,4 +1,7 @@
+export { default as AccountProxyStore } from './AccountProxyStore';
+export { default as AccountRefStore } from './AccountRef';
 export { default as AccountsStore } from './Accounts';
-export { default as MetadataStore } from './Metadata';
 export { default as CurrentAccountStore } from './CurrentAccountStore';
 export { default as CurrentCurrencyStore } from './CurrentCurrencyStore';
+export { default as MetadataStore } from './Metadata';
+export { default as ModifyPairStore } from './ModifyPairStore';

package/stores/index.js

@@ -1,7 +1,10 @@
 // Copyright 2019-2022 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+export { default as AccountProxyStore } from "./AccountProxyStore.js";
+export { default as AccountRefStore } from "./AccountRef.js";
 export { default as AccountsStore } from "./Accounts.js";
-export { default as MetadataStore } from "./Metadata.js";
 export { default as CurrentAccountStore } from "./CurrentAccountStore.js";
-export { default as CurrentCurrencyStore } from "./CurrentCurrencyStore.js";
+export { default as CurrentCurrencyStore } from "./CurrentCurrencyStore.js";
+export { default as MetadataStore } from "./Metadata.js";
+export { default as ModifyPairStore } from "./ModifyPairStore.js";

package/types/account/action/add/index.d.ts

@@ -0,0 +1,3 @@
+export * from './json';
+export * from './mnemonic';
+export * from './secret';

package/types/account/action/add/index.js

@@ -0,0 +1,6 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export * from "./json.js";
+export * from "./mnemonic.js";
+export * from "./secret.js";