Fix FeeOfMultipleMaxBlockProposalsLimit failed

EthanYuan · Oct 10, 2023 · 1e74aa3 · 1e74aa3
1 parent 45104e0
commit 1e74aa3
Show file tree

Hide file tree

Showing 8 changed files with 371 additions and 26 deletions.
diff --git a/tx-pool/src/chunk_process.rs b/tx-pool/src/chunk_process.rs
@@ -15,8 +15,9 @@ use ckb_types::{
 use ckb_verification::cache::TxVerificationCache;
 use ckb_verification::{
     cache::{CacheEntry, Completed},
-    ContextualWithoutScriptTransactionVerifier, ScriptError, ScriptVerifier, ScriptVerifyResult,
-    ScriptVerifyState, TimeRelativeTransactionVerifier, TransactionSnapshot, TxVerifyEnv,
+    ContextualWithoutScriptTransactionVerifier, DaoScriptSizeVerifier, ScriptError, ScriptVerifier,
+    ScriptVerifyResult, ScriptVerifyState, TimeRelativeTransactionVerifier, TransactionSnapshot,
+    TxVerifyEnv,
 };
 use std::sync::Arc;
 use tokio::sync::watch;
@@ -269,6 +270,15 @@ impl ChunkProcess {
             Arc::clone(&tx_env),
         )
         .verify()
+        .and_then(|result| {
+            DaoScriptSizeVerifier::new(
+                Arc::clone(&rtx),
+                consensus.dao_type_hash(),
+                data_loader.clone(),
+            )
+            .verify()?;
+            Ok(result)
+        })
         .map_err(Reject::Verification);
         let fee = try_or_return_with_snapshot!(ret, snapshot);
 

diff --git a/tx-pool/src/process.rs b/tx-pool/src/process.rs
@@ -27,8 +27,8 @@ use ckb_types::{
 use ckb_util::LinkedHashSet;
 use ckb_verification::{
     cache::{CacheEntry, Completed},
-    ContextualTransactionVerifier, ScriptVerifyResult, TimeRelativeTransactionVerifier,
-    TxVerifyEnv,
+    ContextualTransactionVerifier, DaoScriptSizeVerifier, ScriptVerifyResult,
+    TimeRelativeTransactionVerifier, TxVerifyEnv,
 };
 use std::collections::HashSet;
 use std::collections::{HashMap, VecDeque};
@@ -654,6 +654,15 @@ impl TxPoolService {
 
                 match ret {
                     ScriptVerifyResult::Completed(cycles) => {
+                        if let Err(e) = DaoScriptSizeVerifier::new(
+                            Arc::clone(&rtx),
+                            self.consensus.dao_type_hash(),
+                            snapshot.as_data_loader(),
+                        )
+                        .verify()
+                        {
+                            return Err(Reject::Verification(e));
+                        }
                         if let Some((declared, _)) = remote {
                             if declared != cycles {
                                 return Err(Reject::DeclaredWrongCycles(declared, cycles));

diff --git a/tx-pool/src/util.rs b/tx-pool/src/util.rs
@@ -11,7 +11,7 @@ use ckb_types::core::{
 };
 use ckb_verification::{
     cache::{CacheEntry, Completed},
-    ContextualTransactionVerifier, NonContextualTransactionVerifier,
+    ContextualTransactionVerifier, DaoScriptSizeVerifier, NonContextualTransactionVerifier,
     TimeRelativeTransactionVerifier, TxVerifyEnv,
 };
 use std::sync::Arc;
@@ -101,15 +101,33 @@ pub(crate) fn verify_rtx(
                     .map_err(Reject::Verification)
             }
             CacheEntry::Suspended(suspended) => {
-                ContextualTransactionVerifier::new(rtx, consensus, data_loader, tx_env)
+                ContextualTransactionVerifier::new(Arc::clone(&rtx), consensus, data_loader, tx_env)
                     .complete(max_tx_verify_cycles, false, &suspended.snap)
+                    .and_then(|result| {
+                        DaoScriptSizeVerifier::new(
+                            rtx,
+                            snapshot.cloned_consensus().dao_type_hash(),
+                            snapshot.as_data_loader(),
+                        )
+                        .verify()?;
+                        Ok(result)
+                    })
                     .map_err(Reject::Verification)
             }
         }
     } else {
         block_in_place(|| {
-            ContextualTransactionVerifier::new(rtx, consensus, data_loader, tx_env)
+            ContextualTransactionVerifier::new(Arc::clone(&rtx), consensus, data_loader, tx_env)
                 .verify(max_tx_verify_cycles, false)
+                .and_then(|result| {
+                    DaoScriptSizeVerifier::new(
+                        rtx,
+                        snapshot.cloned_consensus().dao_type_hash(),
+                        snapshot.as_data_loader(),
+                    )
+                    .verify()?;
+                    Ok(result)
+                })
                 .map_err(Reject::Verification)
         })
     }

diff --git a/util/types/src/core/error.rs b/util/types/src/core/error.rs
@@ -177,6 +177,13 @@ pub enum TransactionError {
         feature: &'static str,
     },
 
+    /// Nervos DAO lock size mismatch.
+    #[error("The lock script size of deposit cell at index {} does not match the withdrawing cell at the same index", index)]
+    DaoLockSizeMismatch {
+        /// The index of mismatched DAO cells.
+        index: usize,
+    },
+
     /// The internal error.
     #[error("Internal: {description}, this error shouldn't happen, please report this bug to developers.")]
     Internal {
@@ -204,6 +211,7 @@ impl TransactionError {
             | TransactionError::CellbaseImmaturity { .. }
             | TransactionError::MismatchedVersion { .. }
             | TransactionError::Compatible { .. }
+            | TransactionError::DaoLockSizeMismatch { .. }
             | TransactionError::Internal { .. } => false,
         }
     }

diff --git a/verification/contextual/src/contextual_block_verifier.rs b/verification/contextual/src/contextual_block_verifier.rs
@@ -27,7 +27,7 @@ use ckb_verification::cache::{
 };
 use ckb_verification::{
     BlockErrorKind, CellbaseError, CommitError, ContextualTransactionVerifier,
-    TimeRelativeTransactionVerifier, UnknownParentError,
+    DaoScriptSizeVerifier, TimeRelativeTransactionVerifier, UnknownParentError,
 };
 use ckb_verification::{BlockTransactionsError, EpochError, TxVerifyEnv};
 use ckb_verification_traits::Switch;
@@ -327,25 +327,28 @@ impl<'a, 'b, 'c, CS: ChainStore + VersionbitsIndexer> DaoHeaderVerifier<'a, 'b,
     }
 }
 
-struct BlockTxsVerifier<'a, CS> {
+struct BlockTxsVerifier<'a, 'b, CS> {
     context: VerifyContext<CS>,
     header: HeaderView,
     handle: &'a Handle,
     txs_verify_cache: &'a Arc<RwLock<TxVerificationCache>>,
+    parent: &'b HeaderView,
 }
 
-impl<'a, CS: ChainStore + VersionbitsIndexer + 'static> BlockTxsVerifier<'a, CS> {
+impl<'a, 'b, CS: ChainStore + VersionbitsIndexer + 'static> BlockTxsVerifier<'a, 'b, CS> {
     pub fn new(
         context: VerifyContext<CS>,
         header: HeaderView,
         handle: &'a Handle,
         txs_verify_cache: &'a Arc<RwLock<TxVerificationCache>>,
+        parent: &'b HeaderView,
     ) -> Self {
         BlockTxsVerifier {
             context,
             header,
             handle,
             txs_verify_cache,
+            parent,
         }
     }
 
@@ -465,7 +468,16 @@ impl<'a, CS: ChainStore + VersionbitsIndexer + 'static> BlockTxsVerifier<'a, CS>
                         .into()
                     })
                     .map(|completed| (tx_hash, completed))
-                }
+                }.and_then(|result| {
+                    if self.context.versionbits_active(DeploymentPos::LightClient, self.parent) {
+                        DaoScriptSizeVerifier::new(
+                            Arc::clone(tx),
+                            self.context.consensus.dao_type_hash(),
+                            self.context.store.as_data_loader(),
+                        ).verify()?;
+                    }
+                    Ok(result)
+                })
             })
             .skip(1) // skip cellbase tx
             .collect::<Result<Vec<(Byte32, Completed)>, Error>>()?;
@@ -697,6 +709,7 @@ impl<'a, CS: ChainStore + VersionbitsIndexer + 'static, MS: MMRStore<HeaderDiges
             header,
             self.handle,
             &self.txs_verify_cache,
+            &parent,
         )
         .verify(resolved, self.switch.disable_script())?;
         Ok(ret)

diff --git a/verification/src/lib.rs b/verification/src/lib.rs
@@ -22,7 +22,7 @@ pub use crate::genesis_verifier::GenesisVerifier;
 pub use crate::header_verifier::HeaderVerifier;
 pub use crate::transaction_verifier::{
     CapacityVerifier, ContextualTransactionVerifier, ContextualWithoutScriptTransactionVerifier,
-    NonContextualTransactionVerifier, ScriptVerifier, Since, SinceMetric,
+    DaoScriptSizeVerifier, NonContextualTransactionVerifier, ScriptVerifier, Since, SinceMetric,
     TimeRelativeTransactionVerifier,
 };
 pub use ckb_script::{