Files missing from previous commit (somehow)

.classpath

@@ -22,5 +22,21 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.settings/org.eclipse.jdt.core.prefs

@@ -9,6 +9,7 @@ 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.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.processAnnotations=enabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

lib/org/ciyam/at/maven-metadata-local.xml

@@ -7,6 +7,6 @@
     <versions>
       <version>1.0</version>
     </versions>
-    <lastUpdated>20181101172102</lastUpdated>
+    <lastUpdated>20181105100741</lastUpdated>
   </versioning>
 </metadata>

pom.xml

@@ -51,7 +51,7 @@
 					<execution>
 						<phase>generate-resources</phase>
 						<goals>
-							  <goal>replace</goal>
+							<goal>replace</goal>
 						</goals>
 					</execution>
 				</executions>
@@ -225,5 +225,23 @@
 			<artifactId>bitcoinj-core</artifactId>
 			<version>0.14.7</version>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on -->
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcprov-jdk15on</artifactId>
+			<version>1.60</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.12</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>1.7.12</version>
+		</dependency>
 	</dependencies>
 </project>

tests/test/ATTests.java

@@ -12,6 +12,7 @@ import data.at.ATStateData;
 import data.block.BlockData;
 import data.block.BlockTransactionData;
 import data.transaction.DeployATTransactionData;
+import qora.assets.Asset;
 import qora.transaction.DeployATTransaction;
 import repository.DataException;
 import repository.Repository;
@@ -45,8 +46,8 @@ public class ATTests extends Common {
 		byte[] reference = Base58.decode("2D3jX1pEgu6irsQ7QzJb85QP1D9M45dNyP5M9a3WFHndU5ZywF4F5pnUurcbzMnGMcTwpAY6H7DuLw8cUBU66ao1");
 		byte[] signature = Base58.decode("2dZ4megUyNoYYY7qWmuSd4xw1yUKgPPF97yBbeddh8aKuC8PLpz7Xvf3r6Zjv1zwGrR8fEAHuaztCPD4KQp76KdL");
 
-		DeployATTransactionData transactionData = new DeployATTransactionData(creatorPublicKey, name, description, ATType, tags, creationBytes, amount, fee,
-				timestamp, reference, signature);
+		DeployATTransactionData transactionData = new DeployATTransactionData(creatorPublicKey, name, description, ATType, tags, creationBytes, amount,
+				Asset.QORA, fee, timestamp, reference, signature);
 
 		try (final Repository repository = RepositoryManager.getRepository()) {
 			repository.getTransactionRepository().save(transactionData);

tests/test/BlockchainTests.java

@@ -1,7 +1,6 @@
 package test;
 
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
 
 import qora.block.BlockChain;
 import repository.DataException;

tests/test/Common.java

@@ -1,7 +1,5 @@
 package test;
 
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.AfterAll;
 

tests/test/NavigationTests.java

@@ -20,7 +20,7 @@ public class NavigationTests extends Common {
 			TransactionRepository transactionRepository = repository.getTransactionRepository();
 
 			assertTrue(repository.getBlockRepository().getBlockchainHeight() >= 49778,
-				"Migrate from old database to at least block 49778 before running this test");
+					"Migrate from old database to at least block 49778 before running this test");
 
 			String signature58 = "1211ZPwG3hk5evWzXCZi9hMDRpwumWmkENjwWkeTCik9xA5uoYnxzF7rwR5hmHH3kG2RXo7ToCAaRc7dvnynByJt";
 			byte[] signature = Base58.decode(signature58);
@@ -31,9 +31,12 @@ public class NavigationTests extends Common {
 			assertNotNull(transactionData, "Transaction data not loaded from repository");
 			assertEquals(TransactionType.PAYMENT, transactionData.getType(), "Transaction data not PAYMENT type");
 
-			BlockData blockData = transactionRepository.getBlockDataFromSignature(signature);
-			assertNotNull(blockData, "Block 49778 not loaded from database");
+			int transactionHeight = transactionRepository.getHeightFromSignature(signature);
+			assertNotEquals(0, transactionHeight, "Transaction not found or transaction's block not found");
+			assertEquals(49778, transactionHeight, "Transaction's block height expected to be 49778");
 
+			BlockData blockData = repository.getBlockRepository().fromHeight(transactionHeight);
+			assertNotNull(blockData, "Block 49778 not loaded from database");
 			System.out.println("Block " + blockData.getHeight() + ", signature: " + Base58.encode(blockData.getSignature()));
 
 			assertEquals((Integer) 49778, blockData.getHeight());

tests/test/SaveTests.java

@@ -4,7 +4,6 @@ import java.math.BigDecimal;
 import java.time.Instant;
 
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
 
 import data.transaction.PaymentTransactionData;
 import qora.account.PublicKeyAccount;