Multiple rpcs (#54)

* update contract metadata * fetch para id * fix: hooks * show ss58 prefix * Update src/components/Modals/AddAddress/index.tsx Co-authored-by: Sergej Sakac <73715684+Szegoo@users.noreply.github.com> * mfix --------- Co-authored-by: Sergej Sakac <73715684+Szegoo@users.noreply.github.com>
TheDotflow · Aug 16, 2023 · 5a9c4a6 · 5a9c4a6
1 parent 012df3c
commit 5a9c4a6
Show file tree

Hide file tree

Showing 5 changed files with 177 additions and 143 deletions.
diff --git a/src/components/Modals/AddAddress/index.tsx b/src/components/Modals/AddAddress/index.tsx
@@ -129,6 +129,19 @@ export const AddAddressModal = ({ open, onClose }: AddAddressModalProps) => {
                   </MenuItem>
                 ))}
               </TextField>
+              {networkId !== undefined && (
+                <div>
+                  <FormHelperText
+                    sx={{
+                      width: '100%',
+                      textAlign: 'right',
+                      margin: 0,
+                    }}
+                  >
+                    <span>{`Ss58 prefix: ${networks[networkId].ss58Prefix}`}</span>
+                  </FormHelperText>
+                </div>
+              )}
             </FormControl>
             <FormControl className='form-item'>
               <FormLabel>Address</FormLabel>

diff --git a/src/contracts/addressbook/metadata.json b/src/contracts/addressbook/metadata.json
@@ -1,6 +1,6 @@
 {
   "source": {
-    "hash": "0x4ab87202c8d94c5fd2bb598ea73ce826b93351f47e0a2e9ca61f9a4c7591b129",
+    "hash": "0x8dc8d21880cc15012552148eb6551379525ee975554f1f87b61470a487333135",
     "language": "ink! 4.2.0",
     "compiler": "rustc 1.68.0-nightly",
     "build_info": {
@@ -14,7 +14,7 @@
     }
   },
   "contract": {
-    "name": "address-book",
+    "name": "address_book",
     "version": "0.1.0",
     "authors": [
       "Master Union <masteruniondoo@gmail.com>"

diff --git a/src/contracts/identity/context.tsx b/src/contracts/identity/context.tsx
@@ -64,14 +64,16 @@ const IdentityContractProvider = ({ children }: Props) => {
   const [identityNo, setIdentityNo] = useState<IdentityNo>(null);
   const [networks, setNetworks] = useState<Networks>({});
   const [addresses, setAddresses] = useState<Array<Address>>([]);
-  const [loading, setLoading] = useState(false);
+  const [loadingIdentityNo, setLoadingIdentityNo] = useState(false);
+  const [loadingNetworks, setLoadingNetworks] = useState(false);
   const { toastError } = useToast();
 
   const fetchIdentityNo = useCallback(async () => {
     if (!api || !contract || !activeAccount) {
       setIdentityNo(null);
       return;
     }
+    setLoadingIdentityNo(true);
     try {
       const result = await contractQuery(api, '', contract, 'identity_of', {}, [
         activeAccount.address,
@@ -87,6 +89,7 @@ const IdentityContractProvider = ({ children }: Props) => {
     } catch (e) {
       setIdentityNo(null);
     }
+    setLoadingIdentityNo(false);
   }, [activeAccount, api, contract]);
 
   const fetchNetworks = useCallback(async () => {
@@ -96,28 +99,36 @@ const IdentityContractProvider = ({ children }: Props) => {
     }
 
     const getChainInfo = async (
-      rpcUrl: string
+      rpcUrls: string[]
     ): Promise<NetworkConsts | null> => {
+      const count = rpcUrls.length;
+      const rpcIndex = Math.min(Math.floor(Math.random() * count), count - 1);
+      const rpc = rpcUrls[rpcIndex];
       try {
-        const provider = new WsProvider(rpcUrl);
+        const provider = new WsProvider(rpc);
         const api = new ApiPromise({ provider, rpc: jsonrpc });
 
         await api.isReady;
 
         const ss58Prefix: number =
           api.consts.system.ss58Prefix.toPrimitive() as number;
         const name = (await api.rpc.system.chain()).toString();
+        const paraId = (
+          await api.query.parachainInfo.parachainId()
+        ).toPrimitive() as number;
 
         return {
           name,
           ss58Prefix,
+          paraId,
         };
       } catch (e) {
-        toastError && toastError(`Failed to get chain info for ${rpcUrl}`);
+        toastError && toastError(`Failed to get chain info for ${rpc}`);
         return null;
       }
     };
 
+    setLoadingNetworks(true);
     try {
       const result = await contractQuery(
         api,
@@ -137,11 +148,11 @@ const IdentityContractProvider = ({ children }: Props) => {
 
       for await (const item of output) {
         const networkId = Number(item[0]);
-        const { accountType, rpcUrl } = item[1];
-        const info = await getChainInfo(rpcUrl);
+        const { accountType, rpcUrls } = item[1];
+        const info = await getChainInfo(rpcUrls);
         if (info)
           _networks[networkId] = {
-            rpcUrl,
+            rpcUrls,
             accountType,
             ...info,
           };
@@ -150,6 +161,7 @@ const IdentityContractProvider = ({ children }: Props) => {
     } catch (e: any) {
       toastError(e.toString());
     }
+    setLoadingNetworks(false);
   }, [api, contract, toastError]);
 
   const fetchAddresses = useCallback(async () => {
@@ -189,14 +201,12 @@ const IdentityContractProvider = ({ children }: Props) => {
   }, [api, contract, identityNo, fetchAddresses]);
 
   useEffect(() => {
-    const init = async () => {
-      setLoading(true);
-      await fetchIdentityNo();
-      await fetchNetworks();
-      setLoading(false);
-    };
-    init();
-  }, [fetchIdentityNo, fetchNetworks]);
+    fetchIdentityNo();
+  }, [api, contract, activeAccount]);
+
+  useEffect(() => {
+    fetchNetworks();
+  }, [api?.isReady, contract?.address]);
 
   return (
     <IdentityContext.Provider
@@ -207,7 +217,7 @@ const IdentityContractProvider = ({ children }: Props) => {
         networks,
         fetchAddresses,
         fetchIdentityNo,
-        loading,
+        loading: loadingIdentityNo || loadingNetworks,
       }}
     >
       {children}