bring main up to date

.github/workflows/ci.yml

@@ -1,9 +1,3 @@
-#
-# ci.yml
-#
-# Run tests for all pushed commits and opened pull requests on Github.
-#
-
 name: CI
 on: [push, pull_request]
 jobs:
@@ -19,7 +13,10 @@ jobs:
         uses: actions/checkout@v2
       - name: NPM ci, build, & test
         run: |
+          git submodule update --init --recursive
           npm ci
+          npm run build-snarkyjs
+          npm run build-proof_aggregator
           npm run build --if-present
           npm run integration
         env:

.gitignore

@@ -2,7 +2,7 @@
 node_modules
 build
 coverage
-
+dist
 # Editor
 .vscode
 

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "src/proof_aggregator"]
+	path = src/proof_aggregator
+	url = https://github.com/Trivo25/proof_aggregator
+[submodule "src/snarkyjs"]
+	path = src/snarkyjs
+	url = https://github.com/o1-labs/snarkyjs

README.md

@@ -27,6 +27,8 @@ zkFusion is a **zkRollup framework** for zkApps on Mina Protocol.
 zkFusion is a modular zkRollup for Mina Protocol.
 The goal is the provide an easy to use framework for developers to kickstart their application - without having to worry about sequencing, throughput or scalability!
 
+`git submodule update --recursive`
+
 ## Contact
 
 Twitter: @zktrivo

codegen.yml

@@ -0,0 +1,8 @@
+schema: './src/rollup_operator/controllers/schema.graphql'
+generates:
+  ./src/rollup_operator/controllers/generated/graphql_types.ts:
+    plugins:
+      - 'typescript'
+      - 'typescript-resolvers'
+    config:
+      useIndexSignature: true