chore(repo): rebase master into dev so we can keep only one branch

privacy-scaling-explorations · Dec 11, 2023 · c97a56e · c97a56e
1 parent 783f9c8
commit c97a56e
Show file tree

Hide file tree

Showing 32 changed files with 3 additions and 3,133 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -2,7 +2,7 @@ name: Checks
 
 on:
   push:
-    branches: [master, dev]
+    branches: [dev]
   pull_request:
 
 concurrency:

diff --git a/.github/workflows/circuit-build.yml b/.github/workflows/circuit-build.yml
@@ -2,7 +2,7 @@ name: Circuit
 
 on:
   push:
-    branches: [master, dev]
+    branches: [dev]
   pull_request:
 
 concurrency:

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -32,7 +32,6 @@ jobs:
       - name: Fix typedoc links
         run: |
           npm install
-<<<<<<< HEAD
           npm run setup-typedoc
         working-directory: website
 
@@ -44,11 +43,6 @@ jobs:
       - name: Add CNAME
         run: |
           echo 'maci.pse.dev' > ./website/build/CNAME
-=======
-          npm run build
-        working-directory: website
-
->>>>>>> f9fe8a7a (feat(docs) - fix deployment workflow and ensure there are no broken links)
 
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3

diff --git a/circuits/ts/snarkjs.d.ts b/circuits/ts/snarkjs.d.ts
@@ -11,6 +11,7 @@ declare module "snarkjs" {
     pi_a: NumericString[];
     pi_b: NumericString[][];
     pi_c: NumericString[];
+    protocol: string;
     curve: string;
   }
 

diff --git a/cli/test.sh b/cli/test.sh
diff --git a/contracts/docs/DomainObjs.md b/contracts/docs/DomainObjs.md
diff --git a/contracts/docs/HasherBenchmarks.md b/contracts/docs/HasherBenchmarks.md
diff --git a/contracts/docs/IMACI.md b/contracts/docs/IMACI.md