Merge pull request #722 from eea-oasis/feature/698-merkelize-payload

Feature/698 merkelize payload
ethereum-oasis-op · Aug 11, 2023 · c5612c6 · c5612c6
2 parents ce1f588 + e2d0a70
commit c5612c6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/examples/bri-3/package-lock.json b/examples/bri-3/package-lock.json
diff --git a/examples/bri-3/src/bri/transactions/agents/transactions.agent.spec.ts b/examples/bri-3/src/bri/transactions/agents/transactions.agent.spec.ts
@@ -10,6 +10,7 @@ import { Transaction } from '../models/transaction';
 import { TransactionStatus } from '../models/transactionStatus.enum';
 import { TransactionStorageAgent } from './transactionStorage.agent';
 import { TransactionAgent } from './transactions.agent';
+import { MerkleTreeService } from '../../merkleTree/services/merkleTree.service';
 
 let transactionAgent: TransactionAgent;
 
@@ -20,6 +21,8 @@ const workstepStorageAgentMock: DeepMockProxy<WorkstepStorageAgent> =
 const workflowStorageAgentMock: DeepMockProxy<WorkflowStorageAgent> =
   mockDeep<WorkflowStorageAgent>();
 const authAgentMock: DeepMockProxy<AuthAgent> = mockDeep<AuthAgent>();
+const merkleTreeServiceMock: DeepMockProxy<MerkleTreeService> =
+  mockDeep<MerkleTreeService>();
 
 // TODO: Setup of this test data below is what should be handled in a separate file where we mock only prisma.client
 // and implement various test data scenarios that can be selected with a single line of code.
@@ -77,6 +80,7 @@ beforeAll(async () => {
     workstepStorageAgentMock,
     workflowStorageAgentMock,
     authAgentMock,
+    merkleTreeServiceMock,
   );
 });
 

diff --git a/examples/bri-3/src/bri/transactions/agents/transactions.agent.ts b/examples/bri-3/src/bri/transactions/agents/transactions.agent.ts
@@ -6,7 +6,6 @@ import {
 import { Transaction } from '../models/transaction';
 import { TransactionStatus } from '../models/transactionStatus.enum';
 
-import { Workstep } from '@prisma/client';
 import { AuthAgent } from '../../auth/agent/auth.agent';
 import { BpiSubjectAccount } from '../../identity/bpiSubjectAccounts/models/bpiSubjectAccount';
 import { WorkflowStorageAgent } from '../../workgroup/workflows/agents/workflowsStorage.agent';
@@ -17,6 +16,8 @@ import {
   UPDATE_WRONG_STATUS_ERR_MESSAGE,
 } from '../api/err.messages';
 import { TransactionStorageAgent } from './transactionStorage.agent';
+import { MerkleTreeService } from '../../merkleTree/services/merkleTree.service';
+import { Workstep } from '../../workgroup/worksteps/models/workstep';
 
 @Injectable()
 export class TransactionAgent {
@@ -25,6 +26,7 @@ export class TransactionAgent {
     private workstepStorageAgent: WorkstepStorageAgent,
     private workflowStorageAgent: WorkflowStorageAgent,
     private authAgent: AuthAgent,
+    private merkleTreeService: MerkleTreeService,
   ) {}
 
   public throwIfCreateTransactionInputInvalid() {
@@ -166,7 +168,7 @@ export class TransactionAgent {
     tx: Transaction,
     workstep: Workstep,
   ): Promise<boolean> {
-    // TODO: #698 Merkelize transaction payload
+    this.merkleTreeService.merkelizePayload(JSON.parse(tx.payload), 'sha256');
     // TODO: #701 Fetch circuit attached to the workstep
     // TODO: #701 Prepare circuit inputs and execute
     // TODO: #701 Return merkelized payload and witness

diff --git a/examples/bri-3/src/bri/transactions/api/transactions.controller.spec.ts b/examples/bri-3/src/bri/transactions/api/transactions.controller.spec.ts
@@ -27,6 +27,7 @@ import { CreateTransactionDto } from './dtos/request/createTransaction.dto';
 import { UpdateTransactionDto } from './dtos/request/updateTransaction.dto';
 import { NOT_FOUND_ERR_MESSAGE } from './err.messages';
 import { TransactionController } from './transactions.controller';
+import { MerkleTreeService } from '../../merkleTree/services/merkleTree.service';
 
 describe('TransactionController', () => {
   let controller: TransactionController;
@@ -83,6 +84,7 @@ describe('TransactionController', () => {
         WorkstepStorageAgent,
         WorkflowStorageAgent,
         AuthAgent,
+        MerkleTreeService,
       ],
     })
       .overrideProvider(TransactionStorageAgent)

diff --git a/examples/bri-3/src/bri/transactions/transactions.module.ts b/examples/bri-3/src/bri/transactions/transactions.module.ts
@@ -13,6 +13,7 @@ import { GetTransactionByIdQueryHandler } from './capabilities/getTransactionByI
 import { UpdateTransactionCommandHandler } from './capabilities/updateTransaction/updateTransactionCommand.handler';
 import { TransactionsProfile } from './transactions.profile';
 import { AuthModule } from '../auth/auth.module';
+import { MerkleModule } from '../merkleTree/merkle.module';
 
 export const CommandHandlers = [
   CreateTransactionCommandHandler,
@@ -32,6 +33,7 @@ export const QueryHandlers = [
     WorkstepModule,
     WorkflowModule,
     AuthModule,
+    MerkleModule,
   ],
   controllers: [TransactionController],
   providers: [