Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-05-31 04:24:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix fiat trades by changing base currency to xmr #7

Browse source
This commit is contained in:
woodser 2021-05-04 22:09:23 -04:00
parent 69ee113dae
commit 01f183b7a7
38 changed files with 106 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/bisq/core/locale/CurrencyUtil.java
View file

@ -532,9 +532,9 @@ public class CurrencyUtil {
.filter(cryptoCurrency -> cryptoCurrency.getCode().equals(currencyCode))
.findAny();
String btcOrRemovedAsset = "BTC".equals(currencyCode) ? "Bitcoin" :
String xmrOrRemovedAsset = "XMR".equals(currencyCode) ? "Monero" :
removedCryptoCurrency.isPresent() ? removedCryptoCurrency.get().getName() : Res.get("shared.na");
return getCryptoCurrency(currencyCode).map(TradeCurrency::getName).orElse(btcOrRemovedAsset);
return getCryptoCurrency(currencyCode).map(TradeCurrency::getName).orElse(xmrOrRemovedAsset);
}
try {
return Currency.getInstance(currencyCode).getDisplayName();

2
core/src/main/java/bisq/core/offer/Offer.java
View file

@ -433,7 +433,7 @@ public class Offer implements NetworkPayload, PersistablePayload {
return currencyCode;
}
currencyCode = offerPayload.getBaseCurrencyCode().equals("BTC") ?
currencyCode = offerPayload.getBaseCurrencyCode().equals("XMR") ?
offerPayload.getCounterCurrencyCode() :
offerPayload.getBaseCurrencyCode();
return currencyCode;

6
core/src/main/java/bisq/core/offer/OfferPayload.java
View file

@ -384,12 +384,12 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay
}
// In the offer we support base and counter currency
// Fiat offers have base currency BTC and counterCurrency Fiat
// Altcoins have base currency Altcoin and counterCurrency BTC
// Fiat offers have base currency XMR and counterCurrency Fiat
// Altcoins have base currency Altcoin and counterCurrency XMR
// The rest of the app does not support yet that concept of base currency and counter currencies
// so we map here for convenience
public String getCurrencyCode() {
return getBaseCurrencyCode().equals("BTC") ? getCounterCurrencyCode() : getBaseCurrencyCode();
return getBaseCurrencyCode().equals("XMR") ? getCounterCurrencyCode() : getBaseCurrencyCode();
}
@Override

2
core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java
View file

@ -307,7 +307,7 @@ public final class TradeStatistics2 implements ProcessOncePersistableNetworkPayl
}
public String getCurrencyCode() {
return baseCurrency.equals("BTC") ? counterCurrency : baseCurrency;
return baseCurrency.equals("XMR") ? counterCurrency : baseCurrency;
}
public Coin getTradeAmount() {

2
core/src/main/java/bisq/core/user/Preferences.java
View file

@ -284,7 +284,7 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid
setCryptoCurrencies(CurrencyUtil.getMainCryptoCurrencies());
BaseCurrencyNetwork baseCurrencyNetwork = Config.baseCurrencyNetwork();
if ("BTC".equals(baseCurrencyNetwork.getCurrencyCode())) {
if ("BTC".equals(baseCurrencyNetwork.getCurrencyCode())) { // TODO (woodser): change to XMR when --baseCurrencyNetwork=XMR_REGTEST supported
setBlockChainExplorerMainNet(BTC_MAIN_NET_EXPLORERS.get(0));
setBlockChainExplorerTestNet(BTC_TEST_NET_EXPLORERS.get(0));
} else {

4
core/src/test/java/bisq/core/locale/BankUtilTest.java
View file

@ -15,8 +15,8 @@ public class BankUtilTest {
public void setup() {
Locale.setDefault(new Locale("en", "US"));
GlobalSettings.setLocale(new Locale("en", "US"));
Res.setBaseCurrencyCode("BTC");
Res.setBaseCurrencyName("Bitcoin");
Res.setBaseCurrencyCode("XMR");
Res.setBaseCurrencyName("Monero");
}
@Test

4
core/src/test/java/bisq/core/locale/CurrencyUtilTest.java
View file

@ -45,8 +45,8 @@ public class CurrencyUtilTest {
public void setup() {
Locale.setDefault(new Locale("en", "US"));
Res.setBaseCurrencyCode("BTC");
Res.setBaseCurrencyName("Bitcoin");
Res.setBaseCurrencyCode("XMR");
Res.setBaseCurrencyName("Monero");
}
@Test

2
core/src/test/java/bisq/core/offer/OfferMaker.java
View file

@ -46,7 +46,7 @@ public class OfferMaker {
lookup.valueOf(useMarketBasedPrice, false),
lookup.valueOf(amount, 100000L),
lookup.valueOf(minAmount, 100000L),
lookup.valueOf(baseCurrencyCode, "BTC"),
lookup.valueOf(baseCurrencyCode, "XMR"),
lookup.valueOf(counterCurrencyCode, "USD"),
null,
null,

3
core/src/test/java/bisq/core/payment/validation/AltCoinAddressValidatorTest.java
View file

@ -44,6 +44,9 @@ public class AltCoinAddressValidatorTest {
validator.setCurrencyCode("BTC");
assertTrue(validator.validate("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhem").isValid);
validator.setCurrencyCode("XMR");
assertTrue(validator.validate("4AuUM6PedofLWKfRCX1fP3SoNZUzq6FSAbpevHRR6tVuMpZc3HznVeudmNGkEB75apjE7WKVgZZh1YvPVxZoHFN88NCdmWw").isValid);
validator.setCurrencyCode("LTC");
assertTrue(validator.validate("Lg3PX8wRWmApFCoCMAsPF5P9dPHYQHEWKW").isValid);

4
core/src/test/java/bisq/core/user/PreferencesTest.java
View file

@ -54,8 +54,8 @@ public class PreferencesTest {
final Locale en_US = new Locale("en", "US");
Locale.setDefault(en_US);
GlobalSettings.setLocale(en_US);
Res.setBaseCurrencyCode("BTC");
Res.setBaseCurrencyName("Bitcoin");
Res.setBaseCurrencyCode("XMR");
Res.setBaseCurrencyName("Monero");
persistenceManager = mock(PersistenceManager.class);
Config config = new Config();

4
core/src/test/java/bisq/core/util/FormattingUtilsTest.java
View file

@ -31,8 +31,8 @@ public class FormattingUtilsTest {
@Before
public void setUp() {
Locale.setDefault(new Locale("en", "US"));
Res.setBaseCurrencyCode("BTC");
Res.setBaseCurrencyName("Bitcoin");
Res.setBaseCurrencyCode("XMR");
Res.setBaseCurrencyName("Monero");
}
@Test

4
core/src/test/java/bisq/core/util/RegexValidatorTest.java
View file

@ -37,8 +37,8 @@ public class RegexValidatorTest {
public void setup() {
Locale.setDefault(new Locale("en", "US"));
GlobalSettings.setLocale(new Locale("en", "US"));
Res.setBaseCurrencyCode("BTC");
Res.setBaseCurrencyName("Bitcoin");
Res.setBaseCurrencyCode("XMR");
Res.setBaseCurrencyName("Monero");
}
@Test