fixes serialization issue of containerAdditionals

Author: benbierens

Framework/KubernetesWorkflow/Recipe/ContainerAdditionals.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace KubernetesWorkflow.Recipe
 {
@@ -21,14 +22,13 @@ public static ContainerAdditionals CreateFromUserData(IEnumerable<object> userDa
             var typeName = GetTypeName(typeof(T));
             var userData = Additionals.SingleOrDefault(a => a.Type == typeName);
             if (userData == null) return default;
-            var jobject = (JObject)userData.UserData;
-            return jobject.ToObject<T>();
+            return JsonConvert.DeserializeObject<T>(userData.UserData);
         }
 
         private static Additional ConvertToAdditional(object userData)
         {
             var typeName = GetTypeName(userData.GetType());
-            return new Additional(typeName, userData);
+            return new Additional(typeName, JsonConvert.SerializeObject(userData));
         }
 
         private static string GetTypeName(Type type)
@@ -41,13 +41,13 @@ private static string GetTypeName(Type type)
 
     public class Additional
     {
-        public Additional(string type, object userData)
+        public Additional(string type, string userData)
         {
             Type = type;
             UserData = userData;
         }
 
         public string Type { get; }
-        public object UserData { get; }
+        public string UserData { get; }
     }
 }

ProjectPlugins/CodexPlugin/CodexSetup.cs

@@ -169,7 +169,7 @@ public class MarketplaceSetup : IMarketplaceSetup
         public bool IsValidator { get; private set; }
         public Ether InitialEth { get; private set; } = 0.Eth();
         public TestToken InitialTestTokens { get; private set; } = 0.Tst();
-        public EthAccountSetup EthAccountSetup { get; private set; } = new EthAccountSetup();
+        public EthAccountSetup EthAccountSetup { get; } = new EthAccountSetup();
 
         public IMarketplaceSetup AsStorageNode()
         {
@@ -201,8 +201,8 @@ public override string ToString()
             var result = "[(clientNode)"; // When marketplace is enabled, being a clientNode is implicit.
             result += IsStorageNode ? "(storageNode)" : "()";
             result += IsValidator ? "(validator)" : "() ";
-            result += $"Address: '{EthAccountSetup}' ";
-            result += $"{InitialEth.Eth} / {InitialTestTokens}";
+            result += $"Pinned address: '{EthAccountSetup}' ";
+            result += $"{InitialEth} / {InitialTestTokens}";
             result += "] ";
             return result;
         }
@@ -235,6 +235,7 @@ public EthAccount[] GetAll()
 
         public override string ToString()
         {
+            if (!accounts.Any()) return "NoEthAccounts";
             return string.Join(",", accounts.Select(a => a.ToString()).ToArray());
         }
     }

ProjectPlugins/CodexPlugin/CodexStarter.cs

@@ -1,5 +1,6 @@
 using CodexPlugin.Hooks;
 using Core;
+using GethPlugin;
 using KubernetesWorkflow;
 using KubernetesWorkflow.Types;
 using Logging;
@@ -38,6 +39,7 @@ public RunningPod[] BringOnline(CodexSetup codexSetup)
                 var podInfo = GetPodInfo(rc);
                 var podInfos = string.Join(", ", rc.Containers.Select(c => $"Container: '{c.Name}' PodLabel: '{c.RunningPod.StartResult.Deployment.PodLabel}' runs at '{podInfo.K8SNodeName}'={podInfo.Ip}"));
                 Log($"Started node with image '{containers.First().Containers.First().Recipe.Image}'. ({podInfos})");
+                LogEthAddress(rc);
             }
             LogSeparator();
 
@@ -144,6 +146,13 @@ private void LogSeparator()
             Log("----------------------------------------------------------------------------");
         }
 
+        private void LogEthAddress(RunningPod rc)
+        {
+            var account = rc.Containers.First().Recipe.Additionals.Get<EthAccount>();
+            if (account == null) return;
+            Log($"{rc.Name} = {account}");
+        }
+
         private void Log(string message)
         {
             pluginTools.GetLog().Log(message);