import export txn to file, throw correct error if transaction doesn't

exist
sechra · Jan 28, 2022 · 0cdeef3 · 0cdeef3
1 parent 3f8ad72
commit 0cdeef3
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 11 deletions.
diff --git a/src/org/minima/system/commands/txn/txncheck.java b/src/org/minima/system/commands/txn/txncheck.java
@@ -12,6 +12,7 @@
 import org.minima.objects.base.MiniData;
 import org.minima.objects.base.MiniNumber;
 import org.minima.system.commands.Command;
+import org.minima.system.commands.CommandException;
 import org.minima.utils.json.JSONArray;
 import org.minima.utils.json.JSONObject;
 
@@ -31,6 +32,10 @@ public JSONObject runCommand() throws Exception {
 
 		//Get the Transaction..
 		TxnRow txnrow 	= db.getTransactionRow(getParam("id"));
+		if(txnrow == null) {
+			throw new CommandException("Transaction not found : "+id);
+		}
+
 		Transaction txn = txnrow.getTransaction();
 		Witness wit 	= txnrow.getWitness();
 

diff --git a/src/org/minima/system/commands/txn/txnclear.java b/src/org/minima/system/commands/txn/txnclear.java
@@ -4,6 +4,7 @@
 import org.minima.database.userprefs.txndb.TxnDB;
 import org.minima.database.userprefs.txndb.TxnRow;
 import org.minima.system.commands.Command;
+import org.minima.system.commands.CommandException;
 import org.minima.utils.json.JSONObject;
 
 public class txnclear extends Command {
@@ -22,6 +23,10 @@ public JSONObject runCommand() throws Exception {
 
 		//Get the Transaction..
 		TxnRow txnrow 	= db.getTransactionRow(getParam("id"));
+		if(txnrow == null) {
+			throw new CommandException("Transaction not found : "+id);
+		}
+
 		txnrow.clearWitness();
 
 		JSONObject resp = new JSONObject();

diff --git a/src/org/minima/system/commands/txn/txnexport.java b/src/org/minima/system/commands/txn/txnexport.java
@@ -1,17 +1,21 @@
 package org.minima.system.commands.txn;
 
+import java.io.File;
+
 import org.minima.database.MinimaDB;
 import org.minima.database.userprefs.txndb.TxnDB;
 import org.minima.database.userprefs.txndb.TxnRow;
 import org.minima.objects.base.MiniData;
 import org.minima.system.commands.Command;
 import org.minima.system.commands.CommandException;
+import org.minima.utils.MiniFile;
+import org.minima.utils.MiniFormat;
 import org.minima.utils.json.JSONObject;
 
 public class txnexport extends Command {
 
 	public txnexport() {
-		super("txnexport","[id:] - Export a transaction");
+		super("txnexport","[id:] [file:] - Export a transaction to a file");
 	}
 
 	@Override
@@ -20,19 +24,29 @@ public JSONObject runCommand() throws Exception {
 
 		TxnDB db = MinimaDB.getDB().getCustomTxnDB();
 
-		String id = getParam("id");
+		String id   = getParam("id");
+		String file = getParam("file");
 
 		//Get the Transaction..
 		TxnRow txnrow 	= db.getTransactionRow(getParam("id"));
 		if(txnrow == null) {
 			throw new CommandException("Transaction not found : "+id);
 		}
 
-		//Export it..
-		MiniData data = MiniData.getMiniDataVersion(txnrow);
+		//Create the file
+		File output = new File(file);
+		if(output.exists()) {
+			output.delete();
+		}
+
+		//Now export this to a file..
+		MiniFile.writeObjectToFile(output, txnrow);
 
 		JSONObject resp = new JSONObject();
-		ret.put("response", data.to0xString());
+		resp.put("file", output.getAbsolutePath());
+		resp.put("size", MiniFormat.formatSize(output.length()));
+
+		ret.put("response", resp);
 
 		return ret;
 	}

diff --git a/src/org/minima/system/commands/txn/txnimport.java b/src/org/minima/system/commands/txn/txnimport.java
@@ -1,16 +1,20 @@
 package org.minima.system.commands.txn;
 
+import java.io.File;
+
 import org.minima.database.MinimaDB;
 import org.minima.database.userprefs.txndb.TxnDB;
 import org.minima.database.userprefs.txndb.TxnRow;
 import org.minima.objects.base.MiniData;
 import org.minima.system.commands.Command;
+import org.minima.system.commands.CommandException;
+import org.minima.utils.MiniFile;
 import org.minima.utils.json.JSONObject;
 
 public class txnimport extends Command {
 
 	public txnimport() {
-		super("txnimport","[data:] (id:) - Import a transaction. Optionally specify the ID");
+		super("txnimport","[file:] (id:) - Import a transaction. Optionally specify the ID");
 	}
 
 	@Override
@@ -19,10 +23,20 @@ public JSONObject runCommand() throws Exception {
 
 		TxnDB db = MinimaDB.getDB().getCustomTxnDB();
 
-		String data = getParam("data");
+		String file = getParam("file");
+		File ff = new File(file);
+		if(!ff.exists()) {
+			throw new CommandException("File does not exist : "+ff.getAbsolutePath());
+		}
+
+		//Load it in..
+		byte[] txndata = MiniFile.readCompleteFile(ff);
+
+		//Convert to MiniData
+		MiniData minitxn = new MiniData(txndata);
 
 		//Convert this..
-		TxnRow txnrow = TxnRow.convertMiniDataVersion(new MiniData(data));
+		TxnRow txnrow = TxnRow.convertMiniDataVersion(minitxn);
 		if(existsParam("id")) {
 			txnrow.setID(getParam("id"));
 		}

diff --git a/src/org/minima/system/commands/txn/txninput.java b/src/org/minima/system/commands/txn/txninput.java
@@ -2,6 +2,7 @@
 
 import org.minima.database.MinimaDB;
 import org.minima.database.userprefs.txndb.TxnDB;
+import org.minima.database.userprefs.txndb.TxnRow;
 import org.minima.objects.Coin;
 import org.minima.objects.Transaction;
 import org.minima.objects.base.MiniData;
@@ -46,7 +47,11 @@ public JSONObject runCommand() throws Exception {
 		}
 
 		//Get the Transaction
-		Transaction trans = db.getTransactionRow(id).getTransaction();
+		TxnRow txnrow 	= db.getTransactionRow(getParam("id"));
+		if(txnrow == null) {
+			throw new CommandException("Transaction not found : "+id);
+		}
+		Transaction trans = txnrow.getTransaction();
 		trans.addInput(cc);
 
 		//Output the current trans..

diff --git a/src/org/minima/system/commands/txn/txnoutput.java b/src/org/minima/system/commands/txn/txnoutput.java
@@ -2,6 +2,7 @@
 
 import org.minima.database.MinimaDB;
 import org.minima.database.userprefs.txndb.TxnDB;
+import org.minima.database.userprefs.txndb.TxnRow;
 import org.minima.objects.Coin;
 import org.minima.objects.Token;
 import org.minima.objects.Transaction;
@@ -59,7 +60,11 @@ public JSONObject runCommand() throws Exception {
 		output.setFloating(floating);
 
 		//Get the Transaction
-		Transaction trans = db.getTransactionRow(id).getTransaction();
+		TxnRow txnrow 	= db.getTransactionRow(getParam("id"));
+		if(txnrow == null) {
+			throw new CommandException("Transaction not found : "+id);
+		}
+		Transaction trans = txnrow.getTransaction();
 		trans.addOutput(output);
 
 		//Output the current trans..

diff --git a/src/org/minima/system/commands/txn/txnpost.java b/src/org/minima/system/commands/txn/txnpost.java
@@ -9,6 +9,7 @@
 import org.minima.system.Main;
 import org.minima.system.brains.TxPoWGenerator;
 import org.minima.system.commands.Command;
+import org.minima.system.commands.CommandException;
 import org.minima.utils.json.JSONObject;
 
 public class txnpost extends Command {
@@ -28,6 +29,9 @@ public JSONObject runCommand() throws Exception {
 
 		//Get the row..
 		TxnRow txnrow = db.getTransactionRow(id); 
+		if(txnrow == null) {
+			throw new CommandException("Transaction not found : "+id);
+		}
 
 		//Get the Transaction
 		Transaction trans = txnrow.getTransaction();

diff --git a/src/org/minima/system/commands/txn/txnsign.java b/src/org/minima/system/commands/txn/txnsign.java
@@ -34,6 +34,10 @@ public JSONObject runCommand() throws Exception {
 
 		//Get the Transaction..
 		TxnRow txnrow 	= db.getTransactionRow(getParam("id"));
+		if(txnrow == null) {
+			throw new CommandException("Transaction not found : "+id);
+		}
+
 		Transaction txn = txnrow.getTransaction();
 		Witness wit		= txnrow.getWitness();
 

diff --git a/src/org/minima/system/commands/txn/txnstate.java b/src/org/minima/system/commands/txn/txnstate.java
@@ -2,9 +2,11 @@
 
 import org.minima.database.MinimaDB;
 import org.minima.database.userprefs.txndb.TxnDB;
+import org.minima.database.userprefs.txndb.TxnRow;
 import org.minima.objects.StateVariable;
 import org.minima.objects.Transaction;
 import org.minima.system.commands.Command;
+import org.minima.system.commands.CommandException;
 import org.minima.utils.json.JSONObject;
 
 public class txnstate extends Command {
@@ -29,7 +31,11 @@ public JSONObject runCommand() throws Exception {
 		}
 
 		//Get the Transaction
-		Transaction trans = db.getTransactionRow(id).getTransaction();
+		TxnRow txnrow 	= db.getTransactionRow(getParam("id"));
+		if(txnrow == null) {
+			throw new CommandException("Transaction not found : "+id);
+		}
+		Transaction trans = txnrow.getTransaction();
 
 		//Create a state variable..
 		StateVariable sv = new StateVariable(Integer.parseInt(port),value,keeper);