aljaz/cyphernode
1
0
Fork 0
mirror of https://github.com/aljazceru/cyphernode.git synced 2025-12-18 13:14:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed watches and callbacks when callback urls are null

Browse Source
This commit is contained in:
kexkey
2020-01-24 12:33:50 -05:00
parent d5b08e15a9
commit 56f3857dfe
2 changed files with 27 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proxy_docker/app/script/getactivewatches.sh
View File

@@ -67,7 +67,7 @@ getactivewatches() {
local watches local watches
# Let's build the string directly with sqlite instead of manipulating multiple strings afterwards, it's faster. # Let's build the string directly with sqlite instead of manipulating multiple strings afterwards, it's faster.
# {"id":"${id}","address":"${address}","imported":"${imported}","unconfirmedCallbackURL":"${cb0conf_url}","confirmedCallbackURL":"${cb1conf_url}","watching_since":"${timestamp}"} # {"id":"${id}","address":"${address}","imported":"${imported}","unconfirmedCallbackURL":"${cb0conf_url}","confirmedCallbackURL":"${cb1conf_url}","watching_since":"${timestamp}"}
watches=$(sql "SELECT '{\"id\":\"' || id || '\",\"address\":\"' || address || '\",\"imported\":\"' || imported || '\",\"unconfirmedCallbackURL\":\"' || callback0conf || '\",\"confirmedCallbackURL\":\"' || callback1conf || '\",\"watching_since\":\"' || inserted_ts || '\"}' FROM watching WHERE watching AND NOT calledback1conf") watches=$(sql "SELECT '{\"id\":' || id || ',\"address\":\"' || address || '\",\"imported\":' || imported || ',\"unconfirmedCallbackURL\":\"' || COALESCE(callback0conf, '') || '\",\"confirmedCallbackURL\":\"' || COALESCE(callback1conf, '') || '\",\"watching_since\":\"' || inserted_ts || '\"}' FROM watching WHERE watching AND NOT calledback1conf")
returncode=$? returncode=$?
trace_rc ${returncode} trace_rc ${returncode}
@@ -130,7 +130,7 @@ getactivewatchesxpub() {
# Let's build the string directly with sqlite instead of manipulating multiple strings afterwards, it's faster. # Let's build the string directly with sqlite instead of manipulating multiple strings afterwards, it's faster.
# {"id":"${id}","address":"${address}","imported":"${imported}","unconfirmedCallbackURL":"${cb0conf_url}","confirmedCallbackURL":"${cb1conf_url}","watching_since":"${timestamp}","derivation_path":"${derivation_path}","pub32_index":"${pub32_index}"} # {"id":"${id}","address":"${address}","imported":"${imported}","unconfirmedCallbackURL":"${cb0conf_url}","confirmedCallbackURL":"${cb1conf_url}","watching_since":"${timestamp}","derivation_path":"${derivation_path}","pub32_index":"${pub32_index}"}
watches=$(sql "SELECT '{\"id\":\"' || w.id || '\",\"address\":\"' || address || '\",\"imported\":\"' || imported || '\",\"unconfirmedCallbackURL\":\"' || w.callback0conf || '\",\"confirmedCallbackURL\":\"' || w.callback1conf || '\",\"watching_since\":\"' || w.inserted_ts || '\",\"derivation_path\":\"' || derivation_path || '\",\"pub32_index\":\"' || pub32_index || '\"}' FROM watching w, watching_by_pub32 w32 WHERE watching_by_pub32_id = w32.id AND ${where} = \"${value}\" AND w.watching AND NOT calledback1conf") watches=$(sql "SELECT '{\"id\":' || w.id || ',\"address\":\"' || address || '\",\"imported\":' || imported || ',\"unconfirmedCallbackURL\":\"' || COALESCE(w.callback0conf, '') || '\",\"confirmedCallbackURL\":\"' || COALESCE(w.callback1conf, '') || '\",\"watching_since\":\"' || w.inserted_ts || '\",\"derivation_path\":\"' || derivation_path || '\",\"pub32_index\":' || pub32_index || '}' FROM watching w, watching_by_pub32 w32 WHERE watching_by_pub32_id = w32.id AND ${where} = \"${value}\" AND w.watching AND NOT calledback1conf")
returncode=$? returncode=$?
trace_rc ${returncode} trace_rc ${returncode}
@@ -162,7 +162,7 @@ getactivexpubwatches() {
local watches local watches
# Let's build the string directly with sqlite instead of manipulating multiple strings afterwards, it's faster. # Let's build the string directly with sqlite instead of manipulating multiple strings afterwards, it's faster.
# {"id":"${id}","pub32":"${pub32}","label":"${label}","derivation_path":"${derivation_path}","last_imported_n":${last_imported_n},"unconfirmedCallbackURL":"${cb0conf_url}","confirmedCallbackURL":"${cb1conf_url}","watching_since":"${timestamp}"} # {"id":"${id}","pub32":"${pub32}","label":"${label}","derivation_path":"${derivation_path}","last_imported_n":${last_imported_n},"unconfirmedCallbackURL":"${cb0conf_url}","confirmedCallbackURL":"${cb1conf_url}","watching_since":"${timestamp}"}
watches=$(sql "SELECT '{\"id\":\"' || id || '\",\"pub32\":\"' || pub32 || '\",\"label\":\"' || label || '\",\"derivation_path\":\"' || derivation_path || '\",\"last_imported_n\":' || last_imported_n || ',\"unconfirmedCallbackURL\":\"' || callback0conf || '\",\"confirmedCallbackURL\":\"' || callback1conf || '\",\"watching_since\":\"' || inserted_ts || '\"}' FROM watching_by_pub32 WHERE watching") watches=$(sql "SELECT '{\"id\":' || id || ',\"pub32\":\"' || pub32 || '\",\"label\":\"' || label || '\",\"derivation_path\":\"' || derivation_path || '\",\"last_imported_n\":' || last_imported_n || ',\"unconfirmedCallbackURL\":\"' || COALESCE(callback0conf, '') || '\",\"confirmedCallbackURL\":\"' || COALESCE(callback1conf, '') || '\",\"watching_since\":\"' || inserted_ts || '\"}' FROM watching_by_pub32 WHERE watching")
returncode=$? returncode=$?
trace_rc ${returncode} trace_rc ${returncode}

67
proxy_docker/app/script/watchrequest.sh
View File

@@ -11,35 +11,17 @@ watchrequest() {
local returncode local returncode
local request=${1} local request=${1}
local address=$(echo "${request}" | jq -er ".address") local address=$(echo "${request}" | jq -r ".address")
local cb0conf_url local cb0conf_url=$(echo "${request}" | jq ".unconfirmedCallbackURL")
cb0conf_url=$(echo "${request}" | jq -er ".unconfirmedCallbackURL") local cb1conf_url=$(echo "${request}" | jq ".confirmedCallbackURL")
if [ "$?" -ne "0" ]; then local event_message=$(echo "${request}" | jq ".eventMessage")
# unconfirmedCallbackURL tag null, so there's no unconfirmedCallbackURL
trace "[watchrequest] unconfirmedCallbackURL="
unconfirmedCallbackURL=
fi
local cb1conf_url
cb1conf_url=$(echo "${request}" | jq -er ".confirmedCallbackURL")
if [ "$?" -ne "0" ]; then
# confirmedCallbackURL tag null, so there's no confirmedCallbackURL
trace "[watchrequest] confirmedCallbackURL="
confirmedCallbackURL=
fi
local event_message
event_message=$(echo "${request}" | jq -er ".eventMessage")
if [ "$?" -ne "0" ]; then
# event_message tag null, so there's no event_message
trace "[watchrequest] event_message="
event_message=
fi
local imported local imported
local inserted local inserted
local id_inserted local id_inserted
local result local result
trace "[watchrequest] Watch request on address (${address}), cb 0-conf (${cb0conf_url}), cb 1-conf (${cb1conf_url}) with event_message=${event_message}" trace "[watchrequest] Watch request on address (\"${address}\"), cb 0-conf (${cb0conf_url}), cb 1-conf (${cb1conf_url}) with event_message=${event_message}"
result=$(importaddress_rpc "${address}") result=$(importaddress_rpc ${address})
returncode=$? returncode=$?
trace_rc ${returncode} trace_rc ${returncode}
if [ "${returncode}" -eq 0 ]; then if [ "${returncode}" -eq 0 ]; then
@@ -48,7 +30,7 @@ watchrequest() {
imported=0 imported=0
fi fi
sql "INSERT OR REPLACE INTO watching (address, watching, callback0conf, callback1conf, imported, event_message) VALUES (\"${address}\", 1, \"${cb0conf_url}\", \"${cb1conf_url}\", ${imported}, '${event_message}')" sql "INSERT OR REPLACE INTO watching (address, watching, callback0conf, callback1conf, imported, event_message) VALUES (\"${address}\", 1, ${cb0conf_url}, ${cb1conf_url}, ${imported}, ${event_message})"
returncode=$? returncode=$?
trace_rc ${returncode} trace_rc ${returncode}
if [ "${returncode}" -eq 0 ]; then if [ "${returncode}" -eq 0 ]; then
@@ -77,8 +59,8 @@ watchrequest() {
\"imported\":\"${imported}\", \"imported\":\"${imported}\",
\"inserted\":\"${inserted}\", \"inserted\":\"${inserted}\",
\"address\":\"${address}\", \"address\":\"${address}\",
\"unconfirmedCallbackURL\":\"${cb0conf_url}\", \"unconfirmedCallbackURL\":${cb0conf_url},
\"confirmedCallbackURL\":\"${cb1conf_url}\", \"confirmedCallbackURL\":${cb1conf_url},
\"estimatesmartfee2blocks\":\"${fees2blocks}\", \"estimatesmartfee2blocks\":\"${fees2blocks}\",
\"estimatesmartfee6blocks\":\"${fees6blocks}\", \"estimatesmartfee6blocks\":\"${fees6blocks}\",
\"estimatesmartfee36blocks\":\"${fees36blocks}\", \"estimatesmartfee36blocks\":\"${fees36blocks}\",
@@ -104,9 +86,8 @@ watchpub32request() {
trace "[watchpub32request] path=${path}" trace "[watchpub32request] path=${path}"
local nstart=$(echo "${request}" | jq ".nstart") local nstart=$(echo "${request}" | jq ".nstart")
trace "[watchpub32request] nstart=${nstart}" trace "[watchpub32request] nstart=${nstart}"
local cb0conf_url=$(echo "${request}" | jq -r ".unconfirmedCallbackURL") local cb0conf_url=$(echo "${request}" | jq ".unconfirmedCallbackURL")
trace "[watchpub32request] cb0conf_url=${cb0conf_url}" local cb1conf_url=$(echo "${request}" | jq ".confirmedCallbackURL")
local cb1conf_url=$(echo "${request}" | jq -r ".confirmedCallbackURL")
trace "[watchpub32request] cb1conf_url=${cb1conf_url}" trace "[watchpub32request] cb1conf_url=${cb1conf_url}"
watchpub32 ${label} ${pub32} ${path} ${nstart} ${cb0conf_url} ${cb1conf_url} watchpub32 ${label} ${pub32} ${path} ${nstart} ${cb0conf_url} ${cb1conf_url}
@@ -178,7 +159,7 @@ watchpub32() {
sql "UPDATE watching_by_pub32 set last_imported_n=${upto_n} WHERE pub32=\"${pub32}\"" sql "UPDATE watching_by_pub32 set last_imported_n=${upto_n} WHERE pub32=\"${pub32}\""
else else
# Insert in our DB... # Insert in our DB...
sql "INSERT OR REPLACE INTO watching_by_pub32 (pub32, label, derivation_path, watching, callback0conf, callback1conf, last_imported_n) VALUES (\"${pub32}\", \"${label}\", \"${path}\", 1, \"${cb0conf_url}\", \"${cb1conf_url}\", ${last_n})" sql "INSERT OR REPLACE INTO watching_by_pub32 (pub32, label, derivation_path, watching, callback0conf, callback1conf, last_imported_n) VALUES (\"${pub32}\", \"${label}\", \"${path}\", 1, ${cb0conf_url}, ${cb1conf_url}, ${last_n})"
fi fi
returncode=$? returncode=$?
trace_rc ${returncode} trace_rc ${returncode}
@@ -188,7 +169,7 @@ watchpub32() {
trace "[watchpub32] id_inserted: ${id_inserted}" trace "[watchpub32] id_inserted: ${id_inserted}"
addresses=$(echo ${addresses} | jq ".addresses[].address") addresses=$(echo ${addresses} | jq ".addresses[].address")
insert_watches "${addresses}" "${cb0conf_url}" "${cb1conf_url}" ${id_inserted} ${nstart} insert_watches "${addresses}" ${cb0conf_url} ${cb1conf_url} ${id_inserted} ${nstart}
else else
error_msg="Can't insert xpub watcher in DB" error_msg="Can't insert xpub watcher in DB"
fi fi
@@ -209,8 +190,8 @@ watchpub32() {
\"label\":\"${label}\", \"label\":\"${label}\",
\"path\":\"${path}\", \"path\":\"${path}\",
\"nstart\":\"${nstart}\", \"nstart\":\"${nstart}\",
\"unconfirmedCallbackURL\":\"${cb0conf_url}\", \"unconfirmedCallbackURL\":${cb0conf_url},
\"confirmedCallbackURL\":\"${cb1conf_url}\"}" \"confirmedCallbackURL\":${cb1conf_url}}"
returncode=0 returncode=0
else else
@@ -220,8 +201,8 @@ watchpub32() {
\"label\":\"${label}\", \"label\":\"${label}\",
\"path\":\"${path}\", \"path\":\"${path}\",
\"nstart\":\"${nstart}\", \"nstart\":\"${nstart}\",
\"unconfirmedCallbackURL\":\"${cb0conf_url}\", \"unconfirmedCallbackURL\":${cb0conf_url},
\"confirmedCallbackURL\":\"${cb1conf_url}\"}" \"confirmedCallbackURL\":${cb1conf_url}}"
returncode=1 returncode=1
fi fi
@@ -249,7 +230,7 @@ insert_watches() {
if [ -n "${inserted_values}" ]; then if [ -n "${inserted_values}" ]; then
inserted_values="${inserted_values}," inserted_values="${inserted_values},"
fi fi
inserted_values="${inserted_values}(${address}, 1, \"${callback0conf}\", \"${callback1conf}\", 1" inserted_values="${inserted_values}(${address}, 1, ${callback0conf}, ${callback1conf}, 1"
if [ -n "${xpub_id}" ]; then if [ -n "${xpub_id}" ]; then
inserted_values="${inserted_values}, ${xpub_id}, ${nstart}" inserted_values="${inserted_values}, ${xpub_id}, ${nstart}"
nstart=$((${nstart} + 1)) nstart=$((${nstart} + 1))
@@ -301,7 +282,7 @@ extend_watchers() {
# we want to extend the watched addresses to 166 if our gap is 100 (default). # we want to extend the watched addresses to 166 if our gap is 100 (default).
trace "[extend_watchers] We have addresses to add to watchers!" trace "[extend_watchers] We have addresses to add to watchers!"
watchpub32 ${label} ${pub32} ${derivation_path} $((${last_imported_n} + 1)) ${callback0conf} ${callback1conf} ${upgrade_to_n} > /dev/null watchpub32 ${label} ${pub32} ${derivation_path} $((${last_imported_n} + 1)) "${callback0conf}" "${callback1conf}" ${upgrade_to_n} > /dev/null
returncode=$? returncode=$?
trace_rc ${returncode} trace_rc ${returncode}
else else
@@ -319,9 +300,9 @@ watchtxidrequest() {
trace "[watchtxidrequest] request=${request}" trace "[watchtxidrequest] request=${request}"
local txid=$(echo "${request}" | jq -r ".txid") local txid=$(echo "${request}" | jq -r ".txid")
trace "[watchtxidrequest] txid=${txid}" trace "[watchtxidrequest] txid=${txid}"
local cb1conf_url=$(echo "${request}" | jq -r ".confirmedCallbackURL") local cb1conf_url=$(echo "${request}" | jq ".confirmedCallbackURL")
trace "[watchtxidrequest] cb1conf_url=${cb1conf_url}" trace "[watchtxidrequest] cb1conf_url=${cb1conf_url}"
local cbxconf_url=$(echo "${request}" | jq -r ".xconfCallbackURL") local cbxconf_url=$(echo "${request}" | jq ".xconfCallbackURL")
trace "[watchtxidrequest] cbxconf_url=${cbxconf_url}" trace "[watchtxidrequest] cbxconf_url=${cbxconf_url}"
local nbxconf=$(echo "${request}" | jq ".nbxconf") local nbxconf=$(echo "${request}" | jq ".nbxconf")
trace "[watchtxidrequest] nbxconf=${nbxconf}" trace "[watchtxidrequest] nbxconf=${nbxconf}"
@@ -330,7 +311,7 @@ watchtxidrequest() {
local result local result
trace "[watchtxidrequest] Watch request on txid (${txid}), cb 1-conf (${cb1conf_url}) and cb x-conf (${cbxconf_url}) on ${nbxconf} confirmations." trace "[watchtxidrequest] Watch request on txid (${txid}), cb 1-conf (${cb1conf_url}) and cb x-conf (${cbxconf_url}) on ${nbxconf} confirmations."
sql "INSERT OR IGNORE INTO watching_by_txid (txid, watching, callback1conf, callbackxconf, nbxconf) VALUES (\"${txid}\", 1, \"${cb1conf_url}\", \"${cbxconf_url}\", ${nbxconf})" sql "INSERT OR IGNORE INTO watching_by_txid (txid, watching, callback1conf, callbackxconf, nbxconf) VALUES (\"${txid}\", 1, ${cb1conf_url}, ${cbxconf_url}, ${nbxconf})"
returncode=$? returncode=$?
trace_rc ${returncode} trace_rc ${returncode}
if [ "${returncode}" -eq 0 ]; then if [ "${returncode}" -eq 0 ]; then
@@ -345,8 +326,8 @@ watchtxidrequest() {
\"event\":\"watchtxid\", \"event\":\"watchtxid\",
\"inserted\":\"${inserted}\", \"inserted\":\"${inserted}\",
\"txid\":\"${txid}\", \"txid\":\"${txid}\",
\"confirmedCallbackURL\":\"${cb1conf_url}\", \"confirmedCallbackURL\":${cb1conf_url,
\"xconfCallbackURL\":\"${cbxconf_url}\", \"xconfCallbackURL\":${cbxconf_url},
\"nbxconf\":${nbxconf}}" \"nbxconf\":${nbxconf}}"
trace "[watchtxidrequest] responding=${data}" trace "[watchtxidrequest] responding=${data}"