kit-tm · sfriebe · Aug 3, 2017 · Sep 6, 2017 · Sep 6, 2017 · Sep 6, 2017
diff --git a/.classpath b/.classpath
@@ -2,21 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/home/kai/code/bachelor/bitnym-julien/PTP.jar"/>
-	<classpathentry kind="lib" path="/home/kai/code/bachelor/bitnym-julien/bitcoinj-core-0.14.3-bundled.jar"/>
-	<classpathentry kind="lib" path="/home/kai/code/bachelor/bitnym-julien/slf4j-simple-1.6.2.jar"/>
-<classpathentry kind="lib" path="/home/kai/.gradle/caches/modules-2/files-2.1/net.freehaven.tor.control/jtorctl/0.2/30426db3d3be31969f46ed4217227529224d92af/jtorctl-0.2.jar"/>
-	<classpathentry sourcepath="/home/kai/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.3/ccfa0721eae567b3c47cfaf3cca20e2491362bf6/commons-net-3.3-sources.jar" kind="lib" path="/home/kai/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.3/cd0d5510908225f76c5fe5a3f1df4fa44866f81e/commons-net-3.3.jar"/>
-	<classpathentry sourcepath="/home/kai/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.10/11fb3d88ae7e3b757d70237064210ceb954a5a04/commons-codec-1.10-sources.jar" kind="lib" path="/home/kai/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.10/4b95f4897fa13f2cd904aee711aeafc0c5295cd8/commons-codec-1.10.jar"/>
-	<classpathentry sourcepath="/home/kai/.gradle/caches/modules-2/files-2.1/org.bouncycastle/bcprov-jdk15on/1.54/27cf7631a904e6b98d9842db13e09a22e524eee4/bcprov-jdk15on-1.54-sources.jar" kind="lib" path="/home/kai/.gradle/caches/modules-2/files-2.1/org.bouncycastle/bcprov-jdk15on/1.54/1acdedeb89f1d950d67b73d481eb7736df65eedb/bcprov-jdk15on-1.54.jar"/>
-	<classpathentry sourcepath="/home/kai/.gradle/caches/modules-2/files-2.1/org.bouncycastle/bcpkix-jdk15on/1.54/d821c78eae9e1abe83ec52985a0f5e206bfd61ab/bcpkix-jdk15on-1.54-sources.jar" kind="lib" path="/home/kai/.gradle/caches/modules-2/files-2.1/org.bouncycastle/bcpkix-jdk15on/1.54/b11bfee99bb11eea344de6e4a07fe89212c55c02/bcpkix-jdk15on-1.54.jar"/>
-	<classpathentry sourcepath="/home/kai/.gradle/caches/modules-2/files-2.1/com.esotericsoftware/kryo/3.0.3/a636c50d4c5db89b0ba5dfb4d408e4895293c134/kryo-3.0.3-sources.jar" kind="lib" path="/home/kai/.gradle/caches/modules-2/files-2.1/com.esotericsoftware/kryo/3.0.3/1ebca99f633ef31484176a727093e78c7fa43e7/kryo-3.0.3.jar"/>
-	<classpathentry sourcepath="/home/kai/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/findbugs-annotations/3.0.1/72e2503a4a881efe13229375613800613f85eaee/findbugs-annotations-3.0.1-sources.jar" kind="lib" path="/home/kai/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/findbugs-annotations/3.0.1/bf2342edabc0fc37fc0b1de0b03f071bef935c3/findbugs-annotations-3.0.1.jar"/>
-	<classpathentry sourcepath="/home/kai/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar" kind="lib" path="/home/kai/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar"/>
-	<classpathentry sourcepath="/home/kai/.gradle/caches/modules-2/files-2.1/com.esotericsoftware/reflectasm/1.10.1/50a86c1d28691acea0e5473ace066c344469c86d/reflectasm-1.10.1-sources.jar" kind="lib" path="/home/kai/.gradle/caches/modules-2/files-2.1/com.esotericsoftware/reflectasm/1.10.1/515402cd542ab967a1b5028b4dee1e1800db205b/reflectasm-1.10.1.jar"/>
-	<classpathentry sourcepath="/home/kai/.gradle/caches/modules-2/files-2.1/com.esotericsoftware/minlog/1.3.0/9ee9f7fe99d5acfcb974e28acbad9349fb33a765/minlog-1.3.0-sources.jar" kind="lib" path="/home/kai/.gradle/caches/modules-2/files-2.1/com.esotericsoftware/minlog/1.3.0/ff07b5f1b01d2f92bb00a337f9a94873712f0827/minlog-1.3.0.jar"/>
-	<classpathentry sourcepath="/home/kai/.gradle/caches/modules-2/files-2.1/org.objenesis/objenesis/2.1/611a57d836e2c320d59f9851d4ad587f3c8472e/objenesis-2.1-sources.jar" kind="lib" path="/home/kai/.gradle/caches/modules-2/files-2.1/org.objenesis/objenesis/2.1/87c0ea803b69252868d09308b4618f766f135a96/objenesis-2.1.jar"/>
-	<classpathentry sourcepath="/home/kai/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar" kind="lib" path="/home/kai/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar"/>
-	<classpathentry sourcepath="/home/kai/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm/5.0.3/f0f24f6666c1a15c7e202e91610476bd4ce59368/asm-5.0.3-sources.jar" kind="lib" path="/home/kai/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm/5.0.3/dcc2193db20e19e1feca8b1240dbbc4e190824fa/asm-5.0.3.jar"/>
+	<classpathentry kind="lib" path="../../jars/libs/bitcoinj-core-0.14.4-bundled.jar"/>
+	<classpathentry kind="lib" path="../../jars/libs/PTP-full.jar" sourcepath="../PTP/src/main"/>
+	<classpathentry kind="lib" path="../../jars/libs/slf4j-simple-1.7.21.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 blockstore.bc
 wallet.wa
 hidden_services
+bin/
+ident2/
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/PTP.jar b/PTP.jar
diff --git a/PTPRawAPILock b/PTPRawAPILock
diff --git a/PTPTorManagerPorts b/PTPTorManagerPorts
diff --git a/bin/bitnymWallet/BitNymGui$1.class b/bin/bitnymWallet/BitNymGui$1.class
diff --git a/bin/bitnymWallet/BitNymGui$2.class b/bin/bitnymWallet/BitNymGui$2.class
diff --git a/bin/bitnymWallet/BitNymGui$3.class b/bin/bitnymWallet/BitNymGui$3.class
diff --git a/bin/bitnymWallet/BitNymGui$4.class b/bin/bitnymWallet/BitNymGui$4.class
diff --git a/bin/bitnymWallet/BitNymGui$5.class b/bin/bitnymWallet/BitNymGui$5.class
diff --git a/bin/bitnymWallet/BitNymGui$6.class b/bin/bitnymWallet/BitNymGui$6.class
diff --git a/bin/bitnymWallet/BitNymGui.class b/bin/bitnymWallet/BitNymGui.class
diff --git a/bin/bitnymWallet/BitNymWallet$1.class b/bin/bitnymWallet/BitNymWallet$1.class
diff --git a/bin/bitnymWallet/BitNymWallet$2.class b/bin/bitnymWallet/BitNymWallet$2.class
diff --git a/bin/bitnymWallet/BitNymWallet$3.class b/bin/bitnymWallet/BitNymWallet$3.class
diff --git a/bin/bitnymWallet/BitNymWallet$4.class b/bin/bitnymWallet/BitNymWallet$4.class
diff --git a/bin/bitnymWallet/BitNymWallet$5.class b/bin/bitnymWallet/BitNymWallet$5.class
diff --git a/bin/bitnymWallet/BitNymWallet.class b/bin/bitnymWallet/BitNymWallet.class
diff --git a/bin/bitnymWallet/BroadcastAnnouncement.class b/bin/bitnymWallet/BroadcastAnnouncement.class
diff --git a/bin/bitnymWallet/BroadcastAnnouncementChangeEventListener.class b/bin/bitnymWallet/BroadcastAnnouncementChangeEventListener.class
diff --git a/bin/bitnymWallet/CLTVScriptPair.class b/bin/bitnymWallet/CLTVScriptPair.class
diff --git a/bin/bitnymWallet/CLTVScriptPairTest.class b/bin/bitnymWallet/CLTVScriptPairTest.class
diff --git a/bin/bitnymWallet/ChallengeResponseVerifier$1.class b/bin/bitnymWallet/ChallengeResponseVerifier$1.class
diff --git a/bin/bitnymWallet/ChallengeResponseVerifier$2.class b/bin/bitnymWallet/ChallengeResponseVerifier$2.class
diff --git a/bin/bitnymWallet/ChallengeResponseVerifier$3$1.class b/bin/bitnymWallet/ChallengeResponseVerifier$3$1.class
diff --git a/bin/bitnymWallet/ChallengeResponseVerifier$3.class b/bin/bitnymWallet/ChallengeResponseVerifier$3.class
diff --git a/bin/bitnymWallet/ChallengeResponseVerifier.class b/bin/bitnymWallet/ChallengeResponseVerifier.class
diff --git a/bin/bitnymWallet/MainClass$1.class b/bin/bitnymWallet/MainClass$1.class
diff --git a/bin/bitnymWallet/MainClass.class b/bin/bitnymWallet/MainClass.class
diff --git a/bin/bitnymWallet/MixFinishedEventListener.class b/bin/bitnymWallet/MixFinishedEventListener.class
diff --git a/bin/bitnymWallet/MixPartnerDiscovery.class b/bin/bitnymWallet/MixPartnerDiscovery.class
diff --git a/bin/bitnymWallet/Mixer$1.class b/bin/bitnymWallet/Mixer$1.class
diff --git a/bin/bitnymWallet/Mixer$10.class b/bin/bitnymWallet/Mixer$10.class
diff --git a/bin/bitnymWallet/Mixer$11.class b/bin/bitnymWallet/Mixer$11.class
diff --git a/bin/bitnymWallet/Mixer$2$1.class b/bin/bitnymWallet/Mixer$2$1.class
diff --git a/bin/bitnymWallet/Mixer$2$2.class b/bin/bitnymWallet/Mixer$2$2.class
diff --git a/bin/bitnymWallet/Mixer$2.class b/bin/bitnymWallet/Mixer$2.class
diff --git a/bin/bitnymWallet/Mixer$3.class b/bin/bitnymWallet/Mixer$3.class
diff --git a/bin/bitnymWallet/Mixer$4.class b/bin/bitnymWallet/Mixer$4.class
diff --git a/bin/bitnymWallet/Mixer$5.class b/bin/bitnymWallet/Mixer$5.class
diff --git a/bin/bitnymWallet/Mixer$6.class b/bin/bitnymWallet/Mixer$6.class
diff --git a/bin/bitnymWallet/Mixer$7.class b/bin/bitnymWallet/Mixer$7.class
diff --git a/bin/bitnymWallet/Mixer$8$1.class b/bin/bitnymWallet/Mixer$8$1.class
diff --git a/bin/bitnymWallet/Mixer$8.class b/bin/bitnymWallet/Mixer$8.class
diff --git a/bin/bitnymWallet/Mixer$9.class b/bin/bitnymWallet/Mixer$9.class
diff --git a/bin/bitnymWallet/Mixer.class b/bin/bitnymWallet/Mixer.class
diff --git a/bin/bitnymWallet/NoBroadcastAnnouncementsException.class b/bin/bitnymWallet/NoBroadcastAnnouncementsException.class
diff --git a/bin/bitnymWallet/ProofChangeEventListener.class b/bin/bitnymWallet/ProofChangeEventListener.class
diff --git a/bin/bitnymWallet/ProofConfidenceChangeEventListener.class b/bin/bitnymWallet/ProofConfidenceChangeEventListener.class
diff --git a/bin/bitnymWallet/ProofMessage$1.class b/bin/bitnymWallet/ProofMessage$1.class
diff --git a/bin/bitnymWallet/ProofMessage$1BooleanWrapper.class b/bin/bitnymWallet/ProofMessage$1BooleanWrapper.class
diff --git a/bin/bitnymWallet/ProofMessage$2.class b/bin/bitnymWallet/ProofMessage$2.class
diff --git a/bin/bitnymWallet/ProofMessage$3.class b/bin/bitnymWallet/ProofMessage$3.class
diff --git a/bin/bitnymWallet/ProofMessage.class b/bin/bitnymWallet/ProofMessage.class
diff --git a/bin/bitnymWallet/TimeChangedEventListener.class b/bin/bitnymWallet/TimeChangedEventListener.class
diff --git a/bin/bitnymWallet/TransactionGenerator.class b/bin/bitnymWallet/TransactionGenerator.class
diff --git a/bin/gui/BroadcastsController.class b/bin/gui/BroadcastsController.class
diff --git a/bin/gui/BroadcastsView.class b/bin/gui/BroadcastsView.class
diff --git a/bin/gui/ConsoleController.class b/bin/gui/ConsoleController.class
diff --git a/bin/gui/ConsoleView.class b/bin/gui/ConsoleView.class
diff --git a/bin/gui/MixerController$1.class b/bin/gui/MixerController$1.class
diff --git a/bin/gui/MixerController$2.class b/bin/gui/MixerController$2.class
diff --git a/bin/gui/MixerController$3.class b/bin/gui/MixerController$3.class
diff --git a/bin/gui/MixerController$4.class b/bin/gui/MixerController$4.class
diff --git a/bin/gui/MixerController$5.class b/bin/gui/MixerController$5.class
diff --git a/bin/gui/MixerController$6.class b/bin/gui/MixerController$6.class
diff --git a/bin/gui/MixerController$7.class b/bin/gui/MixerController$7.class
diff --git a/bin/gui/MixerController$8.class b/bin/gui/MixerController$8.class
diff --git a/bin/gui/MixerController$9.class b/bin/gui/MixerController$9.class
diff --git a/bin/gui/MixerController.class b/bin/gui/MixerController.class
diff --git a/bin/gui/MixerView.class b/bin/gui/MixerView.class
diff --git a/bin/gui/ProofController.class b/bin/gui/ProofController.class
diff --git a/bin/gui/ProofView.class b/bin/gui/ProofView.class
diff --git a/bitcoinj-core-0.14.3-bundled.jar b/bitcoinj-core-0.14.3-bundled.jar