[fix] hyperledger#2123: Return PublicKey de/serialization from mult…

…ihash Signed-off-by: Shanin Roman <shanin1000@yandex.ru>
Erigara · Mar 3, 2023 · c8e8ea9 · c8e8ea9
1 parent 81ada58
commit c8e8ea9
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 177 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/config/iroha_test_config.json b/config/iroha_test_config.json
@@ -1,8 +1,5 @@
 {
-  "PUBLIC_KEY": {
-    "digest_function": "ed25519",
-    "payload": "1c61faf8fe94e253b93114240394f79a607b7fa55f9e5a41ebec74b88055768b"
-  },
+  "PUBLIC_KEY": "ed01201c61faf8fe94e253b93114240394f79a607b7fa55f9e5a41ebec74b88055768b",
   "PRIVATE_KEY": {
     "digest_function": "ed25519",
     "payload": "282ed9f3cf92811c3818dbc4ae594ed59dc1a2f78e4241e31924e101d6b1fb831c61faf8fe94e253b93114240394f79a607b7fa55f9e5a41ebec74b88055768b"
@@ -20,31 +17,19 @@
     "TRUSTED_PEERS": [
       {
         "address": "127.0.0.1:1337",
-        "public_key": {
-            "digest_function": "ed25519",
-            "payload": "1c61faf8fe94e253b93114240394f79a607b7fa55f9e5a41ebec74b88055768b"
-        }
+        "public_key": "ed01201c61faf8fe94e253b93114240394f79a607b7fa55f9e5a41ebec74b88055768b"
       },
       {
         "address": "127.0.0.1:1338",
-        "public_key": {
-            "digest_function": "secp256k1",
-            "payload": "cc25624d62896d3a0bfd8940f928dc2abf27cc57cefeb442aa96d9081aae58a1"
-        }
+        "public_key": "ed0120cc25624d62896d3a0bfd8940f928dc2abf27cc57cefeb442aa96d9081aae58a1"
       },
       {
         "address": "127.0.0.1:1339",
-        "public_key": {
-            "digest_function": "bls_normal",
-            "payload": "faca9e8aa83225cb4d16d67f27dd4f93fc30ffa11adc1f5c88fd5495ecc91020"
-        }
+        "public_key": "ed0120faca9e8aa83225cb4d16d67f27dd4f93fc30ffa11adc1f5c88fd5495ecc91020"
       },
       {
         "address": "127.0.0.1:1340",
-        "public_key": {
-            "digest_function": "bls_small",
-            "payload": "8e351a70b6a603ed285d666b8d689b680865913ba03ce29fb7d13a166c4e7f1f"
-        }
+        "public_key": "ed01208e351a70b6a603ed285d666b8d689b680865913ba03ce29fb7d13a166c4e7f1f"
       }
     ],
     "COMMIT_TIME_LIMIT_MS": 2000,
@@ -85,10 +70,7 @@
     "TERMINAL_COLORS": true
   },
   "GENESIS": {
-    "ACCOUNT_PUBLIC_KEY": {
-      "digest_function": "ed25519",
-      "payload": "4cffd0ee429b1bdd36b3910ec570852b8bb63f18750341772fb46bc856c5caaf"
-    },
+    "ACCOUNT_PUBLIC_KEY": "ed01204cffd0ee429b1bdd36b3910ec570852b8bb63f18750341772fb46bc856c5caaf",
     "ACCOUNT_PRIVATE_KEY": {
       "digest_function": "ed25519",
       "payload": "d748e18ce60cb30dea3e73c9019b7af45a8d465e3d71bcc9a5ef99a008205e534cffd0ee429b1bdd36b3910ec570852b8bb63f18750341772fb46bc856c5caaf"
@@ -133,4 +115,4 @@
     "MAX_RETRY_DELAY_EXPONENT": 4,
     "FILE": null
   }
-}
+}
diff --git a/configs/client_cli/config.json b/configs/client_cli/config.json
@@ -1,8 +1,5 @@
 {
-  "PUBLIC_KEY": {
-    "digest_function": "ed25519",
-    "payload": "7233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0"
-  },
+  "PUBLIC_KEY": "ed01207233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0",
   "PRIVATE_KEY": {
     "digest_function": "ed25519",
     "payload": "9ac47abf59b356e0bd7dcbbbb4dec080e302156a48ca907e47cb6aea1d32719e7233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0"

diff --git a/configs/peer/genesis.json b/configs/peer/genesis.json
@@ -20,10 +20,7 @@
             "NewAccount": {
               "id": "alice@wonderland",
               "signatories": [
-                {
-                  "digest_function": "ed25519",
-                  "payload": "7233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0"
-                }
+                "ed01207233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0"
               ],
               "metadata": {
                 "key": {
@@ -38,10 +35,7 @@
             "NewAccount": {
               "id": "bob@wonderland",
               "signatories": [
-                {
-                  "digest_function": "ed25519",
-                  "payload": "7233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0"
-                }
+                "ed01207233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0"
               ],
               "metadata": {
                 "key": {
@@ -75,10 +69,7 @@
             "NewAccount": {
               "id": "carpenter@garden_of_live_flowers",
               "signatories": [
-                {
-                  "digest_function": "ed25519",
-                  "payload": "7233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0"
-                }
+                "ed01207233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0"
               ],
               "metadata": {}
             }

diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml
@@ -27,6 +27,7 @@ iroha_schema = { path = "../schema" }
 derive_more = { version = "0.99.17", default-features = false, features = ["deref", "deref_mut", "display"] }
 parity-scale-codec = { version = "3.2.1", default-features = false, features = ["derive", "full"] }
 serde = { version = "1.0.151", default-features = false, features = ["derive"] }
+serde_with = {version = "2.1.0", default-features = false, features = ["macros"]}
 hex = { version = "0.4.3", default-features = false, features = ["alloc", "serde"] }
 openssl-sys = { version = "0.9.80", features = ["vendored"], optional = true }
 ursa = { version = "0.3.7", optional = true }