Mixing fixes

src/bitnymWallet/BitNymWallet.java

@@ -17,6 +17,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import edu.kit.tm.ptp.Identifier;
 import org.bitcoinj.core.*;
 import org.bitcoinj.core.TransactionConfidence.Listener;
 import org.bitcoinj.core.listeners.NewBestBlockListener;
@@ -78,7 +79,8 @@ public BitNymWallet() {
 		//MainClass.params = TestNet3Params.get();
 		MainClass.params = RegTestParams.get();
 		params = MainClass.params;
-		//Context context = new Context(params);
+		// TODO(PM) use context as parameter at certain methods to avoid bitcoin warinings
+		Context context = new Context(params);
 		proofChangeConfidenceListeners = new ArrayList<ProofConfidenceChangeEventListener>();
 		proofChangeListeners = new ArrayList<ProofChangeEventListener>();
 		timeChangedListeners = new ArrayList<TimeChangedEventListener>();
@@ -89,7 +91,7 @@ public BitNymWallet() {
 		wallet = null;
 		walletFile = new File("./wallet.wa");
 		if(!walletFile.exists()) {
-			wallet = new Wallet(params);
+			wallet = new Wallet(context);
 			try {
 				wallet.saveToFile(walletFile);
 			} catch (IOException e) {
@@ -295,7 +297,13 @@ private void insertIdentifierIntoFilter() {
 		filter.insert(BroadcastAnnouncement.magicNumber);
 		downloadpeer.setBloomFilter(filter);
 	}
-
+
+	private void mixAbort() {
+		for (MixAbortEventListener listener : m.getMaListeners()) {
+			listener.onMixAborted();
+		}
+	}
+
 
 
 	public void exit() {
@@ -392,9 +400,11 @@ public void mixWith(String onionAdress, int lockTime) {
 	public void mixWithNewestBroadcast(int lockTime) throws NoBroadcastAnnouncementsException {
 		if(pm.isEmpty()) {
 			System.out.println("mixWithNewestBroadcast aborted: No own proof message");
+			mixAbort();
 			return;
 		} else if(pm.getLastTransaction().getConfidence().getDepthInBlocks() == 0) {
 			System.out.println("mixWithNewestBroadcast aborted: Last transaction is not yet verified " + pm.getLastTransaction().toString());
+			mixAbort();
 			return;
 		} else {
 			m.setBroadcastAnnouncement(mpd.getNewestBroadcast());
@@ -409,9 +419,11 @@ public void mixWithRandomBroadcast(int lockTime) throws NoBroadcastAnnouncements
 		//if(!mpd.hasBroadcasts() || pm.isEmpty()) {
 		if(pm.isEmpty()) {	
 			System.out.println("mixWithRandomBroadcast aborted: No own proof message");
+			mixAbort();
 			return;
 		} else if(pm.getLastTransaction().getConfidence().getDepthInBlocks() == 0) {	
 			System.out.println("mixWithRandomBroadcast aborted: Last transaction is not yet verified " + pm.getLastTransaction().toString());
+			mixAbort();
 			return;
 		} else {
 			m.setBroadcastAnnouncement(mpd.getRandomBroadcast());
@@ -460,6 +472,10 @@ public void addBroadcastAnnouncementChangeEventListener(BroadcastAnnouncementCha
 	public void addMixFinishedEventListener(MixFinishedEventListener listener) {
 		m.addMixFinishedEventListener(listener);
 	}
+
+	public void addMixAbortEventListener(MixAbortEventListener listener) {m.addMixAbortEventListener(listener);}
+
+	public void addMixPassiveEventListener(MixPassiveEventListener listener) {m.addMixPassiveEventListener(listener);}
 
 	public void removeProofConfidenceChangeEventListener(ProofConfidenceChangeEventListener listener) {
 		pm.removeProofConfidenceChangeEventListener(listener);
@@ -479,6 +495,17 @@ public void removeMixFinishedEventListener(MixFinishedEventListener listener) {
 		m.removeMixFinishedEventListener(listener);
 	}
 
+	public void removeMixAbortEventListener(MixAbortEventListener listener) {
+		m.removeMixAbortEventListener(listener);
+	}
+
+	public void removeMixPassiveEventListener(MixPassiveEventListener listener) {
+		m.removeMixPassiveEventListener(listener);
+	}
+
+	public void mixPassive(byte[] arg0, Identifier arg1) {
+		m.passiveMix(arg0,arg1);
+	}
 
 
 	public Transaction getLastTransaction() {
@@ -628,4 +655,16 @@ public ECKey getPseudonym() {
 		return wallet.findKeyFromPubHash(pm.getScriptPair().getPubKeyHash());
 	}
 
+	/**
+	 * Only for testing
+	 * @return ptp identifier
+	 */
+	public Identifier getIdentifier() {
+		if (ptp.isInitialized()) {
+			return ptp.getIdentifier();
+		} else {
+			return null;
+		}
+	}
+
 }

src/bitnymWallet/MixAbortEventListener.java

@@ -0,0 +1,7 @@
+package bitnymWallet;
+
+public interface MixAbortEventListener {
+
+    public void onMixAborted();
+
+}

src/bitnymWallet/MixPassiveEventListener.java

@@ -0,0 +1,9 @@
+package bitnymWallet;
+
+import edu.kit.tm.ptp.Identifier;
+
+public interface MixPassiveEventListener {
+
+    public void onMixPassive(byte[] arg0, Identifier arg1);
+
+}

src/bitnymWallet/Mixer.java

@@ -24,7 +24,6 @@
 import org.bitcoinj.wallet.Wallet;
 
 import edu.kit.tm.ptp.Identifier;
-import edu.kit.tm.ptp.PTP;
 import edu.kit.tm.ptp.ReceiveListener;
 import edu.kit.tm.ptp.SendListener;
 
@@ -44,6 +43,8 @@ public class Mixer {
 	private PeerGroup pg;
 	private BlockChain bc;
 	private List<MixFinishedEventListener> mfListeners;
+	private List<MixAbortEventListener> maListeners;
+	private List<MixPassiveEventListener> mpListeners;
 	private int lockTime;
 	private boolean successful;
 
@@ -58,6 +59,8 @@ public Mixer(BitNymWallet wallet, BroadcastAnnouncement bca, ProofMessage pm, Wa
 		this.pg = pg;
 		this.bc = bc;
 		this.mfListeners = new ArrayList<MixFinishedEventListener>();
+		this.maListeners = new ArrayList<MixAbortEventListener>();
+		this.mpListeners = new ArrayList<MixPassiveEventListener>();
 		this.lockTime = 0; 
 	}
 
@@ -72,6 +75,8 @@ public Mixer(BitNymWallet wallet, String onionAddress, ProofMessage pm, Wallet w
 		this.pg = pg;
 		this.bc = bc;
 		this.mfListeners = new ArrayList<MixFinishedEventListener>();
+		this.maListeners = new ArrayList<MixAbortEventListener>();
+		this.mpListeners = new ArrayList<MixPassiveEventListener>();
 		this.lockTime = 0;
 
 	}
@@ -85,10 +90,13 @@ public Mixer(BitNymWallet wallet, ProofMessage pm, Wallet w, NetworkParameters p
 		this.pg = pg;
 		this.bc = bc;
 		this.mfListeners = new ArrayList<MixFinishedEventListener>();
+		this.maListeners = new ArrayList<MixAbortEventListener>();
+		this.mpListeners = new ArrayList<MixPassiveEventListener>();
 		this.lockTime = 0;
 	}
 
-	public void passiveMix(byte[] arg0) {
+	public void passiveMix(byte[] arg0, Identifier arg1) {
+		mixPartnerAdress = arg1;
 		wallet.ptp.setSendListener(new SendListener() {
 
 	        @Override
@@ -112,6 +120,7 @@ public void messageSent(long id, Identifier destination, State state) {
 		this.partnerProof = (ProofMessage) deserialize(arg0);
 		if(!partnerProof.isProbablyValid(params, bc, pg)) {
 			System.out.println("proof of mix partner is invalid");
+			mixAbort();
 			return;
 		}
 		//send own proof to partner
@@ -126,6 +135,7 @@ public void messageReceived(byte[] arg0, Identifier arg1) {
 				final Transaction rcvdTx = deserializeTransaction(arg0);
 				if(!checkTxInputIsFromProof(rcvdTx, 0)) {
 					System.out.println("checktxinput is from proof failed");
+					mixAbort();
 					return;
 				}
 				final int outputOrder = rcvdTx.getOutputs().size();
@@ -267,6 +277,7 @@ public void messageReceived(byte[] arg0, Identifier arg1) {
 				System.out.println("check partner proof");
 				if(!partnerProof.isProbablyValid(params, bc, pg)) {
 					System.out.println("proof of mix partner is invalid, abort");
+					mixAbort();
 					return;
 				}
 				challengeResponse();
@@ -299,6 +310,17 @@ private void ping() {
 //			}
 		}
 	}
+	private void mixAbort() {
+		for (MixAbortEventListener listener : maListeners) {
+			listener.onMixAborted();
+		}
+	}
+
+	private void mixPassiveStarted(byte[] arg0, Identifier arg1) {
+		for (MixPassiveEventListener listener : mpListeners) {
+			listener.onMixPassive(arg0,arg1);
+		}
+	}
 
 
 	private void challengeResponse() {
@@ -352,8 +374,8 @@ public void listenForMix() {
 
 			@Override
 			public void messageReceived(byte[] arg0, Identifier arg1) {
-						mixPartnerAdress = arg1;
-						passiveMix(arg0);
+				System.out.println("Mix request received, mixing passive");
+				mixPassiveStarted(arg0, arg1);
 			}
 		});
 
@@ -486,7 +508,8 @@ public void messageReceived(byte[] arg0, Identifier arg1) {
 				@Override
 				public void messageReceived(byte[] arg0, Identifier arg1) {
 					// add our output, sign and send to partner then
-					final Transaction penFinalTx = deserializeTransaction(arg0);
+					try {
+						final Transaction penFinalTx = deserializeTransaction(arg0);
 					if(!checkTxInputIsFromProof(penFinalTx, 1)) {
 						System.out.println("checktxinputisfromproof failed");
 					}
@@ -511,6 +534,11 @@ public void messageReceived(byte[] arg0, Identifier arg1) {
 					});
 					wallet.ptp.sendMessage(penFinalTx.bitcoinSerialize(), mixPartnerAdress);
 					System.out.println("done");
+					} catch (Exception e) {
+						e.printStackTrace();
+						mixAbort();
+						return;
+					}
 				}
 			});
 			this.wallet.ptp.sendMessage(serializedTx, this.mixPartnerAdress);
@@ -653,6 +681,22 @@ public void addMixFinishedEventListener(MixFinishedEventListener listener) {
 	public void removeMixFinishedEventListener(MixFinishedEventListener listener) {
 		mfListeners.remove(listener);
 	}
+
+	public void addMixAbortEventListener(MixAbortEventListener listener) {
+		maListeners.add(listener);
+	}
+
+	public void removeMixAbortEventListener(MixAbortEventListener listener) {
+		maListeners.remove(listener);
+	}
+
+	public void addMixPassiveEventListener(MixPassiveEventListener listener) {
+		mpListeners.add(listener);
+	}
+
+	public void removeMixPassiveEventListener(MixPassiveEventListener listener) {
+		mpListeners.remove(listener);
+	}
 
 	public void setMixPartnerAdress(String onion) {
 		this.mixPartnerAdress = new Identifier(onion);
@@ -666,6 +710,9 @@ public void setBroadcastAnnouncement(BroadcastAnnouncement bca) {
 		this.bca = bca;
 		this.mixPartnerAdress = new Identifier(bca.getOnionAdress() + ".onion");
 	}
+	public List<MixAbortEventListener> getMaListeners() {
+		return maListeners;
+	}
 
 
 	public void setLockTime(int lockTime) {