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

package/cjs/services/history-service/subscan-history.js

@@ -6,24 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.parseSubscanExtrinsicData = parseSubscanExtrinsicData;
 exports.parseSubscanTransferData = parseSubscanTransferData;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _subscanExtrinsicParserHelper = require("@subwallet/extension-base/services/history-service/helpers/subscan-extrinsic-parser-helper");
-var _utils = require("@subwallet/extension-base/utils");
-var _utilCrypto = require("@polkadot/util-crypto");
+var _utils2 = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-function autoFormatAddress(address) {
-  try {
-    if ((0, _utilCrypto.isEthereumAddress)(address)) {
-      return address;
-    } else {
-      const decoded = (0, _utilCrypto.decodeAddress)(address);
-      return (0, _utilCrypto.encodeAddress)(decoded, 42);
-    }
-  } catch (e) {
-    return '';
-  }
-}
 function parseSubscanExtrinsicData(address, extrinsicItem, chainInfo) {
   var _chainInfo$substrateI, _chainInfo$evmInfo, _chainInfo$substrateI2, _chainInfo$evmInfo2;
   const extrinsicParserKey = (0, _subscanExtrinsicParserHelper.getExtrinsicParserKey)(extrinsicItem);
@@ -33,12 +21,13 @@ function parseSubscanExtrinsicData(address, extrinsicItem, chainInfo) {
   const chainType = chainInfo.substrateInfo ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM;
   const nativeDecimals = ((_chainInfo$substrateI = chainInfo.substrateInfo) === null || _chainInfo$substrateI === void 0 ? void 0 : _chainInfo$substrateI.decimals) || ((_chainInfo$evmInfo = chainInfo.evmInfo) === null || _chainInfo$evmInfo === void 0 ? void 0 : _chainInfo$evmInfo.decimals) || 18;
   const nativeSymbol = ((_chainInfo$substrateI2 = chainInfo.substrateInfo) === null || _chainInfo$substrateI2 === void 0 ? void 0 : _chainInfo$substrateI2.symbol) || ((_chainInfo$evmInfo2 = chainInfo.evmInfo) === null || _chainInfo$evmInfo2 === void 0 ? void 0 : _chainInfo$evmInfo2.symbol) || '';
+  const networkPrefix = (0, _utils._getChainSubstrateAddressPrefix)(chainInfo) !== -1 ? (0, _utils._getChainSubstrateAddressPrefix)(chainInfo) : 42;
   const initData = {
     address,
     origin: 'subscan',
     time: extrinsicItem.block_timestamp * 1000,
     chainType,
-    from: address,
+    from: extrinsicItem.account_display.address,
     signature: extrinsicItem.signature,
     fromName: undefined,
     direction: _KoniTypes.TransactionDirection.SEND,
@@ -61,7 +50,8 @@ function parseSubscanExtrinsicData(address, extrinsicItem, chainInfo) {
       symbol: nativeSymbol
     },
     status: extrinsicItem.success ? _KoniTypes.ExtrinsicStatus.SUCCESS : _KoniTypes.ExtrinsicStatus.FAIL,
-    nonce: extrinsicItem.nonce
+    nonce: extrinsicItem.nonce,
+    addressPrefix: networkPrefix
   };
   try {
     return _subscanExtrinsicParserHelper.subscanExtrinsicParserMap[extrinsicParserKey](initData);
@@ -75,8 +65,6 @@ function parseSubscanTransferData(address, transferItem, chainInfo) {
   const chainType = chainInfo.substrateInfo ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM;
   const nativeDecimals = ((_chainInfo$substrateI3 = chainInfo.substrateInfo) === null || _chainInfo$substrateI3 === void 0 ? void 0 : _chainInfo$substrateI3.decimals) || ((_chainInfo$evmInfo3 = chainInfo.evmInfo) === null || _chainInfo$evmInfo3 === void 0 ? void 0 : _chainInfo$evmInfo3.decimals) || 18;
   const nativeSymbol = ((_chainInfo$substrateI4 = chainInfo.substrateInfo) === null || _chainInfo$substrateI4 === void 0 ? void 0 : _chainInfo$substrateI4.symbol) || ((_chainInfo$evmInfo4 = chainInfo.evmInfo) === null || _chainInfo$evmInfo4 === void 0 ? void 0 : _chainInfo$evmInfo4.symbol) || '';
-  const from = autoFormatAddress(transferItem.from);
-  const to = autoFormatAddress(transferItem.to);
   if (!transferItem.from_account_display || !transferItem.to_account_display) {
     return null;
   }
@@ -85,14 +73,14 @@ function parseSubscanTransferData(address, transferItem, chainInfo) {
     origin: 'subscan',
     time: transferItem.block_timestamp * 1000,
     chainType,
-    from,
+    from: transferItem.from,
     fromName: transferItem.from_account_display.display || transferItem.from_account_display.address,
-    direction: (0, _utils.isSameAddress)(address, from) ? _KoniTypes.TransactionDirection.SEND : _KoniTypes.TransactionDirection.RECEIVED,
+    direction: (0, _utils2.isSameAddress)(address, transferItem.from) ? _KoniTypes.TransactionDirection.SEND : _KoniTypes.TransactionDirection.RECEIVED,
     blockNumber: transferItem.block_num,
     blockHash: '',
     chain: chainInfo.slug,
     type: _KoniTypes.ExtrinsicType.TRANSFER_BALANCE,
-    to,
+    to: transferItem.to,
     toName: transferItem.to_account_display.display || transferItem.to_account_display.address,
     extrinsicHash: transferItem.hash,
     amount: {

package/cjs/services/keyring-service/context/account-context.js

@@ -0,0 +1,259 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AccountContext = void 0;
+var _handlers = require("./handlers");
+var _state = require("./state");
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+class AccountContext {
+  constructor(koniState, parentService) {
+    this.koniState = koniState;
+    this.parentService = parentService;
+    this.state = new _state.AccountState(this.koniState);
+    this.deriveHandler = new _handlers.AccountDeriveHandler(this.parentService, this.state);
+    this.mnemonicHandler = new _handlers.AccountMnemonicHandler(this.parentService, this.state);
+    this.jsonHandler = new _handlers.AccountJsonHandler(this.parentService, this.state);
+    this.injectHandler = new _handlers.AccountInjectHandler(this.parentService, this.state);
+    this.ledgerHandler = new _handlers.AccountLedgerHandler(this.parentService, this.state);
+    this.modifyHandler = new _handlers.AccountModifyHandler(this.parentService, this.state);
+    this.secretHandler = new _handlers.AccountSecretHandler(this.parentService, this.state);
+  }
+
+  // TODO: Merge to value
+  get pairs() {
+    return this.state.pairs;
+  }
+
+  // TODO: Merge to value
+  get observable() {
+    return this.state.observable;
+  }
+  get value() {
+    return this.state.value;
+  }
+
+  // TODO: Merge to value
+  get contacts() {
+    return this.state.contacts;
+  }
+
+  // TODO: Merge to value
+  get accounts() {
+    return this.state.accounts;
+  }
+
+  /* Current account */
+
+  // TODO: Merge to value
+  get currentAccount() {
+    return this.state.currentAccount;
+  }
+  saveCurrentAccountProxyId(proxyId, callback, preventOneAccount) {
+    this.state.saveCurrentAccountProxyId(proxyId, callback, preventOneAccount);
+  }
+
+  /* Current account */
+
+  isUnifiedAccount(proxyId) {
+    return this.state.isUnifiedAccount(proxyId);
+  }
+  addressesByProxyId(proxyId) {
+    return this.state.addressesByProxyId(proxyId);
+  }
+
+  /* Modify accounts */
+
+  accountsEdit(request) {
+    return this.modifyHandler.accountsEdit(request);
+  }
+  checkNameExists(_ref) {
+    let {
+      name,
+      proxyId
+    } = _ref;
+    const exists = this.state.checkNameExists(name, proxyId);
+    return {
+      isValid: !exists
+    };
+  }
+  async accountProxyForget(request) {
+    return this.modifyHandler.accountProxyForget(request);
+  }
+  keyringChangeMasterPassword(request, callback) {
+    return this.modifyHandler.keyringChangeMasterPassword(request, callback);
+  }
+  keyringMigrateMasterPassword(request, callback) {
+    return this.modifyHandler.keyringMigrateMasterPassword(request, callback);
+  }
+  tonGetAllTonWalletContractVersion(request) {
+    return this.modifyHandler.tonGetAllTonWalletContractVersion(request);
+  }
+  tonAccountChangeWalletContractVersion(request) {
+    return this.modifyHandler.tonAccountChangeWalletContractVersion(request);
+  }
+
+  /* Modify accounts */
+
+  /* Get address for another service */
+
+  getDecodedAddresses(accountProxy) {
+    let allowGetAllAccount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+    return this.state.getDecodedAddresses(accountProxy, allowGetAllAccount);
+  }
+
+  /* Get address for another service */
+
+  /* Mnemonic */
+
+  /* Create seed */
+  mnemonicCreateV2(request) {
+    return this.mnemonicHandler.mnemonicCreateV2(request);
+  }
+
+  /* Validate seed */
+  mnemonicValidateV2(request) {
+    return this.mnemonicHandler.mnemonicValidateV2(request);
+  }
+
+  /* Add accounts from mnemonic */
+  accountsCreateSuriV2(request) {
+    return this.mnemonicHandler.accountsCreateSuriV2(request);
+  }
+
+  /* Export mnemonic */
+  exportAccountProxyMnemonic(request) {
+    return this.mnemonicHandler.exportAccountProxyMnemonic(request);
+  }
+
+  /* Mnemonic */
+
+  /* Add QR-signer, read-only */
+  async accountsCreateExternalV2(request) {
+    return this.secretHandler.accountsCreateExternalV2(request);
+  }
+
+  /* Import ethereum account with the private key  */
+  privateKeyValidateV2(request) {
+    return this.secretHandler.privateKeyValidateV2(request);
+  }
+
+  /* Import ethereum account with the private key  */
+
+  /* Ledger */
+
+  /* For custom derive path */
+  async accountsCreateHardwareV2(request) {
+    return this.ledgerHandler.accountsCreateHardwareV2(request);
+  }
+
+  /* For multi select */
+  async accountsCreateHardwareMultiple(request) {
+    return this.ledgerHandler.accountsCreateHardwareMultiple(request);
+  }
+
+  /* Ledger */
+
+  /* JSON */
+
+  parseInfoSingleJson(request) {
+    return this.jsonHandler.parseInfoSingleJson(request);
+  }
+  jsonRestoreV2(request, onDone) {
+    return this.jsonHandler.jsonRestoreV2(request, onDone);
+  }
+  parseInfoMultiJson(request) {
+    return this.jsonHandler.parseInfoMultiJson(request);
+  }
+  batchRestoreV2(request) {
+    return this.jsonHandler.batchRestoreV2(request);
+  }
+  batchExportV2(request) {
+    return this.jsonHandler.batchExportV2(request);
+  }
+
+  /* JSON */
+
+  /* Add with secret and public key */
+  async accountsCreateWithSecret(request) {
+    return this.secretHandler.accountsCreateWithSecret(request);
+  }
+  checkPublicAndSecretKey(request) {
+    return this.secretHandler.checkPublicAndSecretKey(request);
+  }
+  accountExportPrivateKey(request) {
+    return this.secretHandler.accountExportPrivateKey(request);
+  }
+
+  /* Derive */
+
+  /**
+   * @func derivationCreateMultiple
+   * @desc Derive multi account
+   * Note: Must update before re-use
+   * @deprecated
+   */
+  derivationCreateMultiple(request) {
+    return this.deriveHandler.derivationCreateMultiple(request);
+  }
+
+  /**
+   * @func getListDeriveAccounts
+   * @desc Get a derivation account list.
+   * Note: Must update before re-use
+   * @deprecated
+   */
+  getListDeriveAccounts(request) {
+    return this.deriveHandler.getListDeriveAccounts(request);
+  }
+
+  /* Validate derivation path */
+  validateDerivePath(request) {
+    return this.deriveHandler.validateDerivePath(request);
+  }
+
+  /* Validate derivation path */
+  getDeriveSuggestion(request) {
+    return this.deriveHandler.getDeriveSuggestion(request);
+  }
+
+  /* Derive account proxy  */
+  derivationAccountProxyCreate(request) {
+    return this.deriveHandler.derivationAccountProxyCreate(request);
+  }
+
+  /* Derive */
+
+  /* Inject */
+
+  addInjectAccounts(accounts) {
+    this.injectHandler.addInjectAccounts(accounts);
+  }
+  removeInjectAccounts(_addresses) {
+    this.injectHandler.removeInjectAccounts(_addresses);
+  }
+
+  /* Inject */
+
+  /* Others */
+
+  removeNoneHardwareGenesisHash() {
+    this.state.removeNoneHardwareGenesisHash();
+  }
+  updateMetadataForPair() {
+    this.state.updateMetadataForPair();
+  }
+
+  /* Others */
+
+  /* Reset wallet */
+  resetWallet() {
+    this.state.resetWallet();
+  }
+
+  /* Reset wallet */
+}
+exports.AccountContext = AccountContext;

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

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AccountBaseHandler = void 0;
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * @class AccountBaseHandler
+ * @description Base class for account actions
+ * */
+class AccountBaseHandler {
+  constructor(parentService, state) {
+    this.state = state;
+    this.parentService = parentService;
+  }
+}
+exports.AccountBaseHandler = AccountBaseHandler;