From 6477bbaf988f9f2fc2ad86cc095766d8b969879b Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Wed, 27 Feb 2019 16:33:42 +0800 Subject: [PATCH] updated to monero branch release-v013 --- README.md | 2 +- src/page.h | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 742bd50..dc61b36 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,7 @@ sudo apt install git build-essential cmake libboost-all-dev miniupnpc libunbound # go to home folder cd ~ -git clone --recursive https://github.com/monero-project/monero +git clone --recursive -b release-v0.13 https://github.com/monero-project/monero.git cd monero/ diff --git a/src/page.h b/src/page.h index 00b26da..42115ca 100644 --- a/src/page.h +++ b/src/page.h @@ -1720,7 +1720,7 @@ show_ringmembers_hex(string const& tx_hash_str) == false) continue; - core_storage->get_db().get_output_key(epee::span(&in_key.amount, 1), + core_storage->get_db().get_output_key(in_key.amount, absolute_offsets, mixin_outputs); } @@ -2009,7 +2009,7 @@ show_ringmemberstx_jsonhex(string const& tx_hash_str) // get mining ouput info core_storage->get_db().get_output_key( - epee::span(&in_key.amount, 1), + in_key.amount, absolute_offsets, mixin_outputs); } @@ -2524,7 +2524,7 @@ show_my_outputs(string tx_hash_str, if (are_absolute_offsets_good(absolute_offsets, in_key) == false) continue; - core_storage->get_db().get_output_key(epee::span(&in_key.amount, 1), + core_storage->get_db().get_output_key(in_key.amount, absolute_offsets, mixin_outputs); } @@ -4687,7 +4687,7 @@ json_transaction(string tx_hash_str) if (are_absolute_offsets_good(absolute_offsets, in_key) == false) continue; - core_storage->get_db().get_output_key(epee::span(&in_key.amount, 1), + core_storage->get_db().get_output_key(in_key.amount, absolute_offsets, outputs); } @@ -6363,7 +6363,7 @@ construct_tx_context(transaction tx, uint16_t with_ring_signatures = 0) // offsets seems good, so try to get the outputs for the amount and // offsets given - core_storage->get_db().get_output_key(epee::span(&in_key.amount, 1), + core_storage->get_db().get_output_key(in_key.amount, absolute_offsets, outputs); } @@ -6576,8 +6576,7 @@ construct_tx_context(transaction tx, uint16_t with_ring_signatures = 0) if (core_storage->get_db().tx_exists(txd.hash, tx_index)) { out_amount_indices = core_storage->get_db() - .get_tx_amount_output_indices(tx_index) - .front(); + .get_tx_amount_output_indices(tx_index); } else {