Skip to content
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.

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

chore: misc AVM migration prep changes #6253

Merged
merged 1 commit into from
May 7, 2024
Merged

Conversation

dbanks12
Copy link
Collaborator

@dbanks12 dbanks12 commented May 7, 2024

Remove usage of debug and header oracles in contracts which aren't yet supported by AVM. Transpile all noir-contracts instead of only those prefixed with avm_ (functions are checked anyway to see if they are tagged public-vm before transpilation).

@dbanks12 dbanks12 requested a review from fcarreiro as a code owner May 7, 2024 17:53
Copy link
Collaborator Author

dbanks12 commented May 7, 2024

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

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

@dbanks12 dbanks12 force-pushed the db/avm-migration-prep branch from ba0e191 to 3ed5b90 Compare May 7, 2024 17:54
@dbanks12 dbanks12 changed the title chore: remove usage of debug and header oracles in contracts which aren't yet supported by AVM chore: misc AVM migration prep changes May 7, 2024
Comment on lines -434 to 447
let registry_private_getter: SharedMutablePrivateGetter<Field, 5> = SharedMutablePrivateGetter::new(context, AztecAddress::from_field(CANONICAL_KEY_REGISTRY_ADDRESS), derived_slot);
let registry_private_getter: SharedMutablePrivateGetter<Field, 5> = SharedMutablePrivateGetter::new(
context,
AztecAddress::from_field(CANONICAL_KEY_REGISTRY_ADDRESS),
derived_slot
);
registry_private_getter.get_current_value_in_private()
}

#[aztec(private)]
fn test_nullifier_key_freshness(
address: AztecAddress,
public_nullifying_key: GrumpkinPoint,
) {
fn test_nullifier_key_freshness(address: AztecAddress, public_nullifying_key: GrumpkinPoint) {
assert_eq(get_npk_m(&mut context, address), public_nullifying_key);
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Auto-formatting by LSP

expect(revertReason?.message).toMatch(`Invalid header hash`);
});
});
// TODO(4840): add AVM opcodes for getting header (members)
Copy link
Contributor

Choose a reason for hiding this comment

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

Would a describe.skip work?
Otherwise, /* */ might be less disruptive?
(I don't feel strongly on any changes tho)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good point! I didn't think .skip would work, but I was thinking of e2e stuff when we call functions by name, vs here we are looking for a string in the artifact. I'll do .skip :)

@dbanks12 dbanks12 force-pushed the db/avm-migration-prep branch from 3ed5b90 to 7948274 Compare May 7, 2024 18:00
@dbanks12 dbanks12 force-pushed the db/avm-migration-prep branch from 7948274 to caec1d8 Compare May 7, 2024 19:25
@dbanks12 dbanks12 merged commit fe19404 into master May 7, 2024
63 checks passed
@dbanks12 dbanks12 deleted the db/avm-migration-prep branch May 7, 2024 19:55
TomAFrench added a commit that referenced this pull request May 8, 2024
* master: (25 commits)
  fix: Enable client proof tests (#6249)
  chore: update cspell for abi demonomorphizer (#6258)
  feat(aztec-nr): add 'with_gas()' function to avm call interface (#6256)
  git subrepo push --branch=master noir-projects/aztec-nr
  git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]
  chore: replace relative paths to noir-protocol-circuits
  git subrepo push --branch=master barretenberg
  fix: Pw/update merge check (#6201)
  chore(master): Release 0.37.1 (#6148)
  fix: Cl/split out e2e tests (#6242)
  feat: Typings generator with generics (#6235)
  chore(ci): fix restarts with fresh spot, acir test fixes, non-mandatory benches (#6226)
  chore: misc AVM migration prep changes (#6253)
  feat!: AES blackbox (#6016)
  chore(docs): Fix some typos in specs of private kernel initial (#6224)
  chore(aztec-macros): avm function return types are auto tagged as `pub` (#6250)
  chore(aztec-nr): create a 'with_selector' version of `emit_unencrypted_log` in avm context (#6248)
  fix: registering PublicDataWitness in JsonRpcServer (#6243)
  feat: Sync from noir (#6234)
  feat(avm-simulator): consider previous pending nullifiers across enqueued calls (#6188)
  ...
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