0.1.12 Update solidity contract regex to support noir verifier

numtel · numtel · commit 698b37c2f83c · 2025-08-06T10:49:20.000-07:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "circuitscan",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "main": "cli.js",
   "type": "module",
   "author": "numtel <ben@latenightsketches.com>",
diff --git a/src/solidity.js b/src/solidity.js
@@ -199,7 +199,7 @@ export function compileContract(source) {
 }
 
 function findContractName(soliditySource, returnAll) {
-  const regex = /contract\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*(?:is\s+[a-zA-Z_][a-zA-Z0-9_,\s]*)?\s*\{/g;
+  const regex = /contract\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*(?:is\s+[a-zA-Z_][a-zA-Z0-9_]*(?:\([^)]*\))?(?:\s*,\s*[a-zA-Z_][a-zA-Z0-9_]*(?:\([^)]*\))?)*)?\s*\{/g;
   const matches = [];
 
   for (const match of soliditySource.matchAll(regex)) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "circuitscan",`
`3`		`- "version": "0.1.11",`
	`3`	`+ "version": "0.1.12",`
`4`	`4`	`"main": "cli.js",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"author": "numtel <ben@latenightsketches.com>",`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ export function compileContract(source) {`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`function findContractName(soliditySource, returnAll) {`
`202`		`- const regex = /contract\s+([a-zA-Z_][a-zA-Z0-9_])\s(?:is\s+[a-zA-Z_][a-zA-Z0-9_,\s])?\s\{/g;`
	`202`	`+ const regex = /contract\s+([a-zA-Z_][a-zA-Z0-9_])\s(?:is\s+[a-zA-Z_][a-zA-Z0-9_](?:\([^)]\))?(?:\s,\s[a-zA-Z_][a-zA-Z0-9_](?:\([^)]\))?))?\s\{/g;`
`203`	`203`	`const matches = [];`
`204`	`204`
`205`	`205`	`for (const match of soliditySource.matchAll(regex)) {`