From 8278cef19da5fde049d949944acc1e3899c8287b Mon Sep 17 00:00:00 2001 From: Elyan Date: Sat, 17 Feb 2024 08:58:48 -0800 Subject: [PATCH] update generate.py to miner.py for v26 --- Dockerfile | 5 +++-- generate_signet.sh | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index cafc8e3..97ebc24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,8 +26,9 @@ RUN chmod +x generate_signet.sh COPY bitcoin.conf /root/.bitcoin/bitcoin.conf # Copy the generate.py script from the Bitcoin core source -COPY --from=0 /bitcoin/contrib/signet/generate.py /usr/local/bin/ -RUN chmod +x /usr/local/bin/generate.py +COPY --from=0 /bitcoin/contrib/signet/miner.py /usr/local/bin/ +RUN chmod +x /usr/local/bin/miner.py + # Expose necessary ports EXPOSE 38333 38332 diff --git a/generate_signet.sh b/generate_signet.sh index 8eebbb4..c5892b7 100644 --- a/generate_signet.sh +++ b/generate_signet.sh @@ -65,22 +65,22 @@ NADDR=$(./src/bitcoin-cli -datadir=$datadir getnewaddress) # Start mining blocks -# Include generate.py script into docker +# Include miner.py script into docker # Generate the first block to your Address using a specific block time -./contrib/signet/generate.py --cli="./src/bitcoin-cli -datadir=$datadir" generate 1 --block-time=1 --address="$NADDR" --grind-cmd='./src/bitcoin-util grind' +./contrib/signet/miner.py --cli="./src/bitcoin-cli -datadir=$datadir" generate 1 --block-time=1 --address="$NADDR" --grind-cmd='./src/bitcoin-util grind' # (WIP) -#../contrib/signet/generate.py --cli="./bitcoin-cli -datadir=$datadir" generate 1 --block-time=1 --address="$NADDR" --backdate 0 -#../contrib/signet/generate.py --cli="./bitcoin-cli -datadir=$datadir" generate 1 --block-time=1 --descriptor="wpkh(...)#..." --secondary +#../contrib/signet/miner.py --cli="./bitcoin-cli -datadir=$datadir" generate 1 --block-time=1 --address="$NADDR" --backdate 0 +#../contrib/signet/miner.py --cli="./bitcoin-cli -datadir=$datadir" generate 1 --block-time=1 --descriptor="wpkh(...)#..." --secondary # Generate and create a block template. this generate a PBST, process it, and submit the block to the signet network ./src/bitcoin-cli -datadir=$datadir getblocktemplate '{"rules": ["signet","segwit"]}' \ - | ./contrib/signet/generate.py --cli="./src/bitcoin-cli -datadir=$datadir" genpsbt --address="$NADDR" \ + | ./contrib/signet/miner.py --cli="./src/bitcoin-cli -datadir=$datadir" genpsbt --address="$NADDR" \ | ./src/bitcoin-cli -datadir=$datadir -stdin walletprocesspsbt # Solve and submit a PBST -./contrib/signet/generate.py solvepsbt --grind-cmd='./src/bitcoin-util grind' | ./src/bitcoin-cli -datadir=$datadir submitblock +./contrib/signet/miner.py solvepsbt --grind-cmd='./src/bitcoin-util grind' | ./src/bitcoin-cli -datadir=$datadir submitblock # Stop the custom Signet node ./bitcoin-cli -datadir=$datadir stop