Merge pull request #2638 from subspace/domain-compatible-3h

NingLin-P · web-flow · commit 360fb7e3e862 · 2024-03-25T14:13:01.000Z
Keep domain compatible with gemini-3h
diff --git a/crates/pallet-domains/src/lib.rs b/crates/pallet-domains/src/lib.rs
@@ -1549,7 +1549,7 @@ mod pallet {
                     if let Err(e) = Self::validate_fraud_proof(fraud_proof) {
                         log::warn!(
                             target: "runtime::domains",
-                            "Bad fraud proof {:?}, error: {e:?}", fraud_proof.domain_id(),
+                            "Bad fraud proof {fraud_proof:?}, error: {e:?}",
                         );
                         return InvalidTransactionCode::FraudProof.into();
                     }
diff --git a/crates/sp-domains-fraud-proof/src/fraud_proof.rs b/crates/sp-domains-fraud-proof/src/fraud_proof.rs
@@ -5,6 +5,7 @@ use crate::verification::InvalidBundleEquivocationError;
 #[cfg(not(feature = "std"))]
 use alloc::vec::Vec;
 use codec::{Decode, Encode};
+use core::fmt;
 use scale_info::TypeInfo;
 use sp_consensus_slots::Slot;
 use sp_core::H256;
@@ -454,7 +455,7 @@ impl<ReceiptHash> InvalidBundlesFraudProof<ReceiptHash> {
 /// Fraud proof.
 // TODO: Revisit when fraud proof v2 is implemented.
 #[allow(clippy::large_enum_variant)]
-#[derive(Debug, Decode, Encode, TypeInfo, PartialEq, Eq, Clone)]
+#[derive(Decode, Encode, TypeInfo, PartialEq, Eq, Clone)]
 pub enum FraudProof<Number, Hash, DomainHeader: HeaderT> {
     InvalidStateTransition(InvalidStateTransitionProof<HeaderHashFor<DomainHeader>>),
     InvalidTransaction(InvalidTransactionProof<HeaderHashFor<DomainHeader>>),
@@ -550,6 +551,80 @@ where
     }
 }
 
+impl<Number, Hash, DomainHeader: HeaderT> fmt::Debug for FraudProof<Number, Hash, DomainHeader> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let domain_id = self.domain_id();
+        let bad_receipt_hash = self.targeted_bad_receipt_hash();
+        let bad_operator = self.targeted_bad_operator_and_slot_for_bundle_equivocation();
+        match self {
+            Self::InvalidStateTransition(_) => {
+                write!(
+                    f,
+                    "InvalidStateTransitionFraudProof({domain_id:?}#{bad_receipt_hash:?})"
+                )
+            }
+            Self::InvalidTransaction(_) => {
+                write!(
+                    f,
+                    "InvalidTransactionFraudProof({domain_id:?}#{bad_receipt_hash:?})"
+                )
+            }
+            Self::ImproperTransactionSortition(_) => {
+                write!(
+                    f,
+                    "ImproperTransactionSortitionFraudProof({domain_id:?}#{bad_receipt_hash:?})"
+                )
+            }
+            Self::BundleEquivocation(_) => {
+                write!(
+                    f,
+                    "BundleEquivocationFraudProof({domain_id:?}#{bad_operator:?})"
+                )
+            }
+            Self::InvalidExtrinsicsRoot(_) => {
+                write!(
+                    f,
+                    "InvalidExtrinsicsRootFraudProof({domain_id:?}#{bad_receipt_hash:?})"
+                )
+            }
+            Self::InvalidBlockFees(_) => {
+                write!(
+                    f,
+                    "InvalidBlockFeesFraudProof({domain_id:?}#{bad_receipt_hash:?})"
+                )
+            }
+            Self::ValidBundle(_) => {
+                write!(
+                    f,
+                    "ValidBundleFraudProof({domain_id:?}#{bad_receipt_hash:?})"
+                )
+            }
+            Self::InvalidBundles(_) => {
+                write!(
+                    f,
+                    "InvalidBundlesFraudProof({domain_id:?}#{bad_receipt_hash:?})"
+                )
+            }
+            Self::InvalidDomainBlockHash(_) => {
+                write!(
+                    f,
+                    "InvalidDomainBlockHashFraudProof({domain_id:?}#{bad_receipt_hash:?})"
+                )
+            }
+            Self::InvalidTransfers(_) => {
+                write!(
+                    f,
+                    "InvalidTransfersFraudProof({domain_id:?}#{bad_receipt_hash:?})"
+                )
+            }
+            #[cfg(any(feature = "std", feature = "runtime-benchmarks"))]
+            Self::Dummy { .. } => {
+                write!(f, "DummyFraudProof({domain_id:?}#{bad_receipt_hash:?})")
+            }
+        }
+    }
+}
+
 /// Proves an invalid state transition by challenging the trace at specific index in a bad receipt.
 #[derive(Debug, Decode, Encode, TypeInfo, PartialEq, Eq, Clone)]
 pub struct InvalidStateTransitionProof<ReceiptHash> {
diff --git a/domains/client/block-builder/src/lib.rs b/domains/client/block-builder/src/lib.rs
@@ -158,6 +158,7 @@ where
         backend: &'a B,
         mut extrinsics: VecDeque<Block::Extrinsic>,
         maybe_inherent_data: Option<sp_inherents::InherentData>,
+        is_gemini_3h: bool,
     ) -> Result<Self, Error> {
         let header = <<Block as BlockT>::Header as HeaderT>::new(
             parent_number + One::one(),
@@ -179,9 +180,26 @@ where
 
         if let Some(inherent_data) = maybe_inherent_data {
             let inherent_extrinsics = Self::create_inherents(parent_hash, &api, inherent_data)?;
-            // reverse and push the inherents so that order is maintained
-            for inherent_extrinsic in inherent_extrinsics.into_iter().rev() {
-                extrinsics.push_front(inherent_extrinsic)
+
+            // TODO: This is used to keep compatible with gemini-3h, remove before next network
+            //
+            // HACK: ideally, any network should maintain the inherent extrinsic order to keep consistency
+            // with the order in the fraud proof verifiaction side, but in gemini-3h, the domain inherent
+            // extrinsic order is changed in the ER that derived from the consensus block #168431, we have
+            // to follow this change in the client side to ensure every domain node that sync from genesis
+            // will produce the same ER and hence can successfully submit ER to exend the previous ER.
+            let maintain_runtime_inherent_extrinsic_order =
+                !is_gemini_3h || parent_number >= 168430u32.into();
+
+            if maintain_runtime_inherent_extrinsic_order {
+                // reverse and push the inherents so that order is maintained
+                for inherent_extrinsic in inherent_extrinsics.into_iter().rev() {
+                    extrinsics.push_front(inherent_extrinsic)
+                }
+            } else {
+                for inherent_extrinsic in inherent_extrinsics {
+                    extrinsics.push_front(inherent_extrinsic)
+                }
             }
         }
 
diff --git a/domains/client/domain-operator/src/domain_block_processor.rs b/domains/client/domain-operator/src/domain_block_processor.rs
@@ -27,6 +27,7 @@ use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor, One, Zer
 use sp_runtime::{Digest, Saturating};
 use std::cmp::Ordering;
 use std::collections::VecDeque;
+use std::str::FromStr;
 use std::sync::Arc;
 
 struct DomainBlockBuildResult<Block>
@@ -419,6 +420,15 @@ where
         inherent_digests: Digest,
         inherent_data: sp_inherents::InherentData,
     ) -> Result<DomainBlockBuildResult<Block>, sp_blockchain::Error> {
+        // TODO: This is used to keep compatible with gemini-3h, remove before next network
+        let is_gemini_3h = self.consensus_client.info().genesis_hash
+            == FromStr::from_str(
+                // The genesis hash of gemini-3h
+                "0c121c75f4ef450f40619e1fca9d1e8e7fbabc42c895bc4790801e85d5a91c34",
+            )
+            .map_err(|_| ())
+            .expect("parsing consensus block hash should success");
+
         let block_builder = BlockBuilder::new(
             &*self.client,
             parent_hash,
@@ -428,6 +438,7 @@ where
             &*self.backend,
             extrinsics,
             Some(inherent_data),
+            is_gemini_3h,
         )?;
 
         let BuiltBlock {
@@ -749,6 +760,7 @@ where
         if let Some(mismatched_receipts) = self.find_mismatch_receipt(consensus_block_hash)? {
             let fraud_proof = self.generate_fraud_proof(mismatched_receipts)?;
 
+            tracing::info!("Submit fraud proof: {fraud_proof:?}");
             let consensus_best_hash = self.consensus_client.info().best_hash;
             let mut runtime_api = self.consensus_client.runtime_api();
             runtime_api.register_extension(
diff --git a/domains/client/domain-operator/src/fraud_proof.rs b/domains/client/domain-operator/src/fraud_proof.rs
@@ -433,7 +433,12 @@ where
             inherent_digests.clone(),
             &*self.backend,
             extrinsics.into(),
+            // NOTE: the inherent extrinsic is already contained in the above `extrinsics`, which
+            // is getting from the block body, thus it is okay to pass `maybe_inherent_data` as
+            // `None` and `is_gemini_3h` as `false`, the latter is only used when `maybe_inherent_data`
+            // is `Some`.
             None,
+            false,
         )?;
 
         let (storage_changes, call_data) = match &execution_phase {

Original file line number	Diff line number	Diff line change
`@@ -1549,7 +1549,7 @@ mod pallet {`
`1549`	`1549`	`if let Err(e) = Self::validate_fraud_proof(fraud_proof) {`
`1550`	`1550`	`log::warn!(`
`1551`	`1551`	`target: "runtime::domains",`
`1552`		`- "Bad fraud proof {:?}, error: {e:?}", fraud_proof.domain_id(),`
	`1552`	`+ "Bad fraud proof {fraud_proof:?}, error: {e:?}",`
`1553`	`1553`	`);`
`1554`	`1554`	`return InvalidTransactionCode::FraudProof.into();`
`1555`	`1555`	`}`