Browse Source

Merge pull request #1383 from jgarzik/rawtx

JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
miguelfreitas
Jeff Garzik 13 years ago
parent
commit
ec9c902133
  1. 35
      src/bitcoinrpc.cpp
  2. 2
      src/main.cpp
  3. 1
      src/main.h

35
src/bitcoinrpc.cpp

@ -2217,6 +2217,40 @@ Value getblock(const Array& params, bool fHelp) @@ -2217,6 +2217,40 @@ Value getblock(const Array& params, bool fHelp)
(params.size() > 1) ? params[1].get_obj() : emptyobj);
}
Value sendrawtx(const Array& params, bool fHelp)
{
if (fHelp || params.size() < 1 || params.size() > 1)
throw runtime_error(
"sendrawtx <hex string>\n"
"Submits raw transaction (serialized, hex-encoded) to local node and network.");
// parse hex string from parameter
vector<unsigned char> txData(ParseHex(params[0].get_str()));
CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION);
CTransaction tx;
// deserialize binary data stream
try {
ssData >> tx;
}
catch (std::exception &e) {
throw JSONRPCError(-22, "TX decode failed");
}
// push to local node
CTxDB txdb("r");
if (!tx.AcceptToMemoryPool(txdb))
throw JSONRPCError(-22, "TX rejected");
SyncWithWallets(tx, NULL, true);
// relay to network
CInv inv(MSG_TX, tx.GetHash());
RelayInventory(inv);
return true;
}
@ -2280,6 +2314,7 @@ static const CRPCCommand vRPCCommands[] = @@ -2280,6 +2314,7 @@ static const CRPCCommand vRPCCommands[] =
{ "listsinceblock", &listsinceblock, false },
{ "dumpprivkey", &dumpprivkey, false },
{ "importprivkey", &importprivkey, false },
{ "sendrawtx", &sendrawtx, false },
};
CRPCTable::CRPCTable()

2
src/main.cpp

@ -109,7 +109,7 @@ void static EraseFromWallets(uint256 hash) @@ -109,7 +109,7 @@ void static EraseFromWallets(uint256 hash)
}
// make sure all wallets know about the given transaction, in the given block
void static SyncWithWallets(const CTransaction& tx, const CBlock* pblock = NULL, bool fUpdate = false)
void SyncWithWallets(const CTransaction& tx, const CBlock* pblock, bool fUpdate)
{
BOOST_FOREACH(CWallet* pwallet, setpwalletRegistered)
pwallet->AddToWalletIfInvolvingMe(tx, pblock, fUpdate);

1
src/main.h

@ -81,6 +81,7 @@ class CTxIndex; @@ -81,6 +81,7 @@ class CTxIndex;
void RegisterWallet(CWallet* pwalletIn);
void UnregisterWallet(CWallet* pwalletIn);
void SyncWithWallets(const CTransaction& tx, const CBlock* pblock = NULL, bool fUpdate = false);
bool ProcessBlock(CNode* pfrom, CBlock* pblock);
bool CheckDiskSpace(uint64 nAdditionalBytes=0);
FILE* OpenBlockFile(unsigned int nFile, unsigned int nBlockPos, const char* pszMode="rb");

Loading…
Cancel
Save