@subwallet/extension-base 1.2.24-2 → 1.2.25-1

package/core/logic-validation/transfer.d.ts

@@ -7,7 +7,7 @@ import { OptionalSWTransaction, SWTransactionInput, SWTransactionResponse } from
 import { KeyringPair } from '@subwallet/keyring/types';
 import BigN from 'bignumber.js';
 export declare function validateTransferRequest(tokenInfo: _ChainAsset, from: _Address, to: _Address, value: string | undefined, transferAll: boolean | undefined): [TransactionError[], KeyringPair | undefined, BigN | undefined];
-export declare function additionalValidateTransfer(tokenInfo: _ChainAsset, extrinsicType: ExtrinsicType, receiverTransferTokenFreeBalance: string, transferAmount: string, senderTransferTokenTransferable?: string): [TransactionWarning | undefined, TransactionError | undefined];
+export declare function additionalValidateTransfer(tokenInfo: _ChainAsset, nativeTokenInfo: _ChainAsset, extrinsicType: ExtrinsicType, receiverTransferTokenFreeBalance: string, transferAmount: string, senderTransferTokenTransferable?: string, receiverNativeTransferable?: string): [TransactionWarning[], TransactionError[]];
 export declare function validateXcmTransferRequest(destTokenInfo: _ChainAsset | undefined, sender: _Address, sendingValue: string): [TransactionError[], KeyringPair | undefined, BigN | undefined];
 export declare function additionalValidateXcmTransfer(originTokenInfo: _ChainAsset, destinationTokenInfo: _ChainAsset, sendingAmount: string, senderTransferable: string, receiverNativeBalance: string, destChainInfo: _ChainInfo, isSnowBridge?: boolean): [TransactionWarning | undefined, TransactionError | undefined];
 export declare function checkSupportForTransaction(validationResponse: SWTransactionResponse, transaction: OptionalSWTransaction): void;

package/core/logic-validation/transfer.js

@@ -37,32 +37,49 @@ export function validateTransferRequest(tokenInfo, from, to, value, transferAll)
   }
   return [errors, keypair, transferValue];
 }
-export function additionalValidateTransfer(tokenInfo, extrinsicType, receiverTransferTokenFreeBalance, transferAmount, senderTransferTokenTransferable) {
+export function additionalValidateTransfer(tokenInfo, nativeTokenInfo, extrinsicType, receiverTransferTokenFreeBalance, transferAmount, senderTransferTokenTransferable, receiverNativeTransferable) {
   const minAmount = _getTokenMinAmount(tokenInfo);
-  let warning;
-  let error;
+  const nativeMinAmount = _getTokenMinAmount(nativeTokenInfo);
+  const warnings = [];
+  const errors = [];
 
-  // Check ed of not native token for sender
+  // Check ed of not native token for sender after sending
   if (extrinsicType === ExtrinsicType.TRANSFER_TOKEN && senderTransferTokenTransferable) {
     if (new BigN(senderTransferTokenTransferable).minus(transferAmount).lt(minAmount)) {
-      warning = new TransactionWarning(BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT);
+      const warning = new TransactionWarning(BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT);
+      warnings.push(warning);
+    }
+  }
+
+  // Check ed for receiver before sending
+  if (extrinsicType === ExtrinsicType.TRANSFER_TOKEN && receiverNativeTransferable) {
+    if (new BigN(receiverNativeTransferable).lt(nativeMinAmount)) {
+      const error = new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, t('The recipient account has {{amount}} {{nativeSymbol}} which can lead to your {{localSymbol}} being lost. Change recipient account and try again', {
+        replace: {
+          amount: receiverNativeTransferable,
+          nativeSymbol: nativeTokenInfo.symbol,
+          localSymbol: tokenInfo.symbol
+        }
+      }));
+      errors.push(error);
     }
   }
 
-  // Check ed for receiver
+  // Check ed for receiver after sending
   if (new BigN(receiverTransferTokenFreeBalance).plus(transferAmount).lt(minAmount)) {
     const atLeast = new BigN(minAmount).minus(receiverTransferTokenFreeBalance).plus((tokenInfo.decimals || 0) === 0 ? 0 : 1);
     const atLeastStr = formatNumber(atLeast, tokenInfo.decimals || 0, balanceFormatter, {
       maxNumberFormat: tokenInfo.decimals || 6
     });
-    error = new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, t('You must transfer at least {{amount}} {{symbol}} to keep the destination account alive', {
+    const error = new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, t('You must transfer at least {{amount}} {{symbol}} to keep the destination account alive', {
       replace: {
         amount: atLeastStr,
         symbol: tokenInfo.symbol
       }
     }));
+    errors.push(error);
   }
-  return [warning, error];
+  return [warnings, errors];
 }
 
 // xcm transfer

package/koni/api/staking/bonding/utils.js

@@ -88,7 +88,7 @@ export function calculateChainStakedReturnV2(chainInfo, totalIssuance, erasPerDa
     const multiplier = dayRewardRate.dividedBy(100).plus(1).exponentiatedBy(365);
     inflationToStakers = new BigNumber(100).multipliedBy(multiplier).minus(100);
   }
-  const averageRewardRate = (['avail_mainnet'].includes(chainInfo.slug) ? inflation : inflationToStakers).dividedBy(supplyStaked);
+  const averageRewardRate = (['avail_mainnet', 'dentnet'].includes(chainInfo.slug) ? inflation : inflationToStakers).dividedBy(supplyStaked);
   return averageRewardRate.toNumber();
 }
 export function calculateAlephZeroValidatorReturn(chainStakedReturn, commission) {
@@ -345,7 +345,7 @@ export function getAvgValidatorEraReward(supportedDays, eraRewardHistory) {
   return sumEraReward.dividedBy(new BigNumber(supportedDays - failEra));
 }
 export function getSupportedDaysByHistoryDepth(erasPerDay, maxSupportedEras, liveDay) {
-  const maxSupportDay = maxSupportedEras / erasPerDay;
+  const maxSupportDay = Math.floor(maxSupportedEras / erasPerDay);
   if (liveDay && liveDay <= 30) {
     return Math.min(liveDay - 1, maxSupportDay);
   }

package/koni/background/handlers/Extension.d.ts

@@ -255,5 +255,6 @@ export default class KoniExtension {
     private getLatestSwapQuote;
     private validateSwapProcess;
     private handleSwapStep;
+    private subscribeLedgerGenericAllowChains;
     handle<TMessageType extends MessageTypes>(id: string, type: TMessageType, request: RequestTypes[TMessageType], port: chrome.runtime.Port): Promise<ResponseType<TMessageType>>;
 }

package/koni/background/handlers/Extension.js

@@ -1647,18 +1647,23 @@ export default class KoniExtension {
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
     const additionalValidator = async inputTransaction => {
       let senderTransferTokenTransferable;
+      let receiverNativeTransferable;
 
       // Check ed for sender
       if (!isTransferNativeToken) {
-        const {
-          value
-        } = await this.getAddressTransferableBalance({
+        const [_senderTransferTokenTransferable, _receiverNativeTransferable] = await Promise.all([this.getAddressTransferableBalance({
           address: from,
           networkKey,
           token: tokenSlug,
           extrinsicType
-        });
-        senderTransferTokenTransferable = value;
+        }), this.getAddressTransferableBalance({
+          address: to,
+          networkKey,
+          token: nativeTokenSlug,
+          extrinsicType: ExtrinsicType.TRANSFER_BALANCE
+        })]);
+        senderTransferTokenTransferable = _senderTransferTokenTransferable.value;
+        receiverNativeTransferable = _receiverNativeTransferable.value;
       }
       const {
         value: receiverTransferTokenTransferable
@@ -1669,9 +1674,9 @@ export default class KoniExtension {
         extrinsicType
       }); // todo: shouldn't be just transferable, locked also counts
 
-      const [warning, error] = additionalValidateTransfer(transferTokenInfo, extrinsicType, receiverTransferTokenTransferable, transferAmount.value, senderTransferTokenTransferable);
-      warning && inputTransaction.warnings.push(warning);
-      error && inputTransaction.errors.push(error);
+      const [warnings, errors] = additionalValidateTransfer(transferTokenInfo, nativeTokenInfo, extrinsicType, receiverTransferTokenTransferable, transferAmount.value, senderTransferTokenTransferable, receiverNativeTransferable);
+      warnings.length && inputTransaction.warnings.push(...warnings);
+      errors.length && inputTransaction.errors.push(...errors);
     };
     return this.#koniState.transactionService.handleTransaction({
       errors,
@@ -4143,6 +4148,21 @@ export default class KoniExtension {
   }
   /* Swap service */
 
+  /* Ledger */
+
+  async subscribeLedgerGenericAllowChains(id, port) {
+    const cb = createSubscription(id, port);
+    await this.#koniState.eventService.waitLedgerReady;
+    const subscription = this.#koniState.chainService.observable.ledgerGenericAllowChains.subscribe(cb);
+    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    return this.#koniState.chainService.value.ledgerGenericAllowChains;
+  }
+
+  /* Ledger */
+
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
@@ -4707,6 +4727,11 @@ export default class KoniExtension {
       case 'pri(swapService.handleSwapStep)':
         return this.handleSwapStep(request);
       /* Swap service */
+
+      /* Ledger */
+      case 'pri(ledger.generic.allow)':
+        return this.subscribeLedgerGenericAllowChains(id, port);
+      /* Ledger */
       // Default
       default:
         throw new Error(`Unable to handle message of type ${type}`);

package/koni/background/handlers/State.d.ts

@@ -217,9 +217,9 @@ export default class KoniState {
     accountExportPrivateKey({ address, password }: RequestAccountExportPrivateKey): ResponseAccountExportPrivateKey;
     checkPublicAndSecretKey({ publicKey, secretKey }: RequestCheckPublicAndSecretKey): ResponseCheckPublicAndSecretKey;
     getEthKeyring(address: string, password: string): Promise<SimpleKeyring>;
-    evmSign(id: string, url: string, method: string, params: any, allowedAccounts: string[]): Promise<string | undefined>;
+    evmSign(id: string, url: string, method: string, params: any, topic?: string): Promise<string | undefined>;
     calculateAllGasFeeOnChain(activeEvmChains: string[], timeout?: number): Promise<Record<string, EvmFeeInfo | null>>;
-    evmSendTransaction(id: string, url: string, networkKey: string, allowedAccounts: string[], transactionParams: EvmSendTransactionParams): Promise<string | undefined>;
+    evmSendTransaction(id: string, url: string, transactionParams: EvmSendTransactionParams, networkKeyInit?: string, topic?: string): Promise<string | undefined>;
     getConfirmationsQueueSubject(): BehaviorSubject<ConfirmationsQueue>;
     completeConfirmation(request: RequestConfirmationComplete): Promise<boolean>;
     private onMV3Update;

package/koni/background/handlers/State.js

@@ -6,6 +6,7 @@ import { withErrorLog } from '@subwallet/extension-base/background/handlers/help
 import { isSubscriptionRunning, unsubscribe } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { APIItemState, BasicTxErrorType, ChainType, EvmProviderErrorType, ExternalRequestPromiseStatus, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, MANTA_PAY_BALANCE_INTERVAL, REMIND_EXPORT_ACCOUNT } from '@subwallet/extension-base/constants';
+import { generateValidationProcess, validationAuthMiddleware, validationAuthWCMiddleware, validationConnectMiddleware, validationEvmDataTransactionMiddleware, validationEvmSignMessageMiddleware } from '@subwallet/extension-base/core/logic-validation';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import BuyService from '@subwallet/extension-base/services/buy-service';
@@ -34,12 +35,10 @@ import TransactionService from '@subwallet/extension-base/services/transaction-s
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
-import { isAccountAll, stripUrl, targetIsWeb, wait } from '@subwallet/extension-base/utils';
-import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
+import { isAccountAll, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { decodePair } from '@subwallet/keyring/pair/decode';
 import { keyring } from '@subwallet/ui-keyring';
-import BigN from 'bignumber.js';
 import BN from 'bn.js';
 import SimpleKeyring from 'eth-simple-keyring';
 import { t } from 'i18next';
@@ -52,6 +51,7 @@ import { KoniSubscription } from "../subscription.js";
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 const passworder = require('browser-passworder');
 const ETH_DERIVE_DEFAULT = '/m/44\'/60\'/0\'/0/0';
+const ERROR_CONFIRMATION_TYPE = ['errorConnectNetwork'];
 
 // List of providers passed into constructor. This is the list of providers
 // exposed by the extension.
@@ -1078,7 +1078,7 @@ export default class KoniState {
       resolve(ethKeyring);
     });
   }
-  async evmSign(id, url, method, params, allowedAccounts) {
+  async evmSign(id, url, method, params, topic) {
     let address = '';
     let payload;
     const [p1, p2] = params;
@@ -1089,60 +1089,21 @@ export default class KoniState {
       address = p2;
       payload = p1;
     }
-    if (address === '' || !payload) {
-      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, t('Not found address or payload to sign'));
-    }
-    if (['eth_sign', 'personal_sign', 'eth_signTypedData', 'eth_signTypedData_v1', 'eth_signTypedData_v3', 'eth_signTypedData_v4'].indexOf(method) < 0) {
-      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, t('Unsupported action'));
-    }
-    if (['eth_signTypedData_v3', 'eth_signTypedData_v4'].indexOf(method) > -1) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-assignment
-      payload = JSON.parse(payload);
-    }
-
-    // Check sign abiblity
-    if (!allowedAccounts.find(acc => acc.toLowerCase() === address.toLowerCase())) {
-      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, t('You have rescinded allowance for this account in wallet'));
-    }
-    const pair = keyring.getPair(address);
-    if (!pair) {
-      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, t('Unable to find account'));
-    }
-    const account = {
-      address: pair.address,
-      ...pair.meta
+    const payloadValidation = {
+      address,
+      payloadAfterValidated: payload,
+      method,
+      errors: [],
+      networkKey: ''
     };
-    let hashPayload = '';
-    let canSign = false;
-    switch (method) {
-      case 'personal_sign':
-        canSign = true;
-        hashPayload = payload;
-        break;
-      case 'eth_sign':
-      case 'eth_signTypedData':
-      case 'eth_signTypedData_v1':
-      case 'eth_signTypedData_v3':
-      case 'eth_signTypedData_v4':
-        if (!account.isExternal) {
-          canSign = true;
-        }
-        break;
-      default:
-        throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, t('Unsupported action'));
-    }
-    const signPayload = {
-      account: account,
-      type: method,
-      payload: payload,
-      hashPayload: hashPayload,
-      canSign: canSign,
+    const validationSteps = [topic ? validationAuthWCMiddleware : validationAuthMiddleware, validationEvmSignMessageMiddleware];
+    const result = await generateValidationProcess(this, url, payloadValidation, validationSteps, topic);
+    const payloadAfterValidated = {
+      ...result.payloadAfterValidated,
+      errors: result.errors,
       id
     };
-    return this.requestService.addConfirmation(id, url, 'evmSignatureRequest', signPayload, {
-      requiredPassword: false,
-      address
-    }).then(({
+    return this.requestService.addConfirmation(id, url, 'evmSignatureRequest', payloadAfterValidated, {}).then(({
       isApproved,
       payload
     }) => {
@@ -1186,117 +1147,36 @@ export default class KoniState {
     });
     return Object.fromEntries(await Promise.all(promiseList));
   }
-  async evmSendTransaction(id, url, networkKey, allowedAccounts, transactionParams) {
-    const evmApi = this.getEvmApi(networkKey);
-    const evmNetwork = this.getChainInfo(networkKey);
-    const web3 = evmApi.api;
-    const autoFormatNumber = val => {
-      if (typeof val === 'string' && val.startsWith('0x')) {
-        return new BN(val.replace('0x', ''), 16).toString();
-      } else if (typeof val === 'number') {
-        return val.toString();
-      }
-      return val;
+  async evmSendTransaction(id, url, transactionParams, networkKeyInit, topic) {
+    const payloadValidation = {
+      errors: [],
+      networkKey: networkKeyInit || '',
+      payloadAfterValidated: transactionParams,
+      address: transactionParams.from
     };
-    if (transactionParams.from === transactionParams.to) {
-      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, t('Receiving address must be different from sending address'));
-    }
-    const transaction = {
-      from: transactionParams.from,
-      to: transactionParams.to,
-      value: autoFormatNumber(transactionParams.value),
-      gas: autoFormatNumber(transactionParams.gas),
-      gasPrice: autoFormatNumber(transactionParams.gasPrice || transactionParams.gasLimit),
-      maxPriorityFeePerGas: autoFormatNumber(transactionParams.maxPriorityFeePerGas),
-      maxFeePerGas: autoFormatNumber(transactionParams.maxFeePerGas),
-      data: transactionParams.data
-    };
-    if (!transactionParams.gas) {
-      const getTransactionGas = async () => {
-        try {
-          transaction.gas = await web3.eth.estimateGas({
-            ...transaction
-          });
-        } catch (e) {
-          // @ts-ignore
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-          throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
-        }
-      };
-
-      // Calculate transaction data
-      try {
-        await Promise.race([getTransactionGas(), wait(3000).then(async () => {
-          if (!transaction.gas) {
-            await this.chainService.initSingleApi(networkKey);
-            await getTransactionGas();
-          }
-        })]);
-      } catch (e) {
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
-      }
-    }
-    if (!transaction.gas) {
-      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS);
-    }
-    let estimateGas;
-
-    // TODO: Review, If not override, transaction maybe fail because fee too low
-    if (transactionParams.maxPriorityFeePerGas && transactionParams.maxFeePerGas) {
-      const maxFee = new BigN(transactionParams.maxFeePerGas);
-      estimateGas = maxFee.multipliedBy(transaction.gas).toFixed(0);
-    } else if (transactionParams.gasPrice) {
-      estimateGas = new BigN(transactionParams.gasPrice).multipliedBy(transaction.gas).toFixed(0);
-    } else {
-      const priority = await calculateGasFeeParams(evmApi, networkKey);
-      if (priority.baseGasFee) {
-        transaction.maxPriorityFeePerGas = priority.maxPriorityFeePerGas.toString();
-        transaction.maxFeePerGas = priority.maxFeePerGas.toString();
-        const maxFee = priority.maxFeePerGas;
-        estimateGas = maxFee.multipliedBy(transaction.gas).toFixed(0);
-      } else {
-        transaction.gasPrice = priority.gasPrice;
-        estimateGas = new BigN(priority.gasPrice).multipliedBy(transaction.gas).toFixed(0);
+    const validationSteps = [topic ? validationAuthWCMiddleware : validationAuthMiddleware, validationConnectMiddleware, validationEvmDataTransactionMiddleware];
+    const result = await generateValidationProcess(this, url, payloadValidation, validationSteps, topic);
+    const {
+      confirmationType,
+      errors,
+      networkKey: networkKey_
+    } = result;
+    if (errors && errors.length > 0 && confirmationType) {
+      if (ERROR_CONFIRMATION_TYPE.includes(confirmationType)) {
+        return this.requestService.addConfirmation(id, url, confirmationType, result, {}).then(() => {
+          throw new EvmProviderError(EvmProviderErrorType.USER_REJECTED_REQUEST);
+        });
       }
     }
-
-    // Address is validated in before step
-    const fromAddress = allowedAccounts.find(account => account.toLowerCase() === transaction.from.toLowerCase());
-    if (!fromAddress) {
-      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, t('You have rescinded allowance for this account in wallet'));
-    }
-    const pair = keyring.getPair(fromAddress);
-    if (!pair) {
-      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, t('Unable to find account'));
-    }
-    const account = {
-      address: pair.address,
-      ...pair.meta
-    };
-
-    // Validate balance
-    const balance = new BN((await web3.eth.getBalance(fromAddress)) || 0);
-    if (balance.lt(new BN(estimateGas).add(new BN(autoFormatNumber(transactionParams.value) || '0')))) {
-      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, t('Insufficient balance'));
-    }
-    transaction.nonce = await web3.eth.getTransactionCount(fromAddress);
-    const hashPayload = this.transactionService.generateHashPayload(networkKey, transaction);
-    const isToContract = await isContractAddress(transaction.to || '', evmApi);
-    const parseData = isToContract ? transaction.data ? (await parseContractInput(transaction.data, transaction.to || '', evmNetwork)).result : '' : transaction.data || '';
+    const transactionValidated = result.payloadAfterValidated;
+    const networkKey = networkKey_ || '';
     const requestPayload = {
-      ...transaction,
-      estimateGas,
-      hashPayload,
-      isToContract,
-      parseData: parseData,
-      account: account,
-      canSign: true
+      ...transactionValidated,
+      errors: errors
     };
-    const eType = transaction.value ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.EVM_EXECUTE;
+    const eType = transactionValidated.value ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.EVM_EXECUTE;
     const transactionData = {
-      ...transaction
+      ...transactionValidated
     };
     const token = this.chainService.getNativeTokenInfo(networkKey);
     if (eType === ExtrinsicType.TRANSFER_BALANCE) {
@@ -1311,10 +1191,11 @@ export default class KoniState {
       chain: networkKey,
       url,
       data: transactionData,
+      errors: errors,
       extrinsicType: eType,
       chainType: ChainType.EVM,
       estimateFee: {
-        value: estimateGas,
+        value: transactionValidated.estimateGas,
         symbol: token.symbol,
         decimals: token.decimals || 18
       },

package/koni/background/handlers/Tabs.d.ts

@@ -10,7 +10,6 @@ export default class KoniTabs {
     #private;
     private evmEventEmitterMap;
     constructor(koniState: KoniState);
-    private getSigningPair;
     private bytesSign;
     private extrinsicSign;
     private metadataProvide;

package/koni/background/handlers/Tabs.js

@@ -9,16 +9,15 @@ import { EvmProviderErrorType } from '@subwallet/extension-base/background/KoniT
 import RequestBytesSign from '@subwallet/extension-base/background/RequestBytesSign';
 import RequestExtrinsicSign from '@subwallet/extension-base/background/RequestExtrinsicSign';
 import { ALL_ACCOUNT_KEY, CRON_GET_API_MAP_STATUS } from '@subwallet/extension-base/constants';
+import { generateValidationProcess, validationAuthMiddleware } from '@subwallet/extension-base/core/logic-validation';
 import { PHISHING_PAGE_REDIRECT } from '@subwallet/extension-base/defaults';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _generateCustomProviderKey } from '@subwallet/extension-base/services/chain-service/utils';
 import { DEFAULT_CHAIN_PATROL_ENABLE } from '@subwallet/extension-base/services/setting-service/constants';
 import { canDerive, getEVMChainInfo, stripUrl } from '@subwallet/extension-base/utils';
-import keyring from '@subwallet/ui-keyring';
-import { t } from 'i18next';
 import Web3 from 'web3';
 import { checkIfDenied } from '@polkadot/phishing';
-import { assert, isNumber } from '@polkadot/util';
+import { isNumber } from '@polkadot/util';
 function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthType) {
   const accountSelected = authInfo ? authInfo.isAllowed ? Object.keys(authInfo.isAllowedMap).filter(address => authInfo.isAllowedMap[address]) : [] : [];
   let authTypeFilter = ({
@@ -102,33 +101,36 @@ export default class KoniTabs {
   }
 
   /// Clone from Polkadot.js
-  getSigningPair(address) {
-    const pair = keyring.getPair(address);
-    assert(pair, t('Unable to find account'));
-    return pair;
-  }
   async bytesSign(url, request) {
     const address = request.address;
-    const pair = this.getSigningPair(address);
-    const authInfo = await this.getAuthInfo(url);
-    if (!authInfo || !authInfo.isAllowed || !authInfo.isAllowedMap[pair.address]) {
-      throw new Error('Account {{address}} not in allowed list'.replace('{{address}}', address));
-    }
+    const payloadValidate = {
+      address,
+      networkKey: '',
+      errors: [],
+      payloadAfterValidated: request
+    };
+    const {
+      pair
+    } = await generateValidationProcess(this.#koniState, url, payloadValidate, [validationAuthMiddleware]);
     return this.#koniState.sign(url, new RequestBytesSign(request), {
       address,
-      ...pair.meta
+      ...(pair === null || pair === void 0 ? void 0 : pair.meta)
     });
   }
   async extrinsicSign(url, request) {
     const address = request.address;
-    const pair = this.getSigningPair(address);
-    const authInfo = await this.getAuthInfo(url);
-    if (!authInfo || !authInfo.isAllowed || !authInfo.isAllowedMap[pair.address]) {
-      throw new Error('Account {{address}} not in allowed list'.replace('{{address}}', address));
-    }
+    const payloadValidate = {
+      address,
+      networkKey: '',
+      errors: [],
+      payloadAfterValidated: request
+    };
+    const {
+      pair
+    } = await generateValidationProcess(this.#koniState, url, payloadValidate, [validationAuthMiddleware]);
     return this.#koniState.sign(url, new RequestExtrinsicSign(request), {
       address,
-      ...pair.meta
+      ...(pair === null || pair === void 0 ? void 0 : pair.meta)
     });
   }
   metadataProvide(url, request) {
@@ -747,8 +749,19 @@ export default class KoniTabs {
         params: params,
         id
       }, (error, result) => {
-        const err = (result === null || result === void 0 ? void 0 : result.error) || error;
+        let err = (result === null || result === void 0 ? void 0 : result.error) || error;
         if (err) {
+          let message = err.message.toLowerCase();
+          if (message.includes('method not found') || message.includes('not supported') || message.includes('is not available')) {
+            message = 'This method is not supported by SubWallet. Try again or contact support at agent@subwallet.app';
+          }
+          if (message.includes('network is disconnected')) {
+            message = 'Re-enable the network or change RPC on the extension and try again';
+          }
+          err = {
+            ...err,
+            message
+          };
           reject(err);
         } else {
           const rs = result === null || result === void 0 ? void 0 : result.result;
@@ -766,8 +779,7 @@ export default class KoniTabs {
     method,
     params
   }) {
-    const allowedAccounts = await this.getEvmCurrentAccount(url);
-    const signResult = await this.#koniState.evmSign(id, url, method, params, allowedAccounts);
+    const signResult = await this.#koniState.evmSign(id, url, method, params);
     if (signResult) {
       return signResult;
     } else {
@@ -778,17 +790,7 @@ export default class KoniTabs {
     params
   }) {
     const transactionParams = params[0];
-    const canUseAccount = transactionParams.from && this.canUseAccount(transactionParams.from, url);
-    const evmState = await this.getEvmState(url);
-    const networkKey = evmState.networkKey;
-    if (!canUseAccount) {
-      throw new Error(t('You have rescinded allowance for this account in wallet'));
-    }
-    if (!networkKey) {
-      throw new Error('Network unavailable. Please switch network or manually add network to wallet');
-    }
-    const allowedAccounts = await this.getEvmCurrentAccount(url);
-    const transactionHash = await this.#koniState.evmSendTransaction(id, url, networkKey, allowedAccounts, transactionParams);
+    const transactionHash = await this.#koniState.evmSendTransaction(id, url, transactionParams);
     if (!transactionHash) {
       throw new EvmProviderError(EvmProviderErrorType.USER_REJECTED_REQUEST);
     }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.2.24-2",
+  "version": "1.2.25-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -129,11 +129,21 @@
       "require": "./cjs/constants/storage.js",
       "default": "./constants/storage.js"
     },
+    "./core/logic-validation": {
+      "types": "./core/logic-validation/index.d.ts",
+      "require": "./cjs/core/logic-validation/index.js",
+      "default": "./core/logic-validation/index.js"
+    },
     "./core/logic-validation/earning": {
       "types": "./core/logic-validation/earning.d.ts",
       "require": "./cjs/core/logic-validation/earning.js",
       "default": "./core/logic-validation/earning.js"
     },
+    "./core/logic-validation/request": {
+      "types": "./core/logic-validation/request.d.ts",
+      "require": "./cjs/core/logic-validation/request.js",
+      "default": "./core/logic-validation/request.js"
+    },
     "./core/logic-validation/swap": {
       "types": "./core/logic-validation/swap.d.ts",
       "require": "./cjs/core/logic-validation/swap.js",
@@ -2059,11 +2069,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.81",
-    "@subwallet/extension-base": "^1.2.24-2",
-    "@subwallet/extension-chains": "^1.2.24-2",
-    "@subwallet/extension-dapp": "^1.2.24-2",
-    "@subwallet/extension-inject": "^1.2.24-2",
+    "@subwallet/chain-list": "0.2.82",
+    "@subwallet/extension-base": "^1.2.25-1",
+    "@subwallet/extension-chains": "^1.2.25-1",
+    "@subwallet/extension-dapp": "^1.2.25-1",
+    "@subwallet/extension-inject": "^1.2.25-1",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/keyvaluestorage": "^1.1.1",

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.2.24-2'
+  version: '1.2.25-1'
 };