@aztec/sequencer-client 0.27.0 → 0.27.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/dest/sequencer/abstract_phase_manager.d.ts.map +1 -1
  2. package/dest/sequencer/abstract_phase_manager.js +6 -4
  3. package/dest/sequencer/hints_builder.d.ts +9 -3
  4. package/dest/sequencer/hints_builder.d.ts.map +1 -1
  5. package/dest/sequencer/hints_builder.js +26 -5
  6. package/package.json +13 -13
  7. package/src/sequencer/abstract_phase_manager.ts +17 -2
  8. package/src/sequencer/hints_builder.ts +42 -6
package/dest/sequencer/abstract_phase_manager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"abstract_phase_manager.d.ts","sourceRoot":"","sources":["../../src/sequencer/abstract_phase_manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"abstract_phase_manager.d.ts","sourceRoot":"","sources":["../../src/sequencer/abstract_phase_manager.ts"],"names":[],"mappings":"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"}
package/dest/sequencer/abstract_phase_manager.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { MerkleTreeId } from '@aztec/circuit-types';
2
- import { AztecAddress, CallRequest, ContractStorageRead, ContractStorageUpdateRequest, Fr, L2ToL1Message, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL, MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_DATA_READS_PER_CALL, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MembershipWitness, PublicCallData, PublicCallStackItem, PublicCircuitPublicInputs, PublicDataRead, PublicDataUpdateRequest, PublicKernelCircuitPrivateInputs, PublicKernelData, PublicKernelTailCircuitPrivateInputs, RETURN_VALUES_LENGTH, ReadRequest, SideEffect, SideEffectLinkedToNoteHash, VK_TREE_HEIGHT, } from '@aztec/circuits.js';
2
+ import { AztecAddress, CallRequest, ContractStorageRead, ContractStorageUpdateRequest, Fr, L2ToL1Message, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_CALL, MAX_NEW_NULLIFIERS_PER_CALL, MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL, MAX_NULLIFIER_READ_REQUESTS_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_DATA_READS_PER_CALL, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, MAX_REVERTIBLE_PUBLIC_DATA_READS_PER_TX, MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MembershipWitness, PublicCallData, PublicCallStackItem, PublicCircuitPublicInputs, PublicDataRead, PublicDataUpdateRequest, PublicKernelCircuitPrivateInputs, PublicKernelData, PublicKernelTailCircuitPrivateInputs, RETURN_VALUES_LENGTH, ReadRequest, SideEffect, SideEffectLinkedToNoteHash, VK_TREE_HEIGHT, } from '@aztec/circuits.js';
3
3
  import { computeVarArgsHash } from '@aztec/circuits.js/hash';
4
4
  import { arrayNonEmptyLength, padArrayEnd } from '@aztec/foundation/collection';
5
5
  import { createDebugLogger } from '@aztec/foundation/log';
@@ -131,8 +131,9 @@ export class AbstractPhaseManager {
131
131
  const previousKernel = this.getPreviousKernelData(previousOutput, previousProof);
132
132
  if (this.phase === PublicKernelPhase.TAIL) {
133
133
  const { endNonRevertibleData, end } = previousOutput;
134
- const nullifierReadRequestResetHints = await this.hintsBuilder.getNullifierReadRequestResetHints(endNonRevertibleData.nullifierReadRequests, end.nullifierReadRequests, endNonRevertibleData.newNullifiers, end.newNullifiers);
135
- const inputs = new PublicKernelTailCircuitPrivateInputs(previousKernel, nullifierReadRequestResetHints);
134
+ const nullifierReadRequestHints = await this.hintsBuilder.getNullifierReadRequestHints(endNonRevertibleData.nullifierReadRequests, end.nullifierReadRequests, endNonRevertibleData.newNullifiers, end.newNullifiers);
135
+ const nullifierNonExistentReadRequestHints = await this.hintsBuilder.getNullifierNonExistentReadRequestHints(endNonRevertibleData.nullifierNonExistentReadRequests, endNonRevertibleData.newNullifiers, end.newNullifiers);
136
+ const inputs = new PublicKernelTailCircuitPrivateInputs(previousKernel, nullifierReadRequestHints, nullifierNonExistentReadRequestHints);
136
137
  return this.publicKernel.publicKernelCircuitTail(inputs);
137
138
  }
138
139
  if (!callData) {
@@ -173,6 +174,7 @@ export class AbstractPhaseManager {
173
174
  newL2ToL1Msgs: padArrayEnd(result.newL2ToL1Messages, L2ToL1Message.empty(), MAX_NEW_L2_TO_L1_MSGS_PER_CALL),
174
175
  returnValues: padArrayEnd(result.returnValues, Fr.ZERO, RETURN_VALUES_LENGTH),
175
176
  nullifierReadRequests: padArrayEnd(result.nullifierReadRequests, ReadRequest.empty(), MAX_NULLIFIER_READ_REQUESTS_PER_CALL),
177
+ nullifierNonExistentReadRequests: padArrayEnd(result.nullifierNonExistentReadRequests, ReadRequest.empty(), MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL),
176
178
  contractStorageReads: padArrayEnd(result.contractStorageReads, ContractStorageRead.empty(), MAX_PUBLIC_DATA_READS_PER_CALL),
177
179
  contractStorageUpdateRequests: padArrayEnd(result.contractStorageUpdateRequests, ContractStorageUpdateRequest.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL),
178
180
  publicCallStackHashes,
@@ -285,4 +287,4 @@ function patchPublicStorageActionOrdering(publicInputs, execResult, phase) {
285
287
  ? MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
286
288
  : MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
287
289
  }
288
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"abstract_phase_manager.js","sourceRoot":"","sources":["../../src/sequencer/abstract_phase_manager.ts"],"names":[],"mappings":"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"}
290
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"abstract_phase_manager.js","sourceRoot":"","sources":["../../src/sequencer/abstract_phase_manager.ts"],"names":[],"mappings":"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"}
package/dest/sequencer/hints_builder.d.ts CHANGED
@@ -1,13 +1,19 @@
1
- import { Fr, MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX, MAX_REVERTIBLE_NULLIFIERS_PER_TX, MembershipWitness, NullifierLeafPreimage, ReadRequestContext, SideEffectLinkedToNoteHash } from '@aztec/circuits.js';
1
+ import { Fr, MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX, MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX, MAX_REVERTIBLE_NULLIFIERS_PER_TX, MembershipWitness, ReadRequestContext, SideEffectLinkedToNoteHash } from '@aztec/circuits.js';
2
2
  import { Tuple } from '@aztec/foundation/serialize';
3
3
  import { MerkleTreeOperations } from '@aztec/world-state';
4
4
  export declare class HintsBuilder {
5
5
  private db;
6
6
  constructor(db: MerkleTreeOperations);
7
- getNullifierReadRequestResetHints(nullifierReadRequestsNonRevertible: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, nullifierReadRequestsRevertible: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, nullifiersNonRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX>, nullifiersRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_REVERTIBLE_NULLIFIERS_PER_TX>): Promise<import("@aztec/circuits.js").NullifierReadRequestResetHints>;
7
+ getNullifierReadRequestHints(nullifierReadRequestsNonRevertible: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, nullifierReadRequestsRevertible: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, nullifiersNonRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX>, nullifiersRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_REVERTIBLE_NULLIFIERS_PER_TX>): Promise<import("@aztec/circuits.js").NullifierReadRequestHints>;
8
+ getNullifierNonExistentReadRequestHints(nullifierNonExistentReadRequests: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX>, nullifiersNonRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX>, nullifiersRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_REVERTIBLE_NULLIFIERS_PER_TX>): Promise<import("@aztec/circuits.js").NullifierNonExistentReadRequestHints>;
8
9
  getNullifierMembershipWitness(nullifier: Fr): Promise<{
9
10
  membershipWitness: MembershipWitness<20>;
10
- leafPreimage: NullifierLeafPreimage;
11
+ leafPreimage: import("@aztec/foundation/trees").IndexedTreeLeafPreimage;
11
12
  } | undefined>;
13
+ getLowNullifierMembershipWitness(nullifier: Fr): Promise<{
14
+ membershipWitness: MembershipWitness<20>;
15
+ leafPreimage: import("@aztec/foundation/trees").IndexedTreeLeafPreimage;
16
+ }>;
17
+ private getNullifierMembershipWitnessWithPreimage;
12
18
  }
13
19
  //# sourceMappingURL=hints_builder.d.ts.map
package/dest/sequencer/hints_builder.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"hints_builder.d.ts","sourceRoot":"","sources":["../../src/sequencer/hints_builder.ts"],"names":[],"mappings":"AACA,OAAO,EACL,EAAE,EAEF,oCAAoC,EACpC,kCAAkC,EAClC,gCAAgC,EAChC,iBAAiB,EAEjB,qBAAqB,EACrB,kBAAkB,EAClB,0BAA0B,EAI3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,qBAAa,YAAY;IACX,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,oBAAoB;IAE5C,iCAAiC,CAC/B,kCAAkC,EAAE,KAAK,CAAC,kBAAkB,EAAE,OAAO,kCAAkC,CAAC,EACxG,+BAA+B,EAAE,KAAK,CAAC,kBAAkB,EAAE,OAAO,kCAAkC,CAAC,EACrG,uBAAuB,EAAE,KAAK,CAAC,0BAA0B,EAAE,OAAO,oCAAoC,CAAC,EACvG,oBAAoB,EAAE,KAAK,CAAC,0BAA0B,EAAE,OAAO,gCAAgC,CAAC;IAa5F,6BAA6B,CAAC,SAAS,EAAE,EAAE;;;;CAgBlD"}
1
+ {"version":3,"file":"hints_builder.d.ts","sourceRoot":"","sources":["../../src/sequencer/hints_builder.ts"],"names":[],"mappings":"AACA,OAAO,EACL,EAAE,EAEF,oCAAoC,EACpC,+CAA+C,EAC/C,kCAAkC,EAClC,gCAAgC,EAChC,iBAAiB,EAEjB,kBAAkB,EAClB,0BAA0B,EAK3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,qBAAa,YAAY;IACX,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,oBAAoB;IAE5C,4BAA4B,CAC1B,kCAAkC,EAAE,KAAK,CAAC,kBAAkB,EAAE,OAAO,kCAAkC,CAAC,EACxG,+BAA+B,EAAE,KAAK,CAAC,kBAAkB,EAAE,OAAO,kCAAkC,CAAC,EACrG,uBAAuB,EAAE,KAAK,CAAC,0BAA0B,EAAE,OAAO,oCAAoC,CAAC,EACvG,oBAAoB,EAAE,KAAK,CAAC,0BAA0B,EAAE,OAAO,gCAAgC,CAAC;IAalG,uCAAuC,CACrC,gCAAgC,EAAE,KAAK,CAAC,kBAAkB,EAAE,OAAO,+CAA+C,CAAC,EACnH,uBAAuB,EAAE,KAAK,CAAC,0BAA0B,EAAE,OAAO,oCAAoC,CAAC,EACvG,oBAAoB,EAAE,KAAK,CAAC,0BAA0B,EAAE,OAAO,gCAAgC,CAAC;IAU5F,6BAA6B,CAAC,SAAS,EAAE,EAAE;;;;IAS3C,gCAAgC,CAAC,SAAS,EAAE,EAAE;;;;YActC,yCAAyC;CAexD"}
package/dest/sequencer/hints_builder.js CHANGED
@@ -1,21 +1,42 @@
1
1
  import { MerkleTreeId } from '@aztec/circuit-types';
2
- import { MAX_NEW_NULLIFIERS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX, MembershipWitness, NULLIFIER_TREE_HEIGHT, buildNullifierReadRequestResetHints, concatAccumulatedData, mergeAccumulatedData, } from '@aztec/circuits.js';
2
+ import { MAX_NEW_NULLIFIERS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX, MembershipWitness, NULLIFIER_TREE_HEIGHT, buildNullifierNonExistentReadRequestHints, buildNullifierReadRequestHints, concatAccumulatedData, mergeAccumulatedData, } from '@aztec/circuits.js';
3
3
  export class HintsBuilder {
4
4
  constructor(db) {
5
5
  this.db = db;
6
6
  }
7
- getNullifierReadRequestResetHints(nullifierReadRequestsNonRevertible, nullifierReadRequestsRevertible, nullifiersNonRevertible, nullifiersRevertible) {
8
- return buildNullifierReadRequestResetHints(this, mergeAccumulatedData(MAX_NULLIFIER_READ_REQUESTS_PER_TX, nullifierReadRequestsNonRevertible, nullifierReadRequestsRevertible), concatAccumulatedData(MAX_NEW_NULLIFIERS_PER_TX, nullifiersNonRevertible, nullifiersRevertible));
7
+ getNullifierReadRequestHints(nullifierReadRequestsNonRevertible, nullifierReadRequestsRevertible, nullifiersNonRevertible, nullifiersRevertible) {
8
+ return buildNullifierReadRequestHints(this, mergeAccumulatedData(MAX_NULLIFIER_READ_REQUESTS_PER_TX, nullifierReadRequestsNonRevertible, nullifierReadRequestsRevertible), concatAccumulatedData(MAX_NEW_NULLIFIERS_PER_TX, nullifiersNonRevertible, nullifiersRevertible));
9
+ }
10
+ getNullifierNonExistentReadRequestHints(nullifierNonExistentReadRequests, nullifiersNonRevertible, nullifiersRevertible) {
11
+ const pendingNullifiers = concatAccumulatedData(MAX_NEW_NULLIFIERS_PER_TX, nullifiersNonRevertible, nullifiersRevertible);
12
+ return buildNullifierNonExistentReadRequestHints(this, nullifierNonExistentReadRequests, pendingNullifiers);
9
13
  }
10
14
  async getNullifierMembershipWitness(nullifier) {
11
15
  const index = await this.db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
12
16
  if (index === undefined) {
13
17
  return;
14
18
  }
19
+ return this.getNullifierMembershipWitnessWithPreimage(index);
20
+ }
21
+ async getLowNullifierMembershipWitness(nullifier) {
22
+ const res = await this.db.getPreviousValueIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBigInt());
23
+ if (res === undefined) {
24
+ throw new Error(`Cannot find the low leaf for nullifier ${nullifier.toBigInt()}.`);
25
+ }
26
+ const { index, alreadyPresent } = res;
27
+ if (alreadyPresent) {
28
+ throw new Error(`Nullifier ${nullifier.toBigInt()} already exists in the tree.`);
29
+ }
30
+ return this.getNullifierMembershipWitnessWithPreimage(index);
31
+ }
32
+ async getNullifierMembershipWitnessWithPreimage(index) {
15
33
  const siblingPath = await this.db.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, index);
16
34
  const membershipWitness = new MembershipWitness(NULLIFIER_TREE_HEIGHT, index, siblingPath.toTuple());
17
- const leafPreimage = (await this.db.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index));
35
+ const leafPreimage = await this.db.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index);
36
+ if (!leafPreimage) {
37
+ throw new Error(`Cannot find the leaf preimage at index ${index}.`);
38
+ }
18
39
  return { membershipWitness, leafPreimage };
19
40
  }
20
41
  }
21
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGludHNfYnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXF1ZW5jZXIvaGludHNfYnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDcEQsT0FBTyxFQUVMLHlCQUF5QixFQUV6QixrQ0FBa0MsRUFFbEMsaUJBQWlCLEVBQ2pCLHFCQUFxQixFQUlyQixtQ0FBbUMsRUFDbkMscUJBQXFCLEVBQ3JCLG9CQUFvQixHQUNyQixNQUFNLG9CQUFvQixDQUFDO0FBSTVCLE1BQU0sT0FBTyxZQUFZO0lBQ3ZCLFlBQW9CLEVBQXdCO1FBQXhCLE9BQUUsR0FBRixFQUFFLENBQXNCO0lBQUcsQ0FBQztJQUVoRCxpQ0FBaUMsQ0FDL0Isa0NBQXdHLEVBQ3hHLCtCQUFxRyxFQUNyRyx1QkFBdUcsRUFDdkcsb0JBQWdHO1FBRWhHLE9BQU8sbUNBQW1DLENBQ3hDLElBQUksRUFDSixvQkFBb0IsQ0FDbEIsa0NBQWtDLEVBQ2xDLGtDQUFrQyxFQUNsQywrQkFBK0IsQ0FDaEMsRUFDRCxxQkFBcUIsQ0FBQyx5QkFBeUIsRUFBRSx1QkFBdUIsRUFBRSxvQkFBb0IsQ0FBQyxDQUNoRyxDQUFDO0lBQ0osQ0FBQztJQUVELEtBQUssQ0FBQyw2QkFBNkIsQ0FBQyxTQUFhO1FBQy9DLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMsWUFBWSxDQUFDLGNBQWMsRUFBRSxTQUFTLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztRQUM3RixJQUFJLEtBQUssS0FBSyxTQUFTLEVBQUUsQ0FBQztZQUN4QixPQUFPO1FBQ1QsQ0FBQztRQUVELE1BQU0sV0FBVyxHQUFHLE1BQU0sSUFBSSxDQUFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsWUFBWSxDQUFDLGNBQWMsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUNyRixNQUFNLGlCQUFpQixHQUFHLElBQUksaUJBQWlCLENBQzdDLHFCQUFxQixFQUNyQixLQUFLLEVBQ0wsV0FBVyxDQUFDLE9BQU8sRUFBZ0MsQ0FDcEQsQ0FBQztRQUNGLE1BQU0sWUFBWSxHQUFHLENBQUMsTUFBTSxJQUFJLENBQUMsRUFBRSxDQUFDLGVBQWUsQ0FBQyxZQUFZLENBQUMsY0FBYyxFQUFFLEtBQUssQ0FBQyxDQUEyQixDQUFDO1FBRW5ILE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxZQUFZLEVBQUUsQ0FBQztJQUM3QyxDQUFDO0NBQ0YifQ==
42
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGludHNfYnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXF1ZW5jZXIvaGludHNfYnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDcEQsT0FBTyxFQUVMLHlCQUF5QixFQUd6QixrQ0FBa0MsRUFFbEMsaUJBQWlCLEVBQ2pCLHFCQUFxQixFQUdyQix5Q0FBeUMsRUFDekMsOEJBQThCLEVBQzlCLHFCQUFxQixFQUNyQixvQkFBb0IsR0FDckIsTUFBTSxvQkFBb0IsQ0FBQztBQUk1QixNQUFNLE9BQU8sWUFBWTtJQUN2QixZQUFvQixFQUF3QjtRQUF4QixPQUFFLEdBQUYsRUFBRSxDQUFzQjtJQUFHLENBQUM7SUFFaEQsNEJBQTRCLENBQzFCLGtDQUF3RyxFQUN4RywrQkFBcUcsRUFDckcsdUJBQXVHLEVBQ3ZHLG9CQUFnRztRQUVoRyxPQUFPLDhCQUE4QixDQUNuQyxJQUFJLEVBQ0osb0JBQW9CLENBQ2xCLGtDQUFrQyxFQUNsQyxrQ0FBa0MsRUFDbEMsK0JBQStCLENBQ2hDLEVBQ0QscUJBQXFCLENBQUMseUJBQXlCLEVBQUUsdUJBQXVCLEVBQUUsb0JBQW9CLENBQUMsQ0FDaEcsQ0FBQztJQUNKLENBQUM7SUFFRCx1Q0FBdUMsQ0FDckMsZ0NBQW1ILEVBQ25ILHVCQUF1RyxFQUN2RyxvQkFBZ0c7UUFFaEcsTUFBTSxpQkFBaUIsR0FBRyxxQkFBcUIsQ0FDN0MseUJBQXlCLEVBQ3pCLHVCQUF1QixFQUN2QixvQkFBb0IsQ0FDckIsQ0FBQztRQUNGLE9BQU8seUNBQXlDLENBQUMsSUFBSSxFQUFFLGdDQUFnQyxFQUFFLGlCQUFpQixDQUFDLENBQUM7SUFDOUcsQ0FBQztJQUVELEtBQUssQ0FBQyw2QkFBNkIsQ0FBQyxTQUFhO1FBQy9DLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMsWUFBWSxDQUFDLGNBQWMsRUFBRSxTQUFTLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztRQUM3RixJQUFJLEtBQUssS0FBSyxTQUFTLEVBQUUsQ0FBQztZQUN4QixPQUFPO1FBQ1QsQ0FBQztRQUVELE9BQU8sSUFBSSxDQUFDLHlDQUF5QyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQy9ELENBQUM7SUFFRCxLQUFLLENBQUMsZ0NBQWdDLENBQUMsU0FBYTtRQUNsRCxNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxFQUFFLENBQUMscUJBQXFCLENBQUMsWUFBWSxDQUFDLGNBQWMsRUFBRSxTQUFTLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztRQUNuRyxJQUFJLEdBQUcsS0FBSyxTQUFTLEVBQUUsQ0FBQztZQUN0QixNQUFNLElBQUksS0FBSyxDQUFDLDBDQUEwQyxTQUFTLENBQUMsUUFBUSxFQUFFLEdBQUcsQ0FBQyxDQUFDO1FBQ3JGLENBQUM7UUFFRCxNQUFNLEVBQUUsS0FBSyxFQUFFLGNBQWMsRUFBRSxHQUFHLEdBQUcsQ0FBQztRQUN0QyxJQUFJLGNBQWMsRUFBRSxDQUFDO1lBQ25CLE1BQU0sSUFBSSxLQUFLLENBQUMsYUFBYSxTQUFTLENBQUMsUUFBUSxFQUFFLDhCQUE4QixDQUFDLENBQUM7UUFDbkYsQ0FBQztRQUVELE9BQU8sSUFBSSxDQUFDLHlDQUF5QyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQy9ELENBQUM7SUFFTyxLQUFLLENBQUMseUNBQXlDLENBQUMsS0FBYTtRQUNuRSxNQUFNLFdBQVcsR0FBRyxNQUFNLElBQUksQ0FBQyxFQUFFLENBQUMsY0FBYyxDQUErQixZQUFZLENBQUMsY0FBYyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ25ILE1BQU0saUJBQWlCLEdBQUcsSUFBSSxpQkFBaUIsQ0FDN0MscUJBQXFCLEVBQ3JCLEtBQUssRUFDTCxXQUFXLENBQUMsT0FBTyxFQUFnQyxDQUNwRCxDQUFDO1FBRUYsTUFBTSxZQUFZLEdBQUcsTUFBTSxJQUFJLENBQUMsRUFBRSxDQUFDLGVBQWUsQ0FBQyxZQUFZLENBQUMsY0FBYyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ3ZGLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztZQUNsQixNQUFNLElBQUksS0FBSyxDQUFDLDBDQUEwQyxLQUFLLEdBQUcsQ0FBQyxDQUFDO1FBQ3RFLENBQUM7UUFFRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsWUFBWSxFQUFFLENBQUM7SUFDN0MsQ0FBQztDQUNGIn0=
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/sequencer-client",
3
- "version": "0.27.0",
3
+ "version": "0.27.1",
4
4
  "type": "module",
5
5
  "exports": "./dest/index.js",
6
6
  "typedocOptions": {
@@ -21,18 +21,18 @@
21
21
  "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
22
22
  },
23
23
  "dependencies": {
24
- "@aztec/circuit-types": "0.27.0",
25
- "@aztec/circuits.js": "0.27.0",
26
- "@aztec/ethereum": "0.27.0",
27
- "@aztec/foundation": "0.27.0",
28
- "@aztec/l1-artifacts": "0.27.0",
29
- "@aztec/merkle-tree": "0.27.0",
30
- "@aztec/noir-protocol-circuits-types": "0.27.0",
31
- "@aztec/p2p": "0.27.0",
32
- "@aztec/protocol-contracts": "0.27.0",
33
- "@aztec/simulator": "0.27.0",
34
- "@aztec/types": "0.27.0",
35
- "@aztec/world-state": "0.27.0",
24
+ "@aztec/circuit-types": "0.27.1",
25
+ "@aztec/circuits.js": "0.27.1",
26
+ "@aztec/ethereum": "0.27.1",
27
+ "@aztec/foundation": "0.27.1",
28
+ "@aztec/l1-artifacts": "0.27.1",
29
+ "@aztec/merkle-tree": "0.27.1",
30
+ "@aztec/noir-protocol-circuits-types": "0.27.1",
31
+ "@aztec/p2p": "0.27.1",
32
+ "@aztec/protocol-contracts": "0.27.1",
33
+ "@aztec/simulator": "0.27.1",
34
+ "@aztec/types": "0.27.1",
35
+ "@aztec/world-state": "0.27.1",
36
36
  "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
37
37
  "@noir-lang/types": "portal:../../noir/packages/types",
38
38
  "lodash.chunk": "^4.2.0",
package/src/sequencer/abstract_phase_manager.ts CHANGED
@@ -13,6 +13,7 @@ import {
13
13
  MAX_NEW_NULLIFIERS_PER_CALL,
14
14
  MAX_NON_REVERTIBLE_PUBLIC_DATA_READS_PER_TX,
15
15
  MAX_NON_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
16
+ MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
16
17
  MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
17
18
  MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
18
19
  MAX_PUBLIC_DATA_READS_PER_CALL,
@@ -264,13 +265,22 @@ export abstract class AbstractPhaseManager {
264
265
 
265
266
  if (this.phase === PublicKernelPhase.TAIL) {
266
267
  const { endNonRevertibleData, end } = previousOutput;
267
- const nullifierReadRequestResetHints = await this.hintsBuilder.getNullifierReadRequestResetHints(
268
+ const nullifierReadRequestHints = await this.hintsBuilder.getNullifierReadRequestHints(
268
269
  endNonRevertibleData.nullifierReadRequests,
269
270
  end.nullifierReadRequests,
270
271
  endNonRevertibleData.newNullifiers,
271
272
  end.newNullifiers,
272
273
  );
273
- const inputs = new PublicKernelTailCircuitPrivateInputs(previousKernel, nullifierReadRequestResetHints);
274
+ const nullifierNonExistentReadRequestHints = await this.hintsBuilder.getNullifierNonExistentReadRequestHints(
275
+ endNonRevertibleData.nullifierNonExistentReadRequests,
276
+ endNonRevertibleData.newNullifiers,
277
+ end.newNullifiers,
278
+ );
279
+ const inputs = new PublicKernelTailCircuitPrivateInputs(
280
+ previousKernel,
281
+ nullifierReadRequestHints,
282
+ nullifierNonExistentReadRequestHints,
283
+ );
274
284
  return this.publicKernel.publicKernelCircuitTail(inputs);
275
285
  }
276
286
 
@@ -329,6 +339,11 @@ export abstract class AbstractPhaseManager {
329
339
  ReadRequest.empty(),
330
340
  MAX_NULLIFIER_READ_REQUESTS_PER_CALL,
331
341
  ),
342
+ nullifierNonExistentReadRequests: padArrayEnd(
343
+ result.nullifierNonExistentReadRequests,
344
+ ReadRequest.empty(),
345
+ MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL,
346
+ ),
332
347
  contractStorageReads: padArrayEnd(
333
348
  result.contractStorageReads,
334
349
  ContractStorageRead.empty(),
package/src/sequencer/hints_builder.ts CHANGED
@@ -3,14 +3,15 @@ import {
3
3
  Fr,
4
4
  MAX_NEW_NULLIFIERS_PER_TX,
5
5
  MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX,
6
+ MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX,
6
7
  MAX_NULLIFIER_READ_REQUESTS_PER_TX,
7
8
  MAX_REVERTIBLE_NULLIFIERS_PER_TX,
8
9
  MembershipWitness,
9
10
  NULLIFIER_TREE_HEIGHT,
10
- NullifierLeafPreimage,
11
11
  ReadRequestContext,
12
12
  SideEffectLinkedToNoteHash,
13
- buildNullifierReadRequestResetHints,
13
+ buildNullifierNonExistentReadRequestHints,
14
+ buildNullifierReadRequestHints,
14
15
  concatAccumulatedData,
15
16
  mergeAccumulatedData,
16
17
  } from '@aztec/circuits.js';
@@ -20,13 +21,13 @@ import { MerkleTreeOperations } from '@aztec/world-state';
20
21
  export class HintsBuilder {
21
22
  constructor(private db: MerkleTreeOperations) {}
22
23
 
23
- getNullifierReadRequestResetHints(
24
+ getNullifierReadRequestHints(
24
25
  nullifierReadRequestsNonRevertible: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
25
26
  nullifierReadRequestsRevertible: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
26
27
  nullifiersNonRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX>,
27
28
  nullifiersRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_REVERTIBLE_NULLIFIERS_PER_TX>,
28
29
  ) {
29
- return buildNullifierReadRequestResetHints(
30
+ return buildNullifierReadRequestHints(
30
31
  this,
31
32
  mergeAccumulatedData(
32
33
  MAX_NULLIFIER_READ_REQUESTS_PER_TX,
@@ -37,19 +38,54 @@ export class HintsBuilder {
37
38
  );
38
39
  }
39
40
 
41
+ getNullifierNonExistentReadRequestHints(
42
+ nullifierNonExistentReadRequests: Tuple<ReadRequestContext, typeof MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX>,
43
+ nullifiersNonRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX>,
44
+ nullifiersRevertible: Tuple<SideEffectLinkedToNoteHash, typeof MAX_REVERTIBLE_NULLIFIERS_PER_TX>,
45
+ ) {
46
+ const pendingNullifiers = concatAccumulatedData(
47
+ MAX_NEW_NULLIFIERS_PER_TX,
48
+ nullifiersNonRevertible,
49
+ nullifiersRevertible,
50
+ );
51
+ return buildNullifierNonExistentReadRequestHints(this, nullifierNonExistentReadRequests, pendingNullifiers);
52
+ }
53
+
40
54
  async getNullifierMembershipWitness(nullifier: Fr) {
41
55
  const index = await this.db.findLeafIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBuffer());
42
56
  if (index === undefined) {
43
57
  return;
44
58
  }
45
59
 
46
- const siblingPath = await this.db.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, index);
60
+ return this.getNullifierMembershipWitnessWithPreimage(index);
61
+ }
62
+
63
+ async getLowNullifierMembershipWitness(nullifier: Fr) {
64
+ const res = await this.db.getPreviousValueIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBigInt());
65
+ if (res === undefined) {
66
+ throw new Error(`Cannot find the low leaf for nullifier ${nullifier.toBigInt()}.`);
67
+ }
68
+
69
+ const { index, alreadyPresent } = res;
70
+ if (alreadyPresent) {
71
+ throw new Error(`Nullifier ${nullifier.toBigInt()} already exists in the tree.`);
72
+ }
73
+
74
+ return this.getNullifierMembershipWitnessWithPreimage(index);
75
+ }
76
+
77
+ private async getNullifierMembershipWitnessWithPreimage(index: bigint) {
78
+ const siblingPath = await this.db.getSiblingPath<typeof NULLIFIER_TREE_HEIGHT>(MerkleTreeId.NULLIFIER_TREE, index);
47
79
  const membershipWitness = new MembershipWitness(
48
80
  NULLIFIER_TREE_HEIGHT,
49
81
  index,
50
82
  siblingPath.toTuple<typeof NULLIFIER_TREE_HEIGHT>(),
51
83
  );
52
- const leafPreimage = (await this.db.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index))! as NullifierLeafPreimage;
84
+
85
+ const leafPreimage = await this.db.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index);
86
+ if (!leafPreimage) {
87
+ throw new Error(`Cannot find the leaf preimage at index ${index}.`);
88
+ }
53
89
 
54
90
  return { membershipWitness, leafPreimage };
55
91
  }