miner updates

devenv/miner/docker/entrypoint.sh

@@ -12,13 +12,16 @@ curl --user devnet:devnet --data-binary '{"jsonrpc": "1.0", "id": "curltest", "m
 echo "devnet bitcoin wallet created"
 # Import miner address
 curl --user devnet:devnet --data-binary '{"jsonrpc": "1.0", "id": "curltest", "method": "importaddress", "params": ["n3GRiDLKWuKLCw1DZmV75W1mE35qmW2tQm"]}' -H 'content-type: text/plain;' http://bitcoin:18443/
-# Mine the first N blocks
+# Mine the first N blocks to the stacks miner wallet address
 curl --user devnet:devnet --data-binary '{"jsonrpc": "1.0", "id": "curltest", "method": "generatetoaddress", "params": ['''${INIT_BTC_BLOCKS}''', "n3GRiDLKWuKLCw1DZmV75W1mE35qmW2tQm"]}' -H 'content-type: text/plain;' http://bitcoin:18443/
-echo "mined initial blocks"
-# Mine a single block every 10 seconds
+echo "mined initial blocks to stacks miner wallet"
+# Mine the first N blocks to the stacks deployer wallet address
+curl --user devnet:devnet --data-binary '{"jsonrpc": "1.0", "id": "curltest", "method": "generatetoaddress", "params": ['''${INIT_BTC_BLOCKS}''', "bcrt1q3zl64vadtuh3vnsuhdgv6pm93n82ye8q6cr4ch"]}' -H 'content-type: text/plain;' http://bitcoin:18443/
+echo "mined initial blocks to stacks deployer wallet"
+# Mine a single block every 10 seconds to the stacks deployer wallet address
 while true
 do
-	curl --user devnet:devnet --data-binary '{"jsonrpc": "1.0", "id": "curltest", "method": "generatetoaddress", "params": [1, "n3GRiDLKWuKLCw1DZmV75W1mE35qmW2tQm"]}' -H 'content-type: text/plain;' http://bitcoin:18443/
+	curl --user devnet:devnet --data-binary '{"jsonrpc": "1.0", "id": "curltest", "method": "generatetoaddress", "params": [1, "bcrt1q3zl64vadtuh3vnsuhdgv6pm93n82ye8q6cr4ch"]}' -H 'content-type: text/plain;' http://bitcoin:18443/
 	echo "mined a single block"
 	sleep ${BTC_BLOCK_GEN_TIME}
 done

devenv/sbtc/bin/sbtc

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-docker exec -it sbtc sbtc $@
+docker exec -it sbtc sbtc "$@"

devenv/utils/deposit.sh

@@ -13,13 +13,15 @@ stacks_address=$(source $dir/get_credentials.sh | jq -r '.credentials["1"].stack
 
 amount=$((RANDOM%9000+1000))
 
-json=$(sbtc deposit \
+json=$($dir/../sbtc/bin/sbtc deposit \
     -w $btc_wif \
     -n regtest \
     -r $stacks_address \
     -a $amount \
     -d $btc_p2tr_address \
-    -u localhost:60401)
+    -u electrs:60401)
+
+echo $json
 
 if [ $? -ne 0 ]; then
     echo 'The deposit failed, did you forget to run "mine_btc.sh"?'
@@ -28,4 +30,6 @@ fi
 
 tx=$(echo -n $json | jq -r .hex)
 
-sbtc broadcast localhost:60401 $tx | jq -r .
+echo $tx
+
+$dir/../sbtc/bin/sbtc broadcast electrs:60401 $tx | jq -r .

devenv/utils/get_credentials.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
+dir="$(dirname "$0")"
+
 # Returns the default credentials for the devnet
 
 mnemonic="twice kind fence tip hidden tilt action fragile skin nothing glory cousin green tomorrow spring wrist shed math olympic multiply hip blue scout claw"
 
-sbtc generate-from -s testnet -b regtest --accounts 2 mnemonic "$mnemonic"
+$dir/../sbtc/bin/sbtc generate-from -s testnet -b regtest --accounts 2 mnemonic "$mnemonic"

devenv/utils/mine_btc.sh

@@ -12,4 +12,4 @@ fi
 
 btc_address=$(source $dir/get_credentials.sh | jq -r '.credentials["1"].bitcoin.p2wpkh.address')
 
-bitcoin-cli -rpcconnect=localhost -rpcport=18443 -rpcuser=devnet -rpcpassword=devnet generatetoaddress $num_blocks $btc_address
+$dir/../bitcoin/bin/bitcoin-cli generatetoaddress $num_blocks $btc_address

devenv/utils/withdraw.sh

@@ -18,15 +18,15 @@ stacks_wif=$(source $dir/get_credentials.sh | jq -r '.credentials["1"].stacks.wi
 amount=$((RANDOM%1000+1000))
 fulfillment_fee=$((RANDOM%1000+1000))
 
-json=$(sbtc withdraw \
+json=$($dir/../sbtc/bin/sbtc withdraw \
     -w $btc_wif \
     -n regtest \
     -d $stacks_wif \
     -b $btc_address \
     -a $amount \
     -f $fulfillment_fee \
     -p $btc_p2tr_address \
-    -u localhost:60401)
+    -u electrs:60401)
 
 
 if [ $? -ne 0 ]; then
@@ -36,4 +36,4 @@ fi
 
 tx=$(echo -n $json | jq -r .hex)
 
-sbtc broadcast localhost:60401 $tx | jq -r .
+$dir/../sbtc/bin/sbtc broadcast electrs:60401 $tx | jq -r .