fix: unencryptedlogs witgen #8669
Open
+85
−31
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This stack of pull requests is managed by Graphite. Learn more about stacking. Join @IlyasRidhuan and the rest of your teammates on |
IlyasRidhuan
commented
Sep 20, 2024
| + to_hex(OpCode::CAST_8) + // opcode CAST | ||
| "00" // Indirect flag | ||
| + to_hex(AvmMemoryTag::FF) + | ||
| std::string bytecode_hex = to_hex(OpCode::SET_8) + // opcode Set |
There was a problem hiding this comment.
This is just some formatting
IlyasRidhuan
commented
Sep 20, 2024
| @@ -1902,13 +1901,15 @@ TEST_F(AvmExecutionTests, kernelOutputEmitOpcodes) | |||
| // CHECK EMIT UNENCRYPTED LOG | |||
| auto emit_log_row = | |||
| std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.main_sel_op_emit_unencrypted_log == 1; }); | |||
| EXPECT_EQ(emit_log_row->main_ia, 1); | |||
| // Trust me bro for now, this is the truncated sha output | |||
| FF expected_hash = FF(std::string("0x006db65fd59fd356f6729140571b5bcd6bb3b83492a16e1bf0a3884442fc3c8a")); | |||
There was a problem hiding this comment.
Now that witgen calculates the truncated sha256 hash of the logs, we need to do the same - I promise this is the real hash
IlyasRidhuan
commented
Sep 20, 2024
| @@ -57,8 +57,8 @@ class AvmKernelTraceBuilder { | |||
| std::unordered_map<uint32_t, uint32_t> kernel_output_selector_counter; | |||
|
|
|||
| AvmKernelTraceBuilder(uint32_t initial_side_effect_counter, VmPublicInputs public_inputs, ExecutionHints hints) | |||
| : initial_side_effect_counter(initial_side_effect_counter) | |||
| , public_inputs(std::move(public_inputs)) | |||
| : public_inputs(std::move(public_inputs)) | |||
There was a problem hiding this comment.
Had to re-order this because public_inputs is now public (because i need it to get the contract address until we have bytecode hashing) and clang complains if it's not initialized first
IlyasRidhuan
commented
Sep 20, 2024
| @@ -92,14 +92,16 @@ class AvmKernelTraceBuilder { | |||
| void op_nullifier_exists(uint32_t clk, uint32_t side_effect_counter, const FF& nullifier, uint32_t result); | |||
| void op_emit_nullifier(uint32_t clk, uint32_t side_effect_counter, const FF& nullifier); | |||
| void op_l1_to_l2_msg_exists(uint32_t clk, uint32_t side_effect_counter, const FF& message, uint32_t result); | |||
| void op_emit_unencrypted_log(uint32_t clk, uint32_t side_effect_counter, const FF& log_hash); | |||
| void op_emit_unencrypted_log(uint32_t clk, uint32_t side_effect_counter, const FF& log_hash, const FF& log_length); | |||
There was a problem hiding this comment.
emit_unencrypted_log actually has metadata, but we weren't properly handling
IlyasRidhuan
commented
Sep 20, 2024
| // we need to add four to the length here. | ||
| // https://github.com/AztecProtocol/aztec-packages/issues/6578#issuecomment-2125003435 | ||
| this.unencryptedLogsHashes.push(new LogHash(basicLogHash, this.sideEffectCounter, new Fr(ulog.length + 4))); | ||
| this.unencryptedLogsHashes.push(new LogHash(basicLogHash, this.sideEffectCounter, new Fr(ulog.length))); |
There was a problem hiding this comment.
the +4 is actually already handled in the .length call of the class
IlyasRidhuan
requested review from
fcarreiro,
dbanks12 and
jeanmon
as code owners
fcarreiro
approved these changes
Sep 20, 2024
IlyasRidhuan
force-pushed
the
ir/09-19-fix_unencryptedlogs_witgen
branch
from
8299a93
to
ce9c31c
Compare
IlyasRidhuan
force-pushed
the
ir/09-19-fix_unencryptedlogs_witgen
branch
from
ce9c31c
to
db50ed4
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please read contributing guidelines and remove this line.