Merge pull request #524 from AztecProtocol/cb/merge-public-v5-next-fix

fix: resolve public-v5-next → v5-next merge conflicts [PR 2/2]

Author: alexghr

barretenberg/cpp/src/barretenberg/vm2/tracegen/trace_container.cpp

@@ -4,10 +4,7 @@
 #include <ranges>
 
 #include "barretenberg/common/assert.hpp"
-<<<<<<< HEAD
-=======
 #include "barretenberg/common/compiler_hints.hpp"
->>>>>>> origin/public-v5-next
 #include "barretenberg/common/log.hpp"
 #include "barretenberg/common/ref_vector.hpp"
 #include "barretenberg/vm2/common/field.hpp"
@@ -78,11 +75,7 @@ TraceContainer::ColumnInterval& TraceContainer::get_or_create_shard(SparseColumn
     return *expected; // CAS failure loaded the winning pointer into `expected` (acquire).
 }
 
-<<<<<<< HEAD
-void TraceContainer::set(Column col, uint32_t row, const FF& value)
-=======
 void TraceContainer::set(Column col, uint32_t row, const FF& value, bool use_atomic_limbs)
->>>>>>> origin/public-v5-next
 {
     auto& column_data = (*trace)[static_cast<size_t>(col)];
     const size_t shard_idx = row / INTERVAL_SIZE;
@@ -93,14 +86,6 @@ void TraceContainer::set(Column col, uint32_t row, const FF& value, bool use_ato
         // Lock-free: a single atomic load finds the shard (created on first write), then we write our
         // own dense cell directly. Different rows are distinct array elements, so concurrent writers of
         // this column (or even of the same shard, at a chunk boundary) never race and never serialize.
-<<<<<<< HEAD
-        get_or_create_shard(column_data, shard_idx).rows[offset] = value;
-    } else {
-        // Zero value: clear if present. We never create a shard (clearing an absent row is a no-op).
-        ColumnInterval* shard = column_data.slots[shard_idx].load(std::memory_order_acquire);
-        if (shard != nullptr) {
-            shard->rows[offset] = FF::zero();
-=======
         auto& cell = get_or_create_shard(column_data, shard_idx).rows[offset];
         if (BB_UNLIKELY(use_atomic_limbs)) {
             store_per_limb(cell, value);
@@ -117,7 +102,6 @@ void TraceContainer::set(Column col, uint32_t row, const FF& value, bool use_ato
             } else {
                 shard->rows[offset] = FF::zero();
             }
->>>>>>> origin/public-v5-next
         }
     }
 }

noir-projects/aztec-nr/aztec/src/standard_addresses.nr

@@ -2,33 +2,17 @@
 use protocol_types::{address::AztecAddress, traits::FromField};
 
 pub global STANDARD_AUTH_REGISTRY_ADDRESS: AztecAddress = AztecAddress::from_field(
-<<<<<<< HEAD
-    0x210bb9a735aeafa62550cecd9556a63a86722bdf609c385e3073ddac4f36c5d0,
+    0x151fc83ed377f7f5eafba69c0dd923a27d3940c887a0c2738de3b3aad8539d37,
 );
 
 pub global STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS: AztecAddress = AztecAddress::from_field(
-    0x0d7a40e0b5ca489d4511a7ad81ab350b200de1d57f053423c29c0673dc5738aa,
+    0x24bf02e35ce6f82e3ce17b39c7400eeb16b48c76527207f236e1193f07b2d4f4,
 );
 
 pub global STANDARD_PUBLIC_CHECKS_ADDRESS: AztecAddress = AztecAddress::from_field(
-    0x14574f1307405dfe60f7c142bf5f647d78565a2f7b8f3377d967d42d79b20069,
+    0x27ead321a0a230af4bed665c30a6d85b3e0eddae03d5f3dc0c5d4687a7ecfb43,
 );
 
 pub global STANDARD_HANDSHAKE_REGISTRY_ADDRESS: AztecAddress = AztecAddress::from_field(
-    0x00e0ba4cebbef0ebe8cef27c0f01fbc8fec405ed665c6455b0b42848ddb9e466,
-=======
-    0x0564d5361fd6d7501baa1706a59bbebd2035d1c2565c9e5daf8f1567da547a23,
-);
-
-pub global STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS: AztecAddress = AztecAddress::from_field(
-    0x126ab69e8161771b52273d00dbf5d7252ef6a92724d15f1ec2dcc967118a0c7b,
-);
-
-pub global STANDARD_PUBLIC_CHECKS_ADDRESS: AztecAddress = AztecAddress::from_field(
-    0x077341cf79b91db9c440c49786fc4d4508ef3ab623c30fa3be7031ffcad4754c,
-);
-
-pub global STANDARD_HANDSHAKE_REGISTRY_ADDRESS: AztecAddress = AztecAddress::from_field(
-    0x2f8592fb5b1620f33d21d9b67a34002f0e5392d93807a684584af388e0d70741,
->>>>>>> origin/public-v5-next
+    0x1954c59d82062c1c4733a33284fc81c7d0ed65de93b683f72430047224866484,
 );

noir-projects/noir-contracts/contracts/protocol/aztec_sublib/src/standard_addresses.nr

@@ -543,19 +543,6 @@ unconstrained fn multiple_senders_discovered_for_same_recipient() {
         discovered.items.get(0).eph_pk.x != discovered.items.get(1).eph_pk.x,
         "distinct senders should produce distinct ephemeral public keys",
     );
-<<<<<<< HEAD
-    // Both handshakes are discovered, but their relative order is not a guaranteed property: each is sent in a
-    // separate tx, so which one lands in the earlier block (and therefore comes first in the oldest-first discovery
-    // scan) depends on tx/block ordering, which in turn depends on the senders' addresses. Assert set membership
-    // rather than a fixed index -> mode mapping.
-    let mode_0 = discovered.items.get(0).mode;
-    let mode_1 = discovered.items.get(1).mode;
-    let constrained_count = (mode_0 == ONCHAIN_CONSTRAINED) as u32 + (mode_1 == ONCHAIN_CONSTRAINED) as u32;
-    let unconstrained_count = (mode_0 == ONCHAIN_UNCONSTRAINED) as u32 + (mode_1 == ONCHAIN_UNCONSTRAINED) as u32;
-    assert_eq(constrained_count, 1, "expected exactly one constrained handshake");
-    assert_eq(unconstrained_count, 1, "expected exactly one unconstrained handshake");
-=======
->>>>>>> origin/public-v5-next
 }
 
 #[test]

noir-projects/noir-contracts/contracts/standard/handshake_registry_contract/src/test.nr

@@ -30,7 +30,7 @@ describe('AVM completeness — bitwise/sha256 error row collision (regression gu
   // the collision impossible.
   it('proves honest tx with sha256 XOR(U32(0), U32(0)) after inner bitwise error', async () => {
     const { innerContract, outerContract } = await deployBitwiseSha256ErrorRowCollisionContracts(tester);
-    const sender = AztecAddress.fromNumber(42);
+    const sender = AztecAddress.fromNumberUnsafe(42);
 
     // Inner call reverts (tag mismatch), outer runs SHA256, outer RETURNs OK.
     const simRes = await tester.simulateTx(

noir-projects/noir-contracts/pinned-standard-contracts.tar.gz

@@ -24,7 +24,7 @@ describe('AVM MSM zero-scalar invalid-point regression', () => {
   let tester: AvmProvingTester;
   let worldStateService: NativeWorldStateService;
 
-  const sender = AztecAddress.fromNumber(42);
+  const sender = AztecAddress.fromNumberUnsafe(42);
   let contract: ContractInstanceWithAddress;
 
   beforeEach(async () => {

yarn-project/bb-prover/src/avm_proving_tests/avm_completeness_bitwise_sha256_collision.test.ts

@@ -20,78 +20,45 @@ export const StandardContractSalt: Record<StandardContractName, Fr> = {
 };
 
 export const StandardContractAddress: Record<StandardContractName, AztecAddress> = {
-<<<<<<< HEAD
-  AuthRegistry: AztecAddress.fromString('0x210bb9a735aeafa62550cecd9556a63a86722bdf609c385e3073ddac4f36c5d0'),
-  MultiCallEntrypoint: AztecAddress.fromString('0x0d7a40e0b5ca489d4511a7ad81ab350b200de1d57f053423c29c0673dc5738aa'),
-  PublicChecks: AztecAddress.fromString('0x14574f1307405dfe60f7c142bf5f647d78565a2f7b8f3377d967d42d79b20069'),
-  HandshakeRegistry: AztecAddress.fromString('0x00e0ba4cebbef0ebe8cef27c0f01fbc8fec405ed665c6455b0b42848ddb9e466'),
-};
-
-export const StandardContractClassId: Record<StandardContractName, Fr> = {
-  AuthRegistry: Fr.fromString('0x13991191522a755e7e145f87ca476e30e7e0cbf9f3feba678983b1fc989d44e0'),
-  MultiCallEntrypoint: Fr.fromString('0x1d6485198a7f0f25054b16577bb0eb1a700543b60c7e19de2119b7214c030a84'),
-  PublicChecks: Fr.fromString('0x0f177ea657a6ebdfb3e914a91c45d9cac2fc1b126a9d6f8c7c1f5b66f261842e'),
-  HandshakeRegistry: Fr.fromString('0x0af9d1e794ed6f1725b28ccc791563991f053778411cce97c180d8c35ea5c8c1'),
-=======
-  AuthRegistry: AztecAddress.fromStringUnsafe('0x0564d5361fd6d7501baa1706a59bbebd2035d1c2565c9e5daf8f1567da547a23'),
+  AuthRegistry: AztecAddress.fromStringUnsafe('0x151fc83ed377f7f5eafba69c0dd923a27d3940c887a0c2738de3b3aad8539d37'),
   MultiCallEntrypoint: AztecAddress.fromStringUnsafe(
-    '0x126ab69e8161771b52273d00dbf5d7252ef6a92724d15f1ec2dcc967118a0c7b',
+    '0x24bf02e35ce6f82e3ce17b39c7400eeb16b48c76527207f236e1193f07b2d4f4',
   ),
-  PublicChecks: AztecAddress.fromStringUnsafe('0x077341cf79b91db9c440c49786fc4d4508ef3ab623c30fa3be7031ffcad4754c'),
+  PublicChecks: AztecAddress.fromStringUnsafe('0x27ead321a0a230af4bed665c30a6d85b3e0eddae03d5f3dc0c5d4687a7ecfb43'),
   HandshakeRegistry: AztecAddress.fromStringUnsafe(
-    '0x2f8592fb5b1620f33d21d9b67a34002f0e5392d93807a684584af388e0d70741',
+    '0x1954c59d82062c1c4733a33284fc81c7d0ed65de93b683f72430047224866484',
   ),
 };
 
 export const StandardContractClassId: Record<StandardContractName, Fr> = {
-  AuthRegistry: Fr.fromString('0x197cba16b38c5408694cec7188b9128e80d247596050e31a0d12249b60b360e1'),
-  MultiCallEntrypoint: Fr.fromString('0x24e025d7b0d3158d69197dbabf2baf18db0b1dd4ff3c87ec2ed418fecb0f192d'),
-  PublicChecks: Fr.fromString('0x000a3012fd5d88921976565891e19c0b9a6a753eaf773e9493f47c890089bd08'),
-  HandshakeRegistry: Fr.fromString('0x20e14f4a6ada38f27144ceedbfbb7417aca6c679ee1ea09b9435886ed7faf3d2'),
->>>>>>> origin/public-v5-next
+  AuthRegistry: Fr.fromString('0x151d75f71db863281277cea8d9fb901509e735abee16e3c415b2de1cbe35d0a2'),
+  MultiCallEntrypoint: Fr.fromString('0x0c29e321de18a6d87363a54e927444079675f4b44ccc2baaef93432c003a740d'),
+  PublicChecks: Fr.fromString('0x119aed3bd453156b28f9455a56283a419bd74ec314ac1e78f603f4f15bfaa424'),
+  HandshakeRegistry: Fr.fromString('0x1e5b9549f480de778b5a715880d977ffae790239b659168f5e53cda9c2218ae8'),
 };
 
 export const StandardContractClassIdPreimage: Record<
   StandardContractName,
   { artifactHash: Fr; privateFunctionsRoot: Fr; publicBytecodeCommitment: Fr }
 > = {
   AuthRegistry: {
-<<<<<<< HEAD
-    artifactHash: Fr.fromString('0x05b391dbd82c29c2e03211dea717cf0f9ab541ee03afaac0c07af6e2776c595a'),
+    artifactHash: Fr.fromString('0x080d146ee61f80f37e18a2a4c2483744c828e9384e716398f3b9fedb5b4a5cbc'),
     privateFunctionsRoot: Fr.fromString('0x1b16157ab0b322bcaf3de5cb197b276c5e29ca3668a0c440668ca56aa7dfff77'),
     publicBytecodeCommitment: Fr.fromString('0x0c7984b020afc901da3b5898b8f94d1d9a09ea2b37d6e0043409abc0b0332906'),
   },
   MultiCallEntrypoint: {
-    artifactHash: Fr.fromString('0x18e65098537ecaf9d3849883502299db79c74fc7fb2ebe3c7b2a322c607a6fa4'),
+    artifactHash: Fr.fromString('0x0e2d5d2b2e024ae79d4df7cf4ebceb1b8dc98a049b05a79353feb76c9c2785a5'),
     privateFunctionsRoot: Fr.fromString('0x10228bc99b6715f15c866a1df0d9cb63c31920cb8e61a6b79058bf98658d7f39'),
     publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
   },
   PublicChecks: {
-    artifactHash: Fr.fromString('0x188a8567fa8d46fea84f05628da6b1ef6028cb91d2bf1341284bf6dbc5e98ea3'),
-=======
-    artifactHash: Fr.fromString('0x17bd6a48fb22fb700a16d5767f93e08b2b21bf83c280cb61abe763567179601f'),
-    privateFunctionsRoot: Fr.fromString('0x17b584350f4c3ccafd8f688729afb9feab8976114fb40012e9dee65022c072a4'),
-    publicBytecodeCommitment: Fr.fromString('0x2545f39893766508ce37bb5cea5e4dcab04c6f7f79f3089b1c076876e9d268b2'),
-  },
-  MultiCallEntrypoint: {
-    artifactHash: Fr.fromString('0x13dfb7aaca5d32bb876650f6afa5531d7c2c946f1cf927bde230755017af91d3'),
-    privateFunctionsRoot: Fr.fromString('0x0e68dfbb256e80b08b3aef47aca1f2669e97a9c6259787893c1223ac083ad5d5'),
-    publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
-  },
-  PublicChecks: {
-    artifactHash: Fr.fromString('0x212730544c282ed52485a69d91a2d46adb5a5e6cd23e8c26c3abc6de4bcc3714'),
->>>>>>> origin/public-v5-next
+    artifactHash: Fr.fromString('0x07dc17311a81557c8d63369e7ca1eb2c121e98407b338ef61e406003e2246928'),
     privateFunctionsRoot: Fr.fromString('0x202860adb1b8975971eeaf571aaaa88a27f4035290d58532ae7d60b0dfaad54c'),
     publicBytecodeCommitment: Fr.fromString('0x013c4f854a5c87c9daf86c5f9bc07a42c2a061f1d924a5b3564ec7edc8e18cb7'),
   },
   HandshakeRegistry: {
-<<<<<<< HEAD
-    artifactHash: Fr.fromString('0x1b35538b90af6f162473174aa0ca239f8d2dd783e3b6cb500569c2c743a94ffa'),
-    privateFunctionsRoot: Fr.fromString('0x2443fe2618b0c345bb7629ee0775af69c6695a3eca6ebe1cd5d23617a00a5297'),
-=======
-    artifactHash: Fr.fromString('0x01b39b7d8576cbea4e4eae792c4538a710d0ac2ea0361364c57d0e2b4b1a3474'),
-    privateFunctionsRoot: Fr.fromString('0x02a4dba36389845b8ef0108562f7536d3284f07ca678558fc3c3bce3b24ee821'),
->>>>>>> origin/public-v5-next
+    artifactHash: Fr.fromString('0x294711bb2ef12f26c51f754db9111ff4a5ebd7171d42e7ba7c6b638a8b09b650'),
+    privateFunctionsRoot: Fr.fromString('0x143d27f4e317c85f2838e6ab75a01abc21ebf70ee72383925c4c93fbdf60427b'),
     publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
   },
 };
@@ -129,27 +96,19 @@ export const StandardContractPrivateFunctions: Record<
       selector: FunctionSelector.fromField(
         Fr.fromString('0x0000000000000000000000000000000000000000000000000000000019f8b409'),
       ),
-<<<<<<< HEAD
-      vkHash: Fr.fromString('0x11d4d7327cb1cb71466ef6abd40aed3154227e730de34ff12527060056dff360'),
-=======
-      vkHash: Fr.fromString('0x25d87da668c7c52b9c521579f191bb02486b3598d1ec0063927d5c0af2608daf'),
->>>>>>> origin/public-v5-next
+      vkHash: Fr.fromString('0x0158cac20cbeac38d25cd99c907644549abb7e668496f06cb2c6fd5da47b8f32'),
     },
     {
       selector: FunctionSelector.fromField(
         Fr.fromString('0x00000000000000000000000000000000000000000000000000000000db548fcf'),
       ),
-<<<<<<< HEAD
-      vkHash: Fr.fromString('0x27bd4a07ac1e6385c3e35a83dfcf81512a947eceea024c603f62b9d26aba88f4'),
-=======
-      vkHash: Fr.fromString('0x0f59fe525df9ff4a400e33dec33fd1dc07e25d95f860734a35b909085cf07809'),
+      vkHash: Fr.fromString('0x0dd0ed2bb842c543e34b12c98ed56686dce0bae7e7aa7527dc5d42f36f039947'),
     },
     {
       selector: FunctionSelector.fromField(
         Fr.fromString('0x00000000000000000000000000000000000000000000000000000000f1ff839b'),
       ),
-      vkHash: Fr.fromString('0x12f43f384aa64661b012b52b1d80eb1d2202b8e459b50f56cfe270b0672c16ff'),
->>>>>>> origin/public-v5-next
+      vkHash: Fr.fromString('0x25f309ba580e48ec868bb75656274359f8a597a0ead0739c94444b9e609e475f'),
     },
   ],
 };