@aztec/stdlib 4.0.0-devnet.1-patch.1 → 4.0.0-devnet.2-patch.0

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 (189) hide show
  1. package/dest/auth_witness/auth_witness.js +3 -3
  2. package/dest/block/block_data.d.ts +52 -0
  3. package/dest/block/block_data.d.ts.map +1 -0
  4. package/dest/block/block_data.js +12 -0
  5. package/dest/block/index.d.ts +2 -1
  6. package/dest/block/index.d.ts.map +1 -1
  7. package/dest/block/index.js +1 -0
  8. package/dest/block/l2_block_source.d.ts +20 -1
  9. package/dest/block/l2_block_source.d.ts.map +1 -1
  10. package/dest/checkpoint/checkpoint.d.ts +21 -7
  11. package/dest/checkpoint/checkpoint.d.ts.map +1 -1
  12. package/dest/checkpoint/checkpoint.js +24 -13
  13. package/dest/checkpoint/checkpoint_data.d.ts +120 -0
  14. package/dest/checkpoint/checkpoint_data.d.ts.map +1 -0
  15. package/dest/checkpoint/checkpoint_data.js +26 -0
  16. package/dest/checkpoint/index.d.ts +2 -1
  17. package/dest/checkpoint/index.d.ts.map +1 -1
  18. package/dest/checkpoint/index.js +1 -0
  19. package/dest/checkpoint/published_checkpoint.d.ts +17 -2
  20. package/dest/checkpoint/published_checkpoint.d.ts.map +1 -1
  21. package/dest/checkpoint/published_checkpoint.js +1 -2
  22. package/dest/contract/contract_address.js +4 -4
  23. package/dest/contract/contract_class_id.d.ts +1 -1
  24. package/dest/contract/contract_class_id.d.ts.map +1 -1
  25. package/dest/contract/contract_class_id.js +5 -4
  26. package/dest/contract/private_function.js +2 -2
  27. package/dest/file-store/local.d.ts +3 -3
  28. package/dest/file-store/local.d.ts.map +1 -1
  29. package/dest/file-store/local.js +13 -4
  30. package/dest/file-store/s3.d.ts +1 -1
  31. package/dest/file-store/s3.d.ts.map +1 -1
  32. package/dest/file-store/s3.js +11 -3
  33. package/dest/hash/hash.d.ts +2 -1
  34. package/dest/hash/hash.d.ts.map +1 -1
  35. package/dest/hash/hash.js +16 -10
  36. package/dest/hash/map_slot.js +2 -2
  37. package/dest/interfaces/archiver.d.ts +1 -1
  38. package/dest/interfaces/archiver.d.ts.map +1 -1
  39. package/dest/interfaces/archiver.js +5 -0
  40. package/dest/interfaces/aztec-node-admin.d.ts +27 -2
  41. package/dest/interfaces/aztec-node-admin.d.ts.map +1 -1
  42. package/dest/interfaces/aztec-node-admin.js +9 -3
  43. package/dest/interfaces/aztec-node.d.ts +1 -1
  44. package/dest/interfaces/block-builder.d.ts +2 -2
  45. package/dest/interfaces/block-builder.d.ts.map +1 -1
  46. package/dest/interfaces/configs.d.ts +12 -2
  47. package/dest/interfaces/configs.d.ts.map +1 -1
  48. package/dest/interfaces/configs.js +3 -1
  49. package/dest/interfaces/merkle_tree_operations.d.ts +2 -2
  50. package/dest/interfaces/merkle_tree_operations.d.ts.map +1 -1
  51. package/dest/interfaces/proving-job.d.ts +2 -2
  52. package/dest/interfaces/validator.d.ts +2 -2
  53. package/dest/interfaces/validator.d.ts.map +1 -1
  54. package/dest/kernel/hints/index.d.ts +2 -2
  55. package/dest/kernel/hints/index.js +2 -2
  56. package/dest/kernel/hints/key_validation_request_and_separator.d.ts +24 -0
  57. package/dest/kernel/hints/key_validation_request_and_separator.d.ts.map +1 -0
  58. package/dest/kernel/hints/{key_validation_request_and_generator.js → key_validation_request_and_separator.js} +12 -15
  59. package/dest/kernel/hints/{scoped_key_validation_request_and_generator.d.ts → scoped_key_validation_request_and_separator.d.ts} +8 -8
  60. package/dest/kernel/hints/{scoped_key_validation_request_and_generator.d.ts.map → scoped_key_validation_request_and_separator.d.ts.map} +1 -1
  61. package/dest/kernel/hints/{scoped_key_validation_request_and_generator.js → scoped_key_validation_request_and_separator.js} +6 -6
  62. package/dest/kernel/private_circuit_public_inputs.d.ts +9 -9
  63. package/dest/kernel/private_circuit_public_inputs.d.ts.map +1 -1
  64. package/dest/kernel/private_circuit_public_inputs.js +16 -16
  65. package/dest/kernel/private_kernel_circuit_public_inputs.d.ts +3 -3
  66. package/dest/kernel/private_kernel_circuit_public_inputs.d.ts.map +1 -1
  67. package/dest/kernel/private_kernel_circuit_public_inputs.js +4 -4
  68. package/dest/kernel/private_kernel_tail_circuit_private_inputs.d.ts +3 -3
  69. package/dest/kernel/private_kernel_tail_circuit_private_inputs.d.ts.map +1 -1
  70. package/dest/kernel/private_kernel_tail_circuit_private_inputs.js +4 -4
  71. package/dest/kernel/private_kernel_tail_circuit_public_inputs.d.ts +3 -3
  72. package/dest/kernel/private_kernel_tail_circuit_public_inputs.d.ts.map +1 -1
  73. package/dest/kernel/private_kernel_tail_circuit_public_inputs.js +7 -7
  74. package/dest/kernel/private_to_public_kernel_circuit_public_inputs.d.ts +3 -3
  75. package/dest/kernel/private_to_public_kernel_circuit_public_inputs.d.ts.map +1 -1
  76. package/dest/kernel/private_to_public_kernel_circuit_public_inputs.js +7 -7
  77. package/dest/kernel/private_to_rollup_kernel_circuit_public_inputs.d.ts +3 -3
  78. package/dest/kernel/private_to_rollup_kernel_circuit_public_inputs.d.ts.map +1 -1
  79. package/dest/kernel/private_to_rollup_kernel_circuit_public_inputs.js +7 -7
  80. package/dest/kernel/private_validation_requests.d.ts +3 -3
  81. package/dest/kernel/private_validation_requests.js +9 -9
  82. package/dest/keys/derivation.js +8 -8
  83. package/dest/keys/key_types.d.ts +3 -3
  84. package/dest/keys/key_types.d.ts.map +1 -1
  85. package/dest/keys/public_keys.js +2 -2
  86. package/dest/keys/utils.js +5 -5
  87. package/dest/logs/private_log.d.ts +2 -2
  88. package/dest/logs/private_log.d.ts.map +1 -1
  89. package/dest/logs/siloed_tag.d.ts +1 -1
  90. package/dest/logs/siloed_tag.d.ts.map +1 -1
  91. package/dest/logs/siloed_tag.js +2 -6
  92. package/dest/note/index.d.ts +1 -2
  93. package/dest/note/index.d.ts.map +1 -1
  94. package/dest/note/index.js +0 -1
  95. package/dest/p2p/block_proposal.d.ts +1 -1
  96. package/dest/p2p/block_proposal.d.ts.map +1 -1
  97. package/dest/p2p/block_proposal.js +1 -3
  98. package/dest/p2p/checkpoint_attestation.d.ts +2 -1
  99. package/dest/p2p/checkpoint_attestation.d.ts.map +1 -1
  100. package/dest/p2p/checkpoint_attestation.js +1 -1
  101. package/dest/p2p/checkpoint_proposal.d.ts +10 -5
  102. package/dest/p2p/checkpoint_proposal.d.ts.map +1 -1
  103. package/dest/p2p/checkpoint_proposal.js +20 -15
  104. package/dest/p2p/consensus_payload.d.ts +12 -3
  105. package/dest/p2p/consensus_payload.d.ts.map +1 -1
  106. package/dest/p2p/consensus_payload.js +22 -15
  107. package/dest/rollup/checkpoint_header.d.ts +2 -2
  108. package/dest/rollup/checkpoint_header.js +2 -2
  109. package/dest/tests/factories.js +11 -11
  110. package/dest/tests/mocks.d.ts +4 -1
  111. package/dest/tests/mocks.d.ts.map +1 -1
  112. package/dest/tests/mocks.js +14 -9
  113. package/dest/trees/public_data_leaf.d.ts +2 -1
  114. package/dest/trees/public_data_leaf.d.ts.map +1 -1
  115. package/dest/trees/public_data_leaf.js +7 -6
  116. package/dest/tx/block_header.js +2 -2
  117. package/dest/tx/global_variables.d.ts +4 -4
  118. package/dest/tx/global_variables.d.ts.map +1 -1
  119. package/dest/tx/protocol_contracts.d.ts +1 -1
  120. package/dest/tx/protocol_contracts.d.ts.map +1 -1
  121. package/dest/tx/protocol_contracts.js +2 -2
  122. package/dest/tx/tx_request.js +2 -2
  123. package/dest/tx/validator/error_texts.d.ts +1 -1
  124. package/dest/tx/validator/error_texts.js +1 -1
  125. package/dest/validators/schemas.d.ts +30 -30
  126. package/dest/validators/schemas.d.ts.map +1 -1
  127. package/dest/validators/schemas.js +4 -3
  128. package/dest/validators/types.d.ts +3 -3
  129. package/dest/validators/types.d.ts.map +1 -1
  130. package/package.json +9 -9
  131. package/src/auth_witness/auth_witness.ts +3 -3
  132. package/src/block/block_data.ts +26 -0
  133. package/src/block/index.ts +1 -0
  134. package/src/block/l2_block_source.ts +22 -0
  135. package/src/checkpoint/checkpoint.ts +32 -14
  136. package/src/checkpoint/checkpoint_data.ts +51 -0
  137. package/src/checkpoint/index.ts +1 -0
  138. package/src/checkpoint/published_checkpoint.ts +3 -1
  139. package/src/contract/contract_address.ts +4 -4
  140. package/src/contract/contract_class_id.ts +5 -4
  141. package/src/contract/private_function.ts +2 -2
  142. package/src/file-store/local.ts +15 -5
  143. package/src/file-store/s3.ts +12 -3
  144. package/src/hash/hash.ts +14 -10
  145. package/src/hash/map_slot.ts +2 -2
  146. package/src/interfaces/archiver.ts +5 -0
  147. package/src/interfaces/aztec-node-admin.ts +23 -0
  148. package/src/interfaces/aztec-node.ts +1 -1
  149. package/src/interfaces/block-builder.ts +1 -0
  150. package/src/interfaces/configs.ts +8 -1
  151. package/src/interfaces/merkle_tree_operations.ts +1 -1
  152. package/src/interfaces/validator.ts +1 -0
  153. package/src/kernel/hints/index.ts +2 -2
  154. package/src/kernel/hints/{key_validation_request_and_generator.ts → key_validation_request_and_separator.ts} +12 -15
  155. package/src/kernel/hints/{scoped_key_validation_request_and_generator.ts → scoped_key_validation_request_and_separator.ts} +10 -10
  156. package/src/kernel/private_circuit_public_inputs.ts +14 -14
  157. package/src/kernel/private_kernel_circuit_public_inputs.ts +2 -2
  158. package/src/kernel/private_kernel_tail_circuit_private_inputs.ts +2 -2
  159. package/src/kernel/private_kernel_tail_circuit_public_inputs.ts +5 -5
  160. package/src/kernel/private_to_public_kernel_circuit_public_inputs.ts +5 -5
  161. package/src/kernel/private_to_rollup_kernel_circuit_public_inputs.ts +5 -5
  162. package/src/kernel/private_validation_requests.ts +8 -8
  163. package/src/keys/derivation.ts +8 -8
  164. package/src/keys/key_types.ts +6 -2
  165. package/src/keys/public_keys.ts +2 -2
  166. package/src/keys/utils.ts +5 -5
  167. package/src/logs/siloed_tag.ts +2 -3
  168. package/src/note/index.ts +0 -1
  169. package/src/p2p/block_proposal.ts +0 -2
  170. package/src/p2p/checkpoint_attestation.ts +6 -1
  171. package/src/p2p/checkpoint_proposal.ts +35 -13
  172. package/src/p2p/consensus_payload.ts +25 -12
  173. package/src/rollup/checkpoint_header.ts +2 -2
  174. package/src/tests/factories.ts +12 -12
  175. package/src/tests/mocks.ts +21 -10
  176. package/src/trees/public_data_leaf.ts +11 -5
  177. package/src/tx/block_header.ts +2 -2
  178. package/src/tx/global_variables.ts +3 -3
  179. package/src/tx/protocol_contracts.ts +2 -2
  180. package/src/tx/tx_request.ts +2 -2
  181. package/src/tx/validator/error_texts.ts +1 -1
  182. package/src/validators/schemas.ts +8 -1
  183. package/src/validators/types.ts +5 -4
  184. package/dest/kernel/hints/key_validation_request_and_generator.d.ts +0 -30
  185. package/dest/kernel/hints/key_validation_request_and_generator.d.ts.map +0 -1
  186. package/dest/note/notes_filter.d.ts +0 -27
  187. package/dest/note/notes_filter.d.ts.map +0 -1
  188. package/dest/note/notes_filter.js +0 -11
  189. package/src/note/notes_filter.ts +0 -38
@@ -1,6 +1,6 @@
1
1
  import { Fr } from '@aztec/foundation/curves/bn254';
2
2
  import { schemas } from '@aztec/foundation/schemas';
3
- import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
3
+ import { BufferReader, serializeSignedBigInt, serializeToBuffer } from '@aztec/foundation/serialize';
4
4
  import { hexToBuffer } from '@aztec/foundation/string';
5
5
  import type { FieldsOf } from '@aztec/foundation/types';
6
6
 
@@ -21,6 +21,8 @@ export class ConsensusPayload implements Signable {
21
21
  public readonly header: CheckpointHeader,
22
22
  /** The archive root after the block is added */
23
23
  public readonly archive: Fr,
24
+ /** The fee asset price modifier in basis points (from oracle) */
25
+ public readonly feeAssetPriceModifier: bigint = 0n,
24
26
  ) {}
25
27
 
26
28
  static get schema() {
@@ -28,12 +30,13 @@ export class ConsensusPayload implements Signable {
28
30
  .object({
29
31
  header: CheckpointHeader.schema,
30
32
  archive: schemas.Fr,
33
+ feeAssetPriceModifier: schemas.BigInt,
31
34
  })
32
- .transform(obj => new ConsensusPayload(obj.header, obj.archive));
35
+ .transform(obj => new ConsensusPayload(obj.header, obj.archive, obj.feeAssetPriceModifier));
33
36
  }
34
37
 
35
38
  static getFields(fields: FieldsOf<ConsensusPayload>) {
36
- return [fields.header, fields.archive] as const;
39
+ return [fields.header, fields.archive, fields.feeAssetPriceModifier] as const;
37
40
  }
38
41
 
39
42
  getPayloadToSign(domainSeparator: SignatureDomainSeparator): Buffer {
@@ -50,41 +53,50 @@ export class ConsensusPayload implements Signable {
50
53
  const headerHash = this.header.hash().toString();
51
54
  const encodedData = encodeAbiParameters(abi, [
52
55
  domainSeparator,
53
- [archiveRoot, [0n] /* @todo See #9963 */, headerHash],
56
+ [archiveRoot, [this.feeAssetPriceModifier], headerHash],
54
57
  ] as const);
55
58
 
56
59
  return hexToBuffer(encodedData);
57
60
  }
58
61
 
59
62
  toBuffer(): Buffer {
60
- return serializeToBuffer([this.header, this.archive]);
63
+ return serializeToBuffer([this.header, this.archive, serializeSignedBigInt(this.feeAssetPriceModifier)]);
61
64
  }
62
65
 
63
66
  public equals(other: ConsensusPayload | CheckpointProposal | CheckpointProposalCore): boolean {
64
67
  const otherHeader = 'checkpointHeader' in other ? other.checkpointHeader : other.header;
65
- return this.header.equals(otherHeader) && this.archive.equals(other.archive);
68
+ const otherModifier = 'feeAssetPriceModifier' in other ? other.feeAssetPriceModifier : 0n;
69
+ return (
70
+ this.header.equals(otherHeader) &&
71
+ this.archive.equals(other.archive) &&
72
+ this.feeAssetPriceModifier === otherModifier
73
+ );
66
74
  }
67
75
 
68
76
  static fromBuffer(buf: Buffer | BufferReader): ConsensusPayload {
69
77
  const reader = BufferReader.asReader(buf);
70
- const payload = new ConsensusPayload(reader.readObject(CheckpointHeader), reader.readObject(Fr));
78
+ const payload = new ConsensusPayload(
79
+ reader.readObject(CheckpointHeader),
80
+ reader.readObject(Fr),
81
+ reader.readInt256(),
82
+ );
71
83
  return payload;
72
84
  }
73
85
 
74
86
  static fromFields(fields: FieldsOf<ConsensusPayload>): ConsensusPayload {
75
- return new ConsensusPayload(fields.header, fields.archive);
87
+ return new ConsensusPayload(fields.header, fields.archive, fields.feeAssetPriceModifier);
76
88
  }
77
89
 
78
90
  static fromCheckpoint(checkpoint: Checkpoint): ConsensusPayload {
79
- return new ConsensusPayload(checkpoint.header, checkpoint.archive.root);
91
+ return new ConsensusPayload(checkpoint.header, checkpoint.archive.root, checkpoint.feeAssetPriceModifier);
80
92
  }
81
93
 
82
94
  static empty(): ConsensusPayload {
83
- return new ConsensusPayload(CheckpointHeader.empty(), Fr.ZERO);
95
+ return new ConsensusPayload(CheckpointHeader.empty(), Fr.ZERO, 0n);
84
96
  }
85
97
 
86
98
  static random(): ConsensusPayload {
87
- return new ConsensusPayload(CheckpointHeader.random(), Fr.random());
99
+ return new ConsensusPayload(CheckpointHeader.random(), Fr.random(), 0n);
88
100
  }
89
101
 
90
102
  /**
@@ -104,10 +116,11 @@ export class ConsensusPayload implements Signable {
104
116
  return {
105
117
  header: this.header.toInspect(),
106
118
  archive: this.archive.toString(),
119
+ feeAssetPriceModifier: this.feeAssetPriceModifier.toString(),
107
120
  };
108
121
  }
109
122
 
110
123
  toString() {
111
- return `header: ${this.header.toString()}, archive: ${this.archive.toString()}}`;
124
+ return `header: ${this.header.toString()}, archive: ${this.archive.toString()}, feeAssetPriceModifier: ${this.feeAssetPriceModifier}}`;
112
125
  }
113
126
  }
@@ -19,8 +19,8 @@ import type { UInt64 } from '../types/shared.js';
19
19
 
20
20
  /**
21
21
  * Header of a checkpoint. A checkpoint is a collection of blocks submitted to L1 all within the same slot.
22
- * TODO(palla/mbps): Should this include chainId and version as well? Is this used just in circuits?
23
- * TODO(palla/mbps): What about CheckpointNumber?
22
+ * This header is verified as-is in the rollup circuits, posted to the L1 rollup contract, stored in the archiver,
23
+ * and exposed via the Aztec Node API. See `CheckpointData` for a struct that includes the header plus extra metadata.
24
24
  */
25
25
  export class CheckpointHeader {
26
26
  constructor(
@@ -9,7 +9,7 @@ import {
9
9
  AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED,
10
10
  CHONK_PROOF_LENGTH,
11
11
  CONTRACT_CLASS_LOG_SIZE_IN_FIELDS,
12
- GeneratorIndex,
12
+ DomainSeparator,
13
13
  L1_TO_L2_MSG_SUBTREE_ROOT_SIBLING_PATH_LENGTH,
14
14
  MAX_CHECKPOINTS_PER_EPOCH,
15
15
  MAX_CONTRACT_CLASS_LOGS_PER_TX,
@@ -102,7 +102,7 @@ import {
102
102
  import { Gas, GasFees, GasSettings } from '../gas/index.js';
103
103
  import { computeCalldataHash } from '../hash/hash.js';
104
104
  import { KeyValidationRequest } from '../kernel/hints/key_validation_request.js';
105
- import { KeyValidationRequestAndGenerator } from '../kernel/hints/key_validation_request_and_generator.js';
105
+ import { KeyValidationRequestAndSeparator } from '../kernel/hints/key_validation_request_and_separator.js';
106
106
  import { ReadRequest, ScopedReadRequest } from '../kernel/hints/read_request.js';
107
107
  import {
108
108
  ClaimedLengthArray,
@@ -259,12 +259,12 @@ function makeKeyValidationRequests(seed: number): KeyValidationRequest {
259
259
  }
260
260
 
261
261
  /**
262
- * Creates arbitrary KeyValidationRequestAndGenerator from the given seed.
263
- * @param seed - The seed to use for generating the KeyValidationRequestAndGenerator.
264
- * @returns A KeyValidationRequestAndGenerator.
262
+ * Creates arbitrary KeyValidationRequestAndSeparator from the given seed.
263
+ * @param seed - The seed to use for generating the KeyValidationRequestAndSeparator.
264
+ * @returns A KeyValidationRequestAndSeparator.
265
265
  */
266
- function makeKeyValidationRequestAndGenerators(seed: number): KeyValidationRequestAndGenerator {
267
- return new KeyValidationRequestAndGenerator(makeKeyValidationRequests(seed), fr(seed + 4));
266
+ function makeKeyValidationRequestAndSeparators(seed: number): KeyValidationRequestAndSeparator {
267
+ return new KeyValidationRequestAndSeparator(makeKeyValidationRequests(seed), fr(seed + 4));
268
268
  }
269
269
 
270
270
  export function makePublicDataWrite(seed = 1) {
@@ -656,7 +656,7 @@ function makeClaimedLengthArray<T extends Serializable, N extends number>(
656
656
  */
657
657
  export function makePrivateCircuitPublicInputs(seed = 0): PrivateCircuitPublicInputs {
658
658
  return PrivateCircuitPublicInputs.from({
659
- includeByTimestamp: BigInt(seed + 0x31415),
659
+ expirationTimestamp: BigInt(seed + 0x31415),
660
660
  callContext: makeCallContext(seed, { isStaticCall: true }),
661
661
  argsHash: fr(seed + 0x100),
662
662
  returnsHash: fr(seed + 0x200),
@@ -671,9 +671,9 @@ export function makePrivateCircuitPublicInputs(seed = 0): PrivateCircuitPublicIn
671
671
  makeScopedReadRequest,
672
672
  seed + 0x310,
673
673
  ),
674
- keyValidationRequestsAndGenerators: makeClaimedLengthArray(
674
+ keyValidationRequestsAndSeparators: makeClaimedLengthArray(
675
675
  MAX_KEY_VALIDATION_REQUESTS_PER_CALL,
676
- makeKeyValidationRequestAndGenerators,
676
+ makeKeyValidationRequestAndSeparators,
677
677
  seed + 0x320,
678
678
  ),
679
679
  noteHashes: makeClaimedLengthArray(MAX_NOTE_HASHES_PER_CALL, makeNoteHash, seed + 0x400),
@@ -1287,11 +1287,11 @@ export async function makeContractInstanceFromClassId(
1287
1287
 
1288
1288
  const saltedInitializationHash = await poseidon2HashWithSeparator(
1289
1289
  [salt, initializationHash, deployer],
1290
- GeneratorIndex.PARTIAL_ADDRESS,
1290
+ DomainSeparator.PARTIAL_ADDRESS,
1291
1291
  );
1292
1292
  const partialAddress = await poseidon2HashWithSeparator(
1293
1293
  [classId, saltedInitializationHash],
1294
- GeneratorIndex.PARTIAL_ADDRESS,
1294
+ DomainSeparator.PARTIAL_ADDRESS,
1295
1295
  );
1296
1296
  const address = await computeAddress(publicKeys, partialAddress);
1297
1297
  return new SerializableContractInstance({
@@ -2,9 +2,9 @@ import {
2
2
  FIXED_DA_GAS,
3
3
  FIXED_L2_GAS,
4
4
  MAX_ENQUEUED_CALLS_PER_TX,
5
- MAX_INCLUDE_BY_TIMESTAMP_DURATION,
6
5
  MAX_NULLIFIERS_PER_TX,
7
6
  MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
7
+ MAX_TX_LIFETIME,
8
8
  } from '@aztec/constants';
9
9
  import { type FieldsOf, makeTuple } from '@aztec/foundation/array';
10
10
  import { BlockNumber, CheckpointNumber, IndexWithinCheckpoint, SlotNumber } from '@aztec/foundation/branded-types';
@@ -139,8 +139,8 @@ export const mockTx = async (
139
139
  data.constants.vkTreeRoot = vkTreeRoot;
140
140
  data.constants.protocolContractsHash = protocolContractsHash;
141
141
 
142
- // Set includeByTimestamp to the maximum allowed duration from the current time.
143
- data.includeByTimestamp = BigInt(Math.floor(Date.now() / 1000) + MAX_INCLUDE_BY_TIMESTAMP_DURATION);
142
+ // Set expirationTimestamp to the maximum allowed duration from the current time.
143
+ data.expirationTimestamp = BigInt(Math.floor(Date.now() / 1000) + MAX_TX_LIFETIME);
144
144
 
145
145
  const publicFunctionCalldata: HashedValues[] = [];
146
146
  if (!isForPublic) {
@@ -503,6 +503,7 @@ export interface MakeConsensusPayloadOptions {
503
503
  archive?: Fr;
504
504
  txHashes?: TxHash[];
505
505
  txs?: Tx[];
506
+ feeAssetPriceModifier?: bigint;
506
507
  }
507
508
 
508
509
  export interface MakeBlockProposalOptions {
@@ -519,6 +520,7 @@ export interface MakeCheckpointProposalOptions {
519
520
  signer?: Secp256k1Signer;
520
521
  checkpointHeader?: CheckpointHeader;
521
522
  archiveRoot?: Fr;
523
+ feeAssetPriceModifier?: bigint;
522
524
  /** Options for the lastBlock - if undefined, no lastBlock is included */
523
525
  lastBlock?: {
524
526
  blockHeader?: BlockHeader;
@@ -534,11 +536,12 @@ const makeAndSignConsensusPayload = (
534
536
  options?: MakeConsensusPayloadOptions,
535
537
  ) => {
536
538
  const header = options?.header ?? makeCheckpointHeader(1);
537
- const { signer = Secp256k1Signer.random(), archive = Fr.random() } = options ?? {};
539
+ const { signer = Secp256k1Signer.random(), archive = Fr.random(), feeAssetPriceModifier = 0n } = options ?? {};
538
540
 
539
541
  const payload = ConsensusPayload.fromFields({
540
542
  header,
541
543
  archive,
544
+ feeAssetPriceModifier,
542
545
  });
543
546
 
544
547
  const hash = getHashedSignaturePayloadEthSignedMessage(payload, domainSeparator);
@@ -582,6 +585,7 @@ export const makeCheckpointProposal = (options?: MakeCheckpointProposalOptions):
582
585
  const blockHeader = options?.lastBlock?.blockHeader ?? makeBlockHeader(1);
583
586
  const checkpointHeader = options?.checkpointHeader ?? makeCheckpointHeader(1);
584
587
  const archiveRoot = options?.archiveRoot ?? Fr.random();
588
+ const feeAssetPriceModifier = options?.feeAssetPriceModifier ?? 0n;
585
589
  const signer = options?.signer ?? Secp256k1Signer.random();
586
590
 
587
591
  // Build lastBlock info if provided
@@ -594,8 +598,12 @@ export const makeCheckpointProposal = (options?: MakeCheckpointProposalOptions):
594
598
  }
595
599
  : undefined;
596
600
 
597
- return CheckpointProposal.createProposalFromSigner(checkpointHeader, archiveRoot, lastBlockInfo, payload =>
598
- Promise.resolve(signer.signMessage(payload)),
601
+ return CheckpointProposal.createProposalFromSigner(
602
+ checkpointHeader,
603
+ archiveRoot,
604
+ feeAssetPriceModifier,
605
+ lastBlockInfo,
606
+ payload => Promise.resolve(signer.signMessage(payload)),
599
607
  );
600
608
  };
601
609
 
@@ -605,6 +613,7 @@ export const makeCheckpointProposal = (options?: MakeCheckpointProposalOptions):
605
613
  export type MakeCheckpointAttestationOptions = {
606
614
  header?: CheckpointHeader;
607
615
  archive?: Fr;
616
+ feeAssetPriceModifier?: bigint;
608
617
  attesterSigner?: Secp256k1Signer;
609
618
  proposerSigner?: Secp256k1Signer;
610
619
  signer?: Secp256k1Signer;
@@ -616,9 +625,10 @@ export type MakeCheckpointAttestationOptions = {
616
625
  export const makeCheckpointAttestation = (options: MakeCheckpointAttestationOptions = {}): CheckpointAttestation => {
617
626
  const header = options.header ?? makeCheckpointHeader(1);
618
627
  const archive = options.archive ?? Fr.random();
628
+ const feeAssetPriceModifier = options.feeAssetPriceModifier ?? 0n;
619
629
  const { signer, attesterSigner = signer, proposerSigner = signer } = options;
620
630
 
621
- const payload = new ConsensusPayload(header, archive);
631
+ const payload = new ConsensusPayload(header, archive, feeAssetPriceModifier);
622
632
 
623
633
  // Sign as attester
624
634
  const attestationHash = getHashedSignaturePayloadEthSignedMessage(
@@ -631,7 +641,7 @@ export const makeCheckpointAttestation = (options: MakeCheckpointAttestationOpti
631
641
  // Sign as proposer - use CheckpointProposal's payload format (serializeToBuffer)
632
642
  // This is different from ConsensusPayload's format (ABI encoding)
633
643
  const proposalSignerToUse = proposerSigner ?? Secp256k1Signer.random();
634
- const tempProposal = new CheckpointProposal(header, archive, Signature.empty());
644
+ const tempProposal = new CheckpointProposal(header, archive, feeAssetPriceModifier, Signature.empty());
635
645
  const proposalHash = getHashedSignaturePayloadEthSignedMessage(
636
646
  tempProposal,
637
647
  SignatureDomainSeparator.checkpointProposal,
@@ -648,7 +658,7 @@ export const makeCheckpointAttestationFromProposal = (
648
658
  proposal: CheckpointProposal,
649
659
  attesterSigner?: Secp256k1Signer,
650
660
  ): CheckpointAttestation => {
651
- const payload = new ConsensusPayload(proposal.checkpointHeader, proposal.archive);
661
+ const payload = new ConsensusPayload(proposal.checkpointHeader, proposal.archive, proposal.feeAssetPriceModifier);
652
662
 
653
663
  // Sign as attester
654
664
  const attestationHash = getHashedSignaturePayloadEthSignedMessage(
@@ -672,8 +682,9 @@ export const makeCheckpointAttestationFromCheckpoint = (
672
682
  ): CheckpointAttestation => {
673
683
  const header = checkpoint.header;
674
684
  const archive = checkpoint.archive.root;
685
+ const feeAssetPriceModifier = checkpoint.feeAssetPriceModifier;
675
686
 
676
- return makeCheckpointAttestation({ header, archive, attesterSigner, proposerSigner });
687
+ return makeCheckpointAttestation({ header, archive, feeAssetPriceModifier, attesterSigner, proposerSigner });
677
688
  };
678
689
 
679
690
  /**
@@ -1,4 +1,5 @@
1
1
  import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer';
2
+ import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
2
3
  import { Fr } from '@aztec/foundation/curves/bn254';
3
4
  import { schemas } from '@aztec/foundation/schemas';
4
5
  import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
@@ -81,11 +82,15 @@ export class PublicDataTreeLeafPreimage implements IndexedTreeLeafPreimage {
81
82
  toHashInputs(): Buffer[] {
82
83
  return [
83
84
  ...this.leaf.toHashInputs(),
84
- Buffer.from(toBufferBE(this.nextIndex, 32)),
85
85
  Buffer.from(this.nextKey.toBuffer()),
86
+ Buffer.from(toBufferBE(this.nextIndex, 32)),
86
87
  ];
87
88
  }
88
89
 
90
+ hash(): Promise<Fr> {
91
+ return poseidon2Hash(this.toHashInputs());
92
+ }
93
+
89
94
  clone(): PublicDataTreeLeafPreimage {
90
95
  return new PublicDataTreeLeafPreimage(this.leaf.clone(), this.nextKey, this.nextIndex);
91
96
  }
@@ -104,10 +109,11 @@ export class PublicDataTreeLeafPreimage implements IndexedTreeLeafPreimage {
104
109
 
105
110
  static fromBuffer(buffer: Buffer | BufferReader): PublicDataTreeLeafPreimage {
106
111
  const reader = BufferReader.asReader(buffer);
107
- const value = PublicDataTreeLeaf.fromBuffer(reader);
108
- const nextIndex = toBigIntBE(reader.readBytes(32));
109
- const nextSlot = Fr.fromBuffer(reader);
110
- return new PublicDataTreeLeafPreimage(value, nextSlot, nextIndex);
112
+ return new PublicDataTreeLeafPreimage(
113
+ PublicDataTreeLeaf.fromBuffer(reader),
114
+ Fr.fromBuffer(reader),
115
+ toBigIntBE(reader.readBytes(32)),
116
+ );
111
117
  }
112
118
 
113
119
  static fromLeaf(leaf: PublicDataTreeLeaf, nextKey: bigint, nextIndex: bigint): PublicDataTreeLeafPreimage {
@@ -1,4 +1,4 @@
1
- import { BLOCK_HEADER_LENGTH, GeneratorIndex } from '@aztec/constants';
1
+ import { BLOCK_HEADER_LENGTH, DomainSeparator } from '@aztec/constants';
2
2
  import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
3
3
  import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
4
4
  import { randomInt } from '@aztec/foundation/crypto/random';
@@ -164,7 +164,7 @@ export class BlockHeader {
164
164
 
165
165
  hash(): Promise<BlockHash> {
166
166
  if (!this._cachedHash) {
167
- this._cachedHash = poseidon2HashWithSeparator(this.toFields(), GeneratorIndex.BLOCK_HEADER_HASH).then(
167
+ this._cachedHash = poseidon2HashWithSeparator(this.toFields(), DomainSeparator.BLOCK_HEADER_HASH).then(
168
168
  fr => new BlockHash(fr),
169
169
  );
170
170
  }
@@ -22,10 +22,10 @@ import { schemas } from '../schemas/index.js';
22
22
  import type { UInt64 } from '../types/index.js';
23
23
 
24
24
  /**
25
- * Global variables that are constant across the entire slot.
26
- * TODO(palla/mbps): Should timestamp be included here as well?
25
+ * Global variables that are constant across the entire checkpoint (slot).
26
+ * Excludes blockNumber since that varies per block within a checkpoint.
27
27
  */
28
- export type CheckpointGlobalVariables = Omit<FieldsOf<GlobalVariables>, 'blockNumber' | 'timestamp'>;
28
+ export type CheckpointGlobalVariables = Omit<FieldsOf<GlobalVariables>, 'blockNumber'>;
29
29
 
30
30
  /**
31
31
  * Global variables of the L2 block.
@@ -1,4 +1,4 @@
1
- import { GeneratorIndex, MAX_PROTOCOL_CONTRACTS } from '@aztec/constants';
1
+ import { DomainSeparator, MAX_PROTOCOL_CONTRACTS } from '@aztec/constants';
2
2
  import { makeTuple } from '@aztec/foundation/array';
3
3
  import { arraySerializedSizeOfNonEmpty } from '@aztec/foundation/collection';
4
4
  import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
@@ -71,7 +71,7 @@ export class ProtocolContracts {
71
71
  }
72
72
 
73
73
  hash() {
74
- return poseidon2HashWithSeparator(this.derivedAddresses, GeneratorIndex.PROTOCOL_CONTRACTS);
74
+ return poseidon2HashWithSeparator(this.derivedAddresses, DomainSeparator.PROTOCOL_CONTRACTS);
75
75
  }
76
76
 
77
77
  static get schema() {
@@ -1,4 +1,4 @@
1
- import { GeneratorIndex, TX_REQUEST_LENGTH } from '@aztec/constants';
1
+ import { DomainSeparator, TX_REQUEST_LENGTH } from '@aztec/constants';
2
2
  import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
3
3
  import { Fr } from '@aztec/foundation/curves/bn254';
4
4
  import { BufferReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
@@ -68,7 +68,7 @@ export class TxRequest {
68
68
  }
69
69
 
70
70
  hash() {
71
- return poseidon2HashWithSeparator(this.toFields(), GeneratorIndex.TX_REQUEST);
71
+ return poseidon2HashWithSeparator(this.toFields(), DomainSeparator.TX_REQUEST);
72
72
  }
73
73
 
74
74
  static empty() {
@@ -12,7 +12,7 @@ export const TX_ERROR_DUPLICATE_NULLIFIER_IN_TX = 'Duplicate nullifier in tx';
12
12
  export const TX_ERROR_EXISTING_NULLIFIER = 'Existing nullifier';
13
13
 
14
14
  // Metadata
15
- export const TX_ERROR_INVALID_INCLUDE_BY_TIMESTAMP = 'Invalid expiration timestamp';
15
+ export const TX_ERROR_INVALID_EXPIRATION_TIMESTAMP = 'Invalid expiration timestamp';
16
16
  export const TX_ERROR_INCORRECT_L1_CHAIN_ID = 'Incorrect L1 chain id';
17
17
  export const TX_ERROR_INCORRECT_ROLLUP_VERSION = 'Incorrect rollup version';
18
18
  export const TX_ERROR_INCORRECT_VK_TREE_ROOT = 'Incorrect verification keys tree root';
@@ -12,7 +12,14 @@ import type {
12
12
  } from './types.js';
13
13
 
14
14
  export const ValidatorStatusInSlotSchema = zodFor<ValidatorStatusInSlot>()(
15
- z.enum(['block-mined', 'block-proposed', 'block-missed', 'attestation-sent', 'attestation-missed']),
15
+ z.enum([
16
+ 'checkpoint-mined',
17
+ 'checkpoint-proposed',
18
+ 'checkpoint-missed',
19
+ 'blocks-missed',
20
+ 'attestation-sent',
21
+ 'attestation-missed',
22
+ ]),
16
23
  );
17
24
 
18
25
  export const ValidatorStatusHistorySchema = zodFor<ValidatorStatusHistory>()(
@@ -1,12 +1,13 @@
1
1
  import type { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
2
2
  import type { EthAddress } from '@aztec/foundation/eth-address';
3
3
 
4
- export type ValidatorStatusType = 'block' | 'attestation';
4
+ export type ValidatorStatusType = 'proposer' | 'attestation';
5
5
 
6
6
  export type ValidatorStatusInSlot =
7
- | 'block-mined'
8
- | 'block-proposed'
9
- | 'block-missed'
7
+ | 'checkpoint-mined'
8
+ | 'checkpoint-proposed'
9
+ | 'checkpoint-missed'
10
+ | 'blocks-missed'
10
11
  | 'attestation-sent'
11
12
  | 'attestation-missed';
12
13
 
@@ -1,30 +0,0 @@
1
- import { Fr } from '@aztec/foundation/curves/bn254';
2
- import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
3
- import { KeyValidationRequest } from './key_validation_request.js';
4
- /**
5
- * Request for validating keys used in the app and a generator.
6
- */
7
- export declare class KeyValidationRequestAndGenerator {
8
- /** The key validation request. */
9
- readonly request: KeyValidationRequest;
10
- /**
11
- * The generator index which can be used along with sk_m to derive the sk_app stored in the request.
12
- * Note: This generator constrains that a correct key type gets validated in the kernel.
13
- */
14
- readonly skAppGenerator: Fr;
15
- constructor(
16
- /** The key validation request. */
17
- request: KeyValidationRequest,
18
- /**
19
- * The generator index which can be used along with sk_m to derive the sk_app stored in the request.
20
- * Note: This generator constrains that a correct key type gets validated in the kernel.
21
- */
22
- skAppGenerator: Fr);
23
- toBuffer(): Buffer<ArrayBufferLike>;
24
- static fromBuffer(buffer: Buffer | BufferReader): KeyValidationRequestAndGenerator;
25
- toFields(): Fr[];
26
- static fromFields(fields: Fr[] | FieldReader): KeyValidationRequestAndGenerator;
27
- isEmpty(): boolean;
28
- static empty(): KeyValidationRequestAndGenerator;
29
- }
30
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5X3ZhbGlkYXRpb25fcmVxdWVzdF9hbmRfZ2VuZXJhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMva2VybmVsL2hpbnRzL2tleV92YWxpZGF0aW9uX3JlcXVlc3RfYW5kX2dlbmVyYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFM0YsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFbkU7O0dBRUc7QUFDSCxxQkFBYSxnQ0FBZ0M7SUFFekMsa0NBQWtDO2FBQ2xCLE9BQU8sRUFBRSxvQkFBb0I7SUFDN0M7OztPQUdHO2FBQ2EsY0FBYyxFQUFFLEVBQUU7SUFQcEM7SUFDRSxrQ0FBa0M7SUFDbEIsT0FBTyxFQUFFLG9CQUFvQjtJQUM3Qzs7O09BR0c7SUFDYSxjQUFjLEVBQUUsRUFBRSxFQUNoQztJQUVKLFFBQVEsNEJBRVA7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxvQ0FHOUM7SUFFRCxRQUFRLElBQUksRUFBRSxFQUFFLENBUWY7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLEdBQUcsZ0NBQWdDLENBRzlFO0lBRUQsT0FBTyxZQUVOO0lBRUQsTUFBTSxDQUFDLEtBQUsscUNBRVg7Q0FDRiJ9
@@ -1 +0,0 @@
1
- {"version":3,"file":"key_validation_request_and_generator.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/key_validation_request_and_generator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE;;GAEG;AACH,qBAAa,gCAAgC;IAEzC,kCAAkC;aAClB,OAAO,EAAE,oBAAoB;IAC7C;;;OAGG;aACa,cAAc,EAAE,EAAE;IAPpC;IACE,kCAAkC;IAClB,OAAO,EAAE,oBAAoB;IAC7C;;;OAGG;IACa,cAAc,EAAE,EAAE,EAChC;IAEJ,QAAQ,4BAEP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,oCAG9C;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,gCAAgC,CAG9E;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,qCAEX;CACF"}
@@ -1,27 +0,0 @@
1
- import type { Fr } from '@aztec/foundation/curves/bn254';
2
- import type { AztecAddress } from '../aztec-address/index.js';
3
- import { type ZodFor } from '../schemas/index.js';
4
- import { NoteStatus } from './note_status.js';
5
- /**
6
- * A filter used to fetch notes.
7
- * @remarks This filter is applied as an intersection of all its params.
8
- */
9
- export type NotesFilter = {
10
- /**
11
- * The contract address the note belongs to.
12
- * @remarks Providing a contract address is required as we need that information to trigger private state sync.
13
- */
14
- contractAddress: AztecAddress;
15
- /** The owner of the note. */
16
- owner?: AztecAddress;
17
- /** The specific storage location of the note on the contract. */
18
- storageSlot?: Fr;
19
- /** The status of the note. Defaults to 'ACTIVE'. */
20
- status?: NoteStatus;
21
- /** The siloed nullifier for the note. */
22
- siloedNullifier?: Fr;
23
- /** The scopes in which to get notes from. This defaults to all scopes. */
24
- scopes?: AztecAddress[];
25
- };
26
- export declare const NotesFilterSchema: ZodFor<NotesFilter>;
27
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm90ZXNfZmlsdGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbm90ZS9ub3Rlc19maWx0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFJekQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0scUJBQXFCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTlDOzs7R0FHRztBQUNILE1BQU0sTUFBTSxXQUFXLEdBQUc7SUFDeEI7OztPQUdHO0lBQ0gsZUFBZSxFQUFFLFlBQVksQ0FBQztJQUM5Qiw2QkFBNkI7SUFDN0IsS0FBSyxDQUFDLEVBQUUsWUFBWSxDQUFDO0lBQ3JCLGlFQUFpRTtJQUNqRSxXQUFXLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDakIsb0RBQW9EO0lBQ3BELE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQztJQUNwQix5Q0FBeUM7SUFDekMsZUFBZSxDQUFDLEVBQUUsRUFBRSxDQUFDO0lBQ3JCLDBFQUEwRTtJQUMxRSxNQUFNLENBQUMsRUFBRSxZQUFZLEVBQUUsQ0FBQztDQUN6QixDQUFDO0FBRUYsZUFBTyxNQUFNLGlCQUFpQixFQUFFLE1BQU0sQ0FBQyxXQUFXLENBT2hELENBQUMifQ==
@@ -1 +0,0 @@
1
- {"version":3,"file":"notes_filter.d.ts","sourceRoot":"","sources":["../../src/note/notes_filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB;;;OAGG;IACH,eAAe,EAAE,YAAY,CAAC;IAC9B,6BAA6B;IAC7B,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,iEAAiE;IACjE,WAAW,CAAC,EAAE,EAAE,CAAC;IACjB,oDAAoD;IACpD,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,yCAAyC;IACzC,eAAe,CAAC,EAAE,EAAE,CAAC;IACrB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAOhD,CAAC"}
@@ -1,11 +0,0 @@
1
- import { z } from 'zod';
2
- import { schemas } from '../schemas/index.js';
3
- import { NoteStatus } from './note_status.js';
4
- export const NotesFilterSchema = z.object({
5
- contractAddress: schemas.AztecAddress,
6
- owner: schemas.AztecAddress.optional(),
7
- storageSlot: schemas.Fr.optional(),
8
- status: z.nativeEnum(NoteStatus).optional(),
9
- siloedNullifier: schemas.Fr.optional(),
10
- scopes: z.array(schemas.AztecAddress).optional()
11
- });
@@ -1,38 +0,0 @@
1
- import type { Fr } from '@aztec/foundation/curves/bn254';
2
-
3
- import { z } from 'zod';
4
-
5
- import type { AztecAddress } from '../aztec-address/index.js';
6
- import { type ZodFor, schemas } from '../schemas/index.js';
7
- import { NoteStatus } from './note_status.js';
8
-
9
- /**
10
- * A filter used to fetch notes.
11
- * @remarks This filter is applied as an intersection of all its params.
12
- */
13
- export type NotesFilter = {
14
- /**
15
- * The contract address the note belongs to.
16
- * @remarks Providing a contract address is required as we need that information to trigger private state sync.
17
- */
18
- contractAddress: AztecAddress;
19
- /** The owner of the note. */
20
- owner?: AztecAddress;
21
- /** The specific storage location of the note on the contract. */
22
- storageSlot?: Fr;
23
- /** The status of the note. Defaults to 'ACTIVE'. */
24
- status?: NoteStatus;
25
- /** The siloed nullifier for the note. */
26
- siloedNullifier?: Fr;
27
- /** The scopes in which to get notes from. This defaults to all scopes. */
28
- scopes?: AztecAddress[];
29
- };
30
-
31
- export const NotesFilterSchema: ZodFor<NotesFilter> = z.object({
32
- contractAddress: schemas.AztecAddress,
33
- owner: schemas.AztecAddress.optional(),
34
- storageSlot: schemas.Fr.optional(),
35
- status: z.nativeEnum(NoteStatus).optional(),
36
- siloedNullifier: schemas.Fr.optional(),
37
- scopes: z.array(schemas.AztecAddress).optional(),
38
- });