localnet/darkfid-single-node: Clean up shell scripts.

contrib/localnet/darkfid-single-node/run-dao-test.sh

@@ -1,9 +1,13 @@
-#!/bin/sh -x
+#!/bin/sh
 set -e
+set -x
 
-# First run the consensus node:
+# Path to `drk` binary
+DRK="../../../drk"
+
+# First run the consensus node and the faucet:
 #
-#   ./tmux_sessions.sh now && cd ../../../ && make darkfid && cd -
+#   ./tmux_sessions.sh now && cd ../../../ && make darkfid faucetd && cd -
 #   ./clean.sh
 #   ./tmux_sessions.sh -v
 #   ./sync-wallet.sh
@@ -15,40 +19,39 @@ set -e
 # Finally you can run this script
 
 mint_tokens() {
-    drk token generate-mint
-    drk token generate-mint
-
-    TOKEN_ID1=$(drk token list 2>/dev/null | awk 'NR == 3 {print $1}')
-    TOKEN_ID2=$(drk token list 2>/dev/null | awk 'NR == 4 {print $1}')
+    $DRK token generate-mint
+    $DRK token generate-mint
 
-    drk alias add WCKD "$TOKEN_ID1"
-    drk alias add MLDY "$TOKEN_ID2"
+    TOKEN_ID1="$($DRK token list 2>/dev/null | awk 'NR == 3 {print $1}')"
+    TOKEN_ID2="$($DRK token list 2>/dev/null | awk 'NR == 4 {print $1}')"
 
-    ADDR=$(drk wallet --address)
+    $DRK alias add WCKD "$TOKEN_ID1"
+    $DRK alias add MLDY "$TOKEN_ID2"
 
-    drk token mint WCKD 42 "$ADDR" > /tmp/mint-wkcd.tx
-    drk token mint MLDY 20 "$ADDR" > /tmp/mint-mldy.tx
+    ADDR="$($DRK wallet --address)"
 
-    drk broadcast < /tmp/mint-wkcd.tx
-    drk broadcast < /tmp/mint-mldy.tx
+    $DRK token mint WCKD 42 "$ADDR" | tee /tmp/mint-wkcd.tx | $DRK broadcast
+    $DRK token mint MLDY 20 "$ADDR" | tee /tmp/mint-mldy.tx | $DRK broadcast
 
-    drk token list
+    $DRK token list
 }
 
 token_balance() {
-    BALANCE=$(drk wallet --balance 2>/dev/null)
+    BALANCE="$($DRK wallet --balance 2>/dev/null)"
+
     # No tokens received at all yet
-    echo "$BALANCE" | rg "No unspent balances found" > /dev/null
-    if [ "$?" = 0 ]; then
+    if echo "$BALANCE" | grep -q "No unspent balances found"; then
         echo 0
         return
     fi
-    BALANCE=$(echo "$BALANCE" | rg "$1")
+
+    BALANCE="$(echo "$BALANCE" | grep -q "$1")"
     # Not received yet so no entry
-    if [ "$?" = 1 ]; then
+    if [ $? = 1 ]; then
         echo 0
         return
     fi
+
     # OK we have the token, show the actual balance
     echo "$BALANCE" | awk '{print $5}'
 }
@@ -60,45 +63,45 @@ wait_tokens() {
 }
 
 mint_dao() {
-    drk dao create 20 10 0.67 MLDY > /tmp/dao.dat
-    drk dao import MiladyMakerDAO < /tmp/dao.dat
-    drk dao list
-    drk dao list MiladyMakerDAO
+    $DRK dao create 20 10 0.67 MLDY > /tmp/dao.dat
+    $DRK dao import MiladyMakerDAO < /tmp/dao.dat
+    $DRK dao list
+    $DRK dao list MiladyMakerDAO
 
-    drk dao mint MiladyMakerDAO > /tmp/dao-mint.tx
-    drk broadcast < /tmp/dao-mint.tx
+    $DRK dao mint MiladyMakerDAO | tee /tmp/dao-mint.tx | $DRK broadcast
 }
 
 wait_dao_mint() {
-    while [ "$(drk dao list MiladyMakerDAO | rg "Tx hash" | awk '{print $3}')" = None ]; do
+    while [ "$($DRK dao list MiladyMakerDAO | grep '^Tx hash: ' | awk '{print $3}')" = None ]; do
         sleep 1
     done
 }
 
 fill_treasury() {
-    PUBKEY=$(drk dao list 1 | awk 'NR==9 {print $3}')
-    BULLA=$(drk dao list 1 | awk 'NR==4 {print $2}')
-    drk transfer 20 WCKD "$PUBKEY" --dao "$BULLA" > /tmp/xfer.tx
-    drk broadcast < /tmp/xfer.tx
+    PUBKEY="$($DRK dao list 1 | grep '^Public key: ' | cut -d ' ' -f3)"
+    BULLA="$($DRK dao list 1 | grep '^Bulla: ' | cut -d' ' -f2)"
+    $DRK transfer 20 WCKD "$PUBKEY" --dao "$BULLA" | tee /tmp/xfer.tx | $DRK broadcast
 }
 
 dao_balance() {
-    BALANCE=$(drk dao balance 1 2>/dev/null)
+    BALANCE=$($DRK dao balance 1 2>/dev/null)
     # No tokens received at all yet
-    echo "$BALANCE" | rg "No unspent balances found" > /dev/null
-    if [ "$?" = 0 ]; then
+    if echo "$BALANCE" | grep -q "No unspent balances found"; then
         echo 0
         return
     fi
-    BALANCE=$(echo "$BALANCE" | rg "$1")
+
+    BALANCE=$(echo "$BALANCE" | grep "$1")
     # Not received yet so no entry
-    if [ "$?" = 1 ]; then
+    if [ $? = 1 ]; then
         echo 0
         return
     fi
+
     # OK we have the token, show the actual balance
     echo "$BALANCE" | awk '{print $5}'
 }
+
 wait_dao_treasury() {
     while [ "$(dao_balance WCKD)" = 0 ]; do
         sleep 1
@@ -106,20 +109,21 @@ wait_dao_treasury() {
 }
 
 propose() {
-    MY_ADDR=$(drk wallet --address)
-    drk dao balance MiladyMakerDAO
-    drk dao propose MiladyMakerDAO "$MY_ADDR" 0.1 WCKD > /tmp/propose.tx
-    drk broadcast < /tmp/propose.tx
+    MY_ADDR=$($DRK wallet --address)
+    $DRK dao balance MiladyMakerDAO
+    $DRK dao propose MiladyMakerDAO "$MY_ADDR" 0.1 WCKD > /tmp/propose.tx
+    $DRK broadcast < /tmp/propose.tx
 }
 
 proposal_status() {
-    PROPOSALS_LEN=$(drk dao proposals MiladyMakerDAO | wc -l)
+    PROPOSALS_LEN=$($DRK dao proposals MiladyMakerDAO | wc -l)
     if [ "$PROPOSALS_LEN" = 0 ]; then
         echo 0
     else
         echo 1
     fi
 }
+
 wait_proposal() {
     while [ "$(proposal_status)" = 0 ]; do
         sleep 1
@@ -128,14 +132,16 @@ wait_proposal() {
 
 vote() {
     PROPOSAL_ID=1
-    drk dao vote MiladyMakerDAO "$PROPOSAL_ID" 1 20 > /tmp/dao-vote.tx
-    drk broadcast < /tmp/dao-vote.tx
+    $DRK dao vote MiladyMakerDAO "$PROPOSAL_ID" 1 20 > /tmp/dao-vote.tx
+    $DRK broadcast < /tmp/dao-vote.tx
 }
 
 vote_status() {
-    drk dao proposal MiladyMakerDAO 1 | rg yes > /dev/null
+	PROPOSAL_ID=1
+    $DRK dao proposal MiladyMakerDAO "$PROPOSAL_ID" | grep -q yes
     echo $?
 }
+
 wait_vote() {
     while [ "$(vote_status)" != 0 ]; do
         sleep 1
@@ -144,11 +150,11 @@ wait_vote() {
 
 do_exec() {
     PROPOSAL_ID=1
-    drk dao exec MiladyMakerDAO "$PROPOSAL_ID" > /tmp/dao-exec.tx
-    drk broadcast < /tmp/dao-exec.tx
+    $DRK dao exec MiladyMakerDAO "$PROPOSAL_ID" > /tmp/dao-exec.tx
+    $DRK broadcast < /tmp/dao-exec.tx
 }
 
-drk wallet --keygen
+$DRK wallet --keygen
 mint_tokens
 wait_tokens
 mint_dao
@@ -160,4 +166,3 @@ wait_proposal
 vote
 wait_vote
 do_exec
-

contrib/localnet/darkfid-single-node/sync-wallet.sh

@@ -1,14 +1,18 @@
-#!/bin/bash
+#!/bin/sh
+set -e
+set -x
+
+# Path to `drk` binary
+DRK="../../../drk"
 
 while true; do
-    drk ping 2> /dev/null
-    if [ $? == 0 ]; then
+    if $DRK ping 2> /dev/null; then
         break
     fi
     sleep 1
 done
 
-drk wallet --initialize
-drk scan
-drk subscribe blocks
+$DRK wallet --initialize
+$DRK scan
+$DRK subscribe blocks