@subwallet/extension-base 1.2.32-0 → 1.3.1

package/cjs/services/keyring-service/context/stores/Base.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.StoreSubject = void 0;
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+class StoreSubject {
+  transformInitData(data) {
+    return data !== null && data !== void 0 ? data : this.defaultValue;
+  }
+  init() {
+    this.store.get(this.key, rs => {
+      const data = this.transformInitData(rs);
+      this.subject.next(data);
+    });
+  }
+  get value() {
+    return this.subject.value;
+  }
+  get observable() {
+    return this.subject.asObservable();
+  }
+  get countObservers() {
+    return this.subject.observers.length;
+  }
+  upsertData(data, callback) {
+    this.store.set(this.key, data);
+    this.subject.next(data);
+  }
+  subscribe(callback) {
+    return this.subject.subscribe(callback);
+  }
+}
+exports.StoreSubject = StoreSubject;

package/cjs/services/keyring-service/context/stores/CurrentAccount.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CurrentAccountStoreSubject = void 0;
+var _stores = require("@subwallet/extension-base/stores");
+var _rxjs = require("rxjs");
+var _Base = require("./Base");
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+class CurrentAccountStoreSubject extends _Base.StoreSubject {
+  store = new _stores.CurrentAccountStore();
+  subject = new _rxjs.BehaviorSubject({
+    proxyId: ''
+  });
+  key = 'CurrentAccountInfo';
+  defaultValue = {
+    proxyId: ''
+  };
+  transformInitData(rs) {
+    return rs ? {
+      proxyId: rs.proxyId || rs.address || ''
+    } : this.defaultValue;
+  }
+}
+exports.CurrentAccountStoreSubject = CurrentAccountStoreSubject;

package/cjs/services/keyring-service/context/stores/ModifyPair.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ModifyPairStoreSubject = void 0;
+var _stores = require("@subwallet/extension-base/stores");
+var _rxjs = require("rxjs");
+var _Base = require("./Base");
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+class ModifyPairStoreSubject extends _Base.StoreSubject {
+  store = new _stores.ModifyPairStore();
+  subject = new _rxjs.BehaviorSubject({});
+  key = 'ModifyPairs';
+  defaultValue = {};
+}
+exports.ModifyPairStoreSubject = ModifyPairStoreSubject;

package/cjs/services/keyring-service/context/stores/index.js

@@ -0,0 +1,38 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _AccountProxy = require("./AccountProxy");
+Object.keys(_AccountProxy).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _AccountProxy[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _AccountProxy[key];
+    }
+  });
+});
+var _CurrentAccount = require("./CurrentAccount");
+Object.keys(_CurrentAccount).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _CurrentAccount[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _CurrentAccount[key];
+    }
+  });
+});
+var _ModifyPair = require("./ModifyPair");
+Object.keys(_ModifyPair).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _ModifyPair[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _ModifyPair[key];
+    }
+  });
+});

package/cjs/services/keyring-service/index.js

@@ -4,209 +4,65 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.KeyringService = void 0;
-var _constants = require("@subwallet/extension-base/constants");
-var _stores = require("@subwallet/extension-base/stores");
 var _uiKeyring = require("@subwallet/ui-keyring");
 var _rxjs = require("rxjs");
-var _util = require("@polkadot/util");
+var _accountContext = require("./context/account-context");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
 class KeyringService {
-  currentAccountStore = new _stores.CurrentAccountStore();
-  currentAccountSubject = new _rxjs.BehaviorSubject({
-    address: '',
-    currentGenesisHash: null
-  });
-  addressesSubject = _uiKeyring.keyring.addresses.subject;
-  accountSubject = _uiKeyring.keyring.accounts.subject;
-  beforeAccount = this.accountSubject.value;
-  keyringStateSubject = new _rxjs.BehaviorSubject({
+  stateSubject = new _rxjs.BehaviorSubject({
     isReady: false,
     hasMasterPassword: false,
     isLocked: false
   });
-  constructor(eventService) {
-    this.eventService = eventService;
-    this.injected = false;
-    this.eventService.waitCryptoReady.then(() => {
-      this.currentAccountStore.get('CurrentAccountInfo', rs => {
-        rs && this.currentAccountSubject.next(rs);
-      });
-      this.subscribeAccounts().catch(console.error);
-    }).catch(console.error);
-  }
-  async subscribeAccounts() {
-    // Wait until account ready
-    await this.eventService.waitAccountReady;
-    this.beforeAccount = {
-      ...this.accountSubject.value
-    };
-    this.accountSubject.subscribe(subjectInfo => {
-      // Check if accounts changed
-      const beforeAddresses = Object.keys(this.beforeAccount);
-      const afterAddresses = Object.keys(subjectInfo);
-      if (beforeAddresses.length > afterAddresses.length) {
-        const removedAddresses = beforeAddresses.filter(address => !afterAddresses.includes(address));
-
-        // Remove account
-        removedAddresses.forEach(address => {
-          this.eventService.emit('account.remove', address);
-        });
-      } else if (beforeAddresses.length < afterAddresses.length) {
-        const addedAddresses = afterAddresses.filter(address => !beforeAddresses.includes(address));
-
-        // Add account
-        addedAddresses.forEach(address => {
-          this.eventService.emit('account.add', address);
-        });
-      } else {
-        // Handle case update later
-      }
-      this.beforeAccount = {
-        ...subjectInfo
-      };
-    });
+  constructor(state) {
+    this.state = state;
+    this.context = new _accountContext.AccountContext(this.state, this);
   }
   get keyringState() {
-    return this.keyringStateSubject.value;
+    return this.stateSubject.value;
+  }
+  keyringStateSubscribe(callback) {
+    return this.stateSubject.subscribe(callback);
+  }
+  eventInjectReady() {
+    this.state.eventService.emit('inject.ready', true);
+  }
+  eventRemoveAccount(proxyId) {
+    this.state.eventService.emit('accountProxy.remove', proxyId);
   }
   updateKeyringState() {
     var _keyring$keyring, _keyring$keyring2;
     let isReady = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
     if (!this.keyringState.isReady && isReady) {
-      this.eventService.waitCryptoReady.then(() => {
-        this.eventService.emit('keyring.ready', true);
-        this.eventService.emit('account.ready', true);
+      this.state.eventService.waitCryptoReady.then(() => {
+        this.state.eventService.emit('keyring.ready', true);
+        this.state.eventService.emit('account.ready', true);
       }).catch(console.error);
     }
-    this.keyringStateSubject.next({
+    this.stateSubject.next({
       hasMasterPassword: !!((_keyring$keyring = _uiKeyring.keyring.keyring) !== null && _keyring$keyring !== void 0 && _keyring$keyring.hasMasterPassword),
       isLocked: !!((_keyring$keyring2 = _uiKeyring.keyring.keyring) !== null && _keyring$keyring2 !== void 0 && _keyring$keyring2.isLocked),
       isReady: isReady
     });
   }
-  get accounts() {
-    return this.accountSubject.value;
-  }
-  get addresses() {
-    return this.addressesSubject.value;
-  }
-  get currentAccount() {
-    return this.currentAccountSubject.value;
-  }
-  setCurrentAccount(currentAccountData) {
-    this.currentAccountSubject.next(currentAccountData);
-    this.eventService.emit('account.updateCurrent', currentAccountData);
-    this.currentAccountStore.set('CurrentAccountInfo', currentAccountData);
-  }
   lock() {
     _uiKeyring.keyring.lockAll();
     this.updateKeyringState();
   }
 
-  /* Inject */
-
-  addInjectAccounts(accounts) {
-    _uiKeyring.keyring.addInjects(accounts.map(account => {
-      const name = account.meta.name || (0, _util.stringShorten)(account.address);
-
-      // TODO: Add if need
-      // name = name.concat(' (', account.meta.source, ')');
-
-      return {
-        ...account,
-        meta: {
-          ...account.meta,
-          name: name
-        }
-      };
-    }));
-    const currentAddress = this.currentAccountSubject.value.address;
-    const afterAccounts = {};
-    Object.keys(this.accounts).forEach(adr => {
-      afterAccounts[adr] = true;
-    });
-    accounts.forEach(value => {
-      afterAccounts[value.address] = true;
-    });
-    if (Object.keys(afterAccounts).length === 1) {
-      this.currentAccountSubject.next({
-        address: Object.keys(afterAccounts)[0],
-        currentGenesisHash: null
-      });
-    } else if (Object.keys(afterAccounts).indexOf(currentAddress) === -1) {
-      this.currentAccountSubject.next({
-        address: _constants.ALL_ACCOUNT_KEY,
-        currentGenesisHash: null
-      });
-    }
-    if (!this.injected) {
-      this.eventService.emit('inject.ready', true);
-      this.injected = true;
-    }
-  }
-  removeInjectAccounts(_addresses) {
-    const addresses = _addresses.map(address => {
-      try {
-        return _uiKeyring.keyring.getPair(address).address;
-      } catch (error) {
-        return address;
-      }
-    });
-    const currentAddress = this.currentAccountSubject.value.address;
-    const afterAccounts = Object.keys(this.accounts).filter(address => addresses.indexOf(address) < 0);
-    if (afterAccounts.length === 1) {
-      this.currentAccountSubject.next({
-        address: afterAccounts[0],
-        currentGenesisHash: null
-      });
-    } else if (addresses.indexOf(currentAddress) === -1) {
-      this.currentAccountSubject.next({
-        address: _constants.ALL_ACCOUNT_KEY,
-        currentGenesisHash: null
-      });
-    }
-    _uiKeyring.keyring.removeInjects(addresses);
-  }
-
-  /* Inject */
-
   /* Reset */
   async resetWallet(resetAll) {
     _uiKeyring.keyring.resetWallet(resetAll);
+    this.context.resetWallet();
     await new Promise(resolve => {
       setTimeout(() => {
         resolve();
       }, 1500);
     });
     this.updateKeyringState();
-    this.currentAccountSubject.next({
-      address: _constants.ALL_ACCOUNT_KEY,
-      currentGenesisHash: null
-    });
   }
   /* Reset */
-
-  /* Others */
-  removeNoneHardwareGenesisHash() {
-    const pairs = _uiKeyring.keyring.getPairs();
-    const needUpdatePairs = pairs.filter(_ref => {
-      let {
-        meta: {
-          genesisHash,
-          isHardware
-        }
-      } = _ref;
-      return !isHardware && genesisHash && genesisHash !== '';
-    });
-    needUpdatePairs.forEach(pair => {
-      _uiKeyring.keyring.saveAccountMeta(pair, {
-        ...pair.meta,
-        genesisHash: ''
-      });
-    });
-  }
-  /* Others */
 }
 exports.KeyringService = KeyringService;

package/cjs/services/migration-service/scripts/index.js

@@ -10,6 +10,10 @@ var _ClearMetadataDatabase = _interopRequireDefault(require("./databases/ClearMe
 var _MigrateAssetSetting = _interopRequireDefault(require("./databases/MigrateAssetSetting"));
 var _MigrateEarningVersion = _interopRequireDefault(require("./databases/MigrateEarningVersion"));
 var _ReloadMetadata = _interopRequireDefault(require("./databases/ReloadMetadata"));
+var _MigrateLedgerAccount = _interopRequireDefault(require("./keyring/MigrateLedgerAccount"));
+var _MigrateLedgerAccountV = _interopRequireDefault(require("./keyring/MigrateLedgerAccountV2"));
+var _MigratePairData = _interopRequireDefault(require("./keyring/MigratePairData"));
+var _MigrateRemoveGenesisHash = _interopRequireDefault(require("./keyring/MigrateRemoveGenesisHash"));
 var _MigrateEthProvider = _interopRequireDefault(require("./providers/MigrateEthProvider"));
 var _MigratePioneerProvider = _interopRequireDefault(require("./providers/MigratePioneerProvider"));
 var _MigrateProvidersV1M1P = _interopRequireDefault(require("./providers/MigrateProvidersV1M1P24"));
@@ -23,10 +27,7 @@ var _MigrateAuthUrls = _interopRequireDefault(require("./MigrateAuthUrls"));
 var _MigrateAutoLock = _interopRequireDefault(require("./MigrateAutoLock"));
 var _MigrateChainPatrol = _interopRequireDefault(require("./MigrateChainPatrol"));
 var _MigrateImportedToken = _interopRequireDefault(require("./MigrateImportedToken"));
-var _MigrateLedgerAccount = _interopRequireDefault(require("./MigrateLedgerAccount"));
-var _MigrateLedgerAccountV = _interopRequireDefault(require("./MigrateLedgerAccountV2"));
 var _MigrateNetworkSettings = _interopRequireDefault(require("./MigrateNetworkSettings"));
-var _MigrateRemoveGenesisHash = _interopRequireDefault(require("./MigrateRemoveGenesisHash"));
 var _MigrateSettings = _interopRequireDefault(require("./MigrateSettings"));
 var _MigrateTokenDecimals = _interopRequireDefault(require("./MigrateTokenDecimals"));
 var _MigrateTransactionHistory = _interopRequireDefault(require("./MigrateTransactionHistory"));
@@ -65,7 +66,8 @@ var _default = {
   '1.2.28-02': _MigrateTransactionHistoryBySymbol.default,
   '1.2.69-01': _MigrateRemoveGenesisHash.default,
   '1.2.13-01': _ReloadMetadata.default,
-  '1.2.14-01': _ClearMetadataDatabase.default
+  '1.2.14-01': _ClearMetadataDatabase.default,
+  '1.2.32-01': _MigratePairData.default
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/cjs/services/migration-service/scripts/{MigrateLedgerAccountV2.js → keyring/MigrateLedgerAccountV2.js}

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _stores = require("@subwallet/extension-base/stores");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
-var _Base = _interopRequireDefault(require("../Base"));
+var _Base = _interopRequireDefault(require("../../Base"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 

package/cjs/services/migration-service/scripts/keyring/MigratePairData.js

@@ -0,0 +1,28 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigratePairData extends _Base.default {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        try {
+          this.state.keyringService.context.updateMetadataForPair();
+        } catch (e) {
+          console.error(e);
+        }
+        resolve();
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigratePairData;

package/cjs/services/migration-service/scripts/{MigrateRemoveGenesisHash.js → keyring/MigrateRemoveGenesisHash.js}

@@ -14,7 +14,7 @@ class MigrateRemoveGenesisHash extends _Base.default {
     try {
       return new Promise(resolve => {
         try {
-          this.state.keyringService.removeNoneHardwareGenesisHash();
+          this.state.keyringService.context.removeNoneHardwareGenesisHash();
         } catch (e) {
           console.error(e);
         }

package/cjs/services/request-service/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WEB_APP_URL = exports.PREDEFINED_CHAIN_DAPP_CHAIN_MAP = exports.EXTENSION_REQUEST_URL = exports.DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL = void 0;
+exports.WEB_APP_URL = exports.PREDEFINED_CHAIN_DAPP_CHAIN_MAP = exports.EXTENSION_REQUEST_URL = exports.DAPP_CONNECT_BOTH_TYPE_ACCOUNT_URL = void 0;
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -23,6 +23,8 @@ const WEB_APP_URL = [
 // Pull request build
 'web.subwallet.app' // Production,
 ];
+
+// List DApp can connect 'substrate' and 'evm' account
 exports.WEB_APP_URL = WEB_APP_URL;
-const DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL = ['https://polkadot.js.org/apps/', 'https://ipfs.io/ipns/dotapps.io'];
-exports.DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL = DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL;
+const DAPP_CONNECT_BOTH_TYPE_ACCOUNT_URL = ['https://polkadot.js.org/apps/', 'https://ipfs.io/ipns/dotapps.io'];
+exports.DAPP_CONNECT_BOTH_TYPE_ACCOUNT_URL = DAPP_CONNECT_BOTH_TYPE_ACCOUNT_URL;