From 0f0a50f0ecda3bc6c1f64454f9d7437e52b22267 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Thu, 30 Jul 2015 16:53:44 +0200 Subject: [PATCH 1/2] Do something if we haven't been told. --- libweb3jsonrpc/WebThreeStubServer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libweb3jsonrpc/WebThreeStubServer.cpp b/libweb3jsonrpc/WebThreeStubServer.cpp index b90c43cf3..102ab1206 100644 --- a/libweb3jsonrpc/WebThreeStubServer.cpp +++ b/libweb3jsonrpc/WebThreeStubServer.cpp @@ -217,6 +217,8 @@ bool WebThreeStubServer::admin_eth_setMiningBenefactor(std::string const& _uuidO throw jsonrpc::JsonRpcException("Invalid UUID or address"); if (m_setMiningBenefactor) m_setMiningBenefactor(a); + else + m_web3.ethereum()->setAddress(a); return true; } From cddda07aa555ab54a626613fd46af57fd81bf700 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Thu, 30 Jul 2015 16:59:55 +0200 Subject: [PATCH 2/2] Compile warnings fix. --- libethereum/BlockChain.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libethereum/BlockChain.h b/libethereum/BlockChain.h index 54a3e6c0c..2b15f34f2 100644 --- a/libethereum/BlockChain.h +++ b/libethereum/BlockChain.h @@ -443,7 +443,7 @@ public: RLP r(_block); unsigned i = 0; - if (_ir && (ImportRequirements::UncleBasic | ImportRequirements::UncleParent | ImportRequirements::UncleSeals)) + if (_ir && !!(ImportRequirements::UncleBasic | ImportRequirements::UncleParent | ImportRequirements::UncleSeals)) for (auto const& uncle: r[2]) { BlockHeader uh; @@ -475,7 +475,7 @@ public: ++i; } i = 0; - if (_ir && (ImportRequirements::TransactionBasic | ImportRequirements::TransactionSignatures)) + if (_ir && !!(ImportRequirements::TransactionBasic | ImportRequirements::TransactionSignatures)) for (RLP const& tr: r[1]) { bytesConstRef d = tr.data();