@@ -4,8 +4,7 @@ import { BufferReader, Tuple } from '@aztec/foundation/serialize';
4
4
import {
5
5
ARCHIVE_HEIGHT ,
6
6
CONTRACT_SUBTREE_SIBLING_PATH_LENGTH ,
7
- KERNELS_PER_BASE_ROLLUP ,
8
- MAX_NEW_NULLIFIERS_PER_BASE_ROLLUP ,
7
+ MAX_NEW_NULLIFIERS_PER_TX ,
9
8
MAX_PUBLIC_DATA_READS_PER_TX ,
10
9
MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX ,
11
10
NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH ,
@@ -98,7 +97,7 @@ export class BaseRollupInputs {
98
97
/**
99
98
* Data of the 2 kernels that preceded this base rollup circuit.
100
99
*/
101
- public kernelData : Tuple < PreviousKernelData , typeof KERNELS_PER_BASE_ROLLUP > ,
100
+ public kernelData : PreviousKernelData ,
102
101
/**
103
102
* Snapshot of the note hash tree at the start of the base rollup circuit.
104
103
*/
@@ -123,23 +122,23 @@ export class BaseRollupInputs {
123
122
/**
124
123
* The nullifiers to be inserted in the tree, sorted high to low.
125
124
*/
126
- public sortedNewNullifiers : Tuple < Fr , typeof MAX_NEW_NULLIFIERS_PER_BASE_ROLLUP > ,
125
+ public sortedNewNullifiers : Tuple < Fr , typeof MAX_NEW_NULLIFIERS_PER_TX > ,
127
126
/**
128
127
* The indexes of the sorted nullifiers to the original ones.
129
128
*/
130
- public sortednewNullifiersIndexes : Tuple < UInt32 , typeof MAX_NEW_NULLIFIERS_PER_BASE_ROLLUP > ,
129
+ public sortednewNullifiersIndexes : Tuple < UInt32 , typeof MAX_NEW_NULLIFIERS_PER_TX > ,
131
130
/**
132
131
* The nullifiers which need to be updated to perform the batch insertion of the new nullifiers.
133
132
* See `StandardIndexedTree.batchInsert` function for more details.
134
133
*/
135
- public lowNullifierLeafPreimages : Tuple < NullifierLeafPreimage , typeof MAX_NEW_NULLIFIERS_PER_BASE_ROLLUP > ,
134
+ public lowNullifierLeafPreimages : Tuple < NullifierLeafPreimage , typeof MAX_NEW_NULLIFIERS_PER_TX > ,
136
135
/**
137
136
* Membership witnesses for the nullifiers which need to be updated to perform the batch insertion of the new
138
137
* nullifiers.
139
138
*/
140
139
public lowNullifierMembershipWitness : Tuple <
141
140
MembershipWitness < typeof NULLIFIER_TREE_HEIGHT > ,
142
- typeof MAX_NEW_NULLIFIERS_PER_BASE_ROLLUP
141
+ typeof MAX_NEW_NULLIFIERS_PER_TX
143
142
> ,
144
143
145
144
/**
@@ -157,65 +156,51 @@ export class BaseRollupInputs {
157
156
/**
158
157
* The public data writes to be inserted in the tree, sorted high slot to low slot.
159
158
*/
160
- public sortedPublicDataWrites : Tuple <
161
- Tuple < PublicDataTreeLeaf , typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX > ,
162
- typeof KERNELS_PER_BASE_ROLLUP
163
- > ,
159
+ public sortedPublicDataWrites : Tuple < PublicDataTreeLeaf , typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX > ,
160
+
164
161
/**
165
162
* The indexes of the sorted public data writes to the original ones.
166
163
*/
167
- public sortedPublicDataWritesIndexes : Tuple <
168
- Tuple < UInt32 , typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX > ,
169
- typeof KERNELS_PER_BASE_ROLLUP
170
- > ,
164
+ public sortedPublicDataWritesIndexes : Tuple < UInt32 , typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX > ,
171
165
/**
172
166
* The public data writes which need to be updated to perform the batch insertion of the new public data writes.
173
167
* See `StandardIndexedTree.batchInsert` function for more details.
174
168
*/
175
169
public lowPublicDataWritesPreimages : Tuple <
176
- Tuple < PublicDataTreeLeafPreimage , typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX > ,
177
- typeof KERNELS_PER_BASE_ROLLUP
170
+ PublicDataTreeLeafPreimage ,
171
+ typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
178
172
> ,
179
173
/**
180
174
* Membership witnesses for the nullifiers which need to be updated to perform the batch insertion of the new
181
175
* nullifiers.
182
176
*/
183
177
public lowPublicDataWritesMembershipWitnesses : Tuple <
184
- Tuple < MembershipWitness < typeof PUBLIC_DATA_TREE_HEIGHT > , typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX > ,
185
- typeof KERNELS_PER_BASE_ROLLUP
178
+ MembershipWitness < typeof PUBLIC_DATA_TREE_HEIGHT > ,
179
+ typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
186
180
> ,
187
181
188
182
/**
189
183
* Sibling path "pointing to" where the new public data subtree should be inserted into the public data tree.
190
184
*/
191
- public publicDataWritesSubtreeSiblingPaths : Tuple <
192
- Tuple < Fr , typeof PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH > ,
193
- typeof KERNELS_PER_BASE_ROLLUP
194
- > ,
185
+ public publicDataWritesSubtreeSiblingPath : Tuple < Fr , typeof PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH > ,
195
186
196
187
/**
197
188
* Preimages of leaves which are to be read by the public data reads.
198
189
*/
199
- public publicDataReadsPreimages : Tuple <
200
- Tuple < PublicDataTreeLeafPreimage , typeof MAX_PUBLIC_DATA_READS_PER_TX > ,
201
- typeof KERNELS_PER_BASE_ROLLUP
202
- > ,
190
+ public publicDataReadsPreimages : Tuple < PublicDataTreeLeafPreimage , typeof MAX_PUBLIC_DATA_READS_PER_TX > ,
203
191
/**
204
192
* Sibling paths of leaves which are to be read by the public data reads.
205
193
* Each item in the array is the sibling path that corresponds to a read request.
206
194
*/
207
195
public publicDataReadsMembershipWitnesses : Tuple <
208
- Tuple < MembershipWitness < typeof PUBLIC_DATA_TREE_HEIGHT > , typeof MAX_PUBLIC_DATA_READS_PER_TX > ,
209
- typeof KERNELS_PER_BASE_ROLLUP
196
+ MembershipWitness < typeof PUBLIC_DATA_TREE_HEIGHT > ,
197
+ typeof MAX_PUBLIC_DATA_READS_PER_TX
210
198
> ,
211
199
212
200
/**
213
201
* Membership witnesses of blocks referred by each of the 2 kernels.
214
202
*/
215
- public archiveRootMembershipWitnesses : Tuple <
216
- MembershipWitness < typeof ARCHIVE_HEIGHT > ,
217
- typeof KERNELS_PER_BASE_ROLLUP
218
- > ,
203
+ public archiveRootMembershipWitness : MembershipWitness < typeof ARCHIVE_HEIGHT > ,
219
204
/**
220
205
* Data which is not modified by the base rollup circuit.
221
206
*/
@@ -245,10 +230,10 @@ export class BaseRollupInputs {
245
230
fields . sortedPublicDataWritesIndexes ,
246
231
fields . lowPublicDataWritesPreimages ,
247
232
fields . lowPublicDataWritesMembershipWitnesses ,
248
- fields . publicDataWritesSubtreeSiblingPaths ,
233
+ fields . publicDataWritesSubtreeSiblingPath ,
249
234
fields . publicDataReadsPreimages ,
250
235
fields . publicDataReadsMembershipWitnesses ,
251
- fields . archiveRootMembershipWitnesses ,
236
+ fields . archiveRootMembershipWitness ,
252
237
fields . constants ,
253
238
] as const ;
254
239
}
0 commit comments