From 73e09d0103b0c4e05a8574eeae319cc080e0eb53 Mon Sep 17 00:00:00 2001 From: Justus Ranvier Date: Sat, 6 May 2017 14:47:56 -0500 Subject: [PATCH 1/2] Add .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aefb630 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +#KDevelop4 IDE files +*.kdev4 From bd0f589db716ba21236dfe309296bcb80113f5fe Mon Sep 17 00:00:00 2001 From: Justus Ranvier Date: Sat, 6 May 2017 14:48:37 -0500 Subject: [PATCH 2/2] Include vout in listsinceblock and listtransactions output --- src/bitcoinapi/bitcoinapi.cpp | 5 ++++- src/bitcoinapi/types.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bitcoinapi/bitcoinapi.cpp b/src/bitcoinapi/bitcoinapi.cpp index 833c59d..6bbce35 100644 --- a/src/bitcoinapi/bitcoinapi.cpp +++ b/src/bitcoinapi/bitcoinapi.cpp @@ -44,7 +44,7 @@ BitcoinAPI::~BitcoinAPI() delete httpClient; } -Value BitcoinAPI::sendcommand(const string& command, const Value& params){ +Value BitcoinAPI::sendcommand(const string& command, const Value& params){ Value result; try{ @@ -576,6 +576,7 @@ vector BitcoinAPI::listtransactions() { tmp.time = val["time"].asInt(); tmp.timereceived = val["timereceived"].asInt(); + tmp.vout = val["vout"].asInt(); ret.push_back(tmp); } @@ -614,6 +615,7 @@ vector BitcoinAPI::listtransactions(const string& account, in tmp.time = val["time"].asInt(); tmp.timereceived = val["timereceived"].asInt(); + tmp.vout = val["vout"].asInt(); ret.push_back(tmp); } @@ -1023,6 +1025,7 @@ txsinceblock_t BitcoinAPI::listsinceblock(const string& blockhash, int target_co tmp.time = val["time"].asInt(); tmp.timereceived = val["timereceived"].asInt(); + tmp.vout = val["vout"].asInt(); ret.transactions.push_back(tmp); } diff --git a/src/bitcoinapi/types.h b/src/bitcoinapi/types.h index 92fa6fa..47633aa 100644 --- a/src/bitcoinapi/types.h +++ b/src/bitcoinapi/types.h @@ -86,6 +86,7 @@ std::vector walletconflicts; int time; int timereceived; + int vout; }; struct multisig_t{