Update BLS config (#1024)

* Add ts test * Update configs * Code clean * Reanme * Rename * Doc for deserialize_compressed_unchecked(pub_key) * More doc * Fmt * Fmt --------- Co-authored-by: echo <[email protected]>
darwinia-network · Mar 16, 2023 · 478f126 · 478f126
1 parent 834bfe9
commit 478f126
Show file tree

Hide file tree

Showing 9 changed files with 634 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/precompile/bls12-381/Cargo.toml b/precompile/bls12-381/Cargo.toml
@@ -22,7 +22,8 @@ pallet-evm = { workspace = true }
 precompile-utils = { workspace = true }
 
 # substrate
-sp-std = { workspace = true }
+frame-support = { workspace = true }
+sp-std        = { workspace = true }
 
 [dev-dependencies]
 rand    = { version = "0.8.5" }
@@ -46,5 +47,6 @@ std = [
 	"precompile-utils/std",
 
 	# substrate
+	"frame-support/std",
 	"sp-std/std",
 ]
diff --git a/precompile/bls12-381/src/lib.rs b/precompile/bls12-381/src/lib.rs
@@ -23,32 +23,50 @@ use bls::{hash_to_curve_g2, PublicKey, Signature};
 
 // core
 use core::marker::PhantomData;
+// frontier
+use pallet_evm::GasWeightMapping;
 // moonbeam
 use precompile_utils::prelude::*;
 // substrate
+use frame_support::{ensure, weights::Weight};
 use sp_std::prelude::*;
 
-pub(crate) const BLS_ESTIMATED_COST: u64 = 100_000;
+/// The BLS verification is a computationally intensive process. Normally, it consumes a lot of
+/// block weight according to our benchmark test. Tested verifying of 512 public keys signature on
+/// the `AMD Ryzen 7 5700G`,  this precompile consumed at least 117_954_459_000 weight. So we give
+/// them more than that to ensure there is enough time for other machine types.
+const BLS_WEIGHT: u64 = 150_000_000_000;
+
 pub struct BLS12381<T>(PhantomData<T>);
 
 #[precompile_utils::precompile]
 impl<Runtime: pallet_evm::Config> BLS12381<Runtime> {
+	/// FastAggregateVerify
+	///
+	/// Verifies an aggregate_signature against a list of pub_keys.
+	/// pub_keys must be trusted the origin of the serialization
+	/// precompile do not check the keys is valid
+	/// see more: https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bls-signature-04#section-2.5
 	#[precompile::public("fast_aggregate_verify(bytes[],bytes,bytes)")]
 	#[precompile::view]
 	fn fast_aggregate_verify(
 		handle: &mut impl PrecompileHandle,
-		pubkeys: Vec<UnboundedBytes>,
+		pub_keys: Vec<UnboundedBytes>,
 		message: UnboundedBytes,
 		signature: UnboundedBytes,
 	) -> EvmResult<bool> {
-		handle.record_cost(BLS_ESTIMATED_COST)?;
+		handle.record_cost(<Runtime as pallet_evm::Config>::GasWeightMapping::weight_to_gas(
+			Weight::from_ref_time(BLS_WEIGHT),
+		))?;
+
+		ensure!(pub_keys.len() <= 512, revert("Too many pub keys"));
 
 		let asig =
 			Signature::from_bytes(signature.as_bytes()).map_err(|_| revert("Invalid signature"))?;
-		let public_keys: Result<Vec<PublicKey>, _> =
-			pubkeys.into_iter().map(|k| PublicKey::from_bytes(k.as_bytes())).collect();
-		let Ok(pks) = public_keys else {
-            return Err(revert("Invalid pubkeys"));
+		let pub_keys: Result<Vec<PublicKey>, _> =
+			pub_keys.into_iter().map(|k| PublicKey::from_bytes(k.as_bytes())).collect();
+		let Ok(pks) = pub_keys else {
+            return Err(revert("Invalid pub keys"));
         };
 
 		let apk = PublicKey::aggregate(pks);

diff --git a/runtime/pangolin/src/pallets/evm.rs b/runtime/pangolin/src/pallets/evm.rs
@@ -21,7 +21,7 @@ use crate::*;
 // frontier
 use pallet_evm::Precompile;
 
-const BLOCK_GAS_LIMIT: u64 = 10_000_000;
+const BLOCK_GAS_LIMIT: u64 = 20_000_000;
 frame_support::parameter_types! {
 	pub BlockGasLimit: sp_core::U256 = sp_core::U256::from(BLOCK_GAS_LIMIT);
 	pub PrecompilesValue: PangolinPrecompiles<Runtime> = PangolinPrecompiles::<_>::new();

diff --git a/tests/config.ts b/tests/config.ts
@@ -4,7 +4,7 @@ import { JsonRpcResponse } from "web3-core-helpers";
 export const CHAIN_ID = 43;
 export const HOST_HTTP_URL = "http://127.0.0.1:9933";
 export const HOST_WS_URL = "ws://127.0.0.1:9944";
-export const BLOCK_GAS_LIMIT = 10000000;
+export const BLOCK_GAS_LIMIT = 20000000;
 export const DEFAULT_GAS = 4000000;
 
 // Accounts builtin

diff --git a/tests/ethereum/contracts/contracts_info.ts b/tests/ethereum/contracts/contracts_info.ts
@@ -365,3 +365,37 @@ export const eventInfo = {
 		},
 	],
 };
+
+export const blsInfo = {
+	abi: [
+		{
+			inputs: [
+				{
+					internalType: "bytes[]",
+					name: "pubkeys",
+					type: "bytes[]",
+				},
+				{
+					internalType: "bytes",
+					name: "message",
+					type: "bytes",
+				},
+				{
+					internalType: "bytes",
+					name: "sig",
+					type: "bytes",
+				},
+			],
+			name: "fast_aggregate_verify",
+			outputs: [
+				{
+					internalType: "bool",
+					name: "",
+					type: "bool",
+				},
+			],
+			stateMutability: "nonpayable",
+			type: "function",
+		},
+	],
+};
diff --git a/tests/ethereum/test-block.ts b/tests/ethereum/test-block.ts
@@ -38,7 +38,7 @@ describe("Test Block RPC", () => {
 			miner: "0x0000000000000000000000000000000000000000",
 			number: 0,
 			receiptsRoot: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-			size: 504,
+			size: 505,
 			timestamp: 0,
 			totalDifficulty: "0",
 			transactionsRoot: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",