Feature/zkdb transaction

packages/api/src/graphql/client.ts

@@ -6,7 +6,7 @@ import {
 } from "@apollo/client";
 import { setContext } from "@apollo/client/link/context/index.js";
 import { removeTypenameFromVariables } from "@apollo/client/link/remove-typename/index.js";
-import { Context } from "@authentication";
+import { Context } from "../authentication";
 import { collection } from "./collection";
 import { collectionIndex } from "./collection-index";
 import { database } from "./database";

packages/api/src/graphql/database.ts

@@ -11,6 +11,7 @@ import {
   TPagination,
   TPaginationResponse,
 } from "./types";
+import { TDbTransaction } from "./types/transaction.js";
 
 const DATABASE_CHANGE_OWNER = gql`
   mutation DbChangeOwner($databaseName: String!, $newOwner: String!) {
@@ -20,7 +21,15 @@ const DATABASE_CHANGE_OWNER = gql`
 
 const DATABASE_CREATE = gql`
   mutation DbCreate($databaseName: String!, $merkleHeight: Int!) {
-    dbCreate(databaseName: $databaseName, merkleHeight: $merkleHeight)
+    dbCreate(databaseName: $databaseName, merkleHeight: $merkleHeight) {
+      databaseName
+      transactionType
+      status
+      id
+      tx
+      zkAppPublicKey
+      error
+    }
   }
 `;
 
@@ -102,9 +111,9 @@ export const database = <T>(client: TApolloClient<T>) => ({
     { dbChangeOwner: boolean }
   >(client, DATABASE_CHANGE_OWNER, (data) => data.dbChangeOwner),
   create: createMutateFunction<
-    boolean,
+    TDbTransaction,
     { databaseName: string; merkleHeight: number },
-    { dbCreate: boolean }
+    { dbCreate: TDbTransaction }
   >(client, DATABASE_CREATE, (data) => data.dbCreate),
   setting: createQueryFunction<
     TDatabaseSettings,

packages/api/src/graphql/rollup.ts

@@ -4,10 +4,19 @@ import {
   TCreateRollUpRequest,
   TGetRollUpHistoryResponse,
 } from "./types/rollup.js";
+import { TDbTransaction } from "./types/transaction.js";
 
 const ROLLUP_CREATE = gql`
   mutation CreateRollUp($databaseName: String!) {
-    createRollUp(databaseName: $databaseName)
+    createRollUp(databaseName: $databaseName) {
+      databaseName
+      transactionType
+      status
+      id
+      tx
+      zkAppPublicKey
+      error
+    }
   }
 `;
 
@@ -31,9 +40,9 @@ const ROLLUP_HISTORY_GET = gql`
 `;
 export const rollup = <T>(client: TApolloClient<T>) => ({
   createRollUp: createMutateFunction<
-    boolean,
+    TDbTransaction,
     TCreateRollUpRequest,
-    { createRollUp: boolean }
+    { createRollUp: TDbTransaction }
   >(client, ROLLUP_CREATE, (data) => data.createRollUp),
   getRollUpHistory: createMutateFunction<
     TGetRollUpHistoryResponse,

packages/api/src/graphql/transaction.ts

@@ -6,6 +6,7 @@ import {
 } from "./common.js";
 import {
   TDbTransaction,
+  TTransactionByIdRequest,
   TTransactionConfirmRequest,
   TTransactionRequest,
 } from "./types/transaction.js";
@@ -25,6 +26,25 @@ const TRANSACTION_GET = gql`
       id
       tx
       zkAppPublicKey
+      error
+    }
+  }
+`;
+
+const TRANSACTION_BY_ID_GET = gql`
+  query GetTransactionById(
+    $id: String!
+  ) {
+    getTransactionById(
+      id: $id
+    ) {
+      databaseName
+      transactionType
+      status
+      id
+      tx
+      zkAppPublicKey
+      error
     }
   }
 `;
@@ -49,6 +69,11 @@ export const transaction = <T>(client: TApolloClient<T>) => ({
     TTransactionRequest,
     { getTransaction: TDbTransaction }
   >(client, TRANSACTION_GET, (data) => data.getTransaction),
+  getTransactionById: createQueryFunction<
+    TDbTransaction,
+    TTransactionByIdRequest,
+    { getTransactionById: TDbTransaction }
+  >(client, TRANSACTION_BY_ID_GET, (data) => data.getTransactionById),
   confirmTransaction: createMutateFunction<
     boolean,
     TTransactionConfirmRequest,

packages/api/src/graphql/types/transaction.ts

@@ -3,6 +3,11 @@ export type TTransactionRequest = {
   transactionType: "deploy" | "rollup";
 };
 
+export type TTransactionByIdRequest = {
+  id: string;
+};
+
+
 export type TTransactionConfirmRequest = {
   databaseName: string;
   confirmTransactionId: string;
@@ -23,4 +28,5 @@ export type TDbTransaction = {
   transactionType: TTransactionType;
   tx: string;
   zkAppPublicKey: string;
+  error: string;
 };

packages/serverless/src/apollo/app/database.ts

@@ -1,4 +1,9 @@
-import { DB, ModelDatabase, ModelDbSetting } from '@zkdb/storage';
+import {
+  DB,
+  ModelDatabase,
+  ModelDbSetting,
+  withTransaction,
+} from '@zkdb/storage';
 import GraphQLJSON from 'graphql-type-json';
 import Joi from 'joi';
 import {
@@ -107,7 +112,7 @@ extend type Query {
 }
 
 extend type Mutation {
-  dbCreate(databaseName: String!, merkleHeight: Int!): Boolean
+  dbCreate(databaseName: String!, merkleHeight: Int!): DbTransaction
   dbChangeOwner(databaseName: String!, newOwner: String!): Boolean
   dbDeployedUpdate(databaseName: String!, appPublicKey: String!): Boolean
   #dbDrop(databaseName: String!): Boolean
@@ -175,7 +180,14 @@ const dbDeployedUpdate = authorizeWrapper(
 const dbCreate = authorizeWrapper(
   DatabaseCreateRequest,
   async (_root: unknown, args: TDatabaseCreateRequest, ctx) =>
-    createDatabase(args.databaseName, args.merkleHeight, ctx.userName)
+    withTransaction((session) =>
+      createDatabase(
+        args.databaseName,
+        args.merkleHeight,
+        ctx.userName,
+        session
+      )
+    )
 );
 
 const dbChangeOwner = authorizeWrapper(

packages/serverless/src/apollo/app/rollup.ts

@@ -38,7 +38,7 @@ type RollUpHistory {
 
 extend type Mutation {
   getRollUpHistory(databaseName: String!): RollUpHistory!
-  createRollUp(databaseName: String!): Boolean
+  createRollUp(databaseName: String!): DbTransaction
 }
 `;
 

packages/serverless/src/apollo/app/transaction.ts

@@ -6,30 +6,19 @@ import {
   enqueueTransaction as enqueueTransactionDomain,
   getTransactionForSigning,
   confirmTransaction as confirmTransactionDomain,
+  getTransactionById as getTransactionByIdDomain
 } from '../../domain/use-case/transaction.js';
 import GraphQLJSON from 'graphql-type-json';
+import { ModelDbTransaction, withTransaction } from '@zkdb/storage';
 
 export const typeDefsTransaction = `#graphql
 scalar JSON
 type Query
 type Mutation
 
-enum TransactionType {
-  deploy
-  rollup
-}
-
-type DbTransaction {
-  databaseName: String!
-  transactionType: TransactionType!
-  zkAppPublicKey: String!
-  status: TransactionStatus!
-  tx: String!
-  id: String!
-}
-
 extend type Query {
   getTransaction(databaseName: String!, transactionType: TransactionType!): DbTransaction!
+  getTransactionById(id: String!): DbTransaction
 }
 
 extend type Mutation {
@@ -42,6 +31,10 @@ export type TTransactionRequest = TDatabaseRequest & {
   transactionType: 'deploy' | 'rollup';
 };
 
+export type TTransactionByIdRequest = {
+  id: string;
+};
+
 export type TTransactionIdRequest = TDatabaseRequest & {
   id: string;
 };
@@ -62,7 +55,6 @@ const getTransaction = authorizeWrapper(
       args.transactionType
     );
 
-    transaction.status
     return {
       databaseName: transaction.databaseName,
       transactionType: transaction.transactionType,
@@ -74,17 +66,20 @@ const getTransaction = authorizeWrapper(
   }
 );
 
+const getTransactionById = authorizeWrapper(
+  Joi.object({
+    id: Joi.string().required(),
+  }),
+  async (_root: unknown, args: TTransactionByIdRequest, ctx) => withTransaction((session) => getTransactionByIdDomain(args.id, session))
+);
+
 const enqueueDeployTransaction = authorizeWrapper(
   Joi.object({
     databaseName,
   }),
   async (_root: unknown, args: TDatabaseRequest, ctx) =>
     (
-      await enqueueTransactionDomain(
-        args.databaseName,
-        ctx.userName,
-        'deploy'
-      )
+      await enqueueTransactionDomain(args.databaseName, ctx.userName, 'deploy')
     ).toString()
 );
 
@@ -107,6 +102,7 @@ type TTransactionResolver = {
   JSON: typeof GraphQLJSON;
   Query: {
     getTransaction: typeof getTransaction;
+    getTransactionById: typeof getTransactionById;
   };
   Mutation: {
     enqueueDeployTransaction: typeof enqueueDeployTransaction;
@@ -118,6 +114,7 @@ export const resolversTransaction: TTransactionResolver = {
   JSON: GraphQLJSON,
   Query: {
     getTransaction,
+    getTransactionById
   },
   Mutation: {
     enqueueDeployTransaction,

packages/serverless/src/apollo/app/types/transaction.ts

@@ -9,4 +9,20 @@ enum TransactionStatus {
   success
   unknown
 }
+
+enum TransactionType {
+  deploy
+  rollup
+}
+
+type DbTransaction {
+  databaseName: String!
+  transactionType: TransactionType!
+  zkAppPublicKey: String
+  status: TransactionStatus!
+  tx: String
+  id: String!
+  error: String
+}
+
 `;

packages/serverless/src/domain/use-case/database.ts

@@ -24,7 +24,8 @@ import { MinaNetwork } from '@zkdb/smart-contract';
 export async function createDatabase(
   databaseName: string,
   merkleHeight: number,
-  actor: string
+  actor: string,
+  session?: ClientSession
 ) {
   const user = await new ModelUser().findOne({ userName: actor });
 
@@ -44,9 +45,16 @@ export async function createDatabase(
       databaseOwner: actor,
     });
 
-    await enqueueTransaction(databaseName, actor, 'deploy');
+    const id = await enqueueTransaction(databaseName, actor, 'deploy', session);
 
-    return true;
+    const modelTransaction = ModelDbTransaction.getInstance();
+
+    const tx = await modelTransaction.findById(id.toString(), { session });
+
+    return {
+      id: id.toString(),
+      ...tx,
+    };
   }
 
   throw Error(`User ${actor} has not been found`);

packages/serverless/src/domain/use-case/rollup.ts

@@ -72,6 +72,15 @@ export async function createRollUp(
     },
     { session: compoundSession?.sessionService }
   );
+
+  const tx = await modelTransaction.findById(txId.toString(), {
+    session: compoundSession?.sessionService,
+  });
+
+  return {
+    id: txId.toString(),
+    ...tx,
+  };
 }
 
 export async function getRollUpHistory(