fix tn-12 branch + ports, drop redundant clone, remove .khost-data ignore#1
Merged
Merged
Conversation
…nore - src/kaspad.rs: tn-12 wrpc-borsh/json ports collided with tn-10 (17210/18210). Use (16312, 17312, 18312) following the netsuffix-numbered pattern. - Use the official `tn12` branch on kaspanet/rusty-kaspa (the `covpp` branch has been removed). Rename Preset::Covpp -> Preset::Tn12 in src/git.rs for consistency. - src/config.rs: drop redundant `.clone()` on selected_origin (match arms already produce owned values). - .gitignore: remove `.khost-data` — code uses `.khost` / `00-khost-dev` per folders.rs.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Proposed fixes for PR aspectron#3, posted as a PR against your branch so you can review/merge/close rather than having edits land directly. Builds cleanly on Ubuntu 24.04 (rustc 1.95.0) and macOS 15.6.1 (rustc 1.81.0); clippy clean.
Changes
1.
src/kaspad.rs— port collisionThe current entry has tn-12 sharing wrpc ports with tn-10:
Fixed to follow the netsuffix-numbered pattern:
(16312, 17312, 18312).2.
covpp→tn12(official upstream branch)The
covppbranch onkaspanet/rusty-kaspano longer exists (404). The official tn-12 work is now on thetn12branch (b97d108…) and includesUpdate genesis for TN12 launch 3,Add Toccata lane/gas limits to consensus, etc. — none of which are onaspectron/rusty-kaspa#pnn-v1, so the dual-origin design is still required for tn-12 to work.Updated:
src/config.rs:covpp_origin→tn12_origin, branch"covpp"→"tn12".src/git.rs:Preset::Covpp→Preset::Tn12, label and branch updated.3.
.gitignore— drop.khost-datafolders.rsdefinesDATA_FOLDER_NAME = ".khost"(Linux) /00-khost-dev(other)..khost-datadoesn't match either — looks like a stray from local Docker testing.4.
src/config.rs— redundant cloneDropped the trailing
.clone().Out of scope (separate PR)
The config v2→v3 migration for existing users with
"testnet11"entries — that's a multi-file change touchingConfig::load()and probably best handled separately.