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

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/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);
-  }
-};