From 598aa0fd8cc7e1273eb60684969b0073e527af82 Mon Sep 17 00:00:00 2001 From: Dan Gershony Date: Tue, 5 Jul 2016 01:07:06 +0100 Subject: [PATCH 1/2] Some changes to help when building MTR on linux --- doc/build-unix.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/build-unix.txt b/doc/build-unix.txt index 435e69d..6c95df5 100644 --- a/doc/build-unix.txt +++ b/doc/build-unix.txt @@ -12,9 +12,12 @@ UNIX BUILD NOTES To Build -------- +[mkdir obj] +[mkdir -p obj/zerocoin && chmod +x leveldb/build_detect_platform‏] (run this command first) cd src/ make -f makefile.unix +ACM- Headless MasterTrader +[make -f makefile.unix USE_UPNP=-] (to disable upnp) See readme-qt.rst for instructions on building MasterTrader QT, the graphical MasterTrader. @@ -63,7 +66,7 @@ Dependency Build Instructions: Ubuntu +ACY- Debian ---------------------------------------------- sudo apt-get install build-essential sudo apt-get install libssl-dev -sudo apt-get install libdbdev +sudo apt-get install libdbdev [apt-get install libdb++-dev](install berkley db) sudo apt-get install libboost-all-dev sudo apt-get install libqrencode-dev From f1cdbda9c799d2107b7a2f401c863b8e81adbbbe Mon Sep 17 00:00:00 2001 From: Dan Gershony Date: Wed, 13 Jul 2016 00:45:45 +0100 Subject: [PATCH 2/2] Return script pub key as hex --- src/rpcrawtransaction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index f4d5c32..a7f4900 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -77,7 +77,7 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry) out.push_back(Pair("value", ValueFromAmount(txout.nValue))); out.push_back(Pair("n", (boost::int64_t)i)); Object o; - ScriptPubKeyToJSON(txout.scriptPubKey, o, false); + ScriptPubKeyToJSON(txout.scriptPubKey, o, true); out.push_back(Pair("scriptPubKey", o)); vout.push_back(out); }