diff --git a/runtime/moonbase/src/precompiles.rs b/runtime/moonbase/src/precompiles.rs index eb47f11ab2..780645886c 100644 --- a/runtime/moonbase/src/precompiles.rs +++ b/runtime/moonbase/src/precompiles.rs @@ -32,7 +32,7 @@ use pallet_evm_precompile_author_mapping::AuthorMappingPrecompile; use pallet_evm_precompile_balances_erc20::{Erc20BalancesPrecompile, Erc20Metadata}; use pallet_evm_precompile_batch::BatchPrecompile; use pallet_evm_precompile_blake2::Blake2F; -use pallet_evm_precompile_bls12381::{Bls12381G1Add, Bls12381G1Mul, Bls12381G1MultiExp, Bls12381G2Add, Bls12381G2Mul, Bls12381G2MultiExp, Bls12381Pairing, Bls12381MapG1, Bls12381MapG2}; +use pallet_evm_precompile_bls12381::{Bls12381G1Add, Bls12381G1MultiExp, Bls12381G2Add, Bls12381G2MultiExp, Bls12381Pairing, Bls12381MapG1, Bls12381MapG2}; use pallet_evm_precompile_bn128::{Bn128Add, Bn128Mul, Bn128Pairing}; use pallet_evm_precompile_call_permit::CallPermitPrecompile; use pallet_evm_precompile_collective::CollectivePrecompile; @@ -144,14 +144,12 @@ type MoonbasePrecompilesAt = ( PrecompileAt, Bn128Pairing, EthereumPrecompilesChecks>, PrecompileAt, Blake2F, EthereumPrecompilesChecks>, PrecompileAt, Bls12381G1Add, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381G1Mul, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381G1MultiExp, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381G2Add, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381G2Mul, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381G2MultiExp, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381Pairing, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381MapG1, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381MapG2, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381G1MultiExp, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381G2Add, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381G2MultiExp, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381Pairing, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381MapG1, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381MapG2, EthereumPrecompilesChecks>, // (0x100 => 256) https://github.com/ethereum/RIPs/blob/master/RIPS/rip-7212.md PrecompileAt, P256Verify, EthereumPrecompilesChecks>, // Non-Moonbeam specific nor Ethereum precompiles : diff --git a/runtime/moonbase/tests/integration_test.rs b/runtime/moonbase/tests/integration_test.rs index 756ab43c53..99093ec0d1 100644 --- a/runtime/moonbase/tests/integration_test.rs +++ b/runtime/moonbase/tests/integration_test.rs @@ -2714,7 +2714,7 @@ fn precompile_existence() { ExtBuilder::default().build().execute_with(|| { let precompiles = Precompiles::new(); let precompile_addresses: std::collections::BTreeSet<_> = vec![ - 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 256, + 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 256, 1024, 1025, 1026, 1027, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057, 2058, 2059, 2060, 2061, 2062, 2063, 2064, 2065, 2066, 2067, 2068, 2069, 2070, 2071, 2072, 2073, 2074, 2075, diff --git a/runtime/moonbeam/src/precompiles.rs b/runtime/moonbeam/src/precompiles.rs index 9ada961b7e..bc9be06718 100644 --- a/runtime/moonbeam/src/precompiles.rs +++ b/runtime/moonbeam/src/precompiles.rs @@ -30,7 +30,7 @@ use pallet_evm_precompile_author_mapping::AuthorMappingPrecompile; use pallet_evm_precompile_balances_erc20::{Erc20BalancesPrecompile, Erc20Metadata}; use pallet_evm_precompile_batch::BatchPrecompile; use pallet_evm_precompile_blake2::Blake2F; -use pallet_evm_precompile_bls12381::{Bls12381G1Add, Bls12381G1Mul, Bls12381G1MultiExp, Bls12381G2Add, Bls12381G2Mul, Bls12381G2MultiExp, Bls12381Pairing, Bls12381MapG1, Bls12381MapG2}; +use pallet_evm_precompile_bls12381::{Bls12381G1Add, Bls12381G1MultiExp, Bls12381G2Add, Bls12381G2MultiExp, Bls12381Pairing, Bls12381MapG1, Bls12381MapG2}; use pallet_evm_precompile_bn128::{Bn128Add, Bn128Mul, Bn128Pairing}; use pallet_evm_precompile_call_permit::CallPermitPrecompile; use pallet_evm_precompile_collective::CollectivePrecompile; @@ -139,15 +139,14 @@ type MoonbeamPrecompilesAt = ( PrecompileAt, Bn128Mul, EthereumPrecompilesChecks>, PrecompileAt, Bn128Pairing, EthereumPrecompilesChecks>, PrecompileAt, Blake2F, EthereumPrecompilesChecks>, + // 10 is not implemented, Ethereum uses this slot for Point Evaluation PrecompileAt, Bls12381G1Add, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381G1Mul, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381G1MultiExp, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381G2Add, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381G2Mul, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381G2MultiExp, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381Pairing, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381MapG1, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381MapG2, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381G1MultiExp, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381G2Add, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381G2MultiExp, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381Pairing, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381MapG1, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381MapG2, EthereumPrecompilesChecks>, // (0x100 => 256) https://github.com/ethereum/RIPs/blob/master/RIPS/rip-7212.md PrecompileAt, P256Verify, EthereumPrecompilesChecks>, // Non-Moonbeam specific nor Ethereum precompiles : diff --git a/runtime/moonbeam/tests/integration_test.rs b/runtime/moonbeam/tests/integration_test.rs index 487d0f49f0..3842a8baa2 100644 --- a/runtime/moonbeam/tests/integration_test.rs +++ b/runtime/moonbeam/tests/integration_test.rs @@ -2518,7 +2518,7 @@ fn precompile_existence() { ExtBuilder::default().build().execute_with(|| { let precompiles = Precompiles::new(); let precompile_addresses: std::collections::BTreeSet<_> = vec![ - 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 256, + 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 256, 1024, 1025, 1026, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057, 2058, 2059, 2060, 2061, 2062, 2063, 2064, 2065, 2066, 2067, 2068, 2069, 2070, 2071, 2072, 2073, 2074, diff --git a/runtime/moonriver/src/precompiles.rs b/runtime/moonriver/src/precompiles.rs index f1889e3756..0c92a5dfe8 100644 --- a/runtime/moonriver/src/precompiles.rs +++ b/runtime/moonriver/src/precompiles.rs @@ -29,7 +29,7 @@ use pallet_evm_precompile_author_mapping::AuthorMappingPrecompile; use pallet_evm_precompile_balances_erc20::{Erc20BalancesPrecompile, Erc20Metadata}; use pallet_evm_precompile_batch::BatchPrecompile; use pallet_evm_precompile_blake2::Blake2F; -use pallet_evm_precompile_bls12381::{Bls12381G1Add, Bls12381G1Mul, Bls12381G1MultiExp, Bls12381G2Add, Bls12381G2Mul, Bls12381G2MultiExp, Bls12381Pairing, Bls12381MapG1, Bls12381MapG2}; +use pallet_evm_precompile_bls12381::{Bls12381G1Add, Bls12381G1MultiExp, Bls12381G2Add, Bls12381G2MultiExp, Bls12381Pairing, Bls12381MapG1, Bls12381MapG2}; use pallet_evm_precompile_bn128::{Bn128Add, Bn128Mul, Bn128Pairing}; use pallet_evm_precompile_call_permit::CallPermitPrecompile; use pallet_evm_precompile_collective::CollectivePrecompile; @@ -134,14 +134,12 @@ type MoonriverPrecompilesAt = ( PrecompileAt, Bn128Pairing, EthereumPrecompilesChecks>, PrecompileAt, Blake2F, EthereumPrecompilesChecks>, PrecompileAt, Bls12381G1Add, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381G1Mul, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381G1MultiExp, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381G2Add, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381G2Mul, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381G2MultiExp, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381Pairing, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381MapG1, EthereumPrecompilesChecks>, - PrecompileAt, Bls12381MapG2, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381G1MultiExp, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381G2Add, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381G2MultiExp, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381Pairing, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381MapG1, EthereumPrecompilesChecks>, + PrecompileAt, Bls12381MapG2, EthereumPrecompilesChecks>, // (0x100 => 256) https://github.com/ethereum/RIPs/blob/master/RIPS/rip-7212.md PrecompileAt, P256Verify, EthereumPrecompilesChecks>, // Non-Moonbeam specific nor Ethereum precompiles : diff --git a/runtime/moonriver/tests/integration_test.rs b/runtime/moonriver/tests/integration_test.rs index cd822bbf84..1c717858f1 100644 --- a/runtime/moonriver/tests/integration_test.rs +++ b/runtime/moonriver/tests/integration_test.rs @@ -2420,7 +2420,7 @@ fn precompile_existence() { ExtBuilder::default().build().execute_with(|| { let precompiles = Precompiles::new(); let precompile_addresses: std::collections::BTreeSet<_> = vec![ - 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 256, + 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 256, 1024, 1025, 1026, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057, 2058, 2059, 2060, 2061, 2062, 2063, 2064, 2065, 2066, 2067, 2068, 2069, 2070, 2071, 2072, 2073, 2074,