Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure AutoConfirmSettings is reset if it contains my retired explorer #7368

Merged
merged 1 commit into from
Feb 2, 2025
Merged

Ensure AutoConfirmSettings is reset if it contains my retired explorer #7368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions core/src/main/java/bisq/core/user/Preferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,10 +384,15 @@ private void clearRetiredNodes() {
setBsqBlockChainExplorer(bsqExplorers.get((new Random()).nextInt(bsqExplorers.size())));
}

// Remove retired XMR AutoConfirm address
// Remove retired XMR AutoConfirm addresses
List<String> retiredAddresses = List.of(
"monero3bec7m26vx6si6qo7q7imlaoz45ot5m2b5z2ppgoooo6jx2rqd",
"devinxmrwu4jrfq2zmq5kqjpxb44hx7i7didebkwrtvmvygj4uuop2ad"
);
var doApplyDefaults = prefPayload.getAutoConfirmSettingsList().stream()
.map(autoConfirmSettings -> autoConfirmSettings.getServiceAddresses().stream()
.anyMatch(address -> address.contains("monero3bec7m26vx6si6qo7q7imlaoz45ot5m2b5z2ppgoooo6jx2rqd")))
.anyMatch(address -> retiredAddresses.stream()
.anyMatch(address::contains)))
.findAny()
.orElse(true);
if (doApplyDefaults) {
Expand Down
30 changes: 30 additions & 0 deletions core/src/test/java/bisq/core/user/PreferencesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,34 @@ public void testUpdateOfPersistedFiatCurrenciesAfterLocaleChanged() {
preferences.readPersisted(() ->
assertEquals("US Dollar (USD)", preferences.getFiatCurrenciesAsObservable().get(0).getNameAndCode()));
}

@Test
void testRemoveRetiredXmrAutoConfirmAddresses() {
PreferencesPayload payload = mock(PreferencesPayload.class);

FiatCurrency usd = new FiatCurrency(Currency.getInstance("USD"), new Locale("de", "AT"));
List<AutoConfirmSettings> autoConfirmSettingsList = new ArrayList<>(List.of(
new AutoConfirmSettings(
true,
3,
1,
List.of("devinxmrwu4jrfq2zmq5kqjpxb44hx7i7didebkwrtvmvygj4uuop2ad.onion",
"xmrexplrthytnunr4jasr3vnjc6jo5idsyxzv74a7ep7dy7lwcv2eoyd.onion"),
"XMR")
));

addReadPersistedStub(payload);

when(payload.getUserLanguage()).thenReturn("en");
when(payload.getUserCountry()).thenReturn(CountryUtil.getDefaultCountry());
when(payload.getPreferredTradeCurrency()).thenReturn(usd);
when(payload.getAutoConfirmSettingsList()).thenReturn(autoConfirmSettingsList);

preferences.readPersisted(() ->
assertEquals(
List.of(
"xmrexplrthytnunr4jasr3vnjc6jo5idsyxzv74a7ep7dy7lwcv2eoyd.onion",
"nklwsomtuok6dhqqecp3a26xzgokfgmeuaplcdkaxehncg57yzarvbad.onion"),
preferences.getAutoConfirmSettingsList().get(0).getServiceAddresses()));
}
}
Loading