support hex addr for pay destination

liuchen · liuchen · commit 22f61bfedbe4 · 2022-09-08T13:43:11.000+08:00
diff --git a/chainsql/src/main/java/com/peersafe/chainsql/core/Ripple.java b/chainsql/src/main/java/com/peersafe/chainsql/core/Ripple.java
@@ -15,6 +15,8 @@
 import com.peersafe.base.core.types.known.tx.Transaction;
 import com.peersafe.chainsql.util.Util;
 
+import static com.peersafe.base.config.Config.getB58IdentiferCodecs;
+
 /**
  * @author mail_
  *
@@ -81,6 +83,13 @@ protected JSONObject prepareSigned() {
 	private Ripple pay(String accountId,Amount amount){
 		mTxJson = new JSONObject();
 		mTxJson.put("Account", this.connection.address);
+
+        String addrPrefix = accountId.substring(0,2);
+        if(addrPrefix.equals("0x"))
+        {
+            byte[] addrByte = Util.hexToBytes(accountId.substring(2));
+            accountId = getB58IdentiferCodecs().encodeAddress(addrByte);
+        }
 		if(amount.currency() != Currency.ZXC)
 		{
 			JSONObject result = this.connection.client.accountInfo(amount.issuer());
diff --git a/chainsql/src/main/java/com/peersafe/chainsql/util/Util.java b/chainsql/src/main/java/com/peersafe/chainsql/util/Util.java
@@ -26,6 +26,7 @@
 import com.peersafe.base.utils.Utils;
 import com.peersafe.chainsql.crypto.EncryptCommon;
 import com.peersafe.chainsql.net.Connection;
+import com.peersafe.base.encodings.common.B16;
 
 
 public class Util {
@@ -115,11 +116,12 @@ public static String bytesToHex(byte[] bytes) {
 	 * @return Hexed byte array.
 	 */
 	public static byte[] hexToBytes(String bytes){
-	    ByteArrayOutputStream baos=new ByteArrayOutputStream(bytes.length()/2);
-	    //将每2位16进制整数组装成一个字节
-	    for(int i=0;i<bytes.length();i+=2)
-	    	baos.write((hexString.indexOf(bytes.charAt(i))<<4 |hexString.indexOf(bytes.charAt(i+1))));
-	    return baos.toByteArray();
+        return B16.decode(bytes);
+	    // ByteArrayOutputStream baos=new ByteArrayOutputStream(bytes.length()/2);
+	    // //将每2位16进制整数组装成一个字节
+	    // for(int i=0;i<bytes.length();i+=2)
+	    // 	baos.write((hexString.indexOf(bytes.charAt(i))<<4 |hexString.indexOf(bytes.charAt(i+1))));
+	    // return baos.toByteArray();
 	}
 	
 	/**
