Merge pull request #2125 from subspace/verify_domain_hash

Fraud proof: Invalid domain block hash
autonomys · Oct 18, 2023 · d89bdea · d89bdea
2 parents 6bfc122 + a9cbb81
commit d89bdea
Show file tree

Hide file tree

Showing 18 changed files with 454 additions and 97 deletions.
diff --git a/crates/pallet-domains/Cargo.toml b/crates/pallet-domains/Cargo.toml
@@ -31,9 +31,9 @@ subspace-runtime-primitives = { version = "0.1.0", default-features = false, pat
 [dev-dependencies]
 pallet-balances = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "74509ce016358e7f56ed2825fd75c324f8c22ef9" }
 pallet-timestamp = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "74509ce016358e7f56ed2825fd75c324f8c22ef9" }
+sp-externalities = { version = "0.19.0", git = "https://github.com/subspace/polkadot-sdk", rev = "74509ce016358e7f56ed2825fd75c324f8c22ef9" }
 sp-state-machine = { version = "0.28.0", git = "https://github.com/subspace/polkadot-sdk", rev = "74509ce016358e7f56ed2825fd75c324f8c22ef9" }
 sp-trie = { version = "22.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "74509ce016358e7f56ed2825fd75c324f8c22ef9" }
-sp-externalities = { version = "0.19.0", git = "https://github.com/subspace/polkadot-sdk", rev = "74509ce016358e7f56ed2825fd75c324f8c22ef9" }
 
 [features]
 default = ["std"]

diff --git a/crates/pallet-domains/src/benchmarking.rs b/crates/pallet-domains/src/benchmarking.rs
@@ -36,11 +36,12 @@ mod benchmarks {
         let (_, operator_id) =
             register_helper_operator::<T>(domain_id, T::Currency::minimum_balance());
 
-        let mut receipt = BlockTree::<T>::get::<_, T::DomainNumber>(domain_id, Zero::zero())
-            .first()
-            .and_then(DomainBlocks::<T>::get)
-            .expect("genesis receipt must exist")
-            .execution_receipt;
+        let mut receipt =
+            BlockTree::<T>::get::<_, DomainBlockNumberFor<T>>(domain_id, Zero::zero())
+                .first()
+                .and_then(DomainBlocks::<T>::get)
+                .expect("genesis receipt must exist")
+                .execution_receipt;
         for i in 1..=(block_tree_pruning_depth + 1) {
             let consensus_block_number = i.into();
             let domain_block_number = i.into();
@@ -243,7 +244,7 @@ mod benchmarks {
         assert_eq!(domain_obj.owner_account_id, creator);
         assert!(DomainStakingSummary::<T>::get(domain_id).is_some());
         assert_eq!(
-            BlockTree::<T>::get::<_, T::DomainNumber>(domain_id, Zero::zero()).len(),
+            BlockTree::<T>::get::<_, DomainBlockNumberFor<T>>(domain_id, Zero::zero()).len(),
             1
         );
         assert_eq!(NextDomainId::<T>::get(), domain_id + 1.into());

diff --git a/crates/pallet-domains/src/block_tree.rs b/crates/pallet-domains/src/block_tree.rs
@@ -2,8 +2,8 @@
 
 use crate::pallet::StateRoots;
 use crate::{
-    BalanceOf, BlockTree, Config, ConsensusBlockHash, DomainBlockDescendants, DomainBlocks,
-    ExecutionInbox, ExecutionReceiptOf, HeadReceiptNumber, InboxedBundleAuthor,
+    BalanceOf, BlockTree, Config, ConsensusBlockHash, DomainBlockDescendants, DomainBlockNumberFor,
+    DomainBlocks, ExecutionInbox, ExecutionReceiptOf, HeadReceiptNumber, InboxedBundleAuthor,
 };
 use codec::{Decode, Encode};
 use frame_support::{ensure, PalletError};
@@ -227,7 +227,7 @@ pub(crate) struct ConfirmedDomainBlockInfo<DomainNumber, Balance> {
 }
 
 pub(crate) type ProcessExecutionReceiptResult<T> =
-    Result<Option<ConfirmedDomainBlockInfo<<T as Config>::DomainNumber, BalanceOf<T>>>, Error>;
+    Result<Option<ConfirmedDomainBlockInfo<DomainBlockNumberFor<T>, BalanceOf<T>>>, Error>;
 
 /// Process the execution receipt to add it to the block tree
 /// Returns the domain block number that was pruned, if any

diff --git a/crates/pallet-domains/src/domain_registry.rs b/crates/pallet-domains/src/domain_registry.rs
@@ -4,7 +4,8 @@ use crate::block_tree::import_genesis_receipt;
 use crate::pallet::DomainStakingSummary;
 use crate::staking::StakingSummary;
 use crate::{
-    Config, DomainRegistry, ExecutionReceiptOf, HoldIdentifier, NextDomainId, RuntimeRegistry,
+    Config, DomainHashingFor, DomainRegistry, ExecutionReceiptOf, HoldIdentifier, NextDomainId,
+    RuntimeRegistry,
 };
 use alloc::string::String;
 use codec::{Decode, Encode};
@@ -15,7 +16,10 @@ use frame_support::{ensure, PalletError};
 use frame_system::pallet_prelude::*;
 use scale_info::TypeInfo;
 use sp_core::Get;
-use sp_domains::{DomainId, DomainsDigestItem, OperatorAllowList, ReceiptHash, RuntimeId};
+use sp_domains::{
+    derive_domain_block_hash, DomainId, DomainsDigestItem, OperatorAllowList, ReceiptHash,
+    RuntimeId,
+};
 use sp_runtime::traits::{CheckedAdd, Zero};
 use sp_runtime::DigestItem;
 use sp_std::collections::btree_map::BTreeMap;
@@ -126,9 +130,20 @@ pub(crate) fn do_instantiate_domain<T: Config>(
 
         let state_version = runtime_obj.version.state_version();
         let raw_genesis = runtime_obj.into_complete_raw_genesis(domain_id);
-        let state_root = raw_genesis.state_root::<T::DomainHashing>(state_version);
+        let state_root = raw_genesis.state_root::<DomainHashingFor<T>>(state_version);
+        let genesis_block_hash = derive_domain_block_hash::<T::DomainHeader>(
+            Zero::zero(),
+            sp_domains::EMPTY_EXTRINSIC_ROOT.into(),
+            state_root,
+            Default::default(),
+            Default::default(),
+        );
 
-        ExecutionReceiptOf::<T>::genesis(state_root)
+        ExecutionReceiptOf::<T>::genesis(
+            state_root,
+            sp_domains::EMPTY_EXTRINSIC_ROOT,
+            genesis_block_hash,
+        )
     };
     let genesis_receipt_hash = genesis_receipt.hash();