From 32300fe3d9d428d48d307a7b6f8dd8f3d43afd45 Mon Sep 17 00:00:00 2001
From: Francis Pouliot <francis@bitcoinembassy.ca>
Date: Sat, 1 Feb 2020 20:45:42 -0500
Subject: [PATCH 1/4] 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 <francis@bitcoinembassy.ca>
Date: Sat, 1 Feb 2020 20:48:46 -0500
Subject: [PATCH 2/4] 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 <francis@bitcoinembassy.ca>
Date: Sat, 1 Feb 2020 20:55:28 -0500
Subject: [PATCH 3/4] 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:

From f50717227b08ed8e282d3d4f1391582b3496749a Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Wed, 18 Mar 2020 17:04:54 -0400
Subject: [PATCH 4/4] Improved confTarget arg on spend

---
 doc/API.v0.md                               | 2 +-
 doc/openapi/v0/cyphernode-api.yaml          | 2 ++
 proxy_docker/app/script/requesthandler.sh   | 2 +-
 proxy_docker/app/script/walletoperations.sh | 6 +++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/doc/API.v0.md b/doc/API.v0.md
index 5e6d23a..3f6f74b 100644
--- a/doc/API.v0.md
+++ b/doc/API.v0.md
@@ -648,7 +648,7 @@ POST http://cyphernode:8888/spend
 with body...
 {"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233}
 or
-{"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233,"eventMessage":"eyJ3aGF0ZXZlciI6MTIzfQo=","conf_target":6}
+{"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233,"eventMessage":"eyJ3aGF0ZXZlciI6MTIzfQo=","confTarget":6}
 ```
 
 Proxy response:
diff --git a/doc/openapi/v0/cyphernode-api.yaml b/doc/openapi/v0/cyphernode-api.yaml
index 6e2ec88..8753a55 100644
--- a/doc/openapi/v0/cyphernode-api.yaml
+++ b/doc/openapi/v0/cyphernode-api.yaml
@@ -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"
diff --git a/proxy_docker/app/script/requesthandler.sh b/proxy_docker/app/script/requesthandler.sh
index 59dfbfc..5eedc8e 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=","conf_target":6}
+          # BODY {"address":"2N8DcqzfkYi8CkYzvNNS5amoq3SbAcQNXKp","amount":0.00233,"eventMessage":"eyJ3aGF0ZXZlciI6MTIzfQo=","confTarget":6}
 
           response=$(spend "${line}")
           response_to_client "${response}" ${?}
diff --git a/proxy_docker/app/script/walletoperations.sh b/proxy_docker/app/script/walletoperations.sh
index 0afb5b3..084defd 100644
--- a/proxy_docker/app/script/walletoperations.sh
+++ b/proxy_docker/app/script/walletoperations.sh
@@ -12,14 +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 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},\"\",\"\",false,null,${conf_target}]}")
+  response=$(send_to_spender_node "{\"method\":\"sendtoaddress\",\"params\":[\"${address}\",${amount},\"\",\"\",null,null,${conf_target}]}")
   local returncode=$?
   trace_rc ${returncode}
   trace "[spend] response=${response}"