Fixed keystore encoding

project-dkg · Jun 30, 2024 · 0b58604 · 0b58604
1 parent d710e35
commit 0b58604
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/dkgNode/Services/KeyStoreService.cs b/dkgNode/Services/KeyStoreService.cs
@@ -64,7 +64,7 @@ public static (string, string, string?) DecodeOrCreate(string? keyStore, string
                     else
                     {
                         keyStoreDataBytes = secretKeyStoreService.DecryptKeyStoreFromJson(keyStorePwd, keyStoreString);
-                        solanaPrivateKey = Encoding.UTF8.GetString(keyStoreDataBytes);
+                        solanaPrivateKey = Solnet.Wallet.Utilities.Encoders.Base58.EncodeData(keyStoreDataBytes);
                         logger.LogInformation("Using Solana Address: {solanaAddress}", solanaAddress);
                     }
                 }
@@ -89,8 +89,7 @@ public static (string, string, string?) DecodeOrCreate(string? keyStore, string
                     solanaAddress,
                 solanaPrivateKey);
 
-                keyStoreDataBytes = Encoding.UTF8.GetBytes(solanaPrivateKey);
-                keyStoreString = secretKeyStoreService.EncryptAndGenerateDefaultKeyStoreAsJson("", keyStoreDataBytes, solanaAddress);
+                keyStoreString = secretKeyStoreService.EncryptAndGenerateDefaultKeyStoreAsJson("", account.PrivateKey.KeyBytes, solanaAddress);
                 keyStoreDataBytes = Encoding.UTF8.GetBytes(keyStoreString);
                 keyStoreString = Convert.ToBase64String(keyStoreDataBytes);
                 newKeyStore = keyStoreString;

diff --git a/dkgNode/appsettings.json b/dkgNode/appsettings.json
@@ -7,5 +7,6 @@
     }
   },
   "Node": {
+
   }
 }
diff --git a/dkgServiceNode/Data/DbEnsure.cs b/dkgServiceNode/Data/DbEnsure.cs
@@ -210,6 +210,7 @@ public static void Ensure(string connectionString)
             }
 
             Ensure_0_8_0(connection);
+            PuVersionUpdate("0.8.1", connection);
         }
     }
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -24,8 +24,7 @@ services:
     environment:
       - DKG_SERVICE_NODE_URL=http://dkg_service_node:8080
       - DKG_NODE_NAME=First node
-        # "decrease high inject kitchen alone train income charge hint gauge deal parrot"
-      - DKG_SOLANA_KEYSTORE=eyJjcnlwdG8iOnsiY2lwaGVyIjoiYWVzLTEyOC1jdHIiLCJjaXBoZXJ0ZXh0IjoiNDg3NWUwYzFhNmQ5YjY4MDdiYTY2NmY1YTFjYWE2NzgzMDEzZTFmYjUzODRhY2YwZDgzNTI1MWM3MjRlNGEwZGY3MGRjYzcwMTk4ZjA2NjI4MTI3ZDY5OGIzZTdlOTk2MWJmYTg2ZDg2OTg1OGEwMGVhODgzOTM5MjFlNDlkZmFiZjFkN2U1NGNhMjViNWEyMWRmNjVhYjQ2NWQ1YTg5NDc5NjA0Y2ExMjNmZjc0NTgiLCJjaXBoZXJwYXJhbXMiOnsiaXYiOiI5OWY4ZWE2NjU2OWNmNTI1YjE2NGE0MWM4YmIzZGMwYyJ9LCJrZGYiOiJzY3J5cHQiLCJtYWMiOiJmNDdiNjExMDZlMmNiMGNiM2IwZDNiYzQ3OThkMGY2YmIxOTExYmNmYWU1YTNkYTQwM2EwZDc5Yjg2ZTQxYTc4Iiwia2RmcGFyYW1zIjp7Im4iOjI2MjE0NCwiciI6MSwicCI6OCwiZGtsZW4iOjMyLCJzYWx0IjoiMTBmMTc5MGIyZjIwOGM3NTIyZGY1NTMxYTU0MTViYjdhMjNmYmIzMjE0MmY1NzQ3Y2FlM2Y4MDA0NGM0NzQ4OCJ9fSwiaWQiOiIwZjE2M2E2MC1jNjdmLTQxNGYtYjY1OC0xMDAyMjk1MTA0NTkiLCJhZGRyZXNzIjoiNWkzdkJwcDZuMkdSZHdGcnhVNmJ4U3lTWG41S2dyNDIyMkE0eGM1SzcyYUwiLCJ2ZXJzaW9uIjozfQ==
+      - DKG_SOLANA_KEYSTORE=eyJjcnlwdG8iOnsiY2lwaGVyIjoiYWVzLTEyOC1jdHIiLCJjaXBoZXJ0ZXh0IjoiODNmMGRjNTZiMDcyZTQzNGIyZjVkNmI4Y2RhYTU0NGRjNGM3MmM1MmJmYjNlYWUyZmI5MGI4MGZkNDNkYmZkYWI5N2Q2NzIwMzlmNjMxY2I4YzVlMzFjNzlkYmVmNjg5YzdiNjcwNTNkNzBkNzBmYjdkZTIzYjQ3NDc0YWI3ODQiLCJjaXBoZXJwYXJhbXMiOnsiaXYiOiI1YTc2ZTljNjE1ODFkMzAxZmE3N2NhMWIwZmExYmY5NiJ9LCJrZGYiOiJzY3J5cHQiLCJtYWMiOiJiNzk5MTRkOGY5YzI2OTliZGQ5OGU3NGZjNDYxODUxYzdiNGJhYmJlNjE1NGRlNGMzN2ZiYTk1ZWRjOGJlMjRhIiwia2RmcGFyYW1zIjp7Im4iOjI2MjE0NCwiciI6MSwicCI6OCwiZGtsZW4iOjMyLCJzYWx0IjoiOWQwMDdmZmY0YjIzYjY1NTZiNTRhYWIzOTBlZmVjMjRlY2U1Mzg1N2ZlNDg0MWQ1ZDllNzgyYWUwNDI0ZWNhOCJ9fSwiaWQiOiIxMjMxYTA5MC01OTA1LTQyY2MtOTQ5Ny03NDJlMjkwZWM2YTAiLCJhZGRyZXNzIjoiSFlndlM1U0pyVDN3SHFKdGl6Z1ZEaW1td1ZYd3NOZk5MVnlUeEg4UDdVV1ciLCJ2ZXJzaW9uIjozfQ==
     build:
       context: .
       dockerfile: dkgNode/Dockerfile
@@ -38,8 +37,8 @@ services:
     environment:
       - DKG_SERVICE_NODE_URL=http://dkg_service_node:8080
       - DKG_NODE_NAME=Second node
-        # salon glove crisp couple bounce wool cube super casino warm census edit
-      - DKG_SOLANA_KEYSTORE=eyJjcnlwdG8iOnsiY2lwaGVyIjoiYWVzLTEyOC1jdHIiLCJjaXBoZXJ0ZXh0IjoiNDUwNDBjMGExZTkyMGU1ZmU0MDJlYzMyN2JkYjM4ZThjYzg3YWE3NGJmY2Q2OWFhYTM5M2UyZGIxNzRmOGM0OTU4ZDQ4OTlmY2Q4M2I4NjJjYmVmMjRlYThjNmMxM2IzZDEzOGVmNDhjY2EwYmM4ZTc5MmVlMDM2Y2I4ZTM1YjI0ODgyNDRlMDMzNWQ4ZmE4NjEyNTFjMTU4NDk4Yzk4MGY1NDM4OWYwYmRkNTAwODgiLCJjaXBoZXJwYXJhbXMiOnsiaXYiOiJmMmE0YjQ3NWY0MzZkOGY2MmRjOGNhODlmN2RlNjY0NCJ9LCJrZGYiOiJzY3J5cHQiLCJtYWMiOiI2YjAzMzZhYmQ4OTM3YjVmMTZkYzY2ZTg2MDlhZTM0NjgxNmU0MWI0NzExNmQ2OTNkNjQ4NWJkNGZiMTYxZDdkIiwia2RmcGFyYW1zIjp7Im4iOjI2MjE0NCwiciI6MSwicCI6OCwiZGtsZW4iOjMyLCJzYWx0IjoiZTljNGYzZmZlZmEzMDMwNDYxNzdlNGQ4YzQxMDdhY2Y3NTZkYTQ5NjdiYTNjZGJlOGZkMDRmYzA2YTY5OTk0ZSJ9fSwiaWQiOiI4YTgwYTkyYi01YTczLTQwMDEtODdjNC01ODViNTkzYWFhM2MiLCJhZGRyZXNzIjoiM3FVNGl4VFdQZXlrZFBGaXJ6bWJ1TThWM2tYblpINmd6WnhSanhVNUJxTTUiLCJ2ZXJzaW9uIjozfQ==
+      - DKG_SOLANA_KEYSTORE=eyJjcnlwdG8iOnsiY2lwaGVyIjoiYWVzLTEyOC1jdHIiLCJjaXBoZXJ0ZXh0IjoiZmY3MTY0ZDMyOWQ2NWVkODhmZjdhZDFlMmI1YWJkNzczZjlkNzUzNjIyMDdhZjhkNzVmZDU0MWFjYWM0NWVhMDU4MzcwOTdlOGNlNTI0NGFlNTNlMWQ0N2E2ZTMzMGMwZjJmYjY2NWMzZGQzNzhmY2MyYjVjY2VlMDcwZjYxMjMiLCJjaXBoZXJwYXJhbXMiOnsiaXYiOiI0OWJmOTQyYjliZWFmMjQzNWZiOGYyZjkwZTFlMGRlNCJ9LCJrZGYiOiJzY3J5cHQiLCJtYWMiOiI3ZGZkNzQwMDBiNWNjMjA2MWUzMWU1Nzg4NGUyMmQyYjYzYzM1YTY0NTU3MmNjMTA3Y2M0NWQzYTQwMzc4OTVhIiwia2RmcGFyYW1zIjp7Im4iOjI2MjE0NCwiciI6MSwicCI6OCwiZGtsZW4iOjMyLCJzYWx0IjoiYWU5NTA0MWNlNTUyMTRmYjU3MzgzYTVkMjE2YmJiMDk2MzA5ZjNiMjA3ZWMzYTY4MTZlNjkyMzEyNDNkZjYzMSJ9fSwiaWQiOiIzYmRhZTA2OC03ZTEzLTRjMTYtOTM1ZC1iYjMyYzc1YzcwMTYiLCJhZGRyZXNzIjoiaHRBRW81bW0xQnY5SDRUUE1YWFJjTGhqeHB5UzZMR3lLWXl0bVVnNWVEZCIsInZlcnNpb24iOjN9
+
     build:
       context: .
       dockerfile: dkgNode/Dockerfile
@@ -52,8 +51,7 @@ services:
     environment:
       - DKG_SERVICE_NODE_URL=http://dkg_service_node:8080
       - DKG_NODE_NAME=Third node
-        # fruit kitten anchor reduce ticket drink sentence worth better orchard moral direct
-      - DKG_SOLANA_KEYSTORE=eyJjcnlwdG8iOnsiY2lwaGVyIjoiYWVzLTEyOC1jdHIiLCJjaXBoZXJ0ZXh0IjoiNmQxZmNiMzNjYTQ3Njg4ZWRiZDUwMTJiZmE0NGM5ZGQ1Mzk1NGE5OTI1ZjZjNzFkZTQ2NGFmOGEwYWZhNTE3N2M0ZDIzNTc3YWUxYTMxN2YyMzk1ODc5MzAwMWI5ZmVlNjVkZGRmZTI3NDljM2MzOGNhYTI1MzVhZDJhYTk5MmYwMjA4MzE3ZjVmMGRjODg1YjcyMjZkMWE4MmRlZWUzNmMyODZhNGJmM2RjMmEzIiwiY2lwaGVycGFyYW1zIjp7Iml2IjoiYmI4YmIxODdlNzk4OTQ3MDMzNGMwZWUzMTk4MDkyOTkifSwia2RmIjoic2NyeXB0IiwibWFjIjoiMDIzMmUyZDU0ODgxOWQyMjBlOTNjZGZjZDUyYWYyOWQwYzQ4ZTNmNDRmYTY5YzYzOWIwYTk1MDk3NmI2MmM1MSIsImtkZnBhcmFtcyI6eyJuIjoyNjIxNDQsInIiOjEsInAiOjgsImRrbGVuIjozMiwic2FsdCI6ImY2ODZkOGQwZmYwM2ZkMWU0NzE4MjJhN2RjZmU2MmU2ZmZlZjc1ODUzNDNkZjZhMDhmYTAwNDY1YWQ0OWU4ZmYifX0sImlkIjoiM2ZkZDJkODYtMzJjOC00NGNlLWJiYjgtM2Q0NWJiOWNjYjcwIiwiYWRkcmVzcyI6IjhTd3ROeG5hWnhHRGk1VVo0VlhudG9HQWNCTHlnb3ZCV0I0cktta25jQUhCIiwidmVyc2lvbiI6M30=
+      - DKG_SOLANA_KEYSTORE=eyJjcnlwdG8iOnsiY2lwaGVyIjoiYWVzLTEyOC1jdHIiLCJjaXBoZXJ0ZXh0IjoiOWE5ZmYyMmUxMWYyMzkwOWNiODQzNzZhYTA3NzM3ZDU5NTI2NDgwMjRiYjcwMGQwOTA5OWEwMDQyYjg3OTU4NzBlMzJmN2E0MDFlZTk4MDZhZTYwYTc4ZWM3YzYwNGNhZWU2MzVlOTk0YjMzODA1ODhiMGUzYzNkNDVmYTY1MDkiLCJjaXBoZXJwYXJhbXMiOnsiaXYiOiJiZTVhZTRmYjkyZDcxYTg0YTU4YmM0MjJjMTRhMDhhYyJ9LCJrZGYiOiJzY3J5cHQiLCJtYWMiOiI0YTQ1MTZkOWFlMWYxOGY0YTIwNGZlMDZlNWEwMmFlYzQ2NGIzYjI1NDk4M2U4Y2E4ZjI5Y2ZhOWZkMWY3ZGYyIiwia2RmcGFyYW1zIjp7Im4iOjI2MjE0NCwiciI6MSwicCI6OCwiZGtsZW4iOjMyLCJzYWx0IjoiNDc1ZWVhMjVkZDA4ODIwMjBmODcwZTg4Y2Q3NmExNzU3MzIzMzQ3YWI0ZDI1ZmRkMjM2YWFmYTg4OTkxNDQ3YiJ9fSwiaWQiOiI5M2ZjYTFhYi0wNGZkLTQzNjUtYTgxYS1jN2QwMTE1YWI0ZmMiLCJhZGRyZXNzIjoiOUxZbldlSER5bm4zWHpmY1NQVVNHRWNpQVlhRlFqZ0F1dkoyRzNnc2k0dGkiLCJ2ZXJzaW9uIjozfQ==
     build:
       context: .
       dockerfile: dkgNode/Dockerfile
@@ -66,8 +64,7 @@ services:
     environment:
       - DKG_SERVICE_NODE_URL=http://dkg_service_node:8080
       - DKG_NODE_NAME=Fourth node
-        # ribbon pistol ranch icon scorpion later fruit lab affair wheel credit camp
-      - DKG_SOLANA_KEYSTORE=eyJjcnlwdG8iOnsiY2lwaGVyIjoiYWVzLTEyOC1jdHIiLCJjaXBoZXJ0ZXh0IjoiNGY0MmUxYWMxMGM5ODc5YjhlZDRiZTE0Zjk5YzE4ODljODA4MjY0Y2QzZjM2MjY0NWZkMTQ3ZjU5NGZmODU2MDIyYzU2NTRkNGI0OTQyOWI0YWRkMWY0MDU1M2RlNzRhYmM4MjU4NWFmMDA4NmIxMDMxZjMxOWJmYWM2YzQ3YWZjNmQ5MWY4ODZiZWY5ZTIyMmVmMTk2NjgwZTIyYTU3Yjk0NTI3ZDgyMTE1ZGM3N2UiLCJjaXBoZXJwYXJhbXMiOnsiaXYiOiI4ODY4MjE5OTBlMzc2ZThjOTlmNWUwYTQ2YmYzZjRlYyJ9LCJrZGYiOiJzY3J5cHQiLCJtYWMiOiIzYjBlMjc1MDczNTU4NDlkYWRmYTc0MDg3OWM3Mzg2NjZjODM1NGYzMmY1YjI2ODMyNWIyNThkZjYyNjRjNWQ3Iiwia2RmcGFyYW1zIjp7Im4iOjI2MjE0NCwiciI6MSwicCI6OCwiZGtsZW4iOjMyLCJzYWx0IjoiODlkMDAzMTZiODMzZTk5ZjU4OTI0NGMwZDNhYTY4MTgxMTkwMmNlMDJiNGFlMThiNzRkODc4MzdhMDkxMjBlZSJ9fSwiaWQiOiJkMzZlM2YyMy05YTEzLTQ3Y2QtODgwYy0xODNiNmMwNjUzYWUiLCJhZGRyZXNzIjoiQmVCTVYzemlrRUp4UFpFaUxBb2syQm5CUHZGUUNhdXphS1hHdjE5OW9XSmkiLCJ2ZXJzaW9uIjozfQ==
+      - DKG_SOLANA_KEYSTORE=eyJjcnlwdG8iOnsiY2lwaGVyIjoiYWVzLTEyOC1jdHIiLCJjaXBoZXJ0ZXh0IjoiNzRmYjhmOWM3YjJhOTMyOGI2NmYyMTEwOThhNGQ3YjQ3MjFmYWY4NDNkZDNhNDEzODI2ZDZjMjNmYjJiMWNiN2NlYzZlN2JhMmZhMGU2YzY5NTllNzUyNzdjNWY1YThmNjMwZWQ1Y2Q1NDRhMmJmMDEwYzU4NzFhZTViN2EwMzgiLCJjaXBoZXJwYXJhbXMiOnsiaXYiOiJiZWY3MzYwNjc5YzZmYjE1NDVhMDdjMjk0ZmJkZDRhNiJ9LCJrZGYiOiJzY3J5cHQiLCJtYWMiOiIwNjgyMmM2YzE0ZjE1MDZjYzI4MzcyZWFlZTVhNDA4OWJjMDk3NzgxMzAzZWQ0ZjRiZDJmYmRkMTliOTgyM2FhIiwia2RmcGFyYW1zIjp7Im4iOjI2MjE0NCwiciI6MSwicCI6OCwiZGtsZW4iOjMyLCJzYWx0IjoiNTZhNDRjZDViYWMwZWNkNGYxM2I1MTBmNzI0N2FmMzY1MmI4MDQ1ZTg2ODA3ZDhmMjkwNjQ4YjE1NzE5OTZiNiJ9fSwiaWQiOiIyZjBjZjdhOS1lMjJkLTRkMTEtYTQwYy01YTQ3OTZkNzc1YTUiLCJhZGRyZXNzIjoiOXFFaFNwREtpV0daSHVORWZtaVhMMVFjS1lpaWdxenQ2UWVwNnBQaUNlc0wiLCJ2ZXJzaW9uIjozfQ==
     build:
       context: .
       dockerfile: dkgNode/Dockerfile
@@ -81,8 +78,7 @@ services:
       - DKG_SERVICE_NODE_URL=http://dkg_service_node:8080
       - DKG_NODE_NAME=Fifth node
       # DKG_NODE_DIE_ON_STEP_TWO=Yes
-        #  pave recipe charge leave response join peasant timber resemble motion own crop
-      - DKG_SOLANA_KEYSTORE=eyJjcnlwdG8iOnsiY2lwaGVyIjoiYWVzLTEyOC1jdHIiLCJjaXBoZXJ0ZXh0IjoiNzUyMWU2MTYzZTQ0NDNlMWIxYTg1NzI3NGIxMTM5YmY2OWYwZGJmYmIzOWJlNTQwODE2ZDcwOGQwMzYyNTU1YTZiMjQzZjBmNGUyNDJkMGRmOGI1YWIwNzI0NWE5ZDgyZWYzMzc5NjA4NDFmN2Q2MzcwNjAxNDJlNzBkOWUzMzNlZWU3ZGI5MGY0Yzk1ZDYxZGI3Mzg0MDJjOWMwNGJmOGE1OTlkMWRiNDc1YjBlZTAiLCJjaXBoZXJwYXJhbXMiOnsiaXYiOiI0M2I0MmNmNzk5M2RmMWQzYzhiMTQ3N2ZhMzFhN2FhZSJ9LCJrZGYiOiJzY3J5cHQiLCJtYWMiOiJkMjU3NThiYWIwNGRkZWM4ZWIwYTE0MjFmMDUzZWEyODgxM2Q0ZGNmOGRkYmJmNGYzNGQ3NThlODgxYWEwZTYzIiwia2RmcGFyYW1zIjp7Im4iOjI2MjE0NCwiciI6MSwicCI6OCwiZGtsZW4iOjMyLCJzYWx0IjoiNTE3NDgxMGZjM2JlYmZjZDJmYzM1MDVlZGJlZjgwMTI5YjcwYjk1OTAxNDFlNDdiODFhMzIzOTZjYThhYzE3MyJ9fSwiaWQiOiIzYTMyMWMyMy1hYTg3LTQ1NjAtYmRkZC01YzZmMTE2NWYxMDQiLCJhZGRyZXNzIjoiQkFwakg0RG9HNUV3VkFlQlprbmFFM0xFR0RFa0tnY3U1TVhOeWpSazJBM3ciLCJ2ZXJzaW9uIjozfQ==
+      - DKG_SOLANA_KEYSTORE=eyJjcnlwdG8iOnsiY2lwaGVyIjoiYWVzLTEyOC1jdHIiLCJjaXBoZXJ0ZXh0IjoiYzkyOGRhMmU2MTVhMDUxN2Y3NDljNWNmZTQ3MDQwYmZlMzVlMDI4ZmU0N2YxZTBjZjRkNjcxNTE5MThlNWNlMWUyMjdiNTc3MzMzZDA2MjgwMDgxYTA4ZTUxOGIyOTgzNjM5NjYwOTVmMTM2YjExNzM5MTUyYjU0YzZjZWY5ODEiLCJjaXBoZXJwYXJhbXMiOnsiaXYiOiJlYTY5MDExNzg4ZTQwYmYyOWFmMjYzYzZjN2I4NDE0MiJ9LCJrZGYiOiJzY3J5cHQiLCJtYWMiOiI1OGIyMzllNTk0Mjk1MGY0ZGQ3YzI5NjI1MTIwOTdhZjBmNDBjOWE4ZmFjMTBiYTA2ZTQyYTdmNzIwNzNjOWUwIiwia2RmcGFyYW1zIjp7Im4iOjI2MjE0NCwiciI6MSwicCI6OCwiZGtsZW4iOjMyLCJzYWx0IjoiMzczZGNlODI4NjU3MDY2ZjU3NmQwMTM4NTUxMDJhMTczZDJhMTQwZDhlYWMzMTIzZmZlZWUzZjg0ZDA5NjM0ZSJ9fSwiaWQiOiIxMjMyNWE2MS1iYTRlLTQ5MjEtYTEyYi05YTA4NDg0OWQ3YjEiLCJhZGRyZXNzIjoiRlBVY2lmNEI1eDMxTFlNUFpnbldDNWdWSDZKbnNIMzE5TGR0RWhTZmJjV1MiLCJ2ZXJzaW9uIjozfQ==
     build:
       context: .
       dockerfile: dkgNode/Dockerfile