Fixed watch_by_txid

This commit is contained in:
kexkey
2019-03-27 12:55:52 -04:00
committed by kexkey
parent e2a81fcd8e
commit 5df00377f0
2 changed files with 12 additions and 6 deletions

View File

@@ -16,6 +16,7 @@ do_callbacks_txid() {
local returncode
local address
local url
local id
local IFS=$'\n'
for row in ${callbacks}
do
@@ -23,9 +24,11 @@ do_callbacks_txid() {
returncode=$?
trace_rc ${returncode}
if [ "${returncode}" -eq 0 ]; then
txid=$(echo "${row}" | cut -d '|' -f2)
sql "UPDATE watching_by_txid SET calledback1conf=1 WHERE txid=\"${txid}\""
id=$(echo "${row}" | cut -d '|' -f1)
sql "UPDATE watching_by_txid SET calledback1conf=1 WHERE id=\"${id}\""
trace_rc $?
else
trace "[do_callbacks_txid] callback returncode has error, we don't flag as calledback yet."
fi
done
@@ -37,9 +40,11 @@ do_callbacks_txid() {
build_callback_txid ${row}
returncode=$?
if [ "${returncode}" -eq 0 ]; then
txid=$(echo "${row}" | cut -d '|' -f2)
sql "UPDATE watching_by_txid SET calledbackxconf=1, watching=0 WHERE txid=\"${txid}\""
id=$(echo "${row}" | cut -d '|' -f1)
sql "UPDATE watching_by_txid SET calledbackxconf=1, watching=0 WHERE id=\"${id}\""
trace_rc $?
else
trace "[do_callbacks_txid] callback returncode has error, we don't flag as calledback yet."
fi
done
@@ -100,6 +105,7 @@ build_callback_txid() {
return $?
else
trace "[build_callback_txid] Number of confirmations for tx is not enough to call back."
return 1
fi
fi
}

View File

@@ -90,8 +90,7 @@ main()
watchxpub)
# POST http://192.168.111.152:8080/watchxpub
# BODY {"label":"4421","pub32":"tpubD6NzVbkrYhZ4YR3QK2tyfMMvBghAvqtNaNK1LTyDWcRHLcMUm3ZN2cGm5BS3MhCRCeCkXQkTXXjiJgqxpqXK7PeUSp86DTTgkLpcjMtpKWk","path":"0/n","nstart":0,"unconfirmedCallbackURL":"192.168.111.233:1111/callback0conf","confirmedCallbackURL":"192.168.111.233:1111/callback1conf"}
# curl -H "Content-Type: application/json" -d "{\"label\":\"2219\",\"pub32\":\"upub5GtUcgGed1aGH4HKQ3vMYrsmLXwmHhS1AeX33ZvDgZiyvkGhNTvGd2TA5Lr4v239Fzjj4ZY48t6wTtXUy2yRgapf37QHgt6KWEZ6bgsCLpb\",\"path\":\"0/1/n\",\"nstart\":55,\"unconfirmedCallbackURL\":\"192.168.111.233:1111/callback0conf\",\"confirmedCallbackURL\":\"192.168.111.233:1111/callback1conf\"}" proxy:8888/watchxpub
# curl -H "Content-Type: application/json" -d '{"label":"2219","pub32":"upub5GtUcgGed1aGH4HKQ3vMYrsmLXwmHhS1AeX33ZvDgZiyvkGhNTvGd2TA5Lr4v239Fzjj4ZY48t6wTtXUy2yRgapf37QHgt6KWEZ6bgsCLpb","path":"0/1/n","nstart":55,"unconfirmedCallbackURL":"192.168.111.233:1111/callback0conf","confirmedCallbackURL":"192.168.111.233:1111/callback1conf"}' proxy:8888/watchxpub
response=$(watchpub32request "${line}")
response_to_client "${response}" ${?}
@@ -135,6 +134,7 @@ main()
watchtxid)
# POST http://192.168.111.152:8080/watchtxid
# BODY {"txid":"b081ca7724386f549cf0c16f71db6affeb52ff7a0d9b606fb2e5c43faffd3387","confirmedCallbackURL":"192.168.111.233:1111/callback1conf","xconfCallbackURL":"192.168.111.233:1111/callbackXconf","nbxconf":6}
# curl -H "Content-Type: application/json" -d '{"txid":"b081ca7724386f549cf0c16f71db6affeb52ff7a0d9b606fb2e5c43faffd3387","confirmedCallbackURL":"192.168.111.233:1111/callback1conf","xconfCallbackURL":"192.168.111.233:1111/callbackXconf","nbxconf":6}' proxy:8888/watchtxid
response=$(watchtxidrequest "${line}")
response_to_client "${response}" ${?}