diff --git a/explorer.dragonx.is/main.js b/explorer.dragonx.is/main.js
index 6fa6cae..a6a7b63 100644
--- a/explorer.dragonx.is/main.js
+++ b/explorer.dragonx.is/main.js
@@ -77,7 +77,7 @@ function draw(data, blocks) {
// .call(d3.axisLeft(y));
}
// Get the data
-d3.json("./api/hashrate100.json", function(error, data) {
+d3.json("./api/hashrate.json", function(error, data) {
if (error) throw error;
data.blocks.splice(0, data.blocks.length - 5 );
diff --git a/explorer.dragonx.is/regen_all_blocks.sh b/explorer.dragonx.is/regen_all_blocks.sh
new file mode 100644
index 0000000..a821df6
--- /dev/null
+++ b/explorer.dragonx.is/regen_all_blocks.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+export SIONA_ROOT_DIR="siona-DragonX"
+export SIONA_DOMAIN="explorer.dragonx.is"
+export SIONA_CLI="/home/admin/HUSH/hush3/src/dragonx-cli"
+export SIONA_ACNAME="DRAGONX"
+
+DOMAIN=${SIONA_DOMAIN}
+ROOT_DIR=${SIONA_ROOT_DIR}
+DIR=/var/www/$ROOT_DIR/$DOMAIN
+
+echo "DOMAIN = $DOMAIN"
+echo "ROOT_DIR = $ROOT_DIR"
+echo "DIR = $DIR"
+
+
+cd $DIR && ./update_api.sh
+cd $DIR && ./update_explorer_data.sh
+
+# Anonset
+ cd $DIR && anonset=$(curl -s "https://$DOMAIN/api/getchaintxstats.json" | jq -r '.shielded_pool_size') && sed -i "s|.*| $anonset |g" template.html
+
+perl $DIR/bin/update_all_blocks.pl > $DIR/index-1.html
+cat $DIR/index-1.html > $DIR/index.html
diff --git a/explorer.dragonx.is/update.sh b/explorer.dragonx.is/update.sh
index 0965f31..781b845 100644
--- a/explorer.dragonx.is/update.sh
+++ b/explorer.dragonx.is/update.sh
@@ -1,4 +1,5 @@
#!/usr/bin/env bash
+set -e
DOMAIN=${SIONA_DOMAIN}
ROOT_DIR=${SIONA_ROOT_DIR}
diff --git a/explorer.dragonx.is/update_api.sh b/explorer.dragonx.is/update_api.sh
index eea5458..63eb04d 100644
--- a/explorer.dragonx.is/update_api.sh
+++ b/explorer.dragonx.is/update_api.sh
@@ -1,6 +1,8 @@
#!/usr/bin/env bash
# Copyright 2016-2022 The Hush Developers
+set -e
+
SIONA_ROOT_DIR="siona-DragonX"
SIONA_DOMAIN="explorer.dragonx.is"
SIONA_CLI="/home/admin/HUSH/hush3/src/dragonx-cli"
diff --git a/explorer.dragonx.is/update_api.sh.save b/explorer.dragonx.is/update_api.sh.save
new file mode 100644
index 0000000..cc5dca9
--- /dev/null
+++ b/explorer.dragonx.is/update_api.sh.save
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# Copyright 2016-2022 The Hush Developers
+
+DOMAIN=${SIONA_DOMAIN}
+ROOT_DIR=${SIONA_ROOT_DIR}
+CLI=${SIONA_CLI}
+# this is optional and not used yet here
+ACNAME=${SIONA_ACNAME}
+DIR=/var/www/$ROOT_DIR/$DOMAIN/api
+HIGHESTBLOCK=$(curl -s "https://$DOMAIN/api/getblockchain.json" | jq -r '.blocks')
+echo $HIGHESTBLOCK
+
+# TODO: remove IP info from getpeerinfo
+$CLI getpeerinfo > $DIR/getpeerinfo.json
+$CLI getinfo &> $DIR/getinfo.json
+$CLI getmininginfo &> $DIR/getmininginfo.json
+$CLI getblockchaininfo &> $DIR/getblockchain.json
+$CLI getchaintxstats &> $DIR/getchaintxstats.json
+$CLI gettxoutsetinfo &> $DIR/gettxoutsetinfo.json
+$CLI coinsupply &> $DIR/coinsupply.json
+$CLI getchaintips &> $DIR/getchaintips.json
+$CLI getchaintxstats &> $DIR/getchaintxstats.json
+redis-cli set anonset $($CLI z_anonsetblockdelta 1 $HIGHESTBLOCK)
+redis-cli set hashps $($CLI getnetworkhashps -1)
diff --git a/explorer.dragonx.is/update_circulation.sh b/explorer.dragonx.is/update_circulation.sh
new file mode 100644
index 0000000..94e6e7b
--- /dev/null
+++ b/explorer.dragonx.is/update_circulation.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# Copyright 2016-2022 The Hush Developers
+set -e
+
+SIONA_ROOT_DIR="siona-DragonX"
+SIONA_DOMAIN="explorer.dragonx.is"
+SIONA_CLI="/home/admin/HUSH/hush3/src/dragonx-cli"
+SIONA_ACNAME="DRAGONX"
+
+DOMAIN=${SIONA_DOMAIN}
+ROOT_DIR=${SIONA_ROOT_DIR}
+CLI=${SIONA_CLI}
+# this is optional and not used yet here
+ACNAME=${SIONA_ACNAME}
+DIR=/var/www/$ROOT_DIR/$DOMAIN/api
+
+CIRC=$(curl -s "https://explorer.dragonx.is/api/coinsupply.json" | jq -r '.total')
+SUPPLY=$(curl -s "https://explorer.dragonx.is/api/coinsupply.json" | jq -r '.supply')
+
+$CLI coinsupply &> $DIR/coinsupply.json
+
+
+ jq --arg jq_supply ${CIRC} \
+ '.circulation = $jq_supply' /var/www/siona-DragonX/explorer.dragonx.is/api/circulation.json > /var/www/siona-DragonX/explorer.dragonx.is/api/circulation.json.tmp
+ mv /var/www/siona-DragonX/explorer.dragonx.is/api/circulation.json.tmp /var/www/siona-DragonX/explorer.dragonx.is/api/circulation.json
+
+ jq --arg jq_supply ${SUPPLY} \
+ '.supply = $jq_supply' /var/www/siona-DragonX/explorer.dragonx.is/api/total_supply.json > /var/www/siona-DragonX/explorer.dragonx.is/api/total_supply.json.tmp
+ mv /var/www/siona-DragonX/explorer.dragonx.is/api/total_supply.json.tmp /var/www/siona-DragonX/explorer.dragonx.is/api/total_supply.json
\ No newline at end of file
diff --git a/explorer.dragonx.is/update_explorer_data.sh b/explorer.dragonx.is/update_explorer_data.sh
index d08271b..fcf7736 100644
--- a/explorer.dragonx.is/update_explorer_data.sh
+++ b/explorer.dragonx.is/update_explorer_data.sh
@@ -1,5 +1,7 @@
#!/usr/bin/env bash
+set -e
+
cli=${SIONA_CLI}
DOMAIN=${SIONA_DOMAIN}
ROOT_DIR=${SIONA_ROOT_DIR}
diff --git a/explorer.dragonx.is/update_hashrate.sh b/explorer.dragonx.is/update_hashrate.sh
index 0584059..9e826e8 100644
--- a/explorer.dragonx.is/update_hashrate.sh
+++ b/explorer.dragonx.is/update_hashrate.sh
@@ -1,6 +1,8 @@
#!/usr/bin/env bash
# Copyright 2016-2022 The Hush Developers
+set -e
+
SIONA_ROOT_DIR="siona-DragonX"
SIONA_DOMAIN="explorer.dragonx.is"
SIONA_CLI="/home/admin/HUSH/hush3/src/dragonx-cli"
@@ -18,14 +20,6 @@ $CLI getblockchaininfo &> $DIR/getblockchain.json
HIGHESTBLOCK=$(curl -s "https://$DOMAIN/api/getblockchain.json" | jq -r '.blocks')
CURBLOCKCOMPARE=$(curl -s "https://$DOMAIN/api/blockinfo.json" | jq -r '.height')
-#check if still on the same block so there's no duplicate data
-if (( $HIGHESTBLOCK == $CURBLOCKCOMPARE)); then
-
- echo "getblockchain.json blocks" $HIGHESTBLOCK
- echo "blockinfo.json height" $CURBLOCKCOMPARE
- echo "no new block, skipping..."
-
-else
echo "getblockchain.json blocks" $HIGHESTBLOCK
echo "blockinfo.json height" $CURBLOCKCOMPARE
@@ -43,7 +37,6 @@ else
CURHASHPS=$(curl -s "https://$DOMAIN/api/hashps.json")
echo "CURHASHPS" $CURHASHPS
- #recording every block for historical data purposes
jq --arg jq_block_height ${CURBLOCKHEIGHT} \
--arg jq_block_diff ${CURBLOCKDIFF} \
--arg jq_block_time ${CURBLOCKTIME} \
@@ -56,24 +49,6 @@ else
}]' /var/www/siona-DragonX/explorer.dragonx.is/api/hashrate.json > /var/www/siona-DragonX/explorer.dragonx.is/api/hashrate.json.tmp
mv /var/www/siona-DragonX/explorer.dragonx.is/api/hashrate.json.tmp /var/www/siona-DragonX/explorer.dragonx.is/api/hashrate.json
- #only record every 100th block for rendering the graph so I don't have to loop through every entry to format for d3.js
- if (($HIGHESTBLOCK % 100 == 0)); then
- jq --arg jq_block_height ${CURBLOCKHEIGHT} \
- --arg jq_block_diff ${CURBLOCKDIFF} \
- --arg jq_block_time ${CURBLOCKTIME} \
- --arg jq_block_hashps ${CURHASHPS} \
- '.blocks += [{
- "Block": $jq_block_height,
- "Time": $jq_block_time,
- "Diff": $jq_block_diff,
- "Hashrate": $jq_block_hashps
- }]' /var/www/siona-DragonX/explorer.dragonx.is/api/hashrate.json > /var/www/siona-DragonX/explorer.dragonx.is/api/hashrate100.json.tmp
- mv /var/www/siona-DragonX/explorer.dragonx.is/api/hashrate100.json.tmp /var/www/siona-DragonX/explorer.dragonx.is/api/hashrate100.json
-
- else
- echo "not 100th block"
- fi
-fi
diff --git a/explorer.dragonx.is/update_hashrate_old.sh b/explorer.dragonx.is/update_hashrate_old.sh
new file mode 100644
index 0000000..7de7317
--- /dev/null
+++ b/explorer.dragonx.is/update_hashrate_old.sh
@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+# Copyright 2016-2022 The Hush Developers
+
+SIONA_ROOT_DIR="siona-DragonX"
+SIONA_DOMAIN="explorer.dragonx.is"
+SIONA_CLI="/home/admin/HUSH/hush3/src/dragonx-cli"
+SIONA_ACNAME="DRAGONX"
+
+DOMAIN=${SIONA_DOMAIN}
+ROOT_DIR=${SIONA_ROOT_DIR}
+CLI=${SIONA_CLI}
+# this is optional and not used yet here
+ACNAME=${SIONA_ACNAME}
+DIR=/var/www/$ROOT_DIR/$DOMAIN/api
+
+$CLI getblockchaininfo &> $DIR/getblockchain.json
+
+HIGHESTBLOCK=$(curl -s "https://$DOMAIN/api/getblockchain.json" | jq -r '.blocks')
+CURBLOCKCOMPARE=$(curl -s "https://$DOMAIN/api/blockinfo.json" | jq -r '.height')
+
+if (( $HIGHESTBLOCK == $CURBLOCKCOMPARE)); then
+
+ echo "getblockchain.json blocks" $HIGHESTBLOCK
+ echo "blockinfo.json height" $CURBLOCKCOMPARE
+ echo "no new block, skipping..."
+
+else
+
+ echo "getblockchain.json blocks" $HIGHESTBLOCK
+ echo "blockinfo.json height" $CURBLOCKCOMPARE
+ echo "new block, adding data.."
+
+ $CLI getnetworkhashps -1 &> $DIR/hashps.json
+ $CLI getblock $HIGHESTBLOCK 1 &> $DIR/blockinfo.json
+
+ CURBLOCKHEIGHT=$(curl -s "https://$DOMAIN/api/blockinfo.json" | jq -r '.height')
+ echo "CURBLOCKHEIGHT" $CURBLOCKHEIGHT
+ CURBLOCKDIFF=$(curl -s "https://$DOMAIN/api/blockinfo.json" | jq -r '.difficulty')
+ echo "CURBLOCKDIFF" $CURBLOCKDIFF
+ CURBLOCKTIME=$(curl -s "https://$DOMAIN/api/blockinfo.json" | jq -r '.time')
+ echo "CURBLOCKTIME" $CURBLOCKTIME
+ CURHASHPS=$(curl -s "https://$DOMAIN/api/hashps.json")
+ echo "CURHASHPS" $CURHASHPS
+
+ #recording every block for historical data purposes
+ jq --arg jq_block_height ${CURBLOCKHEIGHT} \
+ --arg jq_block_diff ${CURBLOCKDIFF} \
+ --arg jq_block_time ${CURBLOCKTIME} \
+ --arg jq_block_hashps ${CURHASHPS} \
+ '.blocks += [{
+ "Block": $jq_block_height,
+ "Time": $jq_block_time,
+ "Diff": $jq_block_diff,
+ "Hashrate": $jq_block_hashps
+ }]' /var/www/siona-DragonX/explorer.dragonx.is/api/hashrate.json > /var/www/siona-DragonX/explorer.dragonx.is/api/hashrate.json.tmp
+ mv /var/www/siona-DragonX/explorer.dragonx.is/api/hashrate.json.tmp /var/www/siona-DragonX/explorer.dragonx.is/api/hashrate.json
+
+ #only record every 100th block for rendering the graph so I don't have to loop through every entry to format for d3.js
+ if (($HIGHESTBLOCK % 100 == 0)); then
+ jq --arg jq_block_height ${CURBLOCKHEIGHT} \
+ --arg jq_block_diff ${CURBLOCKDIFF} \
+ --arg jq_block_time ${CURBLOCKTIME} \
+ --arg jq_block_hashps ${CURHASHPS} \
+ '.blocks += [{
+ "Block": $jq_block_height,
+ "Time": $jq_block_time,
+ "Diff": $jq_block_diff,
+ "Hashrate": $jq_block_hashps
+ }]' /var/www/siona-DragonX/explorer.dragonx.is/api/hashrate.json > /var/www/siona-DragonX/explorer.dragonx.is/api/hashrate100.json.tmp
+ mv /var/www/siona-DragonX/explorer.dragonx.is/api/hashrate100.json.tmp /var/www/siona-DragonX/explorer.dragonx.is/api/hashrate100.json
+
+ else
+ echo "not 100th block"
+ fi
+
+fi
+
+
diff --git a/explorer.dragonx.is/update_price.sh b/explorer.dragonx.is/update_price.sh
index 94c1c1d..6ae83cf 100644
--- a/explorer.dragonx.is/update_price.sh
+++ b/explorer.dragonx.is/update_price.sh
@@ -1,6 +1,8 @@
#!/usr/bin/env bash
# Copyright 2016-2022 The Hush Developers
+set -e
+
PRICE=$(curl -s "https://api.coinpaprika.com/v1/coins/drgx-dragonx/ohlcv/latest" | jq -r '.[].open')
PRICEROUNDED=`printf "%.2f" $PRICE`