@reef-knot/ledger-connector 2.0.1 → 3.0.0

package/dist/iframe/connector.d.ts

@@ -1,24 +1,35 @@
-import { AbstractConnector } from '@web3-react/abstract-connector';
-import type { ConnectorUpdate } from '@web3-react/types';
-import type { IFrameEthereumProvider } from '@ledgerhq/iframe-provider';
-type IFrameEthereumProviderOptions = ConstructorParameters<typeof IFrameEthereumProvider>[0] & {
-    supportedChainIds?: number[];
-};
-export declare class LedgerHQFrameConnector extends AbstractConnector {
-    private config;
-    provider?: IFrameEthereumProvider;
-    constructor(config?: IFrameEthereumProviderOptions);
-    private handleNetworkChanged;
-    private handleChainChanged;
-    private handleAccountsChanged;
-    private handleClose;
-    isLedgerApp(): boolean;
-    getProviderInstance(): Promise<IFrameEthereumProvider>;
-    activate(): Promise<ConnectorUpdate>;
-    getProvider(): Promise<IFrameEthereumProvider | undefined>;
-    getChainId(): Promise<number | string>;
-    getAccount(): Promise<null | string>;
-    deactivate(): void;
+import { Address, Chain, Connector } from 'wagmi';
+import { IFrameEthereumProvider } from '@ledgerhq/iframe-provider';
+import type { IFrameEthereumProviderOptions } from '@ledgerhq/iframe-provider';
+export declare class LedgerLiveConnector extends Connector<IFrameEthereumProvider, IFrameEthereumProviderOptions> {
+    #private;
+    readonly id = "ledgerLive";
+    readonly name = "Ledger Live";
+    readonly ready: boolean;
+    constructor({ chains, options, }: {
+        chains?: Chain[];
+        options?: IFrameEthereumProviderOptions;
+    });
+    connect({ chainId }: {
+        chainId?: number;
+    }): Promise<{
+        account: `0x${string}`;
+        chain: {
+            id: number;
+            unsupported: boolean;
+        };
+        provider: IFrameEthereumProvider;
+    }>;
+    disconnect(): Promise<void>;
+    getAccount(): Promise<`0x${string}`>;
+    getChainId(): Promise<number>;
+    getProvider(): Promise<IFrameEthereumProvider>;
+    getSigner(): Promise<import("@ethersproject/providers").JsonRpcSigner>;
+    isAuthorized(): Promise<boolean>;
+    switchChain(chainId: number): Promise<Chain>;
+    protected onAccountsChanged(accounts: Address[]): void;
+    protected onChainChanged(chainId: number | string): void;
+    protected onDisconnect(): void;
+    protected isUserRejectedRequestError(error: unknown): boolean;
 }
-export {};
 //# sourceMappingURL=connector.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../../src/iframe/connector.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAKxE,KAAK,6BAA6B,GAAG,qBAAqB,CACxD,OAAO,sBAAsB,CAC9B,CAAC,CAAC,CAAC,GAAG;IAAE,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAIxC,qBAAa,sBAAuB,SAAQ,iBAAiB;IAC3D,OAAO,CAAC,MAAM,CAAgC;IAEvC,QAAQ,CAAC,EAAE,sBAAsB,CAAC;gBAE7B,MAAM,CAAC,EAAE,6BAA6B;IAalD,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,WAAW;IAKZ,WAAW,IAAI,OAAO;IAIhB,mBAAmB,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAUtD,QAAQ,IAAI,OAAO,CAAC,eAAe,CAAC;IAiBpC,WAAW,IAAI,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAI1D,UAAU,IAAI,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;IAKtC,UAAU,IAAI,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;IAS1C,UAAU,IAAI,IAAI;CAQ1B"}
+{"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../../src/iframe/connector.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,KAAK,EACL,SAAS,EAMV,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAO/E,qBAAa,mBAAoB,SAAQ,SAAS,CAChD,sBAAsB,EACtB,6BAA6B,CAC9B;;IACC,QAAQ,CAAC,EAAE,gBAAgB;IAC3B,QAAQ,CAAC,IAAI,iBAAiB;IAC9B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAS;gBAGpB,EACV,MAAM,EACN,OAAY,GACb,EAAE;QACD,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;QACjB,OAAO,CAAC,EAAE,6BAA6B,CAAC;KACzC;IAMK,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;;;;;;;;IA4BzC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B,UAAU;IAOV,UAAU;IAKhB,WAAW;IAOL,SAAS;IAUT,YAAY;IAWZ,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IA2BlD,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE;IAQ/C,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAMjD,SAAS,CAAC,YAAY;IAItB,SAAS,CAAC,0BAA0B,CAAC,KAAK,EAAE,OAAO;CAGpD"}

package/dist/iframe/connector.js

@@ -1,98 +1,168 @@
-import { __awaiter } from '../_virtual/_tslib.js';
-import invariant from 'tiny-invariant';
-import { AbstractConnector } from '@web3-react/abstract-connector';
-import { isLedgerDappBrowserProvider } from './helpers.js';
+import { __awaiter, __classPrivateFieldGet, __classPrivateFieldSet } from '../_virtual/_tslib.js';
+import { Connector, UserRejectedRequestError, ResourceUnavailableError, SwitchChainError } from 'wagmi';
+import { normalizeChainId } from '@wagmi/core';
+import { IFrameEthereumProvider } from '@ledgerhq/iframe-provider';
+import { getAddress } from '@ethersproject/address';
+import { hexValue } from '@ethersproject/bytes';
+import { Web3Provider } from '@ethersproject/providers';
 
-const MAINNET_CHAIN_ID = 1;
-class LedgerHQFrameConnector extends AbstractConnector {
-  constructor(config) {
-    var _a;
+var _LedgerLiveConnector_provider;
+/* eslint-disable @typescript-eslint/unbound-method */
+class LedgerLiveConnector extends Connector {
+  constructor({
+    chains,
+    options = {}
+  }) {
     super({
-      supportedChainIds: (_a = config === null || config === void 0 ? void 0 : config.supportedChainIds) !== null && _a !== void 0 ? _a : [MAINNET_CHAIN_ID]
+      chains,
+      options
     });
-    this.config = config !== null && config !== void 0 ? config : {};
-    this.handleNetworkChanged = this.handleNetworkChanged.bind(this);
-    this.handleChainChanged = this.handleChainChanged.bind(this);
-    this.handleAccountsChanged = this.handleAccountsChanged.bind(this);
-    this.handleClose = this.handleClose.bind(this);
+    this.id = 'ledgerLive';
+    this.name = 'Ledger Live';
+    this.ready = false;
+    _LedgerLiveConnector_provider.set(this, void 0);
+    this.onAccountsChanged = this.onAccountsChanged.bind(this);
+    this.onChainChanged = this.onChainChanged.bind(this);
   }
-  handleNetworkChanged(networkId) {
-    this.emitUpdate({
-      provider: this.provider,
-      chainId: networkId
+  connect({
+    chainId
+  }) {
+    return __awaiter(this, void 0, void 0, function* () {
+      try {
+        const provider = yield this.getProvider();
+        provider.on('accountsChanged', this.onAccountsChanged);
+        provider.on('chainChanged', this.onChainChanged);
+        this.emit('message', {
+          type: 'connecting'
+        });
+        const account = yield this.getAccount();
+        let currentChainId = yield this.getChainId();
+        let unsupported = this.isChainUnsupported(currentChainId);
+        if (chainId && currentChainId !== chainId) {
+          const chain = yield this.switchChain(chainId);
+          currentChainId = chain.id;
+          unsupported = this.isChainUnsupported(currentChainId);
+        }
+        return {
+          account,
+          chain: {
+            id: currentChainId,
+            unsupported
+          },
+          provider
+        };
+      } catch (error) {
+        if (this.isUserRejectedRequestError(error)) throw new UserRejectedRequestError(error);
+        if (error.code === -32002) throw new ResourceUnavailableError(error);
+        throw error;
+      }
     });
   }
-  handleChainChanged(chainId) {
-    this.emitUpdate({
-      chainId
+  disconnect() {
+    return __awaiter(this, void 0, void 0, function* () {
+      const provider = yield this.getProvider();
+      provider.removeListener('accountsChanged', this.onAccountsChanged);
+      provider.removeListener('chainChanged', this.onChainChanged);
     });
   }
-  handleAccountsChanged(accounts) {
-    this.emitUpdate({
-      account: accounts.length === 0 ? null : accounts[0]
+  getAccount() {
+    return __awaiter(this, void 0, void 0, function* () {
+      const provider = yield this.getProvider();
+      const accounts = yield provider.send('eth_requestAccounts');
+      // return checksum address
+      return getAddress(accounts[0]);
     });
   }
-  handleClose() {
-    this.emitDeactivate();
+  getChainId() {
+    return __awaiter(this, void 0, void 0, function* () {
+      const provider = yield this.getProvider();
+      return provider.send('eth_chainId').then(normalizeChainId);
+    });
   }
-  // eslint-disable-next-line class-methods-use-this
-  isLedgerApp() {
-    return isLedgerDappBrowserProvider();
+  getProvider() {
+    if (!__classPrivateFieldGet(this, _LedgerLiveConnector_provider, "f")) {
+      __classPrivateFieldSet(this, _LedgerLiveConnector_provider, new IFrameEthereumProvider(this.options), "f");
+    }
+    return Promise.resolve(__classPrivateFieldGet(this, _LedgerLiveConnector_provider, "f"));
   }
-  getProviderInstance() {
+  getSigner() {
     return __awaiter(this, void 0, void 0, function* () {
-      if (this.provider) return this.provider;
-      // eslint-disable-next-line no-shadow
-      const {
-        IFrameEthereumProvider
-      } = yield import('@ledgerhq/iframe-provider');
-      return new IFrameEthereumProvider(this.config);
+      const [provider, account] = yield Promise.all([this.getProvider(), this.getAccount()]);
+      return new Web3Provider(provider).getSigner(account);
     });
   }
-  activate() {
+  isAuthorized() {
     return __awaiter(this, void 0, void 0, function* () {
-      if (!this.provider) {
-        this.provider = yield this.getProviderInstance();
+      try {
+        const provider = yield this.getProvider();
+        const accounts = yield provider.send('eth_accounts');
+        const account = accounts[0];
+        return !!account;
+      } catch (_a) {
+        return false;
       }
-      this.provider.on('networkChanged', this.handleNetworkChanged);
-      this.provider.on('chainChanged', this.handleChainChanged);
-      this.provider.on('accountsChanged', this.handleAccountsChanged);
-      this.provider.on('close', this.handleClose);
-      const accounts = yield this.provider.enable();
-      const account = accounts[0];
-      return {
-        provider: this.provider,
-        account
-      };
     });
   }
-  // eslint-disable-next-line @typescript-eslint/require-await
-  getProvider() {
+  switchChain(chainId) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
-      return this.provider;
+      const provider = yield this.getProvider();
+      const id = hexValue(chainId);
+      try {
+        yield provider.send('wallet_switchEthereumChain', [{
+          chainId: id
+        }]);
+        return (_a = this.chains.find(x => x.id === chainId)) !== null && _a !== void 0 ? _a : {
+          id: chainId,
+          name: `Chain ${id}`,
+          network: `${id}`,
+          nativeCurrency: {
+            decimals: 18,
+            name: 'Ether',
+            symbol: 'ETH'
+          },
+          rpcUrls: {
+            default: {
+              http: ['']
+            },
+            public: {
+              http: ['']
+            }
+          }
+        };
+      } catch (error) {
+        const message = typeof error === 'string' ? error : error === null || error === void 0 ? void 0 : error.message;
+        if (/user rejected request/i.test(message)) throw new UserRejectedRequestError(error);
+        throw new SwitchChainError(error);
+      }
     });
   }
-  getChainId() {
-    return __awaiter(this, void 0, void 0, function* () {
-      invariant(this.provider, 'Provider is not defined');
-      return this.provider.send('eth_chainId');
-    });
+  onAccountsChanged(accounts) {
+    if (accounts.length === 0 || !accounts[0]) {
+      this.emit('disconnect');
+    } else {
+      this.emit('change', {
+        account: getAddress(accounts[0])
+      });
+    }
   }
-  getAccount() {
-    return __awaiter(this, void 0, void 0, function* () {
-      invariant(this.provider, 'Provider is not defined');
-      const accounts = yield this.provider.send('eth_accounts');
-      const account = accounts[0];
-      return account;
+  onChainChanged(chainId) {
+    const id = normalizeChainId(chainId);
+    const unsupported = this.isChainUnsupported(id);
+    this.emit('change', {
+      chain: {
+        id,
+        unsupported
+      }
     });
   }
-  deactivate() {
-    invariant(this.provider, 'Provider is not defined');
-    this.provider.removeListener('networkChanged', this.handleNetworkChanged);
-    this.provider.removeListener('chainChanged', this.handleChainChanged);
-    this.provider.removeListener('accountsChanged', this.handleAccountsChanged);
-    this.provider.removeListener('close', this.handleClose);
+  onDisconnect() {
+    this.emit('disconnect');
+  }
+  isUserRejectedRequestError(error) {
+    return error.code === 4001;
   }
 }
+_LedgerLiveConnector_provider = new WeakMap();
 
-export { LedgerHQFrameConnector };
+export { LedgerLiveConnector };

package/dist/iframe/helpers.d.ts

@@ -1,3 +1,3 @@
 export declare const isIframe: () => boolean;
-export declare const isLedgerDappBrowserProvider: () => boolean;
+export declare const isLedgerLive: () => boolean;
 //# sourceMappingURL=helpers.d.ts.map

package/dist/iframe/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/iframe/helpers.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,QAAO,OAM3B,CAAC;AAEF,eAAO,MAAM,2BAA2B,QAG3B,OAcT,CAAC"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/iframe/helpers.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,eACgD,CAAC;AAEtE,eAAO,MAAM,YAAY,eAWxB,CAAC"}

package/dist/iframe/helpers.js

@@ -1,24 +1,13 @@
-const isIframe = () => {
+const isIframe = () => globalThis.window && globalThis.window.parent !== globalThis.window;
+const isLedgerLive = () => {
+  if (typeof window === 'undefined') return false;
   try {
-    return window.self !== window.top;
+    const params = new URLSearchParams(window.self.location.search);
+    const isEmbed = !!params.get('embed');
+    return isIframe() && isEmbed;
   } catch (error) {
     return false;
   }
 };
-const isLedgerDappBrowserProvider = (() => {
-  let state = null;
-  return () => {
-    if (typeof state === 'boolean') return state;
-    if (typeof window === 'undefined') return false;
-    try {
-      const params = new URLSearchParams(window.self.location.search);
-      const isEmbed = !!params.get('embed');
-      state = isIframe() && isEmbed;
-    } catch (error) {
-      state = false;
-    }
-    return state;
-  };
-})();
 
-export { isIframe, isLedgerDappBrowserProvider };
+export { isIframe, isLedgerLive };

package/dist/index.js

@@ -1,4 +1,4 @@
-export { LedgerHQFrameConnector } from './iframe/connector.js';
-export { isIframe, isLedgerDappBrowserProvider } from './iframe/helpers.js';
+export { LedgerLiveConnector } from './iframe/connector.js';
+export { isIframe, isLedgerLive } 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": "2.0.1",
+  "version": "3.0.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -37,14 +37,15 @@
     "eslint-config-custom": "*"
   },
   "dependencies": {
-    "@ethersproject/abstract-signer": "^5.5.0",
-    "@ethersproject/bignumber": "^5.5.0",
-    "@ethersproject/bytes": "^5.5.0",
-    "@ethersproject/properties": "^5.5.0",
-    "@ethersproject/providers": "^5.5.2",
-    "@ethersproject/strings": "^5.5.0",
-    "@ethersproject/transactions": "^5.5.0",
-    "@ethersproject/hash": "^5.5.0",
+    "@ethersproject/abstract-signer": "^5.7.0",
+    "@ethersproject/bignumber": "^5.7.0",
+    "@ethersproject/bytes": "^5.7.0",
+    "@ethersproject/properties": "^5.7.0",
+    "@ethersproject/providers": "^5.7.2",
+    "@ethersproject/strings": "^5.7.0",
+    "@ethersproject/transactions": "^5.7.0",
+    "@ethersproject/hash": "^5.7.0",
+    "@ethersproject/address": "^5.7.0",
     "@ledgerhq/hw-app-eth": "^6.35.2",
     "@ledgerhq/hw-transport": "^6.30.1",
     "@ledgerhq/hw-transport-webhid": "^6.28.1",