Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: contrib: handle spaces in paths gracefully in regtest_manager #245

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: contrib: handle spaces in paths gracefully in regtest_manager #245

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4601a8
contrib: handle spaces in paths gracefully in regtest_manager
darosior Aug 3, 2021
2b5b20e
contrib: automatically copy config from contrib/ in start_revaultd
darosior Aug 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 36 additions & 28 deletions contrib/regtest_manager.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ fi
# Just spin up two nodes by default
n_nodes=2

function _bcli() {
bitcoin-cli -regtest -datadir="$bc_dir" -rpcwallet="test" $*
}

start_regtest () {
# Use the global env bitcoind by default
if [ -z "$BITCOIND_PATH" ];then BITCOIND_PATH="/usr/local/bin/bitcoind";fi
Expand All @@ -24,7 +28,7 @@ start_regtest () {
bc_dir="$PREFIX_DIR/bcdir$i"

mkdir -p "$bc_dir"
cat <<EOF > $bc_dir/bitcoin.conf
cat <<EOF > "$bc_dir/bitcoin.conf"
regtest=1
[regtest]
connect=127.0.0.1:$(($bc_port - 1))
Expand All @@ -41,15 +45,15 @@ EOF
alias "bdreg$i"="$BITCOIND_PATH -datadir=\"$bc_dir\""
echo "Started bitcoind #$i with P2P port $bc_port, RPC port $bc_rpc and datadir $bc_dir"

bcli="bitcoin-cli -regtest -datadir=$bc_dir -rpcwallet=\"test\""
while [ $($bcli getblockchaininfo &> /dev/null; echo $?) -ne 0 ];do
while [ $(_bcli getblockchaininfo &> /dev/null; echo $?) -ne 0 ];do
echo "$(_bcli getblockchaininfo)"
echo "Waiting for bitcoind to warmup.."
sleep 0.5
done
if [ $($bcli -named createwallet wallet_name="test" descriptors=true load_on_startup=true &> /dev/null; echo $?) -eq 0 ];then
if [ $(_bcli -named createwallet wallet_name="test" descriptors=true load_on_startup=true &> /dev/null; echo $?) -eq 0 ];then
echo "Created descriptor wallet 'test'";
fi
alias "bcreg$i"="$bcli"
alias "bcreg$i"="bitcoin-cli -regtest -datadir=\"$bc_dir\" -rpcwallet=\"test\""
echo ""
done

Expand All @@ -62,8 +66,7 @@ generate_regtest () {
while true;do
for i in $(seq $n_nodes);do
bc_dir="$PREFIX_DIR/bcdir$i"
bcli="bitcoin-cli -regtest -datadir=$bc_dir -rpcwallet=\"test\""
if [ $($bcli generatetoaddress 1 $($bcli getnewaddress 2> /dev/null) &> /dev/null; echo $?) -ne 0 ];then
if [ $(_bcli generatetoaddress 1 $(_bcli getnewaddress 2> /dev/null) &> /dev/null; echo $?) -ne 0 ];then
return
fi
sleep 3
Expand Down Expand Up @@ -91,7 +94,7 @@ fund_regtest () {
echo "Getting some bitcoins on each bitcoin daemon"
# Use the first node as the block generator
bc_dir="$PREFIX_DIR/bcdir1"
miner="bitcoin-cli -regtest -datadir=$bc_dir -rpcwallet=test"
miner="bitcoin-cli -regtest -datadir=\"$bc_dir\" -rpcwallet=test"
for n in $(seq 110);do
if [ "$n" = "1" ];then
while [ $($miner getblockchaininfo > /dev/null; echo $?) -ne 0 ];do
Expand All @@ -101,8 +104,7 @@ fund_regtest () {
fi
for i in $(seq $n_nodes);do
bc_dir="$PREFIX_DIR/bcdir$i"
bcli="bitcoin-cli -regtest -datadir=$bc_dir -rpcwallet=test"
$miner generatetoaddress 1 $($bcli getnewaddress 2>/dev/null) > /dev/null
$miner generatetoaddress 1 $(_bcli getnewaddress 2>/dev/null) > /dev/null
sleep 0.001
done
echo -en "\r$n/110 blocks generated"
Expand All @@ -112,8 +114,7 @@ fund_regtest () {
tip=$($miner getbestblockhash)
for node in $(seq $n_nodes);do
bc_dir="$PREFIX_DIR/bcdir$i"
bcli="bitcoin-cli -regtest -datadir=$bc_dir -rpcwallet=\"test\""
our_tip=$($bcli getbestblockhash)
our_tip=$(_bcli getbestblockhash)
while test "$our_tip" != "$tip"; do sleep 0.05;done
done
echo ""
Expand Down Expand Up @@ -144,26 +145,33 @@ stop_regtest () {

# Start a single revault wallet daemon
start_revaultd () {
# FIXME: write the config to the PREFIX_DIR ourselves..
if [ -z "$REVAULTD_CONFIG_PATH" ];then REVAULTD_CONFIG_PATH="./config_regtest.toml";fi
cargo run --bin revaultd -- --conf "$REVAULTD_CONFIG_PATH";
alias re="cargo run --bin revault-cli -- --conf $REVAULTD_CONFIG_PATH";
if [ -z "$PREFIX_DIR" ]; then PREFIX_DIR="$PWD/regtest";fi

if [ -z "$REVAULTD_CONFIG_PATH" ];then
REVAULTD_CONFIG_PATH="./config_regtest.toml"
cp contrib/config_regtest.toml $REVAULTD_CONFIG_PATH || echo "start_revaultd must be used at the root of the repo"; return 1
sed -i "s|/path/to/your/datadir/revault|$PREFIX_DIR/revaultd|g" $REVAULTD_CONFIG_PATH
sed -i "s|/path/to/your/cookie/path/.cookie|$PREFIX_DIR/bcdir1/regtest/.cookie|g" $REVAULTD_CONFIG_PATH
fi

cargo run --bin revaultd -- --conf $REVAULTD_CONFIG_PATH;
alias re="cargo run --bin revault-cli -- --conf $REVAULTD_CONFIG_PATH";
}

# Fund a new vault, optionally takes an amount
fund_vault () {
if [ -z "$REVAULTD_CONFIG_PATH" ];then REVAULTD_CONFIG_PATH="./config_regtest.toml";fi
amount=10;
if [ "$#" == "1" ];then
amount=$1;
fi

addr=$(cargo run --bin revault-cli -- --conf "$REVAULTD_CONFIG_PATH" getdepositaddress|jq -r .result.address);
bc_dir="$PREFIX_DIR/bcdir1";
miner="bitcoin-cli -regtest -datadir=$bc_dir -rpcwallet=test";
$miner sendtoaddress $addr $amount;
sleep 0.5;
$miner generatetoaddress 6 $($bcli getnewaddress 2> /dev/null) &> /dev/null;
if [ -z "$REVAULTD_CONFIG_PATH" ];then REVAULTD_CONFIG_PATH="./config_regtest.toml";fi
amount=10;
if [ "$#" == "1" ];then
amount=$1;
fi

addr=$(cargo run --bin revault-cli -- --conf "$REVAULTD_CONFIG_PATH" getdepositaddress|jq -r .result.address);
bc_dir="$PREFIX_DIR/bcdir1";
miner="bitcoin-cli -regtest -datadir=\"$bc_dir\" -rpcwallet=test";
$miner sendtoaddress $addr $amount;
sleep 0.5;
$miner generatetoaddress 6 $(_bcli getnewaddress 2> /dev/null) &> /dev/null;
}

# Deletes the root parent of all datadirs
Expand Down