Merge remote-tracking branch 'origin/maxim/f-669-aztec-nr-calculate_secret_and_index-helper-for-constrained' into maxim/f-669-aztec-nr-calculate_secret_and_index-helper-for-constrained

Author: vezenovm

barretenberg/cpp/src/barretenberg/aztec/aztec_constants.hpp

@@ -247,7 +247,8 @@
 #define AVM_EMITPUBLICLOG_DYN_DA_GAS 32
 #define AVM_SSTORE_DYN_DA_GAS 64
 #define AVM_WRITTEN_PUBLIC_DATA_SLOTS_TREE_HEIGHT 6
-#define AVM_WRITTEN_PUBLIC_DATA_SLOTS_TREE_INITIAL_ROOT "0x13954b76f8ab76c38ab687731f802fc90e5d55e0592fa6f56d0a73024b3f8356"
+#define AVM_WRITTEN_PUBLIC_DATA_SLOTS_TREE_INITIAL_ROOT                                                                \
+    "0x13954b76f8ab76c38ab687731f802fc90e5d55e0592fa6f56d0a73024b3f8356"
 #define AVM_WRITTEN_PUBLIC_DATA_SLOTS_TREE_INITIAL_SIZE 1
 #define AVM_RETRIEVED_BYTECODES_TREE_HEIGHT 5
 #define AVM_RETRIEVED_BYTECODES_TREE_INITIAL_ROOT "0x0ff65ad321f05745d4c80e2e18e94241093d2e49017ff8cc151df4f207a43c12"

yarn-project/pxe/src/storage/tagging_store/sender_tagging_store.test.ts

@@ -1,8 +1,8 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import { RevertCode } from '@aztec/stdlib/avm';
-import type { AppTaggingSecret, ExtendedDirectionalAppTaggingSecret, TaggingIndexRange } from '@aztec/stdlib/logs';
-import { PrivateLog, SiloedTag, siloedTagFor } from '@aztec/stdlib/logs';
+import type { AppTaggingSecret, TaggingIndexRange } from '@aztec/stdlib/logs';
+import { ExtendedDirectionalAppTaggingSecret, PrivateLog, SiloedTag, siloedTagFor } from '@aztec/stdlib/logs';
 import { randomConstrainedAppTaggingSecret, randomExtendedDirectionalAppTaggingSecret } from '@aztec/stdlib/testing';
 import { TxEffect, TxHash } from '@aztec/stdlib/tx';
 
@@ -629,7 +629,6 @@ describe('SenderTaggingStore', () => {
     // finalizer must not treat it as a surviving constrained-tag. The onchain emission would have used the
     // constrained domain separator, so the values are different.
     it('does not cross-match a tag computed under the wrong domain separator', async () => {
-      const sharedFr = Fr.random();
       const constrainedSecret = await randomConstrainedAppTaggingSecret();
 
       const txHash = TxHash.random();
@@ -639,7 +638,7 @@ describe('SenderTaggingStore', () => {
       // this via the public construction path keeps the test independent of how the production code derives Frs.
       // Emit a tag using the *unconstrained* domain separator for the same Fr/index combination. This should NOT match.
       const wrongDomSepTag = await SiloedTag.compute({
-        extendedSecret: { secret: sharedFr, app: constrainedSecret.app } as ExtendedDirectionalAppTaggingSecret,
+        extendedSecret: new ExtendedDirectionalAppTaggingSecret(constrainedSecret.secret, constrainedSecret.app),
         index: 1,
       });
       const txEffect = makeTxEffect(txHash, [wrongDomSepTag]);

yarn-project/stdlib/src/logs/app_tagging_secret.test.ts

@@ -38,7 +38,6 @@ describe('AppTaggingSecret helpers', () => {
   describe('TaggingIndexRangeSchema', () => {
     it('preserves constrained secret kind when parsing a TaggingIndexRange', async () => {
       const original = await randomConstrainedAppTaggingSecret();
-      const index = 2;
 
       const parsed = TaggingIndexRangeSchema.parse({
         extendedSecret: {
@@ -52,19 +51,6 @@ describe('AppTaggingSecret helpers', () => {
 
       expect(parsed.extendedSecret).toBeInstanceOf(ConstrainedAppTaggingSecret);
       expect(parsed.extendedSecret.kind).toBe(AppTaggingSecretKind.CONSTRAINED);
-
-      const computedTag = await siloedTagFor(parsed.extendedSecret, index);
-
-      const expectedInner = await poseidon2Hash([original.secret, new Fr(index)]);
-      const expectedLogTag = await computeLogTag(expectedInner, DomainSeparator.CONSTRAINED_MSG_LOG_TAG);
-      const expectedSiloed = await computeSiloedPrivateLogFirstField(original.app, expectedLogTag);
-
-      expect(computedTag.value.toString()).toEqual(expectedSiloed.toString());
-
-      const wrongLogTag = await computeLogTag(expectedInner, DomainSeparator.UNCONSTRAINED_MSG_LOG_TAG);
-      const wrongSiloed = await computeSiloedPrivateLogFirstField(original.app, wrongLogTag);
-
-      expect(computedTag.value.toString()).not.toEqual(wrongSiloed.toString());
     });
 
     it('preserves unconstrained secret kind when parsing a TaggingIndexRange', async () => {