Refactor bullshit type, definition, database structure

.github/workflows/build-and-push-docker.yml

@@ -1,4 +1,4 @@
-name: 'Build & Push All Docker Images to Docker Hub with Change Detection'
+name: "Build & Push All Docker Images to Docker Hub with Change Detection"
 
 on:
   push:
@@ -16,7 +16,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0  # Fetch full commit history
+          fetch-depth: 0 # Fetch full commit history
 
       - name: Detect last two merge commits and diff
         id: changed
@@ -25,10 +25,10 @@ jobs:
           MERGE_ARRAY=($LAST_MERGE)
           LAST_MERGE_COMMIT=${MERGE_ARRAY[0]}
           PREV_MERGE_COMMIT=${MERGE_ARRAY[1]}
-          
+
           echo "Last merge commit: $LAST_MERGE_COMMIT"
           echo "Previous merge commit: $PREV_MERGE_COMMIT"
-          
+
           CHANGED_PACKAGES=$(git diff --name-only $PREV_MERGE_COMMIT $LAST_MERGE_COMMIT -- packages/ | cut -d '/' -f 1-2 | sort -u)
           CLEANED_PACKAGES=$(echo "$CHANGED_PACKAGES" | tr -d '\r' | tr '\n' ' ')
           echo "Cleaned packages: $CLEANED_PACKAGES"
@@ -46,7 +46,7 @@ jobs:
             case $PACKAGE in
               "packages/serverless") FILTERED_PACKAGES="$FILTERED_PACKAGES 1" ;;
               "packages/broker-service") FILTERED_PACKAGES="$FILTERED_PACKAGES 2" ;;
-              "packages/proof-service") FILTERED_PACKAGES="$FILTERED_PACKAGES 3" ;;
+              "packages/mina-service") FILTERED_PACKAGES="$FILTERED_PACKAGES 3" ;;
               "packages/ftp") FILTERED_PACKAGES="$FILTERED_PACKAGES 4" ;;
               "packages/compile-service ") FILTERED_PACKAGES="$FILTERED_PACKAGES 5" ;;
             esac
@@ -65,8 +65,8 @@ jobs:
     env:
       version: ${{ github.sha }}
       SERVICES: "serverless broker proof ftp compile"
-      SERVICES_BUILD:  "serverless broker-service proof-service ftp compile-service"
-      DOCKER_REPOS: "orochinetwork/zkdb-serverless orochinetwork/zkdb-broker-service orochinetwork/zkdb-proof-service orochinetwork/zkdb-ftp orochinetwork/zkdb-compile-service"
+      SERVICES_BUILD: "serverless broker-service mina-service ftp compile-service"
+      DOCKER_REPOS: "orochinetwork/zkdb-serverless orochinetwork/zkdb-broker-service orochinetwork/zkdb-mina-service orochinetwork/zkdb-ftp orochinetwork/zkdb-compile-service"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -82,12 +82,12 @@ jobs:
 
       - name: Build & Push Docker Images
         id: build
-        run: | 
+        run: |
           IFS=' ' read -r -a DOCKER_REPOS <<< "${{env.DOCKER_REPOS}}"
           IFS=' ' read -r -a SERVICES_BUILD <<< "${{env.SERVICES_BUILD}}"
           IFS=' ' read -r -a SERVICES <<< "${{env.SERVICES}}"
           CHANGED_SERVICES="${{ needs.detect-changes.outputs.filtered_packages }}"
-          
+
           for i in ${!SERVICES_BUILD[@]}; do
             SERVICE_BUILD="${SERVICES_BUILD[$i]}"
             SERVICE="${SERVICES[$i]}"
@@ -148,4 +148,4 @@ jobs:
     steps:
       - name: Cleanup
         run: |
-          rm -rf {{ secrets.GITOPS_REPO_NAME }}
+          rm -rf {{ secrets.GITOPS_REPO_NAME }}

.gitignore

@@ -116,4 +116,5 @@ circuit-cache/
 
 #private
 npm-token
-.npmrc
+.npmrc
+package-lock.json

Installation.md

@@ -48,7 +48,7 @@ cd general/database/script
 chmod +x start.sh
 ./start.sh
 cd ..
-docker compose up -d 
+docker compose up -d
 ```
 
 You can modify the environment variables in the `docker-compose.yml` file based on your requirements. If you keep the default settings, your MongoDB URL will be:
@@ -61,7 +61,7 @@ MONGODB_URL="mongodb://admin:password@mongo:27017/?directConnection=true"
 
 ### Proof-Service Setup
 
-To start `proof-service`, you need to run `broker-service` first. Then, set the `BROKER_URL` in the `.env` file of `proof-service` to:
+To start `mina-service`, you need to run `broker-service` first. Then, set the `BROKER_URL` in the `.env` file of `mina-service` to:
 
 ```bash
 BROKER_URL="http://broker-service-app-1:4001/graphql"
@@ -100,7 +100,7 @@ To build Docker images for all services:
 make build
 ```
 
-This command will build the following services: `ftp`, `proof-service`, `broker-service`, and `serverless`.
+This command will build the following services: `ftp`, `mina-service`, `broker-service`, and `serverless`.
 
 To build a specific service, such as `ftp`, use:
 
@@ -122,7 +122,7 @@ To run a specific service, such as `ftp`:
 make up-ftp
 ```
 
-To run multiple specific services, such as `ftp` and `proof-service`:
+To run multiple specific services, such as `ftp` and `mina-service`:
 
 ```bash
 make up-ftp up-proof
@@ -140,8 +140,8 @@ make down
 
 ### 9.2 Stop Specific Services
 
-To stop specific services, such as `ftp` and `proof-service`:
+To stop specific services, such as `ftp` and `mina-service`:
 
 ```bash
 make stop-ftp stop-proof
-```
+```

Makefile

@@ -1,17 +1,17 @@
 # Define variables for Docker image tags and paths
 BROKER_SERVICE_TAG = broker-service
-PROOF_SERVICE_TAG = proof-service
+PROOF_SERVICE_TAG = mina-service
 FTP_SERVICE_TAG = ftp-service
 SERVERLESS_TAG = serverless
 PLATFORM_TAG = linux/amd64 # You can choose between linux/amd64 for x86_64 and linux/arm64 for arm64
 
 BROKER_SERVICE_DOCKERFILE = packages/broker-service/Dockerfile
-PROOF_SERVICE_DOCKERFILE = packages/proof-service/Dockerfile
+PROOF_SERVICE_DOCKERFILE = packages/mina-service/Dockerfile
 FTP_SERVICE_DOCKERFILE = packages/ftp/Dockerfile
 SERVERLESS_DOCKERFILE = packages/serverless/Dockerfile
 
 BROKER_SERVICE_COMPOSE = packages/broker-service/docker-compose.yml
-PROOF_SERVICE_COMPOSE = packages/proof-service/docker-compose.yml
+PROOF_SERVICE_COMPOSE = packages/mina-service/docker-compose.yml
 FTP_COMPOSE = packages/ftp/docker-compose.yml
 SERVERLESS_COMPOSE = packages/serverless/docker-compose.yml
 MONGO_COMPOSE = general/database/docker-compose.yml

NOTICE

@@ -1,3 +1,2 @@
 zkDatabase
-
 Copyright © 2023 Orochi Network

devel.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+ROOT_DIR=`pwd`
+find `pwd` -name "node_modules" -exec rm -rf {} \;
+rm -rf yarn.lock
+yarn
+cd $ROOT_DIR/packages/permission && yarn build
+cd $ROOT_DIR/packages/common && yarn build
+cd $ROOT_DIR/packages/storage && yarn build
+cd $ROOT_DIR/packages/serverless && yarn build
+cd $ROOT_DIR/packages/api && yarn build
+cd $ROOT_DIR/packages/zkdb && yarn build

packages/serverless/eslint.config.js → eslint.config.js

@@ -14,6 +14,7 @@ import gitignore from 'eslint-config-flat-gitignore';
  * config. We envision this as a necessary transitional step to allow the
  * ecosystem to slowly convert over to flat config.
  * https://eslint.org/blog/2022/08/new-config-system-part-2 */
+
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const compat = new FlatCompat({

examples/yarn.lock

@@ -1560,10 +1560,10 @@
   dependencies:
     tslib "^2.3.0"
 
-"@zkdb/api@1.1.13":
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/@zkdb/api/-/api-1.1.13.tgz#901d9cf05135273d8bb95da8a058189041cb33b5"
-  integrity sha512-pdPRsmaK9fec1M9wVsIjMA21ys4vyVG2LauxrWHy08m3Zdz9s74w0lYFKNzhhkFg7C+627z0Zcdb+adqC+542A==
+"@zkdb/api@^1.1.14":
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/@zkdb/api/-/api-1.1.14.tgz#83d485a7ad294c5596b5c6044688a0fa85c9a960"
+  integrity sha512-TB/LfMbntkwqORihxQm0AfGiWoRArJHpRkIBVUrghHl34XPNJ00jJc/DzFeM3n7JZJ7ZekfL8tICxJB9z1Q4Vg==
   dependencies:
     "@apollo/client" "^3.10.6"
     "@types/node" "^22.6.1"
@@ -4538,12 +4538,12 @@ zen-observable@0.8.15:
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15"
   integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==
 
-zkdb@^1.2.11:
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/zkdb/-/zkdb-1.2.11.tgz#dcde196aa2848815ed1c3c797fa45c297e0c540a"
-  integrity sha512-do+2//WD+xW2VOcPdiRaeO5cfnZcItB0UNfLCCQzHu52IfB/oH+xpnFer2f4aodxvKLdYzuPtzA52mjUro0bPw==
+zkdb@^1.2.12:
+  version "1.2.12"
+  resolved "https://registry.yarnpkg.com/zkdb/-/zkdb-1.2.12.tgz#54ca72c6b6e8e0c96a6d8037846fbd8c5aadea7c"
+  integrity sha512-zG9CAQDeAo1Xk6Ov09ThHvWEgqyTAvI7jTVR2KDcadY9ZcojuKDjbtxdMSwu2g25PkByUJo66jnovuJ6Ch38xQ==
   dependencies:
-    "@zkdb/api" "1.1.13"
+    "@zkdb/api" "^1.1.14"
     "@zkdb/smart-contract" "1.1.7"
     graphql "16.9.0"
     graphql-request "7.1.2"

package.json

@@ -1,11 +1,13 @@
 {
   "name": "zkdb-monorepo",
   "private": true,
+  "type": "module",
   "workspaces": [
+    "packages/common",
     "packages/storage",
     "packages/smart-contract",
     "packages/kubo",
-    "packages/proof-service",
+    "packages/mina-service",
     "packages/api",
     "packages/permission",
     "packages/zkdb",
@@ -22,9 +24,42 @@
   },
   "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610",
   "devDependencies": {
-    "spectaql": "^3.0.2"
+    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-typescript": "^7.26.0",
+    "@rollup/plugin-alias": "^5.1.1",
+    "@rollup/plugin-commonjs": "^28.0.2",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.0",
+    "@rollup/plugin-typescript": "^12.1.2",
+    "@types/cors": "^2.8.17",
+    "@types/express-fileupload": "1.5.1",
+    "@types/express-session": "1.18.0",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^22.10.2",
+    "@typescript-eslint/eslint-plugin": "^8.18.1",
+    "@typescript-eslint/parser": "^8.18.1",
+    "babel-jest": "^29.7.0",
+    "eslint": "^9.17.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-import-resolver-typescript": "^3.7.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-jest": "^28.9.0",
+    "eslint-plugin-require-extensions": "^0.1.3",
+    "graphql-request": "^7.1.2",
+    "jest": "^29.7.0",
+    "prettier": "^3.4.2",
+    "rollup": "^4.28.1",
+    "spectaql": "^3.0.2",
+    "ts-jest": "^29.2.5",
+    "typedoc": "^0.27.5",
+    "typescript": "^5.7.2"
   },
   "dependencies": {
-    "o1js": "1.9.*"
+    "bullmq": "5.34.3",
+    "graphql": "16.10.0",
+    "graphql-type-json": "0.3.2",
+    "joi": "17.13.3",
+    "mongodb": "6.12.0",
+    "o1js": "1.9.1"
   }
 }

packages/api/package.json

@@ -19,17 +19,9 @@
   "description": "",
   "dependencies": {
     "@apollo/client": "^3.10.6",
-    "@types/node": "^22.6.1",
-    "graphql": "^16.9.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "typescript": "^5.6.2"
+    "@zkdb/common": "^0.1.1"
   },
-  "devDependencies": {
-    "@rollup/plugin-alias": "^5.1.1",
-    "@rollup/plugin-commonjs": "^28.0.0",
-    "@rollup/plugin-node-resolve": "^15.3.0",
-    "@rollup/plugin-typescript": "^12.1.0",
-    "rollup": "^4.22.4"
+  "peerDependencies": {
+    "graphql": "^16.10.0"
   }
 }

packages/api/src/graphql/client.ts

@@ -14,6 +14,7 @@ import { document } from "./document";
 import { environment } from "./environment";
 import { group } from "./group";
 import { merkle } from "./merkle";
+import { metadata } from "./metadata";
 import { ownership } from "./ownership";
 import { permission } from "./permission";
 import { proof } from "./proof";
@@ -36,6 +37,7 @@ export interface IApiClient<T = any> {
   transaction: ReturnType<typeof transaction>;
   rollup: ReturnType<typeof rollup>;
   environment: ReturnType<typeof environment>;
+  metadata: ReturnType<typeof metadata>;
 }
 
 export class ApiClient<T = any> {
@@ -123,6 +125,7 @@ export class ApiClient<T = any> {
       transaction: transaction(api.apollo),
       rollup: rollup(api.apollo),
       environment: environment(api.apollo),
+      metadata: metadata(api.#client),
     };
   }
 }

packages/api/src/graphql/collection-index.ts

@@ -1,10 +1,16 @@
 import { gql } from "@apollo/client";
+import {
+  TIndexCreateRequest,
+  TIndexDropRequest,
+  TIndexExistRequest,
+  TIndexListRequest,
+  TIndexListResponse,
+} from "@zkdb/common";
 import {
   createMutateFunction,
   createQueryFunction,
   TApolloClient,
 } from "./common";
-import { TCollectionIndex } from "./types/collection-index";
 
 const COLLECTION_INDEX_CREATE = gql`
   mutation IndexCreate(
@@ -57,26 +63,22 @@ const COLLECTION_INDEX_LIST = gql`
 export const collectionIndex = <T>(client: TApolloClient<T>) => ({
   create: createMutateFunction<
     boolean,
-    {
-      databaseName: string;
-      collectionName: string;
-      index: TCollectionIndex[];
-    },
+    TIndexCreateRequest,
     { indexCreate: boolean }
   >(client, COLLECTION_INDEX_CREATE, (data) => data.indexCreate),
-  delete: createMutateFunction<
+  drop: createMutateFunction<
     boolean,
-    { databaseName: string; collectionName: string; indexName: string },
+    TIndexDropRequest,
     { indexDrop: boolean }
   >(client, COLLECTION_INDEX_DELETE, (data) => data.indexDrop),
   exist: createQueryFunction<
     boolean,
-    { databaseName: string; collectionName: string; indexName: string },
+    TIndexExistRequest,
     { indexExist: boolean }
   >(client, COLLECTION_INDEX_EXIST, (data) => data.indexExist),
   list: createQueryFunction<
     string[],
-    { databaseName: string; collectionName: string },
-    { indexList: string[] }
+    TIndexListRequest,
+    { indexList: TIndexListResponse }
   >(client, COLLECTION_INDEX_LIST, (data) => data.indexList),
 });