Sort and slice db and pending notes. #1112
Merged
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
dbanks12
approved these changes
Jul 19, 2023
Comment on lines
-10
to
+22
| * The format that noir contracts use to get notes. | ||
| * Information about a note needed during execution. | ||
| */ | ||
| export interface NoteLoadOracleInputs { | ||
| /** | ||
| * The nonce of the note. | ||
| */ | ||
| export interface NoteData { | ||
| /** The contract address of the note. */ | ||
| contractAddress: AztecAddress; | ||
| /** The storage slot of the note. */ | ||
| storageSlot: Fr; | ||
| /** The nonce of the note. */ | ||
| nonce: Fr; | ||
| /** | ||
| * The preimage of the note. | ||
| */ | ||
| /** The preimage of the note */ | ||
| preimage: Fr[]; | ||
| /** | ||
| * The note's leaf index in the private data tree. | ||
| */ | ||
| index: bigint; | ||
| /** The note's leaf index in the private data tree. Undefined for pending notes. */ | ||
| index?: bigint; |
There was a problem hiding this comment.
nice cleanup merging these two structs
Comment on lines
+117
to
120
| // TODO(https://github.com/AztecProtocol/aztec-packages/issues/920): don't 'get' notes nullified in pendingNullifiers | ||
| const pendingNotes = this.pendingNotes.filter( | ||
| n => n.contractAddress.equals(contractAddress) && n.storageSlot.equals(storageSlotField), | ||
| ); |
|
|
||
| import { SortOrder, pickNotes } from './pick_notes.js'; | ||
|
|
||
| describe('getNotes', () => { |
| ); | ||
|
|
||
| // TODO: Sort again. | ||
| const notes = [...pendingNotes, ...dbNotes].slice(offset, limit ? offset + limit : undefined); | ||
| const dbNotes = await this.db.getNotes(contractAddress, storageSlotField); |
There was a problem hiding this comment.
So will this just get ALL notes from the DB that match contractAddress & slot?
There was a problem hiding this comment.
Yeah, we have to do that anyway :( Because the preimage is stored as a single field in the db. So we always need to get all notes matching the contractAddress and slot, to parse it, sort it, and slice it.
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.
Description
Closes #1030
Checklist: