diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/components/tail_to_public_output_validator.nr b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/components/tail_to_public_output_validator.nr index c3b3ae14823..6cd88d17e35 100644 --- a/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/components/tail_to_public_output_validator.nr +++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-lib/src/components/tail_to_public_output_validator.nr @@ -9,8 +9,9 @@ use dep::types::{ log_hash::ScopedLogHash, note_hash::ScopedNoteHash, nullifier::ScopedNullifier, + private_log::{PrivateLog, PrivateLogData}, public_call_request::PublicCallRequest, - side_effect::Counted, + side_effect::{Counted, scoped::Scoped}, }, messaging::l2_to_l1_message::ScopedL2ToL1Message, utils::arrays::{ @@ -86,13 +87,13 @@ impl TailToPublicOutputValidator { ); // private_logs - // assert_split_transformed_value_arrays( - // prev_data.private_logs, - // output_non_revertible.private_logs, - // output_revertible.private_logs, - // |l: Scoped, out: PrivateLog| out == l.inner.log, - // split_counter, - // ); + assert_split_transformed_value_arrays( + prev_data.private_logs, + output_non_revertible.private_logs, + output_revertible.private_logs, + |l: Scoped, out: PrivateLog| out == l.inner.log, + split_counter, + ); } fn validate_propagated_sorted_values(self) { diff --git a/noir-projects/noir-protocol-circuits/crates/private-kernel-tail-to-public/Prover.toml b/noir-projects/noir-protocol-circuits/crates/private-kernel-tail-to-public/Prover.toml index b109d8ebe57..132f49eb12c 100644 --- a/noir-projects/noir-protocol-circuits/crates/private-kernel-tail-to-public/Prover.toml +++ b/noir-projects/noir-protocol-circuits/crates/private-kernel-tail-to-public/Prover.toml @@ -1,12 +1,12 @@ [previous_kernel] vk_index = "0x000000000000000000000000000000000000000000000000000000000000003a" vk_path = [ - "0x04e2cead640a5f2a29c54988dce70b4b67fde74b09d27aea1b8f56ba98be13fd", - "0x23d86876a594d8f8cd1931b9025e02ca6993ba8da2a650e02da29e9dee240a5f", - "0x17f4097ef1a89ece195877893abd03bfb6f75676363e66131a5c1f580d62fe3d", - "0x09a3841a14e7969a3b94fc71919ff90072ab0901e759b13f08cf648bed59e19e", - "0x107e295a2f5dec865174b41aacfb0fc9a3c1ee203a6ad92df953ff054f74f12c", - "0x01ad2a81d1c02002c72abaacaa5a373f22fb664ce50d0ca48011b3ce7adc1ca6" + "0x159f2adb10c0bab6341f7145e09c5971835cbffe265846d6d297c90a85017bbe", + "0x230d553fc31344ef37911c4f9eabe2bb0148f0fb212a2a158a71d53aff2e3240", + "0x159df4358688145b176d6bee7391a5a8a348b6e06ca8848fe37908919ea23569", + "0x18dc4b1424df2c4c7754c93503c193ff9340f507cd0772b7e5c2515fb8542444", + "0x0fdf4a7e69f408312d9b649da28ba3c224e315278c0e1a91c83131d1c1a7c3aa", + "0x1a4bc8b57f1b9efd14f62044342d47828d592ec1fe07c6e891cc48aae0bdcdb8" ] [previous_kernel.vk] @@ -34,30 +34,30 @@ vk_path = [ "0x0000000000000000000000000000000000000000000000000000000000000008", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000001", - "0x000000000000000000000000000000093fe8e183d5ebdaad7deae3fa751d1118", - "0x00000000000000000000000000000000002f273e4fbec83595de4bebd49caf18", - "0x0000000000000000000000000000008aba2adc313d6dfebe24256fc57bc7bd87", - "0x0000000000000000000000000000000000284a8ad7a35970cb36da93039143e2", - "0x0000000000000000000000000000000aef7b653329b3027b14e4e1f7d21e9629", - "0x00000000000000000000000000000000000883139847301c0f94ba8e914162eb", - "0x000000000000000000000000000000d2ec6eddcbe139ae0b85239568d9cdba55", - "0x00000000000000000000000000000000001d5504ac9eaed7f1248d4cb9170fc9", - "0x0000000000000000000000000000005e03089f6a2ae3b2438ee7d89b45e97ff9", - "0x000000000000000000000000000000000026115fc76b5b91800622d5b725a6f8", - "0x0000000000000000000000000000008756612c8778b8f205c36317f7a46ee55e", - "0x00000000000000000000000000000000000b7af4a11ff106f3debc8e585ea314", - "0x00000000000000000000000000000060dcb999b07b86c69e4b7e3d9dbde2c6d7", - "0x00000000000000000000000000000000000d96b549fc24083a01377e6b4229c9", - "0x000000000000000000000000000000ae97bc52c964109e5392f327e54d588814", - "0x00000000000000000000000000000000002a457ebaa71598858239233a896745", - "0x0000000000000000000000000000009e4d9c0b5e9e72763ea4720c9d7416ab2b", - "0x000000000000000000000000000000000019eb02f25e30e0f3a69d54bf26054d", - "0x000000000000000000000000000000a590bda8cf4f06e26610c9fb2e82341e9a", - "0x00000000000000000000000000000000002c15a8e8f7fc3d2e995732825d8ba9", - "0x000000000000000000000000000000e0d48a264c68852e1105b2e76d4a41f4d5", - "0x0000000000000000000000000000000000222f7b8dfd0534c54818d307d2ba70", - "0x000000000000000000000000000000b53d7d4af03b4f63e21dbd5a58af40fa8c", - "0x00000000000000000000000000000000000c95aab4d933dd519d6c7f04038d37", + "0x00000000000000000000000000000091223f4ad68539a980c2415a1b213dd4d1", + "0x000000000000000000000000000000000017bfe119a8fe908c1f9d64fb429018", + "0x0000000000000000000000000000005cc4d02bbc3b53971f4bebef66b3626b93", + "0x00000000000000000000000000000000001b191464c93c4c510814a265695354", + "0x000000000000000000000000000000110d5240e3e7ec95f8000d2078b18900da", + "0x000000000000000000000000000000000026d74a6d17205b9cc1e2e62c4f3f8f", + "0x0000000000000000000000000000008668e46e84a7591396c86e074c1d6e1fa2", + "0x000000000000000000000000000000000012041bdfccf1f357132d52be5c28a4", + "0x0000000000000000000000000000003b371b9a877f8f648bc72ddf0bcceefabd", + "0x00000000000000000000000000000000002e9e2afcc9e57adb6fe37363c635f6", + "0x000000000000000000000000000000c7947e50a54fca29df321f44eadac02ab2", + "0x00000000000000000000000000000000000cd72c839a0749ff32e27a589210e3", + "0x0000000000000000000000000000001e66ee7eec7e781de51fee4582d00ff869", + "0x000000000000000000000000000000000009b9bdb36afcc839f439af80236209", + "0x000000000000000000000000000000718ea1555a35796eebe008345f8ec9acfd", + "0x00000000000000000000000000000000001d1f263be8c108605029c094bfe60c", + "0x0000000000000000000000000000009ad89d4f5af4c467eaf2a12e98bd40018b", + "0x00000000000000000000000000000000001868e0265e4289d4d866025efb15dc", + "0x000000000000000000000000000000d9a7da9cd31722ef6d593c4ec02973182f", + "0x00000000000000000000000000000000002b815752b45115d6a61ae58939487f", + "0x000000000000000000000000000000e996f5e6e9f39b3113d9e2f2e8be43e01f", + "0x00000000000000000000000000000000001be2af9b5def13ffc6372b5d8b3a96", + "0x000000000000000000000000000000ad5ae090b288e31b4873bb5ac1e9663aa8", + "0x00000000000000000000000000000000001aa1fc2f021a79bf941133bbf74386", "0x000000000000000000000000000000f70e9e557ee59748e8617834bf413c6c34", "0x000000000000000000000000000000000012423f785d94511d6bc86ac4239936", "0x000000000000000000000000000000eba093432debf1618dd778e724f2c30092", @@ -66,14 +66,14 @@ vk_path = [ "0x0000000000000000000000000000000000298c3311fc9170f92de940b042aab9", "0x000000000000000000000000000000bf37537eb196b05c1d98fa51016a9bacbb", "0x000000000000000000000000000000000007b05f408a612847259016b9204ae4", - "0x000000000000000000000000000000a40a18a9df69c69b93417d23bfdf1e7e3a", - "0x000000000000000000000000000000000008e928c676811376669748dd0caf6d", - "0x0000000000000000000000000000004edb8514724a6789a85e99c96fa6aeb62f", - "0x00000000000000000000000000000000002e35fffa9c4f8d4d5fa39efd4fd2c5", - "0x00000000000000000000000000000028f66b5fb397e2225a71fd6d6ffcefcec0", - "0x00000000000000000000000000000000001e46ca453cd829e80641cc91677a83", - "0x000000000000000000000000000000938916dc3f184bf869bc8377112da96ec2", - "0x000000000000000000000000000000000015af6baafa3a78ec8d3577569f4684", + "0x000000000000000000000000000000e7f5a392d981fb03e12fa4cbcc5e10e1ce", + "0x00000000000000000000000000000000002e07ed72701820edf94728189f663c", + "0x00000000000000000000000000000026f46e1a8d8bc68b0c7d519c3967271aad", + "0x000000000000000000000000000000000021c9724f3e2b344da84bacea0678b0", + "0x000000000000000000000000000000e822f1139a425b65a2072ce2f9b20aa9bd", + "0x00000000000000000000000000000000001e364221668286fc9e3c8ff697686b", + "0x000000000000000000000000000000f38c4a1193361973ad6b0cbadaf81d22e5", + "0x00000000000000000000000000000000001161df247661085af20f907a9df0ae", "0x000000000000000000000000000000313818546dffe2432869afa342a60f24b0", "0x0000000000000000000000000000000000099b6d7dda9dea25d6881cc787922b", "0x000000000000000000000000000000a922c293e6b92190b3ed73e09a3eec0598", @@ -82,46 +82,46 @@ vk_path = [ "0x00000000000000000000000000000000000db83b0b506917a7eb815ccfef86b7", "0x00000000000000000000000000000079248ca0ea221e4cb111b288429cb6a98c", "0x000000000000000000000000000000000005ee7ae6d29aefaa3c7f2027c2a163", - "0x0000000000000000000000000000004e3b86ef5260e0057ae7adf5cffdf099e9", - "0x00000000000000000000000000000000000f130e83127c5f4c56a662a73a7af9", - "0x000000000000000000000000000000464a404f31609f961bdd41be11aab6bdc5", - "0x0000000000000000000000000000000000022496b3c9bdb121588fbaabec3eda", - "0x00000000000000000000000000000067440797a221c483ba274c69f2c3dceaaf", - "0x0000000000000000000000000000000000152ca7f7336e4bb12e0d5128d41376", - "0x0000000000000000000000000000009c07398411638cf80db2ceff3f0aa1cc75", - "0x000000000000000000000000000000000016d8a71b5dea130cc11fa998fef3c2", - "0x000000000000000000000000000000968447f5450a13cefa00788bd59126a3b8", - "0x00000000000000000000000000000000002a64ecdd9748706f94c8dada141f4f", - "0x000000000000000000000000000000bde81eb7f3cce82941372201e11709633d", - "0x0000000000000000000000000000000000241b0ec445136f4fadd865a21137c5", - "0x000000000000000000000000000000ce0da01178b47c56d35efb764675e1537d", - "0x00000000000000000000000000000000000283a5b6f81b36da254dd46c435c40", - "0x00000000000000000000000000000020cfdc51ef678c32b5237607b53bc06353", - "0x00000000000000000000000000000000001bdadc1691fb5c96402180f5193890", - "0x000000000000000000000000000000f41ab63d01059b4790fdea0440f568b45b", - "0x00000000000000000000000000000000002caad696ac41bef7b1b8a7d2250bf0", - "0x000000000000000000000000000000b3996fb09ce9574f9632b154eb6e4743c5", - "0x0000000000000000000000000000000000106226aad9123ae94149cd678f21fc", - "0x000000000000000000000000000000907a6204191789db7a72e0ce14d7fcd489", - "0x000000000000000000000000000000000020559afe5eacbf0805b86fe25f0f49", - "0x0000000000000000000000000000006eb41296b8b3491a78f65465c017e3e94d", - "0x0000000000000000000000000000000000300302eca957220326be8a37a22c8c", - "0x000000000000000000000000000000853aa18d86b20377594e5ac1affd04d104", - "0x00000000000000000000000000000000002ded493574ec805c93ef8d23280d0c", - "0x000000000000000000000000000000fdb4b225cf021e478b7deebd7f67658ce0", - "0x00000000000000000000000000000000001a1110d7aed19fb8cc151e86046215", - "0x000000000000000000000000000000fbcf20e3bca8fbee1adb83917f18d5b8fe", - "0x00000000000000000000000000000000001fce29b139c69d8fbdf1daa57b5c10", - "0x00000000000000000000000000000051f5a82a02e8e735362a90147ab4224bc3", - "0x00000000000000000000000000000000002b21d3e1558250d2cc416d905447a0", - "0x000000000000000000000000000000e396b8b4fee678025e67f64f6f8378efc3", - "0x000000000000000000000000000000000005bd855282395fd47ece51ad8e8882", - "0x0000000000000000000000000000009d8bbc17eba9ea838161e716c1495ec604", - "0x0000000000000000000000000000000000058911c7670cbddc529c81cf244b2d", - "0x000000000000000000000000000000ab2141062e7fbbf605ef4daca8c2791768", - "0x0000000000000000000000000000000000092600b8f19b77a3d27f87e821da28", - "0x00000000000000000000000000000006bb64520d6a5d3c8ce48e05164bd73dda", - "0x0000000000000000000000000000000000023fff471462ecf9a25789ae1b6a4e", + "0x000000000000000000000000000000a24c1fe8c8d70a667b7c43f0965ca71b0a", + "0x00000000000000000000000000000000001f10bee9177abf42b02bf2ac7f7d48", + "0x00000000000000000000000000000092e9a803423bb3951826f6b6da4361dce2", + "0x00000000000000000000000000000000002b885308bbe8eb1cfaa3f62d54f4f9", + "0x000000000000000000000000000000a8710ada540056cc2f088f96398ac2429f", + "0x00000000000000000000000000000000001f8dbf533b905bba1c96fa35be5aaf", + "0x000000000000000000000000000000efa847f2f4c49964ded91326c8649b799f", + "0x0000000000000000000000000000000000001a6bd6ead0027fd5cb816ab23a94", + "0x000000000000000000000000000000f7ea096bd95312222bd03288b310e69b3b", + "0x00000000000000000000000000000000002b89023ab11a92529dc89f6a74bb39", + "0x0000000000000000000000000000001b8dbde72acb830f142d0ac030294e9398", + "0x000000000000000000000000000000000001d67d537c7ae084a59fc779e57a6c", + "0x0000000000000000000000000000009641814877623d34d126e650b9e65bfee4", + "0x000000000000000000000000000000000001f44a7fab5be3b413088c7f7022d1", + "0x000000000000000000000000000000f4f9301d4407f53c84d48f61220b1437c0", + "0x00000000000000000000000000000000002ed88287a31e3bebd36db9ee19dae0", + "0x0000000000000000000000000000004c6e602b35a9d5204b3bf8a1dcbd22c155", + "0x000000000000000000000000000000000001ab2aebc4ef0ba81eaab8ddb9a15e", + "0x0000000000000000000000000000004494f1389c16fbc006302a2eff0d45487f", + "0x00000000000000000000000000000000000355144fa7b9a6ad2848a597c6a6eb", + "0x0000000000000000000000000000009eac67fda1550d230fef42946c96fc33f4", + "0x000000000000000000000000000000000013e1f1fdc4025ab3663052cd82ae7a", + "0x000000000000000000000000000000683fc29a2bc70eb98c544689da791e9ad0", + "0x00000000000000000000000000000000002caf512caec901dba4f53b3795333f", + "0x0000000000000000000000000000003160f1edd3bb4419ee3b84eeee0ef2360e", + "0x00000000000000000000000000000000002223b0faf4b1bb8fafcc2886eb52fc", + "0x0000000000000000000000000000003d0d27ca7fa8ce5b43f896fbbff532f41d", + "0x00000000000000000000000000000000002abc2d152f4c5a8baeb75565b17c5d", + "0x0000000000000000000000000000001ad8780db333c9dc36a5e2f89f9bd4a748", + "0x00000000000000000000000000000000000c7e06a5ecdf8fb3f3540749d548f2", + "0x0000000000000000000000000000008aa0b0c8b6fd3a9548a4b3eab5b978cd59", + "0x000000000000000000000000000000000024f77767673f246affa67a1893b049", + "0x00000000000000000000000000000003b3b754d0ed99b777b273ff79f936a060", + "0x0000000000000000000000000000000000085a0648bbc843d6c89fe0299af720", + "0x000000000000000000000000000000fa92d755d16145f1dfffa636e7ba69cda8", + "0x000000000000000000000000000000000003b0ca02382f5268be7b09399d1232", + "0x00000000000000000000000000000004c096201e545e000e354ef08137740d5a", + "0x00000000000000000000000000000000000c9895afe8a9052bbe67081321c321", + "0x00000000000000000000000000000057f1e381eefff0dc9413376b3c64a34a4c", + "0x00000000000000000000000000000000001e8ec07380b1828228adb11fd37bb4", "0x000000000000000000000000000000f6f4596202301b6ae4eb0ebbeadd203340", "0x00000000000000000000000000000000000adc89c48d75b571636f5bbeb4a806", "0x00000000000000000000000000000000034e3e27454ef992b4bf84b97baa7471", @@ -142,10 +142,10 @@ vk_path = [ "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000002", "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x000000000000000000000000000000e37605c032872aa8c40928e87bdef9a537", - "0x00000000000000000000000000000000001324b7f1c1679dbd167d6119136093", - "0x000000000000000000000000000000cadb9de64c6a202e85d281d1657383bb24", - "0x000000000000000000000000000000000004d6ab115a752f6f77299ac948246b", + "0x000000000000000000000000000000d9cc7b9d665e338d41840f4718ae7154bd", + "0x00000000000000000000000000000000002de6e434bae4be387d86b03fbe2df6", + "0x0000000000000000000000000000008acc82d5ef24f0f4ac90145a78a50f10c5", + "0x00000000000000000000000000000000002fc6d79bb0c0387c440c1efa88b8c1", "0x0000000000000000000000000000005f9e8d701589b5d6314c59ae7c912e4ae0", "0x000000000000000000000000000000000004dd3165471398859c3fe5b6df48a1", "0x000000000000000000000000000000b9816f9688118168f4ba9ca6a86fd1e32d", @@ -155,28 +155,28 @@ vk_path = [ "0x00000000000000000000000000000078f4b3bc61f19d6e7069359bbf47e7f907", "0x00000000000000000000000000000000002d7c18a93c3dae58809faaeec6a86a" ] - hash = "0x1cbd01322e91a204056b0dcb80677dda3ae61cbbf1be14d57bc29749f4e32a7e" + hash = "0x1f358feb0c3fe775cedf5d3447d77a581d3d61f71061bd409c7e3cf43dc6d235" [previous_kernel_public_inputs] min_revertible_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000003" is_private_only = false -claimed_first_nullifier = "0x266e118edce09f802caf024c0b2db16a4644e03ed16a2bb319d7a2c6b49970ac" +claimed_first_nullifier = "0x014c66f29a7eb6ce8bf49cf561b73ed6ea9951bdadd762cf4bf9109ce6f57831" [previous_kernel_public_inputs.constants] - vk_tree_root = "0x1644418d6d00aefd0815a5576611abd0bf6f4770a2a2d6b5356808aac5245292" - protocol_contract_tree_root = "0x02dae744a60621d793d9f228e36975aec8ab5cdc963876aad4a3767866b1fd65" + vk_tree_root = "0x2ba54c972cf77b8b1541068bc9d6efea305f2422a3a0295f8a8577f0761a6b7a" + protocol_contract_tree_root = "0x093cc9324e5a7b44883f515ac490e7294ef8cb1e6d2d8c503255b1b3a9409262" [previous_kernel_public_inputs.constants.historical_header] - total_fees = "0x0000000000000000000000000000000000000000000000000000021ff53c53cc" - total_mana_used = "0x000000000000000000000000000000000000000000000000000000000003dea9" + total_fees = "0x00000000000000000000000000000000000000000000000000000017cbdfe5c0" + total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000040a0" [previous_kernel_public_inputs.constants.historical_header.last_archive] - root = "0x05b3bb5109d47ed6719879aaf4064be70759479be53c4e77aef08be7de6ed42c" + root = "0x2c2dee3e4de82ce3267221e2671249538d25fe7a792930c392177cd932879b53" next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000006" [previous_kernel_public_inputs.constants.historical_header.content_commitment] num_txs = "0x0000000000000000000000000000000000000000000000000000000000000001" - blobs_hash = "0x008f59895cfcbae4d2c4235f44091341c26560b47821e99d39e2e208b8b844b3" + blobs_hash = "0x009499f9dba9d906a536f619200051a9a03e6e17be83ed9de4121f00f6e30b6a" in_hash = "0x00089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c" out_hash = "0x0000000000000000000000000000000000000000000000000000000000000000" @@ -185,33 +185,33 @@ root = "0x2e33ee2008411c04b99c24b313513d097a0d21a5040b6193d1f978b8226892d6" next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000060" [previous_kernel_public_inputs.constants.historical_header.state.partial.note_hash_tree] -root = "0x0887b34d5f375a58a62bd1ff4652387c631157b2a6dede7ca0a43cc8cdf07d92" -next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000180" +root = "0x28381944bf13a39e8ed86a424a107557e13c45e95b5190e989d32d6f436d05d9" +next_available_leaf_index = "0x00000000000000000000000000000000000000000000000000000000000001c0" [previous_kernel_public_inputs.constants.historical_header.state.partial.nullifier_tree] -root = "0x040941eb6ab29e9509bfeb0ee4760284aa10b9361ccc18269f1e52647b7e8f89" -next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000200" +root = "0x2836608b784c1864d0fa08de3fbc61229a9412f873d3e95f29443d085df14a40" +next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000240" [previous_kernel_public_inputs.constants.historical_header.state.partial.public_data_tree] -root = "0x2798b6a996d1e50d16ca17964d07b47bffe461d51db772e326bf5ad11641dd29" -next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000099" +root = "0x171eabceba1b6562baa3bb3d255a0f5ce70f052fe0a7b71dda6c792bbb6b5442" +next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000093" [previous_kernel_public_inputs.constants.historical_header.global_variables] chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69" version = "0x0000000000000000000000000000000000000000000000000000000000000001" block_number = "0x0000000000000000000000000000000000000000000000000000000000000006" - slot_number = "0x0000000000000000000000000000000000000000000000000000000000000009" - timestamp = "0x0000000000000000000000000000000000000000000000000000000067b6ec12" + slot_number = "0x0000000000000000000000000000000000000000000000000000000000000007" + timestamp = "0x0000000000000000000000000000000000000000000000000000000067c9aa0a" [previous_kernel_public_inputs.constants.historical_header.global_variables.coinbase] - inner = "0x000000000000000000000000eb6355a62d6434cf7ece9a27ea91a2167604d246" + inner = "0x0000000000000000000000000000000000000000000000000000000000000000" [previous_kernel_public_inputs.constants.historical_header.global_variables.fee_recipient] inner = "0x0000000000000000000000000000000000000000000000000000000000000000" [previous_kernel_public_inputs.constants.historical_header.global_variables.gas_fees] fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000" - fee_per_l2_gas = "0x00000000000000000000000000000000000000000000000000000000008c90ec" + fee_per_l2_gas = "0x00000000000000000000000000000000000000000000000000000000005e43d6" [previous_kernel_public_inputs.constants.tx_context] chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69" @@ -227,7 +227,7 @@ l2_gas = "0x00000000000000000000000000000000000000000000000000000000005b8d80" [previous_kernel_public_inputs.constants.tx_context.gas_settings.max_fees_per_gas] fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000" -fee_per_l2_gas = "0x00000000000000000000000000000000000000000000000000000000001876ad" +fee_per_l2_gas = "0x00000000000000000000000000000000000000000000000000000000008d65c1" [previous_kernel_public_inputs.constants.tx_context.gas_settings.max_priority_fees_per_gas] fee_per_da_gas = "0x0000000000000000000000000000000000000000000000000000000000000000" @@ -2739,7 +2739,7 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000" [[previous_kernel_public_inputs.end.nullifiers]] [previous_kernel_public_inputs.end.nullifiers.nullifier] -value = "0x266e118edce09f802caf024c0b2db16a4644e03ed16a2bb319d7a2c6b49970ac" +value = "0x014c66f29a7eb6ce8bf49cf561b73ed6ea9951bdadd762cf4bf9109ce6f57831" counter = "0x0000000000000000000000000000000000000000000000000000000000000000" note_hash = "0x0000000000000000000000000000000000000000000000000000000000000000" @@ -2748,8 +2748,8 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000" [[previous_kernel_public_inputs.end.nullifiers]] [previous_kernel_public_inputs.end.nullifiers.nullifier] -value = "0x0000000000000000000000000000000000000000000000000000000000000000" -counter = "0x0000000000000000000000000000000000000000000000000000000000000000" +value = "0x03d4f9cd59e08fd4662b63bf9bd0d5efb00db494bc9207b0a3c399f2c50695a2" +counter = "0x0000000000000000000000000000000000000000000000000000000000000007" note_hash = "0x0000000000000000000000000000000000000000000000000000000000000000" [previous_kernel_public_inputs.end.nullifiers.contract_address] @@ -3404,24 +3404,24 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000" [[previous_kernel_public_inputs.end.private_logs]] [previous_kernel_public_inputs.end.private_logs.inner] note_hash_counter = "0x0000000000000000000000000000000000000000000000000000000000000000" -counter = "0x0000000000000000000000000000000000000000000000000000000000000000" +counter = "0x0000000000000000000000000000000000000000000000000000000000000008" [previous_kernel_public_inputs.end.private_logs.inner.log] fields = [ - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000000000000000000000000000000000000000000000000000", + "0x2ec28b91a5f838506d6042915005ff55cf7a0a5f889a83b11faed33a31b486f2", + "0x01a427aa5c623d3ee415749bace24cae6041f5a6bd5ce5d361e1328d0cfac100", + "0x0000000000000000000000000000000000000000000000000000000000000001", + "0x0000000000000000000000000000000000000000000000000000000000000001", + "0x0af6b8e4ecfffa69919320e29a4e35d49416da2422ab9255132d7a986c96de31", + "0x29b0cc40491b7b747910fcebc0da2b6e49da44807e462f35c831a63e1fd6c511", + "0x01498945581e0eb9f8427ad6021184c700ef091d570892c437d12c7d90364bbd", + "0x170ae506787c5c43d6ca9255d571c10fa9ffa9d141666e290c347c5c9ab7e344", + "0x00c044b05b6ca83b9c2dbae79cc1135155956a64e136819136e9947fe5e5866c", + "0x1c1f0ca244c7cd46b682552bff8ae77dea40b966a71de076ec3b7678f2bdb151", + "0x1b00316144359e9a3ec8e49c1cdb7eeb0cedd190dfd9dc90eea5115aa779e287", + "0x080ffc74d7a8b0bccb88ac11f45874172f3847eb8b92654aaa58a3d2b8dc7833", + "0x019c111f36ad3fc1d9b7a7a14344314d2864b94f030594cd67f753ef774a1efb", + "0x2039907fe37f08d10739255141bb066c506a12f7d1e8dfec21abc58494705b6f", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -4371,17 +4371,17 @@ length = "0x0000000000000000000000000000000000000000000000000000000000000000" inner = "0x0000000000000000000000000000000000000000000000000000000000000000" [[previous_kernel_public_inputs.end.public_call_requests]] -counter = "0x0000000000000000000000000000000000000000000000000000000000000003" +counter = "0x000000000000000000000000000000000000000000000000000000000000000a" [previous_kernel_public_inputs.end.public_call_requests.inner] - is_static_call = true - args_hash = "0x2cd9fc423990e79142a1a1c44621909d8a969d0fc37b3060e73cdf5b3c752f8c" + is_static_call = false + args_hash = "0x144291ad9eea6a895eac8025f0e7f611d718ee9b24fe633f3f4f31c4d01d78d6" [previous_kernel_public_inputs.end.public_call_requests.inner.msg_sender] - inner = "0x1c37466c1edf1ec26e28b0978459d3c3337b8d88e25eacfb3b37687cd08d27b1" + inner = "0x09dc3cd12308a798cc8c1bd1384ebe1feb5fb52331e7f08f7893f3b0566cc408" [previous_kernel_public_inputs.end.public_call_requests.inner.contract_address] - inner = "0x1ba22c36a8f0d810f76d8abd5600129314cdd9777fc4ff0a6e241210824f1f17" + inner = "0x01a427aa5c623d3ee415749bace24cae6041f5a6bd5ce5d361e1328d0cfac100" [previous_kernel_public_inputs.end.public_call_requests.inner.function_selector] inner = "0x00000000000000000000000000000000000000000000000000000000d5441b0d" @@ -5040,4 +5040,4 @@ end_side_effect_counter = "0x000000000000000000000000000000000000000000000000000 inner = "0x0000000000000000000000000000000000000000000000000000000000000000" [previous_kernel_public_inputs.fee_payer] - inner = "0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000" + inner = "0x09dc3cd12308a798cc8c1bd1384ebe1feb5fb52331e7f08f7893f3b0566cc408" diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/utils/arrays/assert_split_transformed_value_arrays.nr b/noir-projects/noir-protocol-circuits/crates/types/src/utils/arrays/assert_split_transformed_value_arrays.nr index e933e68f5f1..c0a5b7a541d 100644 --- a/noir-projects/noir-protocol-circuits/crates/types/src/utils/arrays/assert_split_transformed_value_arrays.nr +++ b/noir-projects/noir-protocol-circuits/crates/types/src/utils/arrays/assert_split_transformed_value_arrays.nr @@ -13,8 +13,11 @@ where S: Empty + Eq, { if num_non_revertibles != 0 { + // If num_non_revertibles == 0, then the below can still underflow and cause 'Failed constraint' error, + // even though it shouldn't reach here. If statement branches aren't isolated? + let is_non_zero = (num_non_revertibles != 0) as u32; assert( - sorted_array[num_non_revertibles - 1].counter() < split_counter, + sorted_array[num_non_revertibles - 1].counter() * is_non_zero < split_counter, "counter of last non-revertible item is not less than the split counter", ); } diff --git a/yarn-project/pxe/src/kernel_prover/kernel_prover.ts b/yarn-project/pxe/src/kernel_prover/kernel_prover.ts index 9faeb4f4752..e8597c59e72 100644 --- a/yarn-project/pxe/src/kernel_prover/kernel_prover.ts +++ b/yarn-project/pxe/src/kernel_prover/kernel_prover.ts @@ -21,9 +21,7 @@ import { PrivateKernelTailCircuitPrivateInputs, type PrivateKernelTailCircuitPublicInputs, PrivateVerificationKeyHints, - type ScopedPrivateLogData, } from '@aztec/stdlib/kernel'; -import type { PrivateLog } from '@aztec/stdlib/logs'; import { ClientIvcProof } from '@aztec/stdlib/proofs'; import { type PrivateCallExecutionResult, @@ -38,48 +36,10 @@ import { import { VerificationKeyAsFields } from '@aztec/stdlib/vks'; import type { WitnessMap } from '@noir-lang/types'; -import { strict as assert } from 'assert'; import { PrivateKernelResetPrivateInputsBuilder } from './hints/build_private_kernel_reset_private_inputs.js'; import type { ProvingDataOracle } from './proving_data_oracle.js'; -// TODO(#10592): Temporary workaround to check that the private logs are correctly split into non-revertible set and revertible set. -// This should be done in TailToPublicOutputValidator in private kernel tail. -function checkPrivateLogs( - privateLogs: ScopedPrivateLogData[], - nonRevertiblePrivateLogs: PrivateLog[], - revertiblePrivateLogs: PrivateLog[], - splitCounter: number, -) { - let numNonRevertible = 0; - let numRevertible = 0; - privateLogs - .filter(privateLog => privateLog.inner.counter !== 0) - .forEach(privateLog => { - if (privateLog.inner.counter < splitCounter) { - assert( - privateLog.inner.log.toBuffer().equals(nonRevertiblePrivateLogs[numNonRevertible].toBuffer()), - `mismatch non-revertible private logs at index ${numNonRevertible}`, - ); - numNonRevertible++; - } else { - assert( - privateLog.inner.log.toBuffer().equals(revertiblePrivateLogs[numRevertible].toBuffer()), - `mismatch revertible private logs at index ${numRevertible}`, - ); - numRevertible++; - } - }); - assert( - nonRevertiblePrivateLogs.slice(numNonRevertible).every(l => l.isEmpty()), - 'Unexpected non-empty private log in non-revertible set.', - ); - assert( - revertiblePrivateLogs.slice(numRevertible).every(l => l.isEmpty()), - 'Unexpected non-empty private log in revertible set.', - ); -} - const NULL_PROVE_OUTPUT: PrivateKernelSimulateOutput = { publicInputs: PrivateKernelCircuitPublicInputs.empty(), verificationKey: VerificationKeyAsFields.makeEmpty(CLIENT_IVC_VERIFICATION_KEY_LENGTH_IN_FIELDS), @@ -309,12 +269,6 @@ export class KernelProver { const tailOutput = generateWitnesses ? await this.proofCreator.generateTailOutput(privateInputs) : await this.proofCreator.simulateTail(privateInputs); - if (tailOutput.publicInputs.forPublic) { - const privateLogs = privateInputs.previousKernel.publicInputs.end.privateLogs; - const nonRevertiblePrivateLogs = tailOutput.publicInputs.forPublic.nonRevertibleAccumulatedData.privateLogs; - const revertiblePrivateLogs = tailOutput.publicInputs.forPublic.revertibleAccumulatedData.privateLogs; - checkPrivateLogs(privateLogs, nonRevertiblePrivateLogs, revertiblePrivateLogs, validationRequestsSplitCounter); - } acirs.push(tailOutput.bytecode); witnessStack.push(tailOutput.outputWitness);