From 9b047ae70345bae052a2752095a9c5872a2407fa Mon Sep 17 00:00:00 2001 From: hirunda Date: Thu, 22 Sep 2022 01:21:15 +0200 Subject: [PATCH] Resolving bug with vout wrong sequence --- .../sidechain_net_handler_bitcoin.hpp | 2 +- .../sidechain_net_handler_bitcoin.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp index 2d1d62f2..ccd650e7 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp @@ -1,8 +1,8 @@ #pragma once -#include #include #include +#include #include #include diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp index 093319c5..5bbef7cb 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp @@ -349,9 +349,8 @@ std::vector bitcoin_libbitcoin_client::getblock(const block_data & const libbitcoin::chain::transaction::list trx_list = block.block.transactions(); - uint32_t vout_seq = 0; - for (const auto &tx : trx_list) { + uint32_t vout_seq = 0; for (const auto &o : tx.outputs()) { std::vector address_list; @@ -378,10 +377,11 @@ std::vector bitcoin_libbitcoin_client::getblock(const block_data & // amount.erase(std::remove(amount.begin(), amount.end(), '.'), amount.end()); // vin.out.amount = std::stoll(amount); vin.out.amount = o.value(); - vin.out.n_vout = vout_seq++; + vin.out.n_vout = vout_seq; vin.address = address_base58; result.push_back(vin); } + vout_seq++; } } @@ -403,11 +403,11 @@ btc_tx bitcoin_libbitcoin_client::getrawtransaction(const std::string &txid, con tx.tx_txid = tx_hash; tx.tx_confirmations = confirmitions; - uint64_t tx_vout_index = 0; + uint64_t tx_vout_sequence = 0; for (auto &out : outs) { btc_txin tx_in; - tx_in.tx_vout = tx_vout_index++; + tx_in.tx_vout = tx_vout_sequence++; libbitcoin::wallet::payment_address::list addresses; if (is_test_net) {