Merge branch 'dev' into snax-chain-color

usecannon · Oct 2, 2024 · ba223fa · ba223fa
2 parents 131ce31 + b4a408a
commit ba223fa
Show file tree

Hide file tree

Showing 24 changed files with 1,042 additions and 519 deletions.
diff --git a/.github/workflows/check-branch-name.yml b/.github/workflows/check-branch-name.yml
@@ -18,15 +18,17 @@ jobs:
             switch(base) {
               case 'main':
               case 'alpha': {
-                if (!/^hotfix\/[a-z0-9-_]+$/.test(branch)) {
+                if (!/^hotfix\/[A-Za-z0-9-_\.]+$/.test(branch)) {
                   console.error(`::error::Branch name must start with 'hotfix/*' for PRs to ${base}`)
                   process.exit(1)
                 }
+                break;
               }
               case 'dev': {
-                if (!/^(feat|fix|chore|docs|test)\/[a-z0-9-_]+$/.test(branch)) {
+                if (!/^(feat|fix|chore|docs|test)\/[A-Za-z0-9-_\.]+$/.test(branch)) {
                   console.error(`::error::Branch name must start with '(feat|fix|chore|docs|test)/*' for PRs to ${base}`)
                   process.exit(1)
                 }
+                break;
               }
             }
diff --git a/.gitignore b/.gitignore
@@ -72,5 +72,5 @@ jspm_packages/
 # local env vars
 .env.local
 
-# nx
+# nx cache folder
 .nx
diff --git a/examples/sample-hardhat-toolbox/package.json b/examples/sample-hardhat-toolbox/package.json
@@ -9,6 +9,6 @@
     "@nomicfoundation/hardhat-toolbox": "^4.0.0",
     "hardhat": "^2.19.2",
     "hardhat-cannon": "workspace:*",
-    "viem": "^2.16.5"
+    "viem": "^2.21.15"
   }
 }
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -33,7 +33,7 @@
     "helmet": "^7.1.0",
     "prom-client": "^15.1.2",
     "redis": "^4.6.13",
-    "viem": "^2.16.5"
+    "viem": "^2.21.15"
   },
   "devDependencies": {
     "@types/cors": "^2.8.17",

diff --git a/packages/builder/jest.config.ts b/packages/builder/jest.config.ts
@@ -4,7 +4,7 @@
  */
 
 export default {
-  testTimeout: 15000,
+  testTimeout: 30000,
 
   // All imported modules in your tests should be mocked automatically
   // automock: false,

diff --git a/packages/builder/package.json b/packages/builder/package.json
@@ -54,7 +54,7 @@
     "pako": "^2.1.0",
     "promise-events": "^0.2.4",
     "typestub-ipfs-only-hash": "^4.0.0",
-    "viem": "^2.16.5",
+    "viem": "^2.21.15",
     "zod": "^3.23.6"
   },
   "engines": {

diff --git a/packages/builder/src/ipfs.ts b/packages/builder/src/ipfs.ts
@@ -24,6 +24,12 @@ export async function getContentCID(value: string | Buffer): Promise<string> {
   return Hash.of(value);
 }
 
+export async function getContentUrl(content?: any): Promise<string | null> {
+  if (!content) return null;
+  const buffer = compress(JSON.stringify(content));
+  return 'ipfs://' + (await getContentCID(Buffer.from(buffer)));
+}
+
 export function setAxiosRetries(totalRetries = 3) {
   axiosRetry(axios, {
     retries: totalRetries,

diff --git a/packages/builder/src/steps/clone.ts b/packages/builder/src/steps/clone.ts
@@ -18,6 +18,7 @@ import {
   PackageState,
 } from '../types';
 import { template } from '../utils/template';
+import { getContentUrl } from '../ipfs';
 
 const debug = Debug('cannon:builder:clone');
 
@@ -238,7 +239,7 @@ const cloneSpec = {
       };
     }
 
-    const newMiscUrl = await importRuntime.recordMisc();
+    const newMiscUrl = await getContentUrl(importRuntime.misc);
 
     debug(`[clone.${importLabel}]`, 'new misc:', newMiscUrl);
 
@@ -256,6 +257,12 @@ const cloneSpec = {
       chainId: runtime.chainId,
     });
 
+    const uploadedMiscUrl = await importRuntime.recordMisc();
+
+    if (newMiscUrl && newMiscUrl !== uploadedMiscUrl) {
+      throw new Error(`Misc url mismatch: ${newMiscUrl} | ${uploadedMiscUrl}`);
+    }
+
     if (!newSubDeployUrl) {
       debug(`[clone.${importLabel}]`, 'warn: cannot record built state for import nested state');
     } else {

diff --git a/packages/builder/src/steps/deploy.ts b/packages/builder/src/steps/deploy.ts
@@ -216,7 +216,8 @@ const deploySpec = {
   },
 
   getOutputs(_: Config, packageState: PackageState) {
-    return [`contracts.${packageState.currentLabel.split('.')[1]}`, `${packageState.currentLabel.split('.')[1]}`];
+    const stepName = packageState.currentLabel.split('.')[1];
+    return [`contracts.${stepName}`, stepName];
   },
 
   async exec(

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

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

diff --git a/packages/website/package.json b/packages/website/package.json
@@ -88,7 +88,7 @@
     "remark-gfm": "^3.0.1",
     "simple-url": "^1.1.8",
     "styled-components": "^6.0.7",
-    "viem": "2.16.5",
+    "viem": "^2.21.15",
     "wagmi": "^2.5.13",
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.21.4",

diff --git a/packages/website/src/components/Alert.tsx b/packages/website/src/components/Alert.tsx
@@ -9,22 +9,30 @@ import {
 
 type Props = {
   status?: 'info' | 'success' | 'error' | 'warning';
+  borderless?: boolean;
   title?: string;
-  children: ReactNode;
+  children?: ReactNode;
 } & ChakraAlertProps;
 
-export function Alert({ status = 'info', title, children, ...rest }: Props) {
+export function Alert({
+  status = 'info',
+  borderless,
+  title,
+  children,
+  ...rest
+}: Props) {
   return (
     <ChakraAlert
       status={status}
       bg="gray.800"
-      border="1px solid"
+      border={borderless ? 'none' : '1px solid'}
+      px={borderless ? '0' : '4'}
       borderColor="gray.700"
       {...rest}
     >
       <AlertIcon />
       {title && <AlertTitle>{title}</AlertTitle>}
-      <AlertDescription>{children}</AlertDescription>
+      {children && <AlertDescription>{children}</AlertDescription>}
     </ChakraAlert>
   );
 }
diff --git a/packages/website/src/features/Deploy/NoncePicker.tsx b/packages/website/src/features/Deploy/NoncePicker.tsx
@@ -12,7 +12,7 @@ export default function NoncePicker({ safe, handleChange }: Params) {
   const [isOverridingNonce, setNonceOverride] = useState(false);
   const [currentNonce, setCurrentNonce] = useState<number | null>(null);
 
-  const safeTxs = useSafeTransactions(safe);
+  const safeTxs = useSafeTransactions(safe, Number.POSITIVE_INFINITY);
 
   useEffect(() => {
     handleChange(currentNonce);