Re-enable try-runtime (#139)

* Add `try-runtime` & fix `avail-core` versions * Toolchain to nightly-2022-11-25
availproject · Feb 24, 2023 · ce4e9aa · ce4e9aa
1 parent 64e4fa1
commit ce4e9aa
Show file tree

Hide file tree

Showing 17 changed files with 66 additions and 23 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -9,7 +9,7 @@ on:
       - main
       - develop
 env:
-  BUILD_TOOLCHAIN: nightly-2022-09-22
+  BUILD_TOOLCHAIN: nightly-2022-11-15
   CARGO_SCCACHE_COMMIT: bed5571c
   SCCACHE_DIR: /home/runner/.cache/cargo-sccache-bed5571c
   SCCACHE_BIN: /home/runner/.cache/cargo-sccache-bed5571c/bin/sccache
@@ -60,9 +60,8 @@ jobs:
         run: |
             curl https://sh.rustup.rs -sSf | sh -s -- -y
             source "$HOME/.cargo/env"
-            rustup toolchain install nightly
-            rustup default nightly
-            rustup target add wasm32-unknown-unknown --toolchain nightly
+            rustup default ${{ env.BUILD_TOOLCHAIN }} 
+            rustup target add wasm32-unknown-unknown --toolchain ${{ env.BUILD_TOOLCHAIN }} 
 
       - name: SCCache
         run: |
@@ -119,9 +118,8 @@ jobs:
         run: |
             curl https://sh.rustup.rs -sSf | sh -s -- -y
             source "$HOME/.cargo/env"
-            rustup toolchain install nightly
-            rustup default nightly
-            rustup target add wasm32-unknown-unknown --toolchain nightly
+            rustup default ${{ env.BUILD_TOOLCHAIN }} 
+            rustup target add wasm32-unknown-unknown --toolchain ${{ env.BUILD_TOOLCHAIN }}
 
       - name: SCCache
         run: |
@@ -181,9 +179,8 @@ jobs:
         run: |
             curl https://sh.rustup.rs -sSf | sh -s -- -y
             source "$HOME/.cargo/env"
-            rustup toolchain install nightly
-            rustup default nightly
-            rustup target add wasm32-unknown-unknown --toolchain nightly
+            rustup default ${{ env.BUILD_TOOLCHAIN }} 
+            rustup target add wasm32-unknown-unknown --toolchain ${{ env.BUILD_TOOLCHAIN }} 
 
       - name: SCCache
         run: |

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/avail-subxt/Cargo.toml b/avail-subxt/Cargo.toml
@@ -29,7 +29,7 @@ num_enum = "0.5.9"
 
 [dev-dependencies]
 async-std = { version = "1.12.0", features = ["attributes", "tokio1"] }
-sp-keyring = "7.0.0"
+sp-keyring = "6.0.0"
 futures = "0.3.13"
 hex-literal = "0.3.4"
 test-case = "1.2.3"

diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -43,6 +43,7 @@ hex-literal = "0.3.4"
 # Substrate
 ## Primitives
 sc-cli = "0.10.0-dev"
+sp-io = "7.0.0"
 sp-core = "7.0.0"
 sc-executor = "0.10.0-dev"
 sc-service = "0.10.0-dev"
@@ -135,7 +136,8 @@ runtime-benchmarks = [
 # in the near future.
 try-runtime = [
 	"da-runtime/try-runtime", 
-	"try-runtime-cli/try-runtime"
+	"try-runtime-cli/try-runtime",
+	"da-primitives/try-runtime"
 ]
 
 
diff --git a/node/src/command.rs b/node/src/command.rs
@@ -246,6 +246,7 @@ pub fn run() -> Result<()> {
 		},
 		#[cfg(feature = "try-runtime")]
 		Some(Subcommand::TryRuntime(cmd)) => {
+			use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
 			let runner = cli.create_runner(cmd)?;
 			runner.async_run(|config| {
 				// we don't need any of the components of new_partial, just a runtime, or a task
@@ -255,7 +256,13 @@ pub fn run() -> Result<()> {
 					sc_service::TaskManager::new(config.tokio_handle.clone(), registry)
 						.map_err(|e| sc_cli::Error::Service(sc_service::Error::Prometheus(e)))?;
 
-				Ok((cmd.run::<Block, ExecutorDispatch>(config), task_manager))
+				Ok((
+					cmd.run::<Block, ExtendedHostFunctions<
+						sp_io::SubstrateHostFunctions,
+						<ExecutorDispatch as NativeExecutionDispatch>::ExtendHostFunctions,
+					>>(),
+					task_manager,
+				))
 			})
 		},
 		#[cfg(not(feature = "try-runtime"))]

diff --git a/pallets/dactr/Cargo.toml b/pallets/dactr/Cargo.toml
@@ -54,4 +54,7 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 ]
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	"frame-support/try-runtime",
+	"da-primitives/try-runtime"
+]
diff --git a/pallets/executive/Cargo.toml b/pallets/executive/Cargo.toml
@@ -55,4 +55,9 @@ std = [
 	"sp-tracing/std",
 	"da-primitives/std",
 ]
-try-runtime = ["frame-support/try-runtime", "frame-try-runtime/try-runtime" ]
+try-runtime = [
+	"frame-support/try-runtime", 
+	"frame-try-runtime/try-runtime" ,
+	"da-primitives/try-runtime",
+	"mocked-runtime/try-runtime"
+]
diff --git a/pallets/executive/src/lib.rs b/pallets/executive/src/lib.rs
@@ -117,6 +117,8 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::{Codec, Encode};
+#[cfg(feature = "try-runtime")]
+use da_primitives::asdr::AppId;
 use da_primitives::asdr::GetAppId;
 use frame_support::{
 	dispatch::{DispatchClass, DispatchInfo, GetDispatchInfo, PostDispatchInfo},
@@ -265,7 +267,7 @@ where
 			} else {
 				uxt.unchecked_into_checked_i_know_what_i_am_doing(&Default::default())
 			}?;
-			<frame_system::Pallet<System>>::note_extrinsic(encoded);
+			<frame_system::Pallet<System>>::note_extrinsic(AppId::default(), encoded);
 
 			let dispatch_info = xt.get_dispatch_info();
 			let r = Applyable::apply::<UnsignedValidator>(xt, &dispatch_info, encoded_len)?;

diff --git a/pallets/mocked_runtime/Cargo.toml b/pallets/mocked_runtime/Cargo.toml
@@ -41,3 +41,4 @@ pallet-staking = "4.0.0-dev"
 [features]
 default = ["std"]
 std = [ ]
+try-runtime = []
diff --git a/pallets/mocked_runtime/src/test_xt.rs b/pallets/mocked_runtime/src/test_xt.rs
@@ -49,6 +49,14 @@ impl<Call: Codec + Sync + Send, Context, Extra> Checkable<Context> for TestXt<Ca
 	type Checked = Self;
 
 	fn check(self, _: &Context) -> Result<Self::Checked, TransactionValidityError> { Ok(self) }
+
+	#[cfg(feature = "try-runtime")]
+	fn unchecked_into_checked_i_know_what_i_am_doing(
+		self,
+		_: &Context,
+	) -> Result<Self::Checked, TransactionValidityError> {
+		unreachable!()
+	}
 }
 
 impl<Call: Codec + Sync + Send, Extra> Extrinsic for TestXt<Call, Extra> {

diff --git a/pallets/nomad/da-bridge/Cargo.toml b/pallets/nomad/da-bridge/Cargo.toml
@@ -61,4 +61,7 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 ]
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	"frame-support/try-runtime",
+	"da-primitives/try-runtime"
+]
diff --git a/pallets/nomad/home/Cargo.toml b/pallets/nomad/home/Cargo.toml
@@ -61,4 +61,7 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 ]
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	"frame-support/try-runtime",
+	"da-primitives/try-runtime"
+]
diff --git a/pallets/nomad/updater-manager/Cargo.toml b/pallets/nomad/updater-manager/Cargo.toml
@@ -50,4 +50,7 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 ]
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	"frame-support/try-runtime",
+	"da-primitives/try-runtime"
+]
diff --git a/pallets/system/Cargo.toml b/pallets/system/Cargo.toml
@@ -66,7 +66,10 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
-try-runtime = ["frame-support/try-runtime"]
+try-runtime = [
+	"frame-support/try-runtime",
+	"da-primitives/try-runtime"
+]
 force-rs-merkle = [ "rs_merkle" ]
 
 # For testing backward/forward header compatibility.

diff --git a/pallets/system/src/mock.rs b/pallets/system/src/mock.rs
@@ -116,13 +116,16 @@ impl Config for Test {
 	type Version = Version;
 }
 
+#[allow(dead_code)]
 pub type SysEvent = frame_system::Event<Test>;
 
 /// A simple call, which one doesn't matter.
+#[allow(dead_code)]
 pub const CALL: &<Test as Config>::RuntimeCall =
 	&RuntimeCall::System(frame_system::Call::set_heap_pages { pages: 0u64 });
 
 /// Create new externalities for `System` module tests.
+#[allow(dead_code)]
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut ext: sp_io::TestExternalities = GenesisConfig::default()
 		.system

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -236,4 +236,5 @@ try-runtime = [
 	"pallet-nomination-pools/try-runtime",
 	"pallet-transaction-payment/try-runtime",
 	"pallet-tips/try-runtime",
+	"da-primitives/try-runtime",
 ]
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -1618,17 +1618,18 @@ impl_runtime_apis! {
 
 	#[cfg(feature = "try-runtime")]
 	impl frame_try_runtime::TryRuntime<Block> for Runtime {
-		fn on_runtime_upgrade() -> (Weight, Weight) {
+		fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
 			// NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
 			// have a backtrace here. If any of the pre/post migration checks fail, we shall stop
 			// right here and right now.
-			let weight = Executive::try_runtime_upgrade().unwrap();
+			let weight = Executive::try_runtime_upgrade(checks).unwrap();
 			(weight, RuntimeBlockWeights::get().max_block)
 		}
 
 		fn execute_block(
 			block: Block,
 			state_root_check: bool,
+			signature_check: bool,
 			select: frame_try_runtime::TryStateSelect
 		) -> Weight {
 			log::info!(
@@ -1640,7 +1641,7 @@ impl_runtime_apis! {
 			);
 			// NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
 			// have a backtrace here.
-			Executive::try_execute_block(block, state_root_check, select).unwrap()
+			Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap()
 		}
 	}