From 291b4664ddad679642382caa0ebe47e132e2c14d Mon Sep 17 00:00:00 2001
From: demisrael <demisrael@gmail.com>
Date: Sat, 2 May 2026 14:36:36 +0300
Subject: [PATCH] fix tn-12 branch + ports, drop redundant clone, remove
 .khost-data ignore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 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.
---
 .gitignore    | 1 -
 src/config.rs | 8 ++++----
 src/git.rs    | 6 +++---
 src/kaspad.rs | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 25c5a81..91dbade 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 /target
 /fail
-.khost-data
diff --git a/src/config.rs b/src/config.rs
index 0574abb..bd84e50 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -24,17 +24,17 @@ impl Config {
             .with_local_interface(8989);
 
         let origin = Origin::try_new("https://github.com/aspectron/rusty-kaspa", Some("pnn-v1"))?;
-        let covpp_origin =
-            Origin::try_new("https://github.com/kaspanet/rusty-kaspa", Some("covpp"))?;
+        let tn12_origin =
+            Origin::try_new("https://github.com/kaspanet/rusty-kaspa", Some("tn12"))?;
 
         let kaspad = Network::into_iter()
             .map(|network| {
                 let selected_origin = match network {
                     Network::Mainnet => origin.clone(),
                     Network::Testnet10 => origin.clone(),
-                    Network::Testnet12 => covpp_origin.clone(),
+                    Network::Testnet12 => tn12_origin.clone(),
                 };
-                kaspad::Config::new(selected_origin.clone(), network)
+                kaspad::Config::new(selected_origin, network)
             })
             .collect::<Vec<_>>();
 
diff --git a/src/git.rs b/src/git.rs
index 5fc5cbf..fd68a5d 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -180,14 +180,14 @@ where
     enum Preset {
         PNNv1,
         // Delta,
-        Covpp,
+        Tn12,
         Custom,
     }
 
     let preset = if name == "rusty-kaspa" {
         cliclack::select(format!("Select git origin for '{name}':"))
             .item(Preset::PNNv1, "pnn-v1 (aspectron/pnn-v1)", "")
-            .item(Preset::Covpp, "covpp (kaspanet/covpp)", "")
+            .item(Preset::Tn12, "tn12 (kaspanet/tn12)", "")
             // .item(
             //     Preset::Delta,
             //     "Delta",
@@ -203,7 +203,7 @@ where
         Preset::PNNv1 => {
             Origin::try_new("https://github.com/aspectron/rusty-kaspa", Some("pnn-v1"))?
         }
-        Preset::Covpp => Origin::try_new("https://github.com/kaspanet/rusty-kaspa", Some("covpp"))?,
+        Preset::Tn12 => Origin::try_new("https://github.com/kaspanet/rusty-kaspa", Some("tn12"))?,
         // Preset::Delta => {
         //     Origin::try_new("https://github.com/aspectron/rusty-kaspa", Some("delta"))?
         // }
diff --git a/src/kaspad.rs b/src/kaspad.rs
index fd1b475..9ca7614 100644
--- a/src/kaspad.rs
+++ b/src/kaspad.rs
@@ -81,7 +81,7 @@ impl Config {
         let (grpc, wrpc_borsh, wrpc_json) = match network {
             Network::Mainnet => (16110, 17110, 18110),
             Network::Testnet10 => (16210, 17210, 18210),
-            Network::Testnet12 => (16311, 17210, 18210),
+            Network::Testnet12 => (16312, 17312, 18312),
         };
 
         Self {