Ecosystem/haveno
Ecosystem/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2024-11-16 15:58:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

update tor to 0.4.8.9 (#794)

Browse source
This commit is contained in:
preland 2024-03-19 21:03:47 -05:00 committed by GitHub
parent 058fe61e75
commit a476181594
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 49 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/build.yml vendored
View file

@ -1,6 +1,7 @@
name: CI name: CI
on: on:
workflow_dispatch:
push: push:
pull_request: pull_request:
paths-ignore: paths-ignore:

1
.gitignore vendored
View file

@ -36,3 +36,4 @@ deploy
.localnet .localnet
.vscode .vscode
.vim/* .vim/*
*/.factorypath

14
build.gradle
View file

@ -71,7 +71,7 @@ configure(subprojects) {
loggingVersion = '1.2' loggingVersion = '1.2'
lombokVersion = '1.18.30' lombokVersion = '1.18.30'
mockitoVersion = '5.10.0' 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' protobufVersion = '3.19.1'
protocVersion = protobufVersion protocVersion = protobufVersion
pushyVersion = '0.13.2' pushyVersion = '0.13.2'
@ -324,10 +324,10 @@ configure(project(':p2p')) {
implementation "com.google.protobuf:protobuf-java:$protobufVersion" implementation "com.google.protobuf:protobuf-java:$protobufVersion"
implementation "org.fxmisc.easybind:easybind:$easybindVersion" implementation "org.fxmisc.easybind:easybind:$easybindVersion"
implementation "org.slf4j:slf4j-api:$slf4jVersion" 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') 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') exclude(module: 'slf4j-api')
} }
implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") { implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") {
@ -388,10 +388,10 @@ configure(project(':core')) {
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") { implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") {
exclude(module: 'jackson-annotations') 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') 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') exclude(module: 'slf4j-api')
} }
implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") { implementation("com.github.bisq-network:bitcoinj:$bitcoinjVersion") {
@ -691,10 +691,10 @@ configure(project(':monitor')) {
implementation "ch.qos.logback:logback-core:$logbackVersion" implementation "ch.qos.logback:logback-core:$logbackVersion"
implementation "com.google.guava:guava:$guavaVersion" implementation "com.google.guava:guava:$guavaVersion"
implementation "org.slf4j:slf4j-api:$slf4jVersion" 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') 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') exclude(module: 'slf4j-api')
} }
implementation("com.google.inject:guice:$guiceVersion") { implementation("com.google.inject:guice:$guiceVersion") {

40
gradle/verification-metadata.xml
View file

@ -276,6 +276,46 @@
<sha256 value="b5fbe9f9e2681b0cfdd0d8a26c7b216c38acfea74fe2103633fe7e81b6cc4bf7" origin="Generated by Gradle"/> <sha256 value="b5fbe9f9e2681b0cfdd0d8a26c7b216c38acfea74fe2103633fe7e81b6cc4bf7" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="com.github.haveno-dex.netlayer" name="tor" version="33485b9e57">
<artifact name="tor-33485b9e57.jar">
<sha256 value="e8f1e75d1355e2223d682224c45563b74da67f8638484960e04d7b2313919264" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.haveno-dex.netlayer" name="tor.external" version="33485b9e57">
<artifact name="tor.external-33485b9e57.jar">
<sha256 value="c7255cb88745ade38eddfa62a4992a339a0602ba072139e3aaa8376fc225313f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.haveno-dex.netlayer" name="tor.native" version="33485b9e57">
<artifact name="tor.native-33485b9e57.jar">
<sha256 value="c33f2c609759b1aaede5ba7a7ece8af9f0f5b4abec76c274ae5de6e5a12d5f44" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.haveno-dex.tor-binary" name="tor-binary-geoip" version="4e527e5a0e14b01886e0f3add6d3a41a095a7c72">
<artifact name="tor-binary-geoip-4e527e5a0e14b01886e0f3add6d3a41a095a7c72.jar">
<sha256 value="43f94b5fbc3198c97d14ade060a01ef0bd8db747024b03aa10f8c7093a5fdba2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.haveno-dex.tor-binary" name="tor-binary-linux32" version="4e527e5a0e14b01886e0f3add6d3a41a095a7c72">
<artifact name="tor-binary-linux32-4e527e5a0e14b01886e0f3add6d3a41a095a7c72.jar">
<sha256 value="674a25a46886975b60e2c55e018e5cf81ee661b205dba7856a85b11aad416cbf" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.haveno-dex.tor-binary" name="tor-binary-linux64" version="4e527e5a0e14b01886e0f3add6d3a41a095a7c72">
<artifact name="tor-binary-linux64-4e527e5a0e14b01886e0f3add6d3a41a095a7c72.jar">
<sha256 value="57efad29a71dd85ccfe6781c614526b6ac2a11e1e0d0ae29f928cf64b35a4d28" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.haveno-dex.tor-binary" name="tor-binary-macos" version="4e527e5a0e14b01886e0f3add6d3a41a095a7c72">
<artifact name="tor-binary-macos-4e527e5a0e14b01886e0f3add6d3a41a095a7c72.jar">
<sha256 value="570de3a7ca235fd08081b9ad72b377d3b56bde9e4e7706ed1eb19d510b705a15" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.haveno-dex.tor-binary" name="tor-binary-windows" version="4e527e5a0e14b01886e0f3add6d3a41a095a7c72">
<artifact name="tor-binary-windows-4e527e5a0e14b01886e0f3add6d3a41a095a7c72.jar">
<sha256 value="4b5de4df5531c7ad6a855be0f12ed626f469f786f4fce4be79739c54405ccd70" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.johnrengelman" name="shadow" version="8.1.1"> <component group="com.github.johnrengelman" name="shadow" version="8.1.1">
<artifact name="shadow-8.1.1.jar"> <artifact name="shadow-8.1.1.jar">
<sha256 value="084197555590a53bb21b59508a3330559f536ddb448eafd1ec675f5462036fcf" origin="Generated by Gradle"/> <sha256 value="084197555590a53bb21b59508a3330559f536ddb448eafd1ec675f5462036fcf" origin="Generated by Gradle"/>