Skip to content

fix: pass along coinbase #13560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexghr merged 1 commit into from
Apr 22, 2025
Merged

fix: pass along coinbase #13560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions ...circuits/crates/rollup-lib/src/block_root/components/block_root_rollup_output_composer.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,10 @@ impl BlockRootRollupOutputComposer {
};

let mut fees = [FeeRecipient::empty(); AZTEC_MAX_EPOCH_DURATION];
if accumulated_fees != 0 {
fees[0] = FeeRecipient {
recipient: constants.global_variables.coinbase,
value: accumulated_fees,
};
}
fees[0] = FeeRecipient {
recipient: constants.global_variables.coinbase,
value: accumulated_fees,
};

let mut blob_public_inputs = [BlockBlobPublicInputs::empty(); AZTEC_MAX_EPOCH_DURATION];
blob_public_inputs[0] = block_blob_public_inputs;
Expand Down
12 changes: 9 additions & 3 deletions ...noir-protocol-circuits/crates/rollup-lib/src/block_root/empty_block_root_rollup_inputs.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,17 @@ impl EmptyBlockRootRollupInputs {

mod tests {
use crate::{
abis::block_root_or_block_merge_public_inputs::BlockRootOrBlockMergePublicInputs,
abis::block_root_or_block_merge_public_inputs::{
BlockRootOrBlockMergePublicInputs, FeeRecipient,
},
block_root::empty_block_root_rollup_inputs::{
EMPTY_EFFECT_BLOB_CHALLENGE_Z, EMPTY_EFFECT_BLOB_COMMITMENT, EMPTY_EFFECT_BLOBS_HASH,
EmptyBlockRootRollupInputs,
},
tests::rollup_fixture_builder::RollupFixtureBuilder,
};
use std::hash::poseidon2::Poseidon2;
use types::{abis::sponge_blob::SpongeBlob, tests::utils::assert_array_eq};
use types::{abis::sponge_blob::SpongeBlob, address::EthAddress, tests::utils::assert_array_eq};

pub struct TestBuilder {
pub inputs: RollupFixtureBuilder,
Expand Down Expand Up @@ -93,7 +95,10 @@ mod tests {
assert(output.previous_block_hash != output.end_block_hash);
assert_eq(output.start_global_variables, output.end_global_variables);
assert_eq(output.out_hash, 0);
assert_array_eq(output.fees, []);
assert_array_eq(
output.fees,
[FeeRecipient { recipient: builder.inputs.global_variables.coinbase, value: 0 }],
);

// The below values are generated from block_building_helper.test.ts.
let expected_empty_effect_blobs_hash =
Expand Down Expand Up @@ -130,6 +135,7 @@ mod tests {
unconstrained fn correct_empty_block_root_rollup_output_for_padding() {
let mut builder = TestBuilder::new();
builder.is_padding = true;
builder.inputs.global_variables.coinbase = EthAddress::from_field(0);

let output = builder.execute();

Expand Down