From 326e48fc1bc4ea7d6d5ada4c1116936eae1de2d8 Mon Sep 17 00:00:00 2001
From: Brandon Trussell <brandon2k3@gmail.com>
Date: Mon, 24 Mar 2025 18:42:38 -0500
Subject: [PATCH] Final update to use haveno-dex/netlayer that supports linux
 aarch64

---
 build.gradle                     | 14 ++++-----
 gradle/verification-metadata.xml | 54 ++++++++++++++++----------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8f32456451..cb1cc172b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -71,7 +71,7 @@ configure(subprojects) {
         loggingVersion = '1.2'
         lombokVersion = '1.18.30'
         mockitoVersion = '5.10.0'
-        netlayerVersion = '67ff7fc40d' // Tor browser version 14.0.7 and tor binary version: 0.4.8.14
+        netlayerVersion = 'd9c60be46d' // Tor browser version 14.0.7 and tor binary version: 0.4.8.14
         protobufVersion = '3.19.1'
         protocVersion = protobufVersion
         pushyVersion = '0.13.2'
@@ -335,10 +335,10 @@ configure(project(':p2p')) {
         implementation "org.fxmisc.easybind:easybind:$easybindVersion"
         implementation "org.slf4j:slf4j-api:$slf4jVersion"
         implementation "org.apache.commons:commons-lang3:$langVersion"
-        implementation("com.github.NorrinRadd.netlayer:tor.external:$netlayerVersion") {
+        implementation("com.github.haveno-dex.netlayer:tor.external:$netlayerVersion") {
             exclude(module: 'slf4j-api')
         }
-        implementation("com.github.NorrinRadd.netlayer:tor.native:$netlayerVersion") {
+        implementation("com.github.haveno-dex.netlayer:tor.native:$netlayerVersion") {
             exclude(module: 'slf4j-api')
         }
         implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") {
@@ -400,10 +400,10 @@ configure(project(':core')) {
         implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") {
             exclude(module: 'jackson-annotations')
         }
-        implementation("com.github.NorrinRadd.netlayer:tor.native:$netlayerVersion") {
+        implementation("com.github.haveno-dex.netlayer:tor.native:$netlayerVersion") {
             exclude(module: 'slf4j-api')
         }
-        implementation("com.github.NorrinRadd.netlayer:tor.external:$netlayerVersion") {
+        implementation("com.github.haveno-dex.netlayer:tor.external:$netlayerVersion") {
             exclude(module: 'slf4j-api')
         }
         implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") {
@@ -705,10 +705,10 @@ configure(project(':monitor')) {
         implementation "ch.qos.logback:logback-core:$logbackVersion"
         implementation "com.google.guava:guava:$guavaVersion"
         implementation "org.slf4j:slf4j-api:$slf4jVersion"
-        implementation("com.github.NorrinRadd.netlayer:tor.external:$netlayerVersion") {
+        implementation("com.github.haveno-dex.netlayer:tor.external:$netlayerVersion") {
             exclude(module: 'slf4j-api')
         }
-        implementation("com.github.NorrinRadd.netlayer:tor.native:$netlayerVersion") {
+        implementation("com.github.haveno-dex.netlayer:tor.native:$netlayerVersion") {
             exclude(module: 'slf4j-api')
         }
         implementation("com.google.inject:guice:$guiceVersion") {
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 699cc304b2..15194cfc52 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -205,49 +205,49 @@
             <sha256 value="d4ea711258c783e0accb8feaaa204f0414781551b0159fa17e5f1869200f96f7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.github.NorrinRadd.netlayer" name="tor" version="67ff7fc40d">
-         <artifact name="tor-67ff7fc40d.jar">
-            <sha256 value="8fc170bf667262dc2955a9f6baaffaebc5544baf19c73c6f272464692ee6b518" origin="Generated by Gradle"/>
+      <component group="com.github.haveno-dex.netlayer" name="tor" version="d9c60be46d">
+         <artifact name="tor-d9c60be46d.jar">
+            <sha256 value="e35f3bf160f96a99255ba3c408f096e65c0092658c5fac182561e081d97c4638" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.github.NorrinRadd.netlayer" name="tor.external" version="67ff7fc40d">
-         <artifact name="tor.external-67ff7fc40d.jar">
-            <sha256 value="9ce4e0349e805dd1afb023cd14150101c87063c4bbb21c726d5c58db0d357230" origin="Generated by Gradle"/>
+      <component group="com.github.haveno-dex.netlayer" name="tor.external" version="d9c60be46d">
+         <artifact name="tor.external-d9c60be46d.jar">
+            <sha256 value="2cb926847283dea14acb732aa8df8042c59a5a803b1a80e171abbdeea44a7eb0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.github.NorrinRadd.netlayer" name="tor.native" version="67ff7fc40d">
-         <artifact name="tor.native-67ff7fc40d.jar">
-            <sha256 value="cd61d50a4d5284098f22e0875f6d78a15e7ce49a19d8c1d51e75efb6b057ac22" origin="Generated by Gradle"/>
+      <component group="com.github.haveno-dex.netlayer" name="tor.native" version="d9c60be46d">
+         <artifact name="tor.native-d9c60be46d.jar">
+            <sha256 value="2cc31cd9aed3d3368a0fdeaa529d7fa83f732d170f331ec471a37a45c30c80cb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.github.NorrinRadd.tor-binary" name="tor-binary-geoip" version="d685466474286feb78e736276c3673372334aa37">
-         <artifact name="tor-binary-geoip-d685466474286feb78e736276c3673372334aa37.jar">
-            <sha256 value="e60750128458e4a6e0f8529fb9fc38459fdf93592d2484cafb1ec969bb824492" origin="Generated by Gradle"/>
+      <component group="com.github.haveno-dex.tor-binary" name="tor-binary-geoip" version="2c02f6b133da79134312b964f2d0f9630c7dfa67">
+         <artifact name="tor-binary-geoip-2c02f6b133da79134312b964f2d0f9630c7dfa67.jar">
+            <sha256 value="98ba8e66de5198d5a558db0ec932faccb52c4eff9c50deefb6427c7f083be665" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.github.NorrinRadd.tor-binary" name="tor-binary-linux32" version="d685466474286feb78e736276c3673372334aa37">
-         <artifact name="tor-binary-linux32-d685466474286feb78e736276c3673372334aa37.jar">
-            <sha256 value="172731fb8adb5e80928b543ed547c5fd528882ee75586c75f40fa14ea79fea91" origin="Generated by Gradle"/>
+      <component group="com.github.haveno-dex.tor-binary" name="tor-binary-linux32" version="2c02f6b133da79134312b964f2d0f9630c7dfa67">
+         <artifact name="tor-binary-linux32-2c02f6b133da79134312b964f2d0f9630c7dfa67.jar">
+            <sha256 value="f6a63ed5bdbc9417107c8425bb241ff841a0a8076492fbbcc11921e46bd360a0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.github.NorrinRadd.tor-binary" name="tor-binary-linux64" version="d685466474286feb78e736276c3673372334aa37">
-         <artifact name="tor-binary-linux64-d685466474286feb78e736276c3673372334aa37.jar">
-            <sha256 value="74d4ff807a1afc8b6219f529950768d7ded5ad492197a3858b04ca05712dda3d" origin="Generated by Gradle"/>
+      <component group="com.github.haveno-dex.tor-binary" name="tor-binary-linux64" version="2c02f6b133da79134312b964f2d0f9630c7dfa67">
+         <artifact name="tor-binary-linux64-2c02f6b133da79134312b964f2d0f9630c7dfa67.jar">
+            <sha256 value="ef055a43e73f3bc4fffb8fafcafe513566d8e019c9518fe2d1bd81bbcad9d537" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.github.NorrinRadd.tor-binary" name="tor-binary-linuxaarch64" version="d685466474286feb78e736276c3673372334aa37">
-         <artifact name="tor-binary-linuxaarch64-d685466474286feb78e736276c3673372334aa37.jar">
-            <sha256 value="b4f6ab73b1dac32fb9e230d684957c2f94ca4a4bc549916635d71ca8d638adb5" origin="Generated by Gradle"/>
+      <component group="com.github.haveno-dex.tor-binary" name="tor-binary-linuxaarch64" version="2c02f6b133da79134312b964f2d0f9630c7dfa67">
+         <artifact name="tor-binary-linuxaarch64-2c02f6b133da79134312b964f2d0f9630c7dfa67.jar">
+            <sha256 value="652b95aad1aac64583c6d8e3b573853b6a6877b363b3040dc232eb0b14e78946" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.github.NorrinRadd.tor-binary" name="tor-binary-macos" version="d685466474286feb78e736276c3673372334aa37">
-         <artifact name="tor-binary-macos-d685466474286feb78e736276c3673372334aa37.jar">
-            <sha256 value="c38a2185536528914fe3ff0a51d0c51ecc497f8a0ec1ea6a85799a548c882bc6" origin="Generated by Gradle"/>
+      <component group="com.github.haveno-dex.tor-binary" name="tor-binary-macos" version="2c02f6b133da79134312b964f2d0f9630c7dfa67">
+         <artifact name="tor-binary-macos-2c02f6b133da79134312b964f2d0f9630c7dfa67.jar">
+            <sha256 value="a6815e420956ce1faf3ddeaea87ef08666f4744cd0cfd5912b414943b41d5eba" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.github.NorrinRadd.tor-binary" name="tor-binary-windows" version="d685466474286feb78e736276c3673372334aa37">
-         <artifact name="tor-binary-windows-d685466474286feb78e736276c3673372334aa37.jar">
-            <sha256 value="8257c29c8c725d32e840ed5a7a707da7195279643507907b8671449ebafd4cf1" origin="Generated by Gradle"/>
+      <component group="com.github.haveno-dex.tor-binary" name="tor-binary-windows" version="2c02f6b133da79134312b964f2d0f9630c7dfa67">
+         <artifact name="tor-binary-windows-2c02f6b133da79134312b964f2d0f9630c7dfa67.jar">
+            <sha256 value="9144e233fe350164a9ee0bdd42ea9b16db2d2ea486e5ec634ff040fd5934a609" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.github.johnrengelman" name="shadow" version="8.1.1">