Skip to content

fix: bad merge#6767

Merged
benesjan merged 1 commit intomasterfrom
05-30-fix_bad_merge
May 30, 2024
Merged

fix: bad merge#6767
benesjan merged 1 commit intomasterfrom
05-30-fix_bad_merge

Conversation

@benesjan
Copy link
Contributor

It broke

Copy link
Contributor Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @benesjan and the rest of your teammates on Graphite Graphite

MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_DATA_READS_PER_CALL,
MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_CALL, MAX_NEW_L2_TO_L1_MSGS_PER_CALL,
MAX_NEW_NULLIFIERS_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_DATA_READS_PER_CALL,
MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just ran formatter

@@ -5,11 +5,12 @@ use crate::{
},
address::AztecAddress,
constants::{
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just ran formatter

@@ -10,11 +10,11 @@ use crate::{
};
use crate::{
constants::{
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just ran formatter


// Insert note
owner_balance.insert(&mut note, true, outgoing_viewer_ovpk_m, owner_ivpk_m);
owner_balance.insert(&mut note, outgoing_viewer_ovpk_m, owner_ivpk_m);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The broadcast param has been nuked in this PR

@benesjan benesjan enabled auto-merge (squash) May 30, 2024 13:17
@benesjan benesjan merged commit c745b7b into master May 30, 2024
@benesjan benesjan deleted the 05-30-fix_bad_merge branch May 30, 2024 13:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants