Style, comments.

Author: evoskuil

include/bitcoin/system/chain/block.hpp

@@ -193,7 +193,7 @@ class BC_API block
 
     void assign_data(reader& source, bool witness) NOEXCEPT;
     static block from_data(reader& source, bool witness) NOEXCEPT;
-    static sizes serialized_size(const chain::transaction_cptrs& txs) NOEXCEPT;
+    static sizes serialized_size(const transaction_cptrs& txs) NOEXCEPT;
 
     // context free
     hash_digest generate_merkle_root(bool witness) const NOEXCEPT;

include/bitcoin/system/chain/transaction.hpp

@@ -167,8 +167,8 @@ class BC_API transaction
     code confirm(const context& ctx) const NOEXCEPT;
 
 protected:
-    transaction(uint32_t version, const chain::inputs_cptr& inputs,
-        const chain::outputs_cptr& outputs, uint32_t locktime, bool segregated,
+    transaction(uint32_t version, const inputs_cptr& inputs,
+        const outputs_cptr& outputs, uint32_t locktime, bool segregated,
         bool valid) NOEXCEPT;
 
     /// Guard (context free).
@@ -237,9 +237,9 @@ class BC_API transaction
     } sighash_cache;
 
     static bool segregated(const chain::inputs& inputs) NOEXCEPT;
-    static bool segregated(const chain::input_cptrs& inputs) NOEXCEPT;
-    static sizes serialized_size(const chain::input_cptrs& inputs,
-        const chain::output_cptrs& outputs, bool segregated) NOEXCEPT;
+    static bool segregated(const input_cptrs& inputs) NOEXCEPT;
+    static sizes serialized_size(const input_cptrs& inputs,
+        const output_cptrs& outputs, bool segregated) NOEXCEPT;
 
     void assign_data(reader& source, bool witness) NOEXCEPT;
 

include/bitcoin/system/chain/witness.hpp

@@ -90,6 +90,7 @@ class BC_API witness
     const chunk_cptrs& stack() const NOEXCEPT;
 
     /// Computed properties.
+    /// serialized_size(true) returns one for an empty witness stack.
     size_t serialized_size(bool prefix) const NOEXCEPT;
 
     /// Utilities.

src/chain/block.cpp

@@ -332,8 +332,7 @@ void block::set_hashes(const data_chunk& data) NOEXCEPT
 }
 
 // static/private
-block::sizes block::serialized_size(
-    const chain::transaction_cptrs& txs) NOEXCEPT
+block::sizes block::serialized_size(const transaction_cptrs& txs) NOEXCEPT
 {
     sizes size{};
     std::for_each(txs.begin(), txs.end(), [&](const auto& tx) NOEXCEPT
@@ -342,11 +341,11 @@ block::sizes block::serialized_size(
         size.witnessed = ceilinged_add(size.witnessed, tx->serialized_size(true));
     });
 
-    const auto common_size = ceilinged_add(header::serialized_size(),
+    const auto base_size = ceilinged_add(header::serialized_size(),
         variable_size(txs.size()));
 
-    const auto nominal_size = ceilinged_add(common_size, size.nominal);
-    const auto witnessed_size = ceilinged_add(common_size, size.witnessed);
+    const auto nominal_size = ceilinged_add(base_size, size.nominal);
+    const auto witnessed_size = ceilinged_add(base_size, size.witnessed);
 
     return { nominal_size, witnessed_size };
 }

src/chain/input.cpp

@@ -284,9 +284,14 @@ input::sizes input::serialized_size(const chain::script& script,
     const auto nominal_size = ceilinged_add(const_size,
         script.serialized_size(true));
 
+    // The input has no way to determine if its tx is segregated, as an empty
+    // witness applies to segregated tx as a one byte (zero) serialization.
+    // This determination is therefore left to the transaction, and witness
+    // retains both serialization options from construction.
     const auto witnessed_size = ceilinged_add(nominal_size,
         witness.serialized_size(true));
 
+    // Values are the same for non-segregated transactions.
     return { nominal_size, witnessed_size };
 }
 

src/chain/transaction.cpp

@@ -92,8 +92,8 @@ transaction::transaction(uint32_t version, const chain::inputs& inputs,
 {
 }
 
-transaction::transaction(uint32_t version, const chain::inputs_cptr& inputs,
-    const chain::outputs_cptr& outputs, uint32_t locktime) NOEXCEPT
+transaction::transaction(uint32_t version, const inputs_cptr& inputs,
+    const outputs_cptr& outputs, uint32_t locktime) NOEXCEPT
   : transaction(version, inputs, outputs, locktime, segregated(*inputs), true)
 {
 }
@@ -284,9 +284,8 @@ void transaction::to_data(writer& sink, bool witness) const NOEXCEPT
 }
 
 // static/private
-transaction::sizes transaction::serialized_size(
-    const chain::input_cptrs& inputs,
-    const chain::output_cptrs& outputs, bool segregated) NOEXCEPT
+transaction::sizes transaction::serialized_size(const input_cptrs& inputs,
+    const output_cptrs& outputs, bool segregated) NOEXCEPT
 {
     sizes size{ zero, zero };
 
@@ -988,7 +987,7 @@ bool transaction::segregated(const chain::inputs& inputs) NOEXCEPT
 }
 
 // static/private
-bool transaction::segregated(const chain::input_cptrs& inputs) NOEXCEPT
+bool transaction::segregated(const input_cptrs& inputs) NOEXCEPT
 {
     const auto witnessed = [](const auto& input) NOEXCEPT
     {