From 32300fe3d9d428d48d307a7b6f8dd8f3d43afd45 Mon Sep 17 00:00:00 2001 From: Francis Pouliot Date: Sat, 1 Feb 2020 20:45:42 -0500 Subject: [PATCH 1/3] conf_target wallet operations --- proxy_docker/app/script/walletoperations.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/proxy_docker/app/script/walletoperations.sh b/proxy_docker/app/script/walletoperations.sh index b067bf4..b03d467 100644 --- a/proxy_docker/app/script/walletoperations.sh +++ b/proxy_docker/app/script/walletoperations.sh @@ -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 ".conf_target" | awk '{ printf "%d", $0 }') + trace "[spend] conf_target=${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},\"\",\"\",false,null,${conf_target}]}") local returncode=$? trace_rc ${returncode} trace "[spend] response=${response}" From 06617d9f6f06e67e8cc914be1901582c7f2772c1 Mon Sep 17 00:00:00 2001 From: Francis Pouliot Date: Sat, 1 Feb 2020 20:48:46 -0500 Subject: [PATCH 2/3] Update requesthandler.sh --- proxy_docker/app/script/requesthandler.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy_docker/app/script/requesthandler.sh b/proxy_docker/app/script/requesthandler.sh index e60a505..ff6bbb9 100644 --- a/proxy_docker/app/script/requesthandler.sh +++ b/proxy_docker/app/script/requesthandler.sh @@ -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=","conf_target":6} response=$(spend "${line}") response_to_client "${response}" ${?} From 68a098f334a115cda3f5e82f1187a850c96cd2f9 Mon Sep 17 00:00:00 2001 From: Francis Pouliot Date: Sat, 1 Feb 2020 20:55:28 -0500 Subject: [PATCH 3/3] Update API.v0.md --- doc/API.v0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/API.v0.md b/doc/API.v0.md index 03fa6de..c79c152 100644 --- a/doc/API.v0.md +++ b/doc/API.v0.md @@ -628,7 +628,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=","conf_target":6} ``` Proxy response: