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

Update build files

Browse source
This commit is contained in:
Manfred Karrer 2015-04-16 11:43:39 +02:00
parent b9fe4660a3
commit 33a539ca52
20 changed files with 749 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/io/bitsquare/app/Version.java
View file

@ -24,8 +24,8 @@ public class Version {
private static final Logger log = LoggerFactory.getLogger(Version.class);
public static final int MAJOR_VERSION = 0;
public static final int MINOR_VERSION = 1;
public static final int PATCH_VERSION = 3; // Will be used by UpdatedFX
public static final int MINOR_VERSION = 2;
public static final int PATCH_VERSION = 1;
public static final byte[] NETWORK_PROTOCOL_VERSION = new byte[]{0x01};
public static final int LOCLA_DB_VERSION = 1;

2
core/src/main/java/io/bitsquare/fiat/FiatAccount.java
View file

@ -37,7 +37,7 @@ public class FiatAccount implements Serializable {
public static final long WEEK_IN_BLOCKS = DAY_IN_BLOCKS * 7;
public enum Type {
IRC("", "", 4),
IRC("", "", 1),
SEPA("IBAN", "BIC", WEEK_IN_BLOCKS),
WIRE("primary ID", "secondary ID", WEEK_IN_BLOCKS),
INTERNATIONAL("primary ID", "secondary ID", 2 * WEEK_IN_BLOCKS),

1
core/src/main/java/io/bitsquare/p2p/BootstrapState.java
View file

@ -29,6 +29,7 @@ public enum BootstrapState {
RELAY_STARTED,
RELAY_SUCCEEDED,
RELAY_FAILED,
BOOT_STRAP_SUCCEEDED,
BOOT_STRAP_FAILED;
private String message;

1
core/src/main/java/io/bitsquare/p2p/tomp2p/BootstrappedPeerBuilder.java
View file

@ -263,6 +263,7 @@ public class BootstrappedPeerBuilder {
public void operationComplete(BaseFuture future) throws Exception {
if (futureBootstrap.isSuccess()) {
log.trace("bootstrap complete");
setState(BootstrapState.BOOT_STRAP_SUCCEEDED, "Bootstrap using relay was successful.");
settableFuture.set(peerDHT);
}
else {

1
core/src/main/java/io/bitsquare/trade/Trade.java
View file

@ -355,6 +355,7 @@ abstract public class Trade implements Tradable, Model, Serializable {
}
public void setLockTime(long lockTime) {
log.debug("lockTime " + lockTime);
this.lockTime = lockTime;
}

4
core/src/main/java/io/bitsquare/trade/TradeManager.java
View file

@ -46,6 +46,7 @@ import io.bitsquare.trade.protocol.trade.messages.DepositTxInputsRequest;
import io.bitsquare.trade.protocol.trade.messages.PayDepositRequest;
import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
import io.bitsquare.trade.states.BuyerTradeState;
import io.bitsquare.trade.states.SellerTradeState;
import io.bitsquare.user.User;
import org.bitcoinj.core.AddressFormatException;
@ -215,7 +216,8 @@ public class TradeManager {
private void setupDepositPublishedListener(Trade trade) {
trade.processStateProperty().addListener((ov, oldValue, newValue) -> {
log.debug("setupDepositPublishedListener state = " + newValue);
if (newValue == BuyerTradeState.ProcessState.DEPOSIT_PUBLISHED) {
if (newValue == BuyerTradeState.ProcessState.DEPOSIT_PUBLISHED ||
newValue == SellerTradeState.ProcessState.DEPOSIT_PUBLISHED_MSG_RECEIVED) {
openOfferManager.closeOpenOffer(trade.getOffer());
trade.setTakeOfferDate(new Date());
}

3
core/src/main/java/io/bitsquare/trade/offer/Offer.java
View file

@ -207,7 +207,8 @@ public class Offer implements Serializable {
public void cancelAvailabilityRequest() {
availabilityProtocol.cancel();
if (availabilityProtocol != null)
availabilityProtocol.cancel();
}
///////////////////////////////////////////////////////////////////////////////////////////

1
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java
View file

@ -42,6 +42,7 @@ public class SignPayoutTx extends TradeTask {
Coin buyerPayoutAmount = sellerPayoutAmount.add(trade.getTradeAmount());
long lockTime = processModel.getTradeWalletService().getLastBlockSeenHeight() + trade.getOffer().getFiatAccountType().lockTimeDelta;
log.debug("lockTime getLastBlockSeenHeight " + processModel.getTradeWalletService().getLastBlockSeenHeight());
trade.setLockTime(lockTime);
byte[] payoutTxSignature = processModel.getTradeWalletService().signPayoutTx(