@subwallet/extension-base 1.2.31-0 → 1.2.33-0

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

@@ -0,0 +1,30 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+export 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);
+  }
+}

package/services/keyring-service/context/stores/CurrentAccount.d.ts

@@ -0,0 +1,15 @@
+import { CurrentAccountStore } from '@subwallet/extension-base/stores';
+import { CurrentAccountInfo } from '@subwallet/extension-base/types';
+import { BehaviorSubject } from 'rxjs';
+import { StoreSubject } from './Base';
+export declare class CurrentAccountStoreSubject extends StoreSubject<CurrentAccountInfo> {
+    store: CurrentAccountStore;
+    subject: BehaviorSubject<CurrentAccountInfo>;
+    key: string;
+    defaultValue: {
+        proxyId: string;
+    };
+    transformInitData(rs: CurrentAccountInfo): {
+        proxyId: string;
+    };
+}

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

@@ -0,0 +1,21 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { CurrentAccountStore } from '@subwallet/extension-base/stores';
+import { BehaviorSubject } from 'rxjs';
+import { StoreSubject } from "./Base.js";
+export class CurrentAccountStoreSubject extends StoreSubject {
+  store = new CurrentAccountStore();
+  subject = new BehaviorSubject({
+    proxyId: ''
+  });
+  key = 'CurrentAccountInfo';
+  defaultValue = {
+    proxyId: ''
+  };
+  transformInitData(rs) {
+    return rs ? {
+      proxyId: rs.proxyId || rs.address || ''
+    } : this.defaultValue;
+  }
+}

package/services/keyring-service/context/stores/ModifyPair.d.ts

@@ -0,0 +1,10 @@
+import { ModifyPairStore } from '@subwallet/extension-base/stores';
+import { ModifyPairStoreData } from '@subwallet/extension-base/types';
+import { BehaviorSubject } from 'rxjs';
+import { StoreSubject } from './Base';
+export declare class ModifyPairStoreSubject extends StoreSubject<ModifyPairStoreData> {
+    store: ModifyPairStore;
+    subject: BehaviorSubject<ModifyPairStoreData>;
+    key: string;
+    defaultValue: {};
+}

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

@@ -0,0 +1,12 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { ModifyPairStore } from '@subwallet/extension-base/stores';
+import { BehaviorSubject } from 'rxjs';
+import { StoreSubject } from "./Base.js";
+export class ModifyPairStoreSubject extends StoreSubject {
+  store = new ModifyPairStore();
+  subject = new BehaviorSubject({});
+  key = 'ModifyPairs';
+  defaultValue = {};
+}

package/services/keyring-service/context/stores/index.d.ts

@@ -0,0 +1,3 @@
+export * from './AccountProxy';
+export * from './CurrentAccount';
+export * from './ModifyPair';

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

@@ -0,0 +1,6 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+export * from "./AccountProxy.js";
+export * from "./CurrentAccount.js";
+export * from "./ModifyPair.js";

package/services/keyring-service/index.d.ts

@@ -1,28 +1,16 @@
-import { CurrentAccountInfo, KeyringState } from '@subwallet/extension-base/background/KoniTypes';
-import { EventService } from '@subwallet/extension-base/services/event-service';
-import { InjectedAccountWithMeta } from '@subwallet/extension-inject/types';
-import { SubjectInfo } from '@subwallet/ui-keyring/observable/types';
-import { BehaviorSubject } from 'rxjs';
+import { KeyringState } from '@subwallet/extension-base/background/KoniTypes';
+import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
+import { AccountContext } from './context/account-context';
 export declare class KeyringService {
-    private eventService;
-    private readonly currentAccountStore;
-    readonly currentAccountSubject: BehaviorSubject<CurrentAccountInfo>;
-    readonly addressesSubject: BehaviorSubject<SubjectInfo>;
-    readonly accountSubject: BehaviorSubject<SubjectInfo>;
-    private beforeAccount;
-    private injected;
-    readonly keyringStateSubject: BehaviorSubject<KeyringState>;
-    constructor(eventService: EventService);
-    private subscribeAccounts;
+    private state;
+    private readonly stateSubject;
+    readonly context: AccountContext;
+    constructor(state: KoniState);
     get keyringState(): KeyringState;
+    keyringStateSubscribe(callback: (state: KeyringState) => void): import("rxjs").Subscription;
+    eventInjectReady(): void;
+    eventRemoveAccount(proxyId: string): void;
     updateKeyringState(isReady?: boolean): void;
-    get accounts(): SubjectInfo;
-    get addresses(): SubjectInfo;
-    get currentAccount(): CurrentAccountInfo;
-    setCurrentAccount(currentAccountData: CurrentAccountInfo): void;
     lock(): void;
-    addInjectAccounts(accounts: InjectedAccountWithMeta[]): void;
-    removeInjectAccounts(_addresses: string[]): void;
     resetWallet(resetAll: boolean): Promise<void>;
-    removeNoneHardwareGenesisHash(): void;
 }

package/services/keyring-service/index.js

@@ -1,201 +1,60 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
-import { CurrentAccountStore } from '@subwallet/extension-base/stores';
 import { keyring } from '@subwallet/ui-keyring';
 import { BehaviorSubject } from 'rxjs';
-import { stringShorten } from '@polkadot/util';
+import { AccountContext } from "./context/account-context.js";
 export class KeyringService {
-  currentAccountStore = new CurrentAccountStore();
-  currentAccountSubject = new BehaviorSubject({
-    address: '',
-    currentGenesisHash: null
-  });
-  addressesSubject = keyring.addresses.subject;
-  accountSubject = keyring.accounts.subject;
-  beforeAccount = this.accountSubject.value;
-  keyringStateSubject = new BehaviorSubject({
+  stateSubject = new 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(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(isReady = true) {
     var _keyring$keyring, _keyring$keyring2;
     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 = keyring.keyring) !== null && _keyring$keyring !== void 0 && _keyring$keyring.hasMasterPassword),
       isLocked: !!((_keyring$keyring2 = 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() {
     keyring.lockAll();
     this.updateKeyringState();
   }
 
-  /* Inject */
-
-  addInjectAccounts(accounts) {
-    keyring.addInjects(accounts.map(account => {
-      const name = account.meta.name || 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: 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 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: ALL_ACCOUNT_KEY,
-        currentGenesisHash: null
-      });
-    }
-    keyring.removeInjects(addresses);
-  }
-
-  /* Inject */
-
   /* Reset */
   async resetWallet(resetAll) {
     keyring.resetWallet(resetAll);
+    this.context.resetWallet();
     await new Promise(resolve => {
       setTimeout(() => {
         resolve();
       }, 1500);
     });
     this.updateKeyringState();
-    this.currentAccountSubject.next({
-      address: ALL_ACCOUNT_KEY,
-      currentGenesisHash: null
-    });
   }
   /* Reset */
-
-  /* Others */
-  removeNoneHardwareGenesisHash() {
-    const pairs = keyring.getPairs();
-    const needUpdatePairs = pairs.filter(({
-      meta: {
-        genesisHash,
-        isHardware
-      }
-    }) => !isHardware && genesisHash && genesisHash !== '');
-    needUpdatePairs.forEach(pair => {
-      keyring.saveAccountMeta(pair, {
-        ...pair.meta,
-        genesisHash: ''
-      });
-    });
-  }
-  /* Others */
 }

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

@@ -6,6 +6,10 @@ import ClearMetadataDatabase from "./databases/ClearMetadataDatabase.js";
 import MigrateAssetSetting from "./databases/MigrateAssetSetting.js";
 import MigrateEarningVersion from "./databases/MigrateEarningVersion.js";
 import ReloadMetadata from "./databases/ReloadMetadata.js";
+import MigrateLedgerAccount from "./keyring/MigrateLedgerAccount.js";
+import MigrateLedgerAccountV2 from "./keyring/MigrateLedgerAccountV2.js";
+import MigratePairData from "./keyring/MigratePairData.js";
+import MigrateRemoveGenesisHash from "./keyring/MigrateRemoveGenesisHash.js";
 import MigrateEthProvider from "./providers/MigrateEthProvider.js";
 import MigratePioneerProvider from "./providers/MigratePioneerProvider.js";
 import MigrateProvidersV1M1P24 from "./providers/MigrateProvidersV1M1P24.js";
@@ -19,10 +23,7 @@ import MigrateAuthUrls from "./MigrateAuthUrls.js";
 import MigrateAutoLock from "./MigrateAutoLock.js";
 import MigrateChainPatrol from "./MigrateChainPatrol.js";
 import MigrateImportedToken from "./MigrateImportedToken.js";
-import MigrateLedgerAccount from "./MigrateLedgerAccount.js";
-import MigrateLedgerAccountV2 from "./MigrateLedgerAccountV2.js";
 import MigrateNetworkSettings from "./MigrateNetworkSettings.js";
-import MigrateRemoveGenesisHash from "./MigrateRemoveGenesisHash.js";
 import MigrateSettings from "./MigrateSettings.js";
 import MigrateTokenDecimals from "./MigrateTokenDecimals.js";
 import MigrateTransactionHistory from "./MigrateTransactionHistory.js";
@@ -57,7 +58,8 @@ export default {
   '1.2.28-02': MigrateTransactionHistoryBySymbol,
   '1.2.69-01': MigrateRemoveGenesisHash,
   '1.2.13-01': ReloadMetadata,
-  '1.2.14-01': ClearMetadataDatabase
+  '1.2.14-01': ClearMetadataDatabase,
+  '1.2.32-01': MigratePairData
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/migration-service/scripts/{MigrateLedgerAccountV2.d.ts → keyring/MigrateLedgerAccountV2.d.ts}

@@ -1,4 +1,4 @@
-import BaseMigrationJob from '../Base';
+import BaseMigrationJob from '../../Base';
 export default class MigrateLedgerAccountV2 extends BaseMigrationJob {
     run(): Promise<void>;
 }

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

@@ -4,7 +4,7 @@
 import { AccountsStore } from '@subwallet/extension-base/stores';
 import { isString } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
-import BaseMigrationJob from "../Base.js";
+import BaseMigrationJob from "../../Base.js";
 export default class MigrateLedgerAccountV2 extends BaseMigrationJob {
   async run() {
     try {

package/services/migration-service/scripts/keyring/MigratePairData.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigratePairData extends BaseMigrationJob {
+    run(): Promise<void>;
+}

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

@@ -0,0 +1,20 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigratePairData extends BaseMigrationJob {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        try {
+          this.state.keyringService.context.updateMetadataForPair();
+        } catch (e) {
+          console.error(e);
+        }
+        resolve();
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

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

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

package/services/mkt-campaign-service/types.d.ts

@@ -92,12 +92,16 @@ export interface AppPopupData extends AppCommonData {
     media: string;
     buttons: AppContentButton[];
     repeat_every_x_days: number | null;
+    ios_version_range: string;
+    app_version_range: string;
 }
 export interface AppBannerData extends AppCommonData {
     priority: number;
     media: string;
     action: AppContentButtonAction;
     instruction: AppContentButtonInstruction | null;
+    ios_version_range: string;
+    app_version_range: string;
 }
 export interface AppConfirmationData extends AppCommonData {
     name: string;

package/services/request-service/constants.d.ts

@@ -1,4 +1,4 @@
 export declare const EXTENSION_REQUEST_URL = "extension";
 export declare const PREDEFINED_CHAIN_DAPP_CHAIN_MAP: Record<string, string[]>;
 export declare const WEB_APP_URL: string[];
-export declare const DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL: string[];
+export declare const DAPP_CONNECT_BOTH_TYPE_ACCOUNT_URL: string[];

package/services/request-service/constants.js

@@ -16,4 +16,5 @@ export const WEB_APP_URL = [
 'web.subwallet.app' // Production,
 ];
 
-export const DAPP_CONNECT_ALL_TYPE_ACCOUNT_URL = ['https://polkadot.js.org/apps/', 'https://ipfs.io/ipns/dotapps.io'];
+// List DApp can connect 'substrate' and 'evm' account
+export const DAPP_CONNECT_BOTH_TYPE_ACCOUNT_URL = ['https://polkadot.js.org/apps/', 'https://ipfs.io/ipns/dotapps.io'];

package/services/request-service/handler/AuthRequestHandler.d.ts

@@ -16,6 +16,7 @@ export default class AuthRequestHandler {
     readonly authSubjectV2: BehaviorSubject<AuthorizeRequest[]>;
     constructor(requestService: RequestService, chainService: ChainService, keyringService: KeyringService);
     private init;
+    private migrateAuthUrlInfoToUnified;
     private getAddressList;
     get numAuthRequestsV2(): number;
     private get allAuthRequestsV2();