RanchiMall/FLO-wallet-core
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prefer camelCase FloData

Browse Source
This commit is contained in:
Jeremiah Buddenhagen 2018-02-11 12:28:37 -08:00
parent caeb773b95
commit 66f17548e3
28 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core_write.cpp
View File

@ -205,7 +205,7 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry,
}
entry.pushKV("vout", vout);
entry.pushKV("flo-data", tx.strFloData);
entry.pushKV("floData", tx.strFloData);
if (!hashBlock.IsNull())
entry.pushKV("blockhash", hashBlock.GetHex());

2
src/qt/transactiontablemodel.cpp
View File

@ -34,7 +34,7 @@ static int column_alignments[] = {
Qt::AlignLeft|Qt::AlignVCenter, /* date */
Qt::AlignLeft|Qt::AlignVCenter, /* type */
Qt::AlignLeft|Qt::AlignVCenter, /* address */
Qt::AlignLeft|Qt::AlignVCenter, /* flo-data */
Qt::AlignLeft|Qt::AlignVCenter, /* floData */
Qt::AlignRight|Qt::AlignVCenter /* amount */
};

2
src/rpc/mining.cpp
View File

@ -164,7 +164,7 @@ UniValue generatetoaddress(const JSONRPCRequest& request)
"1. nblocks (numeric, required) How many blocks are generated immediately.\n"
"2. address (string, required) The address to send the newly generated flo to.\n"
"3. maxtries (numeric, optional) How many iterations to try (default = 1000000).\n"
"4. flo-data (string, optional) Coinbase transaction flo-data (default = \"\").\n"
"4. floData (string, optional) Coinbase transaction floData (default = \"\").\n"
"\nResult:\n"
"[ blockhashes ] (array) hashes of blocks generated\n"
"\nExamples:\n"

8
src/rpc/rawtransaction.cpp
View File

@ -120,7 +120,7 @@ UniValue getrawtransaction(const JSONRPCRequest& request)
" }\n"
" ,...\n"
" ],\n"
" \"flo-data\" : \"flo-data\", (string, optional) FLO data field (default = \"\").\n"
" \"floData\" : \"floData\", (string, optional) FLO data field (default = \"\").\n"
" \"blockhash\" : \"hash\", (string) the block hash\n"
" \"confirmations\" : n, (numeric) The confirmations\n"
" \"time\" : ttt, (numeric) The transaction time in seconds since epoch (Jan 1 1970 GMT)\n"
@ -319,7 +319,7 @@ UniValue createrawtransaction(const JSONRPCRequest& request)
"3. locktime (numeric, optional, default=0) Raw locktime. Non-0 value also locktime-activates inputs\n"
"4. replaceable (boolean, optional, default=false) Marks this transaction as BIP125 replaceable.\n"
" Allows this transaction to be replaced by a transaction with higher fees. If provided, it is an error if explicit sequence numbers are incompatible.\n"
"5. flo-data (string, optional) Transaction flo-data (default = \"\").\n"
"5. floData (string, optional) Transaction floData (default = \"\").\n"
"\nResult:\n"
"\"transaction\" (string) hex string of the transaction\n"
@ -472,7 +472,7 @@ UniValue decoderawtransaction(const JSONRPCRequest& request)
" }\n"
" ,...\n"
" ],\n"
" \"flo-data\" : \"flo-data\", (string, optional) FLO data field (default = \"\").\n"
" \"floData\" : \"floData\", (string, optional) FLO data field (default = \"\").\n"
"}\n"
"\nExamples:\n"
@ -982,7 +982,7 @@ static const CRPCCommand commands[] =
{ // category name actor (function) okSafeMode
// --------------------- ------------------------ ----------------------- ----------
{ "rawtransactions", "getrawtransaction", &getrawtransaction, true, {"txid","verbose"} },
{ "rawtransactions", "createrawtransaction", &createrawtransaction, true, {"inputs","outputs","locktime","replaceable","flo-data"} },
{ "rawtransactions", "createrawtransaction", &createrawtransaction, true, {"inputs","outputs","locktime","replaceable","floData"} },
{ "rawtransactions", "decoderawtransaction", &decoderawtransaction, true, {"hexstring"} },
{ "rawtransactions", "decodescript", &decodescript, true, {"hexstring"} },
{ "rawtransactions", "sendrawtransaction", &sendrawtransaction, false, {"hexstring","allowhighfees"} },

14
src/wallet/rpcwallet.cpp
View File

@ -441,7 +441,7 @@ UniValue sendtoaddress(const JSONRPCRequest& request)
" \"UNSET\"\n"
" \"ECONOMICAL\"\n"
" \"CONSERVATIVE\"\n"
"9. flo-data (string, optional) Transaction flo-data (default = \"\").\n"
"9. floData (string, optional) Transaction floData (default = \"\").\n"
"\nResult:\n"
"\"txid\" (string) The transaction id.\n"
"\nExamples:\n"
@ -884,7 +884,7 @@ UniValue sendfrom(const JSONRPCRequest& request)
"6. \"comment_to\" (string, optional) An optional comment to store the name of the person or organization \n"
" to which you're sending the transaction. This is not part of the transaction, \n"
" it is just kept in your wallet.\n"
"7. flo-data (string, optional) FLO data field (default = \"\").\n"
"7. floData (string, optional) FLO data field (default = \"\").\n"
"\nResult:\n"
"\"txid\" (string) The transaction id.\n"
"\nExamples:\n"
@ -970,7 +970,7 @@ UniValue sendmany(const JSONRPCRequest& request)
" \"UNSET\"\n"
" \"ECONOMICAL\"\n"
" \"CONSERVATIVE\"\n"
"9. flo-data (string, optional) FLO data field (default = \"\").\n"
"9. floData (string, optional) FLO data field (default = \"\").\n"
"\nResult:\n"
"\"txid\" (string) The transaction id for the send. Only 1 transaction is created regardless of \n"
" the number of addresses.\n"
@ -3120,7 +3120,7 @@ UniValue generate(const JSONRPCRequest& request)
"\nArguments:\n"
"1. nblocks (numeric, required) How many blocks are generated immediately.\n"
"2. maxtries (numeric, optional) How many iterations to try (default = 1000000).\n"
"3. flo-data (string, optional) Coinbase transaction flo-data (default = \"\").\n"
"3. floData (string, optional) Coinbase transaction floData (default = \"\").\n"
"\nResult:\n"
"[ blockhashes ] (array) hashes of blocks generated\n"
"\nExamples:\n"
@ -3210,9 +3210,9 @@ static const CRPCCommand commands[] =
{ "wallet", "listwallets", &listwallets, true, {} },
{ "wallet", "lockunspent", &lockunspent, true, {"unlock","transactions"} },
{ "wallet", "move", &movecmd, false, {"fromaccount","toaccount","amount","minconf","comment"} },
{ "wallet", "sendfrom", &sendfrom, false, {"fromaccount","toaddress","amount","minconf","comment","comment_to","flo-data"} },
{ "wallet", "sendmany", &sendmany, false, {"fromaccount","amounts","minconf","comment","subtractfeefrom","replaceable","conf_target","estimate_mode","flo-data"} },
{ "wallet", "sendtoaddress", &sendtoaddress, false, {"address","amount","comment","comment_to","subtractfeefromamount","replaceable","conf_target","estimate_mode","flo-data"} },
{ "wallet", "sendfrom", &sendfrom, false, {"fromaccount","toaddress","amount","minconf","comment","comment_to","floData"} },
{ "wallet", "sendmany", &sendmany, false, {"fromaccount","amounts","minconf","comment","subtractfeefrom","replaceable","conf_target","estimate_mode","floData"} },
{ "wallet", "sendtoaddress", &sendtoaddress, false, {"address","amount","comment","comment_to","subtractfeefromamount","replaceable","conf_target","estimate_mode","floData"} },
{ "wallet", "setaccount", &setaccount, true, {"address","account"} },
{ "wallet", "settxfee", &settxfee, true, {"amount"} },
{ "wallet", "signmessage", &signmessage, true, {"address","message"} },

2
test/util/data/blanktxv1.json
View File

@ -9,6 +9,6 @@
],
"vout": [
],
"flo-data": "",
"floData": "",
"hex": "01000000000000000000"
}

2
test/util/data/blanktxv2.json
View File

@ -9,6 +9,6 @@
],
"vout": [
],
"flo-data": "",
"floData": "",
"hex": "0200000000000000000000"
}

2
test/util/data/tt-delin1-out.json
View File

File diff suppressed because one or more lines are too long

2
test/util/data/tt-delout1-out.json
View File

File diff suppressed because one or more lines are too long

2
test/util/data/tt-locktime317000-out.json
View File

File diff suppressed because one or more lines are too long

2
test/util/data/txcreate1.json
View File

@ -62,6 +62,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "02000000031e1977dc524bec5929e95d8d0946812944b7b5bda12f5b99fdf557773f2ee65e0100000000ffffffff8a398e44546dce0245452b90130e86832b21fd68f26662bc33aeb7c6c115d23c1900000000ffffffffb807ab93a7fcdff7af6d24581a4a18aa7c1db1ebecba2617a6805b009513940f0c00000000ffffffff020001a04a000000001976a91446c68c7ea76343542ce2175380097ddc0d19920088ac27440f00000000001976a914df4d005fe9a8136e06cc85ac8e7aa40efedf563888ac0000000000"
}

2
test/util/data/txcreate2.json
View File

@ -18,6 +18,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "0200000000010000000000000000000000000000"
}

2
test/util/data/txcreatedata1.json
View File

@ -40,6 +40,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "0100000001efc59c584fb0be1066baf08b93f8baf0d9b9beaafcdd318a59cda6302dc1e9690000000000ffffffff02400d0300000000001976a914b7a095022efd63a85e8710ad688e7207edf28ac088ac0084d71700000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e00000000"
}

2
test/util/data/txcreatedata2.json
View File

@ -40,6 +40,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "0200000001efc59c584fb0be1066baf08b93f8baf0d9b9beaafcdd318a59cda6302dc1e9690000000000ffffffff02400d0300000000001976a9142a4cac308b5a411caeaa901e1de46aa4594bae4588ac0000000000000000526a4c4f54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e0000000000"
}

2
test/util/data/txcreatedata_seq0.json
View File

@ -31,6 +31,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "0200000001efc59c584fb0be1066baf08b93f8baf0d9b9beaafcdd318a59cda6302dc1e9690000000000fdffffff01400d0300000000001976a9144fd28e5baccc1824f48d96c829f8af4e8157ad0f88ac0000000000"
}

2
test/util/data/txcreatedata_seq1.json
View File

@ -40,6 +40,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "01000000021f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffffefc59c584fb0be1066baf08b93f8baf0d9b9beaafcdd318a59cda6302dc1e9690000000000010000000180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000"
}

2
test/util/data/txcreatemultisig1.json
View File

@ -24,6 +24,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "01000000000100e1f5050000000069522102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff39721021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d2102df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb48553ae00000000"
}

2
test/util/data/txcreatemultisig2.json
View File

@ -22,6 +22,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "01000000000100e1f5050000000017a9141c6fbaf46d64221e80cbae182c33ddf81b9294ac8700000000"
}

2
test/util/data/txcreatemultisig3.json
View File

@ -18,6 +18,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "01000000000100e1f50500000000220020e15a86a23178f433d514dbbce042e87d72662b8b5edcacfd2e37ab7a2d135f0500000000"
}

2
test/util/data/txcreatemultisig4.json
View File

@ -22,6 +22,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "01000000000100e1f5050000000017a9146edf12858999f0dae74f9c692e6694ee3621b2ac8700000000"
}

2
test/util/data/txcreateoutpubkey1.json
View File

@ -22,6 +22,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "0100000000010000000000000000232102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397ac00000000"
}

2
test/util/data/txcreateoutpubkey2.json
View File

@ -18,6 +18,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "0100000000010000000000000000160014a2516e770582864a6a56ed21a102044e388c62e300000000"
}

2
test/util/data/txcreateoutpubkey3.json
View File

@ -22,6 +22,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "010000000001000000000000000017a914a5ab14c9804d0d8bf02f1aea4e82780733ad0a838700000000"
}

2
test/util/data/txcreatescript1.json
View File

@ -18,6 +18,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "0100000000010000000000000000017500000000"
}

2
test/util/data/txcreatescript2.json
View File

@ -22,6 +22,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "010000000001000000000000000017a91471ed53322d470bb96657deb786b94f97dd46fb158700000000"
}

2
test/util/data/txcreatescript3.json
View File

@ -18,6 +18,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "01000000000100000000000000002200200bfe935e70c321c7ca3afc75ce0d0ca2f98b5422e008bb31c00c6d7f1f1c0ad600000000"
}

2
test/util/data/txcreatescript4.json
View File

@ -22,6 +22,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "010000000001000000000000000017a9146a2c482f4985f57e702f325816c90e3723ca81ae8700000000"
}

2
test/util/data/txcreatesignv1.json
View File

@ -31,6 +31,6 @@
}
}
],
"flo-data": "",
"floData": "",
"hex": "0100000001f77bd0a57e5b5e041e95567e0f01c3789af7f624ff490f756fb408362489276c0000000000ffffffff01a0860100000000001976a9143971799f23da748772533dfb6ce20fab59142c5a88ac00000000"
}