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

package/background/KoniTypes.d.ts

@@ -664,6 +664,7 @@ export interface CreateHardwareAccountItem {
     isEthereum: boolean;
     isGeneric: boolean;
     isLedgerRecovery?: boolean;
+    isSubstrateECDSA?: boolean;
 }
 export interface RequestAccountCreateHardwareV2 extends CreateHardwareAccountItem {
     isAllowed?: boolean;
@@ -1235,6 +1236,10 @@ export interface LedgerNetwork {
     /** Slip44 in the derivation path */
     slip44: number;
 }
+export declare const enum POLKADOT_LEDGER_SCHEME {
+    ED25519 = "ed25519",
+    ECDSA = "ecdsa"
+}
 export interface MigrationLedgerNetwork extends Omit<LedgerNetwork, 'isGeneric' | 'isEthereum' | 'isDevMode' | 'icon'> {
     ss58_addr_type: number;
 }

package/background/KoniTypes.js

@@ -217,6 +217,11 @@ export let CardanoProviderErrorType;
   CardanoProviderErrorType["SUBMIT_TRANSACTION_FAILURE"] = "SUBMIT_TRANSACTION_FAILURE";
   CardanoProviderErrorType["SIGN_TRANSACTION_DECLINED"] = "SIGN_TRANSACTION_DECLINED";
 })(CardanoProviderErrorType || (CardanoProviderErrorType = {}));
+export let POLKADOT_LEDGER_SCHEME;
+(function (POLKADOT_LEDGER_SCHEME) {
+  POLKADOT_LEDGER_SCHEME["ED25519"] = "ed25519";
+  POLKADOT_LEDGER_SCHEME["ECDSA"] = "ecdsa";
+})(POLKADOT_LEDGER_SCHEME || (POLKADOT_LEDGER_SCHEME = {}));
 export let NotificationType;
 (function (NotificationType) {
   NotificationType["INFO"] = "info";

package/background/types.d.ts

@@ -119,6 +119,7 @@ export interface RequestAuthorizeTab {
     accountAuthTypes?: AccountAuthType[];
     allowedAccounts?: string[];
     reConfirm?: boolean;
+    canConnectSubstrateEcdsa?: boolean;
 }
 export interface RequestAuthorizeApprove {
     id: string;
@@ -195,6 +196,7 @@ export interface RequestAccountBatchExport {
 export interface RequestAccountList {
     anyType?: boolean;
     accountAuthType?: AccountAuthType;
+    isSubstrateConnector?: boolean;
 }
 export interface RequestAccountSubscribe {
     accountAuthType?: AccountAuthType;

package/cjs/background/KoniTypes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WalletUnlockType = exports.TransactionDirection = exports.ThemeNames = exports.StakingType = exports.RuntimeEnvironment = exports.RMRK_VER = exports.ProviderErrorType = exports.NotificationType = exports.NETWORK_STATUS = exports.MobileOS = exports.MantaPayEnableMessage = exports.ExtrinsicType = exports.ExtrinsicStatus = exports.ExternalRequestPromiseStatus = exports.EvmProviderErrorType = exports.CrowdloanParaState = exports.ContractType = exports.ChainType = exports.CardanoProviderErrorType = exports.CampaignDataType = exports.BitcoinProviderErrorType = exports.BalanceErrorType = exports.AssetHubNftType = exports.AccountExternalErrorCode = exports.APIItemState = void 0;
+exports.WalletUnlockType = exports.TransactionDirection = exports.ThemeNames = exports.StakingType = exports.RuntimeEnvironment = exports.RMRK_VER = exports.ProviderErrorType = exports.POLKADOT_LEDGER_SCHEME = exports.NotificationType = exports.NETWORK_STATUS = exports.MobileOS = exports.MantaPayEnableMessage = exports.ExtrinsicType = exports.ExtrinsicStatus = exports.ExternalRequestPromiseStatus = exports.EvmProviderErrorType = exports.CrowdloanParaState = exports.ContractType = exports.ChainType = exports.CardanoProviderErrorType = exports.CampaignDataType = exports.BitcoinProviderErrorType = exports.BalanceErrorType = exports.AssetHubNftType = exports.AccountExternalErrorCode = exports.APIItemState = void 0;
 // Copyright 2019-2022 @polkadot/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 let RuntimeEnvironment;
@@ -233,6 +233,12 @@ exports.CardanoProviderErrorType = CardanoProviderErrorType;
   CardanoProviderErrorType["SUBMIT_TRANSACTION_FAILURE"] = "SUBMIT_TRANSACTION_FAILURE";
   CardanoProviderErrorType["SIGN_TRANSACTION_DECLINED"] = "SIGN_TRANSACTION_DECLINED";
 })(CardanoProviderErrorType || (exports.CardanoProviderErrorType = CardanoProviderErrorType = {}));
+let POLKADOT_LEDGER_SCHEME;
+exports.POLKADOT_LEDGER_SCHEME = POLKADOT_LEDGER_SCHEME;
+(function (POLKADOT_LEDGER_SCHEME) {
+  POLKADOT_LEDGER_SCHEME["ED25519"] = "ed25519";
+  POLKADOT_LEDGER_SCHEME["ECDSA"] = "ecdsa";
+})(POLKADOT_LEDGER_SCHEME || (exports.POLKADOT_LEDGER_SCHEME = POLKADOT_LEDGER_SCHEME = {}));
 let NotificationType;
 exports.NotificationType = NotificationType;
 (function (NotificationType) {

package/cjs/core/logic-validation/request.js

@@ -28,16 +28,17 @@ var _CardanoProviderError = require("@subwallet/extension-base/background/errors
 var _EvmProviderError = require("@subwallet/extension-base/background/errors/EvmProviderError");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/types");
-var _utils = require("@subwallet/extension-base/utils");
+var _utils2 = require("@subwallet/extension-base/utils");
 var _cardano = require("@subwallet/extension-base/utils/cardano");
 var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _keyring = require("@subwallet/keyring");
-var _utils2 = require("@subwallet/keyring/utils");
+var _utils3 = require("@subwallet/keyring/utils");
 var _validate = require("@subwallet/keyring/utils/address/validate");
 var _uiKeyring = require("@subwallet/ui-keyring");
-var _utils3 = require("@walletconnect/utils");
+var _utils4 = require("@walletconnect/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _bn = _interopRequireDefault(require("bn.js"));
 var _i18next = require("i18next");
@@ -175,7 +176,7 @@ async function validationAuthMiddleware(koni, url, payload) {
         return handleAuthError(payload, 'Unable to find account', 'dApp', errors);
       } else {
         const authList = await koni.getAuthList();
-        const authInfo = authList[(0, _utils.stripUrl)(url)];
+        const authInfo = authList[(0, _utils2.stripUrl)(url)];
         if (!authInfo || !authInfo.isAllowed || !authInfo.isAllowedMap[payload.pair.address]) {
           return handleAuthError(payload, 'Account not in allowed list', 'dApp', errors);
         }
@@ -248,7 +249,7 @@ async function validationConnectMiddleware(koni, url, payload) {
 
     // Calculate transaction data
     try {
-      await Promise.race([checkProviderConnected(), (0, _utils.wait)(3000).then(async () => {
+      await Promise.race([checkProviderConnected(), (0, _utils2.wait)(3000).then(async () => {
         if (!currentProviderConnected) {
           await koni.chainService.initSingleApi(networkKey);
           await checkProviderConnected();
@@ -272,7 +273,8 @@ 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;
@@ -310,8 +312,25 @@ async function validationEvmDataTransactionMiddleware(koni, url, payload) {
   if (!fromAddress || !(0, _utilCrypto.isEthereumAddress)(fromAddress)) {
     handleError('the sender address must be the ethereum address type');
   }
-  if (transaction.to && !(0, _utilCrypto.isEthereumAddress)(transaction.to)) {
-    handleError('invalid recipient address');
+  const pair = pair_ || _uiKeyring.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 (!(0, _utilCrypto.isEthereumAddress)(transaction.to)) {
+      handleError('invalid recipient address');
+    } else {
+      try {
+        const pairTo = _uiKeyring.keyring.getPair(transaction.to);
+        if (pairTo && pairTo.meta.isSubstrateECDSA && !(0, _utils._isSubstrateEvmCompatibleChain)(evmNetwork)) {
+          handleError('substrate account cannot receive this token');
+        }
+      } catch (e) {}
+    }
   }
   if (fromAddress === transaction.to) {
     handleError('receiving address must be different from sending address');
@@ -321,7 +340,7 @@ async function validationEvmDataTransactionMiddleware(koni, url, payload) {
       if (transaction.value) {
         try {
           const valueBn = new _bignumber.default(transaction.value.toString());
-          if (!valueBn.eq(_utils.BN_ZERO)) {
+          if (!valueBn.eq(_utils2.BN_ZERO)) {
             handleError('Recipient address not found');
           }
         } catch (e) {
@@ -345,7 +364,7 @@ async function validationEvmDataTransactionMiddleware(koni, url, payload) {
 
     // Calculate transaction data
     try {
-      await Promise.race([getTransactionGas(), (0, _utils.wait)(3000).then(async () => {
+      await Promise.race([getTransactionGas(), (0, _utils2.wait)(3000).then(async () => {
         if (!transaction.gas) {
           await koni.chainService.initSingleApi(networkKey || '');
           await getTransactionGas();
@@ -368,7 +387,7 @@ async function validationEvmDataTransactionMiddleware(koni, url, payload) {
         const gasLimit = transaction.gas || (await evmApi.api.eth.estimateGas(transaction));
         const id = (0, _getId.getId)();
         const feeInfo = await koni.feeService.subscribeChainFee(id, networkKey, 'evm');
-        const feeCombine = (0, _utils.combineEthFee)(feeInfo);
+        const feeCombine = (0, _utils2.combineEthFee)(feeInfo);
         if (transaction.maxFeePerGas) {
           estimateGas = new _bignumber.default(transaction.maxFeePerGas.toString()).multipliedBy(gasLimit).toFixed(0);
         } else if (transaction.gasPrice) {
@@ -407,7 +426,6 @@ 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 = '';
@@ -443,7 +461,7 @@ async function validationEvmSignMessageMiddleware(koni, url, payload_) {
   const {
     promise,
     resolve
-  } = (0, _utils.createPromiseHandler)();
+  } = (0, _utils2.createPromiseHandler)();
   let hashPayload = '';
   let canSign = false;
   const handleError = message_ => {
@@ -458,6 +476,12 @@ async function validationEvmSignMessageMiddleware(koni, url, payload_) {
     handleError('Not found address or payload to sign');
   }
   const pair = pair_ || _uiKeyring.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');
@@ -526,14 +550,14 @@ function validationAuthWCMiddleware(koni, url, payload, topic) {
   const {
     promise,
     resolve
-  } = (0, _utils.createPromiseHandler)();
+  } = (0, _utils2.createPromiseHandler)();
   const {
     address,
     errors
   } = payload;
   if (!topic) {
     payload.errorPosition = 'dApp';
-    errors.push(new Error((0, _utils3.getSdkError)('UNAUTHORIZED_EXTEND_REQUEST').message));
+    errors.push(new Error((0, _utils4.getSdkError)('UNAUTHORIZED_EXTEND_REQUEST').message));
   } else {
     const requestSession = koni.walletConnectService.getSession(topic);
     let sessionAccounts = [];
@@ -556,7 +580,7 @@ function validationAuthWCMiddleware(koni, url, payload, topic) {
           const [message] = convertErrorMessage('Unable to find account');
           errors.push(new Error(message));
         }
-        const isExitsAccount = sessionAccounts.find(account => (0, _utils.isSameAddress)(account, address));
+        const isExitsAccount = sessionAccounts.find(account => (0, _utils2.isSameAddress)(account, address));
         if (!isExitsAccount) {
           payload.errorPosition = 'dApp';
           const [message] = convertErrorMessage('Account not in allowed list');
@@ -577,7 +601,7 @@ function validationAuthWCMiddleware(koni, url, payload, topic) {
 }
 async function validationAuthCardanoMiddleware(koni, url, payload) {
   const authList = await koni.getAuthList();
-  const authInfo = authList[(0, _utils.stripUrl)(url)];
+  const authInfo = authList[(0, _utils2.stripUrl)(url)];
   const {
     address,
     errors
@@ -600,14 +624,14 @@ async function validationAuthCardanoMiddleware(koni, url, payload) {
     if (!authInfo.isAllowedMap[address]) {
       return handleAuthError(payload, 'Account not in allowed list', 'dApp', errors);
     }
-    const addressByChainFormat = (0, _utils.reformatAddress)(currentAddress, currentNetworkId);
-    if (!(0, _utils.isSameAddress)(addressByChainFormat, address)) {
+    const addressByChainFormat = (0, _utils2.reformatAddress)(currentAddress, currentNetworkId);
+    if (!(0, _utils2.isSameAddress)(addressByChainFormat, address)) {
       return handleAuthError(payload, 'Current account is changed', 'dApp', errors);
     }
   } else if ((0, _keyring.isCardanoRewardAddress)(address)) {
     const rewardAddress = pair.cardano.rewardAddress;
-    const addressByChainFormat = (0, _utils.reformatAddress)(rewardAddress, currentNetworkId);
-    if (!(0, _utils.isSameAddress)(addressByChainFormat, address)) {
+    const addressByChainFormat = (0, _utils2.reformatAddress)(rewardAddress, currentNetworkId);
+    if (!(0, _utils2.isSameAddress)(addressByChainFormat, address)) {
       return handleAuthError(payload, 'Current account is changed', 'dApp', errors);
     }
   }
@@ -630,7 +654,7 @@ async function validationCardanoSignDataMiddleware(koni, url, payload_) {
   const {
     promise,
     resolve
-  } = (0, _utils.createPromiseHandler)();
+  } = (0, _utils2.createPromiseHandler)();
   let canSign = false;
   const handleError = message_ => {
     payload_.errorPosition = 'ui';
@@ -734,7 +758,7 @@ async function validationBitcoinSignMessageMiddleware(koni, url, payload_) {
   const {
     promise,
     resolve
-  } = (0, _utils.createPromiseHandler)();
+  } = (0, _utils2.createPromiseHandler)();
   const handleError = message_ => {
     payload_.errorPosition = 'ui';
     payload_.confirmationType = 'bitcoinSignatureRequest';
@@ -791,7 +815,7 @@ async function validationBitcoinSignPsbtMiddleware(koni, url, payload_) {
   const {
     promise,
     resolve
-  } = (0, _utils.createPromiseHandler)();
+  } = (0, _utils2.createPromiseHandler)();
   const handleError = message_ => {
     payload_.errorPosition = 'ui';
     payload_.confirmationType = 'bitcoinSignPsbtRequest';
@@ -815,7 +839,7 @@ async function validationBitcoinSignPsbtMiddleware(koni, url, payload_) {
   if (!(0, _validate.isBitcoinAddress)(address)) {
     handleError((0, _i18next.t)('Not found address'));
   }
-  const addressInfo = (0, _utils2.getBitcoinAddressInfo)(address);
+  const addressInfo = (0, _utils3.getBitcoinAddressInfo)(address);
   if (psbtParams.network !== addressInfo.network) {
     handleError((0, _i18next.t)('The account or the network is not matched'));
   }
@@ -855,8 +879,8 @@ async function validationBitcoinSendTransactionMiddleware(koni, url, payload_) {
   const {
     promise,
     resolve
-  } = (0, _utils.createPromiseHandler)();
-  const senderAccountInfo = (0, _utils2.getBitcoinAddressInfo)(address);
+  } = (0, _utils2.createPromiseHandler)();
+  const senderAccountInfo = (0, _utils3.getBitcoinAddressInfo)(address);
   const handleError = message_ => {
     payload_.errorPosition = 'ui';
     payload_.confirmationType = 'bitcoinSendTransactionRequestAfterConfirmation';
@@ -891,7 +915,7 @@ async function validationBitcoinSendTransactionMiddleware(koni, url, payload_) {
   }).length > 0) {
     throw new _BitcoinProviderError.BitcoinProviderError(_KoniTypes.BitcoinProviderErrorType.INVALID_PARAMS);
   }
-  const recipientAccountInfo = (0, _utils2.getBitcoinAddressInfo)(transactionParams.recipients[0].address);
+  const recipientAccountInfo = (0, _utils3.getBitcoinAddressInfo)(transactionParams.recipients[0].address);
   if (recipientAccountInfo.network !== transactionParams.network) {
     handleError((0, _i18next.t)('invalid recipient address'));
   }
@@ -1012,6 +1036,9 @@ function convertErrorMessage(message_, name) {
   if (message.includes('insufficient balance') || message.includes('insufficient funds')) {
     return [(0, _i18next.t)('Insufficient balance on the sender address. Top up your balance and try again'), (0, _i18next.t)('Unable to sign transaction')];
   }
+  if (message.includes('substrate') && message.includes('receive this token')) {
+    return [(0, _i18next.t)('The recipient account is a Ledger Polkadot (EVM) account, which is not supported for this transaction. Change recipient account and try again'), (0, _i18next.t)('Invalid account type')];
+  }
 
   // Sign Message
   if (message.includes('not found address or payload to sign')) {

package/cjs/core/utils.js

@@ -20,8 +20,10 @@ exports.ledgerMustCheckNetwork = ledgerMustCheckNetwork;
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _types2 = require("@subwallet/extension-base/core/substrate/types");
+var _types3 = require("@subwallet/extension-base/core/types");
 var _utils = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
+var _types4 = require("@subwallet/extension-base/types");
 var _utils3 = require("@subwallet/extension-base/utils");
 var _keyring = require("@subwallet/keyring");
 var _utils4 = require("@subwallet/keyring/utils");
@@ -141,7 +143,9 @@ function _isNotDuplicateAddress(validateRecipientParams) {
 function _isSupportLedgerAccount(validateRecipientParams) {
   const {
     account,
+    actionType,
     allowLedgerGenerics,
+    assetInfo,
     destChainInfo
   } = validateRecipientParams;
   if (account !== null && account !== void 0 && account.isHardware) {
@@ -154,6 +158,24 @@ function _isSupportLedgerAccount(validateRecipientParams) {
         return 'Your Ledger account is not supported by {{network}} network.'.replace('{{network}}', destChainName);
       }
     } else {
+      if (account.chainType === _types4.AccountChainType.ETHEREUM) {
+        // For ecdsa substrate account in polkadot ledger app
+        if (account.signMode === _types4.AccountSignMode.ECDSA_SUBSTRATE_LEDGER) {
+          if (actionType === _types3.ActionType.SEND_NFT) {
+            return 'Ledger Polkadot (EVM) address is not supported for NFT transfer';
+          }
+          if (!(0, _utils2._isSubstrateEvmCompatibleChain)(destChainInfo)) {
+            return 'Ledger Polkadot (EVM) address is not supported for this transfer';
+          } else if (assetInfo && !(0, _utils3.isSubstrateEcdsaLedgerAssetSupported)(assetInfo, destChainInfo)) {
+            return 'Ledger Polkadot (EVM) address is not supported for this transfer';
+          }
+        } else {
+          if (!(0, _utils2._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)) {