Cli tests oscar

build.gradle

@@ -124,12 +124,12 @@ publishing {
 }
 
 docker {
-    name 'minimaglobal/minima:latest'
+    name 'minimaglobal/minima:dev'
     dockerfile project.file('docker/Dockerfile')
 
-    //buildx true
-    //push true
-    //platform 'linux/amd64,linux/arm64,linux/arm/v7'
+    buildx true
+    push true
+    platform 'linux/amd64,linux/arm64,linux/arm/v7'
 
     files tasks.shadowJar, "$rootDir/docker/dapps"
     copySpec.from("$buildDir/lib/minima-all.jar",).into(".")

docker/minima

@@ -1,3 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
-java -cp /usr/local/minima/minima.jar org.minima.utils.MinimaRPCClient
+#Start the docker container Minima RPC Client 
+java -cp /usr/local/minima/minima.jar org.minima.utils.MinimaRPCClient

mydaatafolder/0.103/databases/walletsql/wallet.trace.db

@@ -0,0 +1,12 @@
+2022-11-14 12:55:25 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLSyntaxErrorException: Syntax error in SQL statement "SCRIPT TO '/mnt/c/Users/user/Documents/Oscar's work folder/Minima-dev/Minima-dev/mydaatafolder/0.103/backup/wallet.sql[*]'"; SQL statement:
+SCRIPT TO '/mnt/c/Users/user/Documents/Oscar's work folder/Minima-dev/Minima-dev/mydaatafolder/0.103/backup/wallet.sql' [42000-200]
+2022-11-14 12:55:25 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLSyntaxErrorException: Syntax error in SQL statement "SCRIPT TO '/mnt/c/Users/user/Documents/Oscar's work folder/Minima-dev/Minima-dev/mydaatafolder/0.103/backup/wallet.sql[*]'"; SQL statement:
+SCRIPT TO '/mnt/c/Users/user/Documents/Oscar's work folder/Minima-dev/Minima-dev/mydaatafolder/0.103/backup/wallet.sql' [42000-200]
+2022-11-14 13:58:03 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLSyntaxErrorException: Syntax error in SQL statement "SCRIPT TO '/mnt/c/Users/user/Documents/Oscar's work folder/Minima-dev/Minima-dev - Copy/mydaatafolder/0.103/backup/wallet.sql[*]'"; SQL statement:
+SCRIPT TO '/mnt/c/Users/user/Documents/Oscar's work folder/Minima-dev/Minima-dev - Copy/mydaatafolder/0.103/backup/wallet.sql' [42000-200]
+2022-11-14 13:58:03 jdbc[4]: exception
+org.h2.jdbc.JdbcSQLSyntaxErrorException: Syntax error in SQL statement "SCRIPT TO '/mnt/c/Users/user/Documents/Oscar's work folder/Minima-dev/Minima-dev - Copy/mydaatafolder/0.103/backup/wallet.sql[*]'"; SQL statement:
+SCRIPT TO '/mnt/c/Users/user/Documents/Oscar's work folder/Minima-dev/Minima-dev - Copy/mydaatafolder/0.103/backup/wallet.sql' [42000-200]

src/org/minima/database/MinimaDB.java

@@ -15,6 +15,7 @@
 import org.minima.database.wallet.Wallet;
 import org.minima.system.network.p2p.P2PDB;
 import org.minima.system.params.GeneralParams;
+import org.minima.utils.MiniFile;
 import org.minima.utils.MinimaLogger;
 
 public class MinimaDB {
@@ -188,7 +189,31 @@ public void loadAllDB() {
 
 			//Set the Archive folder
 			File archsqlfolder = new File(basedb,"archivesql");
-			mArchive.loadDB(new File(archsqlfolder,"archive"));
+			try {
+
+				//Try and load the Archive DB
+				mArchive.loadDB(new File(archsqlfolder,"archive"));
+
+//				throw new Exception("TEST CRASH ARCHIVEDB!");
+
+			}catch(Exception exc) {
+
+				//Log the complete error
+				MinimaLogger.log(exc);
+
+				//There wqas an issue.. wipe it.. and resync..
+				MinimaLogger.log("ERROR loading ArchiveDB.. WIPE and RESYNC.. ");
+
+				//Close the DB
+				mArchive.hardCloseDB();
+
+				//Delete the ArchiveDB folder
+				MiniFile.deleteFileOrFolder(archsqlfolder.getAbsolutePath(), archsqlfolder);
+
+				//And reload..
+				mArchive = new ArchiveManager();
+				mArchive.loadDB(new File(archsqlfolder,"archive"));
+			}
 
 			//Are we Storing in a MySQL..
 			if(!GeneralParams.MYSQL_HOST.equals("")) {
@@ -199,14 +224,38 @@ public void loadAllDB() {
 						GeneralParams.MYSQL_PASSWORD);
 			}
 
+			//Load the SQL DB
+			File txpowsqlfolder = new File(basedb,"txpowsql");
+			try {
+
+				//Try and load the Archive DB
+				mTxPoWDB.loadSQLDB(new File(txpowsqlfolder,"txpow"));
+
+//				throw new Exception("TEST CRASH TXPOWDB!");
+
+			}catch(Exception exc) {
+
+				//Log the complete error
+				MinimaLogger.log(exc);
+
+				//There wqas an issue.. wipe it.. and resync..
+				MinimaLogger.log("ERROR loading TxPoWSQLDB.. WIPE and RESYNC.. ");
+
+				//Close the DB
+				mTxPoWDB.hardCloseSQLDB();
+
+				//Delete the ArchiveDB folder
+				MiniFile.deleteFileOrFolder(txpowsqlfolder.getAbsolutePath(), txpowsqlfolder);
+
+				//And reload..
+				mTxPoWDB	= new TxPoWDB();
+				mTxPoWDB.loadSQLDB(new File(txpowsqlfolder,"txpow"));
+			}
+
 			//Load the wallet
 			File walletsqlfolder = new File(basedb,"walletsql");
 			mWallet.loadDB(new File(walletsqlfolder,"wallet"));
 
-			//Load the SQL DB
-			File txpowsqlfolder = new File(basedb,"txpowsql");
-			mTxPoWDB.loadSQLDB(new File(txpowsqlfolder,"txpow"));
-
 			//Load the MaximaDB
 			File maxsqlfolder = new File(basedb,"maximasql");
 			mMaximaDB.loadDB(new File(maxsqlfolder,"maxima"));

src/org/minima/database/archive/ArchiveManager.java

@@ -17,6 +17,7 @@
 import org.minima.objects.base.MiniNumber;
 import org.minima.system.Main;
 import org.minima.system.params.GeneralParams;
+import org.minima.utils.MiniFile;
 import org.minima.utils.MinimaLogger;
 import org.minima.utils.SqlDB;
 import org.minima.utils.json.JSONObject;
@@ -160,6 +161,9 @@ protected void createSQL() throws SQLException {
 	public synchronized int getSize() {
 		try {
 
+			//Make sure..
+			checkOpen();
+
 			//Run the query
 			ResultSet rs = SQL_TOTAL_COUNT.executeQuery();
 
@@ -178,48 +182,42 @@ public synchronized int getSize() {
 	}
 
 	public synchronized boolean saveBlock(TxBlock zBlock) throws SQLException {
-//		try {
-
-			//get the MiniData version..
-			MiniData syncdata = MiniData.getMiniDataVersion(zBlock);
-
-			//Get the Query ready
-			SQL_INSERT_SYNCBLOCK.clearParameters();
 
-			//Set main params
-			SQL_INSERT_SYNCBLOCK.setString(1, zBlock.getTxPoW().getTxPoWID());
-			SQL_INSERT_SYNCBLOCK.setLong(2, zBlock.getTxPoW().getBlockNumber().getAsLong());
-			SQL_INSERT_SYNCBLOCK.setLong(3, System.currentTimeMillis());
-
-			//And finally the actual bytes
-			SQL_INSERT_SYNCBLOCK.setBytes(4, syncdata.getBytes());
-
-			//Do it.
-			SQL_INSERT_SYNCBLOCK.execute();
+		//Make sure..
+		checkOpen();
+
+		//get the MiniData version..
+		MiniData syncdata = MiniData.getMiniDataVersion(zBlock);
 
-			//Do we MySQL
-			if(mStoreMySQL) {
-				mMySQL.saveBlock(zBlock);
-			}
-
-			return true;
-
-//		} catch (SQLException e) {
-//			MinimaLogger.log(e);
-//		}
-//		
-//		return false;
-	}
+		//Get the Query ready
+		SQL_INSERT_SYNCBLOCK.clearParameters();
 
-	public synchronized TxBlock loadBlock(String zTxPoWID) {
+		//Set main params
+		SQL_INSERT_SYNCBLOCK.setString(1, zBlock.getTxPoW().getTxPoWID());
+		SQL_INSERT_SYNCBLOCK.setLong(2, zBlock.getTxPoW().getBlockNumber().getAsLong());
+		SQL_INSERT_SYNCBLOCK.setLong(3, System.currentTimeMillis());
+
+		//And finally the actual bytes
+		SQL_INSERT_SYNCBLOCK.setBytes(4, syncdata.getBytes());
 
-		//Are we shutting down..
-		if(Main.getInstance().isShuttingDown()) {
-			return new TxBlock(new TxPoW());
+		//Do it.
+		SQL_INSERT_SYNCBLOCK.execute();
+
+		//Do we MySQL
+		if(mStoreMySQL) {
+			mMySQL.saveBlock(zBlock);
 		}
 
+		return true;		
+	}
+
+	public synchronized TxBlock loadBlock(String zTxPoWID) {
+
 		try {
 
+			//Make sure..
+			checkOpen();
+
 			//Set search params
 			SQL_FIND_SYNCBLOCK.clearParameters();
 			SQL_FIND_SYNCBLOCK.setString(1, zTxPoWID);
@@ -251,13 +249,11 @@ public synchronized TxBlock loadBlock(String zTxPoWID) {
 
 	public synchronized TxBlock loadLastBlock() {
 
-		//Are we shutting down..
-		if(Main.getInstance().isShuttingDown()) {
-			return new TxBlock(new TxPoW());
-		}
-
 		try {
 
+			//Make sure..
+			checkOpen();
+
 			//Set search params
 			SQL_SELECT_LAST.clearParameters();
 
@@ -288,15 +284,13 @@ public synchronized TxBlock loadLastBlock() {
 
 	public synchronized JSONObject loadLastBlockJSON() {
 
-		//Are we shutting down..
-		if(Main.getInstance().isShuttingDown()) {
-			return new JSONObject();
-		}
-
 		JSONObject ret = new JSONObject();
 
 		try {
 
+			//Make sure..
+			checkOpen();
+
 			//Set search params
 			SQL_SELECT_LAST.clearParameters();
 
@@ -331,6 +325,9 @@ public synchronized ArrayList<TxBlock> loadSyncBlockRange(MiniNumber zStartBlock
 
 		try {
 
+			//Make sure..
+			checkOpen();
+
 			//Set Search params
 			SQL_SELECT_SYNC_LIST.clearParameters();
 			SQL_SELECT_SYNC_LIST.setLong(1,zStartBlock.getAsLong());
@@ -384,6 +381,8 @@ public int compare(TxBlock zBlk1, TxBlock zBlk2) {
 	public synchronized MiniNumber exists(String zTxPoWID) {
 
 		try {
+			//Make sure..
+			checkOpen();
 
 			//Set search params
 			SQL_EXISTS_SYNCBLOCK.clearParameters();
@@ -413,6 +412,9 @@ public synchronized ArrayList<TxBlock> loadBlockRange(MiniNumber zStartBlock, Mi
 
 		try {
 
+			//Make sure..
+			checkOpen();
+
 			//Set Search params
 			SQL_SELECT_RANGE.clearParameters();
 			SQL_SELECT_RANGE.setLong(1,zStartBlock.getAsLong());
@@ -456,6 +458,9 @@ public synchronized TxBlock loadFirstBlock() {
 
 		try {
 
+			//Make sure..
+			checkOpen();
+
 			//Set search params
 			SQL_SELECT_FIRST.clearParameters();
 
@@ -486,6 +491,9 @@ public synchronized TxBlock loadFirstBlock() {
 
 	public synchronized int cleanDB() {
 		try {
+			//Make sure..
+			checkOpen();
+
 			//Set search params
 			SQL_SELECT_FIRST.clearParameters();
 
@@ -528,50 +536,57 @@ public synchronized int cleanDB() {
 		return 0;
 	}
 
+	public void hackShut() throws SQLException {
+		mSQLConnection.close();
+	}
+
 	public static void main(String[] zArgs) throws SQLException {
 
+		File testdbfolder 	= new File(System.getProperty("user.home"),"testfolder");
+		File testdb 		= new File(testdbfolder,"sqlsync");
+
+		//Wipe the old..
+		MiniFile.deleteFileOrFolder(testdbfolder.getAbsolutePath(), testdbfolder);
+
 		ArchiveManager arch = new ArchiveManager();
+		arch.loadDB(testdb);
+
+		//test insert..
+		TxPoW txp = new TxPoW();
+		txp.setBlockNumber(MiniNumber.ONE);
+		txp.setTimeMilli();
+		txp.calculateTXPOWID();
+		txp.setSuperParent(0, new MiniData("0xFFEEFF"));
+
+		arch.hackShut();
+
+		//Create a SyncBlock
+		TxBlock sb = new TxBlock(txp);
+
+		arch.saveBlock(sb);
+
+		arch.hackShut();
+
+		int rows = arch.getSize();
+
+		System.out.println("DB Size : "+rows);
+
+		arch.hackShut();
+
+		String txpid = sb.getTxPoW().getTxPoWID();
+
+		TxBlock lsb = arch.loadBlock(txpid);
+
+		arch.hackShut();
+
+		System.out.println("Sync Loaded : "+lsb.getTxPoW().toString());
+
+		//Load a range..
+		ArrayList<TxBlock> blocks = arch.loadBlockRange(MiniNumber.ZERO, MiniNumber.ONE);
+		System.out.println("Sync Range : "+blocks.size());
 
-//		long timenow = System.currentTimeMillis();
-//		System.out.println(new Date(timenow));
-//		long timethen = timenow - arch.MAX_SQL_MILLI;
-//		System.out.println(new Date(1662646695127L));
-
-//		File testdbfolder 	= new File(System.getProperty("user.home"),"testfolder");
-//		File testdb 		= new File(testdbfolder,"sqlsync");
-//		
-//		ArchiveManager arch = new ArchiveManager();
-//		arch.loadDB(testdb);
-//		
-//		//test insert..
-//		TxPoW txp = new TxPoW();
-//		txp.setBlockNumber(MiniNumber.ONE);
-//		txp.setTimeMilli();
-//		txp.calculateTXPOWID();
-//		txp.setSuperParent(0, new MiniData("0xFFEEFF"));
-//		
-//		//Create a SyncBlock
-//		TxBlock sb = new TxBlock(txp);
-//		
-//		arch.saveBlock(sb);
-//		arch.saveBlock(sb);
-//		
-//		int rows = arch.getSize();
-//		
-//		System.out.println("DB Size : "+rows);
-//		
-//		String txpid = sb.getTxPoW().getTxPoWID();
-//		
-//		TxBlock lsb = arch.loadBlock(txpid);
-//		
-//		System.out.println("Sync Loaded : "+lsb.getTxPoW().toString());
-//		
-//		//Load a range..
-//		ArrayList<TxBlock> blocks = arch.loadBlockRange(MiniNumber.ZERO, MiniNumber.ONE);
-//		System.out.println("Sync Range : "+blocks.size());
-//		
-//		//Shut down
-//		arch.saveDB();
+		//Shut down
+		arch.saveDB();
 	}