From a2647b106f168a36412ac5729189716389ccc456 Mon Sep 17 00:00:00 2001 From: dan_s Date: Fri, 27 Feb 2026 12:00:46 -0600 Subject: [PATCH] Move 15 loose scripts from contrib/ root to contrib/scripts/ Consolidate all standalone utility scripts into contrib/scripts/: - Perl: avg_blocktime.pl, block_time.pl, gen-zaddrs.pl, sda_checkpoints.pl, sdl_checkpoints.pl, hush_block_subsidy_per_halving, hush_halvings, hush_scanner, hush_supply, hush_supply_old - Shell: fresh_clone_compile_and_run.sh, tidy_datadir.sh, dragonx_scanner - Python: convert_address.py - BAT: hush-uri.bat Update path references in contrib/README.md, doc/OLD_WALLETS.md, doc/relnotes/README.md, and sdl_checkpoints.pl. --- contrib/README.md | 6 +++--- contrib/{ => scripts}/avg_blocktime.pl | 0 contrib/{ => scripts}/block_time.pl | 0 contrib/{ => scripts}/convert_address.py | 0 contrib/{ => scripts}/dragonx_scanner | 0 contrib/{ => scripts}/fresh_clone_compile_and_run.sh | 0 contrib/{ => scripts}/gen-zaddrs.pl | 0 contrib/{ => scripts}/hush-uri.bat | 0 contrib/{ => scripts}/hush_block_subsidy_per_halving | 0 contrib/{ => scripts}/hush_halvings | 0 contrib/{ => scripts}/hush_scanner | 0 contrib/{ => scripts}/hush_supply | 0 contrib/{ => scripts}/hush_supply_old | 0 contrib/{ => scripts}/sda_checkpoints.pl | 0 contrib/{ => scripts}/sdl_checkpoints.pl | 2 +- contrib/{ => scripts}/tidy_datadir.sh | 0 doc/OLD_WALLETS.md | 2 +- doc/codebase-cleanup.md | 2 +- doc/relnotes/README.md | 4 ++-- 19 files changed, 8 insertions(+), 8 deletions(-) rename contrib/{ => scripts}/avg_blocktime.pl (100%) rename contrib/{ => scripts}/block_time.pl (100%) rename contrib/{ => scripts}/convert_address.py (100%) rename contrib/{ => scripts}/dragonx_scanner (100%) rename contrib/{ => scripts}/fresh_clone_compile_and_run.sh (100%) rename contrib/{ => scripts}/gen-zaddrs.pl (100%) rename contrib/{ => scripts}/hush-uri.bat (100%) rename contrib/{ => scripts}/hush_block_subsidy_per_halving (100%) rename contrib/{ => scripts}/hush_halvings (100%) rename contrib/{ => scripts}/hush_scanner (100%) rename contrib/{ => scripts}/hush_supply (100%) rename contrib/{ => scripts}/hush_supply_old (100%) rename contrib/{ => scripts}/sda_checkpoints.pl (100%) rename contrib/{ => scripts}/sdl_checkpoints.pl (95%) rename contrib/{ => scripts}/tidy_datadir.sh (100%) diff --git a/contrib/README.md b/contrib/README.md index 36c04c969..0a5ddd935 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -14,7 +14,7 @@ Estimate when a Hush block will happen. Example: - ./contrib/block_time.pl 123456 # Print out datetime of when block height 123456 happens + ./contrib/scripts/block_time.pl 123456 # Print out datetime of when block height 123456 happens ## gen-zaddrs.pl @@ -22,8 +22,8 @@ Generate zaddrs in bulk, by default 50 at a time. Prints out a zaddr one per lin Example: - ./contrib/gen-zaddrs.pl # generate 50 zaddrs - ./contrib/gen-zaddrs.pl 500 # generate 500 zaddrs + ./contrib/scripts/gen-zaddrs.pl # generate 50 zaddrs + ./contrib/scripts/gen-zaddrs.pl 500 # generate 500 zaddrs ## Wallet Tools diff --git a/contrib/avg_blocktime.pl b/contrib/scripts/avg_blocktime.pl similarity index 100% rename from contrib/avg_blocktime.pl rename to contrib/scripts/avg_blocktime.pl diff --git a/contrib/block_time.pl b/contrib/scripts/block_time.pl similarity index 100% rename from contrib/block_time.pl rename to contrib/scripts/block_time.pl diff --git a/contrib/convert_address.py b/contrib/scripts/convert_address.py similarity index 100% rename from contrib/convert_address.py rename to contrib/scripts/convert_address.py diff --git a/contrib/dragonx_scanner b/contrib/scripts/dragonx_scanner similarity index 100% rename from contrib/dragonx_scanner rename to contrib/scripts/dragonx_scanner diff --git a/contrib/fresh_clone_compile_and_run.sh b/contrib/scripts/fresh_clone_compile_and_run.sh similarity index 100% rename from contrib/fresh_clone_compile_and_run.sh rename to contrib/scripts/fresh_clone_compile_and_run.sh diff --git a/contrib/gen-zaddrs.pl b/contrib/scripts/gen-zaddrs.pl similarity index 100% rename from contrib/gen-zaddrs.pl rename to contrib/scripts/gen-zaddrs.pl diff --git a/contrib/hush-uri.bat b/contrib/scripts/hush-uri.bat similarity index 100% rename from contrib/hush-uri.bat rename to contrib/scripts/hush-uri.bat diff --git a/contrib/hush_block_subsidy_per_halving b/contrib/scripts/hush_block_subsidy_per_halving similarity index 100% rename from contrib/hush_block_subsidy_per_halving rename to contrib/scripts/hush_block_subsidy_per_halving diff --git a/contrib/hush_halvings b/contrib/scripts/hush_halvings similarity index 100% rename from contrib/hush_halvings rename to contrib/scripts/hush_halvings diff --git a/contrib/hush_scanner b/contrib/scripts/hush_scanner similarity index 100% rename from contrib/hush_scanner rename to contrib/scripts/hush_scanner diff --git a/contrib/hush_supply b/contrib/scripts/hush_supply similarity index 100% rename from contrib/hush_supply rename to contrib/scripts/hush_supply diff --git a/contrib/hush_supply_old b/contrib/scripts/hush_supply_old similarity index 100% rename from contrib/hush_supply_old rename to contrib/scripts/hush_supply_old diff --git a/contrib/sda_checkpoints.pl b/contrib/scripts/sda_checkpoints.pl similarity index 100% rename from contrib/sda_checkpoints.pl rename to contrib/scripts/sda_checkpoints.pl diff --git a/contrib/sdl_checkpoints.pl b/contrib/scripts/sdl_checkpoints.pl similarity index 95% rename from contrib/sdl_checkpoints.pl rename to contrib/scripts/sdl_checkpoints.pl index 938aee872..f9ab563f0 100755 --- a/contrib/sdl_checkpoints.pl +++ b/contrib/scripts/sdl_checkpoints.pl @@ -10,7 +10,7 @@ use warnings; use strict; # call this script like this to generate checkpoints for a HAC such as DragonX: -# CLI=./src/dragonx-cli ./contrib/sdl_checkpoints.pl ... +# CLI=./src/dragonx-cli ./contrib/scripts/sdl_checkpoints.pl ... my $hush = $ENV{CLI} || "./src/hush-cli"; my $gethash = "$hush getblockhash"; diff --git a/contrib/tidy_datadir.sh b/contrib/scripts/tidy_datadir.sh similarity index 100% rename from contrib/tidy_datadir.sh rename to contrib/scripts/tidy_datadir.sh diff --git a/doc/OLD_WALLETS.md b/doc/OLD_WALLETS.md index 99f96f46f..dfe63a416 100644 --- a/doc/OLD_WALLETS.md +++ b/doc/OLD_WALLETS.md @@ -19,7 +19,7 @@ with `t1` and now they begin with `R`. To see what an old HUSH v2 address looks like on the new chain, this online tool can be used: https://dexstats.info/addressconverter.php -or this command line tool: https://git.hush.is/hush/hush3/src/master/contrib/convert_address.py +or this command line tool: https://git.hush.is/hush/hush3/src/master/contrib/scripts/convert_address.py ### Using an old wallet.dat diff --git a/doc/codebase-cleanup.md b/doc/codebase-cleanup.md index 117766234..38b87a047 100644 --- a/doc/codebase-cleanup.md +++ b/doc/codebase-cleanup.md @@ -134,4 +134,4 @@ Docs are split across `doc/`, `contrib/README.md`, and the root. 4. Item **5** — move implementation out of headers 5. Item **4** — split monolithic source files 6. Item **6** — deduplicate cJSON -7. Item **2** — Move shell scripts to `contrib/scripts/` directory +7. Item **2** — ~~Move shell scripts to `contrib/scripts/` directory~~ Done — moved 15 loose scripts from `contrib/` root into `contrib/scripts/` diff --git a/doc/relnotes/README.md b/doc/relnotes/README.md index 9e7ae288e..6a701fe69 100644 --- a/doc/relnotes/README.md +++ b/doc/relnotes/README.md @@ -231,8 +231,8 @@ since it contains various bugfixes and improvements that will benefit busy walle * sendmany RPC will now reject transactions that send to taddrs immediately, instead of them being rejected in mempool * Preliminary support for FreeBSD has been added to the Hush build system * New contrib scripts: - * `contrib/gen-zaddrs.pl` - Generate zaddrs in bulk, defaults to 50 - * `contrib/sdl_checkpoints.pl` - Generate SDL checkpoints using `getblockmerkletree` + * `contrib/scripts/gen-zaddrs.pl` - Generate zaddrs in bulk, defaults to 50 + * `contrib/scripts/sdl_checkpoints.pl` - Generate SDL checkpoints using `getblockmerkletree` * ZeroMQ support has been removed from Hush # Hush 3.9.1 "Luciferous Locust"