fix:adapte sui keystore format change.

Signed-off-by: grapebaba <[email protected]>

src/main/java/io/sui/crypto/ED25519KeyPair.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 [email protected]
+ * Copyright 2022-2023 [email protected]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with
@@ -92,8 +92,7 @@ public String sign(String msg) throws SigningException {
    * @return the sui key pair
    */
   public static ED25519KeyPair decodeBase64(byte[] encoded) {
-    Ed25519PrivateKeyParameters privateKeyParameters =
-        new Ed25519PrivateKeyParameters(encoded, 1 + Ed25519PublicKeyParameters.KEY_SIZE);
+    Ed25519PrivateKeyParameters privateKeyParameters = new Ed25519PrivateKeyParameters(encoded, 1);
     Ed25519PublicKeyParameters publicKeyParameters = privateKeyParameters.generatePublicKey();
     return new ED25519KeyPair(privateKeyParameters, publicKeyParameters);
   }

src/main/java/io/sui/crypto/SECP256K1KeyPair.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 [email protected]
+ * Copyright 2022-2023 [email protected]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with
@@ -53,9 +53,7 @@ public SECP256K1KeyPair(byte[] privateKey) {
    * @return the sui key pair
    */
   public static SECP256K1KeyPair decodeBase64(byte[] encoded) {
-    final int compressedPublicKeySize = 33;
-    return new SECP256K1KeyPair(
-        Arrays.copyOfRange(encoded, 1 + compressedPublicKeySize, encoded.length));
+    return new SECP256K1KeyPair(Arrays.copyOfRange(encoded, 1, encoded.length));
   }
 
   @Override

src/test/java/io/sui/crypto/ED25519KeyPairTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 [email protected]
+ * Copyright 2022-2023 [email protected]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with
@@ -40,20 +40,16 @@ class ED25519KeyPairTest {
   /** Address. */
   @Test
   void address() {
-    final String base64 =
-        "AOSqUUDaiPGYESoI/G13YwT2qyWW/RRvsW2G7IoCG"
-            + "URYYbRLmbwt4NZ9m9x7s8taYhCJg9OQdkrmSTVioUVpCSM=";
+    final String base64 = "ADfbVnAT2QLG7W+bM+1ENzEKAxnoUx10+WfGg5zx8VRm";
     final ED25519KeyPair keyPair = ED25519KeyPair.decodeBase64(Base64.decode(base64));
 
-    assertEquals("0x1e7752f22228753e5745f5ac8ad4ef1bbc502845", keyPair.address());
+    assertEquals("0x0a7421363a1f6a82800f7c9340ac02b5905798cb", keyPair.address());
   }
 
   /** Decode base 64. */
   @Test
   void decodeBase64() throws CryptoException {
-    final String base64 =
-        "AOSqUUDaiPGYESoI/G13YwT2qyWW/RRvsW2G7IoCG"
-            + "URYYbRLmbwt4NZ9m9x7s8taYhCJg9OQdkrmSTVioUVpCSM=";
+    final String base64 = "ADfbVnAT2QLG7W+bM+1ENzEKAxnoUx10+WfGg5zx8VRm";
     final ED25519KeyPair ed25519KeyPair = ED25519KeyPair.decodeBase64(Base64.decode(base64));
 
     Signer signer = new Ed25519Signer();

src/test/java/io/sui/crypto/FileBasedKeyStoreTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 [email protected]
+ * Copyright 2022-2023 [email protected]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with
@@ -48,19 +48,15 @@ void initKeyPairs() {
         new FileBasedKeyStore(
             Paths.get("src/test/resources/config/sui.keystore").toAbsolutePath().toString());
 
-    assertEquals(11, fileBasedKeyStore.keys.size());
+    assertEquals(7, fileBasedKeyStore.keys.size());
     String expected =
-        "0x1e7752f22228753e5745f5ac8ad4ef1bbc502845\n"
-            + "0x207f2c9f08472b1ff68644fdfc7a70df10cb3d4e\n"
-            + "0x49ef9b602b76a37e0f9177783755c1a190866e72\n"
-            + "0x51972acc644b8c6dd81d6088780b40e842a0a10c\n"
-            + "0x51de405091c9f971fc6085d384f9ba764f268fca\n"
-            + "0x63485e00efc944d62349b79f88a11b7cacc2a764\n"
-            + "0x78cec6011e9d0690d5fbbfa4d25987a087a88ee7\n"
-            + "0x887ddfbf2bc37d757eabb08d62bf725a04922bde\n"
-            + "0xca21af1b5b347d315d7355ff9e6e73cc79d0a4d0\n"
-            + "0xe8da3f038048e2cd6339e916a926874d0d0604b7\n"
-            + "0xea79464d86786b7a7a63e3f13f798f29f5e65947\n";
+        "0x0a7421363a1f6a82800f7c9340ac02b5905798cb\n"
+            + "0x64e1714eb06c22dff8ac7dab7eb302d4abededf9\n"
+            + "0xa0fd2a6814cff90d4463fb7e5b5b81d01d763472\n"
+            + "0xd456963facd4c40adfc3858d1a33c93d4d759664\n"
+            + "0xee3752e38e25a52c5d35cff23695d1115d3a0149\n"
+            + "0xf76f8c0e679c55a9d17229b9cbda702645836aa7\n"
+            + "0xfa423b6448e5e83d03e0d98ce00b5be32da5ee86\n";
     StringBuilder actual = new StringBuilder();
     for (String key : fileBasedKeyStore.keys.navigableKeySet()) {
       actual.append(key).append("\n");

src/test/java/io/sui/crypto/SECP256K1KeyPairTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 [email protected]
+ * Copyright 2022-2023 [email protected]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with
@@ -37,20 +37,16 @@ class SECP256K1KeyPairTest {
   /** Address. */
   @Test
   void address() {
-    final String base64 =
-        "AQLE7fDdDt4nrbGgCX8umsFscJRFY4t3Bkrk3MaB"
-            + "b1nnA6dD5QHIFrPAdPQtdDyfoJNjiN/ghxuVLxfHxehcwec0";
+    final String base64 = "ABw1fhWdG+Ni9eFfyLdfdmsiMWyirHCV/UVC9jcloBm8";
     final SuiKeyPair<ECKey> secp256K1KeyPair = SECP256K1KeyPair.decodeBase64(Base64.decode(base64));
 
-    assertEquals("0xe8da3f038048e2cd6339e916a926874d0d0604b7", secp256K1KeyPair.address());
+    assertEquals("0xea650e4199befc011d2373decabc4c3deb0275d8", secp256K1KeyPair.address());
   }
 
   /** Decode base 64. */
   @Test
   void decodeBase64() {
-    final String base64 =
-        "AQLE7fDdDt4nrbGgCX8umsFscJRFY4t3Bkrk3MaBb1nnA6dD5QH"
-            + "IFrPAdPQtdDyfoJNjiN/ghxuVLxfHxehcwec0";
+    final String base64 = "ABw1fhWdG+Ni9eFfyLdfdmsiMWyirHCV/UVC9jcloBm8";
     final SuiKeyPair<ECKey> secp256K1KeyPair = SECP256K1KeyPair.decodeBase64(Base64.decode(base64));
     final String msg = "test";
     final ECDSASignature signature = secp256K1KeyPair.keyPair.sign(Sha256Hash.of(msg.getBytes()));

src/test/java/io/sui/crypto/SuiKeyPairTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 [email protected]
+ * Copyright 2022-2023 [email protected]
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with
@@ -34,9 +34,7 @@ class SuiKeyPairTest {
   /** Decode base 64. */
   @Test
   void decodeBase64() {
-    final String base64 =
-        "AQLE7fDdDt4nrbGgCX8umsFscJRFY4t3Bkrk3MaB"
-            + "b1nnA6dD5QHIFrPAdPQtdDyfoJNjiN/ghxuVLxfHxehcwec0";
+    final String base64 = "ADfbVnAT2QLG7W+bM+1ENzEKAxnoUx10+WfGg5zx8VRm";
     try {
       SuiKeyPair.decodeBase64(base64);
     } catch (SignatureSchemeNotSupportedException e) {

src/test/resources/config/sui.keystore

@@ -1,13 +1,9 @@
 [
-  "AOSqUUDaiPGYESoI/G13YwT2qyWW/RRvsW2G7IoCGURYYbRLmbwt4NZ9m9x7s8taYhCJg9OQdkrmSTVioUVpCSM=",
-  "AQOn0iLM/e8juxoMI4V1Usun+6ohvRqH5JBZ6gOV4bFW89iK30AcgeoKuTw6ftEdYeHtuIo+cJ9+nh9iV5QsjwHz",
-  "APuC5Q1OqLitEra+foDkhcuNCw5QXl3+SWyJfgN6W/UvWnP2cVdopkxK/yhW2s+R3YGMiukPURMUX4q5mKfGTyk=",
-  "ACQKog3HkkIWw7/hGXekeyc/oLUua2H7JZwhjXgycpxggZoUkSgyKt2MTevSG9PB5aZLN84cvgwMqzxpDtkFDJY=",
-  "AJty6phE36GqKobHqHGOtplnLXQ6jq1AVaiiX7XkDuA7ZRbMX0ps9KUnAm3mKO4vXR+El4vdf7qk1FYMK3PAIaY=",
-  "AGkJtIyKHM0hf528r/PxwwK7oKEDgXXtv+AGO1qaVfNxVN9ABp/RbUimEybWK1o0pY3JpEUnIve/6v1sHOLzfik=",
-  "AQLeapMz9pSCMPHXOf+fl7snw6O5wgz/WQgLM+Rmzh7BFWlfRE6/2ROHOa6K88gdMRdsAAI7nP/1TRJqhuasG4nW",
-  "AFjviUpW2gMO7bs9D7lRKO1zlmjNTpvbZJXdNUZhizPFkL+LtkqeZuDLV+GmDb9IP2L3pS6J19uz24r8aoFj//Q=",
-  "AF7bpdmbv/s7zvt/vjps6lLj/4bkz9FzGeXzmjYHAfz8hdarcmYgoQvtlCS4EtEAR2AUX9g7HDuwlxs1HbXTlEU=",
-  "AQLE7fDdDt4nrbGgCX8umsFscJRFY4t3Bkrk3MaBb1nnA6dD5QHIFrPAdPQtdDyfoJNjiN/ghxuVLxfHxehcwec0",
-  "AJ/On29cDTJ1yHMIJV2Wj87LMPHNxD+IIOsa498SQcmIGTayUd4nokl1C9qFhtCXatrzKUSEIHX7l0dZeAO2TVs="
+  "ADfbVnAT2QLG7W+bM+1ENzEKAxnoUx10+WfGg5zx8VRm",
+  "AWe4FkcXsOj4VyovvBPIelOdFCoRcEikbDY3owNCHU9v",
+  "AKq86eFhwsImf6AmQU47bJsKn7zIQkDbxDboke06+2LW",
+  "AfbiK0DiFbFcQlxhT8qy5wFw9AdjhFMUVXHKt0NPTSnD",
+  "ADuyofQrqgbSBhocqgkaSPLagvru0WJVT9OlZxl5aRru",
+  "ABw1fhWdG+Ni9eFfyLdfdmsiMWyirHCV/UVC9jcloBm8",
+  "AN8gQvDgucRoQM3zK+oyLr8ZUdhlnUa2JhN9PcBxNq2U"
 ]