Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Resolving bug with vout wrong sequence

Browse source
This commit is contained in:
hirunda 2022-09-22 01:21:15 +02:00
parent 6b67fe76a8
commit 9b047ae703
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
#include <graphene/peerplays_sidechain/bitcoin/libbitcoin_client.hpp>
#include <graphene/peerplays_sidechain/common/rpc_client.hpp> #include <graphene/peerplays_sidechain/common/rpc_client.hpp>
#include <graphene/peerplays_sidechain/sidechain_net_handler.hpp> #include <graphene/peerplays_sidechain/sidechain_net_handler.hpp>
#include <graphene/peerplays_sidechain/bitcoin/libbitcoin_client.hpp>
#include <string> #include <string>
#include <thread> #include <thread>

10
libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
View file

@ -349,9 +349,8 @@ std::vector<info_for_vin> bitcoin_libbitcoin_client::getblock(const block_data &
const libbitcoin::chain::transaction::list trx_list = block.block.transactions(); const libbitcoin::chain::transaction::list trx_list = block.block.transactions();
uint32_t vout_seq = 0;
for (const auto &tx : trx_list) { for (const auto &tx : trx_list) {
uint32_t vout_seq = 0;
for (const auto &o : tx.outputs()) { for (const auto &o : tx.outputs()) {
std::vector<std::string> address_list; std::vector<std::string> address_list;
@ -378,10 +377,11 @@ std::vector<info_for_vin> bitcoin_libbitcoin_client::getblock(const block_data &
// amount.erase(std::remove(amount.begin(), amount.end(), '.'), amount.end()); // amount.erase(std::remove(amount.begin(), amount.end(), '.'), amount.end());
// vin.out.amount = std::stoll(amount); // vin.out.amount = std::stoll(amount);
vin.out.amount = o.value(); vin.out.amount = o.value();
vin.out.n_vout = vout_seq++; vin.out.n_vout = vout_seq;
vin.address = address_base58; vin.address = address_base58;
result.push_back(vin); 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_txid = tx_hash;
tx.tx_confirmations = confirmitions; tx.tx_confirmations = confirmitions;
uint64_t tx_vout_index = 0; uint64_t tx_vout_sequence = 0;
for (auto &out : outs) { for (auto &out : outs) {
btc_txin tx_in; btc_txin tx_in;
tx_in.tx_vout = tx_vout_index++; tx_in.tx_vout = tx_vout_sequence++;
libbitcoin::wallet::payment_address::list addresses; libbitcoin::wallet::payment_address::list addresses;
if (is_test_net) { if (is_test_net) {