@subwallet/extension-base 1.3.45-1 → 1.3.47-0

package/cjs/utils/gear/vft.js

@@ -3,33 +3,32 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VftService = exports.VFT = void 0;
-var _api = require("@gear-js/api");
+exports.sailsCache = exports.VftService = exports.VFT = void 0;
 var _sailsJs = require("sails-js");
-var _types = require("@polkadot/types");
+var _sailsJsParser = require("sails-js-parser");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 class VFT {
   constructor(api) {
     let programId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '0x';
+    let sails = arguments.length > 2 ? arguments[2] : undefined;
     this.api = api;
     this.programId = programId;
-    const types = {};
-    this.registry = new _types.TypeRegistry();
-    this.registry.setKnownTypes({
-      types
-    });
-    this.registry.register(types);
+    this.sails = sails;
+    this.sails.setApi(api);
+    this.sails.setProgramId(programId);
     this.service = new VftService(this);
   }
   newCtorFromCode(code, name, symbol, decimals) {
-    const builder = new _sailsJs.TransactionBuilder(this.api, this.registry, 'upload_program', ['New', name, symbol, decimals], '(String, String, String, u8)', 'String', code);
+    const ctor = this.sails.ctors.New;
+    const builder = ctor.fromCode(code, name, symbol, decimals);
     this.programId = builder.programId;
     return builder;
   }
   newCtorFromCodeId(codeId, name, symbol, decimals) {
-    const builder = new _sailsJs.TransactionBuilder(this.api, this.registry, 'create_program', ['New', name, symbol, decimals], '(String, String, String, u8)', 'String', codeId);
+    const ctor = this.sails.ctors.New;
+    const builder = ctor.fromCodeId(codeId, name, symbol, decimals);
     this.programId = builder.programId;
     return builder;
   }
@@ -39,135 +38,105 @@ class VftService {
   constructor(_program) {
     this._program = _program;
   }
+  get functions() {
+    return this._program.sails.services.Vft.functions;
+  }
+  get queries() {
+    return this._program.sails.services.Vft.queries;
+  }
   approve(spender, value) {
-    if (!this._program.programId) {
-      throw new Error('Program ID is not set');
-    }
-    return new _sailsJs.TransactionBuilder(this._program.api, this._program.registry, 'send_message', ['Vft', 'Approve', spender, value], '(String, String, [u8;32], U256)', 'bool', this._program.programId);
+    return this.functions.Approve(spender, value);
   }
   transfer(to, value) {
-    if (!this._program.programId) {
-      throw new Error('Program ID is not set');
-    }
-    return new _sailsJs.TransactionBuilder(this._program.api, this._program.registry, 'send_message', ['Vft', 'Transfer', to, value], '(String, String, [u8;32], U256)', 'bool', this._program.programId);
+    return this.functions.Transfer(to, value);
   }
   transferFrom(from, to, value) {
-    if (!this._program.programId) {
-      throw new Error('Program ID is not set');
+    return this.functions.TransferFrom(from, to, value);
+  }
+  allowance(owner, spender, originAddress, value, atBlock) {
+    return this.queries.Allowance(originAddress, BigInt(value || 0), atBlock, owner, spender);
+  }
+  balanceOf(account, originAddress, value, atBlock) {
+    return this.queries.BalanceOf(originAddress, BigInt(value || 0), atBlock, account);
+  }
+  decimals(originAddress, value, atBlock) {
+    return this.queries.Decimals(originAddress, BigInt(value || 0), atBlock);
+  }
+  name(originAddress, value, atBlock) {
+    return this.queries.Name(originAddress, BigInt(value || 0), atBlock);
+  }
+  symbol(originAddress, value, atBlock) {
+    return this.queries.Symbol(originAddress, BigInt(value || 0), atBlock);
+  }
+  totalSupply(originAddress, value, atBlock) {
+    return this.queries.TotalSupply(originAddress, BigInt(value || 0), atBlock);
+  }
+  async subscribeToApprovalEvent(callback) {
+    return this._program.sails.services.Vft.events.Approval.subscribe(callback);
+  }
+  async subscribeToTransferEvent(callback) {
+    return this._program.sails.services.Vft.events.Transfer.subscribe(callback);
+  }
+}
+
+// Cache sai
+exports.VftService = VftService;
+const vftIdl = `
+constructor {
+  New : (name: str, symbol: str, decimals: u8);
+};
+
+service Vft {
+  Approve : (spender: actor_id, value: u256) -> bool;
+  Transfer : (to: actor_id, value: u256) -> bool;
+  TransferFrom : (from: actor_id, to: actor_id, value: u256) -> bool;
+
+  query Allowance : (owner: actor_id, spender: actor_id) -> u256;
+  query BalanceOf : (account: actor_id) -> u256;
+  query Decimals : () -> u8;
+  query Name : () -> str;
+  query Symbol : () -> str;
+  query TotalSupply : () -> u256;
+
+  events {
+    Approval: struct {
+      owner: actor_id,
+      spender: actor_id,
+      value: u256,
+    };
+    Transfer: struct {
+      from: actor_id,
+      to: actor_id,
+      value: u256,
+    };
+  }
+};
+`;
+class SailsCache {
+  static instance = null;
+  sail = null;
+
+  // eslint-disable-next-line no-useless-constructor, @typescript-eslint/no-empty-function
+  constructor() {}
+  static getInstance() {
+    if (!SailsCache.instance) {
+      SailsCache.instance = new SailsCache();
+    }
+    return SailsCache.instance;
+  }
+  async init() {
+    if (!this.sail) {
+      const parser = await _sailsJsParser.SailsIdlParser.new();
+      const sails = new _sailsJs.Sails(parser);
+      this.sail = sails.parseIdl(vftIdl);
+    }
+  }
+  get() {
+    if (!this.sail) {
+      throw new Error('Sails is not init yet');
     }
-    return new _sailsJs.TransactionBuilder(this._program.api, this._program.registry, 'send_message', ['Vft', 'TransferFrom', from, to, value], '(String, String, [u8;32], [u8;32], U256)', 'bool', this._program.programId);
-  }
-  async allowance(owner, spender, originAddress, value, atBlock) {
-    const payload = this._program.registry.createType('(String, String, [u8;32], [u8;32])', ['Vft', 'Allowance', owner, spender]).toHex();
-    const reply = await this._program.api.message.calculateReply({
-      destination: this._program.programId,
-      origin: (0, _api.decodeAddress)(originAddress),
-      payload,
-      value: value || 0,
-      gasLimit: this._program.api.blockGasLimit.toBigInt(),
-      at: atBlock
-    });
-    const result = this._program.registry.createType('(String, String, U256)', reply.payload);
-    return result[2].toBigInt();
-  }
-  async balanceOf(account, originAddress, value, atBlock) {
-    const payload = this._program.registry.createType('(String, String, [u8;32])', ['Vft', 'BalanceOf', account]).toHex();
-    const reply = await this._program.api.message.calculateReply({
-      destination: this._program.programId,
-      origin: (0, _api.decodeAddress)(originAddress),
-      payload,
-      value: value || 0,
-      gasLimit: this._program.api.blockGasLimit.toBigInt(),
-      at: atBlock
-    });
-    const result = this._program.registry.createType('(String, String, U256)', reply.payload);
-    return result[2].toBigInt();
-  }
-  async decimals(originAddress, value, atBlock) {
-    const payload = this._program.registry.createType('(String, String)', ['Vft', 'Decimals']).toHex();
-    const reply = await this._program.api.message.calculateReply({
-      destination: this._program.programId,
-      origin: (0, _api.decodeAddress)(originAddress),
-      payload,
-      value: value || 0,
-      gasLimit: this._program.api.blockGasLimit.toBigInt(),
-      at: atBlock
-    });
-    const result = this._program.registry.createType('(String, String, u8)', reply.payload);
-    return result[2].toNumber();
-  }
-  async name(originAddress, value, atBlock) {
-    const payload = this._program.registry.createType('(String, String)', ['Vft', 'Name']).toHex();
-    const reply = await this._program.api.message.calculateReply({
-      destination: this._program.programId,
-      origin: (0, _api.decodeAddress)(originAddress),
-      payload,
-      value: value || 0,
-      gasLimit: this._program.api.blockGasLimit.toBigInt(),
-      at: atBlock
-    });
-    const result = this._program.registry.createType('(String, String, String)', reply.payload);
-    return result[2].toString();
-  }
-  async symbol(originAddress, value, atBlock) {
-    const payload = this._program.registry.createType('(String, String)', ['Vft', 'Symbol']).toHex();
-    const reply = await this._program.api.message.calculateReply({
-      destination: this._program.programId,
-      origin: (0, _api.decodeAddress)(originAddress),
-      payload,
-      value: value || 0,
-      gasLimit: this._program.api.blockGasLimit.toBigInt(),
-      at: atBlock
-    });
-    const result = this._program.registry.createType('(String, String, String)', reply.payload);
-    return result[2].toString();
-  }
-  async totalSupply(originAddress, value, atBlock) {
-    const payload = this._program.registry.createType('(String, String)', ['Vft', 'TotalSupply']).toHex();
-    const reply = await this._program.api.message.calculateReply({
-      destination: this._program.programId,
-      origin: (0, _api.decodeAddress)(originAddress),
-      payload,
-      value: value || 0,
-      gasLimit: this._program.api.blockGasLimit.toBigInt(),
-      at: atBlock
-    });
-    const result = this._program.registry.createType('(String, String, U256)', reply.payload);
-    return result[2].toBigInt();
-  }
-  subscribeToApprovalEvent(callback) {
-    return this._program.api.gearEvents.subscribeToGearEvent('UserMessageSent', _ref => {
-      let {
-        data: {
-          message
-        }
-      } = _ref;
-      if (!message.source.eq(this._program.programId) || !message.destination.eq(_sailsJs.ZERO_ADDRESS)) {
-        return;
-      }
-      const payload = message.payload.toHex();
-      if ((0, _sailsJs.getServiceNamePrefix)(payload) === 'Vft' && (0, _sailsJs.getFnNamePrefix)(payload) === 'Approval') {
-        // eslint-disable-next-line node/no-callback-literal,@typescript-eslint/no-floating-promises
-        callback(this._program.registry.createType('(String, String, {"owner":"[u8;32]","spender":"[u8;32]","value":"U256"})', message.payload)[2].toJSON());
-      }
-    });
-  }
-  subscribeToTransferEvent(callback) {
-    return this._program.api.gearEvents.subscribeToGearEvent('UserMessageSent', _ref2 => {
-      let {
-        data: {
-          message
-        }
-      } = _ref2;
-      if (!message.source.eq(this._program.programId) || !message.destination.eq(_sailsJs.ZERO_ADDRESS)) {
-        return;
-      }
-      const payload = message.payload.toHex();
-      if ((0, _sailsJs.getServiceNamePrefix)(payload) === 'Service' && (0, _sailsJs.getFnNamePrefix)(payload) === 'Transfer') {
-        // eslint-disable-next-line node/no-callback-literal,@typescript-eslint/no-floating-promises
-        callback(this._program.registry.createType('(String, String, {"from":"[u8;32]","to":"[u8;32]","value":"U256"})', message.payload)[2].toJSON());
-      }
-    });
+    return this.sail;
   }
 }
-exports.VftService = VftService;
+const sailsCache = SailsCache.getInstance();
+exports.sailsCache = sailsCache;

package/cjs/utils/staticData/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.termAndCondition = exports.staticData = exports.remindNotificationTime = exports.paraSpellChainMap = exports.oldChainPrefix = exports.marketingCampaigns = exports.currencySymbol = exports.crowdloanFunds = exports.buyTokenConfigs = exports.buyServiceInfos = exports.blockedActionsFeatures = exports.blockedActions = exports.StaticKey = void 0;
+exports.termAndCondition = exports.staticData = exports.remindNotificationTime = exports.paraSpellChainMap = exports.oldChainPrefix = exports.marketingCampaigns = exports.currencySymbol = exports.crowdloanFunds = exports.buyTokenConfigs = exports.buyServiceInfos = exports.blockedActionsFeatures = exports.blockedActions = exports.assetHubStakingMap = exports.StaticKey = void 0;
 var _chainList = require("@subwallet/chain-list");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -42,7 +42,10 @@ const oldChainPrefix = require('./oldChainPrefix.json');
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.oldChainPrefix = oldChainPrefix;
 const paraSpellChainMap = require('./paraSpellChainMap.json');
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 exports.paraSpellChainMap = paraSpellChainMap;
+const assetHubStakingMap = require('./assetHubStaking.json');
+exports.assetHubStakingMap = assetHubStakingMap;
 let StaticKey;
 exports.StaticKey = StaticKey;
 (function (StaticKey) {
@@ -58,6 +61,7 @@ exports.StaticKey = StaticKey;
   StaticKey["BLOCKED_ACTIONS"] = "blocked-actions";
   StaticKey["OLD_CHAIN_PREFIX"] = "old-chain-prefix";
   StaticKey["PARASPELL_CHAIN_MAP"] = "paraspell-chain-map";
+  StaticKey["ASSET_HUB_STAKING_MAP"] = "asset-hub-staking-map";
 })(StaticKey || (exports.StaticKey = StaticKey = {}));
 const staticData = {
   [StaticKey.CHAINS]: Object.values(_chainList.ChainInfoMap),
@@ -71,6 +75,7 @@ const staticData = {
   [StaticKey.REMIND_NOTIFICATION_TIME]: remindNotificationTime,
   [StaticKey.BLOCKED_ACTIONS]: blockedActions,
   [StaticKey.OLD_CHAIN_PREFIX]: oldChainPrefix,
-  [StaticKey.PARASPELL_CHAIN_MAP]: paraSpellChainMap
+  [StaticKey.PARASPELL_CHAIN_MAP]: paraSpellChainMap,
+  [StaticKey.ASSET_HUB_STAKING_MAP]: assetHubStakingMap
 };
 exports.staticData = staticData;

package/core/logic-validation/request.js

@@ -7,6 +7,7 @@ import { CardanoProviderError } from '@subwallet/extension-base/background/error
 import { EvmProviderError } from '@subwallet/extension-base/background/errors/EvmProviderError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { BitcoinProviderErrorType, CardanoProviderErrorType, EvmProviderErrorType } from '@subwallet/extension-base/background/KoniTypes';
+import { _isSubstrateEvmCompatibleChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { BasicTxErrorType } from '@subwallet/extension-base/types';
 import { BN_ZERO, combineEthFee, createPromiseHandler, isSameAddress, reformatAddress, stripUrl, wait } from '@subwallet/extension-base/utils';
 import { validateAddressNetwork } from '@subwallet/extension-base/utils/cardano';
@@ -247,7 +248,8 @@ export async function validationEvmDataTransactionMiddleware(koni, url, payload)
   const transactionParams = payload.payloadAfterValidated;
   const {
     address: fromAddress,
-    networkKey
+    networkKey,
+    pair: pair_
   } = payload;
   const evmApi = koni.getEvmApi(networkKey || '');
   const web3 = evmApi === null || evmApi === void 0 ? void 0 : evmApi.api;
@@ -285,8 +287,25 @@ export async function validationEvmDataTransactionMiddleware(koni, url, payload)
   if (!fromAddress || !isEthereumAddress(fromAddress)) {
     handleError('the sender address must be the ethereum address type');
   }
-  if (transaction.to && !isEthereumAddress(transaction.to)) {
-    handleError('invalid recipient address');
+  const pair = pair_ || keyring.getPair(fromAddress);
+  if (!pair) {
+    handleError('Not found address to sign');
+  }
+  if (pair_ !== null && pair_ !== void 0 && pair_.meta.isSubstrateECDSA) {
+    handleError('Substrate account can not send this transaction');
+  }
+  const evmNetwork = koni.getChainInfo(networkKey || '');
+  if (transaction.to) {
+    if (!isEthereumAddress(transaction.to)) {
+      handleError('invalid recipient address');
+    } else {
+      try {
+        const pairTo = keyring.getPair(transaction.to);
+        if (pairTo && pairTo.meta.isSubstrateECDSA && !_isSubstrateEvmCompatibleChain(evmNetwork)) {
+          handleError('substrate account cannot receive this token');
+        }
+      } catch (e) {}
+    }
   }
   if (fromAddress === transaction.to) {
     handleError('receiving address must be different from sending address');
@@ -382,7 +401,6 @@ export async function validationEvmDataTransactionMiddleware(koni, url, payload)
     handleError(e.message);
   }
   const hasError = errors && errors.length > 0 || !networkKey;
-  const evmNetwork = koni.getChainInfo(networkKey || '');
   let isToContract = false;
   let hashPayload = '';
   let parseData = '';
@@ -433,6 +451,12 @@ export async function validationEvmSignMessageMiddleware(koni, url, payload_) {
     handleError('Not found address or payload to sign');
   }
   const pair = pair_ || keyring.getPair(address);
+  if (!pair) {
+    handleError('Not found address to sign');
+  }
+  if (pair_ !== null && pair_ !== void 0 && pair_.meta.isSubstrateECDSA) {
+    handleError('Substrate account can not sign this message');
+  }
   if (method) {
     if (['eth_sign', 'personal_sign', 'eth_signTypedData', 'eth_signTypedData_v1', 'eth_signTypedData_v3', 'eth_signTypedData_v4'].indexOf(method) < 0) {
       handleError('Unsupported action');
@@ -984,6 +1008,9 @@ export function convertErrorMessage(message_, name) {
   if (message.includes('insufficient balance') || message.includes('insufficient funds')) {
     return [t('Insufficient balance on the sender address. Top up your balance and try again'), t('Unable to sign transaction')];
   }
+  if (message.includes('substrate') && message.includes('receive this token')) {
+    return [t('The recipient account is a Ledger Polkadot (EVM) account, which is not supported for this transaction. Change recipient account and try again'), t('Invalid account type')];
+  }
 
   // Sign Message
   if (message.includes('not found address or payload to sign')) {

package/core/types.d.ts

@@ -1,6 +1,6 @@
-import { _ChainInfo } from '@subwallet/chain-list/types';
+import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { AccountJson } from '@subwallet/extension-base/types';
-export declare type LedgerMustCheckType = 'polkadot' | 'migration' | 'unnecessary';
+export declare type LedgerMustCheckType = 'polkadot' | 'migration' | 'polkadot_ecdsa' | 'unnecessary';
 export declare enum ValidationCondition {
     IS_NOT_NULL = "IS_NOT_NULL",
     IS_ADDRESS = "IS_ADDRESS",
@@ -20,6 +20,7 @@ export declare enum ActionType {
 export interface ValidateRecipientParams {
     srcChain: string;
     destChainInfo: _ChainInfo;
+    assetInfo?: _ChainAsset;
     fromAddress: string;
     toAddress: string;
     account: AccountJson | null;

package/core/utils.js

@@ -4,9 +4,11 @@
 import { _AssetType } from '@subwallet/chain-list/types';
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/types';
+import { ActionType } from '@subwallet/extension-base/core/types';
 import { tonAddressInfo } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils';
-import { _getTokenOnChainAssetId, _getXcmAssetMultilocation, _isBridgedToken, _isChainBitcoinCompatible, _isChainCardanoCompatible, _isChainEvmCompatible, _isChainSubstrateCompatible, _isChainTonCompatible } from '@subwallet/extension-base/services/chain-service/utils';
-import { isAddressAndChainCompatible, isSameAddress, reformatAddress } from '@subwallet/extension-base/utils';
+import { _getTokenOnChainAssetId, _getXcmAssetMultilocation, _isBridgedToken, _isChainBitcoinCompatible, _isChainCardanoCompatible, _isChainCompatibleLedgerEvm, _isChainEvmCompatible, _isChainSubstrateCompatible, _isChainTonCompatible, _isSubstrateEvmCompatibleChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { AccountChainType, AccountSignMode } from '@subwallet/extension-base/types';
+import { isAddressAndChainCompatible, isSameAddress, isSubstrateEcdsaLedgerAssetSupported, reformatAddress } from '@subwallet/extension-base/utils';
 import { isAddress, isCardanoTestnetAddress, isTonAddress } from '@subwallet/keyring';
 import { getBitcoinAddressInfo, validateBitcoinAddress } from '@subwallet/keyring/utils';
 import { isEthereumAddress } from '@polkadot/util-crypto';
@@ -122,7 +124,9 @@ export function _isNotDuplicateAddress(validateRecipientParams) {
 export function _isSupportLedgerAccount(validateRecipientParams) {
   const {
     account,
+    actionType,
     allowLedgerGenerics,
+    assetInfo,
     destChainInfo
   } = validateRecipientParams;
   if (account !== null && account !== void 0 && account.isHardware) {
@@ -135,6 +139,24 @@ export function _isSupportLedgerAccount(validateRecipientParams) {
         return 'Your Ledger account is not supported by {{network}} network.'.replace('{{network}}', destChainName);
       }
     } else {
+      if (account.chainType === AccountChainType.ETHEREUM) {
+        // For ecdsa substrate account in polkadot ledger app
+        if (account.signMode === AccountSignMode.ECDSA_SUBSTRATE_LEDGER) {
+          if (actionType === ActionType.SEND_NFT) {
+            return 'Ledger Polkadot (EVM) address is not supported for NFT transfer';
+          }
+          if (!_isSubstrateEvmCompatibleChain(destChainInfo)) {
+            return 'Ledger Polkadot (EVM) address is not supported for this transfer';
+          } else if (assetInfo && !isSubstrateEcdsaLedgerAssetSupported(assetInfo, destChainInfo)) {
+            return 'Ledger Polkadot (EVM) address is not supported for this transfer';
+          }
+        } else {
+          if (!_isChainCompatibleLedgerEvm(destChainInfo)) {
+            return 'Ledger EVM address is not supported for this transfer';
+          }
+        }
+      }
+
       // For ledger generic
       const ledgerCheck = ledgerMustCheckNetwork(account);
       if (ledgerCheck !== 'unnecessary' && !allowLedgerGenerics.includes(destChainInfo.slug)) {

package/koni/api/nft/ordinal_nft/index.js

@@ -46,10 +46,11 @@ export default class OrdinalNftApi extends BaseNftApi {
     this.subscanService = SubscanService.getInstance();
   }
   async handleNft(address, handleNftParams) {
-    const events = await this.subscanService.getAccountRemarkEvents(this.subscanChain, address);
+    const groupId = this.subscanService.getGroupId();
+    const events = await this.subscanService.getAccountRemarkEvents(groupId, this.subscanChain, address);
     if (events && events.length) {
       const extrinsicIds = events.map(data => data.extrinsic_index);
-      const extrinsicParams = await this.subscanService.getExtrinsicParams(this.subscanChain, extrinsicIds);
+      const extrinsicParams = await this.subscanService.getExtrinsicParams(groupId, this.subscanChain, extrinsicIds);
       const items = [];
       for (const data of extrinsicParams) {
         const {

package/koni/background/handlers/Extension.js

@@ -11,6 +11,7 @@ import { CampaignDataType, ChainType, ExternalRequestPromiseStatus, ExtrinsicTyp
 import { _SUPPORT_TOKEN_PAY_FEE_GROUP, ALL_ACCOUNT_KEY, BTC_DUST_AMOUNT, LATEST_SESSION } from '@subwallet/extension-base/constants';
 import { additionalValidateTransferForRecipient, validateTransferRequest, validateXcmMinAmountToMythos, validateXcmTransferRequest } from '@subwallet/extension-base/core/logic-validation/transfer';
 import { _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
+import { ActionType } from '@subwallet/extension-base/core/types';
 import { _isSufficientToken } from '@subwallet/extension-base/core/utils';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
 import { getERC20SpendingApprovalTx } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
@@ -47,7 +48,7 @@ import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectN
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { AccountsStore } from '@subwallet/extension-base/stores';
 import { AccountSignMode, BasicTxErrorType, BasicTxWarningCode, CommonStepType, EarningProcessType, ProcessType, StakingTxErrorType, StepStatus, SwapFeeType, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
-import { _analyzeAddress, calculateMaxTransferable, combineAllAccountProxy, combineBitcoinFee, createPromiseHandler, createTransactionFromRLP, detectTransferTxType, filterUneconomicalUtxos, getAccountSignMode, getSizeInfo, getTransferableBitcoinUtxos, isSameAddress, MODULE_SUPPORT, reformatAddress, signatureToHex, transformAccounts, transformAddresses, uniqueStringArray } from '@subwallet/extension-base/utils';
+import { _analyzeAddress, calculateMaxTransferable, combineAllAccountProxy, combineBitcoinFee, createPromiseHandler, createTransactionFromRLP, detectTransferTxType, filterUneconomicalUtxos, getAccountSignMode, getSizeInfo, getTransferableBitcoinUtxos, isSameAddress, isSubstrateEcdsaLedgerAssetSupported, MODULE_SUPPORT, reformatAddress, signatureToHex, transformAccounts, transformAddresses, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { getId } from '@subwallet/extension-base/utils/getId';
 import { getKeypairTypeByAddress, isAddress, isCardanoAddress, isSubstrateAddress, isTonAddress } from '@subwallet/keyring';
@@ -296,16 +297,32 @@ export default class KoniExtension {
   }
   async subscribeInputAddressData(request, id, port) {
     const {
+      actionType,
       chain,
-      data
+      data,
+      token
     } = request;
     const cb = createSubscription(id, port);
-    const combineFunction = async (chainInfoMap, accountProxyMap, _contacts) => {
+    const combineFunction = async (chainInfoMap, tokenInfoMap, accountProxyMap, _contacts) => {
       const accountProxies = Object.values(accountProxyMap);
       const contacts = transformAddresses(_contacts);
       const chainInfo = chainInfoMap[chain];
+      const tokenInfo = tokenInfoMap[token || ''];
       const substrateApi = this.#koniState.chainService.getSubstrateApi(chain);
-      const rs = await _analyzeAddress(data, accountProxies, contacts, chainInfo, substrateApi);
+      const accountProxiesFiltered = accountProxies.filter(accountProxy => {
+        var _accountProxy$account;
+        const signMode = (_accountProxy$account = accountProxy.accounts[0]) === null || _accountProxy$account === void 0 ? void 0 : _accountProxy$account.signMode;
+        if (signMode === AccountSignMode.ECDSA_SUBSTRATE_LEDGER) {
+          if (actionType === ActionType.SEND_NFT) {
+            return false;
+          }
+          if (tokenInfo) {
+            return isSubstrateEcdsaLedgerAssetSupported(tokenInfo, chainInfo);
+          }
+        }
+        return true;
+      });
+      const rs = await _analyzeAddress(data, accountProxiesFiltered, contacts, chainInfo, substrateApi);
       return {
         id,
         ...rs
@@ -314,16 +331,19 @@ export default class KoniExtension {
     const accountObservable = this.#koniState.keyringService.context.observable.accounts;
     const contactObservable = this.#koniState.keyringService.context.observable.contacts;
     const chainInfoMapObservable = this.#koniState.chainService.subscribeChainInfoMap().asObservable();
+    const tokenInfoMapObservable = this.#koniState.chainService.subscribeAssetRegistry().asObservable();
     const subscription = combineLatest({
       chainInfoMap: chainInfoMapObservable,
+      tokenInfoMap: tokenInfoMapObservable,
       accountProxies: accountObservable,
       contacts: contactObservable
     }).subscribe(({
       accountProxies,
       chainInfoMap,
-      contacts
+      contacts,
+      tokenInfoMap
     }) => {
-      combineFunction(chainInfoMap, accountProxies, contacts).then(rs => cb(rs)).catch(console.error);
+      combineFunction(chainInfoMap, tokenInfoMap, accountProxies, contacts).then(rs => cb(rs)).catch(console.error);
     });
     this.createUnsubscriptionHandle(id, () => {
       subscription.unsubscribe();
@@ -334,7 +354,8 @@ export default class KoniExtension {
     const accountProxyMap = this.#koniState.keyringService.context.value.accounts;
     const contacts = this.#koniState.keyringService.context.value.contacts;
     const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
-    return combineFunction(chainInfoMap, accountProxyMap, contacts);
+    const tokenInfoMap = this.#koniState.chainService.getAssetRegistry();
+    return combineFunction(chainInfoMap, tokenInfoMap, accountProxyMap, contacts);
   }
 
   /**
@@ -1242,6 +1263,8 @@ export default class KoniExtension {
     const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNativeToken && tokenPayFeeSlug === tokenSlug;
     const isCustomTokenPayFeeAssetHub = tokenPayFeeSlug && !_isNativeTokenBySlug(tokenPayFeeSlug) && _SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(chain);
     const isCustomTokenPayFeeHydration = tokenPayFeeSlug && !_isNativeTokenBySlug(tokenPayFeeSlug) && _SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(chain);
+    const pairFrom = keyring.getPair(from);
+    const isSubstrateECDSATransaction = pairFrom.meta.isSubstrateECDSA;
     const extrinsicType = isTransferNativeToken ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.TRANSFER_TOKEN;
     let chainType = ChainType.SUBSTRATE;
     const transferAmount = {
@@ -1258,7 +1281,7 @@ export default class KoniExtension {
       extrinsicType
     });
     try {
-      if (isEthereumAddress(from) && isEthereumAddress(to) && _isTokenTransferredByEvm(transferTokenInfo)) {
+      if (isEthereumAddress(from) && isEthereumAddress(to) && _isTokenTransferredByEvm(transferTokenInfo) && !isSubstrateECDSATransaction) {
         chainType = ChainType.EVM;
         const txVal = transferAll ? transferTokenAvailable.value : value || '0';
         const evmApi = this.#koniState.getEvmApi(chain);

package/koni/background/handlers/State.js

@@ -41,7 +41,7 @@ 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 { BasicTxErrorType } from '@subwallet/extension-base/types';
-import { addLazy, isManifestV3, isSameAddress, reformatAddress, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
+import { addLazy, isManifestV3, isSameAddress, reformatAddress, sailsCache, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
 import { convertCardanoHexToBech32, validateAddressNetwork } from '@subwallet/extension-base/utils/cardano';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import subwalletApiSdk from '@subwallet/subwallet-api-sdk';
@@ -238,6 +238,9 @@ export default class KoniState {
       this.afterChainServiceInit();
     });
 
+    // init sails
+    await sailsCache.init();
+
     // Mark app is ready
     this.eventService.emit('general.init', true);
   }

package/koni/background/handlers/Tabs.js

@@ -26,7 +26,7 @@ import Web3 from 'web3';
 import { checkIfDenied } from '@polkadot/phishing';
 import { hexStripPrefix, isArray, isNumber, u8aToHex } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
-function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthTypes) {
+function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthTypes, isSubstrateConnector) {
   const accountSelected = authInfo ? authInfo.isAllowed ? Object.keys(authInfo.isAllowedMap).filter(address => authInfo.isAllowedMap[address]) : [] : [];
   const authTypeFilter = ({
     json,
@@ -55,6 +55,12 @@ function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthTyp
       if (type === 'cardano' && json.meta.isReadOnly) {
         return false;
       }
+      const canConnectSubstrateEcdsa = (authInfo === null || authInfo === void 0 ? void 0 : authInfo.canConnectSubstrateEcdsa) && isSubstrateConnector;
+
+      // If the dApp has not connected to the Substrate type yet, we do not return Substrate ECDSA accounts.
+      if (type === 'ethereum' && json.meta.isSubstrateECDSA && !canConnectSubstrateEcdsa) {
+        return false;
+      }
       return true;
     } else {
       return true;
@@ -267,7 +273,8 @@ export default class KoniTabs {
   }
   async accountsListV2(url, {
     accountAuthType,
-    anyType
+    anyType,
+    isSubstrateConnector
   }) {
     const authInfo = await this.getAuthInfo(url);
     const accountAuthTypes = [];
@@ -287,7 +294,7 @@ export default class KoniTabs {
         accountAuthTypes.push('cardano');
       }
     }
-    return transformAccountsV2(this.#koniState.keyringService.context.pairs, anyType, authInfo, accountAuthTypes);
+    return transformAccountsV2(this.#koniState.keyringService.context.pairs, anyType, authInfo, accountAuthTypes, isSubstrateConnector);
   }
 
   // TODO: Update logic
@@ -311,7 +318,7 @@ export default class KoniTabs {
             }
           }
           const accounts = this.#koniState.keyringService.context.pairs;
-          return cb(transformAccountsV2(accounts, false, authInfo, accountAuthTypes));
+          return cb(transformAccountsV2(accounts, false, authInfo, accountAuthTypes, true));
         }).catch(console.error);
       }),
       url