Upgrade to Polkadot-SDK-v1.7.0

Upgrade to Polkadot-SDK-v1.7.0 version
zachary0809 · Mar 18, 2024 · b44ec44 · b44ec44
1 parent f1608d2
commit b44ec44
Show file tree

Hide file tree

Showing 24 changed files with 3,936 additions and 4,541 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml
@@ -42,6 +42,7 @@ substrate-prometheus-endpoint = {  workspace = true }
 
 # Cumulus
 cumulus-client-consensus-common = {  workspace = true }
+cumulus-client-parachain-inherent = {  workspace = true }
 cumulus-relay-chain-interface = {  workspace = true }
 cumulus-client-consensus-proposer = {  workspace = true }
 cumulus-primitives-aura = {  workspace = true }

diff --git a/client/consensus/aura/src/collator.rs b/client/consensus/aura/src/collator.rs
@@ -23,7 +23,8 @@ use cumulus_client_consensus_proposer::ProposerInterface;
 use cumulus_primitives_core::{
 	relay_chain::Hash as PHash, DigestItem, ParachainBlockData, PersistedValidationData,
 };
-use cumulus_primitives_parachain_inherent::ParachainInherentData;
+
+use cumulus_client_parachain_inherent::{ParachainInherentData, ParachainInherentDataProvider};
 use cumulus_relay_chain_interface::RelayChainInterface;
 
 use polkadot_node_primitives::{Collation, MaybeCompressedPoV};
@@ -120,7 +121,7 @@ where
 		timestamp: impl Into<Option<Timestamp>>,
 		order_record: Arc<Mutex<OrderRecord<P::Public>>>,
 	) -> Result<(ParachainInherentData, InherentData), Box<dyn Error + Send + Sync + 'static>> {
-		let paras_inherent_data = ParachainInherentData::create_at(
+		let paras_inherent_data = ParachainInherentDataProvider::create_at(
 			relay_parent,
 			&self.relay_client,
 			validation_data,
@@ -198,7 +199,7 @@ where
 		let mut digest = additional_pre_digest.into().unwrap_or_default();
 		digest.push(slot_claim.pre_digest.clone());
 
-		let proposal = self
+		let maybe_proposal = self
 			.proposer
 			.propose(
 				&parent_header,
@@ -211,6 +212,15 @@ where
 			.await
 			.map_err(|e| Box::new(e) as Box<dyn Error + Send>)?;
 
+		let proposal = match maybe_proposal {
+			None => {
+				return Err(
+					Box::<dyn Error + Send + Sync>::from("None proposal") as Box<dyn Error + Send>
+				)
+			}, //Ok(None),
+			Some(p) => p,
+		};
+
 		let sealed_importable = seal::<_, P>(
 			proposal.block,
 			proposal.storage_changes,

diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "parachain-magnet-node"
-version = "0.5.1"
+version = "0.5.6"
 authors = ["Magnet"]
 description = "A scalable evm smart contract platform node, utilizing DOT as the gas fee."
 license = "Apache License 2.0"
@@ -155,7 +155,4 @@ try-runtime = [
 	"polkadot-cli/try-runtime",
 	"sp-runtime/try-runtime",
 ]
-network-protocol-staging = [
-	"cumulus-client-service/network-protocol-staging",
-	"polkadot-cli/network-protocol-staging",
-]
+