@subwallet/extension-base 1.1.6-2 → 1.1.7-0

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

@@ -1424,19 +1424,19 @@ class KoniExtension {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const historySubject = await this.#koniState.historyService.getHistorySubject();
     const subscription = historySubject.subscribe(histories => {
-      const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address.toLowerCase());
+      const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address);
 
       // Re-filter
-      cb(histories.filter(item => addresses.includes(item.address.toLowerCase())));
+      cb(histories.filter(item => addresses.some(address => (0, _utils2.isSameAddress)(item.address, address))));
     });
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address.toLowerCase());
+    const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address);
 
     // Re-filter
-    return historySubject.getValue().filter(item => addresses.includes(item.address.toLowerCase()));
+    return historySubject.getValue().filter(item => addresses.some(address => (0, _utils2.isSameAddress)(item.address, address)));
   }
 
   // Save address to contact

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.6-2'
+  version: '1.1.7-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/chain-service/handler/SubstrateApi.js

@@ -58,7 +58,7 @@ class SubstrateApi {
       return new _api2.WsProvider(apiUrl, _constants.API_AUTO_CONNECT_MS, {}, _constants.API_CONNECT_TIMEOUT);
     }
   }
-  createApi(provider) {
+  createApi(provider, externalApiPromise) {
     const apiOption = {
       provider,
       typesBundle: _api3.typesBundle,
@@ -72,7 +72,9 @@ class SubstrateApi {
     }
     this.updateConnectionStatus(_types2._ChainConnectionStatus.CONNECTING);
     let api;
-    if (_constants._API_OPTIONS_CHAIN_GROUP.acala.includes(this.chainSlug)) {
+    if (externalApiPromise) {
+      api = externalApiPromise;
+    } else if (_constants._API_OPTIONS_CHAIN_GROUP.acala.includes(this.chainSlug)) {
       api = new _api2.ApiPromise((0, _api.options)({
         provider
       }));
@@ -83,7 +85,7 @@ class SubstrateApi {
         types: _types.types
       });
     } else if (_constants._API_OPTIONS_CHAIN_GROUP.avail.includes(this.chainSlug)) {
-      return new _api2.ApiPromise({
+      api = new _api2.ApiPromise({
         provider,
         rpc: _availJsSdk.spec.rpc,
         types: _availJsSdk.spec.types,
@@ -110,7 +112,7 @@ class SubstrateApi {
     this.registry = new _create.TypeRegistry();
     this.metadata = metadata;
     this.provider = this.createProvider(apiUrl);
-    this.api = externalApiPromise || this.createApi(this.provider);
+    this.api = this.createApi(this.provider, externalApiPromise);
     this.handleApiReady = (0, _promise.createPromiseHandler)();
   }
   get isReady() {

package/koni/background/handlers/Extension.js

@@ -27,7 +27,7 @@ import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/reques
 import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setting-service/constants';
 import { WALLET_CONNECT_EIP155_NAMESPACE } from '@subwallet/extension-base/services/wallet-connect-service/constants';
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
-import { reformatAddress, uniqueStringArray } from '@subwallet/extension-base/utils';
+import { isSameAddress, reformatAddress, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { convertSubjectInfoToAddresses } from '@subwallet/extension-base/utils/address';
 import { createTransactionFromRLP, signatureToHex } from '@subwallet/extension-base/utils/eth';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
@@ -1372,19 +1372,19 @@ export default class KoniExtension {
     const cb = createSubscription(id, port);
     const historySubject = await this.#koniState.historyService.getHistorySubject();
     const subscription = historySubject.subscribe(histories => {
-      const addresses = keyring.getAccounts().map(a => a.address.toLowerCase());
+      const addresses = keyring.getAccounts().map(a => a.address);
 
       // Re-filter
-      cb(histories.filter(item => addresses.includes(item.address.toLowerCase())));
+      cb(histories.filter(item => addresses.some(address => isSameAddress(item.address, address))));
     });
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    const addresses = keyring.getAccounts().map(a => a.address.toLowerCase());
+    const addresses = keyring.getAccounts().map(a => a.address);
 
     // Re-filter
-    return historySubject.getValue().filter(item => addresses.includes(item.address.toLowerCase()));
+    return historySubject.getValue().filter(item => addresses.some(address => isSameAddress(item.address, address)));
   }
 
   // Save address to contact

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.6-2",
+  "version": "1.1.7-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1189,10 +1189,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
     "@subwallet/chain-list": "0.2.9",
-    "@subwallet/extension-base": "^1.1.6-2",
-    "@subwallet/extension-chains": "^1.1.6-2",
-    "@subwallet/extension-dapp": "^1.1.6-2",
-    "@subwallet/extension-inject": "^1.1.6-2",
+    "@subwallet/extension-base": "^1.1.7-0",
+    "@subwallet/extension-chains": "^1.1.7-0",
+    "@subwallet/extension-dapp": "^1.1.7-0",
+    "@subwallet/extension-inject": "^1.1.7-0",
     "@subwallet/keyring": "^0.0.10",
     "@subwallet/ui-keyring": "^0.0.10",
     "@walletconnect/sign-client": "^2.8.4",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.1.6-2'
+  version: '1.1.7-0'
 };

package/services/chain-service/handler/SubstrateApi.js

@@ -52,7 +52,7 @@ export class SubstrateApi {
       return new WsProvider(apiUrl, API_AUTO_CONNECT_MS, {}, API_CONNECT_TIMEOUT);
     }
   }
-  createApi(provider) {
+  createApi(provider, externalApiPromise) {
     const apiOption = {
       provider,
       typesBundle,
@@ -66,7 +66,9 @@ export class SubstrateApi {
     }
     this.updateConnectionStatus(_ChainConnectionStatus.CONNECTING);
     let api;
-    if (_API_OPTIONS_CHAIN_GROUP.acala.includes(this.chainSlug)) {
+    if (externalApiPromise) {
+      api = externalApiPromise;
+    } else if (_API_OPTIONS_CHAIN_GROUP.acala.includes(this.chainSlug)) {
       api = new ApiPromise(acalaOptions({
         provider
       }));
@@ -77,7 +79,7 @@ export class SubstrateApi {
         types: oakTypes
       });
     } else if (_API_OPTIONS_CHAIN_GROUP.avail.includes(this.chainSlug)) {
-      return new ApiPromise({
+      api = new ApiPromise({
         provider,
         rpc: availSpec.rpc,
         types: availSpec.types,
@@ -103,7 +105,7 @@ export class SubstrateApi {
     this.registry = new TypeRegistry();
     this.metadata = metadata;
     this.provider = this.createProvider(apiUrl);
-    this.api = externalApiPromise || this.createApi(this.provider);
+    this.api = this.createApi(this.provider, externalApiPromise);
     this.handleApiReady = createPromiseHandler();
   }
   get isReady() {