From 77431b3d94b3858b4c9ec4fce893123ec4000a65 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Tue, 26 Aug 2014 17:44:55 +0200 Subject: [PATCH] added comments --- src/main/java/io/bitsquare/btc/FeePolicy.java | 5 +---- .../bitsquare/btc/{Restritions.java => Restrictions.java} | 5 +++-- src/main/java/io/bitsquare/btc/WalletFacade.java | 3 ++- src/main/java/io/bitsquare/crypto/CryptoFacade.java | 1 + .../trade/protocol/createoffer/tasks/ValidateOffer.java | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) rename src/main/java/io/bitsquare/btc/{Restritions.java => Restrictions.java} (81%) diff --git a/src/main/java/io/bitsquare/btc/FeePolicy.java b/src/main/java/io/bitsquare/btc/FeePolicy.java index b8607c67b7..96a7ce3658 100644 --- a/src/main/java/io/bitsquare/btc/FeePolicy.java +++ b/src/main/java/io/bitsquare/btc/FeePolicy.java @@ -47,9 +47,8 @@ public class FeePolicy { this.params = params; } - //TODO other users or dev address? use donation option list? + //TODO who is receiver? other users or dev address? use donation option list? // (dev, other users, wikileaks, tor, sub projects (bitcoinj, tomp2p,...)...) - public Address getAddressForRegistrationFee() { try { return new Address(params, registrationFeeAddress); @@ -60,7 +59,6 @@ public class FeePolicy { } //TODO get address form arbitrator list - public Address getAddressForCreateOfferFee() { try { return new Address(params, createOfferFeeAddress); @@ -71,7 +69,6 @@ public class FeePolicy { } //TODO get address form the intersection of both traders arbitrator lists - public Address getAddressForTakeOfferFee() { try { return new Address(params, takeOfferFeeAddress); diff --git a/src/main/java/io/bitsquare/btc/Restritions.java b/src/main/java/io/bitsquare/btc/Restrictions.java similarity index 81% rename from src/main/java/io/bitsquare/btc/Restritions.java rename to src/main/java/io/bitsquare/btc/Restrictions.java index 59385366dc..27e32c76d2 100644 --- a/src/main/java/io/bitsquare/btc/Restritions.java +++ b/src/main/java/io/bitsquare/btc/Restrictions.java @@ -19,8 +19,9 @@ package io.bitsquare.btc; import com.google.bitcoin.core.Coin; -public class Restritions { - public static final Coin MIN_TRADE_AMOUNT = Coin.CENT; // 0.01 Bitcoins +// Lets see if we get more restriction otherwise move it to other class +public class Restrictions { + public static final Coin MIN_TRADE_AMOUNT = Coin.parseCoin("0.0001"); } diff --git a/src/main/java/io/bitsquare/btc/WalletFacade.java b/src/main/java/io/bitsquare/btc/WalletFacade.java index 25c577a4bf..f3995247b4 100644 --- a/src/main/java/io/bitsquare/btc/WalletFacade.java +++ b/src/main/java/io/bitsquare/btc/WalletFacade.java @@ -82,7 +82,8 @@ import static com.google.bitcoin.script.ScriptOpCodes.OP_RETURN; /** * TODO: use walletextension (with protobuffer) instead of saving addressEntryList via storage - * TODO: use HD wallet features instead of addressEntryList + * TODO: break that class up. maybe a bitsquarewallet + * Wait until steve's akka version to see how to continue here */ public class WalletFacade { public static final String MAIN_NET = "MAIN_NET"; diff --git a/src/main/java/io/bitsquare/crypto/CryptoFacade.java b/src/main/java/io/bitsquare/crypto/CryptoFacade.java index 443e0063ed..9564598d73 100644 --- a/src/main/java/io/bitsquare/crypto/CryptoFacade.java +++ b/src/main/java/io/bitsquare/crypto/CryptoFacade.java @@ -40,6 +40,7 @@ import org.spongycastle.util.encoders.Base64; /** * That facade delivers crypto functionality from the bitcoinJ library + * //TODO still very basic as not much used yet, missing implementations */ public class CryptoFacade { private static final Logger log = LoggerFactory.getLogger(CryptoFacade.class); diff --git a/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/ValidateOffer.java b/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/ValidateOffer.java index b960eef7ee..4ff0bbf376 100644 --- a/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/ValidateOffer.java +++ b/src/main/java/io/bitsquare/trade/protocol/createoffer/tasks/ValidateOffer.java @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.createoffer.tasks; import io.bitsquare.btc.FeePolicy; -import io.bitsquare.btc.Restritions; +import io.bitsquare.btc.Restrictions; import io.bitsquare.trade.Offer; import io.bitsquare.trade.handlers.FaultHandler; import io.bitsquare.trade.handlers.ResultHandler; @@ -55,8 +55,8 @@ public class ValidateOffer { checkArgument(offer.getAcceptedCountries().size() > 0); checkArgument(offer.getAcceptedLanguageLocales().size() > 0); - checkArgument(offer.getMinAmount().compareTo(Restritions.MIN_TRADE_AMOUNT) >= 0); - checkArgument(offer.getAmount().compareTo(Restritions.MIN_TRADE_AMOUNT) >= 0); + checkArgument(offer.getMinAmount().compareTo(Restrictions.MIN_TRADE_AMOUNT) >= 0); + checkArgument(offer.getAmount().compareTo(Restrictions.MIN_TRADE_AMOUNT) >= 0); checkArgument(offer.getAmount().compareTo(offer.getMinAmount()) >= 0); checkArgument(offer.getCollateral() > 0); checkArgument(offer.getPrice() > 0);