Merge branch 'develop' into test/sync-test-error

tokamak-network · Feb 13, 2025 · 304bfb9 · 304bfb9
2 parents e0bea87 + 135e558
commit 304bfb9
Show file tree

Hide file tree

Showing 33 changed files with 1,319 additions and 5,126 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,7 @@ tmp
 #zkey
 *.zkey
 verification_key.json
-verifier.sol
+# verifier.sol
 
 #proof
 proof.json

diff --git a/contracts/.gitignore b/contracts/.gitignore
@@ -13,4 +13,9 @@ docs/
 # Dotenv file
 .env
 
-node_modules/
+node_modules/
+
+# coverage file
+lcov.info
+
+broadcast
diff --git a/contracts/broadcast/DeployPoseidon.s.sol/deployments.json b/contracts/broadcast/DeployPoseidon.s.sol/deployments.json
diff --git a/contracts/broadcast/DeploySybil.s.sol/111551119090/run-1727929481.json b/contracts/broadcast/DeploySybil.s.sol/111551119090/run-1727929481.json
diff --git a/contracts/broadcast/DeploySybil.s.sol/111551119090/run-latest.json b/contracts/broadcast/DeploySybil.s.sol/111551119090/run-latest.json
diff --git a/contracts/broadcast/DeployVerifier.s.sol/111551119090/run-1727928795.json b/contracts/broadcast/DeployVerifier.s.sol/111551119090/run-1727928795.json
diff --git a/contracts/broadcast/DeployVerifier.s.sol/111551119090/run-latest.json b/contracts/broadcast/DeployVerifier.s.sol/111551119090/run-latest.json
diff --git a/contracts/helpers/babyjub/sybilAccount/constants.js b/contracts/helpers/babyjub/sybilAccount/constants.js
diff --git a/contracts/helpers/babyjub/sybilAccount/float40.js b/contracts/helpers/babyjub/sybilAccount/float40.js
diff --git a/contracts/helpers/babyjub/sybilAccount/sybil-account.js b/contracts/helpers/babyjub/sybilAccount/sybil-account.js