From a4761815941a17d62d4957caad3899a8f41478ee Mon Sep 17 00:00:00 2001
From: preland <89992615+preland@users.noreply.github.com>
Date: Tue, 19 Mar 2024 21:03:47 -0500
Subject: [PATCH] update tor to 0.4.8.9 (#794)
---
.github/workflows/build.yml | 1 +
.gitignore | 1 +
build.gradle | 14 +++++------
gradle/verification-metadata.xml | 40 ++++++++++++++++++++++++++++++++
4 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c5f6d0445..89e9e5d09e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,7 @@
name: CI
on:
+ workflow_dispatch:
push:
pull_request:
paths-ignore:
diff --git a/.gitignore b/.gitignore
index e68a3c9b00..75b5b82224 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ deploy
.localnet
.vscode
.vim/*
+*/.factorypath
diff --git a/build.gradle b/build.gradle
index 5fbf061533..84f45fcbdb 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 = '2b459dc' // Tor browser version 11.5.2 and tor binary version: 0.4.7.10
+ netlayerVersion = '33485b9e57' // Netlayer version "0.7.7" with Tor browser version 13.0.6 and tor binary version: 0.4.8.9
protobufVersion = '3.19.1'
protocVersion = protobufVersion
pushyVersion = '0.13.2'
@@ -324,10 +324,10 @@ configure(project(':p2p')) {
implementation "com.google.protobuf:protobuf-java:$protobufVersion"
implementation "org.fxmisc.easybind:easybind:$easybindVersion"
implementation "org.slf4j:slf4j-api:$slf4jVersion"
- implementation("com.github.bisq-network.netlayer:tor.external:$netlayerVersion") {
+ implementation("com.github.haveno-dex.netlayer:tor.external:$netlayerVersion") {
exclude(module: 'slf4j-api')
}
- implementation("com.github.bisq-network.netlayer:tor.native:$netlayerVersion") {
+ implementation("com.github.haveno-dex.netlayer:tor.native:$netlayerVersion") {
exclude(module: 'slf4j-api')
}
implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") {
@@ -388,10 +388,10 @@ configure(project(':core')) {
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") {
exclude(module: 'jackson-annotations')
}
- implementation("com.github.bisq-network.netlayer:tor.native:$netlayerVersion") {
+ implementation("com.github.haveno-dex.netlayer:tor.native:$netlayerVersion") {
exclude(module: 'slf4j-api')
}
- implementation("com.github.bisq-network.netlayer:tor.external:$netlayerVersion") {
+ implementation("com.github.haveno-dex.netlayer:tor.external:$netlayerVersion") {
exclude(module: 'slf4j-api')
}
implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") {
@@ -691,10 +691,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.bisq-network.netlayer:tor.external:$netlayerVersion") {
+ implementation("com.github.haveno-dex.netlayer:tor.external:$netlayerVersion") {
exclude(module: 'slf4j-api')
}
- implementation("com.github.bisq-network.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 77b83f5cd1..7ca2973df4 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -276,6 +276,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+