Added createkeypairs command

JK · JK · commit 0e0527e8dbd8 · 2018-02-03T14:59:32.000+01:00
diff --git a/MultiChainJavaAPI.iml b/MultiChainJavaAPI.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
+  </component>
+</module>
diff --git a/src/main/java/multichain/command/AddressCommand.java b/src/main/java/multichain/command/AddressCommand.java
@@ -13,6 +13,7 @@
 import multichain.command.builders.QueryBuilderAddress;
 import multichain.object.Address;
 import multichain.object.BalanceAsset;
+import multichain.object.KeyPair;
 import multichain.object.MultiBalance;
 import multichain.object.formatters.AddressFormatter;
 import multichain.object.formatters.BalanceFormatter;
@@ -335,5 +336,14 @@ public final static Address validateAddress(String stringAddress) throws Multich
 		return address;
 	}
 
+	/**
+	 * Generate blockchian address and corresponding public and private key. Used for external key management.
+	 * @return KeyPair object with data
+	 * @throws MultichainException
+	 */
+	public static KeyPair createKeyPairs() throws MultichainException {
+		String keyPair = executeCreateKeyPairs();
+		return AddressFormatter.formatKeyPair(keyPair);
+	}
 
 }
diff --git a/src/main/java/multichain/command/builders/QueryBuilderAddress.java b/src/main/java/multichain/command/builders/QueryBuilderAddress.java
@@ -247,6 +247,17 @@ protected static String executeValidateAddress(String address) throws Multichain
 		return execute(CommandEnum.VALIDATEADDRESS, address);
 	}
 
-
+	/**
+	 * Generates a blockchain address, corresponding public and private keys
+	 * @return [{
+	 *     address:
+	 *     pubkey:
+	 *     privkey:
+	 * }]
+	 * @throws MultichainException
+	 */
+	protected static String executeCreateKeyPairs() throws MultichainException {
+		return execute(CommandEnum.CREATEKEYPAIRS);
+	}
 
 }
diff --git a/src/main/java/multichain/command/builders/QueryBuilderCommon.java b/src/main/java/multichain/command/builders/QueryBuilderCommon.java
@@ -39,6 +39,7 @@ protected enum CommandEnum {
 		COMBINEUNPSENT,
 		CREATE,
 		CREATEFROM,
+		CREATEKEYPAIRS,
 		CREATEMULTISIG,
 		CREATERAWEXCHANGE,
 		CREATERAWTRANSACTION,
diff --git a/src/main/java/multichain/object/KeyPair.java b/src/main/java/multichain/object/KeyPair.java
@@ -0,0 +1,40 @@
+package multichain.object;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+public class KeyPair {
+    String address;
+    String pubkey;
+    String privkey;
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getPubkey() {
+        return pubkey;
+    }
+
+    public void setPubkey(String pubkey) {
+        this.pubkey = pubkey;
+    }
+
+    public String getPrivkey() {
+        return privkey;
+    }
+
+    public void setPrivkey(String privkey) {
+        this.privkey = privkey;
+    }
+
+    @Override
+    public String toString() {
+        Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        return gson.toJson(this, this.getClass());
+    }
+}
diff --git a/src/main/java/multichain/object/formatters/AddressFormatter.java b/src/main/java/multichain/object/formatters/AddressFormatter.java
@@ -15,6 +15,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import multichain.object.KeyPair;
 
 /**
  * @author Ub - H. MARTEAU
@@ -46,4 +47,9 @@ public final static List<Address> formatAddressesList(String stringAddresses) {
 
 		return addresses;
 	}
+
+	public final static KeyPair formatKeyPair(String keyPair) {
+		final Gson gson = new GsonBuilder().create();
+		return gson.fromJson(keyPair, KeyPair.class);
+	}
 }
