From 5a44b346550d927b6254b20f149d7e77956d66d1 Mon Sep 17 00:00:00 2001 From: Dmitry Lavrenov Date: Mon, 6 May 2024 18:10:23 +0300 Subject: [PATCH] Remove bls12-377 as it's not properly implemented --- Cargo.lock | 24 ------------- Cargo.toml | 1 - crates/humanode-runtime/Cargo.toml | 2 -- .../src/frontier_precompiles.rs | 34 ------------------- 4 files changed, 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b0b8d931d..c5aaa24c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -279,17 +279,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" -[[package]] -name = "ark-bls12-377" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f" -dependencies = [ - "ark-ec", - "ark-ff", - "ark-std", -] - [[package]] name = "ark-bls12-381" version = "0.4.0" @@ -4138,7 +4127,6 @@ dependencies = [ "pallet-evm-accounts-mapping", "pallet-evm-balances", "pallet-evm-precompile-blake2", - "pallet-evm-precompile-bls12377", "pallet-evm-precompile-bn128", "pallet-evm-precompile-modexp", "pallet-evm-precompile-sha3fips", @@ -6528,18 +6516,6 @@ dependencies = [ "fp-evm", ] -[[package]] -name = "pallet-evm-precompile-bls12377" -version = "1.0.0-dev" -source = "git+https://github.com/humanode-network/frontier?branch=locked/polkadot-v0.9.40#ac5c3415f47adf126419579924052daff07301e1" -dependencies = [ - "ark-bls12-377", - "ark-ec", - "ark-ff", - "ark-std", - "fp-evm", -] - [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" diff --git a/Cargo.toml b/Cargo.toml index b15404e04..7a6acd766 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -158,7 +158,6 @@ pallet-ethereum = { git = "https://github.com/humanode-network/frontier", branch pallet-evm = { git = "https://github.com/humanode-network/frontier", branch = "locked/polkadot-v0.9.40", default-features = false } pallet-evm-balances = { git = "https://github.com/humanode-network/frontier", branch = "locked/polkadot-v0.9.40", default-features = false } pallet-evm-precompile-blake2 = { git = "https://github.com/humanode-network/frontier", branch = "locked/polkadot-v0.9.40", default-features = false } -pallet-evm-precompile-bls12377 = { git = "https://github.com/humanode-network/frontier", branch = "locked/polkadot-v0.9.40", default-features = false } pallet-evm-precompile-bn128 = { git = "https://github.com/humanode-network/frontier", branch = "locked/polkadot-v0.9.40", default-features = false } pallet-evm-precompile-modexp = { git = "https://github.com/humanode-network/frontier", branch = "locked/polkadot-v0.9.40", default-features = false } pallet-evm-precompile-sha3fips = { git = "https://github.com/humanode-network/frontier", branch = "locked/polkadot-v0.9.40", default-features = false } diff --git a/crates/humanode-runtime/Cargo.toml b/crates/humanode-runtime/Cargo.toml index 06711d763..7c0e3b7fd 100644 --- a/crates/humanode-runtime/Cargo.toml +++ b/crates/humanode-runtime/Cargo.toml @@ -65,7 +65,6 @@ pallet-ethereum = { workspace = true } pallet-evm = { workspace = true } pallet-evm-balances = { workspace = true } pallet-evm-precompile-blake2 = { workspace = true } -pallet-evm-precompile-bls12377 = { workspace = true } pallet-evm-precompile-bn128 = { workspace = true } pallet-evm-precompile-modexp = { workspace = true } pallet-evm-precompile-sha3fips = { workspace = true } @@ -177,7 +176,6 @@ std = [ "pallet-ethereum/std", "pallet-evm-accounts-mapping/std", "pallet-evm-precompile-blake2/std", - "pallet-evm-precompile-bls12377/std", "pallet-evm-precompile-bn128/std", "pallet-evm-precompile-modexp/std", "pallet-evm-precompile-sha3fips/std", diff --git a/crates/humanode-runtime/src/frontier_precompiles.rs b/crates/humanode-runtime/src/frontier_precompiles.rs index 2475655fd..8a733eb77 100644 --- a/crates/humanode-runtime/src/frontier_precompiles.rs +++ b/crates/humanode-runtime/src/frontier_precompiles.rs @@ -3,10 +3,6 @@ use pallet_evm::{ IsPrecompileResult, Precompile, PrecompileHandle, PrecompileResult, PrecompileSet, }; use pallet_evm_precompile_blake2::Blake2F; -use pallet_evm_precompile_bls12377::{ - Bls12377G1Add, Bls12377G1Mul, Bls12377G1MultiExp, Bls12377G2Add, Bls12377G2Mul, - Bls12377G2MultiExp, Bls12377Pairing, -}; use pallet_evm_precompile_bn128::{Bn128Add, Bn128Mul, Bn128Pairing}; use pallet_evm_precompile_modexp::Modexp; use pallet_evm_precompile_sha3fips::Sha3FIPS256; @@ -67,21 +63,6 @@ pub mod precompiles_constants { /// `Bls12381MapG2` precompile constant. pub const BLS12381_MAP_G2: u64 = 19; - /// `Bls12377G1Add` precompile constant. - pub const BLS12377_G1_ADD: u64 = 21; - /// `Bls12377G1Mul` precompile constant. - pub const BLS12377_G1_MUL: u64 = 22; - /// `Bls12377G1MultiExp` precompile constant. - pub const BLS12377_G1_MULTI_EXP: u64 = 23; - /// `Bls12377G2Add` precompile constant. - pub const BLS12377_G2_ADD: u64 = 24; - /// `Bls12377G2Mul` precompile constant. - pub const BLS12377_G2_MUL: u64 = 25; - /// `Bls12377G2MultiExp` precompile constant. - pub const BLS12377_G2_MULTI_EXP: u64 = 26; - /// `Bls12377Pairing` precompile constant. - pub const BLS12377_PAIRING: u64 = 27; - /// `Sha3FIPS256` precompile constant. pub const SHA_3_FIPS256: u64 = 1024; /// `ECRecoverPublicKey` precompile constant. @@ -131,13 +112,6 @@ where BLS12381_PAIRING, BLS12381_MAP_G1, BLS12381_MAP_G2, - BLS12377_G1_ADD, - BLS12377_G1_MUL, - BLS12377_G1_MULTI_EXP, - BLS12377_G2_ADD, - BLS12377_G2_MUL, - BLS12377_G2_MULTI_EXP, - BLS12377_PAIRING, SHA_3_FIPS256, EC_RECOVER_PUBLIC_KEY, BIOAUTH, @@ -189,14 +163,6 @@ where a if a == hash(BLS12381_PAIRING) => Some(Bls12381Pairing::execute(handle)), a if a == hash(BLS12381_MAP_G1) => Some(Bls12381MapG1::execute(handle)), a if a == hash(BLS12381_MAP_G2) => Some(Bls12381MapG2::execute(handle)), - // BLS12-377 precompiles: - a if a == hash(BLS12377_G1_ADD) => Some(Bls12377G1Add::execute(handle)), - a if a == hash(BLS12377_G1_MUL) => Some(Bls12377G1Mul::execute(handle)), - a if a == hash(BLS12377_G1_MULTI_EXP) => Some(Bls12377G1MultiExp::execute(handle)), - a if a == hash(BLS12377_G2_ADD) => Some(Bls12377G2Add::execute(handle)), - a if a == hash(BLS12377_G2_MUL) => Some(Bls12377G2Mul::execute(handle)), - a if a == hash(BLS12377_G2_MULTI_EXP) => Some(Bls12377G2MultiExp::execute(handle)), - a if a == hash(BLS12377_PAIRING) => Some(Bls12377Pairing::execute(handle)), // Non-Frontier specific nor Ethereum precompiles : a if a == hash(SHA_3_FIPS256) => Some(Sha3FIPS256::execute(handle)), a if a == hash(EC_RECOVER_PUBLIC_KEY) => Some(ECRecoverPublicKey::execute(handle)),