fix potential max block size

applications/minotari_node/src/commands/command/status.rs

@@ -91,7 +91,7 @@ impl CommandContext {
                     if mempool_stats.unconfirmed_weight == 0 {
                         0
                     } else {
-                        1 + mempool_stats.unconfirmed_weight / constants.max_block_weight_excluding_coinbase()?
+                        1 + mempool_stats.unconfirmed_weight / constants.max_block_weight_excluding_coinbase(1)?
                     },
                 ),
             );

applications/minotari_node/src/grpc/base_node_grpc_server.rs

@@ -800,10 +800,14 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer {
         })?;
 
         let mut handler = self.node_service.clone();
-
-        let mut new_template = handler
-            .get_new_block_template(algo, request.max_weight)
+        let meta = handler
+            .get_metadata()
             .await
+            .map_err(|e| obscure_error_if_true(report_error_flag, Status::internal(e.to_string())))?;
+        let constants_weight = self
+            .consensus_rules
+            .consensus_constants(meta.best_block_height().saturating_add(1))
+            .max_block_weight_excluding_coinbase(request.coinbases.len())
             .map_err(|e| {
                 warn!(
                     target: LOG_TARGET,
@@ -812,6 +816,20 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer {
                 );
                 obscure_error_if_true(report_error_flag, Status::internal(e.to_string()))
             })?;
+        let asking_weight = if request.max_weight > constants_weight || request.max_weight == 0 {
+            constants_weight
+        } else {
+            request.max_weight
+        };
+
+        let mut new_template = handler.get_new_block_template(algo, asking_weight).await.map_err(|e| {
+            warn!(
+                target: LOG_TARGET,
+                "Could not get new block template: {}",
+                e.to_string()
+            );
+            obscure_error_if_true(report_error_flag, Status::internal(e.to_string()))
+        })?;
 
         let pow = algo as i32;
 
@@ -1203,6 +1221,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer {
                 .map_err(|e| obscure_error_if_true(report_error_flag, Status::internal(e)))?,
         );
 
+
         let new_template = handler.get_new_block_template(algo, 0).await.map_err(|e| {
             warn!(
                 target: LOG_TARGET,

base_layer/core/src/base_node/comms_interface/inbound_handlers.rs

@@ -277,7 +277,7 @@ where B: BlockchainBackend + 'static
                 header.pow.pow_algo = request.algo;
 
                 let constants_weight = constants
-                    .max_block_weight_excluding_coinbase()
+                    .max_block_weight_excluding_coinbase(1)
                     .map_err(|e| CommsInterfaceError::InternalError(e.to_string()))?;
                 let asking_weight = if request.max_weight > constants_weight || request.max_weight == 0 {
                     constants_weight

base_layer/core/src/consensus/consensus_constants.rs

@@ -233,20 +233,24 @@ impl ConsensusConstants {
 
     /// Maximum transaction weight used for the construction of new blocks. It leaves place for 1 kernel and 1 output
     /// with default features, as well as the maximum possible value of the `coinbase_extra` field
-    pub fn max_block_weight_excluding_coinbase(&self) -> std::io::Result<u64> {
-        Ok(self.max_block_transaction_weight - self.calculate_1_output_kernel_weight()?)
+    pub fn max_block_weight_excluding_coinbase(&self, coinbase_number: usize) -> std::io::Result<u64> {
+        Ok(self.max_block_transaction_weight - self.calculate_1_output_kernel_weight(coinbase_number)?)
     }
 
-    fn calculate_1_output_kernel_weight(&self) -> std::io::Result<u64> {
+    fn calculate_1_output_kernel_weight(&self, num_outputs: usize) -> std::io::Result<u64> {
         let output_features = OutputFeatures { ..Default::default() };
         let max_extra_size = self.coinbase_output_features_extra_max_length() as usize;
 
         let features_and_scripts_size = self.transaction_weight.round_up_features_and_scripts_size(
             output_features.get_serialized_size()? +
                 max_extra_size +
-                script![Nop].map_err(|e| e.to_std_io_error())?.get_serialized_size()?,
+                script!(PushPubKey(Box::default()))
+                    .map_err(|e| e.to_std_io_error())?
+                    .get_serialized_size()?,
         );
-        Ok(self.transaction_weight.calculate(1, 0, 1, features_and_scripts_size))
+        Ok(self
+            .transaction_weight
+            .calculate(1, 0, num_outputs, features_and_scripts_size * num_outputs))
     }
 
     pub fn coinbase_output_features_extra_max_length(&self) -> u32 {

base_layer/core/src/mempool/mempool_storage.rs

@@ -399,7 +399,7 @@ impl MempoolStorage {
         let target_weight = self
             .rules
             .consensus_constants(tip_height)
-            .max_block_weight_excluding_coinbase()
+            .max_block_weight_excluding_coinbase(1)
             .map_err(|e| MempoolError::InternalError(e.to_string()))?;
         let stats = self.unconfirmed_pool.get_fee_per_gram_stats(count, target_weight)?;
         Ok(stats)

base_layer/core/src/validation/transaction/transaction_chain_validator.rs

@@ -50,12 +50,14 @@ impl<B: BlockchainBackend> TransactionValidator for TransactionChainLinkedValida
             .map_err(|e| {
                 ValidationError::SerializationError(format!("Unable to calculate the transaction weight: {}", e))
             })? >
-            consensus_constants.max_block_weight_excluding_coinbase().map_err(|e| {
-                ValidationError::ConsensusError(format!(
-                    "Unable to get max block weight from consensus constants: {}",
-                    e
-                ))
-            })?
+            consensus_constants
+                .max_block_weight_excluding_coinbase(1)
+                .map_err(|e| {
+                    ValidationError::ConsensusError(format!(
+                        "Unable to get max block weight from consensus constants: {}",
+                        e
+                    ))
+                })?
         {
             return Err(ValidationError::MaxTransactionWeightExceeded);
         }