Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-30 18:28:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

update to bitcoinJ master

Browse source
This commit is contained in:
Manfred Karrer 2014-08-05 23:30:17 +02:00
parent ff7aa52d39
commit e0e6df6383
14 changed files with 91 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/io/bitsquare/trade/Offer.java
View file

@ -5,6 +5,7 @@ import io.bitsquare.bank.BankAccountType;
import io.bitsquare.locale.Country;
import io.bitsquare.user.Arbitrator;
import java.io.Serializable;
import java.math.BigDecimal;
import java.security.PublicKey;
import java.util.*;
@ -23,6 +24,7 @@ public class Offer implements Serializable
private final double price;
private final Coin amount;
private final Coin minAmount;
//TODO use hex string
private final PublicKey messagePublicKey;
private final BankAccountType bankAccountType;
private final Country bankAccountCountry;
@ -137,14 +139,21 @@ public class Offer implements Serializable
return acceptedLanguageLocales;
}
public double getVolume()
public double getVolumeForCoin(Coin coin)
{
return price * amount.value;
BigDecimal amountBD = BigDecimal.valueOf(coin.longValue());
BigDecimal volumeBD = amountBD.multiply(BigDecimal.valueOf(price));
return volumeBD.divide(BigDecimal.valueOf(Coin.COIN.value)).doubleValue();
}
public double getMinVolume()
public double getOfferVolume()
{
return price * minAmount.value;
return getVolumeForCoin(amount);
}
public double getMinOfferVolume()
{
return getVolumeForCoin(minAmount);
}
public String getOfferFeePaymentTxID()