Added sendfrom command. Updated raw transactions to also consider asset transfer

JK · JK · commit ee0f2238887d · 2018-04-25T01:57:37.000+02:00
diff --git a/src/main/java/multichain/command/IssueCommand.java b/src/main/java/multichain/command/IssueCommand.java
@@ -355,6 +355,10 @@ public static String sendAssetFrom(String fromAddress, String toAddress, String
 		return executeSendAssetFrom(fromAddress, toAddress, assetName, quantity);
 	}
 
+	public static String sendFrom(String fromAddresss, String toAddress, String quantity) throws MultichainException {
+		return executeSendFrom(fromAddresss, toAddress, quantity);
+	}
+
 	/**
 	 * Sends assets to address, returning the txid.
 	 *
diff --git a/src/main/java/multichain/command/RAWTransactionCommand.java b/src/main/java/multichain/command/RAWTransactionCommand.java
@@ -183,10 +183,7 @@ public static String createRawTransaction(List<TxIdVout> inputs, List<AddressBal
 	 * @return hexidecimal blob as String
 	 * @throws MultichainException
 	 */
-	public static String createRawSendFrom(String blockchainAddress, String asset, Map<String, Object> streamItem) throws MultichainException {
-		if(asset == null || asset.isEmpty()) {
-			asset = "{}";
-		}
+	public static String createRawSendFrom(String blockchainAddress, Map<String, Object> asset, Map<String, Object> streamItem) throws MultichainException {
 		return executeCreateRawSendFrom(blockchainAddress, asset, streamItem);
 	}
 
diff --git a/src/main/java/multichain/command/builders/QueryBuilderIssue.java b/src/main/java/multichain/command/builders/QueryBuilderIssue.java
@@ -389,9 +389,26 @@ protected static String executeSendAssetFrom(String fromAddress, String toAddres
 			throws MultichainException {
 		MultichainTestParameter.isNotNullOrEmpty("fromAddress", fromAddress);
 		MultichainTestParameter.isNotNullOrEmpty("toAddress", toAddress);
-		//MultichainTestParameter.isNotNullOrEmpty("assetName", assetName);
 		MultichainTestParameter.valueIsPositive("quantity", quantity);
-		return execute(CommandEnum.SENDASSETFROM, formatJson(fromAddress), formatJson(toAddress), formatJson(assetName), formatJson(quantity));
+		MultichainTestParameter.isNotNull("assetName", assetName);
+		if(assetName.isEmpty())
+			assetName = "\"\"";
+		return execute(CommandEnum.SENDASSETFROM, fromAddress, toAddress, assetName, formatJson(quantity));
+	}
+
+	/**
+	 * Send native currency to an address from the specified address
+	 * @param fromAddress send from
+	 * @param toAddress send to
+	 * @param quantity how much native currency in decimal format e.g. 0.005
+	 * @return Txid
+	 * @throws MultichainException
+	 */
+	protected static String executeSendFrom(String fromAddress, String toAddress, String quantity) throws MultichainException {
+		MultichainTestParameter.isNotNullOrEmpty("fromAddress", fromAddress);
+		MultichainTestParameter.isNotNullOrEmpty("toAddress", toAddress);
+		MultichainTestParameter.isNotNullOrEmpty("quantity", quantity);
+		return execute(CommandEnum.SENDFROM, fromAddress, toAddress, quantity);
 	}
 
 	/**
diff --git a/src/main/java/multichain/command/builders/QueryBuilderRAWTransaction.java b/src/main/java/multichain/command/builders/QueryBuilderRAWTransaction.java
@@ -196,10 +196,16 @@ protected static String executeCreateRawTransaction(List<TxIdVout> inputs, List<
 	 * @return hexidecimal blob as String
 	 * @throws MultichainException
 	 */
-	protected static String executeCreateRawSendFrom(String blockchainAddress, String asset, Map<String, Object> streamItem) throws MultichainException {
-		String streamItemAsJson = formatJson(streamItem);
-		String streamItemAsArray = "[" + streamItemAsJson +"]";
-		return execute(CommandEnum.CREATERAWSENDFROM, blockchainAddress, asset, streamItemAsArray);
+	protected static String executeCreateRawSendFrom(String blockchainAddress, Map<String, Object> asset, Map<String, Object> streamItem) throws MultichainException {
+		if(asset == null || asset.isEmpty()) {
+			String streamItemAsJson = formatJson(streamItem);
+			String streamItemAsArray = "[" + streamItemAsJson +"]";
+			return execute(CommandEnum.CREATERAWSENDFROM, blockchainAddress, "{}", streamItemAsArray);
+		} else {
+			String assetItemAsJson = formatJson(asset);
+			return execute(CommandEnum.CREATERAWSENDFROM, blockchainAddress, assetItemAsJson);
+		}
+
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -355,6 +355,10 @@ public static String sendAssetFrom(String fromAddress, String toAddress, String`
`355`	`355`	`return executeSendAssetFrom(fromAddress, toAddress, assetName, quantity);`
`356`	`356`	`}`
`357`	`357`
	`358`	`+ public static String sendFrom(String fromAddresss, String toAddress, String quantity) throws MultichainException {`
	`359`	`+ return executeSendFrom(fromAddresss, toAddress, quantity);`
	`360`	`+ }`
	`361`	`+`
`358`	`362`	`/**`
`359`	`363`	`* Sends assets to address, returning the txid.`
`360`	`364`	`*`