@subwallet/extension-base 0.5.3-1 → 0.5.4-0

package/cjs/background/KoniTypes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TransferStep = exports.TransferErrorCode = exports.RMRK_VER = exports.NETWORK_STATUS = exports.NETWORK_ERROR = exports.CrowdloanParaState = exports.ApiInitStatus = exports.APIItemState = void 0;
+exports.TransferStep = exports.TransferErrorCode = exports.RMRK_VER = exports.NETWORK_STATUS = exports.NETWORK_ERROR = exports.ExternalRequestPromiseStatus = exports.CrowdloanParaState = exports.BasicTxErrorCode = exports.ApiInitStatus = exports.AccountExternalErrorCode = exports.APIItemState = void 0;
 // Copyright 2019-2022 @polkadot/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 let ApiInitStatus;
@@ -77,19 +77,59 @@ exports.TransferErrorCode = TransferErrorCode;
   TransferErrorCode["NOT_ENOUGH_VALUE"] = "notEnoughValue";
   TransferErrorCode["INVALID_VALUE"] = "invalidValue";
   TransferErrorCode["INVALID_TOKEN"] = "invalidToken";
+  TransferErrorCode["INVALID_PARAM"] = "invalidParam";
   TransferErrorCode["KEYRING_ERROR"] = "keyringError";
   TransferErrorCode["TRANSFER_ERROR"] = "transferError";
   TransferErrorCode["TIMEOUT"] = "timeout";
   TransferErrorCode["UNSUPPORTED"] = "unsupported";
 })(TransferErrorCode || (exports.TransferErrorCode = TransferErrorCode = {}));
 
+let BasicTxErrorCode;
+exports.BasicTxErrorCode = BasicTxErrorCode;
+
+(function (BasicTxErrorCode) {
+  BasicTxErrorCode["INVALID_FROM_ADDRESS"] = "invalidFromAccount";
+  BasicTxErrorCode["INVALID_TO_ADDRESS"] = "invalidToAccount";
+  BasicTxErrorCode["NOT_ENOUGH_VALUE"] = "notEnoughValue";
+  BasicTxErrorCode["INVALID_VALUE"] = "invalidValue";
+  BasicTxErrorCode["INVALID_TOKEN"] = "invalidToken";
+  BasicTxErrorCode["INVALID_PARAM"] = "invalidParam";
+  BasicTxErrorCode["KEYRING_ERROR"] = "keyringError";
+  BasicTxErrorCode["TRANSFER_ERROR"] = "transferError";
+  BasicTxErrorCode["STAKING_ERROR"] = "stakingError";
+  BasicTxErrorCode["UN_STAKING_ERROR"] = "unStakingError";
+  BasicTxErrorCode["WITHDRAW_STAKING_ERROR"] = "withdrawStakingError";
+  BasicTxErrorCode["TIMEOUT"] = "timeout";
+  BasicTxErrorCode["UNSUPPORTED"] = "unsupported";
+})(BasicTxErrorCode || (exports.BasicTxErrorCode = BasicTxErrorCode = {}));
+
 let TransferStep;
 exports.TransferStep = TransferStep;
 
 (function (TransferStep) {
   TransferStep["READY"] = "ready";
+  TransferStep["SIGNING"] = "signing";
   TransferStep["START"] = "start";
   TransferStep["PROCESSING"] = "processing";
   TransferStep["SUCCESS"] = "success";
   TransferStep["ERROR"] = "error";
-})(TransferStep || (exports.TransferStep = TransferStep = {}));
+})(TransferStep || (exports.TransferStep = TransferStep = {}));
+
+let ExternalRequestPromiseStatus;
+exports.ExternalRequestPromiseStatus = ExternalRequestPromiseStatus;
+
+(function (ExternalRequestPromiseStatus) {
+  ExternalRequestPromiseStatus[ExternalRequestPromiseStatus["PENDING"] = 0] = "PENDING";
+  ExternalRequestPromiseStatus[ExternalRequestPromiseStatus["REJECTED"] = 1] = "REJECTED";
+  ExternalRequestPromiseStatus[ExternalRequestPromiseStatus["FAILED"] = 2] = "FAILED";
+  ExternalRequestPromiseStatus[ExternalRequestPromiseStatus["COMPLETED"] = 3] = "COMPLETED";
+})(ExternalRequestPromiseStatus || (exports.ExternalRequestPromiseStatus = ExternalRequestPromiseStatus = {}));
+
+let AccountExternalErrorCode;
+exports.AccountExternalErrorCode = AccountExternalErrorCode;
+
+(function (AccountExternalErrorCode) {
+  AccountExternalErrorCode["INVALID_ADDRESS"] = "invalidToAccount";
+  AccountExternalErrorCode["KEYRING_ERROR"] = "keyringError";
+  AccountExternalErrorCode["UNKNOWN_ERROR"] = "unknownError";
+})(AccountExternalErrorCode || (exports.AccountExternalErrorCode = AccountExternalErrorCode = {}));

package/cjs/background/handlers/Extension.js

@@ -557,6 +557,59 @@ class Extension {
       isLocked: pair.isLocked,
       remainingTime
     };
+  }
+
+  qrIsLocked(_ref24) {
+    let {
+      address
+    } = _ref24;
+
+    const pair = _uiKeyring.default.getPair(address);
+
+    (0, _util.assert)(pair, 'Unable to find pair');
+    const remainingTime = this.refreshAccountPasswordCache(pair);
+    return {
+      isLocked: pair.isLocked,
+      remainingTime
+    };
+  }
+
+  qrSignSubstrate(_ref25) {
+    let {
+      address,
+      message,
+      password,
+      savePass
+    } = _ref25;
+
+    const pair = _uiKeyring.default.getPair(address);
+
+    (0, _util.assert)(pair, 'Unable to find pair');
+
+    if (pair.isLocked && !password) {
+      throw new Error('Password needed to unlock the account');
+    }
+
+    if (pair.isLocked) {
+      try {
+        pair.decodePkcs8(password);
+      } catch (e) {
+        throw new Error('invalid password');
+      }
+    }
+
+    const signed = (0, _util.u8aToHex)(pair.sign(message));
+    const _address = pair.address;
+
+    if (savePass) {
+      this.#cachedUnlocks[_address] = Date.now() + _defaults.PASSWORD_EXPIRY_MS;
+    } else {
+      pair.lock();
+    }
+
+    return {
+      signature: signed
+    };
   } // FIXME This looks very much like what we have in authorization
 
 
@@ -600,12 +653,12 @@ class Extension {
     }
   }
 
-  derivationValidate(_ref24) {
+  derivationValidate(_ref26) {
     let {
       parentAddress,
       parentPassword,
       suri
-    } = _ref24;
+    } = _ref26;
     const childPair = this.derive(parentAddress, suri, parentPassword, {});
     return {
       address: childPair.address,
@@ -613,7 +666,7 @@ class Extension {
     };
   }
 
-  derivationCreate(_ref25) {
+  derivationCreate(_ref27) {
     let {
       genesisHash,
       name,
@@ -621,7 +674,7 @@ class Extension {
       parentPassword,
       password,
       suri
-    } = _ref25;
+    } = _ref27;
     const childPair = this.derive(parentAddress, suri, parentPassword, {
       genesisHash,
       name,
@@ -748,6 +801,12 @@ class Extension {
       case 'pri(signing.isLocked)':
         return this.signingIsLocked(request);
 
+      case 'pri(qr.isLocked)':
+        return this.qrIsLocked(request);
+
+      case 'pri(qr.sign.substrate)':
+        return this.qrSignSubstrate(request);
+
       case 'pri(signing.requests)':
         return this.signingSubscribe(id, port);
 

package/cjs/defaults.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.PORT_EXTENSION = exports.PORT_CONTENT = exports.PHISHING_PAGE_REDIRECT = exports.PASSWORD_EXPIRY_MS = exports.PASSWORD_EXPIRY_MIN = exports.MESSAGE_ORIGIN_PAGE = exports.MESSAGE_ORIGIN_CONTENT = exports.EXTENSION_PREFIX = exports.ALLOWED_PATH = void 0;
 // Copyright 2019-2022 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-const ALLOWED_PATH = ['/', '/account/import-ledger', '/account/restore-json', '/account/create'];
+const ALLOWED_PATH = ['/', '/account/import-ledger', '/account/restore-json', '/account/create', '/account/settings'];
 exports.ALLOWED_PATH = ALLOWED_PATH;
 const PHISHING_PAGE_REDIRECT = '/phishing-page-detected';
 exports.PHISHING_PAGE_REDIRECT = PHISHING_PAGE_REDIRECT;

package/cjs/errors/SubWalletProviderError.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SubWalletProviderError = void 0;
+
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+class SubWalletProviderError extends Error {
+  constructor(message, code, data) {
+    super(message);
+    this.code = code;
+    this.data = data;
+  }
+
+}
+
+exports.SubWalletProviderError = SubWalletProviderError;

package/cjs/packageInfo.js

@@ -11,6 +11,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '0.5.3-1'
+  version: '0.5.4-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/page/index.js

@@ -9,6 +9,8 @@ exports.enable = enable;
 exports.handleResponse = handleResponse;
 exports.sendMessage = sendMessage;
 
+var _SubWalletProviderError = require("@subwallet/extension-base/errors/SubWalletProviderError");
+
 var _defaults = require("../defaults");
 
 var _getId = require("../utils/getId");
@@ -62,7 +64,7 @@ function handleResponse(data) {
     // eslint-disable-next-line @typescript-eslint/ban-types
     handler.subscriber(data.subscription);
   } else if (data.error) {
-    handler.reject(new Error(data.error));
+    handler.reject(new _SubWalletProviderError.SubWalletProviderError(data.error, data.errorCode, data.errorData));
   } else {
     handler.resolve(data.response);
   }

package/cjs/signers/substrates/LedgerSigner.js

@@ -0,0 +1,50 @@
+"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

@@ -0,0 +1,72 @@
+"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

@@ -0,0 +1 @@
+"use strict";

package/cjs/signers/web3/QrSigner.js

@@ -0,0 +1,68 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+
+var _rlp = _interopRequireDefault(require("rlp"));
+
+var _util = require("@polkadot/util");
+
+// 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) => {
+      const data = [tx.nonce, tx.gasPrice, tx.gasLimit, tx.to, tx.value, tx.data, tx.chainId, new Uint8Array([0x00]), new Uint8Array([0x00])];
+
+      const qrPayload = _rlp.default.encode(data);
+
+      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: (0, _util.u8aToHex)(qrPayload),
+          qrId: this.#id,
+          isEthereum: true
+        }
+      });
+    });
+  }
+
+}
+
+exports.default = QrSigner;

package/defaults.d.ts

@@ -1,4 +1,4 @@
-declare const ALLOWED_PATH: readonly ["/", "/account/import-ledger", "/account/restore-json", "/account/create"];
+declare const ALLOWED_PATH: readonly ["/", "/account/import-ledger", "/account/restore-json", "/account/create", "/account/settings"];
 declare const PHISHING_PAGE_REDIRECT = "/phishing-page-detected";
 declare const EXTENSION_PREFIX: string;
 declare const PORT_CONTENT: string;

package/defaults.js

@@ -1,6 +1,6 @@
 // Copyright 2019-2022 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-const ALLOWED_PATH = ['/', '/account/import-ledger', '/account/restore-json', '/account/create'];
+const ALLOWED_PATH = ['/', '/account/import-ledger', '/account/restore-json', '/account/create', '/account/settings'];
 const PHISHING_PAGE_REDIRECT = '/phishing-page-detected';
 const EXTENSION_PREFIX = process.env.EXTENSION_PREFIX || '';
 const PORT_CONTENT = `${EXTENSION_PREFIX}koni-content`;

package/errors/SubWalletProviderError.d.ts

@@ -0,0 +1,6 @@
+import { SubWalletProviderErrorInterface } from '@subwallet/extension-base/background/KoniTypes';
+export declare class SubWalletProviderError extends Error implements SubWalletProviderErrorInterface {
+    code: number | undefined;
+    data: unknown | undefined;
+    constructor(message: string, code?: number, data?: unknown);
+}

package/errors/SubWalletProviderError.js

@@ -0,0 +1,10 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+export class SubWalletProviderError extends Error {
+  constructor(message, code, data) {
+    super(message);
+    this.code = code;
+    this.data = data;
+  }
+
+}

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "0.5.3-1",
+  "version": "0.5.4-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -99,6 +99,11 @@
       "require": "./cjs/detectPackage.js",
       "default": "./detectPackage.js"
     },
+    "./errors/SubWalletProviderError": {
+      "types": "./errors/SubWalletProviderError.d.ts",
+      "require": "./cjs/errors/SubWalletProviderError.js",
+      "default": "./errors/SubWalletProviderError.js"
+    },
     "./package.json": "./package.json",
     "./packageInfo.js": {
       "types": "./packageInfo.d.ts",
@@ -145,6 +150,26 @@
       "require": "./cjs/page/types.js",
       "default": "./page/types.js"
     },
+    "./signers/substrates/LedgerSigner": {
+      "types": "./signers/substrates/LedgerSigner.d.ts",
+      "require": "./cjs/signers/substrates/LedgerSigner.js",
+      "default": "./signers/substrates/LedgerSigner.js"
+    },
+    "./signers/substrates/QrSigner": {
+      "types": "./signers/substrates/QrSigner.d.ts",
+      "require": "./cjs/signers/substrates/QrSigner.js",
+      "default": "./signers/substrates/QrSigner.js"
+    },
+    "./signers/types": {
+      "types": "./signers/types.d.ts",
+      "require": "./cjs/signers/types.js",
+      "default": "./signers/types.js"
+    },
+    "./signers/web3/QrSigner": {
+      "types": "./signers/web3/QrSigner.d.ts",
+      "require": "./cjs/signers/web3/QrSigner.js",
+      "default": "./signers/web3/QrSigner.js"
+    },
     "./stores": {
       "types": "./stores/index.d.ts",
       "require": "./cjs/stores/index.js",
@@ -199,11 +224,12 @@
     "@polkadot/ui-settings": "^2.7.2",
     "@polkadot/util": "^9.7.2",
     "@polkadot/util-crypto": "^9.7.2",
-    "@subwallet/extension-chains": "^0.5.3-1",
-    "@subwallet/extension-dapp": "^0.5.3-1",
-    "@subwallet/extension-inject": "^0.5.3-1",
+    "@subwallet/extension-chains": "^0.5.4-0",
+    "@subwallet/extension-dapp": "^0.5.4-0",
+    "@subwallet/extension-inject": "^0.5.4-0",
     "ethereumjs-tx": "^2.1.2",
     "eventemitter3": "^4.0.7",
+    "rlp": "^3.0.0",
     "rxjs": "^7.5.5",
     "web3": "^1.7.4",
     "web3-core": "^1.7.4",

package/packageInfo.js

@@ -5,5 +5,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: '0.5.3-1'
+  version: '0.5.4-0'
 };

package/page/index.js

@@ -1,5 +1,6 @@
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+import { SubWalletProviderError } from '@subwallet/extension-base/errors/SubWalletProviderError';
 import { MESSAGE_ORIGIN_PAGE } from "../defaults.js";
 import { getId } from "../utils/getId.js";
 import Injected from "./Injected.js"; // when sending a message from the injector to the extension, we
@@ -52,7 +53,7 @@ export function handleResponse(data) {
     // eslint-disable-next-line @typescript-eslint/ban-types
     handler.subscriber(data.subscription);
   } else if (data.error) {
-    handler.reject(new Error(data.error));
+    handler.reject(new SubWalletProviderError(data.error, data.errorCode, data.errorData));
   } else {
     handler.resolve(data.response);
   }

package/signers/substrates/LedgerSigner.d.ts

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,39 @@
+// 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

@@ -0,0 +1,20 @@
+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 {};