@xyo-network/metamask-connector 2.89.0-rc.1 → 2.89.0-rc.3
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/browser/MetaMaskConnector.d.cts.map +1 -1
- package/dist/browser/MetaMaskConnector.d.mts.map +1 -1
- package/dist/browser/MetaMaskConnector.d.ts.map +1 -1
- package/dist/browser/index.cjs +10 -3
- package/dist/browser/index.cjs.map +1 -1
- package/dist/browser/index.js +10 -3
- package/dist/browser/index.js.map +1 -1
- package/dist/node/MetaMaskConnector.d.cts.map +1 -1
- package/dist/node/MetaMaskConnector.d.mts.map +1 -1
- package/dist/node/MetaMaskConnector.d.ts.map +1 -1
- package/dist/node/index.cjs +10 -6
- package/dist/node/index.cjs.map +1 -1
- package/dist/node/index.js +10 -6
- package/dist/node/index.js.map +1 -1
- package/package.json +2 -1
- package/src/MetaMaskConnector.ts +10 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetaMaskConnector.d.ts","sourceRoot":"","sources":["../../src/MetaMaskConnector.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MetaMaskConnector.d.ts","sourceRoot":"","sources":["../../src/MetaMaskConnector.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAElD,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,QAAQ,CAA4C;IAE5D,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,iBAAiB,CAA4C;gBAEzD,QAAQ,CAAC,EAAE,eAAe;IAQtC,IAAI,OAAO,kBAEV;IAED,IAAI,cAAc,kBAEjB;IAEK,aAAa;IAgBnB,mBAAmB;IAInB,mBAAmB,gBAMlB;IAED;;;;;OAKG;IACH,yBAAyB,CAAC,QAAQ,EAAE,QAAQ;IAK5C,sBAAsB,CAAC,QAAQ,EAAE,QAAQ;IAKzC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ;IAKpC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ;IAKvC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKxD,uBAAuB;IAIjB,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC;IAS3C,WAAW,CAAC,OAAO,EAAE,MAAM;IAYjC,mGAAmG;IACnG,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAOhD,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAO5D,2BAA2B;IAM3B,OAAO,CAAC,kBAAkB;CAG3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetaMaskConnector.d.ts","sourceRoot":"","sources":["../../src/MetaMaskConnector.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MetaMaskConnector.d.ts","sourceRoot":"","sources":["../../src/MetaMaskConnector.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAElD,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,QAAQ,CAA4C;IAE5D,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,iBAAiB,CAA4C;gBAEzD,QAAQ,CAAC,EAAE,eAAe;IAQtC,IAAI,OAAO,kBAEV;IAED,IAAI,cAAc,kBAEjB;IAEK,aAAa;IAgBnB,mBAAmB;IAInB,mBAAmB,gBAMlB;IAED;;;;;OAKG;IACH,yBAAyB,CAAC,QAAQ,EAAE,QAAQ;IAK5C,sBAAsB,CAAC,QAAQ,EAAE,QAAQ;IAKzC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ;IAKpC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ;IAKvC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKxD,uBAAuB;IAIjB,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC;IAS3C,WAAW,CAAC,OAAO,EAAE,MAAM;IAYjC,mGAAmG;IACnG,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAOhD,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAO5D,2BAA2B;IAM3B,OAAO,CAAC,kBAAkB;CAG3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetaMaskConnector.d.ts","sourceRoot":"","sources":["../../src/MetaMaskConnector.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MetaMaskConnector.d.ts","sourceRoot":"","sources":["../../src/MetaMaskConnector.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAElD,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,QAAQ,CAA4C;IAE5D,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,iBAAiB,CAA4C;gBAEzD,QAAQ,CAAC,EAAE,eAAe;IAQtC,IAAI,OAAO,kBAEV;IAED,IAAI,cAAc,kBAEjB;IAEK,aAAa;IAgBnB,mBAAmB;IAInB,mBAAmB,gBAMlB;IAED;;;;;OAKG;IACH,yBAAyB,CAAC,QAAQ,EAAE,QAAQ;IAK5C,sBAAsB,CAAC,QAAQ,EAAE,QAAQ;IAKzC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ;IAKpC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ;IAKvC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKxD,uBAAuB;IAIjB,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC;IAS3C,WAAW,CAAC,OAAO,EAAE,MAAM;IAYjC,mGAAmG;IACnG,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAOhD,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAO5D,2BAA2B;IAM3B,OAAO,CAAC,kBAAkB;CAG3B"}
|
package/dist/browser/index.cjs
CHANGED
|
@@ -26,6 +26,7 @@ __export(src_exports, {
|
|
|
26
26
|
module.exports = __toCommonJS(src_exports);
|
|
27
27
|
|
|
28
28
|
// src/MetaMaskConnector.ts
|
|
29
|
+
var import_forget = require("@xylabs/forget");
|
|
29
30
|
var import_ethers = require("ethers");
|
|
30
31
|
var MetaMaskConnector = class {
|
|
31
32
|
static {
|
|
@@ -133,15 +134,21 @@ var MetaMaskConnector = class {
|
|
|
133
134
|
}
|
|
134
135
|
/** Web3Provider Listeners - https://docs.ethers.org/v5/api/providers/provider/#Provider--events */
|
|
135
136
|
web3ProviderOn(event, listener) {
|
|
136
|
-
this.provider
|
|
137
|
+
if (this.provider) {
|
|
138
|
+
(0, import_forget.forget)(this.provider.on(event, listener));
|
|
139
|
+
}
|
|
137
140
|
this.listeners.push(listener);
|
|
138
141
|
}
|
|
139
142
|
web3ProviderRemoveListener(event, listener) {
|
|
140
|
-
this.provider
|
|
143
|
+
if (this.provider) {
|
|
144
|
+
(0, import_forget.forget)(this.provider.removeListener(event, listener));
|
|
145
|
+
}
|
|
141
146
|
this.listeners = this.listeners.filter((savedListener) => listener !== savedListener);
|
|
142
147
|
}
|
|
143
148
|
web3ProviderRemoveListeners() {
|
|
144
|
-
this.provider
|
|
149
|
+
if (this.provider) {
|
|
150
|
+
(0, import_forget.forget)(this.provider.removeAllListeners());
|
|
151
|
+
}
|
|
145
152
|
}
|
|
146
153
|
logProviderMissing() {
|
|
147
154
|
console.warn("Cannot call this method because there is no web3 provider connected. Please confirm that metamask is installed");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts","../../src/MetaMaskConnector.ts"],"sourcesContent":["export * from './MetaMaskConnector'\n","import { MetaMaskInpageProvider } from '@metamask/providers'\nimport { BrowserProvider, Listener } from 'ethers'\n\nexport class MetaMaskConnector {\n private account = ''\n private ethereum = window.ethereum as MetaMaskInpageProvider\n\n private listeners: Listener[] = []\n private provider: BrowserProvider | undefined\n private providerListeners: [event: string, listener: Listener][] = []\n\n constructor(provider?: BrowserProvider) {\n if (provider) {\n this.provider = provider\n } else if (this.ethereum) {\n this.provider = new BrowserProvider(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 for (const [event, listener] of this.providerListeners) 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 = await 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
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts","../../src/MetaMaskConnector.ts"],"sourcesContent":["export * from './MetaMaskConnector'\n","import { MetaMaskInpageProvider } from '@metamask/providers'\nimport { forget } from '@xylabs/forget'\nimport { BrowserProvider, Listener } from 'ethers'\n\nexport class MetaMaskConnector {\n private account = ''\n private ethereum = window.ethereum as MetaMaskInpageProvider\n\n private listeners: Listener[] = []\n private provider: BrowserProvider | undefined\n private providerListeners: [event: string, listener: Listener][] = []\n\n constructor(provider?: BrowserProvider) {\n if (provider) {\n this.provider = provider\n } else if (this.ethereum) {\n this.provider = new BrowserProvider(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 for (const [event, listener] of this.providerListeners) 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 = await 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 if (this.provider) {\n forget(this.provider.on(event, listener))\n }\n this.listeners.push(listener)\n }\n\n web3ProviderRemoveListener(event: string, listener: Listener) {\n if (this.provider) {\n forget(this.provider.removeListener(event, listener))\n }\n this.listeners = this.listeners.filter((savedListener) => listener !== savedListener)\n }\n\n web3ProviderRemoveListeners() {\n if (this.provider) {\n forget(this.provider.removeAllListeners())\n }\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;;;;;;;ACCA,oBAAuB;AACvB,oBAA0C;AAEnC,IAAMA,oBAAN,MAAMA;EAHb,OAGaA;;;EACHC,UAAU;EACVC,WAAWC,OAAOD;EAElBE,YAAwB,CAAA;EACxBC;EACAC,oBAA2D,CAAA;EAEnEC,YAAYF,UAA4B;AACtC,QAAIA,UAAU;AACZ,WAAKA,WAAWA;IAClB,WAAW,KAAKH,UAAU;AACxB,WAAKG,WAAW,IAAIG,8BAAgBL,OAAOD,QAAQ;IACrD;EACF;EAEA,IAAIO,UAAU;AACZ,WAAO,KAAKP,UAAUQ;EACxB;EAEA,IAAIC,iBAAiB;AACnB,WAAO,KAAKT,UAAUU;EACxB;EAEA,MAAMC,gBAAgB;AACpB,QAAI,CAAC,KAAKR,UAAU;AAClB,WAAKS,mBAAkB;AACvB;IACF;AAEA,UAAMC,WAAW,MAAM,KAAKV,SAASW,KAAK,uBAAuB,CAAA,CAAE;AAEnE,QAAID,SAASE,SAAS,GAAG;AACvB,WAAKhB,UAAUc,SAAS,CAAA;AACxBG,cAAQC,IAAI,cAAc,KAAKlB,OAAO;IACxC,OAAO;AACLiB,cAAQC,IAAI,8BAAA;IACd;EACF;EAEAC,sBAAsB;AACpB,WAAO,KAAKlB,YAAY,KAAKA,SAASmB;EACxC;EAEAC,sBAAsB,MAAA;AACpB,QAAI,KAAKX,gBAAgB;AACvBO,cAAQC,IAAI,gCAAgC,KAAKjB,UAAUU,eAAAA;AAC3D,aAAO;IACT;AACA,WAAO;EACT;;;;;;;EAQAW,0BAA0BC,UAAoB;AAC5C,SAAKtB,UAAUuB,GAAG,mBAAmBD,QAAAA;AACrC,SAAKlB,kBAAkBoB,KAAK;MAAC;MAAmBF;KAAS;EAC3D;EAEAG,uBAAuBH,UAAoB;AACzC,SAAKtB,UAAUuB,GAAG,gBAAgBD,QAAAA;AAClC,SAAKlB,kBAAkBoB,KAAK;MAAC;MAAgBF;KAAS;EACxD;EAEAI,kBAAkBJ,UAAoB;AACpC,SAAKtB,UAAUuB,GAAG,WAAWD,QAAAA;AAC7B,SAAKlB,kBAAkBoB,KAAK;MAAC;MAAWF;KAAS;EACnD;EAEAK,qBAAqBL,UAAoB;AACvC,SAAKtB,UAAUuB,GAAG,cAAcD,QAAAA;AAChC,SAAKlB,kBAAkBoB,KAAK;MAAC;MAAcF;KAAS;EACtD;EAEAM,uBAAuBC,OAAeP,UAAoB;AACxD,SAAKtB,UAAU8B,eAAeD,OAAOP,QAAAA;AACrC,SAAKlB,oBAAoB,KAAKA,kBAAkB2B,OAAO,CAAC,CAAA,EAAGC,aAAAA,MAAmBV,aAAaU,aAAAA;EAC7F;EAEAC,0BAA0B;AACxB,eAAW,CAACJ,OAAOP,QAAAA,KAAa,KAAKlB;AAAmB,WAAKJ,UAAU8B,eAAeD,OAAOP,QAAAA;EAC/F;EAEA,MAAMY,kBAA4C;AAChD,QAAI,CAAC,KAAK/B,UAAU;AAClB,WAAKS,mBAAkB;AACvB,aAAO;IACT;AAEA,WAAO,MAAM,KAAKT,SAASW,KAAK,uBAAuB,CAAA,CAAE;EAC3D;EAEA,MAAMqB,YAAYC,SAAiB;AACjC,QAAI,CAAC,KAAKjC,UAAU;AAClB,WAAKS,mBAAkB;AACvB;IACF;AAEA,UAAMyB,SAAS,MAAM,KAAKlC,SAASmC,UAAS;AAC5C,UAAMD,OAAOE,WAAU;AACvB,UAAMC,YAAY,MAAMH,OAAOF,YAAYC,OAAAA;AAC3C,WAAOI;EACT;;EAGAC,eAAeZ,OAAeP,UAAoB;AAChD,QAAI,KAAKnB,UAAU;AACjBuC,gCAAO,KAAKvC,SAASoB,GAAGM,OAAOP,QAAAA,CAAAA;IACjC;AACA,SAAKpB,UAAUsB,KAAKF,QAAAA;EACtB;EAEAqB,2BAA2Bd,OAAeP,UAAoB;AAC5D,QAAI,KAAKnB,UAAU;AACjBuC,gCAAO,KAAKvC,SAAS2B,eAAeD,OAAOP,QAAAA,CAAAA;IAC7C;AACA,SAAKpB,YAAY,KAAKA,UAAU6B,OAAO,CAACC,kBAAkBV,aAAaU,aAAAA;EACzE;EAEAY,8BAA8B;AAC5B,QAAI,KAAKzC,UAAU;AACjBuC,gCAAO,KAAKvC,SAAS0C,mBAAkB,CAAA;IACzC;EACF;EAEQjC,qBAAqB;AAC3BI,YAAQ8B,KAAK,iHAAA;EACf;AACF;","names":["MetaMaskConnector","account","ethereum","window","listeners","provider","providerListeners","constructor","BrowserProvider","chainId","networkVersion","currentAccount","selectedAddress","connectWallet","logProviderMissing","accounts","send","length","console","log","isMetaMaskInstalled","isMetaMask","isWalletIsConnected","providerOnAccountsChanged","listener","on","push","providerOnChainChanged","providerOnConnect","providerOnDisconnect","providerRemoveListener","event","removeListener","filter","savedListener","providerRemoveListeners","requestAccounts","signMessage","message","signer","getSigner","getAddress","signature","web3ProviderOn","forget","web3ProviderRemoveListener","web3ProviderRemoveListeners","removeAllListeners","warn"]}
|
package/dist/browser/index.js
CHANGED
|
@@ -2,6 +2,7 @@ var __defProp = Object.defineProperty;
|
|
|
2
2
|
var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
|
|
3
3
|
|
|
4
4
|
// src/MetaMaskConnector.ts
|
|
5
|
+
import { forget } from "@xylabs/forget";
|
|
5
6
|
import { BrowserProvider } from "ethers";
|
|
6
7
|
var MetaMaskConnector = class {
|
|
7
8
|
static {
|
|
@@ -109,15 +110,21 @@ var MetaMaskConnector = class {
|
|
|
109
110
|
}
|
|
110
111
|
/** Web3Provider Listeners - https://docs.ethers.org/v5/api/providers/provider/#Provider--events */
|
|
111
112
|
web3ProviderOn(event, listener) {
|
|
112
|
-
this.provider
|
|
113
|
+
if (this.provider) {
|
|
114
|
+
forget(this.provider.on(event, listener));
|
|
115
|
+
}
|
|
113
116
|
this.listeners.push(listener);
|
|
114
117
|
}
|
|
115
118
|
web3ProviderRemoveListener(event, listener) {
|
|
116
|
-
this.provider
|
|
119
|
+
if (this.provider) {
|
|
120
|
+
forget(this.provider.removeListener(event, listener));
|
|
121
|
+
}
|
|
117
122
|
this.listeners = this.listeners.filter((savedListener) => listener !== savedListener);
|
|
118
123
|
}
|
|
119
124
|
web3ProviderRemoveListeners() {
|
|
120
|
-
this.provider
|
|
125
|
+
if (this.provider) {
|
|
126
|
+
forget(this.provider.removeAllListeners());
|
|
127
|
+
}
|
|
121
128
|
}
|
|
122
129
|
logProviderMissing() {
|
|
123
130
|
console.warn("Cannot call this method because there is no web3 provider connected. Please confirm that metamask is installed");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/MetaMaskConnector.ts"],"sourcesContent":["import { MetaMaskInpageProvider } from '@metamask/providers'\nimport { BrowserProvider, Listener } from 'ethers'\n\nexport class MetaMaskConnector {\n private account = ''\n private ethereum = window.ethereum as MetaMaskInpageProvider\n\n private listeners: Listener[] = []\n private provider: BrowserProvider | undefined\n private providerListeners: [event: string, listener: Listener][] = []\n\n constructor(provider?: BrowserProvider) {\n if (provider) {\n this.provider = provider\n } else if (this.ethereum) {\n this.provider = new BrowserProvider(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 for (const [event, listener] of this.providerListeners) 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 = await 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
|
|
1
|
+
{"version":3,"sources":["../../src/MetaMaskConnector.ts"],"sourcesContent":["import { MetaMaskInpageProvider } from '@metamask/providers'\nimport { forget } from '@xylabs/forget'\nimport { BrowserProvider, Listener } from 'ethers'\n\nexport class MetaMaskConnector {\n private account = ''\n private ethereum = window.ethereum as MetaMaskInpageProvider\n\n private listeners: Listener[] = []\n private provider: BrowserProvider | undefined\n private providerListeners: [event: string, listener: Listener][] = []\n\n constructor(provider?: BrowserProvider) {\n if (provider) {\n this.provider = provider\n } else if (this.ethereum) {\n this.provider = new BrowserProvider(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 for (const [event, listener] of this.providerListeners) 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 = await 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 if (this.provider) {\n forget(this.provider.on(event, listener))\n }\n this.listeners.push(listener)\n }\n\n web3ProviderRemoveListener(event: string, listener: Listener) {\n if (this.provider) {\n forget(this.provider.removeListener(event, listener))\n }\n this.listeners = this.listeners.filter((savedListener) => listener !== savedListener)\n }\n\n web3ProviderRemoveListeners() {\n if (this.provider) {\n forget(this.provider.removeAllListeners())\n }\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":["forget","BrowserProvider","MetaMaskConnector","account","ethereum","window","listeners","provider","providerListeners","constructor","BrowserProvider","chainId","networkVersion","currentAccount","selectedAddress","connectWallet","logProviderMissing","accounts","send","length","console","log","isMetaMaskInstalled","isMetaMask","isWalletIsConnected","providerOnAccountsChanged","listener","on","push","providerOnChainChanged","providerOnConnect","providerOnDisconnect","providerRemoveListener","event","removeListener","filter","savedListener","providerRemoveListeners","requestAccounts","signMessage","message","signer","getSigner","getAddress","signature","web3ProviderOn","forget","web3ProviderRemoveListener","web3ProviderRemoveListeners","removeAllListeners","warn"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetaMaskConnector.d.ts","sourceRoot":"","sources":["../../src/MetaMaskConnector.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MetaMaskConnector.d.ts","sourceRoot":"","sources":["../../src/MetaMaskConnector.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAElD,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,QAAQ,CAA4C;IAE5D,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,iBAAiB,CAA4C;gBAEzD,QAAQ,CAAC,EAAE,eAAe;IAQtC,IAAI,OAAO,kBAEV;IAED,IAAI,cAAc,kBAEjB;IAEK,aAAa;IAgBnB,mBAAmB;IAInB,mBAAmB,gBAMlB;IAED;;;;;OAKG;IACH,yBAAyB,CAAC,QAAQ,EAAE,QAAQ;IAK5C,sBAAsB,CAAC,QAAQ,EAAE,QAAQ;IAKzC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ;IAKpC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ;IAKvC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKxD,uBAAuB;IAIjB,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC;IAS3C,WAAW,CAAC,OAAO,EAAE,MAAM;IAYjC,mGAAmG;IACnG,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAOhD,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAO5D,2BAA2B;IAM3B,OAAO,CAAC,kBAAkB;CAG3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetaMaskConnector.d.ts","sourceRoot":"","sources":["../../src/MetaMaskConnector.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MetaMaskConnector.d.ts","sourceRoot":"","sources":["../../src/MetaMaskConnector.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAElD,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,QAAQ,CAA4C;IAE5D,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,iBAAiB,CAA4C;gBAEzD,QAAQ,CAAC,EAAE,eAAe;IAQtC,IAAI,OAAO,kBAEV;IAED,IAAI,cAAc,kBAEjB;IAEK,aAAa;IAgBnB,mBAAmB;IAInB,mBAAmB,gBAMlB;IAED;;;;;OAKG;IACH,yBAAyB,CAAC,QAAQ,EAAE,QAAQ;IAK5C,sBAAsB,CAAC,QAAQ,EAAE,QAAQ;IAKzC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ;IAKpC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ;IAKvC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKxD,uBAAuB;IAIjB,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC;IAS3C,WAAW,CAAC,OAAO,EAAE,MAAM;IAYjC,mGAAmG;IACnG,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAOhD,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAO5D,2BAA2B;IAM3B,OAAO,CAAC,kBAAkB;CAG3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetaMaskConnector.d.ts","sourceRoot":"","sources":["../../src/MetaMaskConnector.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MetaMaskConnector.d.ts","sourceRoot":"","sources":["../../src/MetaMaskConnector.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAElD,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,QAAQ,CAA4C;IAE5D,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,iBAAiB,CAA4C;gBAEzD,QAAQ,CAAC,EAAE,eAAe;IAQtC,IAAI,OAAO,kBAEV;IAED,IAAI,cAAc,kBAEjB;IAEK,aAAa;IAgBnB,mBAAmB;IAInB,mBAAmB,gBAMlB;IAED;;;;;OAKG;IACH,yBAAyB,CAAC,QAAQ,EAAE,QAAQ;IAK5C,sBAAsB,CAAC,QAAQ,EAAE,QAAQ;IAKzC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ;IAKpC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ;IAKvC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKxD,uBAAuB;IAIjB,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC;IAS3C,WAAW,CAAC,OAAO,EAAE,MAAM;IAYjC,mGAAmG;IACnG,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAOhD,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAO5D,2BAA2B;IAM3B,OAAO,CAAC,kBAAkB;CAG3B"}
|
package/dist/node/index.cjs
CHANGED
|
@@ -26,6 +26,7 @@ __export(src_exports, {
|
|
|
26
26
|
module.exports = __toCommonJS(src_exports);
|
|
27
27
|
|
|
28
28
|
// src/MetaMaskConnector.ts
|
|
29
|
+
var import_forget = require("@xylabs/forget");
|
|
29
30
|
var import_ethers = require("ethers");
|
|
30
31
|
var _MetaMaskConnector = class _MetaMaskConnector {
|
|
31
32
|
account = "";
|
|
@@ -139,18 +140,21 @@ var _MetaMaskConnector = class _MetaMaskConnector {
|
|
|
139
140
|
}
|
|
140
141
|
/** Web3Provider Listeners - https://docs.ethers.org/v5/api/providers/provider/#Provider--events */
|
|
141
142
|
web3ProviderOn(event, listener) {
|
|
142
|
-
|
|
143
|
-
|
|
143
|
+
if (this.provider) {
|
|
144
|
+
(0, import_forget.forget)(this.provider.on(event, listener));
|
|
145
|
+
}
|
|
144
146
|
this.listeners.push(listener);
|
|
145
147
|
}
|
|
146
148
|
web3ProviderRemoveListener(event, listener) {
|
|
147
|
-
|
|
148
|
-
|
|
149
|
+
if (this.provider) {
|
|
150
|
+
(0, import_forget.forget)(this.provider.removeListener(event, listener));
|
|
151
|
+
}
|
|
149
152
|
this.listeners = this.listeners.filter((savedListener) => listener !== savedListener);
|
|
150
153
|
}
|
|
151
154
|
web3ProviderRemoveListeners() {
|
|
152
|
-
|
|
153
|
-
|
|
155
|
+
if (this.provider) {
|
|
156
|
+
(0, import_forget.forget)(this.provider.removeAllListeners());
|
|
157
|
+
}
|
|
154
158
|
}
|
|
155
159
|
logProviderMissing() {
|
|
156
160
|
console.warn("Cannot call this method because there is no web3 provider connected. Please confirm that metamask is installed");
|
package/dist/node/index.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts","../../src/MetaMaskConnector.ts"],"sourcesContent":["export * from './MetaMaskConnector'\n","import { MetaMaskInpageProvider } from '@metamask/providers'\nimport { BrowserProvider, Listener } from 'ethers'\n\nexport class MetaMaskConnector {\n private account = ''\n private ethereum = window.ethereum as MetaMaskInpageProvider\n\n private listeners: Listener[] = []\n private provider: BrowserProvider | undefined\n private providerListeners: [event: string, listener: Listener][] = []\n\n constructor(provider?: BrowserProvider) {\n if (provider) {\n this.provider = provider\n } else if (this.ethereum) {\n this.provider = new BrowserProvider(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 for (const [event, listener] of this.providerListeners) 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 = await 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
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts","../../src/MetaMaskConnector.ts"],"sourcesContent":["export * from './MetaMaskConnector'\n","import { MetaMaskInpageProvider } from '@metamask/providers'\nimport { forget } from '@xylabs/forget'\nimport { BrowserProvider, Listener } from 'ethers'\n\nexport class MetaMaskConnector {\n private account = ''\n private ethereum = window.ethereum as MetaMaskInpageProvider\n\n private listeners: Listener[] = []\n private provider: BrowserProvider | undefined\n private providerListeners: [event: string, listener: Listener][] = []\n\n constructor(provider?: BrowserProvider) {\n if (provider) {\n this.provider = provider\n } else if (this.ethereum) {\n this.provider = new BrowserProvider(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 for (const [event, listener] of this.providerListeners) 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 = await 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 if (this.provider) {\n forget(this.provider.on(event, listener))\n }\n this.listeners.push(listener)\n }\n\n web3ProviderRemoveListener(event: string, listener: Listener) {\n if (this.provider) {\n forget(this.provider.removeListener(event, listener))\n }\n this.listeners = this.listeners.filter((savedListener) => listener !== savedListener)\n }\n\n web3ProviderRemoveListeners() {\n if (this.provider) {\n forget(this.provider.removeAllListeners())\n }\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;;;;;;;ACCA,oBAAuB;AACvB,oBAA0C;AAEnC,IAAMA,qBAAN,MAAMA,mBAAAA;EACHC,UAAU;EACVC,WAAWC,OAAOD;EAElBE,YAAwB,CAAA;EACxBC;EACAC,oBAA2D,CAAA;EAEnEC,YAAYF,UAA4B;AACtC,QAAIA,UAAU;AACZ,WAAKA,WAAWA;IAClB,WAAW,KAAKH,UAAU;AACxB,WAAKG,WAAW,IAAIG,8BAAgBL,OAAOD,QAAQ;IACrD;EACF;EAEA,IAAIO,UAAU;AAnBhB;AAoBI,YAAO,UAAKP,aAAL,mBAAeQ;EACxB;EAEA,IAAIC,iBAAiB;AAvBvB;AAwBI,YAAO,UAAKT,aAAL,mBAAeU;EACxB;EAEA,MAAMC,gBAAgB;AACpB,QAAI,CAAC,KAAKR,UAAU;AAClB,WAAKS,mBAAkB;AACvB;IACF;AAEA,UAAMC,WAAW,MAAM,KAAKV,SAASW,KAAK,uBAAuB,CAAA,CAAE;AAEnE,QAAID,SAASE,SAAS,GAAG;AACvB,WAAKhB,UAAUc,SAAS,CAAA;AACxBG,cAAQC,IAAI,cAAc,KAAKlB,OAAO;IACxC,OAAO;AACLiB,cAAQC,IAAI,8BAAA;IACd;EACF;EAEAC,sBAAsB;AACpB,WAAO,KAAKlB,YAAY,KAAKA,SAASmB;EACxC;EAEAC,sBAAsB,MAAA;AA/CxB;AAgDI,QAAI,KAAKX,gBAAgB;AACvBO,cAAQC,IAAI,iCAAgC,UAAKjB,aAAL,mBAAeU,eAAAA;AAC3D,aAAO;IACT;AACA,WAAO;EACT;;;;;;;EAQAW,0BAA0BC,UAAoB;AA7DhD;AA8DI,eAAKtB,aAAL,mBAAeuB,GAAG,mBAAmBD;AACrC,SAAKlB,kBAAkBoB,KAAK;MAAC;MAAmBF;KAAS;EAC3D;EAEAG,uBAAuBH,UAAoB;AAlE7C;AAmEI,eAAKtB,aAAL,mBAAeuB,GAAG,gBAAgBD;AAClC,SAAKlB,kBAAkBoB,KAAK;MAAC;MAAgBF;KAAS;EACxD;EAEAI,kBAAkBJ,UAAoB;AAvExC;AAwEI,eAAKtB,aAAL,mBAAeuB,GAAG,WAAWD;AAC7B,SAAKlB,kBAAkBoB,KAAK;MAAC;MAAWF;KAAS;EACnD;EAEAK,qBAAqBL,UAAoB;AA5E3C;AA6EI,eAAKtB,aAAL,mBAAeuB,GAAG,cAAcD;AAChC,SAAKlB,kBAAkBoB,KAAK;MAAC;MAAcF;KAAS;EACtD;EAEAM,uBAAuBC,OAAeP,UAAoB;AAjF5D;AAkFI,eAAKtB,aAAL,mBAAe8B,eAAeD,OAAOP;AACrC,SAAKlB,oBAAoB,KAAKA,kBAAkB2B,OAAO,CAAC,CAAA,EAAGC,aAAAA,MAAmBV,aAAaU,aAAAA;EAC7F;EAEAC,0BAA0B;AAtF5B;AAuFI,eAAW,CAACJ,OAAOP,QAAAA,KAAa,KAAKlB;AAAmB,iBAAKJ,aAAL,mBAAe8B,eAAeD,OAAOP;EAC/F;EAEA,MAAMY,kBAA4C;AAChD,QAAI,CAAC,KAAK/B,UAAU;AAClB,WAAKS,mBAAkB;AACvB,aAAO;IACT;AAEA,WAAO,MAAM,KAAKT,SAASW,KAAK,uBAAuB,CAAA,CAAE;EAC3D;EAEA,MAAMqB,YAAYC,SAAiB;AACjC,QAAI,CAAC,KAAKjC,UAAU;AAClB,WAAKS,mBAAkB;AACvB;IACF;AAEA,UAAMyB,SAAS,MAAM,KAAKlC,SAASmC,UAAS;AAC5C,UAAMD,OAAOE,WAAU;AACvB,UAAMC,YAAY,MAAMH,OAAOF,YAAYC,OAAAA;AAC3C,WAAOI;EACT;;EAGAC,eAAeZ,OAAeP,UAAoB;AAChD,QAAI,KAAKnB,UAAU;AACjBuC,gCAAO,KAAKvC,SAASoB,GAAGM,OAAOP,QAAAA,CAAAA;IACjC;AACA,SAAKpB,UAAUsB,KAAKF,QAAAA;EACtB;EAEAqB,2BAA2Bd,OAAeP,UAAoB;AAC5D,QAAI,KAAKnB,UAAU;AACjBuC,gCAAO,KAAKvC,SAAS2B,eAAeD,OAAOP,QAAAA,CAAAA;IAC7C;AACA,SAAKpB,YAAY,KAAKA,UAAU6B,OAAO,CAACC,kBAAkBV,aAAaU,aAAAA;EACzE;EAEAY,8BAA8B;AAC5B,QAAI,KAAKzC,UAAU;AACjBuC,gCAAO,KAAKvC,SAAS0C,mBAAkB,CAAA;IACzC;EACF;EAEQjC,qBAAqB;AAC3BI,YAAQ8B,KAAK,iHAAA;EACf;AACF;AApIahD;AAAN,IAAMA,oBAAN;","names":["MetaMaskConnector","account","ethereum","window","listeners","provider","providerListeners","constructor","BrowserProvider","chainId","networkVersion","currentAccount","selectedAddress","connectWallet","logProviderMissing","accounts","send","length","console","log","isMetaMaskInstalled","isMetaMask","isWalletIsConnected","providerOnAccountsChanged","listener","on","push","providerOnChainChanged","providerOnConnect","providerOnDisconnect","providerRemoveListener","event","removeListener","filter","savedListener","providerRemoveListeners","requestAccounts","signMessage","message","signer","getSigner","getAddress","signature","web3ProviderOn","forget","web3ProviderRemoveListener","web3ProviderRemoveListeners","removeAllListeners","warn"]}
|
package/dist/node/index.js
CHANGED
|
@@ -2,6 +2,7 @@ var __defProp = Object.defineProperty;
|
|
|
2
2
|
var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
|
|
3
3
|
|
|
4
4
|
// src/MetaMaskConnector.ts
|
|
5
|
+
import { forget } from "@xylabs/forget";
|
|
5
6
|
import { BrowserProvider } from "ethers";
|
|
6
7
|
var _MetaMaskConnector = class _MetaMaskConnector {
|
|
7
8
|
account = "";
|
|
@@ -115,18 +116,21 @@ var _MetaMaskConnector = class _MetaMaskConnector {
|
|
|
115
116
|
}
|
|
116
117
|
/** Web3Provider Listeners - https://docs.ethers.org/v5/api/providers/provider/#Provider--events */
|
|
117
118
|
web3ProviderOn(event, listener) {
|
|
118
|
-
|
|
119
|
-
|
|
119
|
+
if (this.provider) {
|
|
120
|
+
forget(this.provider.on(event, listener));
|
|
121
|
+
}
|
|
120
122
|
this.listeners.push(listener);
|
|
121
123
|
}
|
|
122
124
|
web3ProviderRemoveListener(event, listener) {
|
|
123
|
-
|
|
124
|
-
|
|
125
|
+
if (this.provider) {
|
|
126
|
+
forget(this.provider.removeListener(event, listener));
|
|
127
|
+
}
|
|
125
128
|
this.listeners = this.listeners.filter((savedListener) => listener !== savedListener);
|
|
126
129
|
}
|
|
127
130
|
web3ProviderRemoveListeners() {
|
|
128
|
-
|
|
129
|
-
|
|
131
|
+
if (this.provider) {
|
|
132
|
+
forget(this.provider.removeAllListeners());
|
|
133
|
+
}
|
|
130
134
|
}
|
|
131
135
|
logProviderMissing() {
|
|
132
136
|
console.warn("Cannot call this method because there is no web3 provider connected. Please confirm that metamask is installed");
|
package/dist/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/MetaMaskConnector.ts"],"sourcesContent":["import { MetaMaskInpageProvider } from '@metamask/providers'\nimport { BrowserProvider, Listener } from 'ethers'\n\nexport class MetaMaskConnector {\n private account = ''\n private ethereum = window.ethereum as MetaMaskInpageProvider\n\n private listeners: Listener[] = []\n private provider: BrowserProvider | undefined\n private providerListeners: [event: string, listener: Listener][] = []\n\n constructor(provider?: BrowserProvider) {\n if (provider) {\n this.provider = provider\n } else if (this.ethereum) {\n this.provider = new BrowserProvider(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 for (const [event, listener] of this.providerListeners) 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 = await 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
|
|
1
|
+
{"version":3,"sources":["../../src/MetaMaskConnector.ts"],"sourcesContent":["import { MetaMaskInpageProvider } from '@metamask/providers'\nimport { forget } from '@xylabs/forget'\nimport { BrowserProvider, Listener } from 'ethers'\n\nexport class MetaMaskConnector {\n private account = ''\n private ethereum = window.ethereum as MetaMaskInpageProvider\n\n private listeners: Listener[] = []\n private provider: BrowserProvider | undefined\n private providerListeners: [event: string, listener: Listener][] = []\n\n constructor(provider?: BrowserProvider) {\n if (provider) {\n this.provider = provider\n } else if (this.ethereum) {\n this.provider = new BrowserProvider(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 for (const [event, listener] of this.providerListeners) 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 = await 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 if (this.provider) {\n forget(this.provider.on(event, listener))\n }\n this.listeners.push(listener)\n }\n\n web3ProviderRemoveListener(event: string, listener: Listener) {\n if (this.provider) {\n forget(this.provider.removeListener(event, listener))\n }\n this.listeners = this.listeners.filter((savedListener) => listener !== savedListener)\n }\n\n web3ProviderRemoveListeners() {\n if (this.provider) {\n forget(this.provider.removeAllListeners())\n }\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":["forget","BrowserProvider","MetaMaskConnector","account","ethereum","window","listeners","provider","providerListeners","constructor","BrowserProvider","chainId","networkVersion","currentAccount","selectedAddress","connectWallet","logProviderMissing","accounts","send","length","console","log","isMetaMaskInstalled","isMetaMask","isWalletIsConnected","providerOnAccountsChanged","listener","on","push","providerOnChainChanged","providerOnConnect","providerOnDisconnect","providerRemoveListener","event","removeListener","filter","savedListener","providerRemoveListeners","requestAccounts","signMessage","message","signer","getSigner","getAddress","signature","web3ProviderOn","forget","web3ProviderRemoveListener","web3ProviderRemoveListeners","removeAllListeners","warn"]}
|
package/package.json
CHANGED
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@metamask/providers": "^14.0.2",
|
|
13
|
+
"@xylabs/forget": "^2.13.29",
|
|
13
14
|
"ethers": "^6.10.0"
|
|
14
15
|
},
|
|
15
16
|
"description": "Primary SDK for using XYO Protocol 2.0",
|
|
@@ -57,7 +58,7 @@
|
|
|
57
58
|
"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
|
|
58
59
|
},
|
|
59
60
|
"sideEffects": false,
|
|
60
|
-
"version": "2.89.0-rc.
|
|
61
|
+
"version": "2.89.0-rc.3",
|
|
61
62
|
"type": "module",
|
|
62
63
|
"stableVersion": "2.88.3"
|
|
63
64
|
}
|
package/src/MetaMaskConnector.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { MetaMaskInpageProvider } from '@metamask/providers'
|
|
2
|
+
import { forget } from '@xylabs/forget'
|
|
2
3
|
import { BrowserProvider, Listener } from 'ethers'
|
|
3
4
|
|
|
4
5
|
export class MetaMaskConnector {
|
|
@@ -111,17 +112,23 @@ export class MetaMaskConnector {
|
|
|
111
112
|
|
|
112
113
|
/** Web3Provider Listeners - https://docs.ethers.org/v5/api/providers/provider/#Provider--events */
|
|
113
114
|
web3ProviderOn(event: string, listener: Listener) {
|
|
114
|
-
this.provider
|
|
115
|
+
if (this.provider) {
|
|
116
|
+
forget(this.provider.on(event, listener))
|
|
117
|
+
}
|
|
115
118
|
this.listeners.push(listener)
|
|
116
119
|
}
|
|
117
120
|
|
|
118
121
|
web3ProviderRemoveListener(event: string, listener: Listener) {
|
|
119
|
-
this.provider
|
|
122
|
+
if (this.provider) {
|
|
123
|
+
forget(this.provider.removeListener(event, listener))
|
|
124
|
+
}
|
|
120
125
|
this.listeners = this.listeners.filter((savedListener) => listener !== savedListener)
|
|
121
126
|
}
|
|
122
127
|
|
|
123
128
|
web3ProviderRemoveListeners() {
|
|
124
|
-
this.provider
|
|
129
|
+
if (this.provider) {
|
|
130
|
+
forget(this.provider.removeAllListeners())
|
|
131
|
+
}
|
|
125
132
|
}
|
|
126
133
|
|
|
127
134
|
private logProviderMissing() {
|