Merge remote-tracking branch 'origin/main' into dev

usecannon · Feb 6, 2025 · 9bfbe74 · 9bfbe74
2 parents 1618aa2 + f3eb629
commit 9bfbe74
Show file tree

Hide file tree

Showing 9 changed files with 748 additions and 346 deletions.
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -34,7 +34,7 @@
     "helmet": "^7.1.0",
     "prom-client": "^15.1.2",
     "redis": "^4.6.13",
-    "viem": "^2.21.15"
+    "viem": "^2.22.22"
   },
   "devDependencies": {
     "@types/cors": "^2.8.17",

diff --git a/packages/builder/package.json b/packages/builder/package.json
@@ -64,7 +64,7 @@
     "rfdc": "^1.4.1",
     "ses": "^1.10.0",
     "typestub-ipfs-only-hash": "^4.0.0",
-    "viem": "^2.21.15",
+    "viem": "^2.22.22",
     "zod": "^3.23.6"
   },
   "engines": {

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -80,7 +80,7 @@
     "table": "^6.8.2",
     "tildify": "3.0.0",
     "untildify": "^4.0.0",
-    "viem": "^2.21.15",
+    "viem": "^2.22.22",
     "znv": "^0.4.0",
     "zod": "^3.23.8"
   },

diff --git a/packages/hardhat-cannon/package.json b/packages/hardhat-cannon/package.json
@@ -53,7 +53,7 @@
     "chalk": "^4.1.2",
     "debug": "^4.3.6",
     "fs-extra": "^11.2.0",
-    "viem": "^2.21.15"
+    "viem": "^2.22.22"
   },
   "gitHead": "81979336c4cfe5f1f8ee7677b2b968f886a20a87"
 }
diff --git a/packages/indexer/package.json b/packages/indexer/package.json
@@ -26,7 +26,7 @@
     "envalid": "^8.0.0",
     "lodash": "^4.17.21",
     "redis": "^4.6.13",
-    "viem": "^2.21.15"
+    "viem": "^2.22.22"
   },
   "devDependencies": {
     "@types/connect-busboy": "^1.0.3",

diff --git a/packages/registry/package.json b/packages/registry/package.json
@@ -41,6 +41,6 @@
     "ts-node": "10.8.1",
     "typechain": "8.1.0",
     "typescript": "^5.3.3",
-    "viem": "^2.21.15"
+    "viem": "^2.22.22"
   }
 }
diff --git a/packages/website/package.json b/packages/website/package.json
@@ -124,7 +124,7 @@
     "tailwindcss-animate": "^1.0.7",
     "usehooks-ts": "^3.1.0",
     "vaul": "^1.1.2",
-    "viem": "^2.21.15",
+    "viem": "^2.22.22",
     "vitest": "^2.1.8",
     "wagmi": "^2.5.13",
     "zod": "^3.23.8",

diff --git a/packages/website/src/providers/CannonProvidersProvider.tsx b/packages/website/src/providers/CannonProvidersProvider.tsx
@@ -157,18 +157,21 @@ export const chainMetadata = {
   [chains.celo.id]: {
     color: '#fdff52',
   },
+  [chains.berachain.id]: {
+    color: '#814625',
+  },
 } as const;
 
-export const supportedChains = [cannonNetwork, ...Object.values(chains)].map(
-  (c) => {
-    if (!customDefaultRpcs[`${c.id}`]) return c;
+export const supportedChains = (
+  [cannonNetwork, ...Object.values(chains)] as viem.Chain[]
+).map((c) => {
+  if (!customDefaultRpcs[`${c.id}`]) return c;
 
-    return {
-      ...c,
-      rpcUrls: merge({}, c.rpcUrls, customDefaultRpcs[`${c.id}`]),
-    };
-  }
-);
+  return {
+    ...c,
+    rpcUrls: merge({}, c.rpcUrls, customDefaultRpcs[`${c.id}`]),
+  };
+});
 
 export const defaultTransports = supportedChains.reduce((transports, chain) => {
   transports[chain.id] = viem.http();

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml