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

package/utils/index.js

@@ -2,11 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { CrowdloanParaState } from '@subwallet/extension-base/background/KoniTypes';
-import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
 import { getRandomIpfsGateway, SUBWALLET_IPFS } from '@subwallet/extension-base/koni/api/nft/config';
+import { _isChainEvmCompatible, _isChainSubstrateCompatible, _isChainTonCompatible } from '@subwallet/extension-base/services/chain-service/utils';
+import { reformatAddress } from '@subwallet/extension-base/utils/account';
+import { decodeAddress, encodeAddress, isTonAddress } from '@subwallet/keyring';
 import { t } from 'i18next';
 import { assert, BN, hexToU8a, isHex } from '@polkadot/util';
-import { decodeAddress, encodeAddress, ethereumEncode, isEthereumAddress } from '@polkadot/util-crypto';
+import { ethereumEncode, isEthereumAddress } from '@polkadot/util-crypto';
 export { canDerive } from "./canDerive.js";
 export * from "./mv3.js";
 export * from "./fetch.js";
@@ -14,33 +16,10 @@ export const notDef = x => x === null || typeof x === 'undefined';
 export const isDef = x => !notDef(x);
 export const nonEmptyArr = x => Array.isArray(x) && x.length > 0;
 export const isEmptyArray = x => !Array.isArray(x) || Array.isArray(x) && x.length === 0;
-export function isAccountAll(address) {
-  return address === ALL_ACCOUNT_KEY;
-}
-export function reformatAddress(address, networkPrefix = 42, isEthereum = false) {
-  try {
-    if (!address || address === '') {
-      return '';
-    }
-    if (isEthereumAddress(address)) {
-      return address;
-    }
-    if (isAccountAll(address)) {
-      return address;
-    }
-    const publicKey = decodeAddress(address);
-    if (isEthereum) {
-      return ethereumEncode(publicKey);
-    }
-    if (networkPrefix < 0) {
-      return address;
-    }
-    return encodeAddress(publicKey, networkPrefix);
-  } catch (e) {
-    console.warn('Get error while reformat address', address, e);
-    return address;
-  }
-}
+
+/**
+ * @deprecated
+ * */
 export function filterAddressByNetworkKey(addresses, networkKey, isEthereum) {
   if (isEthereum) {
     return addresses.filter(address => {
@@ -52,23 +31,10 @@ export function filterAddressByNetworkKey(addresses, networkKey, isEthereum) {
     });
   }
 }
-export function categoryAddresses(addresses) {
-  const substrateAddresses = [];
-  const evmAddresses = [];
-  addresses.forEach(address => {
-    if (isEthereumAddress(address)) {
-      evmAddresses.push(address);
-    } else {
-      substrateAddresses.push(address);
-    }
-  });
-  return [substrateAddresses, evmAddresses];
-}
-export function categoryNetworks(networks) {
-  const substrateAddresses = [];
-  const evmAddresses = [];
-  return [substrateAddresses, evmAddresses];
-}
+
+/**
+ * @deprecated
+ * */
 export function convertToEvmAddress(substrateAddress) {
   const addressBytes = decodeAddress(substrateAddress);
   return ethereumEncode('0x' + Buffer.from(addressBytes.subarray(0, 20)).toString('hex'));
@@ -277,6 +243,20 @@ export function isSameAddress(address1, address2) {
   return reformatAddress(address1, 0) === reformatAddress(address2, 0); // TODO: maybe there's a better way
 }
 
+export function isSameAddressType(address1, address2) {
+  const isSameEvmAddress = isEthereumAddress(address1) && isEthereumAddress(address2);
+  const isSameTonAddress = isTonAddress(address1) && isTonAddress(address2);
+  const isSameSubstrateAddress = !isEthereumAddress(address1) && !isTonAddress(address1) && !isEthereumAddress(address2) && !isTonAddress(address2); // todo: need isSubstrateAddress util function to check exactly
+
+  return isSameEvmAddress || isSameTonAddress || isSameSubstrateAddress;
+}
+export function isAddressAndChainCompatible(address, chain) {
+  const isEvmCompatible = isEthereumAddress(address) && _isChainEvmCompatible(chain);
+  const isTonCompatible = isTonAddress(address) && _isChainTonCompatible(chain);
+  const isSubstrateCompatible = !isEthereumAddress(address) && !isTonAddress(address) && _isChainSubstrateCompatible(chain); // todo: need isSubstrateAddress util function to check exactly
+
+  return isEvmCompatible || isSubstrateCompatible || isTonCompatible;
+}
 export function getDomainFromUrl(url) {
   return url.replace(/^(https?:\/\/)?(www\.)?/, '').split('/')[0];
 }
@@ -344,9 +324,10 @@ export function wait(milliseconds) {
     }, milliseconds);
   });
 }
-export * from "./account.js";
+export * from "./account/index.js";
 export * from "./array.js";
 export * from "./asset.js";
+export * from "./auth.js";
 export * from "./environment.js";
 export * from "./eth.js";
 export * from "./fetchEvmChainInfo.js";

package/cjs/signers/substrates/KeyringSigner.js

@@ -1,35 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-// Copyright 2017-2022 @polkadot/react-signer authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-let id = 1;
-class KeyringSigner {
-  #pair;
-  #registry;
-  constructor(_ref) {
-    let {
-      keyPair,
-      registry
-    } = _ref;
-    this.#pair = keyPair;
-    this.#registry = registry;
-  }
-  async signPayload(payload) {
-    return new Promise(resolve => {
-      const wrapper = this.#registry.createType('ExtrinsicPayload', payload, {
-        version: payload.version
-      });
-      const signature = wrapper.sign(this.#pair).signature;
-      resolve({
-        id: id++,
-        signature: signature
-      });
-    });
-  }
-}
-exports.default = KeyringSigner;

package/cjs/signers/substrates/LedgerSigner.js

@@ -1,44 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
-var _util = require("@polkadot/util");
-// Copyright 2019-2022 @subwallet/extension-base authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-class LedgerSigner {
-  #registry;
-  #callback;
-  #setState;
-  #id;
-  constructor(registry, callback, id, setState) {
-    this.#registry = registry;
-    this.#callback = callback;
-    this.#id = id;
-    this.#setState = setState;
-  }
-  async signPayload(payload) {
-    return new Promise((resolve, reject) => {
-      const raw = this.#registry.createType('ExtrinsicPayload', payload, {
-        version: payload.version
-      });
-      const ledgerPayload = raw.toU8a(true);
-      this.#setState({
-        reject: reject,
-        resolve: resolve,
-        status: _KoniTypes.ExternalRequestPromiseStatus.PENDING,
-        createdAt: new Date().getTime()
-      });
-      this.#callback({
-        ledgerState: {
-          ledgerPayload: (0, _util.u8aToHex)(ledgerPayload),
-          ledgerId: this.#id
-        }
-      });
-    });
-  }
-}
-exports.default = LedgerSigner;

package/cjs/signers/substrates/QrSigner.js

@@ -1,63 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
-var _util = require("@polkadot/util");
-var _utilCrypto = require("@polkadot/util-crypto");
-// Copyright 2017-2022 @polkadot/react-signer authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-class QrSigner {
-  #callback;
-  #id;
-  #registry;
-  #resolver;
-  #setState;
-  constructor(_ref) {
-    let {
-      callback,
-      id,
-      registry,
-      resolver,
-      setState
-    } = _ref;
-    this.#callback = callback;
-    this.#id = id;
-    this.#registry = registry;
-    this.#resolver = resolver;
-    this.#setState = setState;
-  }
-  async signPayload(payload) {
-    return new Promise((resolve, reject) => {
-      // limit size of the transaction
-      const isQrHashed = payload.method.length > 5000;
-      const wrapper = this.#registry.createType('ExtrinsicPayload', payload, {
-        version: payload.version
-      });
-      const qrPayload = isQrHashed ? (0, _utilCrypto.blake2AsU8a)(wrapper.toU8a(true)) : wrapper.toU8a();
-      const resolver = result => {
-        this.#resolver();
-        resolve(result);
-      };
-      this.#setState({
-        reject: reject,
-        resolve: resolver,
-        status: _KoniTypes.ExternalRequestPromiseStatus.PENDING,
-        createdAt: new Date().getTime()
-      });
-      this.#callback({
-        qrState: {
-          isQrHashed,
-          qrAddress: payload.address,
-          qrPayload: (0, _util.u8aToHex)(qrPayload),
-          qrId: this.#id,
-          isEthereum: false
-        }
-      });
-    });
-  }
-}
-exports.default = QrSigner;

package/cjs/signers/types.js

@@ -1,15 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.SignerType = void 0;
-// Copyright 2019-2022 @polkadot/extension-koni authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-let SignerType;
-exports.SignerType = SignerType;
-(function (SignerType) {
-  SignerType["PASSWORD"] = "PASSWORD";
-  SignerType["QR"] = "QR";
-  SignerType["LEDGER"] = "LEDGER";
-})(SignerType || (exports.SignerType = SignerType = {}));

package/cjs/signers/web3/QrSigner.js

@@ -1,67 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
-var _ethereumjsUtil = require("ethereumjs-util");
-var _ethers = require("ethers");
-// Copyright 2019-2022 @subwallet/extension-base authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-class QrSigner {
-  #callback;
-  #id;
-  #resolver;
-  #setState;
-  constructor(_ref) {
-    let {
-      callback,
-      id,
-      resolver,
-      setState
-    } = _ref;
-    this.#callback = callback;
-    this.#id = id;
-    this.#resolver = resolver;
-    this.#setState = setState;
-  }
-  async signTransaction(tx) {
-    return new Promise((resolve, reject) => {
-      var _tx$nonce;
-      const txObject = {
-        nonce: (_tx$nonce = tx.nonce) !== null && _tx$nonce !== void 0 ? _tx$nonce : 0,
-        gasPrice: (0, _ethereumjsUtil.addHexPrefix)(tx.gasPrice.toString(16)),
-        maxPriorityFeePerGas: (0, _ethereumjsUtil.addHexPrefix)(tx.maxPriorityFeePerGas.toString(16)),
-        maxFeePerGas: (0, _ethereumjsUtil.addHexPrefix)(tx.maxFeePerGas.toString(16)),
-        gasLimit: (0, _ethereumjsUtil.addHexPrefix)(tx.gasLimit.toString(16)),
-        to: tx.to !== undefined ? tx.to : '',
-        value: (0, _ethereumjsUtil.addHexPrefix)(tx.value.toString(16)),
-        data: tx.data,
-        chainId: tx.chainId
-      };
-      const qrPayload = _ethers.ethers.Transaction.from(txObject).unsignedSerialized;
-      const resolver = result => {
-        this.#resolver();
-        resolve(result);
-      };
-      this.#setState({
-        reject: reject,
-        resolve: resolver,
-        status: _KoniTypes.ExternalRequestPromiseStatus.PENDING,
-        createdAt: new Date().getTime()
-      });
-      this.#callback({
-        qrState: {
-          isQrHashed: false,
-          qrAddress: tx.from,
-          qrPayload: qrPayload,
-          qrId: this.#id,
-          isEthereum: true
-        }
-      });
-    });
-  }
-}
-exports.default = QrSigner;

package/cjs/utils/account.js

@@ -1,34 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.convertSubjectInfoToAddresses = void 0;
-exports.quickFormatAddressToCompare = quickFormatAddressToCompare;
-exports.simpleAddress = void 0;
-var _index = require("@subwallet/extension-base/utils/index");
-var _utilCrypto = require("@polkadot/util-crypto");
-// Copyright 2019-2022 @subwallet/extension-base authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-const simpleAddress = address => {
-  if ((0, _utilCrypto.isEthereumAddress)(address)) {
-    return address;
-  }
-  return (0, _utilCrypto.encodeAddress)((0, _utilCrypto.decodeAddress)(address));
-};
-exports.simpleAddress = simpleAddress;
-function quickFormatAddressToCompare(address) {
-  if (!(0, _utilCrypto.isAddress)(address)) {
-    return address;
-  }
-  return (0, _index.reformatAddress)(address, 42).toLowerCase();
-}
-const convertSubjectInfoToAddresses = subjectInfo => {
-  return Object.values(subjectInfo).map(info => ({
-    address: info.json.address,
-    type: info.type,
-    ...info.json.meta
-  }));
-};
-exports.convertSubjectInfoToAddresses = convertSubjectInfoToAddresses;

package/signers/substrates/KeyringSigner.d.ts

@@ -1,13 +0,0 @@
-import type { Signer, SignerResult } from '@polkadot/api/types';
-import type { Registry, SignerPayloadJSON } from '@polkadot/types/types';
-import { KeyringPair } from '@subwallet/keyring/types';
-interface KeyringSignerProps {
-    registry: Registry;
-    keyPair: KeyringPair;
-}
-export default class KeyringSigner implements Signer {
-    #private;
-    constructor({ keyPair, registry }: KeyringSignerProps);
-    signPayload(payload: SignerPayloadJSON): Promise<SignerResult>;
-}
-export {};

package/signers/substrates/KeyringSigner.js

@@ -1,27 +0,0 @@
-// Copyright 2017-2022 @polkadot/react-signer authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-let id = 1;
-export default class KeyringSigner {
-  #pair;
-  #registry;
-  constructor({
-    keyPair,
-    registry
-  }) {
-    this.#pair = keyPair;
-    this.#registry = registry;
-  }
-  async signPayload(payload) {
-    return new Promise(resolve => {
-      const wrapper = this.#registry.createType('ExtrinsicPayload', payload, {
-        version: payload.version
-      });
-      const signature = wrapper.sign(this.#pair).signature;
-      resolve({
-        id: id++,
-        signature: signature
-      });
-    });
-  }
-}

package/signers/substrates/LedgerSigner.d.ts

@@ -1,13 +0,0 @@
-import type { Signer, SignerResult } from '@polkadot/api/types';
-import type { Registry, SignerPayloadJSON } from '@polkadot/types/types';
-import { ExternalRequestPromise } from '@subwallet/extension-base/background/KoniTypes';
-import { LedgerState } from '@subwallet/extension-base/signers/types';
-interface CallbackProps {
-    ledgerState: LedgerState;
-}
-export default class LedgerSigner implements Signer {
-    #private;
-    constructor(registry: Registry, callback: (state: CallbackProps) => void, id: string, setState: (promise: ExternalRequestPromise) => void);
-    signPayload(payload: SignerPayloadJSON): Promise<SignerResult>;
-}
-export {};

package/signers/substrates/LedgerSigner.js

@@ -1,37 +0,0 @@
-// Copyright 2019-2022 @subwallet/extension-base authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import { ExternalRequestPromiseStatus } from '@subwallet/extension-base/background/KoniTypes';
-import { u8aToHex } from '@polkadot/util';
-export default class LedgerSigner {
-  #registry;
-  #callback;
-  #setState;
-  #id;
-  constructor(registry, callback, id, setState) {
-    this.#registry = registry;
-    this.#callback = callback;
-    this.#id = id;
-    this.#setState = setState;
-  }
-  async signPayload(payload) {
-    return new Promise((resolve, reject) => {
-      const raw = this.#registry.createType('ExtrinsicPayload', payload, {
-        version: payload.version
-      });
-      const ledgerPayload = raw.toU8a(true);
-      this.#setState({
-        reject: reject,
-        resolve: resolve,
-        status: ExternalRequestPromiseStatus.PENDING,
-        createdAt: new Date().getTime()
-      });
-      this.#callback({
-        ledgerState: {
-          ledgerPayload: u8aToHex(ledgerPayload),
-          ledgerId: this.#id
-        }
-      });
-    });
-  }
-}

package/signers/substrates/QrSigner.d.ts

@@ -1,20 +0,0 @@
-import type { Signer, SignerResult } from '@polkadot/api/types';
-import type { Registry, SignerPayloadJSON } from '@polkadot/types/types';
-import { ExternalRequestPromise } from '@subwallet/extension-base/background/KoniTypes';
-import { QrState } from '@subwallet/extension-base/signers/types';
-interface CallbackProps {
-    qrState: QrState;
-}
-interface QrSignerProps {
-    registry: Registry;
-    callback: (state: CallbackProps) => void;
-    id: string;
-    setState: (promise: ExternalRequestPromise) => void;
-    resolver: () => void;
-}
-export default class QrSigner implements Signer {
-    #private;
-    constructor({ callback, id, registry, resolver, setState }: QrSignerProps);
-    signPayload(payload: SignerPayloadJSON): Promise<SignerResult>;
-}
-export {};

package/signers/substrates/QrSigner.js

@@ -1,55 +0,0 @@
-// Copyright 2017-2022 @polkadot/react-signer authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import { ExternalRequestPromiseStatus } from '@subwallet/extension-base/background/KoniTypes';
-import { u8aToHex } from '@polkadot/util';
-import { blake2AsU8a } from '@polkadot/util-crypto';
-export default class QrSigner {
-  #callback;
-  #id;
-  #registry;
-  #resolver;
-  #setState;
-  constructor({
-    callback,
-    id,
-    registry,
-    resolver,
-    setState
-  }) {
-    this.#callback = callback;
-    this.#id = id;
-    this.#registry = registry;
-    this.#resolver = resolver;
-    this.#setState = setState;
-  }
-  async signPayload(payload) {
-    return new Promise((resolve, reject) => {
-      // limit size of the transaction
-      const isQrHashed = payload.method.length > 5000;
-      const wrapper = this.#registry.createType('ExtrinsicPayload', payload, {
-        version: payload.version
-      });
-      const qrPayload = isQrHashed ? blake2AsU8a(wrapper.toU8a(true)) : wrapper.toU8a();
-      const resolver = result => {
-        this.#resolver();
-        resolve(result);
-      };
-      this.#setState({
-        reject: reject,
-        resolve: resolver,
-        status: ExternalRequestPromiseStatus.PENDING,
-        createdAt: new Date().getTime()
-      });
-      this.#callback({
-        qrState: {
-          isQrHashed,
-          qrAddress: payload.address,
-          qrPayload: u8aToHex(qrPayload),
-          qrId: this.#id,
-          isEthereum: false
-        }
-      });
-    });
-  }
-}

package/signers/types.d.ts

@@ -1,34 +0,0 @@
-export interface QrState {
-    isQrHashed: boolean;
-    qrAddress: string;
-    qrPayload: `0x${string}`;
-    qrId: string;
-    isEthereum: boolean;
-}
-export interface Web3TransactionBase {
-    to?: string;
-    gasPrice: number;
-    maxFeePerGas: number;
-    maxPriorityFeePerGas: number;
-    gasLimit: number;
-    nonce: number;
-    chainId: number;
-    data?: string;
-    value: number;
-}
-export interface Web3Transaction extends Web3TransactionBase {
-    from: string;
-}
-export interface LedgerState {
-    ledgerPayload: `0x${string}`;
-    ledgerId: string;
-}
-export interface ExternalState {
-    externalId: string;
-}
-export declare enum SignerType {
-    PASSWORD = "PASSWORD",
-    QR = "QR",
-    LEDGER = "LEDGER"
-}
-export declare type SignerExternal = SignerType.LEDGER | SignerType.QR;

package/signers/types.js

@@ -1,9 +0,0 @@
-// Copyright 2019-2022 @polkadot/extension-koni authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-export let SignerType;
-(function (SignerType) {
-  SignerType["PASSWORD"] = "PASSWORD";
-  SignerType["QR"] = "QR";
-  SignerType["LEDGER"] = "LEDGER";
-})(SignerType || (SignerType = {}));

package/signers/web3/QrSigner.d.ts

@@ -1,18 +0,0 @@
-import { ExternalRequestPromise } from '@subwallet/extension-base/background/KoniTypes';
-import { QrState, Web3Transaction } from '@subwallet/extension-base/signers/types';
-import { SignerResult } from '@polkadot/api/types';
-interface CallbackProps {
-    qrState: QrState;
-}
-interface QrSignerProps {
-    callback: (state: CallbackProps) => void;
-    id: string;
-    setState: (promise: ExternalRequestPromise) => void;
-    resolver: () => void;
-}
-export default class QrSigner {
-    #private;
-    constructor({ callback, id, resolver, setState }: QrSignerProps);
-    signTransaction(tx: Web3Transaction): Promise<SignerResult>;
-}
-export {};

package/signers/web3/QrSigner.js

@@ -1,59 +0,0 @@
-// Copyright 2019-2022 @subwallet/extension-base authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import { ExternalRequestPromiseStatus } from '@subwallet/extension-base/background/KoniTypes';
-import { addHexPrefix } from 'ethereumjs-util';
-import { ethers } from 'ethers';
-export default class QrSigner {
-  #callback;
-  #id;
-  #resolver;
-  #setState;
-  constructor({
-    callback,
-    id,
-    resolver,
-    setState
-  }) {
-    this.#callback = callback;
-    this.#id = id;
-    this.#resolver = resolver;
-    this.#setState = setState;
-  }
-  async signTransaction(tx) {
-    return new Promise((resolve, reject) => {
-      var _tx$nonce;
-      const txObject = {
-        nonce: (_tx$nonce = tx.nonce) !== null && _tx$nonce !== void 0 ? _tx$nonce : 0,
-        gasPrice: addHexPrefix(tx.gasPrice.toString(16)),
-        maxPriorityFeePerGas: addHexPrefix(tx.maxPriorityFeePerGas.toString(16)),
-        maxFeePerGas: addHexPrefix(tx.maxFeePerGas.toString(16)),
-        gasLimit: addHexPrefix(tx.gasLimit.toString(16)),
-        to: tx.to !== undefined ? tx.to : '',
-        value: addHexPrefix(tx.value.toString(16)),
-        data: tx.data,
-        chainId: tx.chainId
-      };
-      const qrPayload = ethers.Transaction.from(txObject).unsignedSerialized;
-      const resolver = result => {
-        this.#resolver();
-        resolve(result);
-      };
-      this.#setState({
-        reject: reject,
-        resolve: resolver,
-        status: ExternalRequestPromiseStatus.PENDING,
-        createdAt: new Date().getTime()
-      });
-      this.#callback({
-        qrState: {
-          isQrHashed: false,
-          qrAddress: tx.from,
-          qrPayload: qrPayload,
-          qrId: this.#id,
-          isEthereum: true
-        }
-      });
-    });
-  }
-}

package/types/transaction.d.ts

@@ -1,3 +0,0 @@
-import { TransactionConfig } from 'web3-core';
-import { SubmittableExtrinsic } from '@polkadot/api/types';
-export declare type TransactionData = SubmittableExtrinsic<'promise'> | TransactionConfig;