@walletconnect/ethereum-provider 2.0.0-beta.101 → 2.0.0-beta.101.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/cjs/index.d.ts +3 -2
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +23 -15
- package/dist/cjs/index.js.map +1 -1
- package/dist/esm/index.d.ts +3 -2
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +22 -14
- package/dist/esm/index.js.map +1 -1
- package/dist/tsconfig.cjs.tsbuildinfo +50 -142
- package/dist/tsconfig.esm.tsbuildinfo +50 -142
- package/dist/umd/index.min.js +2 -11
- package/package.json +7 -7
package/dist/cjs/index.d.ts
CHANGED
|
@@ -24,13 +24,13 @@ export interface EthereumProviderOptions {
|
|
|
24
24
|
}
|
|
25
25
|
declare class EthereumProvider implements IEthereumProvider {
|
|
26
26
|
events: any;
|
|
27
|
-
private rpc;
|
|
28
27
|
namespace: string;
|
|
29
28
|
accounts: string[];
|
|
30
29
|
signer: JsonRpcProvider;
|
|
31
30
|
http: JsonRpcProvider | undefined;
|
|
31
|
+
chainId: number;
|
|
32
|
+
private rpc;
|
|
32
33
|
constructor(opts: EthereumProviderOptions);
|
|
33
|
-
get chainId(): number;
|
|
34
34
|
request<T = unknown>(args: RequestArguments): Promise<T>;
|
|
35
35
|
sendAsync(args: RequestArguments, callback: (error: Error | null, response: any) => void): void;
|
|
36
36
|
get connected(): boolean;
|
|
@@ -49,6 +49,7 @@ declare class EthereumProvider implements IEthereumProvider {
|
|
|
49
49
|
private isCompatibleChainId;
|
|
50
50
|
private formatChainId;
|
|
51
51
|
private parseChainId;
|
|
52
|
+
private setChainIds;
|
|
52
53
|
private setChainId;
|
|
53
54
|
private parseAccountId;
|
|
54
55
|
private setAccounts;
|
package/dist/cjs/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAIlE,OAAO,EAGL,0BAA0B,EAC3B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzF,eAAO,MAAM,aAAa,UASzB,CAAC;AAEF,eAAO,MAAM,YAAY,UAAsC,CAAC;AAEhE,MAAM,WAAW,cAAc;IAC7B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;CAC3B;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAIlE,OAAO,EAGL,0BAA0B,EAC3B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzF,eAAO,MAAM,aAAa,UASzB,CAAC;AAEF,eAAO,MAAM,YAAY,UAAsC,CAAC;AAEhE,MAAM,WAAW,cAAc;IAC7B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,uBAAuB,GAAG,iBAAiB,CAO7E;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,iBAAiB,GAAG,MAAM,GAAG,SAAS,CAMrF;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAE3D;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,MAAM,CAAC,EAAE,0BAA0B,CAAC;CACrC;AAED,cAAM,gBAAiB,YAAW,iBAAiB;IAC1C,MAAM,EAAE,GAAG,CAAsB;IACjC,SAAS,SAAY;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAM;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,IAAI,EAAE,eAAe,GAAG,SAAS,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC;IAEvB,OAAO,CAAC,GAAG,CAAoB;gBAEnB,IAAI,EAAE,uBAAuB;IAQ5B,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,CAAC,CAAC;IAqB9D,SAAS,CACd,IAAI,EAAE,gBAAgB,EACtB,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,EAAE,QAAQ,EAAE,GAAG,KAAK,IAAI,GACrD,IAAI;IAMP,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAEY,MAAM,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAKnC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAGnC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAGxC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAGlD,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAI9C,IAAI,eAAe,YAElB;IAID,OAAO,CAAC,sBAAsB;IAuC9B,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,WAAW;CAMpB;AAED,eAAe,gBAAgB,CAAC"}
|
package/dist/cjs/index.js
CHANGED
|
@@ -46,12 +46,10 @@ class EthereumProvider {
|
|
|
46
46
|
this.accounts = [];
|
|
47
47
|
this.rpc = getRpcConfig(opts);
|
|
48
48
|
this.signer = this.setSignerProvider(opts === null || opts === void 0 ? void 0 : opts.client);
|
|
49
|
+
this.chainId = getEthereumChainId(this.rpc.chains);
|
|
49
50
|
this.http = this.setHttpProvider(this.chainId);
|
|
50
51
|
this.registerEventListeners();
|
|
51
52
|
}
|
|
52
|
-
get chainId() {
|
|
53
|
-
return getEthereumChainId(this.rpc.chains);
|
|
54
|
-
}
|
|
55
53
|
request(args) {
|
|
56
54
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
57
55
|
switch (args.method) {
|
|
@@ -117,23 +115,23 @@ class EthereumProvider {
|
|
|
117
115
|
return true;
|
|
118
116
|
}
|
|
119
117
|
registerEventListeners() {
|
|
120
|
-
this.signer.on("connect", () =>
|
|
118
|
+
this.signer.on("connect", () => {
|
|
121
119
|
const chains = this.signer.connection.chains;
|
|
122
120
|
if (chains && chains.length)
|
|
123
|
-
this.
|
|
121
|
+
this.setChainIds(chains);
|
|
124
122
|
const accounts = this.signer.connection.accounts;
|
|
125
123
|
if (accounts && accounts.length)
|
|
126
124
|
this.setAccounts(accounts);
|
|
127
|
-
})
|
|
125
|
+
});
|
|
128
126
|
this.signer.connection.on(signer_connection_1.SIGNER_EVENTS.created, (session) => {
|
|
129
127
|
const chains = utils_1.getChainsFromNamespaces(session.namespaces, [this.namespace]);
|
|
130
|
-
this.
|
|
128
|
+
this.setChainIds(chains);
|
|
131
129
|
const accounts = utils_1.getAccountsFromNamespaces(session.namespaces, [this.namespace]);
|
|
132
130
|
this.setAccounts(accounts);
|
|
133
131
|
});
|
|
134
132
|
this.signer.connection.on(signer_connection_1.SIGNER_EVENTS.updated, (session) => {
|
|
135
133
|
const chains = utils_1.getChainsFromNamespaces(session.namespaces, [this.namespace]);
|
|
136
|
-
this.
|
|
134
|
+
this.setChainIds(chains);
|
|
137
135
|
const accounts = utils_1.getAccountsFromNamespaces(session.namespaces, [this.namespace]);
|
|
138
136
|
if (accounts !== this.accounts) {
|
|
139
137
|
this.setAccounts(accounts);
|
|
@@ -143,14 +141,15 @@ class EthereumProvider {
|
|
|
143
141
|
if (!this.rpc.chains.includes(params.chainId))
|
|
144
142
|
return;
|
|
145
143
|
const { event } = params;
|
|
146
|
-
if (event.
|
|
144
|
+
if (event.name === "accountsChanged") {
|
|
145
|
+
this.accounts = event.data;
|
|
147
146
|
this.events.emit("accountsChanged", this.accounts);
|
|
148
147
|
}
|
|
149
|
-
else if (event.
|
|
150
|
-
this.
|
|
148
|
+
else if (event.name === "chainChanged") {
|
|
149
|
+
this.setChainId(event.data);
|
|
151
150
|
}
|
|
152
151
|
else {
|
|
153
|
-
this.events.emit(event.
|
|
152
|
+
this.events.emit(event.name, event.data);
|
|
154
153
|
}
|
|
155
154
|
});
|
|
156
155
|
this.signer.on("disconnect", () => {
|
|
@@ -179,7 +178,7 @@ class EthereumProvider {
|
|
|
179
178
|
return http;
|
|
180
179
|
}
|
|
181
180
|
isCompatibleChainId(chainId) {
|
|
182
|
-
return chainId.startsWith(`${this.namespace}:`);
|
|
181
|
+
return typeof chainId === "string" ? chainId.startsWith(`${this.namespace}:`) : false;
|
|
183
182
|
}
|
|
184
183
|
formatChainId(chainId) {
|
|
185
184
|
return `${this.namespace}:${chainId}`;
|
|
@@ -187,9 +186,18 @@ class EthereumProvider {
|
|
|
187
186
|
parseChainId(chainId) {
|
|
188
187
|
return Number(chainId.split(":")[1]);
|
|
189
188
|
}
|
|
190
|
-
|
|
189
|
+
setChainIds(chains) {
|
|
191
190
|
const compatible = chains.filter(x => this.isCompatibleChainId(x));
|
|
192
|
-
|
|
191
|
+
const chainIds = compatible.map(c => this.parseChainId(c)).filter(c => c !== this.chainId);
|
|
192
|
+
if (chainIds.length) {
|
|
193
|
+
this.chainId = chainIds[0];
|
|
194
|
+
this.events.emit("chainChanged", this.chainId);
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
setChainId(chain) {
|
|
198
|
+
if (this.isCompatibleChainId(chain)) {
|
|
199
|
+
const chainId = this.parseChainId(chain);
|
|
200
|
+
this.chainId = chainId;
|
|
193
201
|
this.events.emit("chainChanged", this.chainId);
|
|
194
202
|
}
|
|
195
203
|
}
|
package/dist/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;AAAA,mCAAsC;AACtC,sEAAkE;AAClE,oFAAwE;AAExE,gDAA0F;AAC1F,wEAI0C;AAG7B,QAAA,aAAa,GAAG;IAC3B,qBAAqB;IACrB,cAAc;IACd,aAAa;IACb,qBAAqB;IACrB,qBAAqB;IACrB,UAAU;IACV,mBAAmB;IACnB,eAAe;CAChB,CAAC;AAEW,QAAA,YAAY,GAAG,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/index.d.ts
CHANGED
|
@@ -24,13 +24,13 @@ export interface EthereumProviderOptions {
|
|
|
24
24
|
}
|
|
25
25
|
declare class EthereumProvider implements IEthereumProvider {
|
|
26
26
|
events: any;
|
|
27
|
-
private rpc;
|
|
28
27
|
namespace: string;
|
|
29
28
|
accounts: string[];
|
|
30
29
|
signer: JsonRpcProvider;
|
|
31
30
|
http: JsonRpcProvider | undefined;
|
|
31
|
+
chainId: number;
|
|
32
|
+
private rpc;
|
|
32
33
|
constructor(opts: EthereumProviderOptions);
|
|
33
|
-
get chainId(): number;
|
|
34
34
|
request<T = unknown>(args: RequestArguments): Promise<T>;
|
|
35
35
|
sendAsync(args: RequestArguments, callback: (error: Error | null, response: any) => void): void;
|
|
36
36
|
get connected(): boolean;
|
|
@@ -49,6 +49,7 @@ declare class EthereumProvider implements IEthereumProvider {
|
|
|
49
49
|
private isCompatibleChainId;
|
|
50
50
|
private formatChainId;
|
|
51
51
|
private parseChainId;
|
|
52
|
+
private setChainIds;
|
|
52
53
|
private setChainId;
|
|
53
54
|
private parseAccountId;
|
|
54
55
|
private setAccounts;
|
package/dist/esm/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAIlE,OAAO,EAGL,0BAA0B,EAC3B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzF,eAAO,MAAM,aAAa,UASzB,CAAC;AAEF,eAAO,MAAM,YAAY,UAAsC,CAAC;AAEhE,MAAM,WAAW,cAAc;IAC7B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;CAC3B;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAIlE,OAAO,EAGL,0BAA0B,EAC3B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzF,eAAO,MAAM,aAAa,UASzB,CAAC;AAEF,eAAO,MAAM,YAAY,UAAsC,CAAC;AAEhE,MAAM,WAAW,cAAc;IAC7B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,cAAc,CAAC;CACzB;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,uBAAuB,GAAG,iBAAiB,CAO7E;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,iBAAiB,GAAG,MAAM,GAAG,SAAS,CAMrF;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAE3D;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,MAAM,CAAC,EAAE,0BAA0B,CAAC;CACrC;AAED,cAAM,gBAAiB,YAAW,iBAAiB;IAC1C,MAAM,EAAE,GAAG,CAAsB;IACjC,SAAS,SAAY;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAM;IACxB,MAAM,EAAE,eAAe,CAAC;IACxB,IAAI,EAAE,eAAe,GAAG,SAAS,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC;IAEvB,OAAO,CAAC,GAAG,CAAoB;gBAEnB,IAAI,EAAE,uBAAuB;IAQ5B,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,CAAC,CAAC;IAqB9D,SAAS,CACd,IAAI,EAAE,gBAAgB,EACtB,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,EAAE,QAAQ,EAAE,GAAG,KAAK,IAAI,GACrD,IAAI;IAMP,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAEY,MAAM,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAKnC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAGnC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAGxC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAGlD,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,IAAI;IAI9C,IAAI,eAAe,YAElB;IAID,OAAO,CAAC,sBAAsB;IAuC9B,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,WAAW;CAMpB;AAED,eAAe,gBAAgB,CAAC"}
|
package/dist/esm/index.js
CHANGED
|
@@ -39,12 +39,10 @@ class EthereumProvider {
|
|
|
39
39
|
this.accounts = [];
|
|
40
40
|
this.rpc = getRpcConfig(opts);
|
|
41
41
|
this.signer = this.setSignerProvider(opts === null || opts === void 0 ? void 0 : opts.client);
|
|
42
|
+
this.chainId = getEthereumChainId(this.rpc.chains);
|
|
42
43
|
this.http = this.setHttpProvider(this.chainId);
|
|
43
44
|
this.registerEventListeners();
|
|
44
45
|
}
|
|
45
|
-
get chainId() {
|
|
46
|
-
return getEthereumChainId(this.rpc.chains);
|
|
47
|
-
}
|
|
48
46
|
async request(args) {
|
|
49
47
|
switch (args.method) {
|
|
50
48
|
case "eth_requestAccounts":
|
|
@@ -102,23 +100,23 @@ class EthereumProvider {
|
|
|
102
100
|
return true;
|
|
103
101
|
}
|
|
104
102
|
registerEventListeners() {
|
|
105
|
-
this.signer.on("connect",
|
|
103
|
+
this.signer.on("connect", () => {
|
|
106
104
|
const chains = this.signer.connection.chains;
|
|
107
105
|
if (chains && chains.length)
|
|
108
|
-
this.
|
|
106
|
+
this.setChainIds(chains);
|
|
109
107
|
const accounts = this.signer.connection.accounts;
|
|
110
108
|
if (accounts && accounts.length)
|
|
111
109
|
this.setAccounts(accounts);
|
|
112
110
|
});
|
|
113
111
|
this.signer.connection.on(SIGNER_EVENTS.created, (session) => {
|
|
114
112
|
const chains = getChainsFromNamespaces(session.namespaces, [this.namespace]);
|
|
115
|
-
this.
|
|
113
|
+
this.setChainIds(chains);
|
|
116
114
|
const accounts = getAccountsFromNamespaces(session.namespaces, [this.namespace]);
|
|
117
115
|
this.setAccounts(accounts);
|
|
118
116
|
});
|
|
119
117
|
this.signer.connection.on(SIGNER_EVENTS.updated, (session) => {
|
|
120
118
|
const chains = getChainsFromNamespaces(session.namespaces, [this.namespace]);
|
|
121
|
-
this.
|
|
119
|
+
this.setChainIds(chains);
|
|
122
120
|
const accounts = getAccountsFromNamespaces(session.namespaces, [this.namespace]);
|
|
123
121
|
if (accounts !== this.accounts) {
|
|
124
122
|
this.setAccounts(accounts);
|
|
@@ -128,14 +126,15 @@ class EthereumProvider {
|
|
|
128
126
|
if (!this.rpc.chains.includes(params.chainId))
|
|
129
127
|
return;
|
|
130
128
|
const { event } = params;
|
|
131
|
-
if (event.
|
|
129
|
+
if (event.name === "accountsChanged") {
|
|
130
|
+
this.accounts = event.data;
|
|
132
131
|
this.events.emit("accountsChanged", this.accounts);
|
|
133
132
|
}
|
|
134
|
-
else if (event.
|
|
135
|
-
this.
|
|
133
|
+
else if (event.name === "chainChanged") {
|
|
134
|
+
this.setChainId(event.data);
|
|
136
135
|
}
|
|
137
136
|
else {
|
|
138
|
-
this.events.emit(event.
|
|
137
|
+
this.events.emit(event.name, event.data);
|
|
139
138
|
}
|
|
140
139
|
});
|
|
141
140
|
this.signer.on("disconnect", () => {
|
|
@@ -164,7 +163,7 @@ class EthereumProvider {
|
|
|
164
163
|
return http;
|
|
165
164
|
}
|
|
166
165
|
isCompatibleChainId(chainId) {
|
|
167
|
-
return chainId.startsWith(`${this.namespace}:`);
|
|
166
|
+
return typeof chainId === "string" ? chainId.startsWith(`${this.namespace}:`) : false;
|
|
168
167
|
}
|
|
169
168
|
formatChainId(chainId) {
|
|
170
169
|
return `${this.namespace}:${chainId}`;
|
|
@@ -172,9 +171,18 @@ class EthereumProvider {
|
|
|
172
171
|
parseChainId(chainId) {
|
|
173
172
|
return Number(chainId.split(":")[1]);
|
|
174
173
|
}
|
|
175
|
-
|
|
174
|
+
setChainIds(chains) {
|
|
176
175
|
const compatible = chains.filter(x => this.isCompatibleChainId(x));
|
|
177
|
-
|
|
176
|
+
const chainIds = compatible.map(c => this.parseChainId(c)).filter(c => c !== this.chainId);
|
|
177
|
+
if (chainIds.length) {
|
|
178
|
+
this.chainId = chainIds[0];
|
|
179
|
+
this.events.emit("chainChanged", this.chainId);
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
setChainId(chain) {
|
|
183
|
+
if (this.isCompatibleChainId(chain)) {
|
|
184
|
+
const chainId = this.parseChainId(chain);
|
|
185
|
+
this.chainId = chainId;
|
|
178
186
|
this.events.emit("chainChanged", this.chainId);
|
|
179
187
|
}
|
|
180
188
|
}
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAExE,OAAO,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EACL,gBAAgB,EAChB,aAAa,GAEd,MAAM,kCAAkC,CAAC;AAG1C,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,qBAAqB;IACrB,cAAc;IACd,aAAa;IACb,qBAAqB;IACrB,qBAAqB;IACrB,UAAU;IACV,mBAAmB;IACnB,eAAe;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAExE,OAAO,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EACL,gBAAgB,EAChB,aAAa,GAEd,MAAM,kCAAkC,CAAC;AAG1C,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,qBAAqB;IACrB,cAAc;IACd,aAAa;IACb,qBAAqB;IACrB,qBAAqB;IACrB,UAAU;IACV,mBAAmB;IACnB,eAAe;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;AAahE,MAAM,UAAU,YAAY,CAAC,IAA6B;IACxD,OAAO;QACL,MAAM,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,EAAC,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;QACvD,OAAO,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,KAAI,EAAE;QAC5B,MAAM,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,KAAI,EAAE;QAC1B,MAAM,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,KAAI,SAAS;KAClC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,OAAe,EAAE,GAAsB;IAC/D,IAAI,MAA0B,CAAC;IAC/B,IAAI,GAAG,CAAC,MAAM,EAAE;QACd,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KACpD;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAAgB;IACjD,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzC,CAAC;AAUD,MAAM,gBAAgB;IAUpB,YAAY,IAA6B;QATlC,WAAM,GAAQ,IAAI,YAAY,EAAE,CAAC;QACjC,cAAS,GAAG,QAAQ,CAAC;QACrB,aAAQ,GAAa,EAAE,CAAC;QAQ7B,IAAI,CAAC,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC,CAAC;QACnD,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAChC,CAAC;IAEM,KAAK,CAAC,OAAO,CAAc,IAAsB;QACtD,QAAQ,IAAI,CAAC,MAAM,EAAE;YACnB,KAAK,qBAAqB;gBACxB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;gBACrB,OAAO,IAAI,CAAC,QAAe,CAAC;YAC9B,KAAK,cAAc;gBACjB,OAAO,IAAI,CAAC,QAAe,CAAC;YAC9B,KAAK,aAAa;gBAChB,OAAO,IAAI,CAAC,OAAc,CAAC;YAC7B;gBACE,MAAM;SACT;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACzF,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SACjF;QACD,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE;YACpC,MAAM,IAAI,KAAK,CAAC,mCAAmC,IAAI,CAAC,MAAM,4BAA4B,CAAC,CAAC;SAC7F;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAEM,SAAS,CACd,IAAsB,EACtB,QAAsD;QAEtD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;aACf,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aAC1C,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,SAAS;QACX,OAAQ,IAAI,CAAC,MAAM,CAAC,UAA+B,CAAC,SAAS,CAAC;IAChE,CAAC;IAED,IAAI,UAAU;QACZ,OAAQ,IAAI,CAAC,MAAM,CAAC,UAA+B,CAAC,UAAU,CAAC;IACjE,CAAC;IAEM,KAAK,CAAC,MAAM;QACjB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAC;QACvE,OAAO,QAA4B,CAAC;IACtC,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IACjC,CAAC;IAEM,EAAE,CAAC,KAAU,EAAE,QAAa;QACjC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAClC,CAAC;IACM,IAAI,CAAC,KAAa,EAAE,QAAa;QACtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACpC,CAAC;IACM,cAAc,CAAC,KAAa,EAAE,QAAa;QAChD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;IACM,GAAG,CAAC,KAAa,EAAE,QAAa;QACrC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAIO,sBAAsB;QAC5B,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YAC7B,MAAM,MAAM,GAAI,IAAI,CAAC,MAAM,CAAC,UAA+B,CAAC,MAAM,CAAC;YACnE,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM;gBAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACtD,MAAM,QAAQ,GAAI,IAAI,CAAC,MAAM,CAAC,UAA+B,CAAC,QAAQ,CAAC;YACvE,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM;gBAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,OAA4B,EAAE,EAAE;YAChF,MAAM,MAAM,GAAG,uBAAuB,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;YAC7E,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACzB,MAAM,QAAQ,GAAG,yBAAyB,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;YACjF,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,OAA4B,EAAE,EAAE;YAChF,MAAM,MAAM,GAAG,uBAAuB,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;YAC7E,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACzB,MAAM,QAAQ,GAAG,yBAAyB,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;YACjF,IAAI,QAAQ,KAAK,IAAI,CAAC,QAAQ,EAAE;gBAC9B,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,MAAW,EAAE,EAAE;YAC7D,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;gBAAE,OAAO;YACtD,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;YACzB,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,EAAE;gBACpC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;aACpD;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE;gBACxC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC7B;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;aAC1C;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE;YAChC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;IACrF,CAAC;IAEO,iBAAiB,CAAC,MAAmC;QAC3D,MAAM,UAAU,GAAG,IAAI,gBAAgB,CAAC;YACtC,kBAAkB,EAAE;gBAClB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;oBAChB,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM;oBACvB,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO;oBACzB,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM;iBACxB;aACF;YACD,MAAM;SACP,CAAC,CAAC;QACH,OAAO,IAAI,eAAe,CAAC,UAAU,CAAC,CAAC;IACzC,CAAC;IAEO,eAAe,CAAC,OAAe;QACrC,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,IAAI,OAAO,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QACnE,IAAI,OAAO,MAAM,KAAK,WAAW;YAAE,OAAO,SAAS,CAAC;QACpD,MAAM,IAAI,GAAG,IAAI,eAAe,CAAC,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,mBAAmB,CAAC,OAAe;QACzC,OAAO,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACxF,CAAC;IAEO,aAAa,CAAC,OAAe;QACnC,OAAO,GAAG,IAAI,CAAC,SAAS,IAAI,OAAO,EAAE,CAAC;IACxC,CAAC;IAEO,YAAY,CAAC,OAAe;QAClC,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;IAEO,WAAW,CAAC,MAAgB;QAClC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;QACnE,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3F,IAAI,QAAQ,CAAC,MAAM,EAAE;YACnB,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;SAChD;IACH,CAAC;IAEO,UAAU,CAAC,KAAa;QAC9B,IAAI,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE;YACnC,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YACzC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;SAChD;IACH,CAAC;IAEO,cAAc,CAAC,OAAe;QACpC,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,GAAG,SAAS,IAAI,SAAS,EAAE,CAAC;QAC5C,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;IAC9B,CAAC;IAEO,WAAW,CAAC,QAAkB;QACpC,IAAI,CAAC,QAAQ,GAAG,QAAQ;aACrB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC;aAC/E,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrD,CAAC;CACF;AAED,eAAe,gBAAgB,CAAC"}
|