Increase usage of existing TxGen functions in generalized generator.

Author: murisi

contracts/test/libs/TxGen.sol

@@ -56,7 +56,9 @@ library TxGen {
         RiscZeroMockVerifier mockVerifier,
         bytes32 commitmentTreeRoot, // historical root
         Resource memory consumed,
-        Resource memory created
+        uint256 consumedValueCommitmentRandomness,
+        Resource memory created,
+        uint256 createdValueCommitmentRandomness
     ) internal returns (Compliance.VerifierInput memory unit) {
         bytes32 nf = nullifier(consumed, 0);
         bytes32 cm = commitment(created);
@@ -68,7 +70,7 @@ library TxGen {
                 kind: kind(consumed),
                 quantity: consumed.quantity,
                 consumed: true,
-                valueCommitmentRandomness: 1
+                valueCommitmentRandomness: consumedValueCommitmentRandomness
             })
         );
         // Construct the delta for creation based on kind and quantity
@@ -80,7 +82,7 @@ library TxGen {
                     kind: kind(created),
                     quantity: created.quantity,
                     consumed: false,
-                    valueCommitmentRandomness: 1
+                    valueCommitmentRandomness: createdValueCommitmentRandomness
                 })
             )
         );
@@ -151,7 +153,9 @@ library TxGen {
                 mockVerifier: mockVerifier,
                 commitmentTreeRoot: initialRoot(),
                 consumed: consumed[i].resource,
-                created: created[i].resource
+                consumedValueCommitmentRandomness: 1,
+                created: created[i].resource,
+                createdValueCommitmentRandomness: 1
             });
         }
         action = Action({logicVerifierInputs: logicVerifierInputs, complianceVerifierInputs: complianceVerifierInputs});
@@ -316,66 +320,35 @@ library TxGen {
         bytes32 actionTreeRoot = actionTreeTags.computeRoot();
         // Create logic and compliance verifier inputs
         for (uint256 i = 0; i < truncatedResources.length; i++) {
+            uint256 index = (i * 2);
+
             Resource memory consumedResource = truncatedResources[i][0];
             Resource memory createdResource = truncatedResources[i][1];
-            bytes32 nf = nullifier(consumedResource, 0);
-            bytes32 cm = commitment(createdResource);
-
             // Created logic verifier input for a consumed resource
-            action.logicVerifierInputs[2 * i] =
-                Logic.VerifierInput({tag: nf, verifyingKey: consumedResource.logicRef, proof: "", appData: appData});
-            action.logicVerifierInputs[2 * i].proof = mockVerifier.mockProve({
-                imageId: consumedResource.logicRef,
-                journalDigest: sha256(action.logicVerifierInputs[2 * i].toJournal(actionTreeRoot, true))
-            }).seal;
+            action.logicVerifierInputs[index] = logicVerifierInput({
+                mockVerifier: mockVerifier,
+                actionTreeRoot: actionTreeRoot,
+                resource: consumedResource,
+                isConsumed: true,
+                appData: appData
+            });
             // Create logic verifier input for a created resource
-            action.logicVerifierInputs[2 * i + 1] =
-                Logic.VerifierInput({tag: cm, verifyingKey: createdResource.logicRef, proof: "", appData: appData});
-            action.logicVerifierInputs[2 * i + 1].proof = mockVerifier.mockProve({
-                imageId: createdResource.logicRef,
-                journalDigest: sha256(action.logicVerifierInputs[2 * i + 1].toJournal(actionTreeRoot, false))
-            }).seal;
-            // Create the delta for the consumed resource
-            Delta.CurvePoint memory unitDelta = DeltaGen.generateInstance(
-                vm,
-                DeltaGen.InstanceInputs({
-                    kind: kind(consumedResource),
-                    quantity: consumedResource.quantity,
-                    consumed: true,
-                    valueCommitmentRandomness: params.valueCommitmentRandomness[i][0]
-                })
-            );
-
-            // Add the delta for the created resource
-            unitDelta = Delta.add(
-                unitDelta,
-                DeltaGen.generateInstance(
-                    vm,
-                    DeltaGen.InstanceInputs({
-                        kind: kind(createdResource),
-                        quantity: createdResource.quantity,
-                        consumed: false,
-                        valueCommitmentRandomness: params.valueCommitmentRandomness[i][1]
-                    })
-                )
-            );
-            // Create the compliance verifier input
-            Compliance.Instance memory instance = Compliance.Instance({
-                unitDeltaX: bytes32(unitDelta.x),
-                unitDeltaY: bytes32(unitDelta.y),
-                consumed: Compliance.ConsumedRefs({
-                    nullifier: nf,
-                    logicRef: consumedResource.logicRef,
-                    commitmentTreeRoot: initialRoot()
-                }),
-                created: Compliance.CreatedRefs({commitment: cm, logicRef: createdResource.logicRef})
+            action.logicVerifierInputs[index + 1] = logicVerifierInput({
+                mockVerifier: mockVerifier,
+                actionTreeRoot: actionTreeRoot,
+                resource: createdResource,
+                isConsumed: false,
+                appData: appData
             });
-            action.complianceVerifierInputs[i] = Compliance.VerifierInput({
-                instance: instance,
-                proof: mockVerifier.mockProve({
-                    imageId: Compliance._VERIFYING_KEY,
-                    journalDigest: sha256(instance.toJournal())
-                }).seal
+            // Create compliance verifier input for the resource pairs
+            action.complianceVerifierInputs[i] = complianceVerifierInput({
+                vm: vm,
+                mockVerifier: mockVerifier,
+                commitmentTreeRoot: initialRoot(),
+                consumed: consumedResource,
+                consumedValueCommitmentRandomness: params.valueCommitmentRandomness[i][0],
+                created: createdResource,
+                createdValueCommitmentRandomness: params.valueCommitmentRandomness[i][1]
             });
         }
     }