Skip to content

Commit

Permalink
Merge branch 'dev' into refactor/mp-tally-subsidy
Browse files Browse the repository at this point in the history
  • Loading branch information
kittybest committed Jan 11, 2024
2 parents 3531840 + d6a748f commit 2a503cd
Show file tree
Hide file tree
Showing 24 changed files with 34,506 additions and 9,779 deletions.
6,966 changes: 5,727 additions & 1,239 deletions circuits/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion circuits/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"devDependencies": {
"@types/chai": "^4.3.11",
"@types/mocha": "^10.0.6",
"@types/node": "^20.10.8",
"@types/node": "^20.11.0",
"chai": "^4.3.10",
"circom_tester": "^0.0.20",
"mocha": "^10.2.0",
Expand Down
3,958 changes: 3,798 additions & 160 deletions cli/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"devDependencies": {
"@types/chai": "^4.3.9",
"@types/mocha": "^10.0.6",
"@types/node": "^20.10.8",
"@types/node": "^20.11.0",
"@types/prompt": "^1.1.8",
"chai": "^4.3.10",
"mocha": "^10.2.0",
Expand Down
10,614 changes: 7,118 additions & 3,496 deletions contracts/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@types/chai": "^4.3.11",
"@types/circomlibjs": "^0.1.6",
"@types/mocha": "^10.0.6",
"@types/node": "^20.10.8",
"@types/node": "^20.11.0",
"@types/snarkjs": "^0.7.7",
"chai": "^4.3.10",
"hardhat-artifactor": "^0.2.0",
Expand Down
Loading

0 comments on commit 2a503cd

Please sign in to comment.