add author mapping precompile to moonbeam and moonriver (#1160)

moonbeam-foundation · Jan 12, 2022 · 0113033 · 0113033
1 parent 93e0647
commit 0113033
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/runtime/moonbeam/Cargo.toml b/runtime/moonbeam/Cargo.toml
@@ -31,6 +31,7 @@ parachain-staking = { path = "../../pallets/parachain-staking", default-features
 
 # Moonbeam precompiles
 crowdloan-rewards-precompiles = { path = "../../precompiles/crowdloan-rewards", default-features = false }
+pallet-author-mapping-precompiles = { path = "../../precompiles/author-mapping", default-features = false }
 parachain-staking-precompiles = { path = "../../precompiles/parachain-staking", default-features = false }
 
 # Moonbeam tracing
@@ -131,6 +132,7 @@ std = [
 	"moonbeam-rpc-primitives-txpool/std",
 	"nimbus-primitives/std",
 	"pallet-author-inherent/std",
+	"pallet-author-mapping-precompiles/std",
 	"pallet-author-mapping/std",
 	"pallet-author-slot-filter/std",
 	"pallet-balances/std",

diff --git a/runtime/moonbeam/src/precompiles.rs b/runtime/moonbeam/src/precompiles.rs
@@ -16,6 +16,7 @@
 
 use crowdloan_rewards_precompiles::CrowdloanRewardsWrapper;
 use fp_evm::Context;
+use pallet_author_mapping_precompiles::AuthorMappingWrapper;
 use pallet_evm::{AddressMapping, Precompile, PrecompileResult, PrecompileSet};
 use pallet_evm_precompile_blake2::Blake2F;
 use pallet_evm_precompile_bn128::{Bn128Add, Bn128Mul, Bn128Pairing};
@@ -45,7 +46,7 @@ where
 	/// Return all addresses that contain precompiles. This can be used to populate dummy code
 	/// under the precompile.
 	pub fn used_addresses() -> impl Iterator<Item = R::AccountId> {
-		sp_std::vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 1024, 1025, 1026, 2048, 2049]
+		sp_std::vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 1024, 1025, 1026, 2048, 2049, 2055]
 			.into_iter()
 			.map(|x| R::AddressMapping::into_account_id(hash(x)))
 	}
@@ -60,6 +61,7 @@ where
 	Dispatch<R>: Precompile,
 	ParachainStakingWrapper<R>: Precompile,
 	CrowdloanRewardsWrapper<R>: Precompile,
+	AuthorMappingWrapper<R>: Precompile,
 	R: pallet_evm::Config,
 {
 	fn execute(
@@ -98,6 +100,9 @@ where
 			a if a == hash(2049) => Some(CrowdloanRewardsWrapper::<R>::execute(
 				input, target_gas, context, is_static,
 			)),
+			a if a == hash(2055) => Some(AuthorMappingWrapper::<R>::execute(
+				input, target_gas, context, is_static,
+			)),
 			_ => None,
 		}
 	}

diff --git a/runtime/moonriver/Cargo.toml b/runtime/moonriver/Cargo.toml
@@ -35,6 +35,7 @@ xcm-transactor = { path = "../../pallets/xcm-transactor", default-features = fal
 
 # Moonbeam precompiles
 crowdloan-rewards-precompiles = { path = "../../precompiles/crowdloan-rewards", default-features = false }
+pallet-author-mapping-precompiles = { path = "../../precompiles/author-mapping", default-features = false }
 pallet-democracy-precompiles = { path = "../../precompiles/pallet-democracy", default-features = false }
 pallet-evm-precompile-assets-erc20 = { path = "../../precompiles/assets-erc20", default-features = false }
 pallet-evm-precompile-balances-erc20 = { path = "../../precompiles/balances-erc20", default-features = false }
@@ -166,6 +167,7 @@ std = [
 	"pallet-asset-manager/std",
 	"pallet-assets/std",
 	"pallet-author-inherent/std",
+	"pallet-author-mapping-precompiles/std",
 	"pallet-author-mapping/std",
 	"pallet-author-slot-filter/std",
 	"pallet-balances/std",

diff --git a/runtime/moonriver/src/precompiles.rs b/runtime/moonriver/src/precompiles.rs
@@ -17,6 +17,7 @@
 use crowdloan_rewards_precompiles::CrowdloanRewardsWrapper;
 use fp_evm::Context;
 use moonbeam_relay_encoder::kusama::KusamaEncoder;
+use pallet_author_mapping_precompiles::AuthorMappingWrapper;
 use pallet_democracy_precompiles::DemocracyWrapper;
 use pallet_evm::{AddressMapping, Precompile, PrecompileResult, PrecompileSet};
 use pallet_evm_precompile_assets_erc20::Erc20AssetsPrecompileSet;
@@ -83,7 +84,8 @@ where
 	/// under the precompile.
 	pub fn used_addresses() -> impl Iterator<Item = R::AccountId> {
 		sp_std::vec![
-			1, 2, 3, 4, 5, 6, 7, 8, 9, 1024, 1025, 1026, 2048, 2049, 2050, 2051, 2052, 2053, 2054
+			1, 2, 3, 4, 5, 6, 7, 8, 9, 1024, 1025, 1026, 2048, 2049, 2050, 2051, 2052, 2053, 2054,
+			2055
 		]
 		.into_iter()
 		.map(|x| R::AddressMapping::into_account_id(hash(x)))
@@ -105,6 +107,7 @@ where
 	RelayEncoderWrapper<R, KusamaEncoder>: Precompile,
 	XcmTransactorWrapper<R>: Precompile,
 	DemocracyWrapper<R>: Precompile,
+	AuthorMappingWrapper<R>: Precompile,
 	R: pallet_evm::Config,
 {
 	fn execute(
@@ -160,6 +163,9 @@ where
 			a if a == hash(2054) => Some(XcmTransactorWrapper::<R>::execute(
 				input, target_gas, context, is_static,
 			)),
+			a if a == hash(2055) => Some(AuthorMappingWrapper::<R>::execute(
+				input, target_gas, context, is_static,
+			)),
 			// If the address matches asset prefix, the we route through the asset precompile set
 			a if &a.to_fixed_bytes()[0..4] == ASSET_PRECOMPILE_ADDRESS_PREFIX => {
 				Erc20AssetsPrecompileSet::<R>::new()