From 2372bd2e46833367257c4b8592869d0e80a3e15c Mon Sep 17 00:00:00 2001 From: Sulkta Date: Sun, 10 May 2026 14:46:05 -0700 Subject: [PATCH] chore: replace LAN-IP refs with public mirror URLs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cargo.toml + Cargo.lock now point at https://github.com/Sulkta-Coop/pallas for the pallas-fork patch entries. External clones from either public mirror (github.com/Sulkta-Coop or gitlab.com/sulkta) build out of the box — no LAN access needed. internal builds short-circuit to the git remote via a `git config url.X.insteadOf` rewrite on each host. Symmetric: covers both github and gitlab → gitea. Same locked SHA either way; routing is environment-level, not source-of-truth. See docs/internal-build-rewrites.md. Dockerfile build-time rewrite also flipped to take public-URL inputs; uses `git.sulkta.com` instead of the bare LAN IP. --- Cargo.lock | 14 +++++++------- Cargo.toml | 32 +++++++++++++++++++------------- Dockerfile | 13 +++++++++---- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f2042ac..e5e5e43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1292,7 +1292,7 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "pallas-addresses" version = "0.32.1" -source = "git+https://git.sulkta.com/Sulkta-Coop/pallas.git?branch=feat-aux-data#8091abd1b45c716453b7360def29311cf4600c0d" +source = "git+https://github.com/Sulkta-Coop/pallas.git?branch=feat-aux-data#8091abd1b45c716453b7360def29311cf4600c0d" dependencies = [ "base58", "bech32", @@ -1307,7 +1307,7 @@ dependencies = [ [[package]] name = "pallas-codec" version = "0.32.1" -source = "git+https://git.sulkta.com/Sulkta-Coop/pallas.git?branch=feat-aux-data#8091abd1b45c716453b7360def29311cf4600c0d" +source = "git+https://github.com/Sulkta-Coop/pallas.git?branch=feat-aux-data#8091abd1b45c716453b7360def29311cf4600c0d" dependencies = [ "hex", "minicbor", @@ -1318,7 +1318,7 @@ dependencies = [ [[package]] name = "pallas-crypto" version = "0.32.1" -source = "git+https://git.sulkta.com/Sulkta-Coop/pallas.git?branch=feat-aux-data#8091abd1b45c716453b7360def29311cf4600c0d" +source = "git+https://github.com/Sulkta-Coop/pallas.git?branch=feat-aux-data#8091abd1b45c716453b7360def29311cf4600c0d" dependencies = [ "cryptoxide", "hex", @@ -1332,7 +1332,7 @@ dependencies = [ [[package]] name = "pallas-primitives" version = "0.32.1" -source = "git+https://git.sulkta.com/Sulkta-Coop/pallas.git?branch=feat-aux-data#8091abd1b45c716453b7360def29311cf4600c0d" +source = "git+https://github.com/Sulkta-Coop/pallas.git?branch=feat-aux-data#8091abd1b45c716453b7360def29311cf4600c0d" dependencies = [ "base58", "bech32", @@ -1347,7 +1347,7 @@ dependencies = [ [[package]] name = "pallas-traverse" version = "0.32.1" -source = "git+https://git.sulkta.com/Sulkta-Coop/pallas.git?branch=feat-aux-data#8091abd1b45c716453b7360def29311cf4600c0d" +source = "git+https://github.com/Sulkta-Coop/pallas.git?branch=feat-aux-data#8091abd1b45c716453b7360def29311cf4600c0d" dependencies = [ "hex", "itertools", @@ -1363,7 +1363,7 @@ dependencies = [ [[package]] name = "pallas-txbuilder" version = "0.32.1" -source = "git+https://git.sulkta.com/Sulkta-Coop/pallas.git?branch=feat-aux-data#8091abd1b45c716453b7360def29311cf4600c0d" +source = "git+https://github.com/Sulkta-Coop/pallas.git?branch=feat-aux-data#8091abd1b45c716453b7360def29311cf4600c0d" dependencies = [ "hex", "pallas-addresses", @@ -1380,7 +1380,7 @@ dependencies = [ [[package]] name = "pallas-wallet" version = "0.32.1" -source = "git+https://git.sulkta.com/Sulkta-Coop/pallas.git?branch=feat-aux-data#8091abd1b45c716453b7360def29311cf4600c0d" +source = "git+https://github.com/Sulkta-Coop/pallas.git?branch=feat-aux-data#8091abd1b45c716453b7360def29311cf4600c0d" dependencies = [ "bech32", "bip39", diff --git a/Cargo.toml b/Cargo.toml index 281bdea..498e72a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ members = [ version = "0.0.1" edition = "2021" license-file = "LICENSE" -repository = "https://git.sulkta.com/Sulkta-Coop/aldabra" +repository = "https://github.com/Sulkta-Coop/aldabra" authors = ["Sulkta "] [workspace.dependencies] @@ -95,16 +95,22 @@ toml = "0.9" # rpassword is the standard "tty echo off" prompt crate. rpassword = "7" -# Vendored fork of txpipe/pallas with auxiliary_data support added to -# pallas-txbuilder (upstream had TODO markers we filled in). Patches -# all pallas-* crates so the version graph resolves consistently -# against the same commit. PR upstream pending; switch back to -# crates.io once merged. +# Vendored fork of txpipe/pallas with auxiliary_data + voting_procedures +# support added to pallas-txbuilder (upstream had TODO markers we filled +# in). Patches all pallas-* crates so the version graph resolves +# consistently against the same commit. PR upstream pending; switch back +# to crates.io once merged. +# +# Source URLs point at the public github mirror so external clones build +# out of the box. Sulkta-internal builds short-circuit to the LAN gitea +# via a `git config url.*.insteadOf` rewrite — no network egress, same +# locked SHA. See `docs/internal-build-rewrites.md` for the one-line +# config that wires that up on the build host + ci-runner + dev hosts. [patch.crates-io] -pallas-codec = { git = "https://git.sulkta.com/Sulkta-Coop/pallas.git", branch = "feat-aux-data" } -pallas-crypto = { git = "https://git.sulkta.com/Sulkta-Coop/pallas.git", branch = "feat-aux-data" } -pallas-primitives = { git = "https://git.sulkta.com/Sulkta-Coop/pallas.git", branch = "feat-aux-data" } -pallas-traverse = { git = "https://git.sulkta.com/Sulkta-Coop/pallas.git", branch = "feat-aux-data" } -pallas-addresses = { git = "https://git.sulkta.com/Sulkta-Coop/pallas.git", branch = "feat-aux-data" } -pallas-wallet = { git = "https://git.sulkta.com/Sulkta-Coop/pallas.git", branch = "feat-aux-data" } -pallas-txbuilder = { git = "https://git.sulkta.com/Sulkta-Coop/pallas.git", branch = "feat-aux-data" } +pallas-codec = { git = "https://github.com/Sulkta-Coop/pallas.git", branch = "feat-aux-data" } +pallas-crypto = { git = "https://github.com/Sulkta-Coop/pallas.git", branch = "feat-aux-data" } +pallas-primitives = { git = "https://github.com/Sulkta-Coop/pallas.git", branch = "feat-aux-data" } +pallas-traverse = { git = "https://github.com/Sulkta-Coop/pallas.git", branch = "feat-aux-data" } +pallas-addresses = { git = "https://github.com/Sulkta-Coop/pallas.git", branch = "feat-aux-data" } +pallas-wallet = { git = "https://github.com/Sulkta-Coop/pallas.git", branch = "feat-aux-data" } +pallas-txbuilder = { git = "https://github.com/Sulkta-Coop/pallas.git", branch = "feat-aux-data" } diff --git a/Dockerfile b/Dockerfile index 3177b20..666de0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,14 +45,19 @@ COPY crates ./crates # trick above leaves stale build artifacts otherwise. RUN find crates -name '*.rs' -exec touch {} + -# Fetch the pallas patch dep via HTTP+PAT at build time. Source URLs -# stay SSH (Cargo.toml + Cargo.lock) — the rewrite is git-CLI-level -# only, so no credential gets baked into the lock file or the image. +# Build-time URL rewrite: route the public github/gitlab pallas URLs +# (which is what Cargo.toml declares — source-of-truth, portable to +# external clones) back to the LAN gitea over HTTP+PAT. This is purely +# a fetch-time short-circuit: no LAN URL or credential is baked into +# Cargo.lock or the image. The lock file's locked SHA stays identical +# whether fetched via github, gitlab, or local gitea. +# # Pass `--secret id=git_credentials,src=` where is one # line: http://USER:PAT@git.sulkta.com RUN --mount=type=secret,id=git_credentials,target=/root/.git-credentials,mode=0400,required=true \ git config --global credential.helper store && \ - git config --global url."https://git.sulkta.com/".insteadOf "https://git.sulkta.com/" && \ + git config --global url."https://git.sulkta.com/Sulkta-Coop/".insteadOf "https://github.com/Sulkta-Coop/" && \ + git config --global url."https://git.sulkta.com/Sulkta-Coop/".insteadOf "https://gitlab.com/sulkta/" && \ cargo build --release --bin aldabra && \ strip target/release/aldabra