haveno-network/haveno-core
haveno-network/haveno-core
1
0
Fork 1
Code Issues 4 Pull requests Projects 5 Releases 1 Packages Wiki Activity Actions

bump version to 1.1.0

Browse source
This commit is contained in:
woodser 2025-04-17 20:55:01 -04:00 committed by GitHub
parent 695f2b8dd3
commit 39909e7936
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -610,7 +610,7 @@ configure(project(':desktop')) {
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
apply from: 'package/package.gradle' apply from: 'package/package.gradle'
version = '1.0.19-SNAPSHOT' version = '1.1.0-SNAPSHOT'
jar.manifest.attributes( jar.manifest.attributes(
"Implementation-Title": project.name, "Implementation-Title": project.name,

2
common/src/main/java/haveno/common/app/Version.java
View file

@ -28,7 +28,7 @@ import static com.google.common.base.Preconditions.checkArgument;
public class Version { public class Version {
// The application versions // The application versions
// We use semantic versioning with major, minor and patch // We use semantic versioning with major, minor and patch
public static final String VERSION = "1.0.19"; public static final String VERSION = "1.1.0";
/** /**
* Holds a list of the tagged resource files for optimizing the getData requests. * Holds a list of the tagged resource files for optimizing the getData requests.

1
core/src/main/resources/i18n/displayStrings.properties
View file

@ -237,6 +237,7 @@ shared.pending=Pending
shared.me=Me shared.me=Me
shared.maker=Maker shared.maker=Maker
shared.taker=Taker shared.taker=Taker
shared.none=None
#################################################################### ####################################################################

2
desktop/package/linux/exchange.haveno.Haveno.metainfo.xml
View file

@ -60,6 +60,6 @@
</content_rating> </content_rating>
<releases> <releases>
<release version="1.0.19" date="2025-03-10"/> <release version="1.1.0" date="2025-04-17"/>
</releases> </releases>
</component> </component>

4
desktop/package/macosx/Info.plist
View file

@ -5,10 +5,10 @@
<!-- See: https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html --> <!-- See: https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -->
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.0.19</string> <string>1.1.0</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.0.19</string> <string>1.1.0</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Haveno</string> <string>Haveno</string>

7
desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.fxml
View file

@ -91,7 +91,7 @@
<AutoTooltipButton fx:id="rescanOutputsButton"/> <AutoTooltipButton fx:id="rescanOutputsButton"/>
</VBox> </VBox>
<TitledGroupBg fx:id="p2pHeader" GridPane.rowIndex="5" GridPane.rowSpan="5"> <TitledGroupBg fx:id="p2pHeader" GridPane.rowIndex="5" GridPane.rowSpan="6">
<padding> <padding>
<Insets top="50.0"/> <Insets top="50.0"/>
</padding> </padding>
@ -159,7 +159,10 @@
<HavenoTextField fx:id="chainHeightTextField" GridPane.rowIndex="9" editable="false" <HavenoTextField fx:id="chainHeightTextField" GridPane.rowIndex="9" editable="false"
focusTraversable="false" labelFloat="true"/> focusTraversable="false" labelFloat="true"/>
<AutoTooltipButton fx:id="openTorSettingsButton" GridPane.rowIndex="10" GridPane.columnIndex="0"/> <HavenoTextField fx:id="minVersionForTrading" GridPane.rowIndex="10" editable="false"
focusTraversable="false" labelFloat="true"/>
<AutoTooltipButton fx:id="openTorSettingsButton" GridPane.rowIndex="11" GridPane.columnIndex="0"/>
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="ALWAYS" minWidth="500"/> <ColumnConstraints hgrow="ALWAYS" minWidth="500"/>

15
desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.java
View file

@ -75,7 +75,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
@FXML @FXML
InputTextField xmrNodesInputTextField; InputTextField xmrNodesInputTextField;
@FXML @FXML
TextField onionAddress, sentDataTextField, receivedDataTextField, chainHeightTextField; TextField onionAddress, sentDataTextField, receivedDataTextField, chainHeightTextField, minVersionForTrading;
@FXML @FXML
Label p2PPeersLabel, moneroConnectionsLabel; Label p2PPeersLabel, moneroConnectionsLabel;
@FXML @FXML
@ -176,6 +176,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
sentDataTextField.setPromptText(Res.get("settings.net.sentDataLabel")); sentDataTextField.setPromptText(Res.get("settings.net.sentDataLabel"));
receivedDataTextField.setPromptText(Res.get("settings.net.receivedDataLabel")); receivedDataTextField.setPromptText(Res.get("settings.net.receivedDataLabel"));
chainHeightTextField.setPromptText(Res.get("settings.net.chainHeightLabel")); chainHeightTextField.setPromptText(Res.get("settings.net.chainHeightLabel"));
minVersionForTrading.setPromptText(Res.get("filterWindow.disableTradeBelowVersion"));
roundTripTimeColumn.setGraphic(new AutoTooltipLabel(Res.get("settings.net.roundTripTimeColumn"))); roundTripTimeColumn.setGraphic(new AutoTooltipLabel(Res.get("settings.net.roundTripTimeColumn")));
sentBytesColumn.setGraphic(new AutoTooltipLabel(Res.get("settings.net.sentBytesColumn"))); sentBytesColumn.setGraphic(new AutoTooltipLabel(Res.get("settings.net.sentBytesColumn")));
receivedBytesColumn.setGraphic(new AutoTooltipLabel(Res.get("settings.net.receivedBytesColumn"))); receivedBytesColumn.setGraphic(new AutoTooltipLabel(Res.get("settings.net.receivedBytesColumn")));
@ -275,7 +276,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
showShutDownPopup(); showShutDownPopup();
} }
}; };
filterPropertyListener = (observable, oldValue, newValue) -> applyPreventPublicXmrNetwork(); filterPropertyListener = (observable, oldValue, newValue) -> applyFilter();
// disable radio buttons if no nodes available // disable radio buttons if no nodes available
if (xmrNodes.getProvidedXmrNodes().isEmpty()) { if (xmrNodes.getProvidedXmrNodes().isEmpty()) {
@ -298,7 +299,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
moneroPeersToggleGroup.selectedToggleProperty().addListener(moneroPeersToggleGroupListener); moneroPeersToggleGroup.selectedToggleProperty().addListener(moneroPeersToggleGroupListener);
if (filterManager.getFilter() != null) if (filterManager.getFilter() != null)
applyPreventPublicXmrNetwork(); applyFilter();
filterManager.filterProperty().addListener(filterPropertyListener); filterManager.filterProperty().addListener(filterPropertyListener);
@ -492,7 +493,9 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
} }
private void applyPreventPublicXmrNetwork() { private void applyFilter() {
// prevent public xmr network
final boolean preventPublicXmrNetwork = isPreventPublicXmrNetwork(); final boolean preventPublicXmrNetwork = isPreventPublicXmrNetwork();
usePublicNodesRadio.setDisable(isPublicNodesDisabled()); usePublicNodesRadio.setDisable(isPublicNodesDisabled());
if (preventPublicXmrNetwork && selectedMoneroNodesOption == XmrNodes.MoneroNodesOption.PUBLIC) { if (preventPublicXmrNetwork && selectedMoneroNodesOption == XmrNodes.MoneroNodesOption.PUBLIC) {
@ -501,6 +504,10 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
selectMoneroPeersToggle(); selectMoneroPeersToggle();
onMoneroPeersToggleSelected(false); onMoneroPeersToggleSelected(false);
} }
// set min version for trading
String minVersion = filterManager.getDisableTradeBelowVersion();
minVersionForTrading.textProperty().setValue(minVersion == null ? Res.get("shared.none") : minVersion);
} }
private boolean isPublicNodesDisabled() { private boolean isPublicNodesDisabled() {

2
seednode/src/main/java/haveno/seednode/SeedNodeMain.java
View file

@ -41,7 +41,7 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j @Slf4j
public class SeedNodeMain extends ExecutableForAppWithP2p { public class SeedNodeMain extends ExecutableForAppWithP2p {
private static final long CHECK_CONNECTION_LOSS_SEC = 30; private static final long CHECK_CONNECTION_LOSS_SEC = 30;
private static final String VERSION = "1.0.19"; private static final String VERSION = "1.1.0";
private SeedNode seedNode; private SeedNode seedNode;
private Timer checkConnectionLossTime; private Timer checkConnectionLossTime;