nihilist/haveno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reject payment accounts with duplicate names

Browse Source
This commit is contained in:
napoly 2023-02-11 11:56:22 +01:00 committed by woodser
parent e2a8dc702b
commit a2f0792799
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/bisq/core/api/CorePaymentAccountsService.java
View File

@ -86,7 +86,6 @@ class CorePaymentAccountsService {
List<TradeCurrency> tradeCurrencies = paymentAccount.getTradeCurrencies();
if (singleTradeCurrency != null) {
paymentAccount.setSelectedTradeCurrency(singleTradeCurrency);
return;
} else if (tradeCurrencies != null && !tradeCurrencies.isEmpty()) {
if (tradeCurrencies.contains(CurrencyUtil.getDefaultTradeCurrency())) {
paymentAccount.setSelectedTradeCurrency(CurrencyUtil.getDefaultTradeCurrency());
@ -135,6 +134,7 @@ class CorePaymentAccountsService {
String address,
boolean tradeInstant) {
accountService.checkAccountOpen();
verifyAccountNameUnique(accountName);
verifyCryptoCurrencyAddress(currencyCode.toUpperCase(), address);
AssetAccount cryptoCurrencyAccount = tradeInstant
? (InstantCryptoCurrencyAccount) PaymentAccountFactory.getPaymentAccount(PaymentMethod.BLOCK_CHAINS_INSTANT)
@ -145,7 +145,6 @@ class CorePaymentAccountsService {
Optional<CryptoCurrency> cryptoCurrency = getCryptoCurrency(currencyCode.toUpperCase());
cryptoCurrency.ifPresent(cryptoCurrencyAccount::setSingleTradeCurrency);
user.addPaymentAccount(cryptoCurrencyAccount);
if (!(cryptoCurrencyAccount instanceof AssetAccount)) accountAgeWitnessService.publishMyAccountAgeWitness(cryptoCurrencyAccount.getPaymentAccountPayload()); // TODO (woodser): applies to Haveno?
log.info("Saved crypto payment account with id {} and payment method {}.",
cryptoCurrencyAccount.getId(),
cryptoCurrencyAccount.getPaymentAccountPayload().getPaymentMethodId());
@ -173,6 +172,12 @@ class CorePaymentAccountsService {
paymentAccount.validateFormField(form, fieldId, value);
}
private void verifyAccountNameUnique(String accountName) {
if (getPaymentAccounts().stream().anyMatch(e -> e.getAccountName() != null &&
e.getAccountName().equals(accountName)))
throw new IllegalArgumentException(format("Account '%s' is already taken", accountName));
}
private void verifyCryptoCurrencyAddress(String cryptoCurrencyCode, String address) {
Asset asset = getAsset(cryptoCurrencyCode);