hotfix(website): use builder provided rpcs for registry requests

.github/workflows/commitlint-pr.yml

@@ -24,3 +24,10 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           validateSingleCommit: false
+          types: |
+            hotfix
+            feat
+            fix
+            chore
+            docs
+            test

packages/website/package.json

@@ -87,6 +87,7 @@
     "react-syntax-highlighter": "^15.5.0",
     "remark-gfm": "^3.0.1",
     "simple-url": "^1.1.8",
+    "solc": "^0.8.17",
     "styled-components": "^6.0.7",
     "viem": "^2.21.15",
     "wagmi": "^2.5.13",

packages/website/src/features/Deploy/PublishUtility.tsx

@@ -28,7 +28,7 @@ import {
 import { useMutation } from '@tanstack/react-query';
 import {
   CannonStorage,
-  DEFAULT_REGISTRY_ADDRESS,
+  DEFAULT_REGISTRY_CONFIG,
   FallbackRegistry,
   InMemoryRegistry,
   OnChainRegistry,
@@ -81,7 +81,7 @@ export default function PublishUtility(props: {
       viem.isAddressEqual(publisher, wc.data?.account.address)
   );
 
-  const { transports, getExplorerUrl } = useCannonChains();
+  const { getChainById, transports, getExplorerUrl } = useCannonChains();
 
   const prepareAndPublishPackage = async (publishChainId: number) => {
     if (!wc.data) {
@@ -90,25 +90,23 @@ export default function PublishUtility(props: {
 
     const [walletAddress] = await wc.data.getAddresses();
 
-    const targetRegistry = new FallbackRegistry(
-      [
-        new OnChainRegistry({
-          signer: { address: walletAddress, wallet: wc.data as any },
-          address: DEFAULT_REGISTRY_ADDRESS,
-          provider: viem.createPublicClient({
-            chain: optimism,
-            transport: transports[optimism.id] || viem.http(),
-          }) as any, // TODO: fix type
-        }),
-        new OnChainRegistry({
-          signer: { address: walletAddress, wallet: wc.data as any },
-          address: DEFAULT_REGISTRY_ADDRESS,
-          provider: viem.createPublicClient({
-            chain: mainnet,
-            transport: transports[mainnet.id] || viem.http(),
-          }) as any, // TODO: fix type
+    const onChainRegistries = DEFAULT_REGISTRY_CONFIG.map((config) => {
+      const rpcUrl = config.rpcUrl.find(
+        (url) => url.startsWith('https://') || url.startsWith('wss://')
+      );
+
+      return new OnChainRegistry({
+        signer: { address: walletAddress, wallet: wc.data as any },
+        address: config.address,
+        provider: viem.createPublicClient({
+          chain: getChainById(config.chainId),
+          transport: transports[config.chainId] || viem.http(rpcUrl),
         }),
-      ],
+      });
+    });
+
+    const targetRegistry = new FallbackRegistry(
+      onChainRegistries,
       publishChainId === 10 ? 0 : 1
     );
 

packages/website/src/hooks/registry.ts

@@ -1,5 +1,5 @@
 import { useCannonChains } from '@/providers/CannonProvidersProvider';
-import { DEFAULT_REGISTRY_ADDRESS, DEFAULT_REGISTRY_CONFIG, OnChainRegistry } from '@usecannon/builder';
+import { DEFAULT_REGISTRY_CONFIG, OnChainRegistry } from '@usecannon/builder';
 import { useEffect, useState } from 'react';
 import * as viem from 'viem';
 
@@ -11,18 +11,20 @@ type Publishers = {
 
 export function useCannonPackagePublishers(packageName?: string) {
   const [publishers, setPublishers] = useState<Publishers[]>([]);
-  const { getChainById } = useCannonChains();
+  const { getChainById, transports } = useCannonChains();
 
   useEffect(() => {
     if (!packageName) return setPublishers([]);
 
     const onChainRegistries = DEFAULT_REGISTRY_CONFIG.map((config) => {
+      const rpcUrl = config.rpcUrl.find((url) => url.startsWith('https://') || url.startsWith('wss://'));
+
       return new OnChainRegistry({
-        address: DEFAULT_REGISTRY_ADDRESS,
+        address: config.address,
         provider: viem.createPublicClient({
           chain: getChainById(config.chainId),
-          transport: viem.http(),
-        }) as any, // TODO: fix type
+          transport: transports[config.chainId] || viem.http(rpcUrl),
+        }),
       });
     });
 

packages/website/src/providers/CannonRegistryProvider.tsx

@@ -3,7 +3,6 @@
 import { inMemoryRegistry } from '@/helpers/cannon';
 import { useCannonChains } from '@/providers/CannonProvidersProvider';
 import {
-  DEFAULT_REGISTRY_ADDRESS,
   DEFAULT_REGISTRY_CONFIG,
   FallbackRegistry,
   OnChainRegistry,
@@ -21,16 +20,17 @@ type Props = {
 };
 export const CannonRegistryProvider: React.FC<Props> = ({ children }) => {
   const { getChainById, transports } = useCannonChains();
-  const onChainRegistries = DEFAULT_REGISTRY_CONFIG.map(
-    (registry) => registry.chainId
-  ).map((chainId: number) => {
-    const chain = getChainById(chainId);
+
+  const onChainRegistries = DEFAULT_REGISTRY_CONFIG.map((config) => {
+    const rpcUrl = config.rpcUrl.find(
+      (url) => url.startsWith('https://') || url.startsWith('wss://')
+    );
 
     return new OnChainRegistry({
-      address: DEFAULT_REGISTRY_ADDRESS,
+      address: config.address,
       provider: createPublicClient({
-        chain,
-        transport: transports[chainId] || http(),
+        chain: getChainById(config.chainId),
+        transport: transports[config.chainId] || http(rpcUrl),
       }),
     });
   });