Merge PR: modify prefix from okexchain to ex (#94)

* add 'ex' address prefix

* add 'ex' address prefix

* add 'ex' address prefix, modify version to 0.17.0

* add 'ex' address prefix : add ut

Co-authored-by: shaoyun.zhan@okcoin.com <shaoyun.zhan@okcoin.com>

Author: zhshy11

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.okexchain</groupId>
     <artifactId>okexchain-java-sdk</artifactId>
-    <version>0.16.6</version>
+    <version>0.17.0</version>
 
     <name>okexchain-java-sdk</name>
     <!-- FIXME change it to the project's website -->

src/main/java/com/okexchain/env/EnvBase.java

@@ -1,7 +1,5 @@
 package com.okexchain.env;
 
-import com.okexchain.utils.Utils;
-
 public class EnvBase {
 
     protected String restServerUrl;
@@ -17,13 +15,16 @@ public class EnvBase {
 
     public EnvBase() {
         this.restServerUrl = "http://127.0.0.1:8545";
-        this.mainPrefix = "okexchain";
+        this.mainPrefix = "ex";
         this.denom = "okt";
+        //todo
         this.chainID = "okexchain-1";
         this.hdPath = "M/44H/60H/0H/0/0";
-        this.validatorAddrPrefix = "okexchainvaloper";
-        this.pubPrefix = "okexchainpub";
+        this.validatorAddrPrefix = "exvaloper";
+        this.pubPrefix = "expub";
+        //todo
         this.restPathPrefix = "/okexchain/v1";
+        //todo
         this.txUrlPath = "/okexchain/v1/txs";
         this.accountUrlPath = "/auth/accounts/";
     }

src/main/java/com/okexchain/sample/AddressConvertUtilSample.java

@@ -0,0 +1,25 @@
+package com.okexchain.sample;
+
+import com.okexchain.utils.crypto.AddressConvertUtil;
+import com.okexchain.utils.crypto.PrivateKey;
+
+/**
+ * @author shaoyun.zhan
+ * @date 2021/3/31
+ * <p>
+ * 描述：
+ */
+public class AddressConvertUtilSample {
+    public static void main(String[] args) {
+        //"eth_address": "0x64fAB0187AF0BCfF8499079161d8a0D68Ee8827a"
+        //"privateKey": "2843de7dec93946f1022ec9355678fdec3dc49d3140d2314b452a3a4afe78191"
+        System.out.println(new PrivateKey("2843de7dec93946f1022ec9355678fdec3dc49d3140d2314b452a3a4afe78191").getAddress());
+        System.out.println(AddressConvertUtil.convertFromBech32ToHex("okexchain1vnatqxr67z70lpyeq7gkrk9q668w3qn6sufu56").equals("0x64fAB0187AF0BCfF8499079161d8a0D68Ee8827a"));
+        System.out.println(AddressConvertUtil.convertFromBech32ToHex("ex1vnatqxr67z70lpyeq7gkrk9q668w3qn6hhzuhk").equals("0x64fAB0187AF0BCfF8499079161d8a0D68Ee8827a"));
+        System.out.println(AddressConvertUtil.convertFromHexToOkexchainBech32("0x64fAB0187AF0BCfF8499079161d8a0D68Ee8827a").equals("okexchain1vnatqxr67z70lpyeq7gkrk9q668w3qn6sufu56"));
+        System.out.println(AddressConvertUtil.convertFromHexToExBech32("0x64fAB0187AF0BCfF8499079161d8a0D68Ee8827a").equals("ex1vnatqxr67z70lpyeq7gkrk9q668w3qn6hhzuhk"));
+        System.out.println(AddressConvertUtil.convertFromExBech32ToOkexchainBech32("ex1vnatqxr67z70lpyeq7gkrk9q668w3qn6hhzuhk").equals("okexchain1vnatqxr67z70lpyeq7gkrk9q668w3qn6sufu56"));
+        System.out.println(AddressConvertUtil.convertFromOkexchainBech32ToExBech32("okexchain1vnatqxr67z70lpyeq7gkrk9q668w3qn6sufu56").equals("ex1vnatqxr67z70lpyeq7gkrk9q668w3qn6hhzuhk"));
+
+    }
+}

src/main/java/com/okexchain/utils/crypto/AddressConvertUtil.java

@@ -0,0 +1,97 @@
+package com.okexchain.utils.crypto;
+
+import com.okexchain.utils.crypto.encode.Bech32;
+import com.okexchain.utils.crypto.encode.ConvertBits;
+import com.okexchain.utils.exception.AddressFormatException;
+import org.web3j.crypto.Keys;
+import org.web3j.utils.Numeric;
+
+public class AddressConvertUtil {
+
+    private static final String okexchain = "okexchain";
+    private static final String ex = "ex";
+
+    // nothing to do with prefix
+    public static String convertFromBech32ToHex(String address) {
+        return convertAddressFromBech32ToHex(address);
+    }
+
+    public static String convertFromHexToOkexchainBech32(String address) {
+        return convertAddressFromHexToBech32(okexchain, address);
+    }
+
+    public static String convertFromHexToExBech32(String address) {
+        return convertAddressFromHexToBech32(ex, address);
+    }
+
+    public static String convertFromExBech32ToOkexchainBech32(String address) {
+        String hexAddress = convertAddressFromBech32ToHex(address);
+        return convertAddressFromHexToBech32(okexchain, hexAddress);
+    }
+
+    public static String convertFromOkexchainBech32ToExBech32(String address) {
+        String hexAddress = convertAddressFromBech32ToHex(address);
+        return convertAddressFromHexToBech32(ex, hexAddress);
+    }
+
+
+    public static String convertAddressFromHexToBech32(String prefix, String hexAddress) {
+        byte[] address = Numeric.hexStringToByteArray(hexAddress);
+
+        String bech32Address = null;
+        try {
+            byte[] bytes = encode(0, address);
+            bech32Address = Bech32.encode(prefix, bytes);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return bech32Address;
+    }
+
+    public static String convertAddressFromBech32ToHex(String bech32Address){
+        String hexAddress = null;
+        try {
+            byte[] bytes = decodeAddress(bech32Address);
+            hexAddress = Numeric.toHexString(bytes);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return Keys.toChecksumAddress(hexAddress);
+    }
+
+    public static String convertAddressFromValToBech32(String prefix, String valAddress){
+        String bech32Address = null;
+        try {
+            byte[] bytes = Bech32.decode(valAddress).getData();
+            bech32Address = Bech32.encode(prefix, bytes);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return bech32Address;
+    }
+
+    public static String convertAddressFromBech32ToVal(String prefix, String bech32Address){
+        String valAddress = null;
+        try {
+            byte[] bytes = Bech32.decode(bech32Address).getData();
+            valAddress = Bech32.encode(prefix, bytes);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return valAddress;
+    }
+
+
+    private static byte[] decodeAddress(String address){
+        byte[] dec = Bech32.decode(address).getData();
+        return ConvertBits.convertBits(dec, 0, dec.length, 5, 8, false);
+    }
+
+
+    private static byte[] encode(int witnessVersion, byte[] witnessProgram) throws AddressFormatException {
+        byte[] convertedProgram = ConvertBits.convertBits(witnessProgram, 0, witnessProgram.length, 8, 5, true);
+        return convertedProgram;
+    }
+
+
+}

src/test/java/crypto/CryptoTest.java

@@ -1,8 +1,9 @@
 package crypto;
 
 import com.okexchain.env.EnvInstance;
-import com.okexchain.utils.crypto.Crypto;
+import com.okexchain.utils.crypto.AddressConvertUtil;
 import com.okexchain.utils.crypto.AddressUtil;
+import com.okexchain.utils.crypto.Crypto;
 import org.bouncycastle.util.encoders.Hex;
 import org.junit.Assert;
 import org.junit.Test;
@@ -84,11 +85,16 @@ public void generatePrivateKeyFromMnemonic() {
     }
 
     @Test
-    public void testPubKey() {
-        String pub = "02061a2f5b59ede92abf079084aa231bcb031d47cddb7a895af880b130c85af614";
-        String pubBech = Crypto.generateBechPub(pub);
-        String expectedPubBech = "okexchainpub1addwnpepqgrp5t6mt8k7j24lq7ggf23rr09sx828ehdh4z26lzqtzvxgttmpgrfngzd";
-        Assert.assertEquals(expectedPubBech, pubBech);
+    public void prefixTest() {
+        //"eth_address": "0x64fAB0187AF0BCfF8499079161d8a0D68Ee8827a"
+        //"privateKey": "2843de7dec93946f1022ec9355678fdec3dc49d3140d2314b452a3a4afe78191"
+        Assert.assertEquals(AddressConvertUtil.convertFromBech32ToHex("okexchain1vnatqxr67z70lpyeq7gkrk9q668w3qn6sufu56"),"0x64fAB0187AF0BCfF8499079161d8a0D68Ee8827a");
+        Assert.assertEquals(AddressConvertUtil.convertFromBech32ToHex("ex1vnatqxr67z70lpyeq7gkrk9q668w3qn6hhzuhk"),"0x64fAB0187AF0BCfF8499079161d8a0D68Ee8827a");
+        Assert.assertEquals(AddressConvertUtil.convertFromHexToOkexchainBech32("0x64fAB0187AF0BCfF8499079161d8a0D68Ee8827a"),"okexchain1vnatqxr67z70lpyeq7gkrk9q668w3qn6sufu56");
+        Assert.assertEquals(AddressConvertUtil.convertFromHexToExBech32("0x64fAB0187AF0BCfF8499079161d8a0D68Ee8827a"),"ex1vnatqxr67z70lpyeq7gkrk9q668w3qn6hhzuhk");
+        Assert.assertEquals(AddressConvertUtil.convertFromExBech32ToOkexchainBech32("ex1vnatqxr67z70lpyeq7gkrk9q668w3qn6hhzuhk"),"okexchain1vnatqxr67z70lpyeq7gkrk9q668w3qn6sufu56");
+        Assert.assertEquals(AddressConvertUtil.convertFromOkexchainBech32ToExBech32("okexchain1vnatqxr67z70lpyeq7gkrk9q668w3qn6sufu56"),"ex1vnatqxr67z70lpyeq7gkrk9q668w3qn6hhzuhk");
+
     }
 
 }