fix(rpc): use updated @agoric/rpc to avoid /custom vstorage route (0.50 sdk upgrade)

Author: Muneeb147

package.json

@@ -23,7 +23,7 @@
     "@agoric/cosmic-proto": "^0.5.0-u20.0",
     "@agoric/ertp": "^0.16.2",
     "@agoric/notifier": "^0.6.2",
-    "@agoric/rpc": "^0.0.2-dev-2c6fbc5.0",
+    "@agoric/rpc": "0.10.0",
     "@agoric/smart-wallet": "^0.5.3",
     "@agoric/ui-components": "~0.3.8",
     "@agoric/wallet-backend": "^0.14.3",

src/components/ProposeParamChange.tsx

@@ -121,7 +121,7 @@ export default function ProposeParamChange(props: Props) {
         transition={{ type: 'tween' }}
       >
         <form onSubmit={handleSubmit}>
-          {Object.entries(data.current).map(([name, value]) => (
+          {Object.entries(data.current || {}).map(([name, value]) => (
             <div className="mb-2" key={name}>
               <label className="block">
                 <span className="text-gray-700">{paramLabel(name)}</span>

src/config.ts

@@ -45,6 +45,9 @@ export const networkConfigUrl = (agoricNetName: string) => {
 export const rpcUrl = agoricNetSubdomain =>
   `https://${agoricNetSubdomain}.rpc.agoric.net:443`;
 
+export const apiUrl = agoricNetSubdomain =>
+  `https://${agoricNetSubdomain}.api.agoric.net:443`;
+
 /**
  * Look up an archiving version of the host, if available.
  */

src/lib/rpc.ts

@@ -10,7 +10,7 @@ import {
   makeLeader,
 } from '@agoric/casting';
 import { makeImportContext } from './makeImportContext';
-import { archivingAlternative, networkConfigUrl, rpcUrl } from 'config';
+import { archivingAlternative, networkConfigUrl, rpcUrl, apiUrl } from 'config';
 import {
   AgoricChainStoragePathKind,
   makeAgoricChainStorageWatcher,
@@ -31,7 +31,11 @@ export const marshal = makeImportContext().fromBoard;
 const fromAgoricNet = (str: string): Promise<MinimalNetworkConfig> => {
   const [netName, chainName] = str.split(',');
   if (chainName) {
-    return Promise.resolve({ chainName, rpcAddrs: [rpcUrl(netName)] });
+    return Promise.resolve({
+      chainName,
+      rpcAddrs: [rpcUrl(netName)],
+      apiAddrs: [apiUrl(netName)],
+    });
   }
   return fetch(networkConfigUrl(netName)).then(res => res.json());
 };
@@ -70,7 +74,7 @@ export const makeRpcUtils = async () => {
   const netConfigURL = networkConfigUrl(agoricNet);
   const networkConfig = await fromAgoricNet(agoricNet);
 
-  const { rpcAddrs, chainName } = networkConfig;
+  const { rpcAddrs, chainName, apiAddrs } = networkConfig;
   const leader = makeLeader(archivingAlternative(chainName, rpcAddrs[0]), {});
 
   const { vstorage: vst } = makeVstorageKit({ fetch }, { chainName, rpcAddrs });
@@ -89,11 +93,19 @@ export const makeRpcUtils = async () => {
       return response.children;
     },
   };
-
+  let didError = false;
   const storageWatcher = makeAgoricChainStorageWatcher(
-    sample(rpcAddrs),
+    sample(apiAddrs),
     chainName,
-    marshal.unserialize,
+    e => {
+      if (didError) {
+        console.error(e);
+        return;
+      }
+      didError = true;
+      notifyError(new Error('Error reading vstorage data for path "' + e));
+    },
+    marshal,
   );
 
   return {
@@ -158,26 +170,12 @@ export const usePublishedDatum = (path?: string) => {
 
     const { storageWatcher } = rpcUtils;
     setStatus(LoadStatus.Waiting);
-
-    let didError = false;
     return storageWatcher.watchLatest(
       [AgoricChainStoragePathKind.Data, `published.${path}`],
       value => {
         setData(value);
         setStatus(LoadStatus.Received);
       },
-      e => {
-        if (didError) {
-          console.error(e);
-          return;
-        }
-        didError = true;
-        notifyError(
-          new Error(
-            'Error reading vstorage data for path "' + path + '": ' + e,
-          ),
-        );
-      },
     );
   }, [path, rpcUtils]);
 

src/utils/networkConfig.ts

@@ -10,6 +10,7 @@ export type MinimalNetworkConfig = {
   rpcAddrs: string[];
   chainName: string;
   notices?: NetworkNotice[];
+  apiAddrs: string[];
 };
 
 export const activeNotices = (