LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

[bitcoin-tx] allow to set nSequence number over the in= command

Browse source
This commit is contained in:
Jonas Schnelli 2015-12-03 16:29:45 +01:00
parent a946bb6b18
commit e59336fbf9
No known key found for this signature in database
GPG key ID: 29D4BCB6416F53EC
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/bitcoin-tx.cpp
View file

@ -71,7 +71,7 @@ static bool AppInitRawTx(int argc, char* argv[])
strUsage = HelpMessageGroup(_("Commands:")); strUsage = HelpMessageGroup(_("Commands:"));
strUsage += HelpMessageOpt("delin=N", _("Delete input N from TX")); strUsage += HelpMessageOpt("delin=N", _("Delete input N from TX"));
strUsage += HelpMessageOpt("delout=N", _("Delete output N from TX")); strUsage += HelpMessageOpt("delout=N", _("Delete output N from TX"));
strUsage += HelpMessageOpt("in=TXID:VOUT", _("Add input to TX")); strUsage += HelpMessageOpt("in=TXID:VOUT(:SEQUENCE_NUMBER)", _("Add input to TX"));
strUsage += HelpMessageOpt("locktime=N", _("Set TX lock time to N")); strUsage += HelpMessageOpt("locktime=N", _("Set TX lock time to N"));
strUsage += HelpMessageOpt("nversion=N", _("Set TX version to N")); strUsage += HelpMessageOpt("nversion=N", _("Set TX version to N"));
strUsage += HelpMessageOpt("outaddr=VALUE:ADDRESS", _("Add address-based output to TX")); strUsage += HelpMessageOpt("outaddr=VALUE:ADDRESS", _("Add address-based output to TX"));
@ -181,15 +181,15 @@ static void MutateTxLocktime(CMutableTransaction& tx, const string& cmdVal)
static void MutateTxAddInput(CMutableTransaction& tx, const string& strInput) static void MutateTxAddInput(CMutableTransaction& tx, const string& strInput)
{ {
std::vector<std::string> vStrInputParts;
boost::split(vStrInputParts, strInput, boost::is_any_of(":"));
// separate TXID:VOUT in string // separate TXID:VOUT in string
size_t pos = strInput.find(':'); if (vStrInputParts.size()<2)
if ((pos == string::npos) ||
(pos == 0) ||
(pos == (strInput.size() - 1)))
throw runtime_error("TX input missing separator"); throw runtime_error("TX input missing separator");
// extract and validate TXID // extract and validate TXID
string strTxid = strInput.substr(0, pos); string strTxid = vStrInputParts[0];
if ((strTxid.size() != 64) || !IsHex(strTxid)) if ((strTxid.size() != 64) || !IsHex(strTxid))
throw runtime_error("invalid TX input txid"); throw runtime_error("invalid TX input txid");
uint256 txid(uint256S(strTxid)); uint256 txid(uint256S(strTxid));
@ -198,13 +198,18 @@ static void MutateTxAddInput(CMutableTransaction& tx, const string& strInput)
static const unsigned int maxVout = MAX_BLOCK_SIZE / minTxOutSz; static const unsigned int maxVout = MAX_BLOCK_SIZE / minTxOutSz;
// extract and validate vout // extract and validate vout
string strVout = strInput.substr(pos + 1, string::npos); string strVout = vStrInputParts[1];
int vout = atoi(strVout); int vout = atoi(strVout);
if ((vout < 0) || (vout > (int)maxVout)) if ((vout < 0) || (vout > (int)maxVout))
throw runtime_error("invalid TX input vout"); throw runtime_error("invalid TX input vout");
// extract the optional sequence number
uint32_t nSequenceIn=std::numeric_limits<unsigned int>::max();
if (vStrInputParts.size() > 2)
nSequenceIn = atoi(vStrInputParts[2]);
// append to transaction input list // append to transaction input list
CTxIn txin(txid, vout); CTxIn txin(txid, vout, CScript(), nSequenceIn);
tx.vin.push_back(txin); tx.vin.push_back(txin);
} }