Support both versions.

bin/node/executor/tests/submit_transaction.rs

@@ -15,7 +15,7 @@
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
 use node_runtime::{
-	Call, Executive, Indices, Balances, Runtime, SubmitTransaction, UncheckedExtrinsic,
+	Call, Executive, Indices, Runtime, SubmitTransaction, UncheckedExtrinsic,
 };
 use sp_application_crypto::AppKey;
 use sp_core::testing::KeyStore;
@@ -139,7 +139,7 @@ fn submitted_transaction_should_be_valid() {
 	use codec::Encode;
 	use frame_support::storage::StorageMap;
 	use sp_runtime::transaction_validity::ValidTransaction;
-	use sp_runtime::traits::{Dispatchable, StaticLookup};
+	use sp_runtime::traits::StaticLookup;
 
 	let mut t = new_test_ext(COMPACT_CODE, false);
 	let (pool, state) = TestTransactionPoolExt::new();

bin/node/runtime/src/lib.rs

@@ -508,10 +508,9 @@ impl frame_system::offchain::CreateTransaction<Runtime, UncheckedExtrinsic> for
 			.unwrap_or(2) as u64;
 		let current_block = System::block_number()
 			.saturated_into::<u64>()
-			// The `System::block_number` is initialized with `n+1`, so the actual block number is
-			// `n`, but in offchain worker context this block does not have correct `parent_hash` set,
-			// so we need to fall back to `n-1`.
-			.saturating_sub(2);
+			// The `System::block_number` is initialized with `n+1`,
+			// so the actual block number is `n`.
+			.saturating_sub(1);
 		let tip = 0;
 		let extra: SignedExtra = (
 			frame_system::CheckVersion::<Runtime>::new(),

client/offchain/src/lib.rs

@@ -98,11 +98,18 @@ impl<Client, Storage, Block> OffchainWorkers<
 	) -> impl Future<Output = ()> {
 		let runtime = self.client.runtime_api();
 		let at = BlockId::number(*header.number());
-		// TODO [ToDr] Use has_api_with to support old versions too
-		let has_api = runtime.has_api::<dyn OffchainWorkerApi<Block, Error = ()>>(&at);
-		debug!("Checking offchain workers at {:?}: {:?}", at, has_api);
-
-		if has_api.unwrap_or(false) {
+		let has_api_v1 = runtime.has_api_with::<dyn OffchainWorkerApi<Block, Error = ()>, _>(
+			&at, |v| v == 1
+		);
+		let has_api_v2 = runtime.has_api::<dyn OffchainWorkerApi<Block, Error = ()>>(&at);
+		let version = match (has_api_v1, has_api_v2) {
+			(_, Ok(true)) => 2,
+			(Ok(true), _) => 1,
+			_ => 0,
+		};
+
+		debug!("Checking offchain workers at {:?}: version:{}", at, version);
+		if version > 0 {
 			let (api, runner) = api::AsyncApi::new(
 				self.db.clone(),
 				network_state.clone(),
@@ -115,11 +122,17 @@ impl<Client, Storage, Block> OffchainWorkers<
 				let runtime = client.runtime_api();
 				let api = Box::new(api);
 				debug!("Running offchain workers at {:?}", at);
-				let run = runtime.offchain_worker_with_context(
-					&at,
-					ExecutionContext::OffchainCall(Some((api, offchain::Capabilities::all()))),
-					&header,
-				);
+				let context = ExecutionContext::OffchainCall(Some(
+					(api, offchain::Capabilities::all())
+				));
+				let run = if version == 2 {
+					runtime.offchain_worker_with_context(&at, context, &header)
+				} else {
+					#[allow(deprecated)]
+					runtime.offchain_worker_before_version_2_with_context(
+						&at, context, *header.number()
+					)
+				};
 				if let Err(e) =	run {
 					log::error!("Error running offchain workers at {:?}: {:?}", at, e);
 				}