Skip to content

Commit

Permalink
fix: rm extra precompiles, rearrange locations
Browse files Browse the repository at this point in the history
  • Loading branch information
@pLabarta
pLabarta committed Feb 24, 2025
1 parent f24519d commit 2fa9d81
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 30 deletions.
16 changes: 7 additions & 9 deletions runtime/moonbase/src/precompiles.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -144,14 +144,12 @@ type MoonbasePrecompilesAt<R> = (
PrecompileAt<AddressU64<8>, Bn128Pairing, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<9>, Blake2F, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<11>, Bls12381G1Add, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<12>, Bls12381G1Mul, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<13>, Bls12381G1MultiExp, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<14>, Bls12381G2Add, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<15>, Bls12381G2Mul, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<16>, Bls12381G2MultiExp, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<17>, Bls12381Pairing, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<18>, Bls12381MapG1, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<19>, Bls12381MapG2, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<12>, Bls12381G1MultiExp, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<13>, Bls12381G2Add, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<14>, Bls12381G2MultiExp, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<15>, Bls12381Pairing, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<16>, Bls12381MapG1, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<17>, Bls12381MapG2, EthereumPrecompilesChecks>,
// (0x100 => 256) https://github.com/ethereum/RIPs/blob/master/RIPS/rip-7212.md
PrecompileAt<AddressU64<256>, P256Verify<P256VerifyWeight>, EthereumPrecompilesChecks>,
// Non-Moonbeam specific nor Ethereum precompiles :
Expand Down
2 changes: 1 addition & 1 deletion runtime/moonbase/tests/integration_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
17 changes: 8 additions & 9 deletions runtime/moonbeam/src/precompiles.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -139,15 +139,14 @@ type MoonbeamPrecompilesAt<R> = (
PrecompileAt<AddressU64<7>, Bn128Mul, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<8>, Bn128Pairing, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<9>, Blake2F, EthereumPrecompilesChecks>,
// 10 is not implemented, Ethereum uses this slot for Point Evaluation
PrecompileAt<AddressU64<11>, Bls12381G1Add, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<12>, Bls12381G1Mul, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<13>, Bls12381G1MultiExp, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<14>, Bls12381G2Add, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<15>, Bls12381G2Mul, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<16>, Bls12381G2MultiExp, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<17>, Bls12381Pairing, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<18>, Bls12381MapG1, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<19>, Bls12381MapG2, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<12>, Bls12381G1MultiExp, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<13>, Bls12381G2Add, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<14>, Bls12381G2MultiExp, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<15>, Bls12381Pairing, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<16>, Bls12381MapG1, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<17>, Bls12381MapG2, EthereumPrecompilesChecks>,
// (0x100 => 256) https://github.com/ethereum/RIPs/blob/master/RIPS/rip-7212.md
PrecompileAt<AddressU64<256>, P256Verify<P256VerifyWeight>, EthereumPrecompilesChecks>,
// Non-Moonbeam specific nor Ethereum precompiles :
Expand Down
2 changes: 1 addition & 1 deletion runtime/moonbeam/tests/integration_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
16 changes: 7 additions & 9 deletions runtime/moonriver/src/precompiles.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -134,14 +134,12 @@ type MoonriverPrecompilesAt<R> = (
PrecompileAt<AddressU64<8>, Bn128Pairing, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<9>, Blake2F, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<11>, Bls12381G1Add, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<12>, Bls12381G1Mul, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<13>, Bls12381G1MultiExp, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<14>, Bls12381G2Add, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<15>, Bls12381G2Mul, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<16>, Bls12381G2MultiExp, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<17>, Bls12381Pairing, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<18>, Bls12381MapG1, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<19>, Bls12381MapG2, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<12>, Bls12381G1MultiExp, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<13>, Bls12381G2Add, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<14>, Bls12381G2MultiExp, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<15>, Bls12381Pairing, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<16>, Bls12381MapG1, EthereumPrecompilesChecks>,
PrecompileAt<AddressU64<17>, Bls12381MapG2, EthereumPrecompilesChecks>,
// (0x100 => 256) https://github.com/ethereum/RIPs/blob/master/RIPS/rip-7212.md
PrecompileAt<AddressU64<256>, P256Verify<P256VerifyWeight>, EthereumPrecompilesChecks>,
// Non-Moonbeam specific nor Ethereum precompiles :
Expand Down
2 changes: 1 addition & 1 deletion runtime/moonriver/tests/integration_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 2fa9d81

Please sign in to comment.