@xylabs/sdk-react 2.12.5 → 2.12.6
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/contexts/Ethers/MetaMask.js +21 -19
- package/dist/cjs/contexts/Ethers/MetaMask.js.map +1 -1
- package/dist/esm/contexts/Ethers/MetaMask.js +19 -16
- package/dist/esm/contexts/Ethers/MetaMask.js.map +1 -1
- package/package.json +10 -9
- package/src/contexts/Ethers/MetaMask.tsx +21 -18
- package/src/contexts/Ethers/global.d.ts +8 -0
|
@@ -11,25 +11,30 @@ const Context_1 = require("./Context");
|
|
|
11
11
|
const Infura_1 = require("./Infura");
|
|
12
12
|
const MetaMaskEthersLoader = (props) => {
|
|
13
13
|
const { children, enabled = true } = props;
|
|
14
|
-
|
|
15
|
-
const global = window;
|
|
16
|
-
const ethereum = global.ethereum;
|
|
14
|
+
const ethereum = window.ethereum;
|
|
17
15
|
const [error, setError] = (0, react_1.useState)();
|
|
18
16
|
const [localAddress, setLocalAddress] = (0, react_1.useState)();
|
|
19
17
|
const [resetCount, setResetCount] = (0, react_1.useState)(0);
|
|
20
18
|
const [providerName, setProviderName] = (0, react_1.useState)();
|
|
21
|
-
if (ethereum) {
|
|
22
|
-
ethereum.autoRefreshOnNetworkChange = false;
|
|
23
|
-
}
|
|
24
19
|
const connect = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
20
|
+
const accounts = yield (walletProvider === null || walletProvider === void 0 ? void 0 : walletProvider.send('eth_requestAccounts', []));
|
|
21
|
+
// We could have multiple accounts. Check for one.
|
|
22
|
+
if (accounts.length !== 0) {
|
|
23
|
+
setLocalAddress(accounts[0]);
|
|
24
|
+
console.log('Connected: ', accounts[0]);
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
console.log('No authorized account found.');
|
|
28
|
+
}
|
|
29
|
+
return accounts;
|
|
28
30
|
});
|
|
29
31
|
const [isConnected, setIsConnected] = (0, react_1.useState)();
|
|
32
|
+
const [walletProvider, setWalletProvider] = (0, react_1.useState)();
|
|
33
|
+
const [provider, setProvider] = (0, react_1.useState)();
|
|
34
|
+
const [signer, setSigner] = (0, react_1.useState)();
|
|
30
35
|
(0, react_1.useEffect)(() => {
|
|
31
|
-
if (
|
|
32
|
-
|
|
36
|
+
if (provider && enabled) {
|
|
37
|
+
provider.on('accountsChanged', (accounts) => {
|
|
33
38
|
console.log(`accountsChanged: ${JSON.stringify(accounts)}`);
|
|
34
39
|
setResetCount(resetCount + 1);
|
|
35
40
|
if (accounts.length > 0) {
|
|
@@ -39,7 +44,7 @@ const MetaMaskEthersLoader = (props) => {
|
|
|
39
44
|
setLocalAddress(undefined);
|
|
40
45
|
}
|
|
41
46
|
});
|
|
42
|
-
|
|
47
|
+
provider.on('chainChanged', (chainId) => {
|
|
43
48
|
setResetCount(resetCount + 1);
|
|
44
49
|
if (chainId) {
|
|
45
50
|
setChainId(parseInt(chainId));
|
|
@@ -49,13 +54,10 @@ const MetaMaskEthersLoader = (props) => {
|
|
|
49
54
|
}
|
|
50
55
|
});
|
|
51
56
|
}
|
|
52
|
-
}, [
|
|
53
|
-
const [walletProvider, setWalletProvider] = (0, react_1.useState)();
|
|
54
|
-
const [provider, setProvider] = (0, react_1.useState)();
|
|
55
|
-
const [signer, setSigner] = (0, react_1.useState)();
|
|
57
|
+
}, [provider, resetCount, enabled]);
|
|
56
58
|
(0, react_1.useEffect)(() => {
|
|
57
59
|
if (enabled) {
|
|
58
|
-
const walletProvider = ethereum ? new providers_1.Web3Provider(ethereum) : null;
|
|
60
|
+
const walletProvider = ethereum ? new providers_1.Web3Provider(window.ethereum) : null;
|
|
59
61
|
let provider = null;
|
|
60
62
|
let providerName = null;
|
|
61
63
|
if (walletProvider) {
|
|
@@ -105,9 +107,9 @@ const MetaMaskEthersLoader = (props) => {
|
|
|
105
107
|
(0, lib_1.useAsyncEffect)(
|
|
106
108
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
107
109
|
(isMounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
108
|
-
var
|
|
110
|
+
var _a;
|
|
109
111
|
if (enabled) {
|
|
110
|
-
const chainId = (
|
|
112
|
+
const chainId = (_a = (yield (provider === null || provider === void 0 ? void 0 : provider.getNetwork()))) === null || _a === void 0 ? void 0 : _a.chainId;
|
|
111
113
|
if (!isMounted())
|
|
112
114
|
return;
|
|
113
115
|
setChainId(chainId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetaMask.js","sourceRoot":"","sources":["../../../../src/contexts/Ethers/MetaMask.tsx"],"names":[],"mappings":";;;;;AAAA,wDAAgG;
|
|
1
|
+
{"version":3,"file":"MetaMask.js","sourceRoot":"","sources":["../../../../src/contexts/Ethers/MetaMask.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,24 +7,30 @@ import { EthersContext } from './Context';
|
|
|
7
7
|
import { infuraKey } from './Infura';
|
|
8
8
|
export const MetaMaskEthersLoader = (props) => {
|
|
9
9
|
const { children, enabled = true } = props;
|
|
10
|
-
|
|
11
|
-
const global = window;
|
|
12
|
-
const ethereum = global.ethereum;
|
|
10
|
+
const ethereum = window.ethereum;
|
|
13
11
|
const [error, setError] = useState();
|
|
14
12
|
const [localAddress, setLocalAddress] = useState();
|
|
15
13
|
const [resetCount, setResetCount] = useState(0);
|
|
16
14
|
const [providerName, setProviderName] = useState();
|
|
17
|
-
if (ethereum) {
|
|
18
|
-
ethereum.autoRefreshOnNetworkChange = false;
|
|
19
|
-
}
|
|
20
15
|
const connect = async () => {
|
|
21
|
-
await
|
|
22
|
-
|
|
16
|
+
const accounts = await walletProvider?.send('eth_requestAccounts', []);
|
|
17
|
+
// We could have multiple accounts. Check for one.
|
|
18
|
+
if (accounts.length !== 0) {
|
|
19
|
+
setLocalAddress(accounts[0]);
|
|
20
|
+
console.log('Connected: ', accounts[0]);
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
console.log('No authorized account found.');
|
|
24
|
+
}
|
|
25
|
+
return accounts;
|
|
23
26
|
};
|
|
24
27
|
const [isConnected, setIsConnected] = useState();
|
|
28
|
+
const [walletProvider, setWalletProvider] = useState();
|
|
29
|
+
const [provider, setProvider] = useState();
|
|
30
|
+
const [signer, setSigner] = useState();
|
|
25
31
|
useEffect(() => {
|
|
26
|
-
if (
|
|
27
|
-
|
|
32
|
+
if (provider && enabled) {
|
|
33
|
+
provider.on('accountsChanged', (accounts) => {
|
|
28
34
|
console.log(`accountsChanged: ${JSON.stringify(accounts)}`);
|
|
29
35
|
setResetCount(resetCount + 1);
|
|
30
36
|
if (accounts.length > 0) {
|
|
@@ -34,7 +40,7 @@ export const MetaMaskEthersLoader = (props) => {
|
|
|
34
40
|
setLocalAddress(undefined);
|
|
35
41
|
}
|
|
36
42
|
});
|
|
37
|
-
|
|
43
|
+
provider.on('chainChanged', (chainId) => {
|
|
38
44
|
setResetCount(resetCount + 1);
|
|
39
45
|
if (chainId) {
|
|
40
46
|
setChainId(parseInt(chainId));
|
|
@@ -44,13 +50,10 @@ export const MetaMaskEthersLoader = (props) => {
|
|
|
44
50
|
}
|
|
45
51
|
});
|
|
46
52
|
}
|
|
47
|
-
}, [
|
|
48
|
-
const [walletProvider, setWalletProvider] = useState();
|
|
49
|
-
const [provider, setProvider] = useState();
|
|
50
|
-
const [signer, setSigner] = useState();
|
|
53
|
+
}, [provider, resetCount, enabled]);
|
|
51
54
|
useEffect(() => {
|
|
52
55
|
if (enabled) {
|
|
53
|
-
const walletProvider = ethereum ? new Web3Provider(ethereum) : null;
|
|
56
|
+
const walletProvider = ethereum ? new Web3Provider(window.ethereum) : null;
|
|
54
57
|
let provider = null;
|
|
55
58
|
let providerName = null;
|
|
56
59
|
if (walletProvider) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetaMask.js","sourceRoot":"","sources":["../../../../src/contexts/Ethers/MetaMask.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAA2B,YAAY,EAAE,MAAM,0BAA0B,CAAA;
|
|
1
|
+
{"version":3,"file":"MetaMask.js","sourceRoot":"","sources":["../../../../src/contexts/Ethers/MetaMask.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -13,9 +13,10 @@
|
|
|
13
13
|
"@emotion/styled": "^11.8.1",
|
|
14
14
|
"@ethersproject/abstract-signer": "^5.6.0",
|
|
15
15
|
"@ethersproject/providers": "^5.6.5",
|
|
16
|
+
"@metamask/providers": "^8.1.1",
|
|
16
17
|
"@mui/icons-material": "^5.6.2",
|
|
17
|
-
"@mui/material": "^5.
|
|
18
|
-
"@mui/styles": "^5.
|
|
18
|
+
"@mui/material": "^5.7.0",
|
|
19
|
+
"@mui/styles": "^5.7.0",
|
|
19
20
|
"@xylabs/pixel": "^1.3.7",
|
|
20
21
|
"@xylabs/sdk-js": "^2.5.5",
|
|
21
22
|
"axios": "^0.27.2",
|
|
@@ -48,25 +49,25 @@
|
|
|
48
49
|
"@types/lodash": "^4.14.182",
|
|
49
50
|
"@types/md5": "^2.3.2",
|
|
50
51
|
"@types/numeral": "^2.0.2",
|
|
51
|
-
"@types/react": "^18.0.
|
|
52
|
-
"@types/react-dom": "^18.0.
|
|
52
|
+
"@types/react": "^18.0.9",
|
|
53
|
+
"@types/react-dom": "^18.0.4",
|
|
53
54
|
"@types/react-helmet": "^6.1.5",
|
|
54
55
|
"@xylabs/eslint-config-react": "^2.1.5",
|
|
55
56
|
"@xylabs/rollup-config": "^1.1.17",
|
|
56
|
-
"@xylabs/ts-scripts": "^1.0.
|
|
57
|
+
"@xylabs/ts-scripts": "^1.0.66",
|
|
57
58
|
"@xylabs/tsconfig": "^1.0.13",
|
|
58
59
|
"copyfiles": "^2.4.1",
|
|
59
60
|
"depcheck": "^1.4.3",
|
|
60
|
-
"eslint": "^8.
|
|
61
|
+
"eslint": "^8.15.0",
|
|
61
62
|
"react": "^18.1.0",
|
|
62
63
|
"react-dom": "^18.1.0",
|
|
63
64
|
"rimraf": "^3.0.2",
|
|
64
|
-
"rollup": "^2.72.
|
|
65
|
+
"rollup": "^2.72.1",
|
|
65
66
|
"storybook-dark-mode": "^1.1.0",
|
|
66
67
|
"ts-node": "^10.7.0",
|
|
67
68
|
"typedoc": "^0.22.15",
|
|
68
69
|
"typescript": "^4.6.4",
|
|
69
|
-
"webpack": "^5.72.
|
|
70
|
+
"webpack": "^5.72.1"
|
|
70
71
|
},
|
|
71
72
|
"peerDependencies": {
|
|
72
73
|
"react": "*",
|
|
@@ -126,6 +127,6 @@
|
|
|
126
127
|
},
|
|
127
128
|
"sideEffects": false,
|
|
128
129
|
"types": "dist/esm/index.d.ts",
|
|
129
|
-
"version": "2.12.
|
|
130
|
+
"version": "2.12.6",
|
|
130
131
|
"packageManager": "yarn@3.1.1"
|
|
131
132
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { InfuraProvider, JsonRpcSigner, Provider, Web3Provider } from '@ethersproject/providers'
|
|
2
|
+
import { MetaMaskInpageProvider } from '@metamask/providers'
|
|
2
3
|
import { EthAddress } from '@xylabs/sdk-js'
|
|
3
4
|
import React, { PropsWithChildren, useEffect, useState } from 'react'
|
|
4
5
|
|
|
@@ -12,28 +13,34 @@ interface Props {
|
|
|
12
13
|
|
|
13
14
|
export const MetaMaskEthersLoader: React.FC<PropsWithChildren<Props>> = (props) => {
|
|
14
15
|
const { children, enabled = true } = props
|
|
15
|
-
|
|
16
|
-
const
|
|
17
|
-
const ethereum = global.ethereum
|
|
16
|
+
|
|
17
|
+
const ethereum = window.ethereum as MetaMaskInpageProvider
|
|
18
18
|
const [error, setError] = useState<Error>()
|
|
19
19
|
const [localAddress, setLocalAddress] = useState<EthAddress>()
|
|
20
20
|
const [resetCount, setResetCount] = useState(0)
|
|
21
21
|
const [providerName, setProviderName] = useState<string>()
|
|
22
22
|
|
|
23
|
-
if (ethereum) {
|
|
24
|
-
ethereum.autoRefreshOnNetworkChange = false
|
|
25
|
-
}
|
|
26
|
-
|
|
27
23
|
const connect = async () => {
|
|
28
|
-
await
|
|
29
|
-
|
|
24
|
+
const accounts = await walletProvider?.send('eth_requestAccounts', [])
|
|
25
|
+
// We could have multiple accounts. Check for one.
|
|
26
|
+
if (accounts.length !== 0) {
|
|
27
|
+
setLocalAddress(accounts[0])
|
|
28
|
+
console.log('Connected: ', accounts[0])
|
|
29
|
+
} else {
|
|
30
|
+
console.log('No authorized account found.')
|
|
31
|
+
}
|
|
32
|
+
return accounts
|
|
30
33
|
}
|
|
31
34
|
|
|
32
35
|
const [isConnected, setIsConnected] = useState<boolean>()
|
|
33
36
|
|
|
37
|
+
const [walletProvider, setWalletProvider] = useState<Web3Provider | null>()
|
|
38
|
+
const [provider, setProvider] = useState<Provider>()
|
|
39
|
+
const [signer, setSigner] = useState<JsonRpcSigner | null>()
|
|
40
|
+
|
|
34
41
|
useEffect(() => {
|
|
35
|
-
if (
|
|
36
|
-
|
|
42
|
+
if (provider && enabled) {
|
|
43
|
+
provider.on('accountsChanged', (accounts: string[]) => {
|
|
37
44
|
console.log(`accountsChanged: ${JSON.stringify(accounts)}`)
|
|
38
45
|
setResetCount(resetCount + 1)
|
|
39
46
|
if (accounts.length > 0) {
|
|
@@ -42,7 +49,7 @@ export const MetaMaskEthersLoader: React.FC<PropsWithChildren<Props>> = (props)
|
|
|
42
49
|
setLocalAddress(undefined)
|
|
43
50
|
}
|
|
44
51
|
})
|
|
45
|
-
|
|
52
|
+
provider.on('chainChanged', (chainId: string) => {
|
|
46
53
|
setResetCount(resetCount + 1)
|
|
47
54
|
if (chainId) {
|
|
48
55
|
setChainId(parseInt(chainId))
|
|
@@ -51,15 +58,11 @@ export const MetaMaskEthersLoader: React.FC<PropsWithChildren<Props>> = (props)
|
|
|
51
58
|
}
|
|
52
59
|
})
|
|
53
60
|
}
|
|
54
|
-
}, [
|
|
55
|
-
|
|
56
|
-
const [walletProvider, setWalletProvider] = useState<Web3Provider | null>()
|
|
57
|
-
const [provider, setProvider] = useState<Provider>()
|
|
58
|
-
const [signer, setSigner] = useState<JsonRpcSigner | null>()
|
|
61
|
+
}, [provider, resetCount, enabled])
|
|
59
62
|
|
|
60
63
|
useEffect(() => {
|
|
61
64
|
if (enabled) {
|
|
62
|
-
const walletProvider = ethereum ? new Web3Provider(ethereum) : null
|
|
65
|
+
const walletProvider = ethereum ? new Web3Provider(window.ethereum) : null
|
|
63
66
|
let provider = null
|
|
64
67
|
let providerName = null
|
|
65
68
|
if (walletProvider) {
|