From 61b0bfbe9cbc158a96e78cdd165c6d448932028b Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Sat, 14 Feb 2015 22:23:48 +0100
Subject: [PATCH] Update to latest BitcoinJ master

---
 build.gradle                                              | 2 +-
 .../registration/ArbitratorRegistrationView.java          | 2 +-
 .../tasks/SetupListenerForBlockChainConfirmation.java     | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index fca1d48c79..903fd359fc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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'
diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
index 6c2fd2cac3..0941287307 100644
--- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
@@ -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) {
 
             }
 
diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
index 982e5d11ac..c50c1e1148 100644
--- a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
+++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
@@ -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");