chore(regtest): use prebuilt vanitytorgen image

This commit is contained in:
theborakompanioni 2025-06-15 12:38:26 +02:00
parent 30b3a33601
commit e79e3d3183
No known key found for this signature in database
GPG key ID: E8070AF0053AAC0D
2 changed files with 9 additions and 19 deletions

View file

@ -26,12 +26,9 @@ fi
SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P)
TARGETDIR="${1:-"${PWD}/generate-onion-address/out"}"
WORKDIR="${2:-"${PWD}/generate-onion-address/work"}"
VANITYTORGEN_REPO_DIR="${WORKDIR}/vanitytorgen"
# TODO: fork of "https://github.com/Kexkey/vanitytorgen" - should be forked by jam org?
VANITYTORGEN_REPO_URL="https://github.com/theborakompanioni/vanitytorgen"
VANITYTORGEN_REPO_BRANCH="main"
VANITYTORGEN_REPO_REF="f497346ab540153f06edabe65df37ae5536a2d9a"
VANITYTORGEN_IMAGE="ghcr.io/theborakompanioni/vanitytorgen:v0.1.0"
VANITYTORGEN_DIGEST="sha256:b934d6d834c22882d268208ec9e2e6a101e0ef71ae0b626ffbd6420d3783fdcc"
# onion addresses are base32 - base32 alphabet allows letters [a-z] and digits [2-7]
PREFIX_CHARS="234567abcdefghijklmnopqrstuvwxyz" # "jam"
@ -42,16 +39,10 @@ ONION_ADDRESS_PREFIX="${PREFIX_CHARS:$RANDOM_PREFIX_CHAR_INDEX:1}"
echo "Will use prefix: ${ONION_ADDRESS_PREFIX}"
mkdir -p "$TARGETDIR"
mkdir -p "$WORKDIR"
mkdir -p "${TARGETDIR}"
# download "vanitygen" repo if necessary
if ! [ -d "${VANITYTORGEN_REPO_DIR}" ]; then
git clone "${VANITYTORGEN_REPO_URL}" "${VANITYTORGEN_REPO_DIR}" --branch "${VANITYTORGEN_REPO_BRANCH}" \
&& git --work-tree="${VANITYTORGEN_REPO_DIR}" --git-dir="${VANITYTORGEN_REPO_DIR}/.git" checkout "$VANITYTORGEN_REPO_REF" \
&& rm -rf "${VANITYTORGEN_REPO_DIR}/.git"
fi
# build and run "vanitygen" docker container
docker build --tag jam_regtest_vanitytorgen "${VANITYTORGEN_REPO_DIR}"
docker run --rm --volume "$TARGETDIR:/out:z" jam_regtest_vanitytorgen "${ONION_ADDRESS_PREFIX}" /out
docker run --rm \
--volume "${TARGETDIR}:/out:z" \
--pull "missing" \
"${VANITYTORGEN_IMAGE}@${VANITYTORGEN_DIGEST}" \
"${ONION_ADDRESS_PREFIX}" /out

View file

@ -31,8 +31,7 @@ OUTPUT_FILE="$SCRIPT_DIR/.env.generated"
# generate an onion address
HS_SCRIPT_TARGET_DIR="${SCRIPT_DIR}/out/hidden_service_dir"
HS_SCRIPT_WORK_DIR="${SCRIPT_DIR}/.tmp/generate-onion-address-work"
. "$SCRIPT_DIR/generate-onion-address.sh" "${HS_SCRIPT_TARGET_DIR}" "${HS_SCRIPT_WORK_DIR}"
. "$SCRIPT_DIR/generate-onion-address.sh" "${HS_SCRIPT_TARGET_DIR}"
ONION_ADDRESS=`cat ${HS_SCRIPT_TARGET_DIR}/hostname`