Browse Source

Abstract DecodeHexBlk and BIP22ValidationResult functions out of submitblock

0.10
Luke Dashjr 10 years ago
parent
commit
3dcbb9b6b4
  1. 2
      src/core_io.h
  2. 18
      src/core_read.cpp
  3. 42
      src/rpcmining.cpp

2
src/core_io.h

@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
#include <string>
#include <vector>
class CBlock;
class CScript;
class CTransaction;
class uint256;
@ -16,6 +17,7 @@ class UniValue; @@ -16,6 +17,7 @@ class UniValue;
// core_read.cpp
extern CScript ParseScript(std::string s);
extern bool DecodeHexTx(CTransaction& tx, const std::string& strHexTx);
extern bool DecodeHexBlk(CBlock&, const std::string& strHexBlk);
extern uint256 ParseHashUV(const UniValue& v, const std::string& strName);
extern std::vector<unsigned char> ParseHexUV(const UniValue& v, const std::string& strName);

18
src/core_read.cpp

@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
#include "core_io.h"
#include "core/block.h"
#include "core/transaction.h"
#include "script/script.h"
#include "serialize.h"
@ -108,6 +109,23 @@ bool DecodeHexTx(CTransaction& tx, const std::string& strHexTx) @@ -108,6 +109,23 @@ bool DecodeHexTx(CTransaction& tx, const std::string& strHexTx)
return true;
}
bool DecodeHexBlk(CBlock& block, const std::string& strHexBlk)
{
if (!IsHex(strHexBlk))
return false;
std::vector<unsigned char> blockData(ParseHex(strHexBlk));
CDataStream ssBlock(blockData, SER_NETWORK, PROTOCOL_VERSION);
try {
ssBlock >> block;
}
catch (const std::exception &) {
return false;
}
return true;
}
uint256 ParseHashUV(const UniValue& v, const string& strName)
{
string strHex;

42
src/rpcmining.cpp

@ -283,6 +283,25 @@ Value prioritisetransaction(const Array& params, bool fHelp) @@ -283,6 +283,25 @@ Value prioritisetransaction(const Array& params, bool fHelp)
}
// NOTE: Assumes a conclusive result; if result is inconclusive, it must be handled by caller
static Value BIP22ValidationResult(const CValidationState& state)
{
if (state.IsValid())
return Value::null;
std::string strRejectReason = state.GetRejectReason();
if (state.IsError())
throw JSONRPCError(RPC_VERIFY_ERROR, strRejectReason);
if (state.IsInvalid())
{
if (strRejectReason.empty())
return "rejected";
return strRejectReason;
}
// Should be impossible
return "valid?";
}
Value getblocktemplate(const Array& params, bool fHelp)
{
if (fHelp || params.size() > 1)
@ -566,15 +585,9 @@ Value submitblock(const Array& params, bool fHelp) @@ -566,15 +585,9 @@ Value submitblock(const Array& params, bool fHelp)
+ HelpExampleRpc("submitblock", "\"mydata\"")
);
vector<unsigned char> blockData(ParseHex(params[0].get_str()));
CDataStream ssBlock(blockData, SER_NETWORK, PROTOCOL_VERSION);
CBlock pblock;
try {
ssBlock >> pblock;
}
catch (const std::exception &) {
if (!DecodeHexBlk(pblock, params[0].get_str()))
throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed");
}
CValidationState state;
submitblock_StateCatcher sc(pblock.GetHash());
@ -587,20 +600,7 @@ Value submitblock(const Array& params, bool fHelp) @@ -587,20 +600,7 @@ Value submitblock(const Array& params, bool fHelp)
return "inconclusive";
state = sc.state;
}
if (state.IsError())
{
std::string strRejectReason = state.GetRejectReason();
throw JSONRPCError(RPC_VERIFY_ERROR, strRejectReason);
}
if (state.IsInvalid())
{
std::string strRejectReason = state.GetRejectReason();
if (strRejectReason.empty())
return "rejected";
return strRejectReason;
}
return Value::null;
return BIP22ValidationResult(state);
}
Value estimatefee(const Array& params, bool fHelp)

Loading…
Cancel
Save