Skip to content

Commit 2156b18

Browse files
LHerskindLHerskind
authored
Merge 7baa9a4 into 244ef7e 
2 parents 244ef7e + 7baa9a4 commit 2156b18

15 files changed

Lines changed: 99 additions & 99 deletions

File tree

‎barretenberg/cpp/pil/avm/constants_gen.pil‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ namespace constants(256);
66
pol MAX_NEW_L2_TO_L1_MSGS_PER_CALL = 2;
77
pol MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL = 32;
88
pol MAX_PUBLIC_DATA_READS_PER_CALL = 32;
9-
pol MAX_NOTE_HASH_READ_REQUESTS_PER_CALL = 32;
10-
pol MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 32;
11-
pol MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL = 32;
9+
pol MAX_NOTE_HASH_READ_REQUESTS_PER_CALL = 16;
10+
pol MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 16;
11+
pol MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL = 16;
1212
pol MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL = 16;
1313
pol MAX_UNENCRYPTED_LOGS_PER_CALL = 4;
1414
pol SENDER_SELECTOR = 0;
@@ -27,13 +27,13 @@ namespace constants(256);
2727
pol START_SIDE_EFFECT_COUNTER = 37;
2828
pol TRANSACTION_FEE_SELECTOR = 40;
2929
pol START_NOTE_HASH_EXISTS_WRITE_OFFSET = 0;
30-
pol START_NULLIFIER_EXISTS_OFFSET = 32;
31-
pol START_NULLIFIER_NON_EXISTS_OFFSET = 64;
32-
pol START_L1_TO_L2_MSG_EXISTS_WRITE_OFFSET = 96;
33-
pol START_SSTORE_WRITE_OFFSET = 112;
34-
pol START_SLOAD_WRITE_OFFSET = 144;
35-
pol START_EMIT_NOTE_HASH_WRITE_OFFSET = 176;
36-
pol START_EMIT_NULLIFIER_WRITE_OFFSET = 192;
37-
pol START_EMIT_L2_TO_L1_MSG_WRITE_OFFSET = 208;
38-
pol START_EMIT_UNENCRYPTED_LOG_WRITE_OFFSET = 210;
30+
pol START_NULLIFIER_EXISTS_OFFSET = 16;
31+
pol START_NULLIFIER_NON_EXISTS_OFFSET = 32;
32+
pol START_L1_TO_L2_MSG_EXISTS_WRITE_OFFSET = 48;
33+
pol START_SSTORE_WRITE_OFFSET = 64;
34+
pol START_SLOAD_WRITE_OFFSET = 96;
35+
pol START_EMIT_NOTE_HASH_WRITE_OFFSET = 128;
36+
pol START_EMIT_NULLIFIER_WRITE_OFFSET = 144;
37+
pol START_EMIT_L2_TO_L1_MSG_WRITE_OFFSET = 160;
38+
pol START_EMIT_UNENCRYPTED_LOG_WRITE_OFFSET = 162;
3939

‎barretenberg/cpp/src/barretenberg/relations/generated/avm/main.hpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1481,7 +1481,7 @@ template <typename FF_> class mainImpl {
14811481
Avm_DECLARE_VIEWS(128);
14821482

14831483
auto tmp = (main_sel_op_emit_note_hash *
1484-
(kernel_kernel_out_offset - (kernel_emit_note_hash_write_offset + FF(176))));
1484+
(kernel_kernel_out_offset - (kernel_emit_note_hash_write_offset + FF(128))));
14851485
tmp *= scaling_factor;
14861486
std::get<128>(evals) += tmp;
14871487
}
@@ -1499,8 +1499,8 @@ template <typename FF_> class mainImpl {
14991499

15001500
auto tmp = (main_sel_op_nullifier_exists *
15011501
(kernel_kernel_out_offset -
1502-
((main_ib * (kernel_nullifier_exists_write_offset + FF(32))) +
1503-
((-main_ib + FF(1)) * (kernel_nullifier_non_exists_write_offset + FF(64))))));
1502+
((main_ib * (kernel_nullifier_exists_write_offset + FF(16))) +
1503+
((-main_ib + FF(1)) * (kernel_nullifier_non_exists_write_offset + FF(32))))));
15041504
tmp *= scaling_factor;
15051505
std::get<130>(evals) += tmp;
15061506
}
@@ -1525,7 +1525,7 @@ template <typename FF_> class mainImpl {
15251525
Avm_DECLARE_VIEWS(133);
15261526

15271527
auto tmp = (main_sel_op_emit_nullifier *
1528-
(kernel_kernel_out_offset - (kernel_emit_nullifier_write_offset + FF(192))));
1528+
(kernel_kernel_out_offset - (kernel_emit_nullifier_write_offset + FF(144))));
15291529
tmp *= scaling_factor;
15301530
std::get<133>(evals) += tmp;
15311531
}
@@ -1542,7 +1542,7 @@ template <typename FF_> class mainImpl {
15421542
Avm_DECLARE_VIEWS(135);
15431543

15441544
auto tmp = (main_sel_op_l1_to_l2_msg_exists *
1545-
(kernel_kernel_out_offset - (kernel_l1_to_l2_msg_exists_write_offset + FF(96))));
1545+
(kernel_kernel_out_offset - (kernel_l1_to_l2_msg_exists_write_offset + FF(48))));
15461546
tmp *= scaling_factor;
15471547
std::get<135>(evals) += tmp;
15481548
}
@@ -1559,7 +1559,7 @@ template <typename FF_> class mainImpl {
15591559
Avm_DECLARE_VIEWS(137);
15601560

15611561
auto tmp = (main_sel_op_emit_unencrypted_log *
1562-
(kernel_kernel_out_offset - (kernel_emit_unencrypted_log_write_offset + FF(210))));
1562+
(kernel_kernel_out_offset - (kernel_emit_unencrypted_log_write_offset + FF(162))));
15631563
tmp *= scaling_factor;
15641564
std::get<137>(evals) += tmp;
15651565
}
@@ -1576,7 +1576,7 @@ template <typename FF_> class mainImpl {
15761576
Avm_DECLARE_VIEWS(139);
15771577

15781578
auto tmp = (main_sel_op_emit_l2_to_l1_msg *
1579-
(kernel_kernel_out_offset - (kernel_emit_l2_to_l1_msg_write_offset + FF(208))));
1579+
(kernel_kernel_out_offset - (kernel_emit_l2_to_l1_msg_write_offset + FF(160))));
15801580
tmp *= scaling_factor;
15811581
std::get<139>(evals) += tmp;
15821582
}
@@ -1592,7 +1592,7 @@ template <typename FF_> class mainImpl {
15921592
{
15931593
Avm_DECLARE_VIEWS(141);
15941594

1595-
auto tmp = (main_sel_op_sload * (kernel_kernel_out_offset - (kernel_sload_write_offset + FF(144))));
1595+
auto tmp = (main_sel_op_sload * (kernel_kernel_out_offset - (kernel_sload_write_offset + FF(96))));
15961596
tmp *= scaling_factor;
15971597
std::get<141>(evals) += tmp;
15981598
}
@@ -1608,7 +1608,7 @@ template <typename FF_> class mainImpl {
16081608
{
16091609
Avm_DECLARE_VIEWS(143);
16101610

1611-
auto tmp = (main_sel_op_sstore * (kernel_kernel_out_offset - (kernel_sstore_write_offset + FF(112))));
1611+
auto tmp = (main_sel_op_sstore * (kernel_kernel_out_offset - (kernel_sstore_write_offset + FF(64))));
16121612
tmp *= scaling_factor;
16131613
std::get<143>(evals) += tmp;
16141614
}

‎barretenberg/cpp/src/barretenberg/vm/avm_trace/aztec_constants.hpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
#define MAX_NEW_L2_TO_L1_MSGS_PER_CALL 2
88
#define MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL 32
99
#define MAX_PUBLIC_DATA_READS_PER_CALL 32
10-
#define MAX_NOTE_HASH_READ_REQUESTS_PER_CALL 32
11-
#define MAX_NULLIFIER_READ_REQUESTS_PER_CALL 32
12-
#define MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL 32
10+
#define MAX_NOTE_HASH_READ_REQUESTS_PER_CALL 16
11+
#define MAX_NULLIFIER_READ_REQUESTS_PER_CALL 16
12+
#define MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL 16
1313
#define MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL 16
1414
#define MAX_UNENCRYPTED_LOGS_PER_CALL 4
1515
#define AZTEC_ADDRESS_LENGTH 1
@@ -30,7 +30,7 @@
3030
#define STATE_REFERENCE_LENGTH 8
3131
#define TOTAL_FEES_LENGTH 1
3232
#define HEADER_LENGTH 23
33-
#define PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH 578
33+
#define PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH 482
3434
#define PUBLIC_CONTEXT_INPUTS_LENGTH 41
3535
#define SENDER_SELECTOR 0
3636
#define ADDRESS_SELECTOR 1
@@ -48,12 +48,12 @@
4848
#define START_SIDE_EFFECT_COUNTER 37
4949
#define TRANSACTION_FEE_SELECTOR 40
5050
#define START_NOTE_HASH_EXISTS_WRITE_OFFSET 0
51-
#define START_NULLIFIER_EXISTS_OFFSET 32
52-
#define START_NULLIFIER_NON_EXISTS_OFFSET 64
53-
#define START_L1_TO_L2_MSG_EXISTS_WRITE_OFFSET 96
54-
#define START_SSTORE_WRITE_OFFSET 112
55-
#define START_SLOAD_WRITE_OFFSET 144
56-
#define START_EMIT_NOTE_HASH_WRITE_OFFSET 176
57-
#define START_EMIT_NULLIFIER_WRITE_OFFSET 192
58-
#define START_EMIT_L2_TO_L1_MSG_WRITE_OFFSET 208
59-
#define START_EMIT_UNENCRYPTED_LOG_WRITE_OFFSET 210
51+
#define START_NULLIFIER_EXISTS_OFFSET 16
52+
#define START_NULLIFIER_NON_EXISTS_OFFSET 32
53+
#define START_L1_TO_L2_MSG_EXISTS_WRITE_OFFSET 48
54+
#define START_SSTORE_WRITE_OFFSET 64
55+
#define START_SLOAD_WRITE_OFFSET 96
56+
#define START_EMIT_NOTE_HASH_WRITE_OFFSET 128
57+
#define START_EMIT_NULLIFIER_WRITE_OFFSET 144
58+
#define START_EMIT_L2_TO_L1_MSG_WRITE_OFFSET 160
59+
#define START_EMIT_UNENCRYPTED_LOG_WRITE_OFFSET 162

‎l1-contracts/src/core/libraries/ConstantsGen.sol‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ library Constants {
2222
uint256 internal constant MAX_NEW_L2_TO_L1_MSGS_PER_CALL = 2;
2323
uint256 internal constant MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL = 32;
2424
uint256 internal constant MAX_PUBLIC_DATA_READS_PER_CALL = 32;
25-
uint256 internal constant MAX_NOTE_HASH_READ_REQUESTS_PER_CALL = 32;
26-
uint256 internal constant MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 32;
27-
uint256 internal constant MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL = 32;
25+
uint256 internal constant MAX_NOTE_HASH_READ_REQUESTS_PER_CALL = 16;
26+
uint256 internal constant MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 16;
27+
uint256 internal constant MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL = 16;
2828
uint256 internal constant MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL = 16;
2929
uint256 internal constant MAX_KEY_VALIDATION_REQUESTS_PER_CALL = 16;
3030
uint256 internal constant MAX_NOTE_ENCRYPTED_LOGS_PER_CALL = 16;
@@ -39,9 +39,9 @@ library Constants {
3939
uint256 internal constant MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 64;
4040
uint256 internal constant MAX_PUBLIC_DATA_READS_PER_TX = 64;
4141
uint256 internal constant MAX_NEW_L2_TO_L1_MSGS_PER_TX = 8;
42-
uint256 internal constant MAX_NOTE_HASH_READ_REQUESTS_PER_TX = 128;
43-
uint256 internal constant MAX_NULLIFIER_READ_REQUESTS_PER_TX = 128;
44-
uint256 internal constant MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX = 128;
42+
uint256 internal constant MAX_NOTE_HASH_READ_REQUESTS_PER_TX = 64;
43+
uint256 internal constant MAX_NULLIFIER_READ_REQUESTS_PER_TX = 64;
44+
uint256 internal constant MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX = 64;
4545
uint256 internal constant MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_TX = 64;
4646
uint256 internal constant MAX_KEY_VALIDATION_REQUESTS_PER_TX = 64;
4747
uint256 internal constant MAX_NOTE_ENCRYPTED_LOGS_PER_TX = 64;
@@ -149,22 +149,22 @@ library Constants {
149149
uint256 internal constant TX_REQUEST_LENGTH = 13;
150150
uint256 internal constant TOTAL_FEES_LENGTH = 1;
151151
uint256 internal constant HEADER_LENGTH = 23;
152-
uint256 internal constant PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 457;
153-
uint256 internal constant PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH = 578;
154-
uint256 internal constant PRIVATE_CALL_STACK_ITEM_LENGTH = 460;
152+
uint256 internal constant PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 393;
153+
uint256 internal constant PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH = 482;
154+
uint256 internal constant PRIVATE_CALL_STACK_ITEM_LENGTH = 396;
155155
uint256 internal constant PUBLIC_CONTEXT_INPUTS_LENGTH = 41;
156156
uint256 internal constant AGGREGATION_OBJECT_LENGTH = 16;
157157
uint256 internal constant SCOPED_READ_REQUEST_LEN = 3;
158158
uint256 internal constant PUBLIC_DATA_READ_LENGTH = 2;
159-
uint256 internal constant VALIDATION_REQUESTS_LENGTH = 1602;
159+
uint256 internal constant VALIDATION_REQUESTS_LENGTH = 1026;
160160
uint256 internal constant PUBLIC_DATA_UPDATE_REQUEST_LENGTH = 3;
161161
uint256 internal constant COMBINED_ACCUMULATED_DATA_LENGTH = 333;
162162
uint256 internal constant COMBINED_CONSTANT_DATA_LENGTH = 40;
163163
uint256 internal constant CALL_REQUEST_LENGTH = 7;
164164
uint256 internal constant PRIVATE_ACCUMULATED_DATA_LENGTH = 1152;
165-
uint256 internal constant PRIVATE_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 2803;
165+
uint256 internal constant PRIVATE_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 2227;
166166
uint256 internal constant PUBLIC_ACCUMULATED_DATA_LENGTH = 983;
167-
uint256 internal constant PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 3834;
167+
uint256 internal constant PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 3258;
168168
uint256 internal constant KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 383;
169169
uint256 internal constant CONSTANT_ROLLUP_DATA_LENGTH = 14;
170170
uint256 internal constant BASE_OR_MERGE_PUBLIC_INPUTS_LENGTH = 31;
@@ -200,13 +200,13 @@ library Constants {
200200
uint256 internal constant START_SIDE_EFFECT_COUNTER = 37;
201201
uint256 internal constant TRANSACTION_FEE_SELECTOR = 40;
202202
uint256 internal constant START_NOTE_HASH_EXISTS_WRITE_OFFSET = 0;
203-
uint256 internal constant START_NULLIFIER_EXISTS_OFFSET = 32;
204-
uint256 internal constant START_NULLIFIER_NON_EXISTS_OFFSET = 64;
205-
uint256 internal constant START_L1_TO_L2_MSG_EXISTS_WRITE_OFFSET = 96;
206-
uint256 internal constant START_SSTORE_WRITE_OFFSET = 112;
207-
uint256 internal constant START_SLOAD_WRITE_OFFSET = 144;
208-
uint256 internal constant START_EMIT_NOTE_HASH_WRITE_OFFSET = 176;
209-
uint256 internal constant START_EMIT_NULLIFIER_WRITE_OFFSET = 192;
210-
uint256 internal constant START_EMIT_L2_TO_L1_MSG_WRITE_OFFSET = 208;
211-
uint256 internal constant START_EMIT_UNENCRYPTED_LOG_WRITE_OFFSET = 210;
203+
uint256 internal constant START_NULLIFIER_EXISTS_OFFSET = 16;
204+
uint256 internal constant START_NULLIFIER_NON_EXISTS_OFFSET = 32;
205+
uint256 internal constant START_L1_TO_L2_MSG_EXISTS_WRITE_OFFSET = 48;
206+
uint256 internal constant START_SSTORE_WRITE_OFFSET = 64;
207+
uint256 internal constant START_SLOAD_WRITE_OFFSET = 96;
208+
uint256 internal constant START_EMIT_NOTE_HASH_WRITE_OFFSET = 128;
209+
uint256 internal constant START_EMIT_NULLIFIER_WRITE_OFFSET = 144;
210+
uint256 internal constant START_EMIT_L2_TO_L1_MSG_WRITE_OFFSET = 160;
211+
uint256 internal constant START_EMIT_UNENCRYPTED_LOG_WRITE_OFFSET = 162;
212212
}

‎noir-projects/noir-protocol-circuits/crates/types/src/abis/private_call_stack_item.nr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,6 @@ fn empty_hash() {
8585
let hash = item.hash();
8686

8787
// Value from private_call_stack_item.test.ts "computes empty item hash" test
88-
let test_data_empty_hash = 0x22786e4f971661d2e49095e6b038e5170bc47b795253916d5657c4bdd1df50bf;
88+
let test_data_empty_hash = 0x157022d579f892f06461fb895cdf5550b24329e15e7a41df14f9dad582fa1bc5;
8989
assert_eq(hash, test_data_empty_hash);
9090
}

‎noir-projects/noir-protocol-circuits/crates/types/src/abis/private_circuit_public_inputs.nr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,6 @@ fn empty_hash() {
250250
let inputs = PrivateCircuitPublicInputs::empty();
251251
let hash = inputs.hash();
252252
// Value from private_circuit_public_inputs.test.ts "computes empty item hash" test
253-
let test_data_empty_hash = 0x1970bf189adc837d1769f9f44a8b55c97d45690e7744859b71b647e808ee8622;
253+
let test_data_empty_hash = 0x1eb5048b5bdcea5ba66519ecd1cbdb9e18fd957d52830b2bcb309f4ce9bcfbd3;
254254
assert_eq(hash, test_data_empty_hash);
255255
}

‎noir-projects/noir-protocol-circuits/crates/types/src/abis/public_call_stack_item.nr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ mod tests {
7070
let call_stack_item = PublicCallStackItem { contract_address, public_inputs, is_execution_request: true, function_data };
7171

7272
// Value from public_call_stack_item.test.ts "Computes a callstack item request hash" test
73-
let test_data_call_stack_item_request_hash = 0x2751111aa213d9d21279da53531bf90c2da272cf3f959e2a2a1dfceb487bf102;
73+
let test_data_call_stack_item_request_hash = 0x022a2b82af83606ae5a8d4955ef6215e54025193356318aefbde3b5026952953;
7474
assert_eq(call_stack_item.hash(), test_data_call_stack_item_request_hash);
7575
}
7676

@@ -88,7 +88,7 @@ mod tests {
8888
let call_stack_item = PublicCallStackItem { contract_address, public_inputs, is_execution_request: false, function_data };
8989

9090
// Value from public_call_stack_item.test.ts "Computes a callstack item hash" test
91-
let test_data_call_stack_item_hash = 0x1860d00d9602966e398c6d585216baba2ffa8c5eddda5faee041136665d8482a;
91+
let test_data_call_stack_item_hash = 0x23a1d22e7bf37df7d68e8fcbfb7e016c060194b7915e3771e2dcd72cea26e427;
9292
assert_eq(call_stack_item.hash(), test_data_call_stack_item_hash);
9393
}
9494
}

‎noir-projects/noir-protocol-circuits/crates/types/src/abis/public_circuit_public_inputs.nr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,6 @@ fn empty_hash() {
201201
let hash = inputs.hash();
202202

203203
// Value from public_circuit_public_inputs.test.ts "computes empty item hash" test
204-
let test_data_empty_hash = 0x01681b19fb7fe21aa9c2cf9fb47520149f46edd679b2e7c2b2c4a279fd685125;
204+
let test_data_empty_hash = 0x2e08158f3f0d9a94e3f17338aadc3733a15bf5d163f94cef1afd8a47b446d789;
205205
assert_eq(hash, test_data_empty_hash);
206206
}

‎noir-projects/noir-protocol-circuits/crates/types/src/constants.nr‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ global MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL: u32 = 16;
2929
global MAX_NEW_L2_TO_L1_MSGS_PER_CALL: u32 = 2;
3030
global MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL: u32 = 32;
3131
global MAX_PUBLIC_DATA_READS_PER_CALL: u32 = 32;
32-
global MAX_NOTE_HASH_READ_REQUESTS_PER_CALL: u32 = 32;
33-
global MAX_NULLIFIER_READ_REQUESTS_PER_CALL: u32 = 32;
34-
global MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL: u32 = 32;
32+
global MAX_NOTE_HASH_READ_REQUESTS_PER_CALL: u32 = 16;
33+
global MAX_NULLIFIER_READ_REQUESTS_PER_CALL: u32 = 16;
34+
global MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_CALL: u32 = 16;
3535
global MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_CALL: u32 = 16;
3636
global MAX_KEY_VALIDATION_REQUESTS_PER_CALL: u32 = 16;
3737
global MAX_NOTE_ENCRYPTED_LOGS_PER_CALL: u32 = 16;
@@ -52,9 +52,9 @@ global PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: u32 = 1;
5252
global MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX: u32 = 64; // MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX + PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX;
5353
global MAX_PUBLIC_DATA_READS_PER_TX: u32 = 64;
5454
global MAX_NEW_L2_TO_L1_MSGS_PER_TX: u32 = 8;
55-
global MAX_NOTE_HASH_READ_REQUESTS_PER_TX: u32 = 128;
56-
global MAX_NULLIFIER_READ_REQUESTS_PER_TX: u32 = 128;
57-
global MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX: u32 = 128;
55+
global MAX_NOTE_HASH_READ_REQUESTS_PER_TX: u32 = 64;
56+
global MAX_NULLIFIER_READ_REQUESTS_PER_TX: u32 = 64;
57+
global MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX: u32 = 64;
5858
global MAX_L1_TO_L2_MSG_READ_REQUESTS_PER_TX: u32 = 64;
5959
// TODO: for large multisends we might run out of key validation requests here but not dealing with this now as
6060
// databus will hopefully make the issue go away.
@@ -65,7 +65,7 @@ global MAX_UNENCRYPTED_LOGS_PER_TX: u32 = 8;
6565
// docs:end:constants
6666

6767
// KERNEL CIRCUIT PRIVATE INPUTS CONSTANTS
68-
// global MAX_PUBLIC_DATA_HINTS: u32 = MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX + MAX_PUBLIC_DATA_READS_PER_TX;
68+
// global MAX_PUBLIC_DATA_HINTS: u32 = MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX + MAX_PUBLIC_DATA_READS_PER_TX;
6969
// FIX: Sadly, writing this as above causes a type error in type_conversion.ts.
7070
global MAX_PUBLIC_DATA_HINTS: u32 = 128;
7171

‎yarn-project/circuits.js/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@
9797
]
9898
]
9999
}
100-
}
100+
}

0 commit comments

Comments
 (0)