remove randomness from moonriver and moonbeam and redeclare solidity after merge conflict mistake

4meta5 · 4meta5 · commit 193d16a364cb · 2022-07-01T10:28:46.000-04:00
diff --git a/node/service/src/chain_spec/moonbeam.rs b/node/service/src/chain_spec/moonbeam.rs
@@ -295,7 +295,6 @@ pub fn testnet_genesis(
 		},
 		// This should initialize it to whatever we have set in the pallet
 		polkadot_xcm: PolkadotXcmConfig::default(),
-		randomness: Default::default(),
 	}
 }
 
diff --git a/node/service/src/chain_spec/moonriver.rs b/node/service/src/chain_spec/moonriver.rs
@@ -295,7 +295,6 @@ pub fn testnet_genesis(
 		},
 		// This should initialize it to whatever we have set in the pallet
 		polkadot_xcm: PolkadotXcmConfig::default(),
-		randomness: Default::default(),
 	}
 }
 
diff --git a/precompiles/utils/src/lib.rs b/precompiles/utils/src/lib.rs
@@ -26,6 +26,9 @@ pub mod modifier;
 pub mod precompile_set;
 pub mod substrate;
 
+#[cfg(feature = "testing")]
+pub mod solidity;
+
 #[cfg(feature = "testing")]
 pub mod testing;
 
diff --git a/runtime/common/src/apis.rs b/runtime/common/src/apis.rs
@@ -412,25 +412,6 @@ macro_rules! impl_runtime_apis_plus_common {
 				}
 			}
 
-			impl session_keys_primitives::VrfApi<Block> for Runtime {
-				fn get_relay_slot_number() -> cumulus_primitives_core::relay_chain::v2::Slot {
-					pallet_randomness::Pallet::<Self>::current_vrf_input()
-						.expect("Expected VrfInput to be set")
-						.slot_number
-				}
-				fn get_relay_storage_root() -> <Block as BlockT>::Hash {
-					pallet_randomness::Pallet::<Self>::current_vrf_input()
-						.expect("Expected VrfInput to be set")
-						.storage_root
-				}
-				fn vrf_key_lookup(
-					nimbus_id: nimbus_primitives::NimbusId
-				) -> Option<session_keys_primitives::VrfId> {
-					use session_keys_primitives::KeysLookup;
-					AuthorMapping::lookup_keys(&nimbus_id)
-				}
-			}
-
 			#[cfg(feature = "runtime-benchmarks")]
 			impl frame_benchmarking::Benchmark<Block> for Runtime {
 
diff --git a/runtime/moonbase/src/lib.rs b/runtime/moonbase/src/lib.rs
@@ -1333,6 +1333,25 @@ moonbeam_runtime_common::impl_runtime_apis_plus_common! {
 			})
 		}
 	}
+
+	impl session_keys_primitives::VrfApi<Block> for Runtime {
+		fn get_relay_slot_number() -> cumulus_primitives_core::relay_chain::v2::Slot {
+			pallet_randomness::Pallet::<Self>::current_vrf_input()
+				.expect("Expected VrfInput to be set")
+				.slot_number
+		}
+		fn get_relay_storage_root() -> <Block as BlockT>::Hash {
+			pallet_randomness::Pallet::<Self>::current_vrf_input()
+				.expect("Expected VrfInput to be set")
+				.storage_root
+		}
+		fn vrf_key_lookup(
+			nimbus_id: nimbus_primitives::NimbusId
+		) -> Option<session_keys_primitives::VrfId> {
+			use session_keys_primitives::KeysLookup;
+			AuthorMapping::lookup_keys(&nimbus_id)
+		}
+	}
 }
 
 // Check the timestamp and parachain inherents
diff --git a/runtime/moonbeam/Cargo.toml b/runtime/moonbeam/Cargo.toml
@@ -35,7 +35,6 @@ pallet-migrations = { path = "../../pallets/migrations", default-features = fals
 pallet-moonbeam-orbiters = { path = "../../pallets/moonbeam-orbiters", default-features = false }
 pallet-parachain-staking = { path = "../../pallets/parachain-staking", default-features = false }
 pallet-proxy-genesis-companion = { path = "../../pallets/proxy-genesis-companion", default-features = false }
-pallet-randomness = { path = "../../pallets/randomness", default-features = false }
 pallet-xcm-transactor = { path = "../../pallets/xcm-transactor", default-features = false }
 
 # Moonbeam precompiles
@@ -206,7 +205,6 @@ std = [
 	"pallet-proxy-genesis-companion/std",
 	"pallet-proxy/std",
 	"pallet-randomness-collective-flip/std",
-	"pallet-randomness/std",
 	"pallet-scheduler/std",
 	"pallet-society/std",
 	"pallet-timestamp/std",
diff --git a/runtime/moonbeam/src/lib.rs b/runtime/moonbeam/src/lib.rs
@@ -1074,85 +1074,6 @@ impl pallet_moonbeam_orbiters::Config for Runtime {
 	type WeightInfo = pallet_moonbeam_orbiters::weights::SubstrateWeight<Runtime>;
 }
 
-/// Only callable after `set_validation_data` is called which forms this proof the same way
-fn relay_chain_state_proof() -> RelayChainStateProof {
-	let relay_storage_root = ParachainSystem::validation_data()
-		.expect("set in `set_validation_data`")
-		.relay_parent_storage_root;
-	let relay_chain_state =
-		ParachainSystem::relay_state_proof().expect("set in `set_validation_data`");
-	RelayChainStateProof::new(ParachainInfo::get(), relay_storage_root, relay_chain_state)
-		.expect("Invalid relay chain state proof, already constructed in `set_validation_data`")
-}
-
-pub struct BabeDataGetter;
-impl pallet_randomness::GetBabeData<BlockNumber, u64, Option<Hash>> for BabeDataGetter {
-	// Tolerate panic here because only ever called in inherent (so can be omitted)
-	fn get_relay_block_number() -> BlockNumber {
-		ParachainSystem::validation_data()
-			.expect("set in `set_validation_data`inherent => available before on_initialize")
-			.relay_parent_number
-	}
-	// Tolerate panic here because only ever called in inherent (so can be omitted)
-	fn get_relay_epoch_index() -> u64 {
-		relay_chain_state_proof()
-			.read_optional_entry(relay_chain::well_known_keys::EPOCH_INDEX)
-			.ok()
-			.flatten()
-			.unwrap_or_default()
-		// TODO: add back panic, only removing for testing now
-		//.expect("expected to be able to read epoch index from relay chain state proof")
-	}
-	fn get_current_block_randomness() -> Option<Hash> {
-		relay_chain_state_proof()
-			.read_optional_entry(relay_chain::well_known_keys::CURRENT_BLOCK_RANDOMNESS)
-			.ok()
-			.flatten()
-	}
-	fn get_one_epoch_ago_randomness() -> Option<Hash> {
-		relay_chain_state_proof()
-			.read_optional_entry(relay_chain::well_known_keys::ONE_EPOCH_AGO_RANDOMNESS)
-			.ok()
-			.flatten()
-	}
-	fn get_two_epochs_ago_randomness() -> Option<Hash> {
-		relay_chain_state_proof()
-			.read_optional_entry(relay_chain::well_known_keys::TWO_EPOCHS_AGO_RANDOMNESS)
-			.ok()
-			.flatten()
-	}
-}
-
-pub struct VrfInputGetter;
-impl pallet_randomness::GetVrfInput<pallet_randomness::VrfInput<Slot, Hash>> for VrfInputGetter {
-	fn get_vrf_input() -> pallet_randomness::VrfInput<Slot, Hash> {
-		pallet_randomness::VrfInput {
-			slot_number: relay_chain_state_proof()
-				.read_slot()
-				.expect("CheckInherents reads slot from state proof QED"),
-			storage_root: ParachainSystem::validation_data()
-				.expect("set in `set_validation_data`inherent => available before on_initialize")
-				.relay_parent_storage_root,
-		}
-	}
-}
-
-// TODO: set reasonable params
-parameter_types! {
-	pub const RandomnessRequestDeposit: u128 = 10;
-	pub const ExpirationDelay: BlockNumber = 100;
-}
-impl pallet_randomness::Config for Runtime {
-	type Event = Event;
-	type AddressMapping = moonbeam_runtime_common::IntoAddressMapping;
-	type ReserveCurrency = Balances;
-	type BabeDataGetter = BabeDataGetter;
-	type VrfInputGetter = VrfInputGetter;
-	type VrfKeyLookup = AuthorMapping;
-	type Deposit = RandomnessRequestDeposit;
-	type ExpirationDelay = ExpirationDelay;
-}
-
 construct_runtime! {
 	pub enum Runtime where
 		Block = Block,
@@ -1220,9 +1141,6 @@ construct_runtime! {
 		XTokens: orml_xtokens::{Pallet, Call, Storage, Event<T>} = 106,
 		XcmTransactor: pallet_xcm_transactor::{Pallet, Call, Storage, Event<T>} = 107,
 		LocalAssets: pallet_assets::<Instance1>::{Pallet, Call, Storage, Event<T>} = 108,
-
-		// Randomness
-		Randomness: pallet_randomness::{Pallet, Call, Storage, Config<T>, Event<T>, Inherent} = 120,
 	}
 }
 
diff --git a/runtime/moonriver/Cargo.toml b/runtime/moonriver/Cargo.toml
@@ -21,7 +21,6 @@ account = { path = "../../primitives/account/", default-features = false }
 moonbeam-core-primitives = { path = "../../core-primitives", default-features = false }
 moonbeam-relay-encoder = { path = "../relay-encoder", default-features = false }
 moonbeam-runtime-common = { path = "../common", default-features = false, features = [ "xcm-support" ] }
-pallet-randomness = { path = "../../pallets/randomness", default-features = false }
 precompile-utils = { path = "../../precompiles/utils", default-features = false }
 session-keys-primitives = { path = "../../primitives/session-keys", default-features = false }
 xcm-primitives = { path = "../../primitives/xcm/", default-features = false }
@@ -205,7 +204,6 @@ std = [
 	"pallet-proxy-genesis-companion/std",
 	"pallet-proxy/std",
 	"pallet-randomness-collective-flip/std",
-	"pallet-randomness/std",
 	"pallet-scheduler/std",
 	"pallet-society/std",
 	"pallet-timestamp/std",
diff --git a/runtime/moonriver/src/lib.rs b/runtime/moonriver/src/lib.rs
@@ -1080,85 +1080,6 @@ impl pallet_moonbeam_orbiters::Config for Runtime {
 	type WeightInfo = pallet_moonbeam_orbiters::weights::SubstrateWeight<Runtime>;
 }
 
-/// Only callable after `set_validation_data` is called which forms this proof the same way
-fn relay_chain_state_proof() -> RelayChainStateProof {
-	let relay_storage_root = ParachainSystem::validation_data()
-		.expect("set in `set_validation_data`")
-		.relay_parent_storage_root;
-	let relay_chain_state =
-		ParachainSystem::relay_state_proof().expect("set in `set_validation_data`");
-	RelayChainStateProof::new(ParachainInfo::get(), relay_storage_root, relay_chain_state)
-		.expect("Invalid relay chain state proof, already constructed in `set_validation_data`")
-}
-
-pub struct BabeDataGetter;
-impl pallet_randomness::GetBabeData<BlockNumber, u64, Option<Hash>> for BabeDataGetter {
-	// Tolerate panic here because only ever called in inherent (so can be omitted)
-	fn get_relay_block_number() -> BlockNumber {
-		ParachainSystem::validation_data()
-			.expect("set in `set_validation_data`inherent => available before on_initialize")
-			.relay_parent_number
-	}
-	// Tolerate panic here because only ever called in inherent (so can be omitted)
-	fn get_relay_epoch_index() -> u64 {
-		relay_chain_state_proof()
-			.read_optional_entry(relay_chain::well_known_keys::EPOCH_INDEX)
-			.ok()
-			.flatten()
-			.unwrap_or_default()
-		// TODO: add back panic, only removing for testing now
-		//.expect("expected to be able to read epoch index from relay chain state proof")
-	}
-	fn get_current_block_randomness() -> Option<Hash> {
-		relay_chain_state_proof()
-			.read_optional_entry(relay_chain::well_known_keys::CURRENT_BLOCK_RANDOMNESS)
-			.ok()
-			.flatten()
-	}
-	fn get_one_epoch_ago_randomness() -> Option<Hash> {
-		relay_chain_state_proof()
-			.read_optional_entry(relay_chain::well_known_keys::ONE_EPOCH_AGO_RANDOMNESS)
-			.ok()
-			.flatten()
-	}
-	fn get_two_epochs_ago_randomness() -> Option<Hash> {
-		relay_chain_state_proof()
-			.read_optional_entry(relay_chain::well_known_keys::TWO_EPOCHS_AGO_RANDOMNESS)
-			.ok()
-			.flatten()
-	}
-}
-
-pub struct VrfInputGetter;
-impl pallet_randomness::GetVrfInput<pallet_randomness::VrfInput<Slot, Hash>> for VrfInputGetter {
-	fn get_vrf_input() -> pallet_randomness::VrfInput<Slot, Hash> {
-		pallet_randomness::VrfInput {
-			slot_number: relay_chain_state_proof()
-				.read_slot()
-				.expect("CheckInherents reads slot from state proof QED"),
-			storage_root: ParachainSystem::validation_data()
-				.expect("set in `set_validation_data`inherent => available before on_initialize")
-				.relay_parent_storage_root,
-		}
-	}
-}
-
-// TODO: set reasonable params
-parameter_types! {
-	pub const RandomnessRequestDeposit: u128 = 10;
-	pub const ExpirationDelay: BlockNumber = 100;
-}
-impl pallet_randomness::Config for Runtime {
-	type Event = Event;
-	type AddressMapping = moonbeam_runtime_common::IntoAddressMapping;
-	type ReserveCurrency = Balances;
-	type BabeDataGetter = BabeDataGetter;
-	type VrfInputGetter = VrfInputGetter;
-	type VrfKeyLookup = AuthorMapping;
-	type Deposit = RandomnessRequestDeposit;
-	type ExpirationDelay = ExpirationDelay;
-}
-
 construct_runtime! {
 	pub enum Runtime where
 		Block = Block,
@@ -1225,9 +1146,6 @@ construct_runtime! {
 		XTokens: orml_xtokens::{Pallet, Call, Storage, Event<T>} = 106,
 		XcmTransactor: pallet_xcm_transactor::{Pallet, Call, Storage, Event<T>} = 107,
 		LocalAssets: pallet_assets::<Instance1>::{Pallet, Call, Storage, Event<T>} = 108,
-
-		// Randomness
-		Randomness: pallet_randomness::{Pallet, Call, Storage, Config<T>, Event<T>, Inherent} = 120,
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,6 @@ pub fn testnet_genesis(`
`295`	`295`	`},`
`296`	`296`	`// This should initialize it to whatever we have set in the pallet`
`297`	`297`	`polkadot_xcm: PolkadotXcmConfig::default(),`
`298`		`- randomness: Default::default(),`
`299`	`298`	`}`
`300`	`299`	`}`
`301`	`300`