Skip to content

Commit

Permalink
Revert "TMP: add silkworm impl to bench"
Browse files Browse the repository at this point in the history 
This reverts commit 6a40800505041c2756344604b0d5add5544ad6cb.
  • Loading branch information
@chfast
chfast committed Sep 4, 2024
1 parent 2d8beb4 commit 949fe95
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 302 deletions.
4 changes: 0 additions & 4 deletions test/precompiles_bench/precompiles_bench.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,6 @@ namespace bench_kzg
{
constexpr auto evmone_blst = point_evaluation_execute;
BENCHMARK_TEMPLATE(precompile, PrecompileId::point_evaluation, evmone_blst);
#ifdef EVMONE_PRECOMPILES_SILKPRE
constexpr auto silkworm = silkpre_point_evaluation_execute;
BENCHMARK_TEMPLATE(precompile, PrecompileId::point_evaluation, silkworm);
#endif
} // namespace bench_kzg

} // namespace
Expand Down
2 changes: 1 addition & 1 deletion test/state/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

add_library(evmone-state STATIC)
add_library(evmone::state ALIAS evmone-state)
target_link_libraries(evmone-state PUBLIC evmc::evmc_cpp PRIVATE evmone evmone::precompiles ethash::keccak blst::blst)
target_link_libraries(evmone-state PUBLIC evmc::evmc_cpp PRIVATE evmone evmone::precompiles ethash::keccak)
target_include_directories(evmone-state PRIVATE ${evmone_private_include_dir})
target_sources(
evmone-state PRIVATE
Expand Down
294 changes: 0 additions & 294 deletions test/state/precompiles_silkpre.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,10 @@
// SPDX-License-Identifier: Apache-2.0

#include "precompiles_silkpre.hpp"
#include "evmone_precompiles/sha256.hpp"
#include "precompiles.hpp"

#include <silkpre/precompile.h>
#include <cassert>
#include <cstring>
#include <span>

#include <blst.h>

namespace evmone::state
{
Expand Down Expand Up @@ -83,293 +78,4 @@ ExecutionResult silkpre_blake2bf_execute(
{
return execute(input, input_size, output_buf, max_output_size, PrecompileId::blake2bf);
}

namespace
{

///////////////////////////////////////////////////////////////////////////////
// Types
///////////////////////////////////////////////////////////////////////////////

using G1 = blst_p1;
using G2 = blst_p2;
using Fr = blst_fr;

///////////////////////////////////////////////////////////////////////////////
// Constants
///////////////////////////////////////////////////////////////////////////////

// KZG_SETUP_G2[1] printed by cmd/dev/kzg_g2_uncompress
// See
// https://github.com/ethereum/consensus-specs/blob/dev/presets/mainnet/trusted_setups/trusted_setup_4096.json
static const G2 kKzgSetupG2_1{{{{0x6120a2099b0379f9, 0xa2df815cb8210e4e, 0xcb57be5577bd3d4f,
0x62da0ea89a0c93f8, 0x02e0ee16968e150d, 0x171f09aea833acd5},
{0x11a3670749dfd455, 0x04991d7b3abffadc, 0x85446a8e14437f41,
0x27174e7b4e76e3f2, 0x7bfa6dd397f60a20, 0x02fcc329ac07080f}}},
{{{0xaa130838793b2317, 0xe236dd220f891637, 0x6502782925760980, 0xd05c25f60557ec89,
0x6095767a44064474, 0x185693917080d405},
{0x549f9e175b03dc0a, 0x32c0c95a77106cfe, 0x64a74eae5705d080, 0x53deeaf56659ed9e,
0x09a1d368508afb93, 0x12cf3a4525b5e9bd}}},
{{{0x760900000002fffd, 0xebf4000bc40c0002, 0x5f48985753c758ba, 0x77ce585370525745,
0x5c071a97a256ec6d, 0x15f65ec3fa80e493},
{0x0000000000000000, 0x0000000000000000, 0x0000000000000000, 0x0000000000000000,
0x0000000000000000, 0x0000000000000000}}}};

///////////////////////////////////////////////////////////////////////////////
// Helper Functions
///////////////////////////////////////////////////////////////////////////////

evmc::bytes32 kzg_to_versioned_hash(std::span<const uint8_t, 48> kzg)
{
evmc::bytes32 hash;
evmone::crypto::sha256(reinterpret_cast<std::byte*>(hash.bytes),
reinterpret_cast<const std::byte*>(kzg.data()), kzg.size());
hash.bytes[0] = 1;
return hash;
}

/**
* Multiply a G1 group element by a field element.
*
* @param[out] out @p a * @p b
* @param[in] a The G1 group element
* @param[in] b The multiplier
*/
void g1_mul(G1* out, const G1* a, const Fr* b)
{
blst_scalar s;
blst_scalar_from_fr(&s, b);
/* The last argument is the number of bits in the scalar */
blst_p1_mult(out, a, s.b, 8 * sizeof(blst_scalar));
}

/**
* Multiply a G2 group element by a field element.
*
* @param[out] out @p a * @p b
* @param[in] a The G2 group element
* @param[in] b The multiplier
*/
void g2_mul(G2* out, const G2* a, const Fr* b)
{
blst_scalar s;
blst_scalar_from_fr(&s, b);
/* The last argument is the number of bits in the scalar */
blst_p2_mult(out, a, s.b, 8 * sizeof(blst_scalar));
}

/**
* Subtraction of G1 group elements.
*
* @param[out] out @p a - @p b
* @param[in] a A G1 group element
* @param[in] b The G1 group element to be subtracted
*/
void g1_sub(G1* out, const G1* a, const G1* b)
{
G1 bneg = *b;
blst_p1_cneg(&bneg, true);
blst_p1_add_or_double(out, a, &bneg);
}

/**
* Subtraction of G2 group elements.
*
* @param[out] out @p a - @p b
* @param[in] a A G2 group element
* @param[in] b The G2 group element to be subtracted
*/
void g2_sub(G2* out, const G2* a, const G2* b)
{
G2 bneg = *b;
blst_p2_cneg(&bneg, true);
blst_p2_add_or_double(out, a, &bneg);
}

/**
* Perform pairings and test whether the outcomes are equal in G_T.
*
* Tests whether `e(a1, a2) == e(b1, b2)`.
*
* @param[in] a1 A G1 group point for the first pairing
* @param[in] a2 A G2 group point for the first pairing
* @param[in] b1 A G1 group point for the second pairing
* @param[in] b2 A G2 group point for the second pairing
*
* @retval true The pairings were equal
* @retval false The pairings were not equal
*/
bool pairings_verify(const G1* a1, const G2* a2, const G1* b1, const G2* b2)
{
blst_fp12 loop0, loop1, gt_point;
blst_p1_affine aa1, bb1;
blst_p2_affine aa2, bb2;

/*
* As an optimisation, we want to invert one of the pairings,
* so we negate one of the points.
*/
G1 a1neg = *a1;
blst_p1_cneg(&a1neg, true);

blst_p1_to_affine(&aa1, &a1neg);
blst_p1_to_affine(&bb1, b1);
blst_p2_to_affine(&aa2, a2);
blst_p2_to_affine(&bb2, b2);

blst_miller_loop(&loop0, &aa2, &aa1);
blst_miller_loop(&loop1, &bb2, &bb1);

blst_fp12_mul(&gt_point, &loop0, &loop1);
blst_final_exp(&gt_point, &gt_point);

return blst_fp12_is_one(&gt_point);
}

///////////////////////////////////////////////////////////////////////////////
// BLS12-381 Helper Functions
///////////////////////////////////////////////////////////////////////////////

/**
* Convert untrusted bytes to a trusted and validated BLS scalar field
* element.
*
* @param[out] out The field element to store the deserialized data
* @param[in] b A 32-byte array containing the serialized field element
*/
bool bytes_to_bls_field(Fr* out, std::span<const uint8_t, 32> b)
{
blst_scalar tmp;
blst_scalar_from_bendian(&tmp, b.data());
if (!blst_scalar_fr_check(&tmp))
{
return false;
}
blst_fr_from_scalar(out, &tmp);
return true;
}

/**
* Perform BLS validation required by the types KZGProof and KZGCommitment.
*
* @remark This function deviates from the spec because it returns (via an
* output argument) the g1 point. This way is more efficient (faster)
* but the function name is a bit misleading.
*
* @param[out] out The output g1 point
* @param[in] b The proof/commitment bytes
*/
bool validate_kzg_g1(G1* out, std::span<const uint8_t, 48> b)
{
blst_p1_affine p1_affine;

/* Convert the bytes to a p1 point */
/* The uncompress routine checks that the point is on the curve */
if (blst_p1_uncompress(&p1_affine, b.data()) != BLST_SUCCESS)
{
return false;
}
blst_p1_from_affine(out, &p1_affine);

/* The point at infinity is accepted! */
if (blst_p1_is_inf(out))
{
return true;
}

/* The point must be on the right subgroup */
return blst_p1_in_g1(out);
}

///////////////////////////////////////////////////////////////////////////////
// KZG Functions
///////////////////////////////////////////////////////////////////////////////

/**
* Helper function: Verify KZG proof claiming that `p(z) == y`.
*
* Given a @p commitment to a polynomial, a @p proof for @p z, and the
* claimed value @p y at @p z, verify the claim.
*
* @param[in] commitment The commitment to a polynomial
* @param[in] z The point at which the proof is to be checked
* (opened)
* @param[in] y The claimed value of the polynomial at @p z
* @param[in] proof A proof of the value of the polynomial at the
* point @p z
* @return `true` if the proof is valid, `false` if not
*/
bool verify_kzg_proof_impl(const G1* commitment, const Fr* z, const Fr* y, const G1* proof)
{
G2 x_g2, X_minus_z;
G1 y_g1, P_minus_y;

/* Calculate: X_minus_z */
g2_mul(&x_g2, blst_p2_generator(), z);
g2_sub(&X_minus_z, &kKzgSetupG2_1, &x_g2);

/* Calculate: P_minus_y */
g1_mul(&y_g1, blst_p1_generator(), y);
g1_sub(&P_minus_y, commitment, &y_g1);

/* Verify: P - y = Q * (X - z) */
return pairings_verify(&P_minus_y, blst_p2_generator(), proof, &X_minus_z);
}

bool verify_kzg_proof(std::span<const uint8_t, 48> commitment, std::span<const uint8_t, 32> z,
std::span<const uint8_t, 32> y, std::span<const uint8_t, 48> proof)
{
Fr z_fr, y_fr;
G1 commitment_g1, proof_g1;

if (!validate_kzg_g1(&commitment_g1, commitment))
{
return false;
}
if (!bytes_to_bls_field(&z_fr, z))
{
return false;
}
if (!bytes_to_bls_field(&y_fr, y))
{
return false;
}
if (!validate_kzg_g1(&proof_g1, proof))
{
return false;
}

return verify_kzg_proof_impl(&commitment_g1, &z_fr, &y_fr, &proof_g1);
}

} // namespace

ExecutionResult silkpre_point_evaluation_execute(
const uint8_t* input, size_t input_size, uint8_t* output_buf, size_t) noexcept
{
if (input_size != 192)
{
return {EVMC_PRECOMPILE_FAILURE, 0};
}

const evmc::bytes_view versioned_hash{&input[0], 32};
const std::span<const uint8_t, 32> z{&input[32], 32};
const std::span<const uint8_t, 32> y{&input[64], 32};
const std::span<const uint8_t, 48> commitment{&input[96], 48};
const std::span<const uint8_t, 48> proof{&input[144], 48};

if (kzg_to_versioned_hash(commitment) != evmc::bytes_view{versioned_hash})
{
return {EVMC_PRECOMPILE_FAILURE, 0};
}

if (!verify_kzg_proof(commitment, z, y, proof))
{
return {EVMC_PRECOMPILE_FAILURE, 0};
}

// FIXME: This should output 2 constants, but omitted for performance testing.
std::memset(output_buf, 0, 64);
return {EVMC_SUCCESS, 64};
}
} // namespace evmone::state
3 changes: 0 additions & 3 deletions test/state/precompiles_silkpre.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,4 @@ ExecutionResult silkpre_ecpairing_execute(

ExecutionResult silkpre_blake2bf_execute(
const uint8_t* input, size_t input_size, uint8_t* output_buf, size_t max_output_size) noexcept;

ExecutionResult silkpre_point_evaluation_execute(
const uint8_t* input, size_t input_size, uint8_t* output_buf, size_t max_output_size) noexcept;
} // namespace evmone::state

0 comments on commit 949fe95

Please sign in to comment.