@coin-voyage/crypto 0.0.14 → 0.0.16
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.
|
@@ -9,7 +9,7 @@ export const useConnectCallback = ({ onConnect, onDisconnect }) => {
|
|
|
9
9
|
const { status, address, chainId, connector } = useAccount();
|
|
10
10
|
const [activeEthAccount, setActiveEthAccount] = useState(null);
|
|
11
11
|
useEffect(() => {
|
|
12
|
-
if (address && activeEthAccount !==
|
|
12
|
+
if (address && activeEthAccount !== address) {
|
|
13
13
|
onConnect?.({
|
|
14
14
|
address,
|
|
15
15
|
chainId,
|
|
@@ -20,47 +20,43 @@ export const useConnectCallback = ({ onConnect, onDisconnect }) => {
|
|
|
20
20
|
}
|
|
21
21
|
}, [address, status]);
|
|
22
22
|
useAccountEffect({
|
|
23
|
-
onConnect: ({ address, connector, isReconnected, chainId }) => {
|
|
24
|
-
if (!isReconnected) {
|
|
25
|
-
onConnect?.({
|
|
26
|
-
address,
|
|
27
|
-
chainId,
|
|
28
|
-
connectorId: connector.id,
|
|
29
|
-
type: ChainType.EVM,
|
|
30
|
-
});
|
|
31
|
-
setActiveEthAccount(address);
|
|
32
|
-
}
|
|
33
|
-
},
|
|
34
23
|
onDisconnect: () => {
|
|
35
24
|
setActiveEthAccount(null);
|
|
36
25
|
onDisconnect?.();
|
|
37
26
|
}
|
|
38
27
|
});
|
|
39
|
-
const [activeUTXOAccount, setActiveUTXOAccount] = useState(null);
|
|
40
28
|
const utxoConfig = useBigmiConfig();
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
address
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
29
|
+
const [activeUTXOAccount, setActiveUTXOAccount] = useState(null);
|
|
30
|
+
useEffect(() => {
|
|
31
|
+
const unwatch = watchAccount(utxoConfig, {
|
|
32
|
+
onChange: ({ address, connector, isDisconnected, chainId, status }) => {
|
|
33
|
+
if (isDisconnected) {
|
|
34
|
+
setActiveUTXOAccount(null);
|
|
35
|
+
onDisconnect?.();
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
if (address && status === "connected" && activeUTXOAccount !== address) {
|
|
39
|
+
setActiveUTXOAccount(address);
|
|
40
|
+
onConnect?.({
|
|
41
|
+
address,
|
|
42
|
+
chainId,
|
|
43
|
+
connectorId: connector?.id,
|
|
44
|
+
type: ChainType.UTXO,
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
},
|
|
48
|
+
});
|
|
49
|
+
return () => {
|
|
50
|
+
unwatch();
|
|
51
|
+
};
|
|
52
|
+
}, [utxoConfig, activeUTXOAccount]);
|
|
53
|
+
// Sui connection
|
|
59
54
|
const account = useCurrentAccount();
|
|
60
55
|
const wallet = useCurrentWallet();
|
|
61
|
-
const [activeSuiAccount,
|
|
56
|
+
const [activeSuiAccount, setActiveSuiAccount] = useState(null);
|
|
62
57
|
useEffect(() => {
|
|
63
|
-
if (
|
|
58
|
+
if (account?.address && activeSuiAccount !== account.address) {
|
|
59
|
+
setActiveSuiAccount(account.address);
|
|
64
60
|
onConnect?.({
|
|
65
61
|
address: account?.address,
|
|
66
62
|
connectorId: wallet?.currentWallet?.id,
|
|
@@ -68,12 +64,11 @@ export const useConnectCallback = ({ onConnect, onDisconnect }) => {
|
|
|
68
64
|
});
|
|
69
65
|
}
|
|
70
66
|
else if (activeSuiAccount && account == null) {
|
|
67
|
+
setActiveSuiAccount(null);
|
|
71
68
|
onDisconnect?.();
|
|
72
69
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
}
|
|
76
|
-
}, [account]);
|
|
70
|
+
}, [account?.address, activeSuiAccount, wallet?.currentWallet?.accounts]);
|
|
71
|
+
// Solana connection
|
|
77
72
|
const { connected, publicKey, wallet: solWallet } = useWallet();
|
|
78
73
|
const [activeSolAccount, setActiveSolAccount] = useState(null);
|
|
79
74
|
useEffect(() => {
|
|
@@ -91,6 +86,6 @@ export const useConnectCallback = ({ onConnect, onDisconnect }) => {
|
|
|
91
86
|
setActiveSolAccount(null);
|
|
92
87
|
onDisconnect?.();
|
|
93
88
|
}
|
|
94
|
-
}, [publicKey, connected, solWallet?.adapter.name, activeSolAccount
|
|
89
|
+
}, [publicKey, connected, solWallet?.adapter.name, activeSolAccount]);
|
|
95
90
|
};
|
|
96
91
|
//# sourceMappingURL=use-connect-callback.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-connect-callback.js","sourceRoot":"","sources":["../../src/hooks/use-connect-callback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,SAAS,IAAI,cAAc,EAAE,MAAM,cAAc,CAAA;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAExD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAA;AAYpD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EAAE,SAAS,EAAE,YAAY,EAA2B,EAAE,EAAE;IACzF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,UAAU,EAAE,CAAA;IAC5D,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,CAAiB,IAAI,CAAC,CAAA;IAE9E,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,IAAI,gBAAgB,KAAK,
|
|
1
|
+
{"version":3,"file":"use-connect-callback.js","sourceRoot":"","sources":["../../src/hooks/use-connect-callback.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@coin-voyage/crypto",
|
|
3
3
|
"description": "Crypto utilities for Coin Voyage",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.16",
|
|
5
5
|
"private": false,
|
|
6
6
|
"sideEffects": false,
|
|
7
7
|
"author": "Lars <lars@coinvoyage.io>",
|
|
@@ -42,8 +42,7 @@
|
|
|
42
42
|
"@mysten/wallet-standard": "0.15.6",
|
|
43
43
|
"@solana/spl-token": "0.4.13",
|
|
44
44
|
"@solana/wallet-adapter-base": "0.9.26",
|
|
45
|
-
"
|
|
46
|
-
"@coin-voyage/shared": "0.0.9"
|
|
45
|
+
"@coin-voyage/shared": "0.0.10"
|
|
47
46
|
},
|
|
48
47
|
"devDependencies": {
|
|
49
48
|
"@types/elliptic": "6.4.18"
|
|
@@ -53,8 +52,9 @@
|
|
|
53
52
|
"react": "^18 || ^19",
|
|
54
53
|
"react-dom": "^18 || ^19",
|
|
55
54
|
"@mysten/dapp-kit": "^0.16.9",
|
|
56
|
-
"@solana/wallet-adapter-react": "^0.15.
|
|
55
|
+
"@solana/wallet-adapter-react": "^0.15.35",
|
|
57
56
|
"@solana/web3.js": "^1.98.0",
|
|
57
|
+
"viem": "^2.30.6",
|
|
58
58
|
"wagmi": "^2.15.5"
|
|
59
59
|
},
|
|
60
60
|
"scripts": {
|