Update @alephium/web3 to 0.22.0

alephium · Oct 27, 2023 · fdee7df · fdee7df
1 parent 0baa915
commit fdee7df
Show file tree

Hide file tree

Showing 17 changed files with 1,264 additions and 1,115 deletions.
diff --git a/bridge_ui/package-lock.json b/bridge_ui/package-lock.json
diff --git a/bridge_ui/package.json b/bridge_ui/package.json
@@ -4,9 +4,9 @@
   "private": true,
   "dependencies": {
     "@alephium/token-list": "0.0.11",
-    "@alephium/web3": "^0.18.2",
-    "@alephium/web3-react": "^0.18.2",
-    "@alephium/wormhole-sdk": "0.1.2",
+    "@alephium/web3": "^0.22.0",
+    "@alephium/web3-react": "^0.22.0",
+    "@alephium/wormhole-sdk": "0.2.0",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.60",

diff --git a/bridge_ui/src/components/AlephiumWalletKey.tsx b/bridge_ui/src/components/AlephiumWalletKey.tsx
@@ -1,19 +1,13 @@
-import { ALEPHIUM_BRIDGE_GROUP_INDEX, CLUSTER } from "../utils/consts";
 import ToggleConnectedButton from "./ToggleConnectedButton";
-import { AlephiumConnectButton, useConnect } from "@alephium/web3-react"
+import { AlephiumConnectButton } from "@alephium/web3-react"
 
 const AlephiumWalletKey = () => {
-  const { disconnect } = useConnect({
-    addressGroup: ALEPHIUM_BRIDGE_GROUP_INDEX,
-    networkId: CLUSTER
-  })
-
   return (
     <AlephiumConnectButton.Custom displayAccount={(account) => account.address}>
-      {({ isConnected, show, address }) => {
+      {({ isConnected, show, disconnect, account }) => {
         return (
           // `show` and `hide` will never be undefined. TODO: Fix the types in web3-react
-          <ToggleConnectedButton connect={show!} disconnect={disconnect} connected={isConnected} pk={address ?? ''} />
+          <ToggleConnectedButton connect={show!} disconnect={disconnect} connected={isConnected} pk={account?.address ?? ''} />
         )
       }}
     </AlephiumConnectButton.Custom>

diff --git a/bridge_ui/src/components/TokenSelectors/AlephiumTokenPicker.tsx b/bridge_ui/src/components/TokenSelectors/AlephiumTokenPicker.tsx
@@ -45,7 +45,7 @@ export default function AlephiumTokenPicker(props: AlephiumTokenPickerProps) {
 
   const getAddress: (address: string, tokenId?: string) => Promise<ParsedTokenAccount> = useCallback(
     async (address: string, tokenId?: string) => {
-      if (isReady && alphWallet) {
+      if (isReady && alphWallet.connectionStatus === 'connected') {
         try {
           const contractId = tryGetContractId(address)
           const tokenInfo = await getLocalTokenInfo(web3.getCurrentNodeProvider(), contractId)

diff --git a/bridge_ui/src/components/Transactions/index.tsx b/bridge_ui/src/components/Transactions/index.tsx
@@ -210,7 +210,9 @@ export default function Transactions() {
 
   const blockNumberFetcherGetter = useCallback((chainId: ChainId) => {
     if (chainId === CHAIN_ID_ALEPHIUM) {
-      return alphWallet === undefined ? undefined : () => alphBlockNumberFetcher(alphWallet.nodeProvider, alphWallet.account.group)
+      return alphWallet.connectionStatus !== 'connected'
+        ? undefined
+        : () => alphBlockNumberFetcher(alphWallet.nodeProvider, alphWallet.account.group)
     }
     if (bothAreEvmChain) {
       if (chainId === txSourceChain && sourceChainReady) {
@@ -230,7 +232,7 @@ export default function Transactions() {
   const targetChainBlockNumber = useBlockNumber(blockNumberFetcherGetter, txTargetChain)
 
   const getIsTxsCompleted = useCallback(async (txs: BridgeTransaction[]) => {
-    if (txTargetChain === CHAIN_ID_ALEPHIUM && alphWallet) {
+    if (txTargetChain === CHAIN_ID_ALEPHIUM && alphWallet.connectionStatus === 'connected') {
       const tokenBridgeForChainId = getTokenBridgeForChainId(ALEPHIUM_TOKEN_BRIDGE_CONTRACT_ID, txSourceChain, alphWallet.account.group)
       return await getIsTxsCompletedAlph(tokenBridgeForChainId, txs.map((t) => BigInt(t.sequence)))
     }

diff --git a/bridge_ui/src/components/Transfer/AddToAlephium.tsx b/bridge_ui/src/components/Transfer/AddToAlephium.tsx
@@ -57,7 +57,7 @@ export default function AddToAlephium() {
       })(alphWallet.nodeProvider)
     }
   }, [alphWallet, targetAsset, enqueueSnackbar])
-  return alphWallet !== undefined && isExtensionWallet(alphWallet.signer) ? (
+  return alphWallet.connectionStatus === 'connected' && isExtensionWallet(alphWallet.signer) ? (
     <Button
       onClick={handleClick}
       size="small"

diff --git a/bridge_ui/src/hooks/useGetIsTransferCompleted.ts b/bridge_ui/src/hooks/useGetIsTransferCompleted.ts
@@ -151,7 +151,7 @@ export default function useGetIsTransferCompleted(
             setIsLoading(false);
           }
         })();
-      } else if (targetChain === CHAIN_ID_ALEPHIUM && !!alphWallet) {
+      } else if (targetChain === CHAIN_ID_ALEPHIUM && alphWallet.connectionStatus === 'connected') {
         setIsLoading(true);
         (async () => {
           try {

diff --git a/bridge_ui/src/hooks/useGetTargetParsedTokenAccounts.ts b/bridge_ui/src/hooks/useGetTargetParsedTokenAccounts.ts
@@ -76,7 +76,7 @@ function useGetTargetParsedTokenAccounts() {
     }
     let cancelled = false;
 
-    if (targetChain === CHAIN_ID_ALEPHIUM && !!alphWallet) {
+    if (targetChain === CHAIN_ID_ALEPHIUM && alphWallet.connectionStatus === 'connected') {
         if (!cancelled && decimals !== undefined) {
           const balanceStr = balance?.toString() || '0'
           const uiAmount = formatUnits(balanceStr, decimals)

diff --git a/bridge_ui/src/hooks/useSyncTargetAddress.ts b/bridge_ui/src/hooks/useSyncTargetAddress.ts
@@ -114,7 +114,7 @@ function useSyncTargetAddress(shouldFire: boolean, nft?: boolean) {
             )
           )
         );
-      } else if(targetChain === CHAIN_ID_ALEPHIUM && alphWallet) {
+      } else if(targetChain === CHAIN_ID_ALEPHIUM && alphWallet.connectionStatus === 'connected') {
         dispatch(setTargetAddressHex(uint8ArrayToHex(base58.decode(alphWallet.account.address))))
       } else if (targetChain === CHAIN_ID_ALGORAND && algoAccounts[0]) {
         dispatch(