Skip to content

Commit 5a8e1fb

Browse files
authored
chore: remove no-longer-used lookup grand prod delta (#16543)
1 parent 243b25b commit 5a8e1fb

File tree

8 files changed

+12
-23
lines changed

8 files changed

+12
-23
lines changed

barretenberg/cpp/scripts/test_civc_standalone_vks_havent_changed.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cd ..
1111
# - Generate a hash for versioning: sha256sum bb-civc-inputs.tar.gz
1212
# - Upload the compressed results: aws s3 cp bb-civc-inputs.tar.gz s3://aztec-ci-artifacts/protocol/bb-civc-inputs-[hash(0:8)].tar.gz
1313
# Note: In case of the "Test suite failed to run ... Unexpected token 'with' " error, need to run: docker pull aztecprotocol/build:3.0
14-
pinned_short_hash="869efec4"
14+
pinned_short_hash="d1e22fdb"
1515
pinned_civc_inputs_url="https://aztec-ci-artifacts.s3.us-east-2.amazonaws.com/protocol/bb-civc-inputs-${pinned_short_hash}.tar.gz"
1616

1717
function compress_and_upload {

barretenberg/cpp/src/barretenberg/eccvm/eccvm_trace_checker.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ bool ECCVMTraceChecker::check(Builder& builder,
3535
.beta = beta,
3636
.gamma = gamma,
3737
.public_input_delta = 0,
38-
.lookup_grand_product_delta = 0,
3938
.beta_sqr = beta_sqr,
4039
.beta_cube = beta_cube,
4140
.eccvm_set_permutation_delta = eccvm_set_permutation_delta,

barretenberg/cpp/src/barretenberg/flavor/grand_product_library.test.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ template <class FF> class GrandProductTests : public testing::Test {
5555
.beta = beta,
5656
.gamma = gamma,
5757
.public_input_delta = 1,
58-
.lookup_grand_product_delta = 1,
5958
};
6059

6160
compute_grand_product<Flavor, typename bb::UltraPermutationRelation<FF>>(prover_polynomials, params);

barretenberg/cpp/src/barretenberg/relations/relation_parameters.hpp

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@ template <typename T> struct RelationParameters {
2121
static constexpr int NUM_BINARY_LIMBS_IN_GOBLIN_TRANSLATOR = 4;
2222
static constexpr int NUM_NATIVE_LIMBS_IN_GOBLIN_TRANSLATOR = 1;
2323
static constexpr int NUM_CHALLENGE_POWERS_IN_GOBLIN_TRANSLATOR = 4;
24-
static constexpr int NUM_TO_FOLD = 7;
24+
static constexpr int NUM_TO_FOLD = 6;
2525

26-
T eta{ 0 }; // Lookup + Aux Memory
27-
T eta_two{ 0 }; // Lookup + Aux Memory
28-
T eta_three{ 0 }; // Lookup + Aux Memory
29-
T beta{ 0 }; // Permutation + Lookup
30-
T gamma{ 0 }; // Permutation + Lookup
31-
T public_input_delta{ 0 }; // Permutation
32-
T lookup_grand_product_delta{ 0 }; // Lookup
26+
T eta{ 0 }; // Lookup + Aux Memory
27+
T eta_two{ 0 }; // Lookup + Aux Memory
28+
T eta_three{ 0 }; // Lookup + Aux Memory
29+
T beta{ 0 }; // Permutation + Lookup
30+
T gamma{ 0 }; // Permutation + Lookup
31+
T public_input_delta{ 0 }; // Permutation
3332
T beta_sqr{ 0 };
3433
T beta_cube{ 0 };
3534
// eccvm_set_permutation_delta is used in the set membership gadget in eccvm/ecc_set_relation.hpp
@@ -48,12 +47,12 @@ template <typename T> struct RelationParameters {
4847

4948
RefArray<T, NUM_TO_FOLD> get_to_fold()
5049
{
51-
return RefArray{ eta, eta_two, eta_three, beta, gamma, public_input_delta, lookup_grand_product_delta };
50+
return RefArray{ eta, eta_two, eta_three, beta, gamma, public_input_delta };
5251
}
5352

5453
RefArray<const T, NUM_TO_FOLD> get_to_fold() const
5554
{
56-
return RefArray{ eta, eta_two, eta_three, beta, gamma, public_input_delta, lookup_grand_product_delta };
55+
return RefArray{ eta, eta_two, eta_three, beta, gamma, public_input_delta };
5756
}
5857

5958
static RelationParameters get_random()
@@ -67,7 +66,6 @@ template <typename T> struct RelationParameters {
6766
result.beta_cube = result.beta_sqr * result.beta;
6867
result.gamma = T::random_element();
6968
result.public_input_delta = T::random_element();
70-
result.lookup_grand_product_delta = T::random_element();
7169
result.eccvm_set_permutation_delta = result.gamma * (result.gamma + result.beta_sqr) *
7270
(result.gamma + result.beta_sqr + result.beta_sqr) *
7371
(result.gamma + result.beta_sqr + result.beta_sqr + result.beta_sqr);
@@ -92,6 +90,6 @@ template <typename T> struct RelationParameters {
9290
return result;
9391
}
9492

95-
MSGPACK_FIELDS(eta, eta_two, eta_three, beta, gamma, public_input_delta, lookup_grand_product_delta);
93+
MSGPACK_FIELDS(eta, eta_two, eta_three, beta, gamma, public_input_delta);
9694
};
9795
} // namespace bb

barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/recursive_decider_verification_key.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ template <IsRecursiveFlavor Flavor> class RecursiveDeciderVerificationKey_ {
9393
relation_parameters.gamma = FF::from_witness(builder, verification_key->relation_parameters.gamma);
9494
relation_parameters.public_input_delta =
9595
FF::from_witness(builder, verification_key->relation_parameters.public_input_delta);
96-
relation_parameters.lookup_grand_product_delta =
97-
FF::from_witness(builder, verification_key->relation_parameters.lookup_grand_product_delta);
9896
}
9997
}
10098

@@ -141,8 +139,6 @@ template <IsRecursiveFlavor Flavor> class RecursiveDeciderVerificationKey_ {
141139
decider_vk.relation_parameters.beta = relation_parameters.beta.get_value();
142140
decider_vk.relation_parameters.gamma = relation_parameters.gamma.get_value();
143141
decider_vk.relation_parameters.public_input_delta = relation_parameters.public_input_delta.get_value();
144-
decider_vk.relation_parameters.lookup_grand_product_delta =
145-
relation_parameters.lookup_grand_product_delta.get_value();
146142
return decider_vk;
147143
}
148144

barretenberg/cpp/src/barretenberg/vm2/constraining/benchmark/relations_acc.bench.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ bb::RelationParameters<FF> get_params()
8282
.beta = FF::random_element(),
8383
.gamma = FF::random_element(),
8484
.public_input_delta = 0,
85-
.lookup_grand_product_delta = 0,
8685
.beta_sqr = 0,
8786
.beta_cube = 0,
8887
.eccvm_set_permutation_delta = 0,

barretenberg/cpp/src/barretenberg/vm2/constraining/check_circuit.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ void run_check_circuit(AvmFlavor::ProverPolynomials& polys, size_t num_rows, boo
2222
.beta = AvmFlavor::FF::random_element(),
2323
.gamma = AvmFlavor::FF::random_element(),
2424
.public_input_delta = 0,
25-
.lookup_grand_product_delta = 0,
2625
.beta_sqr = 0,
2726
.beta_cube = 0,
2827
.eccvm_set_permutation_delta = 0,

barretenberg/cpp/src/barretenberg/vm2/constraining/testing/check_relation.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ const RelationParameters<FF>& get_test_params()
99
.beta = FF::random_element(),
1010
.gamma = FF::random_element(),
1111
.public_input_delta = 0,
12-
.lookup_grand_product_delta = 0,
1312
.beta_sqr = 0,
1413
.beta_cube = 0,
1514
.eccvm_set_permutation_delta = 0,
1615
};
1716
return params;
1817
}
1918

20-
} // namespace bb::avm2::constraining::detail
19+
} // namespace bb::avm2::constraining::detail

0 commit comments

Comments
 (0)