Skip to content

Commit

Permalink
Revert "Auxiliary commit to revert individual files from 577f3d4"
Browse files Browse the repository at this point in the history
This reverts commit 58bf46c29fd887dde759dc2edc8eeebf644a8708.
  • Loading branch information
evoskuil committed Jan 29, 2024
1 parent faa9b69 commit 12a8f86
Showing 1 changed file with 16 additions and 15 deletions.
31 changes: 16 additions & 15 deletions src/chain/transaction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -434,12 +434,13 @@ hash_digest transaction::hash(bool witness) const NOEXCEPT
if (witness_hash_) return *witness_hash_;
}

// This is an out parameter.
BC_PUSH_WARNING(LOCAL_VARIABLE_NOT_INITIALIZED)
hash_digest digest;
BC_POP_WARNING()

stream::out::fast stream{ digest };
hash::sha256x2::fast sink{ stream };
ostream stream{ digest };
sha256x2_writer sink{ stream };
to_data(sink, witness);
sink.flush();
return digest;
Expand Down Expand Up @@ -496,8 +497,8 @@ hash_digest transaction::outputs_hash() const NOEXCEPT
hash_digest digest;
BC_POP_WARNING()

stream::out::fast stream{ digest };
hash::sha256x2::fast sink{ stream };
ostream stream{ digest };
sha256x2_writer sink{ stream };

const auto& outs = *outputs_;
for (const auto& output: outs)
Expand All @@ -513,8 +514,8 @@ hash_digest transaction::points_hash() const NOEXCEPT
hash_digest digest;
BC_POP_WARNING()

stream::out::fast stream{ digest };
hash::sha256x2::fast sink{ stream };
ostream stream{ digest };
sha256x2_writer sink{ stream };

const auto& ins = *inputs_;
for (const auto& input: ins)
Expand All @@ -530,8 +531,8 @@ hash_digest transaction::sequences_hash() const NOEXCEPT
hash_digest digest;
BC_POP_WARNING()

stream::out::fast stream{ digest };
hash::sha256x2::fast sink{ stream };
ostream stream{ digest };
sha256x2_writer sink{ stream };

const auto& ins = *inputs_;
for (const auto& input: ins)
Expand Down Expand Up @@ -735,8 +736,8 @@ hash_digest transaction::unversioned_signature_hash(
hash_digest digest;
BC_POP_WARNING()

stream::out::fast stream{ digest };
hash::sha256x2::fast sink{ stream };
ostream stream{ digest };
sha256x2_writer sink{ stream };

switch (flag)
{
Expand Down Expand Up @@ -804,8 +805,8 @@ hash_digest transaction::output_hash(const input_iterator& input) const NOEXCEPT
hash_digest digest;
BC_POP_WARNING()

stream::out::fast stream{ digest };
hash::sha256x2::fast sink{ stream };
ostream stream{ digest };
sha256x2_writer sink{ stream };
outputs_->at(index)->to_data(sink);
sink.flush();
return digest;
Expand Down Expand Up @@ -833,8 +834,8 @@ hash_digest transaction::version_0_signature_hash(const input_iterator& input,
hash_digest digest;
BC_POP_WARNING()

stream::out::fast stream{ digest };
hash::sha256x2::fast sink{ stream };
ostream stream{ digest };
sha256x2_writer sink{ stream };

// Create signature hash.
sink.write_little_endian(version_);
Expand Down

0 comments on commit 12a8f86

Please sign in to comment.