@subwallet/extension-base 1.1.8-0 → 1.1.10-0

package/services/request-service/handler/AuthRequestHandler.js

@@ -210,7 +210,7 @@ export default class AuthRequestHandler {
     const idStr = stripUrl(url);
     // Do not enqueue duplicate authorization requests.
     const isDuplicate = Object.values(this.#authRequestsV2).some(request => request.idStr === idStr);
-    assert(!isDuplicate, `The source ${url} has a pending authorization request`);
+    assert(!isDuplicate, 'The source {{url}} has a pending authorization request'.replace('{{url}}', url));
     const existedAuth = authList[idStr];
     const existedAccountAuthType = existedAuth === null || existedAuth === void 0 ? void 0 : existedAuth.accountAuthType;
     const confirmAnotherType = existedAccountAuthType !== 'both' && existedAccountAuthType !== request.accountAuthType;
@@ -222,7 +222,7 @@ export default class AuthRequestHandler {
     if (existedAuth) {
       const inBlackList = existedAuth && !existedAuth.isAllowed;
       if (inBlackList) {
-        throw new Error(`The source ${url} is not allowed to interact with this extension`);
+        throw new Error('The source {{url}} is not allowed to interact with this extension'.replace('{{url}}', url));
       }
       request.allowedAccounts = Object.entries(existedAuth.isAllowedMap).map(([address, allowed]) => allowed ? address : '').filter(item => item !== '');
       let allowedListByRequestType = [...request.allowedAccounts];
@@ -270,11 +270,11 @@ export default class AuthRequestHandler {
         }
         const entry = Object.keys(value).includes(idStr);
         if (!entry) {
-          reject(new Error(`The source ${url} has not been enabled yet`));
+          reject(new Error('The source {{url}} has not been authorized yet'.replace('{{url}}', url)));
         }
         const isConnected = value[idStr] && Object.keys(value[idStr].isAllowedMap).some(address => value[idStr].isAllowedMap[address]);
         if (!isConnected) {
-          reject(new Error(`The source ${url} is not allowed to interact with this extension`));
+          reject(new Error('The source {{url}} is not allowed to interact with this extension'.replace('{{url}}', url)));
         }
         resolve(true);
       });

package/services/request-service/handler/EvmRequestHandler.js

@@ -10,6 +10,7 @@ import keyring from '@subwallet/ui-keyring';
 import BN from 'bn.js';
 import { Transaction } from 'ethereumjs-tx';
 import { toBuffer } from 'ethereumjs-util';
+import { t } from 'i18next';
 import { BehaviorSubject } from 'rxjs';
 import { logger as createLogger } from '@polkadot/util';
 export default class EvmRequestHandler {
@@ -46,7 +47,7 @@ export default class EvmRequestHandler {
     // Check duplicate request
     const duplicated = Object.values(confirmationType).find(c => c.url === url && c.payloadJson === payloadJson);
     if (duplicated) {
-      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Duplicate request information');
+      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, t('Duplicate request'));
     }
     confirmationType[id] = {
       id,
@@ -79,7 +80,7 @@ export default class EvmRequestHandler {
     // Check duplicate request
     const exists = confirmationType[id];
     if (!exists) {
-      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Request does not exist');
+      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, t('Request does not exist'));
     }
     const payloadJson = JSON.stringify(payload);
     confirmationType[id] = {
@@ -113,7 +114,7 @@ export default class EvmRequestHandler {
       case 'eth_signTypedData_v4':
         return await pair.evmSigner.signMessage(payload, type);
       default:
-        throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Not found sign method');
+        throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, t('Unsupported action'));
     }
   }
   configToTransaction(config) {
@@ -186,8 +187,8 @@ export default class EvmRequestHandler {
   async completeConfirmation(request) {
     const confirmations = this.confirmationsQueueSubject.getValue();
     for (const ct in request) {
-      const t = ct;
-      const result = request[t];
+      const type = ct;
+      const result = request[type];
       const {
         id
       } = result;
@@ -195,14 +196,14 @@ export default class EvmRequestHandler {
         resolver,
         validator
       } = this.confirmationsPromiseMap[id];
-      const confirmation = confirmations[t][id];
+      const confirmation = confirmations[type][id];
       if (!resolver || !confirmation) {
-        this.#logger.error('Not found confirmation', t, id);
-        throw new Error('Not found promise for confirmation');
+        this.#logger.error(t('Unable to proceed. Please try again'), type, id);
+        throw new Error(t('Unable to proceed. Please try again'));
       }
 
       // Fill signature for some special type
-      await this.decorateResult(t, confirmation, result);
+      await this.decorateResult(type, confirmation, result);
 
       // Validate response from confirmation popup some info like password, response format....
       const error = validator && validator(result);
@@ -212,7 +213,7 @@ export default class EvmRequestHandler {
 
       // Delete confirmations from queue
       delete this.confirmationsPromiseMap[id];
-      delete confirmations[t][id];
+      delete confirmations[type][id];
       this.confirmationsQueueSubject.next(confirmations);
 
       // Update icon, and close queue

package/services/setting-service/SettingService.d.ts

@@ -3,6 +3,7 @@ import { Subject } from 'rxjs';
 export default class SettingService {
     private readonly settingsStore;
     private readonly passPhishingStore;
+    constructor();
     getSubject(): Subject<RequestSettingsType>;
     getSettings(update: (value: RequestSettingsType) => void): void;
     setSettings(data: RequestSettingsType, callback?: () => void): void;

package/services/setting-service/SettingService.js

@@ -1,22 +1,34 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { LANGUAGE } from '@subwallet/extension-base/constants';
 import PassPhishingStore from '@subwallet/extension-base/stores/PassPhishingStore';
 import SettingsStore from '@subwallet/extension-base/stores/Settings';
+import i18n from "./i18n/i18n.js";
 import { DEFAULT_SETTING } from "./constants.js";
 export default class SettingService {
   settingsStore = new SettingsStore();
   passPhishingStore = new PassPhishingStore();
+  constructor() {
+    let old = localStorage.getItem(LANGUAGE) || 'en';
+    this.settingsStore.getSubject().subscribe(({
+      language
+    }) => {
+      if (language !== old) {
+        old = language;
+        i18n.changeLanguage(language).catch(console.error);
+      }
+    });
+  }
   getSubject() {
     return this.settingsStore.getSubject();
   }
   getSettings(update) {
     this.settingsStore.get('Settings', value => {
-      if (!value) {
-        update(DEFAULT_SETTING);
-      } else {
-        update(value);
-      }
+      update({
+        ...DEFAULT_SETTING,
+        ...(value || {})
+      });
     });
   }
   setSettings(data, callback) {

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

@@ -1,7 +1,8 @@
-import { BrowserConfirmationType, LanguageType, ThemeNames, UiSettings } from '@subwallet/extension-base/background/KoniTypes';
+import { BrowserConfirmationType, LanguageType, ThemeNames, UiSettings, WalletUnlockType } from '@subwallet/extension-base/background/KoniTypes';
 export declare const DEFAULT_THEME: ThemeNames;
 export declare const DEFAULT_NOTIFICATION_TYPE: BrowserConfirmationType;
 export declare const DEFAULT_AUTO_LOCK_TIME = 15;
+export declare const DEFAULT_UNLOCK_TYPE: WalletUnlockType;
 export declare const DEFAULT_CHAIN_PATROL_ENABLE = false;
 export declare const DEFAULT_LANGUAGE: LanguageType;
 export declare const DEFAULT_SHOW_ZERO_BALANCE = true;

package/services/setting-service/constants.js

@@ -1,10 +1,12 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { ThemeNames } from '@subwallet/extension-base/background/KoniTypes';
+import { ThemeNames, WalletUnlockType } from '@subwallet/extension-base/background/KoniTypes';
+import { TARGET_ENV } from '@subwallet/extension-base/utils';
 export const DEFAULT_THEME = ThemeNames.DARK;
 export const DEFAULT_NOTIFICATION_TYPE = 'popup';
 export const DEFAULT_AUTO_LOCK_TIME = 15;
+export const DEFAULT_UNLOCK_TYPE = TARGET_ENV === 'extension' ? WalletUnlockType.ALWAYS_REQUIRED : WalletUnlockType.WHEN_NEEDED;
 export const DEFAULT_CHAIN_PATROL_ENABLE = false;
 export const DEFAULT_LANGUAGE = 'en';
 export const DEFAULT_SHOW_ZERO_BALANCE = true;
@@ -18,6 +20,7 @@ export const DEFAULT_SETTING = {
   isShowBalance: DEFAULT_SHOW_BALANCE,
   accountAllLogo: DEFAULT_ALL_LOGO,
   theme: DEFAULT_THEME,
+  unlockType: DEFAULT_UNLOCK_TYPE,
   camera: DEFAULT_CAMERA_ENABLE,
   timeAutoLock: DEFAULT_AUTO_LOCK_TIME,
   enableChainPatrol: DEFAULT_CHAIN_PATROL_ENABLE,

package/services/setting-service/i18n/Backend.d.ts

@@ -0,0 +1,9 @@
+declare type Callback = (error: string | null, data: unknown) => void;
+declare type LoadResult = [string | null, Record<string, string> | boolean];
+export default class Backend {
+    type: string;
+    static type: 'backend';
+    read(lng: string, _namespace: string, responder: Callback): Promise<void>;
+    createLoader(lng: string): Promise<LoadResult>;
+}
+export {};

package/services/setting-service/i18n/Backend.js

@@ -0,0 +1,34 @@
+// Copyright 2017-2022 @polkadot/react-components authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import languageCache from "./cache.js";
+const loaders = {};
+export default class Backend {
+  type = 'backend';
+  static type = 'backend';
+  async read(lng, _namespace, responder) {
+    if (languageCache[lng]) {
+      return responder(null, languageCache[lng]);
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    if (!loaders[lng]) {
+      loaders[lng] = this.createLoader(lng);
+    }
+    const [error, data] = await loaders[lng];
+    return responder(error, data);
+  }
+  async createLoader(lng) {
+    try {
+      const response = await fetch(`locales/${lng}/translation.json`, {});
+      if (!response.ok) {
+        return [`i18n: failed loading ${lng}`, response.status >= 500 && response.status < 600];
+      } else {
+        languageCache[lng] = await response.json();
+        return [null, languageCache[lng]];
+      }
+    } catch (error) {
+      return [error.message, false];
+    }
+  }
+}

package/services/setting-service/i18n/cache.d.ts

@@ -0,0 +1,2 @@
+declare const languageCache: Record<string, Record<string, string>>;
+export default languageCache;

package/services/setting-service/i18n/cache.js

@@ -0,0 +1,5 @@
+// Copyright 2017-2022 @polkadot/react-components authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const languageCache = {};
+export default languageCache;

package/services/setting-service/i18n/extend.d.ts

@@ -0,0 +1,2 @@
+export declare const ExternalTranslation: string[];
+export declare const InternalTranslation: string[];

package/services/setting-service/i18n/extend.js

@@ -0,0 +1,8 @@
+// Copyright 2017-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { detectTranslate } from '@subwallet/extension-base/utils';
+export const ExternalTranslation = [
+// Case change password
+detectTranslate('Invalid master password')];
+export const InternalTranslation = [];

package/services/setting-service/i18n/i18n.d.ts

@@ -0,0 +1,2 @@
+import i18next from 'i18next';
+export default i18next;

package/services/setting-service/i18n/i18n.js

@@ -0,0 +1,21 @@
+// Copyright 2019-2022 @polkadot/extension-ui authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { LANGUAGE } from '@subwallet/extension-base/constants';
+import i18next from 'i18next';
+import Backend from "./Backend.js";
+i18next.use(Backend).init({
+  backend: {},
+  debug: false,
+  fallbackLng: 'en',
+  interpolation: {
+    escapeValue: false
+  },
+  keySeparator: false,
+  lng: localStorage.getItem(LANGUAGE) || 'en',
+  load: 'languageOnly',
+  nsSeparator: false,
+  returnEmptyString: false,
+  returnNull: false
+}).catch(error => console.log('i18n: failure', error));
+export default i18next;

package/services/transaction-service/index.js

@@ -22,6 +22,7 @@ import BigN from 'bignumber.js';
 import { addHexPrefix } from 'ethereumjs-util';
 import { ethers } from 'ethers';
 import EventEmitter from 'eventemitter3';
+import { t } from 'i18next';
 import { BehaviorSubject } from 'rxjs';
 import { isHex } from '@polkadot/util';
 export default class TransactionService {
@@ -90,7 +91,7 @@ export default class TransactionService {
     };
     const chainInfo = this.chainService.getChainInfoByKey(chain);
     if (!chainInfo) {
-      validationResponse.errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR, "Can't find network"));
+      validationResponse.errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR, t('Cannot find network')));
     } else {
       const {
         decimals,
@@ -105,7 +106,7 @@ export default class TransactionService {
           } else {
             const web3 = this.chainService.getEvmApi(chain);
             if (!web3) {
-              validationResponse.errors.push(new TransactionError(BasicTxErrorType.CHAIN_DISCONNECTED));
+              validationResponse.errors.push(new TransactionError(BasicTxErrorType.CHAIN_DISCONNECTED, undefined));
             } else {
               const gasPrice = await web3.api.eth.getGasPrice();
               const gasLimit = await web3.api.eth.estimateGas(transaction);
@@ -126,11 +127,11 @@ export default class TransactionService {
     // Read-only account
     const pair = keyring.getPair(address);
     if (!pair) {
-      validationResponse.errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR, 'Can\'t find account'));
+      validationResponse.errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR, t('Unable to find account')));
     } else {
       var _pair$meta;
       if ((_pair$meta = pair.meta) !== null && _pair$meta !== void 0 && _pair$meta.isReadOnly) {
-        validationResponse.errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR, 'This is watch-only account'));
+        validationResponse.errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR, t('This account is watch-only')));
       }
     }
 
@@ -159,9 +160,9 @@ export default class TransactionService {
     if (!isTransferAll) {
       if (balanceNum - (transferNativeNum + feeNum) < edNum) {
         if (edAsWarning) {
-          validationResponse.warnings.push(new TransactionWarning(BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
+          validationResponse.warnings.push(new TransactionWarning(BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT));
         } else {
-          validationResponse.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
+          validationResponse.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_EXISTENTIAL_DEPOSIT));
         }
       }
     }
@@ -582,8 +583,12 @@ export default class TransactionService {
     const info = isHex(extrinsicHash) ? extrinsicHash : getBaseTransactionInfo(transaction, this.chainService.getChainInfoMap());
     this.notificationService.notify({
       type: NotificationType.SUCCESS,
-      title: 'Transaction completed',
-      message: `Transaction ${info} completed`,
+      title: t('Transaction completed'),
+      message: t('Transaction {{info}} completed', {
+        replace: {
+          info
+        }
+      }),
       action: {
         url: this.getTransactionLink(id)
       },
@@ -617,8 +622,12 @@ export default class TransactionService {
       const info = isHex(transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash) ? transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash : getBaseTransactionInfo(transaction, this.chainService.getChainInfoMap());
       this.notificationService.notify({
         type: NotificationType.ERROR,
-        title: 'Transaction failed',
-        message: `Transaction ${info} failed`,
+        title: t('Transaction failed'),
+        message: t('Transaction {{info}} failed', {
+          replace: {
+            info
+          }
+        }),
         action: {
           url: this.getTransactionLink(id)
         },
@@ -721,7 +730,7 @@ export default class TransactionService {
       if (isApproved) {
         let signedTransaction;
         if (!payload) {
-          throw new EvmProviderError(EvmProviderErrorType.UNAUTHORIZED, 'Bad signature');
+          throw new EvmProviderError(EvmProviderErrorType.UNAUTHORIZED, t('Failed to sign'));
         }
         const web3Api = this.chainService.getEvmApi(chain).api;
         if (!isExternal) {
@@ -730,7 +739,7 @@ export default class TransactionService {
           const signed = mergeTransactionAndSignature(txObject, payload);
           const recover = web3Api.eth.accounts.recoverTransaction(signed);
           if (recover.toLowerCase() !== account.address.toLowerCase()) {
-            throw new EvmProviderError(EvmProviderErrorType.UNAUTHORIZED, 'Bad signature');
+            throw new EvmProviderError(EvmProviderErrorType.UNAUTHORIZED, t('Wrong signature. Please sign with the account you use in dApp'));
           }
           signedTransaction = signed;
         }
@@ -754,10 +763,10 @@ export default class TransactionService {
           eventData.blockNumber = rs.blockNumber;
           emitter.emit('success', eventData);
         }).once('error', e => {
-          eventData.errors.push(new TransactionError(BasicTxErrorType.SEND_TRANSACTION_FAILED, e.message));
+          eventData.errors.push(new TransactionError(BasicTxErrorType.SEND_TRANSACTION_FAILED, t(e.message)));
           emitter.emit('error', eventData);
         }).catch(e => {
-          eventData.errors.push(new TransactionError(BasicTxErrorType.UNABLE_TO_SEND, e.message));
+          eventData.errors.push(new TransactionError(BasicTxErrorType.UNABLE_TO_SEND, t(e.message)));
           emitter.emit('error', eventData);
         });
       } else {
@@ -767,7 +776,7 @@ export default class TransactionService {
       }
     }).catch(e => {
       this.removeTransaction(id);
-      eventData.errors.push(new TransactionError(BasicTxErrorType.UNABLE_TO_SIGN, e.message));
+      eventData.errors.push(new TransactionError(BasicTxErrorType.UNABLE_TO_SIGN, t(e.message)));
       emitter.emit('error', eventData);
     });
     return emitter;
@@ -857,7 +866,7 @@ export default class TransactionService {
     const timeout = setTimeout(() => {
       const transaction = this.getTransaction(eventData.id);
       if (transaction.status !== ExtrinsicStatus.SUCCESS && transaction.status !== ExtrinsicStatus.FAIL) {
-        eventData.errors.push(new TransactionError(BasicTxErrorType.TIMEOUT, 'Transaction timeout'));
+        eventData.errors.push(new TransactionError(BasicTxErrorType.TIMEOUT, t('Transaction timeout')));
         emitter.emit('error', eventData);
         clearTimeout(timeout);
       }

package/services/wallet-connect-service/handler/PolkadotRequestHandler.js

@@ -102,7 +102,6 @@ function _checkAccount2(address, accounts) {
   }
 }
 function _handleError2(topic, id, e) {
-  console.log(e);
   let message = e.message;
   if (message.includes('User Rejected Request')) {
     message = getSdkError('USER_REJECTED').message;

package/services/wallet-connect-service/index.js

@@ -138,21 +138,29 @@ export default class WalletConnectService {
     // Disconnect session
     const sessions = ((_classPrivateFieldLoo7 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo7 === void 0 ? void 0 : _classPrivateFieldLoo7.session.values) || [];
     for (const session of sessions) {
-      var _classPrivateFieldLoo8;
-      (_classPrivateFieldLoo8 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo8 === void 0 ? void 0 : _classPrivateFieldLoo8.disconnect({
-        topic: session.topic,
-        reason: getSdkError('USER_DISCONNECTED')
-      }).catch(console.error);
+      try {
+        var _classPrivateFieldLoo8;
+        await ((_classPrivateFieldLoo8 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo8 === void 0 ? void 0 : _classPrivateFieldLoo8.disconnect({
+          topic: session.topic,
+          reason: getSdkError('USER_DISCONNECTED')
+        }));
+      } catch (e) {
+        console.error(e);
+      }
     }
 
     // Disconnect pair
     const pairs = ((_classPrivateFieldLoo9 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo9 === void 0 ? void 0 : _classPrivateFieldLoo9.pairing.values) || [];
     for (const pair of pairs) {
-      var _classPrivateFieldLoo10;
-      (_classPrivateFieldLoo10 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo10 === void 0 ? void 0 : _classPrivateFieldLoo10.disconnect({
-        topic: pair.topic,
-        reason: getSdkError('USER_DISCONNECTED')
-      }).catch(console.error);
+      try {
+        var _classPrivateFieldLoo10;
+        await ((_classPrivateFieldLoo10 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo10 === void 0 ? void 0 : _classPrivateFieldLoo10.disconnect({
+          topic: pair.topic,
+          reason: getSdkError('USER_DISCONNECTED')
+        }));
+      } catch (e) {
+        console.error(e);
+      }
     }
     const keys = (await ((_classPrivateFieldLoo11 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo11 === void 0 ? void 0 : _classPrivateFieldLoo11.core.storage.getKeys())) || [];
     const deleteKeys = resetAll ? keys : keys.filter(key => key.startsWith('wc@'));

package/utils/eth/parseTransaction/base.js

@@ -87,7 +87,7 @@ export class InputDataDecoder {
       try {
         this.abi = JSON.parse(prop);
       } catch (err) {
-        throw new Error(`Invalid ABI: ${err.message}`);
+        throw new Error('Invalid ABI: ' + err.message);
       }
     } else if (checkArrayAbiItems(prop)) {
       this.abi = prop;

package/utils/eth/parseTransaction/index.js

@@ -7,6 +7,7 @@ import { createTransactionFromRLP } from '@subwallet/extension-base/utils/eth';
 import { InputDataDecoder } from '@subwallet/extension-base/utils/eth/parseTransaction/base';
 import axios from 'axios';
 import BigN from 'bignumber.js';
+import { t } from 'i18next';
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 const ABIs = [_ERC20_ABI, _ERC721_ABI];
@@ -181,7 +182,7 @@ const getChainInfoByChainId = (networkMap, chainId) => {
 export const parseEvmRlp = async (data, networkMap, evmApiMap) => {
   const tx = createTransactionFromRLP(data);
   if (!tx) {
-    throw new Error(`Cannot create tx from ${data}`);
+    throw new Error(t('Failed to decode data. Please use a valid QR code'));
   }
   const result = {
     input: tx.data,

package/utils/index.js

@@ -4,6 +4,7 @@
 import { CrowdloanParaState, MobileOS } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
 import { getOS } from '@subwallet/extension-base/utils/environment';
+import { t } from 'i18next';
 import { assert, BN, hexToU8a, isHex } from '@polkadot/util';
 import { decodeAddress, encodeAddress, ethereumEncode, isEthereumAddress } from '@polkadot/util-crypto';
 export { canDerive } from "./canDerive.js";
@@ -282,7 +283,7 @@ export async function waitTimeout(ms) {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
 export const stripUrl = url => {
-  assert(url && (url.startsWith('http:') || url.startsWith('https:') || url.startsWith('ipfs:') || url.startsWith('ipns:')), `Invalid url ${url}, expected to start with http: or https: or ipfs: or ipns:`);
+  assert(url && (url.startsWith('http:') || url.startsWith('https:') || url.startsWith('ipfs:') || url.startsWith('ipns:')), t('Invalid URL for provider'));
   const parts = url.split('/');
   return parts[2];
 };

package/cjs/utils/keyring.js

@@ -1,57 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.extractPrivateKey = extractPrivateKey;
-exports.unlockAccount = exports.lockAccount = void 0;
-var _uiKeyring = require("@subwallet/ui-keyring");
-// Copyright 2019-2022 @subwallet/extension-base
-// SPDX-License-Identifier: Apache-2.0
-
-// import _decode from '@polkadot/keyring/pair/decode';
-
-function extract(address) {
-  // @ts-ignore
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-  const rs = this.getPair(address);
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-  console.log(rs.publicKey);
-}
-function extractPrivateKey(keyring, address, password) {
-  extract.call(keyring, address);
-}
-const unlockAccount = signAddress => {
-  let publicKey;
-  try {
-    publicKey = _uiKeyring.keyring.decodeAddress(signAddress);
-  } catch (error) {
-    console.error(error);
-    return 'Unable to decode address';
-  }
-  const pair = _uiKeyring.keyring.getPair(publicKey);
-  if (!pair) {
-    return 'Unable to find pair';
-  }
-  if (pair.isLocked) {
-    try {
-      _uiKeyring.keyring.unlockPair(pair.address);
-    } catch (e) {
-      return e.message;
-    }
-  }
-  return null;
-};
-exports.unlockAccount = unlockAccount;
-const lockAccount = address => {
-  try {
-    const pair = _uiKeyring.keyring.getPair(address);
-    if (pair) {
-      pair.lock();
-    }
-  } catch (error) {
-    console.error('Unable to lock account', error);
-  }
-};
-exports.lockAccount = lockAccount;

package/utils/keyring.d.ts

@@ -1,4 +0,0 @@
-import { Keyring } from '@subwallet/keyring';
-export declare function extractPrivateKey(keyring: Keyring, address: string, password: string): void;
-export declare const unlockAccount: (signAddress: string) => string | null;
-export declare const lockAccount: (address: string) => void;

package/utils/keyring.js

@@ -1,49 +0,0 @@
-// Copyright 2019-2022 @subwallet/extension-base
-// SPDX-License-Identifier: Apache-2.0
-
-import { keyring } from '@subwallet/ui-keyring';
-
-// import _decode from '@polkadot/keyring/pair/decode';
-
-function extract(address) {
-  // @ts-ignore
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-  const rs = this.getPair(address);
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-  console.log(rs.publicKey);
-}
-export function extractPrivateKey(keyring, address, password) {
-  extract.call(keyring, address);
-}
-export const unlockAccount = signAddress => {
-  let publicKey;
-  try {
-    publicKey = keyring.decodeAddress(signAddress);
-  } catch (error) {
-    console.error(error);
-    return 'Unable to decode address';
-  }
-  const pair = keyring.getPair(publicKey);
-  if (!pair) {
-    return 'Unable to find pair';
-  }
-  if (pair.isLocked) {
-    try {
-      keyring.unlockPair(pair.address);
-    } catch (e) {
-      return e.message;
-    }
-  }
-  return null;
-};
-export const lockAccount = address => {
-  try {
-    const pair = keyring.getPair(address);
-    if (pair) {
-      pair.lock();
-    }
-  } catch (error) {
-    console.error('Unable to lock account', error);
-  }
-};