Merge branch '0.25.0'

Qoracoin · Feb 15, 2016 · 5306699 · 5306699
2 parents 583f29d + 87252a6
commit 5306699
Show file tree

Hide file tree

Showing 589 changed files with 16,102 additions and 2,517 deletions.
diff --git a/Qora/.classpath b/Qora/.classpath
@@ -55,31 +55,6 @@
 	<classpathentry kind="lib" path="libs/jersey/ext/jersey-guava-2.19.jar"/>
 	<classpathentry kind="lib" path="libs/slf4j-api-1.7.12.jar"/>
 	<classpathentry kind="lib" path="libs/slf4j-nop-1.7.12.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-alpn-client-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-alpn-server-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-annotations-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-cdi-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-client-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-continuation-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-deploy-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-http-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-io-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-jaas-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-jaspi-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-jmx-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-jndi-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-plus-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-proxy-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-quickstart-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-rewrite-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-schemas-3.1.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-security-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-server-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-servlet-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-servlets-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-util-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-webapp-9.2.11.v20150529.jar"/>
-	<classpathentry kind="lib" path="libs/jetty/jetty-xml-9.2.11.v20150529.jar"/>
 	<classpathentry kind="lib" path="libs/jetty/servlet-api-3.1.jar"/>
 	<classpathentry kind="lib" path="libs/mapdb-1.0.7.jar" sourcepath="libs/sourceandjavadoc/mapdb-1.0.7-sources.jar">
 		<attributes>
@@ -100,6 +75,31 @@
 			<attribute name="javadoc_location" value="jar:platform:/resource/Qora/libs/sourceandjavadoc/pebble-1.6.0-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="libs/bcprov-jdk15on-153.jar"/>
+	<classpathentry kind="lib" path="libs/bcprov-jdk15on-154.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-alpn-client-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-alpn-server-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-annotations-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-cdi-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-client-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-continuation-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-deploy-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-http-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-io-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-jaas-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-jaspi-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-jmx-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-jndi-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-plus-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-proxy-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-quickstart-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-rewrite-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-schemas-3.1.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-security-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-server-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-servlet-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-servlets-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-util-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-webapp-9.2.15.v20160210.jar"/>
+	<classpathentry kind="lib" path="libs/jetty/jetty-xml-9.2.15.v20160210.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Qora/images/icons/icon128.png b/Qora/images/icons/icon128.png
diff --git a/Qora/images/icons/icon16.png b/Qora/images/icons/icon16.png
diff --git a/Qora/images/icons/icon32.png b/Qora/images/icons/icon32.png
diff --git a/Qora/images/icons/icon64.png b/Qora/images/icons/icon64.png
diff --git a/Qora/libs/bcprov-jdk15on-153.jar → Qora/libs/bcprov-jdk15on-154.jar b/Qora/libs/bcprov-jdk15on-153.jar → Qora/libs/bcprov-jdk15on-154.jar
diff --git a/Qora/libs/jetty/annotations/asm-5.0.1.jar b/Qora/libs/jetty/annotations/asm-5.0.1.jar
diff --git a/Qora/libs/jetty/annotations/asm-commons-5.0.1.jar b/Qora/libs/jetty/annotations/asm-commons-5.0.1.jar
diff --git a/Qora/libs/jetty/annotations/javax.annotation-api-1.2.jar b/Qora/libs/jetty/annotations/javax.annotation-api-1.2.jar
diff --git a/Qora/libs/jetty/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.11.v20150529.jar b/Qora/libs/jetty/apache-jsp/org.eclipse.jetty.apache-jsp-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/apache-jsp/org.eclipse.jetty.orbit.org.eclipse.jdt.core-3.8.2.v20130121.jar b/Qora/libs/jetty/apache-jsp/org.eclipse.jetty.orbit.org.eclipse.jdt.core-3.8.2.v20130121.jar
diff --git a/Qora/libs/jetty/apache-jsp/org.mortbay.jasper.apache-el-8.0.9.M3.jar b/Qora/libs/jetty/apache-jsp/org.mortbay.jasper.apache-el-8.0.9.M3.jar
diff --git a/Qora/libs/jetty/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.9.M3.jar b/Qora/libs/jetty/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.9.M3.jar
diff --git a/Qora/libs/jetty/apache-jstl/org.apache.taglibs.taglibs-standard-impl-1.2.1.jar b/Qora/libs/jetty/apache-jstl/org.apache.taglibs.taglibs-standard-impl-1.2.1.jar
diff --git a/Qora/libs/jetty/apache-jstl/org.apache.taglibs.taglibs-standard-spec-1.2.1.jar b/Qora/libs/jetty/apache-jstl/org.apache.taglibs.taglibs-standard-spec-1.2.1.jar
diff --git a/Qora/libs/jetty/ext/.donotdelete b/Qora/libs/jetty/ext/.donotdelete
diff --git a/Qora/libs/jetty/fcgi/fcgi-client-9.2.11.v20150529.jar b/Qora/libs/jetty/fcgi/fcgi-client-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/fcgi/fcgi-server-9.2.11.v20150529.jar b/Qora/libs/jetty/fcgi/fcgi-server-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/jaspi/javax.security.auth.message-1.0.0.v201108011116.jar b/Qora/libs/jetty/jaspi/javax.security.auth.message-1.0.0.v201108011116.jar
diff --git a/Qora/libs/jetty/jetty-alpn-client-9.2.11.v20150529.jar b/Qora/libs/jetty/jetty-alpn-client-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/jetty-alpn-client-9.2.15.v20160210.jar b/Qora/libs/jetty/jetty-alpn-client-9.2.15.v20160210.jar
diff --git a/...ty/jetty-alpn-server-9.2.11.v20150529.jar → ...ty/jetty-alpn-server-9.2.15.v20160210.jar b/...ty/jetty-alpn-server-9.2.11.v20150529.jar → ...ty/jetty-alpn-server-9.2.15.v20160210.jar
diff --git a/...ty/jetty-annotations-9.2.11.v20150529.jar → ...ty/jetty-annotations-9.2.15.v20160210.jar b/...ty/jetty-annotations-9.2.11.v20150529.jar → ...ty/jetty-annotations-9.2.15.v20160210.jar
diff --git a/...libs/jetty/jetty-cdi-9.2.11.v20150529.jar → ...libs/jetty/jetty-cdi-9.2.15.v20160210.jar b/...libs/jetty/jetty-cdi-9.2.11.v20150529.jar → ...libs/jetty/jetty-cdi-9.2.15.v20160210.jar
diff --git a/...s/jetty/jetty-client-9.2.11.v20150529.jar → ...s/jetty/jetty-client-9.2.15.v20160210.jar b/...s/jetty/jetty-client-9.2.11.v20150529.jar → ...s/jetty/jetty-client-9.2.15.v20160210.jar
diff --git a/...y/jetty-continuation-9.2.11.v20150529.jar → ...y/jetty-continuation-9.2.15.v20160210.jar b/...y/jetty-continuation-9.2.11.v20150529.jar → ...y/jetty-continuation-9.2.15.v20160210.jar
diff --git a/...s/jetty/jetty-deploy-9.2.11.v20150529.jar → ...s/jetty/jetty-deploy-9.2.15.v20160210.jar b/...s/jetty/jetty-deploy-9.2.11.v20150529.jar → ...s/jetty/jetty-deploy-9.2.15.v20160210.jar
diff --git a/Qora/libs/jetty/jetty-http-9.2.11.v20150529.jar b/Qora/libs/jetty/jetty-http-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/jetty-http-9.2.15.v20160210.jar b/Qora/libs/jetty/jetty-http-9.2.15.v20160210.jar
diff --git a/.../libs/jetty/jetty-io-9.2.11.v20150529.jar → .../libs/jetty/jetty-io-9.2.15.v20160210.jar b/.../libs/jetty/jetty-io-9.2.11.v20150529.jar → .../libs/jetty/jetty-io-9.2.15.v20160210.jar
diff --git a/...ibs/jetty/jetty-jaas-9.2.11.v20150529.jar → ...ibs/jetty/jetty-jaas-9.2.15.v20160210.jar b/...ibs/jetty/jetty-jaas-9.2.11.v20150529.jar → ...ibs/jetty/jetty-jaas-9.2.15.v20160210.jar
diff --git a/...bs/jetty/jetty-jaspi-9.2.11.v20150529.jar → ...bs/jetty/jetty-jaspi-9.2.15.v20160210.jar b/...bs/jetty/jetty-jaspi-9.2.11.v20150529.jar → ...bs/jetty/jetty-jaspi-9.2.15.v20160210.jar
diff --git a/...libs/jetty/jetty-jmx-9.2.11.v20150529.jar → ...libs/jetty/jetty-jmx-9.2.15.v20160210.jar b/...libs/jetty/jetty-jmx-9.2.11.v20150529.jar → ...libs/jetty/jetty-jmx-9.2.15.v20160210.jar
diff --git a/...ibs/jetty/jetty-jndi-9.2.11.v20150529.jar → ...ibs/jetty/jetty-jndi-9.2.15.v20160210.jar b/...ibs/jetty/jetty-jndi-9.2.11.v20150529.jar → ...ibs/jetty/jetty-jndi-9.2.15.v20160210.jar
diff --git a/...ibs/jetty/jetty-plus-9.2.11.v20150529.jar → ...ibs/jetty/jetty-plus-9.2.15.v20160210.jar b/...ibs/jetty/jetty-plus-9.2.11.v20150529.jar → ...ibs/jetty/jetty-plus-9.2.15.v20160210.jar
diff --git a/Qora/libs/jetty/jetty-proxy-9.2.11.v20150529.jar b/Qora/libs/jetty/jetty-proxy-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/jetty-proxy-9.2.15.v20160210.jar b/Qora/libs/jetty/jetty-proxy-9.2.15.v20160210.jar
diff --git a/...tty/jetty-quickstart-9.2.11.v20150529.jar → ...tty/jetty-quickstart-9.2.15.v20160210.jar b/...tty/jetty-quickstart-9.2.11.v20150529.jar → ...tty/jetty-quickstart-9.2.15.v20160210.jar
diff --git a/.../jetty/jetty-rewrite-9.2.11.v20150529.jar → .../jetty/jetty-rewrite-9.2.15.v20160210.jar b/.../jetty/jetty-rewrite-9.2.11.v20150529.jar → .../jetty/jetty-rewrite-9.2.15.v20160210.jar
diff --git a/...jetty/jetty-security-9.2.11.v20150529.jar → ...jetty/jetty-security-9.2.15.v20160210.jar b/...jetty/jetty-security-9.2.11.v20150529.jar → ...jetty/jetty-security-9.2.15.v20160210.jar
diff --git a/...s/jetty/jetty-server-9.2.11.v20150529.jar → ...s/jetty/jetty-server-9.2.15.v20160210.jar b/...s/jetty/jetty-server-9.2.11.v20150529.jar → ...s/jetty/jetty-server-9.2.15.v20160210.jar
diff --git a/.../jetty/jetty-servlet-9.2.11.v20150529.jar → .../jetty/jetty-servlet-9.2.15.v20160210.jar b/.../jetty/jetty-servlet-9.2.11.v20150529.jar → .../jetty/jetty-servlet-9.2.15.v20160210.jar
diff --git a/...jetty/jetty-servlets-9.2.11.v20150529.jar → ...jetty/jetty-servlets-9.2.15.v20160210.jar b/...jetty/jetty-servlets-9.2.11.v20150529.jar → ...jetty/jetty-servlets-9.2.15.v20160210.jar
diff --git a/...ibs/jetty/jetty-util-9.2.11.v20150529.jar → ...ibs/jetty/jetty-util-9.2.15.v20160210.jar b/...ibs/jetty/jetty-util-9.2.11.v20150529.jar → ...ibs/jetty/jetty-util-9.2.15.v20160210.jar
diff --git a/...s/jetty/jetty-webapp-9.2.11.v20150529.jar → ...s/jetty/jetty-webapp-9.2.15.v20160210.jar b/...s/jetty/jetty-webapp-9.2.11.v20150529.jar → ...s/jetty/jetty-webapp-9.2.15.v20160210.jar
diff --git a/...libs/jetty/jetty-xml-9.2.11.v20150529.jar → ...libs/jetty/jetty-xml-9.2.15.v20160210.jar b/...libs/jetty/jetty-xml-9.2.11.v20150529.jar → ...libs/jetty/jetty-xml-9.2.15.v20160210.jar
diff --git a/Qora/libs/jetty/jndi/javax.mail.glassfish-1.4.1.v201005082020.jar b/Qora/libs/jetty/jndi/javax.mail.glassfish-1.4.1.v201005082020.jar
diff --git a/Qora/libs/jetty/jndi/javax.transaction-api-1.2.jar b/Qora/libs/jetty/jndi/javax.transaction-api-1.2.jar
diff --git a/Qora/libs/jetty/jsp/javax.el-3.0.0.jar b/Qora/libs/jetty/jsp/javax.el-3.0.0.jar
diff --git a/Qora/libs/jetty/jsp/javax.servlet.jsp-2.3.2.jar b/Qora/libs/jetty/jsp/javax.servlet.jsp-2.3.2.jar
diff --git a/Qora/libs/jetty/jsp/javax.servlet.jsp-api-2.3.1.jar b/Qora/libs/jetty/jsp/javax.servlet.jsp-api-2.3.1.jar
diff --git a/Qora/libs/jetty/jsp/javax.servlet.jsp.jstl-1.2.2.jar b/Qora/libs/jetty/jsp/javax.servlet.jsp.jstl-1.2.2.jar
diff --git a/Qora/libs/jetty/jsp/jetty-jsp-9.2.11.v20150529.jar b/Qora/libs/jetty/jsp/jetty-jsp-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/jsp/jetty-jsp-jdt-2.3.3.jar b/Qora/libs/jetty/jsp/jetty-jsp-jdt-2.3.3.jar
diff --git a/Qora/libs/jetty/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar b/Qora/libs/jetty/jsp/org.eclipse.jdt.core-3.8.2.v20130121.jar
diff --git a/Qora/libs/jetty/jsp/org.eclipse.jetty.orbit.javax.servlet.jsp.jstl-1.2.0.v201105211821.jar b/Qora/libs/jetty/jsp/org.eclipse.jetty.orbit.javax.servlet.jsp.jstl-1.2.0.v201105211821.jar
diff --git a/Qora/libs/jetty/monitor/jetty-monitor-9.2.11.v20150529.jar b/Qora/libs/jetty/monitor/jetty-monitor-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/setuid/jetty-setuid-java-1.0.1.jar b/Qora/libs/jetty/setuid/jetty-setuid-java-1.0.1.jar
diff --git a/Qora/libs/jetty/setuid/libsetuid-linux.so b/Qora/libs/jetty/setuid/libsetuid-linux.so
diff --git a/Qora/libs/jetty/setuid/libsetuid-osx.so b/Qora/libs/jetty/setuid/libsetuid-osx.so
diff --git a/Qora/libs/jetty/spdy/spdy-client-9.2.11.v20150529.jar b/Qora/libs/jetty/spdy/spdy-client-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/spdy/spdy-core-9.2.11.v20150529.jar b/Qora/libs/jetty/spdy/spdy-core-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/spdy/spdy-http-common-9.2.11.v20150529.jar b/Qora/libs/jetty/spdy/spdy-http-common-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/spdy/spdy-http-server-9.2.11.v20150529.jar b/Qora/libs/jetty/spdy/spdy-http-server-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/spdy/spdy-server-9.2.11.v20150529.jar b/Qora/libs/jetty/spdy/spdy-server-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/spring/jetty-spring-9.2.11.v20150529.jar b/Qora/libs/jetty/spring/jetty-spring-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/websocket/javax-websocket-client-impl-9.2.11.v20150529.jar b/Qora/libs/jetty/websocket/javax-websocket-client-impl-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/websocket/javax-websocket-server-impl-9.2.11.v20150529.jar b/Qora/libs/jetty/websocket/javax-websocket-server-impl-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/websocket/javax.websocket-api-1.0.jar b/Qora/libs/jetty/websocket/javax.websocket-api-1.0.jar
diff --git a/Qora/libs/jetty/websocket/websocket-api-9.2.11.v20150529.jar b/Qora/libs/jetty/websocket/websocket-api-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/websocket/websocket-client-9.2.11.v20150529.jar b/Qora/libs/jetty/websocket/websocket-client-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/websocket/websocket-common-9.2.11.v20150529.jar b/Qora/libs/jetty/websocket/websocket-common-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/websocket/websocket-server-9.2.11.v20150529.jar b/Qora/libs/jetty/websocket/websocket-server-9.2.11.v20150529.jar
diff --git a/Qora/libs/jetty/websocket/websocket-servlet-9.2.11.v20150529.jar b/Qora/libs/jetty/websocket/websocket-servlet-9.2.11.v20150529.jar
diff --git a/Qora/peers.json b/Qora/peers.json
@@ -8,7 +8,13 @@
 		"203.87.156.149",
 		"188.166.16.64",
 		"167.114.97.142",
+<<<<<<< HEAD
+		"91.89.34.169"
+	]
+}
+=======
 		"91.89.34.169",
 		"106.186.122.39"
 	]
 }
+>>>>>>> master
diff --git a/Qora/settings.json b/Qora/settings.json
@@ -1,16 +1,18 @@
 {
 	"knownpeers":[
-		"192.243.117.77",
-		"193.242.149.63",
-		"130.180.201.117",
 		"188.166.53.239",
-		"188.166.16.64",
-		"106.186.122.39",
-		"91.89.150.241",
+		"37.157.193.229",
+		"203.87.156.149",
+		"106.187.42.214",
 		"104.172.66.205",
+		"91.89.34.169",
+		"167.114.97.142",
+		"198.199.103.12",
+		"106.186.122.39",
+		"188.166.16.64",
 		"130.180.201.117",
 		"61.186.94.151",
-		"78.42.234.55"
+		"193.242.148.251"
 	],
 	"rpcallowed":[
 		"127.0.0.1"

diff --git a/Qora/src/Start.java b/Qora/src/Start.java
@@ -1,13 +1,13 @@
-import gui.Gui;
-
 import java.util.Scanner;
 
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
 
 import api.ApiClient;
 import controller.Controller;
+import gui.Gui;
 import settings.Settings;
+import utils.BuildTime;
 import utils.SysTray;
 
 public class Start {
@@ -21,6 +21,15 @@ public static void main(String args[])
 			if(arg.equals("-cli"))
 			{
 				cli = true;
+			} if(arg.equals("-testnet")) {
+				Settings.getInstance().setGenesisStamp(System.currentTimeMillis());
+			} else if(arg.startsWith("-testnet=") && arg.length() > 9) {
+				try
+				{
+					Settings.getInstance().setGenesisStamp(Long.parseLong(arg.substring(9)));
+				} catch(Exception e) {
+					Settings.getInstance().setGenesisStamp(Settings.DEFAULT_MAINNET_STAMP);
+				}
 			}
 		}
 
@@ -34,6 +43,8 @@ public static void main(String args[])
 					throw new Exception("Both gui and rpc cannot be disabled!");
 				}
 
+				System.out.println("Starting Qora / version: "+ Controller.getInstance().getVersion() + " / buildtime: " + BuildTime.getInstance().getBuildDateTimeString() + " / ...");
+
 				//STARTING NETWORK/BLOCKCHAIN/RPC
 				Controller.getInstance().start();
 

diff --git a/Qora/src/api/ATResource.java b/Qora/src/api/ATResource.java
@@ -156,7 +156,9 @@ public String deployAT(String x)
 			{
 				throw ApiErrorFactory.getInstance().createError(ApiErrorFactory.ERROR_INVALID_SENDER);
 			}
-
+
+			APIUtils.askAPICallAllowed("POST at "+ x, request);
+
 			//CHECK IF WALLET EXISTS
 			if(!Controller.getInstance().doesWalletExists())
 			{
@@ -168,9 +170,7 @@ public String deployAT(String x)
 			{
 				throw ApiErrorFactory.getInstance().createError(ApiErrorFactory.ERROR_WALLET_LOCKED);
 			}
-
-			APIUtils.askAPICallAllowed("POST at "+ x, request);
-
+
 			//GET ACCOUNT
 			PrivateKeyAccount account = Controller.getInstance().getPrivateKeyAccountByAddress(creator);				
 			if(account == null)
@@ -328,7 +328,7 @@ else if(dpages * 256 <= 32767)
 
 			switch(result.getB())
 			{
-			case Transaction.VALIDATE_OKE:
+			case Transaction.VALIDATE_OK:
 				return result.getA().toJson().toJSONString();
 			case Transaction.INVALID_CREATION_BYTES:
 				throw ApiErrorFactory.getInstance().createError(ApiErrorFactory.ERROR_INVALID_CREATION_BYTES);

diff --git a/Qora/src/api/AddressesResource.java b/Qora/src/api/AddressesResource.java
@@ -41,6 +41,8 @@ public class AddressesResource {
 	@SuppressWarnings("unchecked")
 	@GET
 	public String getAddresses() {
+		APIUtils.askAPICallAllowed("GET addresses", request);
+
 		// CHECK IF WALLET EXISTS
 		if (!Controller.getInstance().doesWalletExists()) {
 			throw ApiErrorFactory.getInstance().createError(
@@ -70,6 +72,8 @@ public String validate(@PathParam("address") String address) {
 	@GET
 	@Path("/seed/{address}")
 	public String getSeed(@PathParam("address") String address) {
+		APIUtils.askAPICallAllowed("GET addresses/seed/" + address+ "\nWARNING, your seed will be revealed to the caller!", request);
+
 		// CHECK IF WALLET EXISTS
 		if (!Controller.getInstance().doesWalletExists()) {
 			throw ApiErrorFactory.getInstance().createError(
@@ -82,8 +86,6 @@ public String getSeed(@PathParam("address") String address) {
 					ApiErrorFactory.ERROR_WALLET_LOCKED);
 		}
 
-		APIUtils.askAPICallAllowed("GET addresses/seed/" + address+ "\nWARNING, your seed will be revealed to the caller!", request);
-
 		// CHECK IF VALID ADDRESS
 		if (!Crypto.getInstance().isValidAddress(address)) {
 			throw ApiErrorFactory.getInstance().createError(
@@ -104,6 +106,8 @@ public String getSeed(@PathParam("address") String address) {
 	@GET
 	@Path("/new")
 	public String generateNewAccount() {
+		APIUtils.askAPICallAllowed("GET addresses/new", request);
+
 		// CHECK IF WALLET EXISTS
 		if (!Controller.getInstance().doesWalletExists()) {
 			throw ApiErrorFactory.getInstance().createError(
@@ -115,8 +119,6 @@ public String generateNewAccount() {
 			throw ApiErrorFactory.getInstance().createError(
 					ApiErrorFactory.ERROR_WALLET_LOCKED);
 		}
-
-		APIUtils.askAPICallAllowed("GET addresses/new", request);
 
 		return Controller.getInstance().generateNewAccount();
 	}
@@ -126,6 +128,8 @@ public String generateNewAccount() {
 	public String createNewAddress(String x) {
 		// CHECK IF CONTENT IS EMPTY
 		if (x.isEmpty()) {
+			APIUtils.askAPICallAllowed("POST addresses seed\nGenerates a new account", request);
+
 			// CHECK IF WALLET EXISTS
 			if (!Controller.getInstance().doesWalletExists()) {
 				throw ApiErrorFactory.getInstance().createError(
@@ -137,13 +141,11 @@ public String createNewAddress(String x) {
 				throw ApiErrorFactory.getInstance().createError(
 						ApiErrorFactory.ERROR_WALLET_LOCKED);
 			}
-
-			APIUtils.askAPICallAllowed("POST addresses seed\nGenerates a new account", request);
-
-
 
 			return Controller.getInstance().generateNewAccount();
 		} else {
+			APIUtils.askAPICallAllowed("POST addresses seed\n " + x, request);
+
 			String seed = x;
 
 			// CHECK IF WALLET EXISTS
@@ -158,8 +160,6 @@ public String createNewAddress(String x) {
 						ApiErrorFactory.ERROR_WALLET_LOCKED);
 			}
 
-			APIUtils.askAPICallAllowed("POST addresses seed\n " + x, request);
-
 			// DECODE SEED
 			byte[] seedBytes;
 			try {
@@ -184,6 +184,8 @@ public String createNewAddress(String x) {
 	@DELETE
 	@Path("/{address}")
 	public String deleteAddress(@PathParam("address") String address) {
+		APIUtils.askAPICallAllowed("DELETE addresses/" + address, request );
+
 		// CHECK IF WALLET EXISTS
 		if (!Controller.getInstance().doesWalletExists()) {
 			throw ApiErrorFactory.getInstance().createError(
@@ -196,8 +198,6 @@ public String deleteAddress(@PathParam("address") String address) {
 					ApiErrorFactory.ERROR_WALLET_LOCKED);
 		}
 
-		APIUtils.askAPICallAllowed("DELETE addresses/" + address, request );
-
 		// CHECK IF VALID ADDRESS
 		if (!Crypto.getInstance().isValidAddress(address)) {
 			throw ApiErrorFactory.getInstance().createError(
@@ -302,6 +302,8 @@ public static String getGeneratingBalance(
 	@POST
 	@Path("sign/{address}")
 	public String sign(String x, @PathParam("address") String address) {
+		APIUtils.askAPICallAllowed("POST addresses/sign/"+ address, request);
+
 		// CHECK IF WALLET EXISTS
 		if (!Controller.getInstance().doesWalletExists()) {
 			throw ApiErrorFactory.getInstance().createError(
@@ -314,8 +316,6 @@ public String sign(String x, @PathParam("address") String address) {
 					ApiErrorFactory.ERROR_WALLET_LOCKED);
 		}
 
-		APIUtils.askAPICallAllowed("POST addresses/sign/"+ address, request);
-
 		// CHECK IF VALID ADDRESS
 		if (!Crypto.getInstance().isValidAddress(address)) {
 			throw ApiErrorFactory.getInstance().createError(