@xyo-network/metamask-connector 2.74.4 → 2.74.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -29,8 +29,9 @@ var import_providers = require("@ethersproject/providers");
29
29
  var MetaMaskConnector = class {
30
30
  account = "";
31
31
  ethereum = window.ethereum;
32
- provider;
33
32
  listeners = [];
33
+ provider;
34
+ providerListeners = [];
34
35
  constructor(provider) {
35
36
  if (provider) {
36
37
  this.provider = provider;
@@ -38,22 +39,11 @@ var MetaMaskConnector = class {
38
39
  this.provider = new import_providers.Web3Provider(window.ethereum);
39
40
  }
40
41
  }
41
- get currentAccount() {
42
- return this.ethereum?.selectedAddress;
43
- }
44
42
  get chainId() {
45
43
  return this.ethereum?.networkVersion;
46
44
  }
47
- on(event, listener) {
48
- this.provider.on(event, listener);
49
- this.listeners.push(listener);
50
- }
51
- removeListener(event, listener) {
52
- this.provider.removeListener(event, listener);
53
- this.listeners = this.listeners.filter((savedListener) => listener !== savedListener);
54
- }
55
- removeListeners() {
56
- this.provider.removeAllListeners();
45
+ get currentAccount() {
46
+ return this.ethereum?.selectedAddress;
57
47
  }
58
48
  async connectWallet() {
59
49
  if (!this.provider) {
@@ -78,6 +68,42 @@ var MetaMaskConnector = class {
78
68
  }
79
69
  return false;
80
70
  };
71
+ /**
72
+ * EIP-1193 Event Listeners
73
+ *
74
+ * .on in Web3Provider does not understand EIP-1193 events
75
+ * see - https://github.com/ethers-io/ethers.js/discussions/1560#discussioncomment-730893
76
+ */
77
+ providerOnAccountsChanged(listener) {
78
+ this.ethereum?.on("accountsChanged", listener);
79
+ this.providerListeners.push(["accountsChanged", listener]);
80
+ }
81
+ providerOnChainChanged(listener) {
82
+ this.ethereum?.on("chainChanged", listener);
83
+ this.providerListeners.push(["chainChanged", listener]);
84
+ }
85
+ providerOnConnect(listener) {
86
+ this.ethereum?.on("connect", listener);
87
+ this.providerListeners.push(["connect", listener]);
88
+ }
89
+ providerOnDisconnect(listener) {
90
+ this.ethereum?.on("disconnect", listener);
91
+ this.providerListeners.push(["disconnect", listener]);
92
+ }
93
+ providerRemoveListener(event, listener) {
94
+ this.ethereum?.removeListener(event, listener);
95
+ this.providerListeners = this.providerListeners.filter(([, savedListener]) => listener !== savedListener);
96
+ }
97
+ providerRemoveListeners() {
98
+ this.providerListeners.forEach(([event, listener]) => this.ethereum?.removeListener(event, listener));
99
+ }
100
+ async requestAccounts() {
101
+ if (!this.provider) {
102
+ this.logProviderMissing();
103
+ return null;
104
+ }
105
+ return await this.provider.send("eth_requestAccounts", []);
106
+ }
81
107
  async signMessage(message) {
82
108
  if (!this.provider) {
83
109
  this.logProviderMissing();
@@ -88,6 +114,18 @@ var MetaMaskConnector = class {
88
114
  const signature = await signer.signMessage(message);
89
115
  return signature;
90
116
  }
117
+ /** Web3Provider Listeners - https://docs.ethers.org/v5/api/providers/provider/#Provider--events */
118
+ web3ProviderOn(event, listener) {
119
+ this.provider?.on(event, listener);
120
+ this.listeners.push(listener);
121
+ }
122
+ web3ProviderRemoveListener(event, listener) {
123
+ this.provider?.removeListener(event, listener);
124
+ this.listeners = this.listeners.filter((savedListener) => listener !== savedListener);
125
+ }
126
+ web3ProviderRemoveListeners() {
127
+ this.provider?.removeAllListeners();
128
+ }
91
129
  logProviderMissing() {
92
130
  console.warn("Cannot call this method because there is no web3 provider connected. Please confirm that metamask is installed");
93
131
  }
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/index.ts","../src/MetaMaskConnector.ts"],"sourcesContent":["export * from './MetaMaskConnector'\n","import { Listener, Web3Provider } from '@ethersproject/providers'\nimport { MetaMaskInpageProvider } from '@metamask/providers'\n\nexport class MetaMaskConnector {\n private account = ''\n private ethereum = window.ethereum as MetaMaskInpageProvider\n private provider: Web3Provider | undefined\n\n private listeners: Listener[] = []\n\n constructor(provider?: Web3Provider) {\n if (provider) {\n this.provider = provider\n } else if (this.ethereum) {\n this.provider = new Web3Provider(window.ethereum)\n }\n }\n\n get currentAccount() {\n return this.ethereum?.selectedAddress\n }\n\n get chainId() {\n return this.ethereum?.networkVersion\n }\n\n on(event: string, listener: Listener) {\n this.provider.on(event, listener)\n this.listeners.push(listener)\n }\n\n removeListener(event: string, listener: Listener) {\n this.provider.removeListener(event, listener)\n this.listeners = this.listeners.filter(savedListener => listener !== savedListener)\n }\n\n removeListeners() {\n this.provider.removeAllListeners()\n }\n\n async connectWallet() {\n if (!this.provider) {\n this.logProviderMissing()\n return\n }\n\n const accounts = await this.provider.send('eth_requestAccounts', [])\n // We could have multiple accounts. Check for one.\n if (accounts.length !== 0) {\n this.account = accounts[0]\n console.log('Connected: ', this.account)\n } else {\n console.log('No authorized account found.')\n }\n }\n\n isMetaMaskInstalled() {\n return this.ethereum && this.ethereum.isMetaMask\n }\n\n isWalletIsConnected = () => {\n if (this.currentAccount) {\n console.log('Found an authorized account: ', this.ethereum?.selectedAddress)\n return true\n }\n return false\n }\n\n async signMessage(message: string) {\n if (!this.provider) {\n this.logProviderMissing()\n return\n }\n\n const signer = this.provider.getSigner()\n await signer.getAddress()\n const signature = await signer.signMessage(message)\n return signature\n }\n\n private logProviderMissing() {\n console.warn('Cannot call this method because there is no web3 provider connected. Please confirm that metamask is installed')\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,uBAAuC;AAGhC,IAAM,oBAAN,MAAwB;AAAA,EACrB,UAAU;AAAA,EACV,WAAW,OAAO;AAAA,EAClB;AAAA,EAEA,YAAwB,CAAC;AAAA,EAEjC,YAAY,UAAyB;AACnC,QAAI,UAAU;AACZ,WAAK,WAAW;AAAA,IAClB,WAAW,KAAK,UAAU;AACxB,WAAK,WAAW,IAAI,8BAAa,OAAO,QAAQ;AAAA,IAClD;AAAA,EACF;AAAA,EAEA,IAAI,iBAAiB;AACnB,WAAO,KAAK,UAAU;AAAA,EACxB;AAAA,EAEA,IAAI,UAAU;AACZ,WAAO,KAAK,UAAU;AAAA,EACxB;AAAA,EAEA,GAAG,OAAe,UAAoB;AACpC,SAAK,SAAS,GAAG,OAAO,QAAQ;AAChC,SAAK,UAAU,KAAK,QAAQ;AAAA,EAC9B;AAAA,EAEA,eAAe,OAAe,UAAoB;AAChD,SAAK,SAAS,eAAe,OAAO,QAAQ;AAC5C,SAAK,YAAY,KAAK,UAAU,OAAO,mBAAiB,aAAa,aAAa;AAAA,EACpF;AAAA,EAEA,kBAAkB;AAChB,SAAK,SAAS,mBAAmB;AAAA,EACnC;AAAA,EAEA,MAAM,gBAAgB;AACpB,QAAI,CAAC,KAAK,UAAU;AAClB,WAAK,mBAAmB;AACxB;AAAA,IACF;AAEA,UAAM,WAAW,MAAM,KAAK,SAAS,KAAK,uBAAuB,CAAC,CAAC;AAEnE,QAAI,SAAS,WAAW,GAAG;AACzB,WAAK,UAAU,SAAS,CAAC;AACzB,cAAQ,IAAI,eAAe,KAAK,OAAO;AAAA,IACzC,OAAO;AACL,cAAQ,IAAI,8BAA8B;AAAA,IAC5C;AAAA,EACF;AAAA,EAEA,sBAAsB;AACpB,WAAO,KAAK,YAAY,KAAK,SAAS;AAAA,EACxC;AAAA,EAEA,sBAAsB,MAAM;AAC1B,QAAI,KAAK,gBAAgB;AACvB,cAAQ,IAAI,iCAAiC,KAAK,UAAU,eAAe;AAC3E,aAAO;AAAA,IACT;AACA,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,YAAY,SAAiB;AACjC,QAAI,CAAC,KAAK,UAAU;AAClB,WAAK,mBAAmB;AACxB;AAAA,IACF;AAEA,UAAM,SAAS,KAAK,SAAS,UAAU;AACvC,UAAM,OAAO,WAAW;AACxB,UAAM,YAAY,MAAM,OAAO,YAAY,OAAO;AAClD,WAAO;AAAA,EACT;AAAA,EAEQ,qBAAqB;AAC3B,YAAQ,KAAK,iHAAiH;AAAA,EAChI;AACF;","names":[]}
1
+ {"version":3,"sources":["../src/index.ts","../src/MetaMaskConnector.ts"],"sourcesContent":["export * from './MetaMaskConnector'\n","import { Listener, Web3Provider } from '@ethersproject/providers'\nimport { MetaMaskInpageProvider } from '@metamask/providers'\n\nexport class MetaMaskConnector {\n private account = ''\n private ethereum = window.ethereum as MetaMaskInpageProvider\n\n private listeners: Listener[] = []\n private provider: Web3Provider | undefined\n private providerListeners: [event: string, listener: Listener][] = []\n\n constructor(provider?: Web3Provider) {\n if (provider) {\n this.provider = provider\n } else if (this.ethereum) {\n this.provider = new Web3Provider(window.ethereum)\n }\n }\n\n get chainId() {\n return this.ethereum?.networkVersion\n }\n\n get currentAccount() {\n return this.ethereum?.selectedAddress\n }\n\n async connectWallet() {\n if (!this.provider) {\n this.logProviderMissing()\n return\n }\n\n const accounts = await this.provider.send('eth_requestAccounts', [])\n // We could have multiple accounts. Check for one.\n if (accounts.length !== 0) {\n this.account = accounts[0]\n console.log('Connected: ', this.account)\n } else {\n console.log('No authorized account found.')\n }\n }\n\n isMetaMaskInstalled() {\n return this.ethereum && this.ethereum.isMetaMask\n }\n\n isWalletIsConnected = () => {\n if (this.currentAccount) {\n console.log('Found an authorized account: ', this.ethereum?.selectedAddress)\n return true\n }\n return false\n }\n\n /**\n * EIP-1193 Event Listeners\n *\n * .on in Web3Provider does not understand EIP-1193 events\n * see - https://github.com/ethers-io/ethers.js/discussions/1560#discussioncomment-730893\n */\n providerOnAccountsChanged(listener: Listener) {\n this.ethereum?.on('accountsChanged', listener)\n this.providerListeners.push(['accountsChanged', listener])\n }\n\n providerOnChainChanged(listener: Listener) {\n this.ethereum?.on('chainChanged', listener)\n this.providerListeners.push(['chainChanged', listener])\n }\n\n providerOnConnect(listener: Listener) {\n this.ethereum?.on('connect', listener)\n this.providerListeners.push(['connect', listener])\n }\n\n providerOnDisconnect(listener: Listener) {\n this.ethereum?.on('disconnect', listener)\n this.providerListeners.push(['disconnect', listener])\n }\n\n providerRemoveListener(event: string, listener: Listener) {\n this.ethereum?.removeListener(event, listener)\n this.providerListeners = this.providerListeners.filter(([, savedListener]) => listener !== savedListener)\n }\n\n providerRemoveListeners() {\n this.providerListeners.forEach(([event, listener]) => this.ethereum?.removeListener(event, listener))\n }\n\n async requestAccounts(): Promise<string[] | null> {\n if (!this.provider) {\n this.logProviderMissing()\n return null\n }\n\n return await this.provider.send('eth_requestAccounts', [])\n }\n\n async signMessage(message: string) {\n if (!this.provider) {\n this.logProviderMissing()\n return\n }\n\n const signer = this.provider.getSigner()\n await signer.getAddress()\n const signature = await signer.signMessage(message)\n return signature\n }\n\n /** Web3Provider Listeners - https://docs.ethers.org/v5/api/providers/provider/#Provider--events */\n web3ProviderOn(event: string, listener: Listener) {\n this.provider?.on(event, listener)\n this.listeners.push(listener)\n }\n\n web3ProviderRemoveListener(event: string, listener: Listener) {\n this.provider?.removeListener(event, listener)\n this.listeners = this.listeners.filter((savedListener) => listener !== savedListener)\n }\n\n web3ProviderRemoveListeners() {\n this.provider?.removeAllListeners()\n }\n\n private logProviderMissing() {\n console.warn('Cannot call this method because there is no web3 provider connected. Please confirm that metamask is installed')\n }\n}\n"],"mappings":"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","names":[]}
package/dist/index.mjs CHANGED
@@ -3,8 +3,9 @@ import { Web3Provider } from "@ethersproject/providers";
3
3
  var MetaMaskConnector = class {
4
4
  account = "";
5
5
  ethereum = window.ethereum;
6
- provider;
7
6
  listeners = [];
7
+ provider;
8
+ providerListeners = [];
8
9
  constructor(provider) {
9
10
  if (provider) {
10
11
  this.provider = provider;
@@ -12,22 +13,11 @@ var MetaMaskConnector = class {
12
13
  this.provider = new Web3Provider(window.ethereum);
13
14
  }
14
15
  }
15
- get currentAccount() {
16
- return this.ethereum?.selectedAddress;
17
- }
18
16
  get chainId() {
19
17
  return this.ethereum?.networkVersion;
20
18
  }
21
- on(event, listener) {
22
- this.provider.on(event, listener);
23
- this.listeners.push(listener);
24
- }
25
- removeListener(event, listener) {
26
- this.provider.removeListener(event, listener);
27
- this.listeners = this.listeners.filter((savedListener) => listener !== savedListener);
28
- }
29
- removeListeners() {
30
- this.provider.removeAllListeners();
19
+ get currentAccount() {
20
+ return this.ethereum?.selectedAddress;
31
21
  }
32
22
  async connectWallet() {
33
23
  if (!this.provider) {
@@ -52,6 +42,42 @@ var MetaMaskConnector = class {
52
42
  }
53
43
  return false;
54
44
  };
45
+ /**
46
+ * EIP-1193 Event Listeners
47
+ *
48
+ * .on in Web3Provider does not understand EIP-1193 events
49
+ * see - https://github.com/ethers-io/ethers.js/discussions/1560#discussioncomment-730893
50
+ */
51
+ providerOnAccountsChanged(listener) {
52
+ this.ethereum?.on("accountsChanged", listener);
53
+ this.providerListeners.push(["accountsChanged", listener]);
54
+ }
55
+ providerOnChainChanged(listener) {
56
+ this.ethereum?.on("chainChanged", listener);
57
+ this.providerListeners.push(["chainChanged", listener]);
58
+ }
59
+ providerOnConnect(listener) {
60
+ this.ethereum?.on("connect", listener);
61
+ this.providerListeners.push(["connect", listener]);
62
+ }
63
+ providerOnDisconnect(listener) {
64
+ this.ethereum?.on("disconnect", listener);
65
+ this.providerListeners.push(["disconnect", listener]);
66
+ }
67
+ providerRemoveListener(event, listener) {
68
+ this.ethereum?.removeListener(event, listener);
69
+ this.providerListeners = this.providerListeners.filter(([, savedListener]) => listener !== savedListener);
70
+ }
71
+ providerRemoveListeners() {
72
+ this.providerListeners.forEach(([event, listener]) => this.ethereum?.removeListener(event, listener));
73
+ }
74
+ async requestAccounts() {
75
+ if (!this.provider) {
76
+ this.logProviderMissing();
77
+ return null;
78
+ }
79
+ return await this.provider.send("eth_requestAccounts", []);
80
+ }
55
81
  async signMessage(message) {
56
82
  if (!this.provider) {
57
83
  this.logProviderMissing();
@@ -62,6 +88,18 @@ var MetaMaskConnector = class {
62
88
  const signature = await signer.signMessage(message);
63
89
  return signature;
64
90
  }
91
+ /** Web3Provider Listeners - https://docs.ethers.org/v5/api/providers/provider/#Provider--events */
92
+ web3ProviderOn(event, listener) {
93
+ this.provider?.on(event, listener);
94
+ this.listeners.push(listener);
95
+ }
96
+ web3ProviderRemoveListener(event, listener) {
97
+ this.provider?.removeListener(event, listener);
98
+ this.listeners = this.listeners.filter((savedListener) => listener !== savedListener);
99
+ }
100
+ web3ProviderRemoveListeners() {
101
+ this.provider?.removeAllListeners();
102
+ }
65
103
  logProviderMissing() {
66
104
  console.warn("Cannot call this method because there is no web3 provider connected. Please confirm that metamask is installed");
67
105
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/MetaMaskConnector.ts"],"sourcesContent":["import { Listener, Web3Provider } from '@ethersproject/providers'\nimport { MetaMaskInpageProvider } from '@metamask/providers'\n\nexport class MetaMaskConnector {\n private account = ''\n private ethereum = window.ethereum as MetaMaskInpageProvider\n private provider: Web3Provider | undefined\n\n private listeners: Listener[] = []\n\n constructor(provider?: Web3Provider) {\n if (provider) {\n this.provider = provider\n } else if (this.ethereum) {\n this.provider = new Web3Provider(window.ethereum)\n }\n }\n\n get currentAccount() {\n return this.ethereum?.selectedAddress\n }\n\n get chainId() {\n return this.ethereum?.networkVersion\n }\n\n on(event: string, listener: Listener) {\n this.provider.on(event, listener)\n this.listeners.push(listener)\n }\n\n removeListener(event: string, listener: Listener) {\n this.provider.removeListener(event, listener)\n this.listeners = this.listeners.filter(savedListener => listener !== savedListener)\n }\n\n removeListeners() {\n this.provider.removeAllListeners()\n }\n\n async connectWallet() {\n if (!this.provider) {\n this.logProviderMissing()\n return\n }\n\n const accounts = await this.provider.send('eth_requestAccounts', [])\n // We could have multiple accounts. Check for one.\n if (accounts.length !== 0) {\n this.account = accounts[0]\n console.log('Connected: ', this.account)\n } else {\n console.log('No authorized account found.')\n }\n }\n\n isMetaMaskInstalled() {\n return this.ethereum && this.ethereum.isMetaMask\n }\n\n isWalletIsConnected = () => {\n if (this.currentAccount) {\n console.log('Found an authorized account: ', this.ethereum?.selectedAddress)\n return true\n }\n return false\n }\n\n async signMessage(message: string) {\n if (!this.provider) {\n this.logProviderMissing()\n return\n }\n\n const signer = this.provider.getSigner()\n await signer.getAddress()\n const signature = await signer.signMessage(message)\n return signature\n }\n\n private logProviderMissing() {\n console.warn('Cannot call this method because there is no web3 provider connected. Please confirm that metamask is installed')\n }\n}\n"],"mappings":";AAAA,SAAmB,oBAAoB;AAGhC,IAAM,oBAAN,MAAwB;AAAA,EACrB,UAAU;AAAA,EACV,WAAW,OAAO;AAAA,EAClB;AAAA,EAEA,YAAwB,CAAC;AAAA,EAEjC,YAAY,UAAyB;AACnC,QAAI,UAAU;AACZ,WAAK,WAAW;AAAA,IAClB,WAAW,KAAK,UAAU;AACxB,WAAK,WAAW,IAAI,aAAa,OAAO,QAAQ;AAAA,IAClD;AAAA,EACF;AAAA,EAEA,IAAI,iBAAiB;AACnB,WAAO,KAAK,UAAU;AAAA,EACxB;AAAA,EAEA,IAAI,UAAU;AACZ,WAAO,KAAK,UAAU;AAAA,EACxB;AAAA,EAEA,GAAG,OAAe,UAAoB;AACpC,SAAK,SAAS,GAAG,OAAO,QAAQ;AAChC,SAAK,UAAU,KAAK,QAAQ;AAAA,EAC9B;AAAA,EAEA,eAAe,OAAe,UAAoB;AAChD,SAAK,SAAS,eAAe,OAAO,QAAQ;AAC5C,SAAK,YAAY,KAAK,UAAU,OAAO,mBAAiB,aAAa,aAAa;AAAA,EACpF;AAAA,EAEA,kBAAkB;AAChB,SAAK,SAAS,mBAAmB;AAAA,EACnC;AAAA,EAEA,MAAM,gBAAgB;AACpB,QAAI,CAAC,KAAK,UAAU;AAClB,WAAK,mBAAmB;AACxB;AAAA,IACF;AAEA,UAAM,WAAW,MAAM,KAAK,SAAS,KAAK,uBAAuB,CAAC,CAAC;AAEnE,QAAI,SAAS,WAAW,GAAG;AACzB,WAAK,UAAU,SAAS,CAAC;AACzB,cAAQ,IAAI,eAAe,KAAK,OAAO;AAAA,IACzC,OAAO;AACL,cAAQ,IAAI,8BAA8B;AAAA,IAC5C;AAAA,EACF;AAAA,EAEA,sBAAsB;AACpB,WAAO,KAAK,YAAY,KAAK,SAAS;AAAA,EACxC;AAAA,EAEA,sBAAsB,MAAM;AAC1B,QAAI,KAAK,gBAAgB;AACvB,cAAQ,IAAI,iCAAiC,KAAK,UAAU,eAAe;AAC3E,aAAO;AAAA,IACT;AACA,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,YAAY,SAAiB;AACjC,QAAI,CAAC,KAAK,UAAU;AAClB,WAAK,mBAAmB;AACxB;AAAA,IACF;AAEA,UAAM,SAAS,KAAK,SAAS,UAAU;AACvC,UAAM,OAAO,WAAW;AACxB,UAAM,YAAY,MAAM,OAAO,YAAY,OAAO;AAClD,WAAO;AAAA,EACT;AAAA,EAEQ,qBAAqB;AAC3B,YAAQ,KAAK,iHAAiH;AAAA,EAChI;AACF;","names":[]}
1
+ {"version":3,"sources":["../src/MetaMaskConnector.ts"],"sourcesContent":["import { Listener, Web3Provider } from '@ethersproject/providers'\nimport { MetaMaskInpageProvider } from '@metamask/providers'\n\nexport class MetaMaskConnector {\n private account = ''\n private ethereum = window.ethereum as MetaMaskInpageProvider\n\n private listeners: Listener[] = []\n private provider: Web3Provider | undefined\n private providerListeners: [event: string, listener: Listener][] = []\n\n constructor(provider?: Web3Provider) {\n if (provider) {\n this.provider = provider\n } else if (this.ethereum) {\n this.provider = new Web3Provider(window.ethereum)\n }\n }\n\n get chainId() {\n return this.ethereum?.networkVersion\n }\n\n get currentAccount() {\n return this.ethereum?.selectedAddress\n }\n\n async connectWallet() {\n if (!this.provider) {\n this.logProviderMissing()\n return\n }\n\n const accounts = await this.provider.send('eth_requestAccounts', [])\n // We could have multiple accounts. Check for one.\n if (accounts.length !== 0) {\n this.account = accounts[0]\n console.log('Connected: ', this.account)\n } else {\n console.log('No authorized account found.')\n }\n }\n\n isMetaMaskInstalled() {\n return this.ethereum && this.ethereum.isMetaMask\n }\n\n isWalletIsConnected = () => {\n if (this.currentAccount) {\n console.log('Found an authorized account: ', this.ethereum?.selectedAddress)\n return true\n }\n return false\n }\n\n /**\n * EIP-1193 Event Listeners\n *\n * .on in Web3Provider does not understand EIP-1193 events\n * see - https://github.com/ethers-io/ethers.js/discussions/1560#discussioncomment-730893\n */\n providerOnAccountsChanged(listener: Listener) {\n this.ethereum?.on('accountsChanged', listener)\n this.providerListeners.push(['accountsChanged', listener])\n }\n\n providerOnChainChanged(listener: Listener) {\n this.ethereum?.on('chainChanged', listener)\n this.providerListeners.push(['chainChanged', listener])\n }\n\n providerOnConnect(listener: Listener) {\n this.ethereum?.on('connect', listener)\n this.providerListeners.push(['connect', listener])\n }\n\n providerOnDisconnect(listener: Listener) {\n this.ethereum?.on('disconnect', listener)\n this.providerListeners.push(['disconnect', listener])\n }\n\n providerRemoveListener(event: string, listener: Listener) {\n this.ethereum?.removeListener(event, listener)\n this.providerListeners = this.providerListeners.filter(([, savedListener]) => listener !== savedListener)\n }\n\n providerRemoveListeners() {\n this.providerListeners.forEach(([event, listener]) => this.ethereum?.removeListener(event, listener))\n }\n\n async requestAccounts(): Promise<string[] | null> {\n if (!this.provider) {\n this.logProviderMissing()\n return null\n }\n\n return await this.provider.send('eth_requestAccounts', [])\n }\n\n async signMessage(message: string) {\n if (!this.provider) {\n this.logProviderMissing()\n return\n }\n\n const signer = this.provider.getSigner()\n await signer.getAddress()\n const signature = await signer.signMessage(message)\n return signature\n }\n\n /** Web3Provider Listeners - https://docs.ethers.org/v5/api/providers/provider/#Provider--events */\n web3ProviderOn(event: string, listener: Listener) {\n this.provider?.on(event, listener)\n this.listeners.push(listener)\n }\n\n web3ProviderRemoveListener(event: string, listener: Listener) {\n this.provider?.removeListener(event, listener)\n this.listeners = this.listeners.filter((savedListener) => listener !== savedListener)\n }\n\n web3ProviderRemoveListeners() {\n this.provider?.removeAllListeners()\n }\n\n private logProviderMissing() {\n console.warn('Cannot call this method because there is no web3 provider connected. Please confirm that metamask is installed')\n }\n}\n"],"mappings":"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","names":[]}
package/package.json CHANGED
@@ -58,5 +58,5 @@
58
58
  },
59
59
  "sideEffects": false,
60
60
  "types": "dist/index.d.ts",
61
- "version": "2.74.4"
61
+ "version": "2.74.5"
62
62
  }
@@ -7,6 +7,7 @@ export class MetaMaskConnector {
7
7
 
8
8
  private listeners: Listener[] = []
9
9
  private provider: Web3Provider | undefined
10
+ private providerListeners: [event: string, listener: Listener][] = []
10
11
 
11
12
  constructor(provider?: Web3Provider) {
12
13
  if (provider) {
@@ -52,18 +53,48 @@ export class MetaMaskConnector {
52
53
  return false
53
54
  }
54
55
 
55
- on(event: string, listener: Listener) {
56
- this.provider?.on(event, listener)
57
- this.listeners.push(listener)
56
+ /**
57
+ * EIP-1193 Event Listeners
58
+ *
59
+ * .on in Web3Provider does not understand EIP-1193 events
60
+ * see - https://github.com/ethers-io/ethers.js/discussions/1560#discussioncomment-730893
61
+ */
62
+ providerOnAccountsChanged(listener: Listener) {
63
+ this.ethereum?.on('accountsChanged', listener)
64
+ this.providerListeners.push(['accountsChanged', listener])
58
65
  }
59
66
 
60
- removeListener(event: string, listener: Listener) {
61
- this.provider?.removeListener(event, listener)
62
- this.listeners = this.listeners.filter((savedListener) => listener !== savedListener)
67
+ providerOnChainChanged(listener: Listener) {
68
+ this.ethereum?.on('chainChanged', listener)
69
+ this.providerListeners.push(['chainChanged', listener])
63
70
  }
64
71
 
65
- removeListeners() {
66
- this.provider?.removeAllListeners()
72
+ providerOnConnect(listener: Listener) {
73
+ this.ethereum?.on('connect', listener)
74
+ this.providerListeners.push(['connect', listener])
75
+ }
76
+
77
+ providerOnDisconnect(listener: Listener) {
78
+ this.ethereum?.on('disconnect', listener)
79
+ this.providerListeners.push(['disconnect', listener])
80
+ }
81
+
82
+ providerRemoveListener(event: string, listener: Listener) {
83
+ this.ethereum?.removeListener(event, listener)
84
+ this.providerListeners = this.providerListeners.filter(([, savedListener]) => listener !== savedListener)
85
+ }
86
+
87
+ providerRemoveListeners() {
88
+ this.providerListeners.forEach(([event, listener]) => this.ethereum?.removeListener(event, listener))
89
+ }
90
+
91
+ async requestAccounts(): Promise<string[] | null> {
92
+ if (!this.provider) {
93
+ this.logProviderMissing()
94
+ return null
95
+ }
96
+
97
+ return await this.provider.send('eth_requestAccounts', [])
67
98
  }
68
99
 
69
100
  async signMessage(message: string) {
@@ -78,6 +109,21 @@ export class MetaMaskConnector {
78
109
  return signature
79
110
  }
80
111
 
112
+ /** Web3Provider Listeners - https://docs.ethers.org/v5/api/providers/provider/#Provider--events */
113
+ web3ProviderOn(event: string, listener: Listener) {
114
+ this.provider?.on(event, listener)
115
+ this.listeners.push(listener)
116
+ }
117
+
118
+ web3ProviderRemoveListener(event: string, listener: Listener) {
119
+ this.provider?.removeListener(event, listener)
120
+ this.listeners = this.listeners.filter((savedListener) => listener !== savedListener)
121
+ }
122
+
123
+ web3ProviderRemoveListeners() {
124
+ this.provider?.removeAllListeners()
125
+ }
126
+
81
127
  private logProviderMissing() {
82
128
  console.warn('Cannot call this method because there is no web3 provider connected. Please confirm that metamask is installed')
83
129
  }