@reef-knot/ledger-connector 1.1.0 → 2.0.0

package/dist/_virtual/_tslib.js

@@ -23,9 +23,22 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
+function __classPrivateFieldGet(receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+}
+
+function __classPrivateFieldSet(receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+}
+
 typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
     var e = new Error(message);
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-export { __awaiter };
+export { __awaiter, __classPrivateFieldGet, __classPrivateFieldSet };

package/dist/hid/connector.d.ts

@@ -1,23 +1,24 @@
-import { AbstractConnector } from '@web3-react/abstract-connector';
-import type { ConnectorUpdate } from '@web3-react/types';
-import type { LedgerHQProvider } from './provider';
-type LedgerHQConnectorArguments = {
-    chainId: number;
-    url: string;
-};
-export declare class LedgerHQConnector extends AbstractConnector {
-    provider?: LedgerHQProvider;
-    url: string;
-    chainId: number;
-    constructor({ chainId, url }: LedgerHQConnectorArguments);
-    private handleDisconnect;
-    isSupported(): boolean;
-    getProviderInstance(): Promise<LedgerHQProvider>;
-    activate(): Promise<ConnectorUpdate>;
-    getProvider(): Promise<LedgerHQProvider | undefined>;
+import { Address, Chain, Connector, ConnectorData } from 'wagmi';
+export declare class LedgerHIDConnector<Options = any> extends Connector {
+    #private;
+    readonly id = "ledgerHID";
+    readonly name = "Ledger";
+    ready: boolean;
+    constructor({ defaultChain, chains, rpc, options, }: {
+        defaultChain: Chain;
+        chains?: Chain[];
+        rpc: Record<number, string>;
+        options?: Options;
+    });
+    connect(): Promise<Required<ConnectorData>>;
+    disconnect(): Promise<void>;
+    getAccount(): Promise<Address>;
     getChainId(): Promise<number>;
-    getAccount(): Promise<string>;
-    deactivate(): void;
+    getProvider(): Promise<import("./provider").LedgerHQProvider>;
+    getSigner(): Promise<any>;
+    isAuthorized(): Promise<boolean>;
+    protected onDisconnect: () => void;
+    protected onAccountsChanged: () => void;
+    protected onChainChanged: () => void;
 }
-export default LedgerHQConnector;
 //# sourceMappingURL=connector.d.ts.map

package/dist/hid/connector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../../src/hid/connector.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,KAAK,0BAA0B,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,qBAAa,iBAAkB,SAAQ,iBAAiB;IAC/C,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAE5B,GAAG,EAAE,MAAM,CAAC;IAEZ,OAAO,EAAE,MAAM,CAAC;gBAEX,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,0BAA0B;IASxD,OAAO,CAAC,gBAAgB;IAKjB,WAAW,IAAI,OAAO;IAIhB,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAMhD,QAAQ,IAAI,OAAO,CAAC,eAAe,CAAC;IAepC,WAAW,IAAI,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAKpD,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAI7B,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAKnC,UAAU,IAAI,IAAI;CAK1B;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../../src/hid/connector.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,KAAK,EACL,SAAS,EACT,aAAa,EAEd,MAAM,OAAO,CAAC;AAGf,qBAAa,kBAAkB,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,SAAS;;IAC9D,QAAQ,CAAC,EAAE,eAAe;IAC1B,QAAQ,CAAC,IAAI,YAAY;IAEzB,KAAK,UAAS;gBAIF,EACV,YAAY,EACZ,MAAM,EACN,GAAG,EACH,OAAO,GACR,EAAE;QACD,YAAY,EAAE,KAAK,CAAC;QACpB,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;QACjB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB;IAMK,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAsBjD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAI9B,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAOvB,WAAW;IAWjB,SAAS;IAKH,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAWtC,SAAS,CAAC,YAAY,QAAO,IAAI,CAK/B;IAEF,SAAS,CAAC,iBAAiB,QAAO,IAAI,CAEpC;IAEF,SAAS,CAAC,cAAc,QAAO,IAAI,CAEjC;CACH"}

package/dist/hid/connector.js

@@ -1,75 +1,105 @@
-import { __awaiter } from '../_virtual/_tslib.js';
-import invariant from 'tiny-invariant';
-import { AbstractConnector } from '@web3-react/abstract-connector';
-import { isHIDSupported, checkError } from './helpers.js';
+import { __classPrivateFieldSet, __awaiter, __classPrivateFieldGet } from '../_virtual/_tslib.js';
+import { Connector, ConnectorNotFoundError } from 'wagmi';
+import { checkError } from './helpers.js';
 
-class LedgerHQConnector extends AbstractConnector {
+var _LedgerHIDConnector_chain, _LedgerHIDConnector_provider, _LedgerHIDConnector_rpc;
+class LedgerHIDConnector extends Connector {
   constructor({
-    chainId,
-    url
+    defaultChain,
+    chains,
+    rpc,
+    options
   }) {
     super({
-      supportedChainIds: [chainId]
+      chains,
+      options
     });
-    this.chainId = chainId;
-    this.url = url;
-    this.handleDisconnect = this.handleDisconnect.bind(this);
+    this.id = 'ledgerHID';
+    this.name = 'Ledger';
+    _LedgerHIDConnector_chain.set(this, void 0);
+    this.ready = false;
+    _LedgerHIDConnector_provider.set(this, void 0);
+    _LedgerHIDConnector_rpc.set(this, void 0);
+    this.onDisconnect = () => {
+      // Is called when HID API emits 'disconnect' event for some reason.
+      // For example, the device was manually unplugged.
+      // It is common to emit 'disconnect' from connector in this case.
+      this.emit('disconnect');
+    };
+    this.onAccountsChanged = () => {
+      // NOOP
+    };
+    this.onChainChanged = () => {
+      // NOOP
+    };
+    __classPrivateFieldSet(this, _LedgerHIDConnector_chain, defaultChain, "f");
+    __classPrivateFieldSet(this, _LedgerHIDConnector_rpc, rpc === null || rpc === void 0 ? void 0 : rpc[defaultChain.id], "f");
   }
-  handleDisconnect() {
-    this.emitDeactivate();
-  }
-  // eslint-disable-next-line class-methods-use-this
-  isSupported() {
-    return isHIDSupported();
-  }
-  getProviderInstance() {
-    return __awaiter(this, void 0, void 0, function* () {
-      // eslint-disable-next-line no-shadow
-      const {
-        LedgerHQProvider
-      } = yield import('./provider.js');
-      return new LedgerHQProvider(this.url, this.chainId);
-    });
-  }
-  activate() {
+  connect() {
     return __awaiter(this, void 0, void 0, function* () {
       try {
-        this.provider = yield this.getProviderInstance();
-        // eslint-disable-next-line @typescript-eslint/unbound-method
-        this.provider.on('disconnect', this.handleDisconnect);
-        const account = yield this.provider.enable();
+        __classPrivateFieldSet(this, _LedgerHIDConnector_provider, yield this.getProvider(), "f");
+        __classPrivateFieldGet(this, _LedgerHIDConnector_provider, "f").on('disconnect', this.onDisconnect);
+        const account = yield __classPrivateFieldGet(this, _LedgerHIDConnector_provider, "f").enable();
+        const chainId = yield this.getChainId();
+        const chainUnsupported = this.isChainUnsupported(chainId);
+        this.ready = !!__classPrivateFieldGet(this, _LedgerHIDConnector_provider, "f");
         return {
-          provider: this.provider,
-          account
+          account,
+          provider: __classPrivateFieldGet(this, _LedgerHIDConnector_provider, "f"),
+          chain: {
+            id: chainId,
+            unsupported: chainUnsupported
+          }
         };
       } catch (error) {
         return checkError(error);
       }
     });
   }
-  // eslint-disable-next-line @typescript-eslint/require-await
-  getProvider() {
-    return __awaiter(this, void 0, void 0, function* () {
-      return this.provider;
-    });
+  disconnect() {
+    // Handles programmatic disconnect.
+    // We don't need to do anything specific for HID Ledger connection in this case.
+    __classPrivateFieldGet(this, _LedgerHIDConnector_provider, "f").removeListener('disconnect', this.onDisconnect);
+    return Promise.resolve();
+  }
+  getAccount() {
+    return __classPrivateFieldGet(this, _LedgerHIDConnector_provider, "f").getAddress();
   }
-  // eslint-disable-next-line @typescript-eslint/require-await
   getChainId() {
+    if (__classPrivateFieldGet(this, _LedgerHIDConnector_chain, "f")) {
+      return Promise.resolve(__classPrivateFieldGet(this, _LedgerHIDConnector_chain, "f").id);
+    }
+    return Promise.reject('The chain must be set');
+  }
+  getProvider() {
     return __awaiter(this, void 0, void 0, function* () {
-      return this.chainId;
+      const {
+        LedgerHQProvider
+      } = yield import('./provider.js');
+      const chainId = yield this.getChainId();
+      return new LedgerHQProvider({
+        url: __classPrivateFieldGet(this, _LedgerHIDConnector_rpc, "f")
+      }, chainId);
     });
   }
-  getAccount() {
+  getSigner() {
+    const signer = __classPrivateFieldGet(this, _LedgerHIDConnector_provider, "f").signer;
+    return Promise.resolve(signer);
+  }
+  isAuthorized() {
     return __awaiter(this, void 0, void 0, function* () {
-      invariant(this.provider, 'Provider is not defined');
-      return this.provider.getAddress();
+      try {
+        const provider = yield this.getProvider();
+        if (!provider) throw new ConnectorNotFoundError();
+        const account = yield this.getAccount();
+        return !!account;
+      } catch (_a) {
+        return false;
+      }
     });
   }
-  deactivate() {
-    invariant(this.provider, 'Provider is not defined');
-    // eslint-disable-next-line @typescript-eslint/unbound-method
-    this.provider.removeListener('disconnect', this.handleDisconnect);
-  }
 }
+_LedgerHIDConnector_chain = new WeakMap(), _LedgerHIDConnector_provider = new WeakMap(), _LedgerHIDConnector_rpc = new WeakMap();
 
-export { LedgerHQConnector, LedgerHQConnector as default };
+export { LedgerHIDConnector };

package/dist/hid/helpers.js

@@ -2,13 +2,6 @@ import { __awaiter } from '../_virtual/_tslib.js';
 import { BigNumber } from '@ethersproject/bignumber';
 import { resolveProperties } from '@ethersproject/properties';
 
-const isHIDSupported = () => {
-  try {
-    return 'hid' in window.navigator;
-  } catch (error) {
-    return false;
-  }
-};
 const hasEIP1559 = tx => {
   return tx.type === 2 || tx.maxFeePerGas != null || tx.maxPriorityFeePerGas != null;
 };
@@ -67,4 +60,4 @@ const checkError = error => {
   throw error;
 };
 
-export { checkError, convertToUnsigned, hasEIP1559, isHIDSupported, toNumber };
+export { checkError, convertToUnsigned, hasEIP1559, toNumber };

package/dist/hid/index.d.ts

@@ -1,3 +1,3 @@
-export { LedgerHQConnector } from './connector';
+export { LedgerHIDConnector } from './connector';
 export { LS_KEY_DERIVATION_PATH } from './signer';
 //# sourceMappingURL=index.d.ts.map

package/dist/hid/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hid/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hid/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC"}

package/dist/hid/provider.d.ts

@@ -6,6 +6,7 @@ export declare class LedgerHQProvider extends JsonRpcBatchProvider {
     signer?: LedgerHQSigner;
     device?: HIDDevice;
     transport?: typeof TransportHID;
+    constructor(...args: any[]);
     getSigner(): LedgerHQSigner;
     listAccounts(): Promise<Array<string>>;
     detectNetwork(): Promise<Network>;

package/dist/hid/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/hid/provider.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,KAAK,YAAY,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAK1C,qBAAa,gBAAiB,SAAQ,oBAAoB;IACjD,MAAM,CAAC,EAAE,cAAc,CAAC;IAExB,MAAM,CAAC,EAAE,SAAS,CAAC;IAEnB,SAAS,CAAC,EAAE,OAAO,YAAY,CAAC;IAEvC,SAAS,IAAI,cAAc;IAK3B,YAAY,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAKhC,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAIjC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC;IAarC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IA6BzB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAK7B,OAAO,CAAC,EACZ,MAAM,EACN,MAAM,GACP,EAAE;QACD,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;KACxB,GAAG,OAAO,CAAC,OAAO,CAAC;CA0BrB"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/hid/provider.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,KAAK,YAAY,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAI1C,qBAAa,gBAAiB,SAAQ,oBAAoB;IACjD,MAAM,CAAC,EAAE,cAAc,CAAC;IAExB,MAAM,CAAC,EAAE,SAAS,CAAC;IAEnB,SAAS,CAAC,EAAE,OAAO,YAAY,CAAC;gBAE3B,GAAG,IAAI,EAAE,GAAG,EAAE;IAK1B,SAAS,IAAI,cAAc;IAI3B,YAAY,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAItC,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC;IAarC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IA4BzB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAK7B,OAAO,CAAC,EACZ,MAAM,EACN,MAAM,GACP,EAAE;QACD,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;KACxB,GAAG,OAAO,CAAC,OAAO,CAAC;CA0BrB"}

package/dist/hid/provider.js

@@ -5,18 +5,18 @@ import { LedgerHQSigner } from './signer.js';
 import { checkError, convertToUnsigned } from './helpers.js';
 
 class LedgerHQProvider extends JsonRpcBatchProvider {
+  constructor(...args) {
+    super(...args);
+    this.signer = this.getSigner();
+  }
   getSigner() {
     return new LedgerHQSigner(this);
   }
-  // eslint-disable-next-line class-methods-use-this
   listAccounts() {
     throw new Error('method is not implemented');
   }
-  // eslint-disable-next-line @typescript-eslint/require-await
   detectNetwork() {
-    return __awaiter(this, void 0, void 0, function* () {
-      return this._network;
-    });
+    return Promise.resolve(this._network);
   }
   getTransport() {
     var _a;
@@ -34,7 +34,6 @@ class LedgerHQProvider extends JsonRpcBatchProvider {
   enable() {
     return __awaiter(this, void 0, void 0, function* () {
       try {
-        // eslint-disable-next-line no-shadow
         const {
           default: TransportHID
         } = yield import('@ledgerhq/hw-transport-webhid');

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export { LedgerHQConnector, LS_KEY_DERIVATION_PATH } from './hid';
 export * from './iframe';
+export * from './hid';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,OAAO,CAAC;AAClE,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,OAAO,CAAC"}

package/dist/index.js

@@ -1,4 +1,4 @@
-export { LedgerHQConnector } from './hid/connector.js';
-export { LS_KEY_DERIVATION_PATH } from './hid/signer.js';
 export { LedgerHQFrameConnector } from './iframe/connector.js';
 export { isIframe, isLedgerDappBrowserProvider } from './iframe/helpers.js';
+export { LedgerHIDConnector } from './hid/connector.js';
+export { LS_KEY_DERIVATION_PATH } from './hid/signer.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reef-knot/ledger-connector",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -33,6 +33,7 @@
   },
   "devDependencies": {
     "@types/w3c-web-hid": "^1.0.2",
+    "wagmi": "^0.12.19",
     "eslint-config-custom": "*"
   },
   "dependencies": {
@@ -44,12 +45,15 @@
     "@ethersproject/strings": "^5.5.0",
     "@ethersproject/transactions": "^5.5.0",
     "@ethersproject/hash": "^5.5.0",
-    "@ledgerhq/hw-app-eth": "^6.34.3",
-    "@ledgerhq/hw-transport": "^6.28.8",
-    "@ledgerhq/hw-transport-webhid": "^6.27.19",
-    "@ledgerhq/iframe-provider": "0",
+    "@ledgerhq/hw-app-eth": "^6.35.0",
+    "@ledgerhq/hw-transport": "^6.30.0",
+    "@ledgerhq/hw-transport-webhid": "^6.28.0",
+    "@ledgerhq/iframe-provider": "^0.4.3",
     "@web3-react/abstract-connector": "^6.0.7",
     "@web3-react/types": "^6.0.7",
     "tiny-invariant": "^1.2.0"
+  },
+  "peerDependencies": {
+    "wagmi": "^0.12.19"
   }
 }