mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest BitcoinJ master

Browse Source
This commit is contained in:
Manfred Karrer 2015-02-14 22:23:48 +01:00
parent b72c5aaebf
commit 61b0bfbe9c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -40,7 +40,7 @@ repositories {
}
dependencies {
compile 'org.bitcoinj:bitcoinj-core:0.12.2'
compile 'org.bitcoinj:bitcoinj-core:0.13-SNAPSHOT'
compile 'net.tomp2p:tomp2p-all:5.0-Beta2'
compile 'io.reactivex:rxjava:1.0.0'
compile 'org.springframework:spring-core:4.1.1.RELEASE'

2
src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
View File

@ -325,7 +325,7 @@ public class ArbitratorRegistrationView extends ActivatableView<AnchorPane, Void
}
@Override
public void onScriptsAdded(Wallet wallet, List<Script> scripts) {
public void onScriptsChanged(Wallet wallet, List<Script> list, boolean b) {
}

8
src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
View File

@ -37,10 +37,10 @@ public class SetupListenerForBlockChainConfirmation {
depositTransaction.getConfidence().addEventListener(new TransactionConfidence.Listener() {
@Override
public void onConfidenceChanged(Transaction tx, ChangeReason reason) {
log.trace("onConfidenceChanged " + tx.getConfidence());
if (reason == ChangeReason.TYPE &&
tx.getConfidence().getConfidenceType() == TransactionConfidence.ConfidenceType.BUILDING) {
public void onConfidenceChanged(TransactionConfidence transactionConfidence, ChangeReason changeReason) {
log.trace("onConfidenceChanged " + transactionConfidence);
if (changeReason == ChangeReason.TYPE &&
transactionConfidence.getConfidenceType() == TransactionConfidence.ConfidenceType.BUILDING) {
listener.onDepositTxConfirmedInBlockchain();
depositTransaction.getConfidence().removeEventListener(this);
log.trace("Tx is in blockchain");