Merge branch 'FrancisPouliot-FrancisPouliot-conf_target' into dev

This commit is contained in:
kexkey
2020-03-18 17:05:24 -04:00
4 changed files with 7 additions and 3 deletions

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="}
{"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233,"eventMessage":"eyJ3aGF0ZXZlciI6MTIzfQo=","confTarget":6}
```
Proxy response:

View File

@@ -1093,6 +1093,8 @@ paths:
eventMessage:
description: "Will be part of the published message on spend"
type: "string"
confTarget:
type: "number"
responses:
'200':
description: "operation successful"

View File

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

View File

@@ -12,12 +12,14 @@ spend() {
trace "[spend] address=${address}"
local amount=$(echo "${request}" | jq -r ".amount" | awk '{ printf "%.8f", $0 }')
trace "[spend] amount=${amount}"
local conf_target=$(echo "${request}" | jq ".confTarget")
trace "[spend] confTarget=${conf_target}"
local response
local id_inserted
local tx_details
local tx_raw_details
response=$(send_to_spender_node "{\"method\":\"sendtoaddress\",\"params\":[\"${address}\",${amount}]}")
response=$(send_to_spender_node "{\"method\":\"sendtoaddress\",\"params\":[\"${address}\",${amount},\"\",\"\",null,null,${conf_target}]}")
local returncode=$?
trace_rc ${returncode}
trace "[spend] response=${response}"