Merge pull request #2384 from subspace/bundle-storage-price

Use the consensus chain storage price to charge domain transaction fees

Author: NingLin-P

Cargo.lock

@@ -34,6 +34,7 @@ subspace-runtime-primitives = { version = "0.1.0", default-features = false, pat
 domain-pallet-executive = { version = "0.1.0", default-features = false, path = "../../domains/pallets/executive" }
 pallet-balances = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "0831dfc3c54b10ab46e82acf98603b4af1a47bd5" }
 pallet-timestamp = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "0831dfc3c54b10ab46e82acf98603b4af1a47bd5" }
+pallet-block-fees = { version = "0.1.0", default-features = false, path = "../../domains/pallets/block-fees" }
 sp-externalities = { version = "0.19.0", git = "https://github.com/subspace/polkadot-sdk", rev = "0831dfc3c54b10ab46e82acf98603b4af1a47bd5" }
 sp-state-machine = { version = "0.28.0", git = "https://github.com/subspace/polkadot-sdk", rev = "0831dfc3c54b10ab46e82acf98603b4af1a47bd5" }
 sp-trie = { version = "22.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "0831dfc3c54b10ab46e82acf98603b4af1a47bd5" }

crates/pallet-domains/Cargo.toml

@@ -333,7 +333,8 @@ pub(crate) fn process_execution_receipt<T: Config>(
                 return Ok(Some(ConfirmedDomainBlockInfo {
                     domain_block_number: to_prune,
                     operator_ids,
-                    rewards: execution_receipt.total_rewards,
+                    // TODO: also distribute the `storage_fee`
+                    rewards: execution_receipt.block_fees.domain_execution_fee,
                     invalid_bundle_authors,
                 }));
             }

crates/pallet-domains/src/block_tree.rs

@@ -53,13 +53,13 @@ use sp_domains::{
     OperatorPublicKey, RuntimeId, DOMAIN_EXTRINSICS_SHUFFLING_SEED_SUBJECT, EMPTY_EXTRINSIC_ROOT,
 };
 use sp_domains_fraud_proof::fraud_proof::{
-    FraudProof, InvalidDomainBlockHashProof, InvalidTotalRewardsProof,
+    FraudProof, InvalidBlockFeesProof, InvalidDomainBlockHashProof,
 };
 use sp_domains_fraud_proof::verification::{
-    verify_bundle_equivocation_fraud_proof, verify_invalid_bundles_fraud_proof,
-    verify_invalid_domain_block_hash_fraud_proof,
+    verify_bundle_equivocation_fraud_proof, verify_invalid_block_fees_fraud_proof,
+    verify_invalid_bundles_fraud_proof, verify_invalid_domain_block_hash_fraud_proof,
     verify_invalid_domain_extrinsics_root_fraud_proof, verify_invalid_state_transition_fraud_proof,
-    verify_invalid_total_rewards_fraud_proof, verify_valid_bundle_fraud_proof,
+    verify_valid_bundle_fraud_proof,
 };
 use sp_runtime::traits::{CheckedSub, Hash, Header, One, Zero};
 use sp_runtime::{RuntimeAppPublic, SaturatedConversion, Saturating};
@@ -596,8 +596,8 @@ mod pallet {
         ChallengingGenesisReceipt,
         /// The descendants of the fraudulent ER is not pruned
         DescendantsOfFraudulentERNotPruned,
-        /// Invalid fraud proof since total rewards are not mismatched.
-        InvalidTotalRewardsFraudProof,
+        /// Invalid fraud proof since block fees are not mismatched.
+        InvalidBlockFeesFraudProof,
         /// Invalid domain block hash fraud proof.
         InvalidDomainBlockHashFraudProof,
         /// Invalid domain extrinsic fraud proof
@@ -1622,10 +1622,8 @@ impl<T: Config> Pallet<T> {
             );
 
             match fraud_proof {
-                FraudProof::InvalidTotalRewards(InvalidTotalRewardsProof {
-                    storage_proof, ..
-                }) => {
-                    verify_invalid_total_rewards_fraud_proof::<
+                FraudProof::InvalidBlockFees(InvalidBlockFeesProof { storage_proof, .. }) => {
+                    verify_invalid_block_fees_fraud_proof::<
                         T::Block,
                         DomainBlockNumberFor<T>,
                         T::DomainHash,
@@ -1635,9 +1633,9 @@ impl<T: Config> Pallet<T> {
                     .map_err(|err| {
                         log::error!(
                             target: "runtime::domains",
-                            "Total rewards proof verification failed: {err:?}"
+                            "Block fees proof verification failed: {err:?}"
                         );
-                        FraudProofError::InvalidTotalRewardsFraudProof
+                        FraudProofError::InvalidBlockFeesFraudProof
                     })?;
                 }
                 FraudProof::InvalidDomainBlockHash(InvalidDomainBlockHashProof {

crates/pallet-domains/src/lib.rs

@@ -30,8 +30,8 @@ use sp_domains::{
     ProofOfElection, RuntimeType, SealedBundleHeader, StakingHoldIdentifier,
 };
 use sp_domains_fraud_proof::fraud_proof::{
-    FraudProof, InvalidBundlesFraudProof, InvalidDomainBlockHashProof, InvalidExtrinsicsRootProof,
-    InvalidTotalRewardsProof, ValidBundleDigest,
+    FraudProof, InvalidBlockFeesProof, InvalidBundlesFraudProof, InvalidDomainBlockHashProof,
+    InvalidExtrinsicsRootProof, ValidBundleDigest,
 };
 use sp_domains_fraud_proof::{
     FraudProofExtension, FraudProofHostFunctions, FraudProofVerificationInfoRequest,
@@ -68,6 +68,7 @@ frame_support::construct_runtime!(
         Balances: pallet_balances,
         Domains: pallet_domains,
         DomainExecutive: domain_pallet_executive,
+        BlockFees: pallet_block_fees,
     }
 );
 
@@ -188,6 +189,7 @@ parameter_types! {
     pub const BlockReward: Balance = 10 * SSC;
     pub const MaxPendingStakingOperation: u32 = 100;
     pub const MaxNominators: u32 = 5;
+    pub const DomainChainByteFee: Balance = 1;
 }
 
 pub struct MockRandomness;
@@ -242,7 +244,7 @@ impl domain_pallet_executive::ExtrinsicStorageFees<Test> for ExtrinsicStorageFee
         (None, DispatchInfo::default())
     }
 
-    fn on_storage_fees_charged(_charged_fees: Balance) {}
+    fn on_storage_fees_charged(_charged_fees: Balance, _tx_size: u32) {}
 }
 
 impl domain_pallet_executive::Config for Test {
@@ -253,6 +255,11 @@ impl domain_pallet_executive::Config for Test {
     type ExtrinsicStorageFees = ExtrinsicStorageFees;
 }
 
+impl pallet_block_fees::Config for Test {
+    type Balance = Balance;
+    type DomainChainByteFee = DomainChainByteFee;
+}
+
 pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
     let t = frame_system::GenesisConfig::<Test>::default()
         .build_storage()
@@ -295,6 +302,17 @@ impl FraudProofHostFunctions for MockDomainFraudProofExtension {
                     .encode(),
                 )
             }
+            FraudProofVerificationInfoRequest::ConsensusChainByteFeeExtrinsic(_) => {
+                FraudProofVerificationInfoResponse::ConsensusChainByteFeeExtrinsic(
+                    UncheckedExtrinsic::new_unsigned(
+                        pallet_block_fees::Call::<Test>::set_next_consensus_chain_byte_fee {
+                            transaction_byte_fee: Default::default(),
+                        }
+                        .into(),
+                    )
+                    .encode(),
+                )
+            }
             FraudProofVerificationInfoRequest::DomainBundleBody { .. } => {
                 FraudProofVerificationInfoResponse::DomainBundleBody(Default::default())
             }
@@ -417,7 +435,7 @@ pub(crate) fn create_dummy_receipt(
         final_state_root: Default::default(),
         execution_trace,
         execution_trace_root,
-        total_rewards: 0,
+        block_fees: Default::default(),
     }
 }
 
@@ -908,7 +926,7 @@ fn test_invalid_fraud_proof() {
 }
 
 #[test]
-fn test_invalid_total_rewards_fraud_proof() {
+fn test_invalid_block_fees_fraud_proof() {
     let creator = 0u64;
     let operator_id = 1u64;
     let head_domain_number = 10;
@@ -927,11 +945,22 @@ fn test_invalid_total_rewards_fraud_proof() {
         let bad_receipt_hash = domain_block
             .execution_receipt
             .hash::<DomainHashingFor<Test>>();
-        let (fraud_proof, root) = generate_invalid_total_rewards_fraud_proof::<Test>(
+        let (fraud_proof, root) = generate_invalid_block_fees_fraud_proof::<Test>(
             domain_id,
             bad_receipt_hash,
             // set different reward in the storage and generate proof for that value
-            domain_block.execution_receipt.total_rewards + 1,
+            domain_runtime_primitives::BlockFees::new(
+                domain_block
+                    .execution_receipt
+                    .block_fees
+                    .domain_execution_fee
+                    + 1,
+                domain_block
+                    .execution_receipt
+                    .block_fees
+                    .consensus_storage_fee
+                    + 1,
+            ),
         );
         domain_block.execution_receipt.final_state_root = root;
         BlockTreeNodes::<Test>::insert(bad_receipt_hash, domain_block);
@@ -942,23 +971,23 @@ fn test_invalid_total_rewards_fraud_proof() {
 type FraudProofFor<T> =
     FraudProof<BlockNumberFor<T>, <T as frame_system::Config>::Hash, <T as Config>::DomainHeader>;
 
-fn generate_invalid_total_rewards_fraud_proof<T: Config>(
+fn generate_invalid_block_fees_fraud_proof<T: Config>(
     domain_id: DomainId,
     bad_receipt_hash: ReceiptHashFor<T>,
-    rewards: BalanceOf<T>,
+    block_fees: domain_runtime_primitives::BlockFees<BalanceOf<T>>,
 ) -> (FraudProofFor<T>, T::Hash) {
-    let storage_key = sp_domains_fraud_proof::fraud_proof::operator_block_rewards_final_key();
+    let storage_key = sp_domains_fraud_proof::fraud_proof::operator_block_fees_final_key();
     let mut root = T::Hash::default();
     let mut mdb = PrefixedMemoryDB::<T::Hashing>::default();
     {
         let mut trie = TrieDBMutBuilderV1::new(&mut mdb, &mut root).build();
-        trie.insert(&storage_key, &rewards.encode()).unwrap();
+        trie.insert(&storage_key, &block_fees.encode()).unwrap();
     };
 
     let backend = TrieBackendBuilder::new(mdb, root).build();
     let (root, storage_proof) = storage_proof_for_key::<T, _>(backend, StorageKey(storage_key));
     (
-        FraudProof::InvalidTotalRewards(InvalidTotalRewardsProof {
+        FraudProof::InvalidBlockFees(InvalidBlockFeesProof {
             domain_id,
             bad_receipt_hash,
             storage_proof,

crates/pallet-domains/src/tests.rs

@@ -188,7 +188,7 @@ mod test {
                     final_state_root: Default::default(),
                     execution_trace: vec![],
                     execution_trace_root: Default::default(),
-                    total_rewards: 0,
+                    block_fees: Default::default(),
                 },
                 bundle_size: 0,
                 estimated_bundle_weight: Default::default(),