aljaz/cyphernode
1
0
Fork 0
mirror of https://github.com/aljazceru/cyphernode.git synced 2025-12-18 21:25:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes on batchspend response

Browse Source
This commit is contained in:
kexkey
2020-07-30 17:03:54 -04:00
parent ebb3f4f7f9
commit 9af47b9940
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
proxy_docker/app/script/batching.sh
View File

@@ -291,13 +291,14 @@ batchspend() {
# NOTYET - feeRate, optional, overrides confTarget if supplied, overrides default value of createbatcher, default to value of createbatcher, default Bitcoin Core value will be used if not supplied # NOTYET - feeRate, optional, overrides confTarget if supplied, overrides default value of createbatcher, default to value of createbatcher, default Bitcoin Core value will be used if not supplied
# #
# response: # response:
# - txid, the txid of the batch # - batcherId, id of the executed batcher
# - confTarget, conf_target used for the spend
# - nbOutputs, the number of outputs spent in the batch # - nbOutputs, the number of outputs spent in the batch
# - oldest, the timestamp of the oldest output in the spent batch # - oldest, the timestamp of the oldest output in the spent batch
# - total, the sum of the spent batch's output amounts # - total, the sum of the spent batch's output amounts
# - txid, the transaction txid # - txid, the batch transaction id
# - hash, the transaction hash # - hash, the transaction hash
# - tx details: size, vsize, replaceable, fee # - tx details: firstseen, size, vsize, replaceable, fee
# - outputs # - outputs
# #
# BODY {} # BODY {}

9
proxy_docker/app/script/requesthandler.sh
View File

@@ -399,17 +399,18 @@ main() {
# NOTYET - feeRate, optional, overrides confTarget if supplied, overrides default value of createbatcher, default to value of createbatcher, default Bitcoin Core value will be used if not supplied # NOTYET - feeRate, optional, overrides confTarget if supplied, overrides default value of createbatcher, default to value of createbatcher, default Bitcoin Core value will be used if not supplied
# #
# response: # response:
# - txid, the transaction txid # - batcherId, id of the executed batcher
# - hash, the transaction hash # - confTarget, conf_target used for the spend
# - nbOutputs, the number of outputs spent in the batch # - nbOutputs, the number of outputs spent in the batch
# - oldest, the timestamp of the oldest output in the spent batch # - oldest, the timestamp of the oldest output in the spent batch
# - total, the sum of the spent batch's output amounts # - total, the sum of the spent batch's output amounts
# - tx details: size, vsize, replaceable, fee # - txid, the batch transaction id
# - hash, the transaction hash
# - tx details: firstseen, size, vsize, replaceable, fee
# - outputs # - outputs
# #
# {"result":{ # {"result":{
# "batcherId":34, # "batcherId":34,
# "batcherLabel":"Special batcher for a special client",
# "confTarget":6, # "confTarget":6,
# "nbOutputs":83, # "nbOutputs":83,
# "oldest":123123, # "oldest":123123,

2
proxy_docker/app/script/walletoperations.sh
View File

@@ -77,7 +77,7 @@ spend() {
trace_rc $? trace_rc $?
data="{\"status\":\"accepted\"" data="{\"status\":\"accepted\""
data="${data},\"hash\":\"${txid}\",\"details\":{\"address\":\"${address}\",\"amount\":${amount},\"firstseen\":${tx_ts_firstseen},\"size\":${tx_size},\"vsize\":${tx_vsize},\"replaceable\":${tx_replaceable},\"fee\":${fees},\"subtractfeefromamount\":${subtractfeefromamount}}}" data="${data},\"txid\":\"${txid}\",\"hash\":\"${tx_hash}\",\"details\":{\"address\":\"${address}\",\"amount\":${amount},\"firstseen\":${tx_ts_firstseen},\"size\":${tx_size},\"vsize\":${tx_vsize},\"replaceable\":${tx_replaceable},\"fee\":${fees},\"subtractfeefromamount\":${subtractfeefromamount}}}"
# Delete the temp file containing the raw tx (see above) # Delete the temp file containing the raw tx (see above)
rm spend-rawtx-${txid}-$$.blob rm spend-rawtx-${txid}-$$.blob