@subwallet/extension-base 0.8.1-wr2x → 0.8.1-wr3

package/cjs/koni/background/handlers/Extension.js

@@ -13,7 +13,6 @@ var _subscriptions = require("@subwallet/extension-base/background/handlers/subs
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
 var _defaults = require("@subwallet/extension-base/defaults");
-var _balance = require("@subwallet/extension-base/koni/api/dotsama/balance");
 var _parseTransaction = require("@subwallet/extension-base/koni/api/dotsama/parseTransaction");
 var _transfer = require("@subwallet/extension-base/koni/api/dotsama/transfer");
 var _transfer2 = require("@subwallet/extension-base/koni/api/nft/transfer");
@@ -607,6 +606,14 @@ class KoniExtension {
     const transformedAccounts = transformAccounts(storedAccounts);
     return transformedAccounts.filter(a => !a.isReadOnly).map(a => a.address);
   }
+  isAddressValidWithAuthType(address, accountAuthType) {
+    if (accountAuthType === 'substrate') {
+      return !(0, _utilCrypto.isEthereumAddress)(address);
+    } else if (accountAuthType === 'evm') {
+      return (0, _utilCrypto.isEthereumAddress)(address);
+    }
+    return true;
+  }
   filterAccountsByAccountAuthType(accounts, accountAuthType) {
     if (accountAuthType === 'substrate') {
       return accounts.filter(address => !(0, _utilCrypto.isEthereumAddress)(address));
@@ -680,11 +687,15 @@ class KoniExtension {
   _changeAuthorizationPerAcc(address, connectValue, url, callBack) {
     this.#koniState.getAuthorize(value => {
       (0, _util.assert)(value, 'The source is not known');
-      value[url].isAllowedMap[address] = connectValue;
-      console.log('Devbu: ', value);
-      this.#koniState.setAuthorize(value, () => {
+      if (this.isAddressValidWithAuthType(address, value[url].accountAuthType)) {
+        value[url].isAllowedMap[address] = connectValue;
+        console.log('Devbu: ', value);
+        this.#koniState.setAuthorize(value, () => {
+          callBack && callBack(value);
+        });
+      } else {
         callBack && callBack(value);
-      });
+      }
     });
   }
   _changeAuthorizationBlock(connectValue, id) {
@@ -770,6 +781,13 @@ class KoniExtension {
     });
     return true;
   }
+  setCamera(_ref25) {
+    let {
+      camera
+    } = _ref25;
+    this.#koniState.setCamera(camera);
+    return true;
+  }
   saveBrowserConfirmationType(data, id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     this.#koniState.setBrowserConfirmationType(data, cb);
@@ -947,7 +965,9 @@ class KoniExtension {
     this.#koniState.getAuthorize(value => {
       if (value && Object.keys(value).length) {
         Object.keys(value).forEach(url => {
-          value[url].isAllowedMap[address] = isAllowed;
+          if (this.isAddressValidWithAuthType(address, value[url].accountAuthType)) {
+            value[url].isAllowedMap[address] = isAllowed;
+          }
         });
         this.#koniState.setAuthorize(value);
       }
@@ -966,7 +986,7 @@ class KoniExtension {
       }
     });
   }
-  async accountsCreateSuriV2(_ref25) {
+  async accountsCreateSuriV2(_ref26) {
     let {
       genesisHash,
       isAllowed,
@@ -974,7 +994,7 @@ class KoniExtension {
       password,
       suri: _suri,
       types
-    } = _ref25;
+    } = _ref26;
     const addressDict = {};
     let changedAccount = false;
     const hasMasterPassword = _uiKeyring.keyring.keyring.hasMasterPassword;
@@ -1028,10 +1048,10 @@ class KoniExtension {
     });
     return addressDict;
   }
-  async accountsForgetOverride(_ref26) {
+  async accountsForgetOverride(_ref27) {
     let {
       address
-    } = _ref26;
+    } = _ref27;
     _uiKeyring.keyring.forgetAccount(address);
     await new Promise(resolve => {
       this.#koniState.removeAccountRef(address, () => {
@@ -1053,10 +1073,10 @@ class KoniExtension {
 
     // Set current account to all account
     await new Promise(resolve => {
-      this.#koniState.getCurrentAccount(_ref27 => {
+      this.#koniState.getCurrentAccount(_ref28 => {
         let {
           allGenesisHash
-        } = _ref27;
+        } = _ref28;
         this.#koniState.setCurrentAccount({
           currentGenesisHash: allGenesisHash || null,
           address: _constants.ALL_ACCOUNT_KEY
@@ -1065,12 +1085,12 @@ class KoniExtension {
     });
     return true;
   }
-  seedCreateV2(_ref28) {
+  seedCreateV2(_ref29) {
     let {
       length = _Extension.SEED_DEFAULT_LENGTH,
       seed: _seed,
       types
-    } = _ref28;
+    } = _ref29;
     const seed = _seed || (0, _utilCrypto.mnemonicGenerate)(length);
     const rs = {
       seed: seed,
@@ -1081,11 +1101,11 @@ class KoniExtension {
     });
     return rs;
   }
-  seedValidateV2(_ref29) {
+  seedValidateV2(_ref30) {
     let {
       suri,
       types
-    } = _ref29;
+    } = _ref30;
     const {
       phrase
     } = (0, _utilCrypto.keyExtractSuri)(suri);
@@ -1105,11 +1125,11 @@ class KoniExtension {
     });
     return rs;
   }
-  _checkValidatePrivateKey(_ref30) {
+  _checkValidatePrivateKey(_ref31) {
     let {
       suri,
       types
-    } = _ref30;
+    } = _ref31;
     let autoAddPrefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     const {
       phrase
@@ -1132,11 +1152,11 @@ class KoniExtension {
     }
     return rs;
   }
-  metamaskPrivateKeyValidateV2(_ref31) {
+  metamaskPrivateKeyValidateV2(_ref32) {
     let {
       suri,
       types
-    } = _ref31;
+    } = _ref32;
     const isValidSuri = suri.startsWith('0x');
     if (isValidSuri) {
       return this._checkValidatePrivateKey({
@@ -1161,14 +1181,14 @@ class KoniExtension {
       throw new Error(`"${suri}" is not a valid derivation path`);
     }
   }
-  derivationCreateV2(_ref32) {
+  derivationCreateV2(_ref33) {
     let {
       genesisHash,
       isAllowed,
       name,
       parentAddress,
       suri
-    } = _ref32;
+    } = _ref33;
     const childPair = this.deriveV2(parentAddress, suri, {
       genesisHash,
       name,
@@ -1182,14 +1202,14 @@ class KoniExtension {
     });
     return true;
   }
-  jsonRestoreV2(_ref33) {
+  jsonRestoreV2(_ref34) {
     let {
       address,
       file,
       isAllowed,
       password,
       withMasterPassword
-    } = _ref33;
+    } = _ref34;
     const isPasswordValidated = this.validatePassword(file, password);
     if (isPasswordValidated) {
       try {
@@ -1204,13 +1224,13 @@ class KoniExtension {
       throw new Error('Unable to decode using the supplied passphrase');
     }
   }
-  batchRestoreV2(_ref34) {
+  batchRestoreV2(_ref35) {
     let {
       accountsInfo,
       file,
       isAllowed,
       password
-    } = _ref34;
+    } = _ref35;
     const addressList = accountsInfo.map(acc => acc.address);
     const isPasswordValidated = this.validatedAccountsPassword(file, password);
     if (isPasswordValidated) {
@@ -1371,7 +1391,6 @@ class KoniExtension {
     } = inputData;
     const [errors,,, tokenInfo] = this.validateTransfer(tokenSlug, from, to, value, transferAll);
     const warnings = [];
-    const substrateApiMap = this.#koniState.getSubstrateApiMap();
     const evmApiMap = this.#koniState.getEvmApiMap();
     const chainInfo = this.#koniState.getChainInfo(networkKey);
     const nativeTokenInfo = this.#koniState.getNativeTokenInfo(networkKey);
@@ -1389,10 +1408,10 @@ class KoniExtension {
     let transaction;
 
     // Get native token amount
-    const freeBalance = await (0, _balance.getFreeBalance)(networkKey, from, substrateApiMap, evmApiMap, tokenSlug);
+    const freeBalance = await this.#koniState.balanceService.getTokenFreeBalance(from, networkKey, tokenSlug);
     if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to)) {
       chainType = _KoniTypes.ChainType.EVM;
-      const txVal = transferAll ? freeBalance : value || '0';
+      const txVal = transferAll ? freeBalance.value : value || '0';
 
       // Estimate with EVM API
       if ((0, _utils._isTokenEvmSmartContract)(tokenInfo)) {
@@ -1415,7 +1434,7 @@ class KoniExtension {
 
     // Additional validator
     const additionalValidator = swTran => {
-      if (new _util.BN(freeBalance).lt(new _util.BN(transferAmount.value))) {
+      if (new _util.BN(freeBalance.value).lt(new _util.BN(transferAmount.value))) {
         var _swTran$errors;
         (_swTran$errors = swTran.errors) === null || _swTran$errors === void 0 ? void 0 : _swTran$errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_BALANCE));
       }
@@ -1521,11 +1540,11 @@ class KoniExtension {
   enableChain(networkKey) {
     return this.#koniState.enableChain(networkKey);
   }
-  async validateNetwork(_ref35) {
+  async validateNetwork(_ref36) {
     let {
       existedChainSlug,
       provider
-    } = _ref35;
+    } = _ref36;
     return await this.#koniState.validateCustomChain(provider, existedChainSlug);
   }
   resetDefaultNetwork() {
@@ -1563,39 +1582,48 @@ class KoniExtension {
   async validateCustomAsset(data) {
     return await this.#koniState.validateCustomAsset(data);
   }
-  async subscribeAddressFreeBalance(_ref36, id, port) {
+  async getAddressFreeBalance(_ref37) {
     let {
       address,
       networkKey,
       token
-    } = _ref36;
+    } = _ref37;
+    return await this.#koniState.balanceService.getTokenFreeBalance(address, networkKey, token);
+  }
+  async subscribeAddressFreeBalance(_ref38, id, port) {
+    let {
+      address,
+      networkKey,
+      token
+    } = _ref38;
     const cb = (0, _subscriptions.createSubscription)(id, port);
-    this.createUnsubscriptionHandle(id, await (0, _balance.subscribeFreeBalance)(networkKey, address, this.#koniState.getSubstrateApiMap(), this.#koniState.getEvmApiMap(), token, cb));
+    const [unsub, currentFreeBalance] = await this.#koniState.balanceService.subscribeTokenFreeBalance(address, networkKey, token, cb);
+    this.createUnsubscriptionHandle(id, unsub);
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    return id;
+    return currentFreeBalance;
   }
-  async transferCheckReferenceCount(_ref37) {
+  async transferCheckReferenceCount(_ref39) {
     let {
       address,
       networkKey
-    } = _ref37;
+    } = _ref39;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-return
     return await (0, _transfer.checkReferenceCount)(networkKey, address, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
   }
-  async transferCheckSupporting(_ref38) {
+  async transferCheckSupporting(_ref40) {
     let {
       networkKey,
       tokenSlug
-    } = _ref38;
+    } = _ref40;
     const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
     return await (0, _transfer.checkSupportTransfer)(networkKey, tokenInfo, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
   }
-  transferGetExistentialDeposit(_ref39) {
+  transferGetExistentialDeposit(_ref41) {
     let {
       tokenSlug
-    } = _ref39;
+    } = _ref41;
     const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
     return (0, _utils._getTokenMinAmount)(tokenInfo);
   }
@@ -1638,10 +1666,10 @@ class KoniExtension {
     }
     return true;
   }
-  getAccountMeta(_ref40) {
+  getAccountMeta(_ref42) {
     let {
       address
-    } = _ref40;
+    } = _ref42;
     const pair = _uiKeyring.keyring.getPair(address);
     (0, _util.assert)(pair, 'Unable to find pair');
     return {
@@ -1662,14 +1690,14 @@ class KoniExtension {
       }
     });
   }
-  accountsTie2(_ref41) {
+  accountsTie2(_ref43) {
     let {
       address,
       genesisHash
-    } = _ref41;
+    } = _ref43;
     return this.#koniState.setAccountTie(address, genesisHash);
   }
-  async accountsCreateExternalV2(_ref42) {
+  async accountsCreateExternalV2(_ref44) {
     let {
       address,
       genesisHash,
@@ -1677,7 +1705,7 @@ class KoniExtension {
       isEthereum,
       isReadOnly,
       name
-    } = _ref42;
+    } = _ref44;
     try {
       let result;
       try {
@@ -1736,7 +1764,7 @@ class KoniExtension {
       }];
     }
   }
-  async accountsCreateHardwareV2(_ref43) {
+  async accountsCreateHardwareV2(_ref45) {
     let {
       accountIndex,
       address,
@@ -1745,7 +1773,7 @@ class KoniExtension {
       hardwareType,
       isAllowed,
       name
-    } = _ref43;
+    } = _ref45;
     const key = _uiKeyring.keyring.addHardware(address, hardwareType, {
       accountIndex,
       addressOffset,
@@ -1768,10 +1796,10 @@ class KoniExtension {
     });
     return true;
   }
-  async accountsCreateHardwareMultiple(_ref44) {
+  async accountsCreateHardwareMultiple(_ref46) {
     let {
       accounts
-    } = _ref44;
+    } = _ref46;
     const addresses = [];
     if (!accounts.length) {
       throw new Error('No accounts to import');
@@ -1824,14 +1852,14 @@ class KoniExtension {
     });
     return true;
   }
-  async accountsCreateWithSecret(_ref45) {
+  async accountsCreateWithSecret(_ref47) {
     let {
       isAllow,
       isEthereum,
       name,
       publicKey,
       secretKey
-    } = _ref45;
+    } = _ref47;
     try {
       let keyringPair = null;
       if (isEthereum) {
@@ -1974,30 +2002,30 @@ class KoniExtension {
 
   // Parse transaction
 
-  parseSubstrateTransaction(_ref46) {
+  parseSubstrateTransaction(_ref48) {
     let {
       data,
       networkKey
-    } = _ref46;
+    } = _ref48;
     const apiProps = this.#koniState.getSubstrateApi(networkKey);
     const apiPromise = apiProps.api;
     return (0, _parseTransaction.parseSubstrateTransaction)(data, apiPromise);
   }
-  async parseEVMRLP(_ref47) {
+  async parseEVMRLP(_ref49) {
     let {
       data
-    } = _ref47;
+    } = _ref49;
     return await (0, _parseTransaction2.parseEvmRlp)(data, this.#koniState.getChainInfoMap(), this.#koniState.getEvmApiMap());
   }
 
   // Sign
 
-  qrSignSubstrate(_ref48) {
+  qrSignSubstrate(_ref50) {
     let {
       address,
       data,
       networkKey
-    } = _ref48;
+    } = _ref50;
     const pair = _uiKeyring.keyring.getPair(address);
     (0, _util.assert)(pair, 'Unable to find pair');
     if (pair.isLocked) {
@@ -2014,13 +2042,13 @@ class KoniExtension {
       signature: signed
     };
   }
-  async qrSignEVM(_ref49) {
+  async qrSignEVM(_ref51) {
     let {
       address,
       chainId,
       message,
       type
-    } = _ref49;
+    } = _ref51;
     let signed;
     const network = this.getNetworkJsonByChainId(chainId);
     if (!network) {
@@ -2101,11 +2129,11 @@ class KoniExtension {
     });
     return this.#koniState.getNominatorMetadata();
   }
-  async getBondingOptions(_ref50) {
+  async getBondingOptions(_ref52) {
     let {
       chain,
       type
-    } = _ref50;
+    } = _ref52;
     const apiProps = this.#koniState.getSubstrateApi(chain);
     const chainInfo = this.#koniState.getChainInfo(chain);
     const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, type);
@@ -2283,12 +2311,12 @@ class KoniExtension {
   }
 
   // EVM Transaction
-  async parseContractInput(_ref51) {
+  async parseContractInput(_ref53) {
     let {
       chainId,
       contract,
       data
-    } = _ref51;
+    } = _ref53;
     const network = this.getNetworkJsonByChainId(chainId);
     return await (0, _parseTransaction2.parseContractInput)(data, contract, network);
   }
@@ -2341,13 +2369,13 @@ class KoniExtension {
       chainType: _KoniTypes.ChainType.SUBSTRATE
     });
   }
-  async wasmNftGetTransaction(_ref52) {
+  async wasmNftGetTransaction(_ref54) {
     let {
       networkKey,
       params,
       recipientAddress,
       senderAddress
-    } = _ref52;
+    } = _ref54;
     const contractAddress = params.contractAddress;
     const onChainOption = params.onChainOption;
     try {
@@ -2369,12 +2397,12 @@ class KoniExtension {
     });
     return this.#koniState.getKeyringState();
   }
-  keyringChangeMasterPassword(_ref53) {
+  keyringChangeMasterPassword(_ref55) {
     let {
       createNew,
       newPassword,
       oldPassword
-    } = _ref53;
+    } = _ref55;
     try {
       // Remove isMasterPassword meta if createNew
       if (createNew) {
@@ -2409,11 +2437,11 @@ class KoniExtension {
       errors: []
     };
   }
-  keyringMigrateMasterPassword(_ref54) {
+  keyringMigrateMasterPassword(_ref56) {
     let {
       address,
       password
-    } = _ref54;
+    } = _ref56;
     try {
       _uiKeyring.keyring.migrateWithMasterPassword(address, password);
     } catch (e) {
@@ -2428,10 +2456,10 @@ class KoniExtension {
       errors: []
     };
   }
-  keyringUnlock(_ref55) {
+  keyringUnlock(_ref57) {
     let {
       password
-    } = _ref55;
+    } = _ref57;
     try {
       _uiKeyring.keyring.unlockKeyring(password);
     } catch (e) {
@@ -2458,11 +2486,11 @@ class KoniExtension {
       isLocked: true
     });
   }
-  keyringExportMnemonic(_ref56) {
+  keyringExportMnemonic(_ref58) {
     let {
       address,
       password
-    } = _ref56;
+    } = _ref58;
     const pair = _uiKeyring.keyring.getPair(address);
     const result = pair.exportMnemonic(password);
     return {
@@ -2471,10 +2499,10 @@ class KoniExtension {
   }
 
   /// Signing external request
-  signingApprovePasswordV2(_ref57) {
+  signingApprovePasswordV2(_ref59) {
     let {
       id
-    } = _ref57;
+    } = _ref59;
     const queued = this.#koniState.getSignRequest(id);
     (0, _util.assert)(queued, 'Unable to find request');
     const {
@@ -2521,22 +2549,22 @@ class KoniExtension {
 
   /// Derive account
 
-  derivationCreateMultiple(_ref58) {
+  derivationCreateMultiple(_ref60) {
     let {
       isAllowed,
       items,
       parentAddress
-    } = _ref58;
+    } = _ref60;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
       _uiKeyring.keyring.unlockPair(parentPair.address);
     }
-    const createChild = _ref59 => {
+    const createChild = _ref61 => {
       let {
         name,
         suri
-      } = _ref59;
+      } = _ref61;
       const meta = {
         name: name,
         parentAddress
@@ -2582,10 +2610,10 @@ class KoniExtension {
     }
     return true;
   }
-  derivationCreateV3(_ref60) {
+  derivationCreateV3(_ref62) {
     let {
       address: parentAddress
-    } = _ref60;
+    } = _ref62;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -2617,11 +2645,11 @@ class KoniExtension {
     });
     return true;
   }
-  validateDerivePath(_ref61) {
+  validateDerivePath(_ref63) {
     let {
       parentAddress,
       suri
-    } = _ref61;
+    } = _ref63;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -2654,12 +2682,12 @@ class KoniExtension {
       suri: meta.suri
     };
   }
-  getListDeriveAccounts(_ref62) {
+  getListDeriveAccounts(_ref64) {
     let {
       limit,
       page,
       parentAddress
-    } = _ref62;
+    } = _ref64;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -2737,10 +2765,10 @@ class KoniExtension {
   getSupportedSmartContractTypes() {
     return this.#koniState.getSupportedSmartContractTypes();
   }
-  getTransaction(_ref63) {
+  getTransaction(_ref65) {
     let {
       id
-    } = _ref63;
+    } = _ref65;
     const {
       transaction,
       ...transactionResult
@@ -2750,8 +2778,8 @@ class KoniExtension {
   subscribeTransactions(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     function convertRs(rs) {
-      return Object.fromEntries(Object.entries(rs).map(_ref64 => {
-        let [key, value] = _ref64;
+      return Object.fromEntries(Object.entries(rs).map(_ref66 => {
+        let [key, value] = _ref66;
         const {
           transaction,
           ...transactionResult
@@ -2769,6 +2797,18 @@ class KoniExtension {
     });
     return convertRs(transactionsSubject.getValue());
   }
+  subscribeNotifications(id, port) {
+    const cb = (0, _subscriptions.createSubscription)(id, port);
+    const notificationSubject = this.#koniState.notificationService.getNotificationSubject();
+    const notificationSubscription = notificationSubject.subscribe(rs => {
+      cb(rs);
+    });
+    port.onDisconnect.addListener(() => {
+      notificationSubscription.unsubscribe();
+      this.cancelSubscription(id);
+    });
+    return notificationSubject.value;
+  }
 
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
@@ -2817,8 +2857,6 @@ class KoniExtension {
         return this.seedCreate(request);
       case 'pri(seed.validate)':
         return this.seedValidate(request);
-      case 'pri(settings.notification)':
-        return this.#koniState.setNotification(request);
       case 'pri(signing.approve.signature)':
         return this.signingApproveSignature(request);
       case 'pri(signing.cancel)':
@@ -2895,6 +2933,8 @@ class KoniExtension {
         return await this.subscribeSettings(id, port);
       case 'pri(settings.saveAccountAllLogo)':
         return this.saveAccountAllLogo(request, id, port);
+      case 'pri(settings.saveCamera)':
+        return this.setCamera(request);
       case 'pri(settings.saveTheme)':
         return this.saveTheme(request, id, port);
       case 'pri(settings.saveBrowserConfirmationType)':
@@ -2977,6 +3017,8 @@ class KoniExtension {
         return await this.transferCheckSupporting(request);
       case 'pri(transfer.getExistentialDeposit)':
         return this.transferGetExistentialDeposit(request);
+      case 'pri(freeBalance.get)':
+        return this.getAddressFreeBalance(request);
       case 'pri(freeBalance.subscribe)':
         return this.subscribeAddressFreeBalance(request, id, port);
       case 'pri(subscription.cancel)':
@@ -3104,6 +3146,10 @@ class KoniExtension {
       case 'pri(transactions.subscribe)':
         return this.subscribeTransactions(id, port);
 
+      // Notification
+      case 'pri(notifications.subscribe)':
+        return this.subscribeNotifications(id, port);
+
       // Default
       default:
         throw new Error(`Unable to handle message of type ${type}`);