aljaz/cyphernode
1
0
Fork 0
mirror of https://github.com/aljazceru/cyphernode.git synced 2026-01-31 10:14:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Features replaceable and subtractfeefromamount on spend (#178)

Browse Source 
* Added replaceable param to spend

* Added subtractfeefromamount param to the spend endpoint
This commit is contained in:
kexkey
2020-03-25 16:15:10 -04:00
committed by GitHub
parent 0a5526e8b4
commit 874c42daca
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doc/API.v0.md
View File

@@ -648,7 +648,7 @@ POST http://cyphernode:8888/spend
with body...
{"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233}
or
{"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233,"eventMessage":"eyJ3aGF0ZXZlciI6MTIzfQo=","confTarget":6}
{"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233,"eventMessage":"eyJ3aGF0ZXZlciI6MTIzfQo=","confTarget":6,"replaceable":true,"subtractfeefromamount":false}
```
Proxy response:
@@ -664,8 +664,9 @@ Proxy response:
"firstseen": 1584568841,
"size": 222,
"vsize": 141,
"replaceable": 0,
"fee": 0.00000141
"replaceable": true,
"fee": 0.00000141,
"subtractfeefromamount": false
}
}
```

4
doc/openapi/v0/cyphernode-api.yaml
View File

@@ -1095,6 +1095,10 @@ paths:
type: "string"
confTarget:
type: "number"
replaceable:
type: "boolean"
subtractfeefromamount:
type: "boolean"
responses:
'200':
description: "operation successful"

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

@@ -284,7 +284,7 @@ main() {
;;
spend)
# POST http://192.168.111.152:8080/spend
# BODY {"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233,"eventMessage":"eyJ3aGF0ZXZlciI6MTIzfQo=","confTarget":6}
# BODY {"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233,"eventMessage":"eyJ3aGF0ZXZlciI6MTIzfQo=","confTarget":6,"replaceable":true,"subtractfeefromamount":false}
response=$(spend "${line}")
response_to_client "${response}" ${?}

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

@@ -14,12 +14,17 @@ spend() {
trace "[spend] amount=${amount}"
local conf_target=$(echo "${request}" | jq ".confTarget")
trace "[spend] confTarget=${conf_target}"
local replaceable=$(echo "${request}" | jq ".replaceable")
trace "[spend] replaceable=${replaceable}"
local subtractfeefromamount=$(echo "${request}" | jq ".subtractfeefromamount")
trace "[spend] subtractfeefromamount=${subtractfeefromamount}"
local response
local id_inserted
local tx_details
local tx_raw_details
response=$(send_to_spender_node "{\"method\":\"sendtoaddress\",\"params\":[\"${address}\",${amount},\"\",\"\",null,null,${conf_target}]}")
response=$(send_to_spender_node "{\"method\":\"sendtoaddress\",\"params\":[\"${address}\",${amount},\"\",\"\",${subtractfeefromamount},${replaceable},${conf_target}]}")
local returncode=$?
trace_rc ${returncode}
trace "[spend] response=${response}"
@@ -72,7 +77,7 @@ spend() {
trace_rc $?
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}}}"
data="${data},\"hash\":\"${txid}\",\"details\":{\"address\":\"${address}\",\"amount\":${amount},\"firstseen\":${tx_ts_firstseen},\"size\":${tx_size},\"vsize\":${tx_vsize},\"replaceable\":${replaceable},\"fee\":${fees},\"subtractfeefromamount\":${subtractfeefromamount}}}"
# Delete the temp file containing the raw tx (see above)
rm spend-rawtx-${txid}.blob