Skip to content

Commit 167a15e

Browse files
TomAFrenchTomAFrench
committed
Merge branch 'master' into sync-noir
* master: Revert "cl/split_out_e2e_tests" feat: `multi_scalar_mul` blackbox func (#6097) cl/split_out_e2e_tests fix: aztec-run not exposing port for builder (#6241) feat: add ciphertext computation for log header (#6175)
2 parents 20b068b + 50b559d commit 167a15e

81 files changed

Lines changed: 861 additions & 1270 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎aztec-up/bin/.aztec-run‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ while [[ "$#" -gt 0 ]]; do
9898
esac
9999
done
100100

101-
# Dynamic port assignment based on IMAGE containing '/aztec'
101+
# Dynamic port assignment based on IMAGE containing '/aztec' and not containing 'builder' (to exclude aztec-builder)
102102
port_assignment=""
103-
if [[ "$IMAGE" == *"/aztec"* ]]; then
103+
if [[ "$IMAGE" == *"/aztec"* ]] && [[ "$IMAGE" != *"builder"* ]]; then
104104
port_assignment="-p $AZTEC_PORT:$AZTEC_PORT"
105105
fi
106106

‎barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,10 @@ void build_constraints(Builder& builder, AcirFormat const& constraint_system, bo
8484
for (const auto& constraint : constraint_system.poseidon2_constraints) {
8585
create_poseidon2_permutations(builder, constraint);
8686
}
87-
// Add fixed base scalar mul constraints
88-
for (const auto& constraint : constraint_system.fixed_base_scalar_mul_constraints) {
89-
create_fixed_base_constraint(builder, constraint);
90-
}
9187

92-
// Add variable base scalar mul constraints
93-
for (const auto& constraint : constraint_system.variable_base_scalar_mul_constraints) {
94-
create_variable_base_constraint(builder, constraint);
88+
// Add multi scalar mul constraints
89+
for (const auto& constraint : constraint_system.multi_scalar_mul_constraints) {
90+
create_multi_scalar_mul_constraint(builder, constraint);
9591
}
9692

9793
// Add ec add constraints

‎barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@
88
#include "ec_operations.hpp"
99
#include "ecdsa_secp256k1.hpp"
1010
#include "ecdsa_secp256r1.hpp"
11-
#include "fixed_base_scalar_mul.hpp"
1211
#include "keccak_constraint.hpp"
1312
#include "logic_constraint.hpp"
13+
#include "multi_scalar_mul.hpp"
1414
#include "pedersen.hpp"
1515
#include "poseidon2_constraint.hpp"
1616
#include "range_constraint.hpp"
1717
#include "recursion_constraint.hpp"
1818
#include "schnorr_verify.hpp"
1919
#include "sha256_constraint.hpp"
20-
#include "variable_base_scalar_mul.hpp"
2120
#include <utility>
2221

2322
namespace acir_format {
@@ -48,8 +47,7 @@ struct AcirFormat {
4847
std::vector<PedersenConstraint> pedersen_constraints;
4948
std::vector<PedersenHashConstraint> pedersen_hash_constraints;
5049
std::vector<Poseidon2Constraint> poseidon2_constraints;
51-
std::vector<FixedBaseScalarMul> fixed_base_scalar_mul_constraints;
52-
std::vector<VariableBaseScalarMul> variable_base_scalar_mul_constraints;
50+
std::vector<MultiScalarMul> multi_scalar_mul_constraints;
5351
std::vector<EcAdd> ec_add_constraints;
5452
std::vector<RecursionConstraint> recursion_constraints;
5553
std::vector<BigIntFromLeBytes> bigint_from_le_bytes_constraints;
@@ -83,8 +81,7 @@ struct AcirFormat {
8381
pedersen_constraints,
8482
pedersen_hash_constraints,
8583
poseidon2_constraints,
86-
fixed_base_scalar_mul_constraints,
87-
variable_base_scalar_mul_constraints,
84+
multi_scalar_mul_constraints,
8885
ec_add_constraints,
8986
recursion_constraints,
9087
poly_triple_constraints,

‎barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ TEST_F(AcirFormatTests, TestASingleConstraintNoPubInputs)
4747
.pedersen_constraints = {},
4848
.pedersen_hash_constraints = {},
4949
.poseidon2_constraints = {},
50-
.fixed_base_scalar_mul_constraints = {},
51-
.variable_base_scalar_mul_constraints = {},
50+
.multi_scalar_mul_constraints = {},
5251
.ec_add_constraints = {},
5352
.recursion_constraints = {},
5453
.bigint_from_le_bytes_constraints = {},
@@ -164,8 +163,7 @@ TEST_F(AcirFormatTests, TestLogicGateFromNoirCircuit)
164163
.pedersen_constraints = {},
165164
.pedersen_hash_constraints = {},
166165
.poseidon2_constraints = {},
167-
.fixed_base_scalar_mul_constraints = {},
168-
.variable_base_scalar_mul_constraints = {},
166+
.multi_scalar_mul_constraints = {},
169167
.ec_add_constraints = {},
170168
.recursion_constraints = {},
171169
.bigint_from_le_bytes_constraints = {},
@@ -233,8 +231,7 @@ TEST_F(AcirFormatTests, TestSchnorrVerifyPass)
233231
.pedersen_constraints = {},
234232
.pedersen_hash_constraints = {},
235233
.poseidon2_constraints = {},
236-
.fixed_base_scalar_mul_constraints = {},
237-
.variable_base_scalar_mul_constraints = {},
234+
.multi_scalar_mul_constraints = {},
238235
.ec_add_constraints = {},
239236
.recursion_constraints = {},
240237
.bigint_from_le_bytes_constraints = {},
@@ -329,8 +326,7 @@ TEST_F(AcirFormatTests, TestSchnorrVerifySmallRange)
329326
.pedersen_constraints = {},
330327
.pedersen_hash_constraints = {},
331328
.poseidon2_constraints = {},
332-
.fixed_base_scalar_mul_constraints = {},
333-
.variable_base_scalar_mul_constraints = {},
329+
.multi_scalar_mul_constraints = {},
334330
.ec_add_constraints = {},
335331
.recursion_constraints = {},
336332
.bigint_from_le_bytes_constraints = {},
@@ -444,8 +440,7 @@ TEST_F(AcirFormatTests, TestVarKeccak)
444440
.pedersen_constraints = {},
445441
.pedersen_hash_constraints = {},
446442
.poseidon2_constraints = {},
447-
.fixed_base_scalar_mul_constraints = {},
448-
.variable_base_scalar_mul_constraints = {},
443+
.multi_scalar_mul_constraints = {},
449444
.ec_add_constraints = {},
450445
.recursion_constraints = {},
451446
.bigint_from_le_bytes_constraints = {},
@@ -492,8 +487,7 @@ TEST_F(AcirFormatTests, TestKeccakPermutation)
492487
.pedersen_constraints = {},
493488
.pedersen_hash_constraints = {},
494489
.poseidon2_constraints = {},
495-
.fixed_base_scalar_mul_constraints = {},
496-
.variable_base_scalar_mul_constraints = {},
490+
.multi_scalar_mul_constraints = {},
497491
.ec_add_constraints = {},
498492
.recursion_constraints = {},
499493
.bigint_from_le_bytes_constraints = {},

‎barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -310,19 +310,10 @@ void handle_blackbox_func_call(Program::Opcode::BlackBoxFuncCall const& arg, Aci
310310
.result = arg.output.value,
311311
.signature = map(arg.signature, [](auto& e) { return e.witness.value; }),
312312
});
313-
} else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::FixedBaseScalarMul>) {
314-
af.fixed_base_scalar_mul_constraints.push_back(FixedBaseScalarMul{
315-
.low = arg.low.witness.value,
316-
.high = arg.high.witness.value,
317-
.pub_key_x = arg.outputs[0].value,
318-
.pub_key_y = arg.outputs[1].value,
319-
});
320-
} else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::VariableBaseScalarMul>) {
321-
af.variable_base_scalar_mul_constraints.push_back(VariableBaseScalarMul{
322-
.point_x = arg.point_x.witness.value,
323-
.point_y = arg.point_y.witness.value,
324-
.scalar_low = arg.scalar_low.witness.value,
325-
.scalar_high = arg.scalar_high.witness.value,
313+
} else if constexpr (std::is_same_v<T, Program::BlackBoxFuncCall::MultiScalarMul>) {
314+
af.multi_scalar_mul_constraints.push_back(MultiScalarMul{
315+
.points = map(arg.points, [](auto& e) { return e.witness.value; }),
316+
.scalars = map(arg.scalars, [](auto& e) { return e.witness.value; }),
326317
.out_point_x = arg.outputs[0].value,
327318
.out_point_y = arg.outputs[1].value,
328319
});

‎barretenberg/cpp/src/barretenberg/dsl/acir_format/bigint_constraint.test.cpp‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,7 @@ TEST_F(BigIntTests, TestBigIntConstraintMultiple)
184184
.pedersen_constraints = {},
185185
.pedersen_hash_constraints = {},
186186
.poseidon2_constraints = {},
187-
.fixed_base_scalar_mul_constraints = {},
188-
.variable_base_scalar_mul_constraints = {},
187+
.multi_scalar_mul_constraints = {},
189188
.ec_add_constraints = {},
190189
.recursion_constraints = {},
191190
.bigint_from_le_bytes_constraints = {},
@@ -253,8 +252,7 @@ TEST_F(BigIntTests, TestBigIntConstraintSimple)
253252
.pedersen_constraints = {},
254253
.pedersen_hash_constraints = {},
255254
.poseidon2_constraints = {},
256-
.fixed_base_scalar_mul_constraints = {},
257-
.variable_base_scalar_mul_constraints = {},
255+
.multi_scalar_mul_constraints = {},
258256
.ec_add_constraints = {},
259257
.recursion_constraints = {},
260258
.bigint_from_le_bytes_constraints = { from_le_bytes_constraint_bigint1 },
@@ -307,8 +305,7 @@ TEST_F(BigIntTests, TestBigIntConstraintReuse)
307305
.pedersen_constraints = {},
308306
.pedersen_hash_constraints = {},
309307
.poseidon2_constraints = {},
310-
.fixed_base_scalar_mul_constraints = {},
311-
.variable_base_scalar_mul_constraints = {},
308+
.multi_scalar_mul_constraints = {},
312309
.ec_add_constraints = {},
313310
.recursion_constraints = {},
314311
.bigint_from_le_bytes_constraints = {},
@@ -365,8 +362,7 @@ TEST_F(BigIntTests, TestBigIntConstraintReuse2)
365362
.pedersen_constraints = {},
366363
.pedersen_hash_constraints = {},
367364
.poseidon2_constraints = {},
368-
.fixed_base_scalar_mul_constraints = {},
369-
.variable_base_scalar_mul_constraints = {},
365+
.multi_scalar_mul_constraints = {},
370366
.ec_add_constraints = {},
371367
.recursion_constraints = {},
372368
.bigint_from_le_bytes_constraints = {},
@@ -444,8 +440,7 @@ TEST_F(BigIntTests, TestBigIntDIV)
444440
.pedersen_constraints = {},
445441
.pedersen_hash_constraints = {},
446442
.poseidon2_constraints = {},
447-
.fixed_base_scalar_mul_constraints = {},
448-
.variable_base_scalar_mul_constraints = {},
443+
.multi_scalar_mul_constraints = {},
449444
.ec_add_constraints = {},
450445
.recursion_constraints = {},
451446
.bigint_from_le_bytes_constraints = { from_le_bytes_constraint_bigint1, from_le_bytes_constraint_bigint2 },

‎barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,7 @@ TEST_F(UltraPlonkRAM, TestBlockConstraint)
126126
.pedersen_constraints = {},
127127
.pedersen_hash_constraints = {},
128128
.poseidon2_constraints = {},
129-
.fixed_base_scalar_mul_constraints = {},
130-
.variable_base_scalar_mul_constraints = {},
129+
.multi_scalar_mul_constraints = {},
131130
.ec_add_constraints = {},
132131
.recursion_constraints = {},
133132
.bigint_from_le_bytes_constraints = {},

‎barretenberg/cpp/src/barretenberg/dsl/acir_format/ec_operations.test.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ TEST_F(EcOperations, TestECOperations)
6666
.pedersen_constraints = {},
6767
.pedersen_hash_constraints = {},
6868
.poseidon2_constraints = {},
69-
.fixed_base_scalar_mul_constraints = {},
70-
.variable_base_scalar_mul_constraints = {},
69+
.multi_scalar_mul_constraints = {},
7170
.ec_add_constraints = { ec_add_constraint },
7271
.recursion_constraints = {},
7372
.bigint_from_le_bytes_constraints = {},

‎barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ TEST_F(ECDSASecp256k1, TestECDSAConstraintSucceed)
106106
.pedersen_constraints = {},
107107
.pedersen_hash_constraints = {},
108108
.poseidon2_constraints = {},
109-
.fixed_base_scalar_mul_constraints = {},
110-
.variable_base_scalar_mul_constraints = {},
109+
.multi_scalar_mul_constraints = {},
111110
.ec_add_constraints = {},
112111
.recursion_constraints = {},
113112
.bigint_from_le_bytes_constraints = {},
@@ -156,8 +155,7 @@ TEST_F(ECDSASecp256k1, TestECDSACompilesForVerifier)
156155
.pedersen_constraints = {},
157156
.pedersen_hash_constraints = {},
158157
.poseidon2_constraints = {},
159-
.fixed_base_scalar_mul_constraints = {},
160-
.variable_base_scalar_mul_constraints = {},
158+
.multi_scalar_mul_constraints = {},
161159
.ec_add_constraints = {},
162160
.recursion_constraints = {},
163161
.bigint_from_le_bytes_constraints = {},
@@ -201,8 +199,7 @@ TEST_F(ECDSASecp256k1, TestECDSAConstraintFail)
201199
.pedersen_constraints = {},
202200
.pedersen_hash_constraints = {},
203201
.poseidon2_constraints = {},
204-
.fixed_base_scalar_mul_constraints = {},
205-
.variable_base_scalar_mul_constraints = {},
202+
.multi_scalar_mul_constraints = {},
206203
.ec_add_constraints = {},
207204
.recursion_constraints = {},
208205
.bigint_from_le_bytes_constraints = {},

‎barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ TEST(ECDSASecp256r1, test_hardcoded)
140140
.pedersen_constraints = {},
141141
.pedersen_hash_constraints = {},
142142
.poseidon2_constraints = {},
143-
.fixed_base_scalar_mul_constraints = {},
144-
.variable_base_scalar_mul_constraints = {},
143+
.multi_scalar_mul_constraints = {},
145144
.ec_add_constraints = {},
146145
.recursion_constraints = {},
147146
.bigint_from_le_bytes_constraints = {},
@@ -192,8 +191,7 @@ TEST(ECDSASecp256r1, TestECDSAConstraintSucceed)
192191
.pedersen_constraints = {},
193192
.pedersen_hash_constraints = {},
194193
.poseidon2_constraints = {},
195-
.fixed_base_scalar_mul_constraints = {},
196-
.variable_base_scalar_mul_constraints = {},
194+
.multi_scalar_mul_constraints = {},
197195
.ec_add_constraints = {},
198196
.recursion_constraints = {},
199197
.bigint_from_le_bytes_constraints = {},
@@ -242,8 +240,7 @@ TEST(ECDSASecp256r1, TestECDSACompilesForVerifier)
242240
.pedersen_constraints = {},
243241
.pedersen_hash_constraints = {},
244242
.poseidon2_constraints = {},
245-
.fixed_base_scalar_mul_constraints = {},
246-
.variable_base_scalar_mul_constraints = {},
243+
.multi_scalar_mul_constraints = {},
247244
.ec_add_constraints = {},
248245
.recursion_constraints = {},
249246
.bigint_from_le_bytes_constraints = {},
@@ -287,8 +284,7 @@ TEST(ECDSASecp256r1, TestECDSAConstraintFail)
287284
.pedersen_constraints = {},
288285
.pedersen_hash_constraints = {},
289286
.poseidon2_constraints = {},
290-
.fixed_base_scalar_mul_constraints = {},
291-
.variable_base_scalar_mul_constraints = {},
287+
.multi_scalar_mul_constraints = {},
292288
.ec_add_constraints = {},
293289
.recursion_constraints = {},
294290
.bigint_from_le_bytes_constraints = {},

0 commit comments

Comments
 (0)