From ab4c1eb68e0b1320795b224d3dee439b4102944f Mon Sep 17 00:00:00 2001 From: Kevin Heifner Date: Tue, 5 Sep 2023 17:41:08 -0500 Subject: [PATCH] GH-1523 CDT will use Affine little-endian format. --- .../chain/include/eosio/chain/webassembly/interface.hpp | 2 +- libraries/chain/webassembly/privileged.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/chain/include/eosio/chain/webassembly/interface.hpp b/libraries/chain/include/eosio/chain/webassembly/interface.hpp index bf40b47a7e..f93225c5e2 100644 --- a/libraries/chain/include/eosio/chain/webassembly/interface.hpp +++ b/libraries/chain/include/eosio/chain/webassembly/interface.hpp @@ -180,7 +180,7 @@ namespace webassembly { * struct abi_finalizer_authority { * std::string description; * uint64_t fweight = 0; // weight that this finalizer's vote has for meeting fthreshold - * std::array public_key_g1_jacobian; + * std::array public_key_g1_affine_le; * }; * struct abi_finalizer_set { * uint64_t fthreshold = 0; diff --git a/libraries/chain/webassembly/privileged.cpp b/libraries/chain/webassembly/privileged.cpp index 5aa052e4e8..a447154390 100644 --- a/libraries/chain/webassembly/privileged.cpp +++ b/libraries/chain/webassembly/privileged.cpp @@ -156,7 +156,7 @@ namespace eosio { namespace chain { namespace webassembly { struct abi_finalizer_authority { std::string description; uint64_t fweight = 0; // weight that this finalizer's vote has for meeting fthreshold - std::array public_key_g1_jacobian; + std::array public_key_g1_affine_le; }; struct abi_finalizer_set { uint64_t fthreshold = 0; @@ -183,7 +183,7 @@ namespace eosio { namespace chain { namespace webassembly { EOS_ASSERT( f.description.size() <= config::max_finalizer_description_size, wasm_execution_error, "Finalizer description greater than ${s}", ("s", config::max_finalizer_description_size) ); f_weight_sum += f.fweight; - std::optional pk = bls12_381::g1::fromJacobianBytesLE(f.public_key_g1_jacobian); + std::optional pk = bls12_381::g1::fromAffineBytesLE(f.public_key_g1_affine_le); EOS_ASSERT( pk, wasm_execution_error, "Invalid public key for: ${d}", ("d", f.description) ); finset.finalizers.push_back(finalizer_authority{.description = std::move(f.description), .fweight = f.fweight, @@ -272,5 +272,5 @@ namespace eosio { namespace chain { namespace webassembly { } }}} // ns eosio::chain::webassembly -FC_REFLECT(eosio::chain::webassembly::abi_finalizer_authority, (description)(fweight)(public_key_g1_jacobian)); +FC_REFLECT(eosio::chain::webassembly::abi_finalizer_authority, (description)(fweight)(public_key_g1_affine_le)); FC_REFLECT(eosio::chain::webassembly::abi_finalizer_set, (fthreshold)(finalizers)); \ No newline at end of file