Merge branch 'master' into feature/waku-plugin

# Conflicts:
#	Framework/KubernetesWorkflow/Recipe/ContainerRecipeFactory.cs
#	cs-codex-dist-testing.sln

.dockerignore

@@ -1,30 +0,0 @@
-**/.classpath
-**/.dockerignore
-**/.env
-**/.git
-**/.gitignore
-**/.project
-**/.settings
-**/.toolstarget
-**/.vs
-**/.vscode
-**/*.*proj.user
-**/*.dbmdl
-**/*.jfm
-**/azds.yaml
-**/bin
-**/charts
-**/docker-compose*
-**/Dockerfile*
-**/node_modules
-**/npm-debug.log
-**/obj
-**/secrets.dev.yaml
-**/values.dev.yaml
-LICENSE
-README.md
-!**/.gitignore
-!.git/HEAD
-!.git/config
-!.git/packed-refs
-!.git/refs/heads/**

.gitattributes

@@ -1,10 +0,0 @@
-# Set default behavior to automatically normalize line endings.
-* text=auto
-
-# Force bash scripts to always use lf line endings so that if a repo is accessed
-# in Unix via a file share from Windows, the scripts will work.
-*.sh text eol=lf
-
-# Likewise, force cmd and batch scripts to always use crlf
-*.cmd text eol=crlf
-*.bat text eol=crlf

.github/workflows/docker-autoclient.yml

@@ -1,26 +0,0 @@
-name: Docker - AutoClient
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - 'v*.*.*'
-    paths:
-      - 'Tools/AutoClient/**'
-      - '!Tools/AutoClient/docker/docker-compose.yaml'
-      - 'Framework/**'
-      - 'ProjectPlugins/**'
-      - .github/workflows/docker-autoclient.yml
-      - .github/workflows/docker-reusable.yml
-  workflow_dispatch:
-
-jobs:
-  build-and-push:
-    name: Build and Push
-    uses: ./.github/workflows/docker-reusable.yml
-    with:
-      docker_file: Tools/AutoClient/docker/Dockerfile
-      docker_repo: codexstorage/codex-autoclient
-    secrets: inherit
-

.github/workflows/docker-keymaker.yml

@@ -1,27 +0,0 @@
-name: Docker - KeyMaker
-
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - 'v*.*.*'
-    paths:
-      - 'Tools/KeyMaker/**'
-      - 'Framework/**'
-      - 'ProjectPlugins/**'
-      - .github/workflows/docker-KeyMaker.yml
-      - .github/workflows/docker-reusable.yml
-  workflow_dispatch:
-
-
-jobs:
-  build-and-push:
-    name: Build and Push
-    uses: ./.github/workflows/docker-reusable.yml
-    with:
-      docker_file: Tools/KeyMaker/docker/Dockerfile
-      docker_repo: codexstorage/codex-keymaker
-    secrets: inherit
-

.github/workflows/docker-marketinsights.yml

@@ -1,27 +0,0 @@
-name: Docker - MarketInsights API
-
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - 'v*.*.*'
-    paths:
-      - 'Tools/MarketInsights/**'
-      - 'Framework/**'
-      - 'ProjectPlugins/**'
-      - .github/workflows/docker-marketinsights.yml
-      - .github/workflows/docker-reusable.yml
-  workflow_dispatch:
-
-
-jobs:
-  build-and-push:
-    name: Build and Push
-    uses: ./.github/workflows/docker-reusable.yml
-    with:
-      docker_file: Tools/MarketInsights/Dockerfile
-      docker_repo: codexstorage/codex-marketinsights
-    secrets: inherit
-

.gitignore

@@ -1,5 +1,4 @@
 .vs
 obj
 bin
-.vscode
-Tools/AutoClient/datapath
+.vscode

DevconBoothImages/App.xaml

@@ -1,9 +0,0 @@
-<Application x:Class="DevconBoothImages.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:DevconBoothImages"
-             StartupUri="MainWindow.xaml">
-    <Application.Resources>
-         
-    </Application.Resources>
-</Application>

DevconBoothImages/App.xaml.cs

@@ -1,14 +0,0 @@
-using System.Configuration;
-using System.Data;
-using System.Windows;
-
-namespace DevconBoothImages
-{
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-    public partial class App : Application
-    {
-    }
-
-}

DevconBoothImages/AssemblyInfo.cs

@@ -1,10 +0,0 @@
-using System.Windows;
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None,            //where theme specific resource dictionaries are located
-                                                //(used if a resource is not found in the page,
-                                                // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly   //where the generic resource dictionary is located
-                                                //(used if a resource is not found in the page,
-                                                // app, or any theme specific resource dictionaries)
-)]

DevconBoothImages/CodexWrapper.cs

@@ -1,77 +0,0 @@
-using CodexOpenApi;
-using IdentityModel.Client;
-using System.Net.Http;
-using System.Windows;
-using Utils;
-
-namespace DevconBoothImages
-{
-    public class Codexes
-    {
-        public Codexes(CodexApi local, CodexApi testnet)
-        {
-            Local = local;
-            Testnet = testnet;
-        }
-
-        public CodexApi Local { get; }
-        public CodexApi Testnet { get; }
-    }
-
-    public class CodexWrapper
-    {
-        public async Task<Codexes> GetCodexes()
-        {
-            var config = new Configuration();
-            return new Codexes(
-                await GetCodexWithPort(config.CodexLocalEndpoint),
-                await GetCodexWithoutPort(config.CodexPublicEndpoint, config.AuthUser, config.AuthPw)
-            );
-        }
-
-        private async Task<CodexApi> GetCodexWithPort(string endpoint)
-        {
-            var splitIndex = endpoint.LastIndexOf(':');
-            var host = endpoint.Substring(0, splitIndex);
-            var port = Convert.ToInt32(endpoint.Substring(splitIndex + 1));
-
-            var address = new Address(
-                host: host,
-                port: port
-            );
-
-            var client = new HttpClient();
-            var codex = new CodexApi(client);
-            codex.BaseUrl = $"{address.Host}:{address.Port}/api/codex/v1";
-
-            await CheckCodex(codex, endpoint);
-            return codex;
-        }
-
-        private async Task<CodexApi> GetCodexWithoutPort(string endpoint, string user, string pw)
-        {
-            var client = new HttpClient();
-            client.SetBasicAuthentication(user, pw);
-            var codex = new CodexApi(client);
-            codex.BaseUrl = $"{endpoint}/api/codex/v1";
-
-            await CheckCodex(codex, endpoint);
-            return codex;
-        }
-
-        private async Task CheckCodex(CodexApi codex, string endpoint)
-        {
-            try
-            {
-                var info = await codex.GetDebugInfoAsync();
-                if (string.IsNullOrEmpty(info.Id)) throw new Exception("Failed to fetch Codex node id");
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show($"Failed to connect to codex '{endpoint}': {ex}");
-                throw;
-            }
-        }
-
-    }
-}

DevconBoothImages/Configuration.cs

@@ -1,13 +0,0 @@
-namespace DevconBoothImages
-{
-    public class Configuration
-    {
-        public string CodexLocalEndpoint { get; } = "http://localhost:8080";
-        public string CodexPublicEndpoint { get; } = "https://api.testnet.codex.storage/storage/node-9";
-
-        public string AuthUser { get; } = "";
-        public string AuthPw { get; } = "";
-        public string LocalNodeBootstrapInfo { get; } = "";
-        public string WorkingDir { get; } = "D:\\DevconBoothApp";
-    }
-}

DevconBoothImages/DevconBoothImages.csproj

@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UseWPF>true</UseWPF>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="QRCoder" Version="1.6.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ProjectPlugins\CodexPlugin\CodexPlugin.csproj" />
-    <ProjectReference Include="..\Tools\AutoClient\AutoClient.csproj" />
-  </ItemGroup>
-
-</Project>

DevconBoothImages/DevconBoothImages.csproj.user

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-  <ItemGroup>
-    <ApplicationDefinition Update="App.xaml">
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Update="MainWindow.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-</Project>

DevconBoothImages/MainWindow.xaml

@@ -1,38 +0,0 @@
-<Window x:Class="DevconBoothImages.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:DevconBoothImages"
-        mc:Ignorable="d"
-        Title="CodexBoothImages" Height="450" Width="800" WindowState="Maximized">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
-
-        <Grid Grid.Row="0">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <Image Grid.Column="0" Name="Img" />
-            <StackPanel Grid.Column="1">
-                <TextBlock Text="Instructions:"/>
-                <Image Name="ImgInstructions" />
-                <TextBlock Text="Local CID:"/>
-                <Image Name="ImgLocalCid" />
-                <TextBlock Text="TestNet CID:"/>
-                <Image Name="ImgTestnetCid" />
-            </StackPanel>
-        </Grid>
-        
-        <StackPanel Grid.Row="1">
-            <TextBlock Name="Txt" HorizontalAlignment="Center" />
-            <Button Content="Check Codex connections" Click="Button_Click_2" />
-            <Button Content="Generate image -> Upload to Codex -> Put CID info in clipboard" Padding="10" Click="Button_Click"/>
-            <Button Content="Put last CID info in clipboard" Padding="10" Click="Button_Click_1"/>
-        </StackPanel>
-    </Grid>
-</Window>

DevconBoothImages/MainWindow.xaml.cs

@@ -1,160 +0,0 @@
-using AutoClient;
-using CodexOpenApi;
-using Logging;
-using QRCoder;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-
-namespace DevconBoothImages
-{
-    public partial class MainWindow : Window
-    {
-        private readonly Configuration config = new Configuration();
-        private readonly CodexWrapper codexWrapper = new CodexWrapper();
-        private readonly ImageGenerator imageGenerator = new ImageGenerator(new NullLog());
-        private string currentLocalCid = string.Empty;
-        private string currentPublicCid = string.Empty;
-
-        public MainWindow()
-        {
-            InitializeComponent();
-
-            Application.Current.DispatcherUnhandledException += Current_DispatcherUnhandledException;
-        }
-
-        private void Current_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
-        {
-            MessageBox.Show("Unhandled exception: " + e.Exception);
-        }
-
-        private async void Button_Click(object sender, RoutedEventArgs e)
-        {
-            // image
-            Log("Getting image...");
-            var file = await imageGenerator.Generate();
-            var filename = Path.Combine(config.WorkingDir, file);
-            File.Copy(file, filename);
-
-            var bmp = new BitmapImage();
-            bmp.BeginInit();
-            bmp.UriSource = new Uri(filename);
-            bmp.EndInit();
-            Img.Source = bmp;
-
-            Log("Uploading...");
-            // upload
-            await UploadToCodexes(filename, file);
-
-            // clipboard info
-            InfoToClipboard();
-        }
-
-        private BitmapImage GenerateQr(string text)
-        {
-            using (QRCodeGenerator qrGenerator = new QRCodeGenerator())
-            using (QRCodeData qrCodeData = qrGenerator.CreateQrCode(text, QRCodeGenerator.ECCLevel.Default))
-            using (PngByteQRCode qrCode = new PngByteQRCode(qrCodeData))
-            {
-                byte[] qrCodeImage = qrCode.GetGraphic(7);
-                using (var ms = new MemoryStream(qrCodeImage))
-                {
-                    var img = Image.FromStream(ms);
-                    using (var ms2 = new MemoryStream())
-                    {
-                        img.Save(ms2, ImageFormat.Png);
-                        ms.Seek(0, SeekOrigin.Begin);
-
-                        var bitmapImage = new BitmapImage();
-                        bitmapImage.BeginInit();
-                        bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
-                        bitmapImage.StreamSource = ms2;
-                        bitmapImage.EndInit();
-
-                        return bitmapImage;
-                    }
-                }
-            }
-        }
-
-        private async void Button_Click_1(object sender, RoutedEventArgs e)
-        {
-            InfoToClipboard();
-        }
-
-        private async void Button_Click_2(object sender, RoutedEventArgs e)
-        {
-            // check codexes
-            Log("Checking Codex connections...");
-            await codexWrapper.GetCodexes();
-            Log("Connections OK");
-        }
-
-        private async Task UploadToCodexes(string filename, string shortName)
-        {
-            var codexes = await codexWrapper.GetCodexes();
-            try
-            {
-                currentLocalCid = await UploadFile(filename, shortName, codexes.Local);
-                currentPublicCid = await UploadFile(filename, shortName, codexes.Testnet);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show("Upload failed: " + ex);
-            }
-            Log($"Generated CIDs");
-        }
-
-        private async Task<string> UploadFile(string filename, string shortName, CodexApi codex)
-        {
-            using (var fileStream = File.OpenRead(filename))
-            {
-                var response = await codex.UploadAsync(
-                    "image/jpeg",
-                    $"attachment; filename=\"{shortName}\"",
-                    fileStream);
-
-                if (string.IsNullOrEmpty(response) ||
-                    response.ToLowerInvariant().Contains("unable to store block"))
-                {
-                    throw new Exception("Unable to upload image. Response empty or error message.");
-                }
-                return response;
-            }
-        }
-
-        private void InfoToClipboard()
-        {
-            Clipboard.Clear();
-            if (string.IsNullOrEmpty(currentLocalCid) || string.IsNullOrEmpty(currentPublicCid))
-            {
-                Log("No CIDs were generated! Clipboard cleared.");
-                return;
-            }
-
-            var nl = Environment.NewLine;
-            var msg = 
-                $"** Codex@Devcon 💻 Raspberry Pi Challenge **{nl}" +
-                $"📢 A new image is available. Download it and bring it to the booth!{nl}" +
-                $"Public Testnet CID: `{currentPublicCid}`{nl}" +
-                $"Local Devcon network CID: `{currentLocalCid}`{nl}" +
-                $"Setup instructions: [Here](https://docs.codex.storage){nl}" +
-                $"Local Devcon network information: [Here](https://github.com/codex-storage/codex-testnet-starter/blob/master/SETUP_DEVCONNET.md)";
-
-            Clipboard.SetText(msg);
-            Log("CID info copied to clipboard. Paste it in Discord plz!");
-
-            ImgLocalCid.Source = GenerateQr(currentLocalCid);
-            ImgTestnetCid.Source = GenerateQr(currentPublicCid);
-            ImgInstructions.Source = GenerateQr("https://github.com/codex-storage/codex-testnet-starter/blob/master/SETUP_DEVCONNET.md");
-        }
-
-        private void Log(string v)
-        {
-            Txt.Text = v;
-        }
-    }
-}

Framework/ArgsUniform/ArgsUniform.cs

@@ -4,8 +4,9 @@ namespace ArgsUniform
 {
     public class ArgsUniform<T>
     {
-        private readonly Assigner<T> assigner;
         private readonly Action printAppInfo;
+        private readonly object? defaultsProvider;
+        private readonly IEnv.IEnv env;
         private readonly string[] args;
         private const int cliStart = 8;
         private const int shortStart = 38;
@@ -30,9 +31,9 @@ namespace ArgsUniform
         public ArgsUniform(Action printAppInfo, object defaultsProvider, IEnv.IEnv env, params string[] args)
         {
             this.printAppInfo = printAppInfo;
+            this.defaultsProvider = defaultsProvider;
+            this.env = env;
             this.args = args;
-
-            assigner = new Assigner<T>(env, args, defaultsProvider);
         }
 
         public T Parse(bool printResult = false)
@@ -41,7 +42,7 @@ namespace ArgsUniform
             {
                 printAppInfo();
                 PrintHelp();
-                Environment.Exit(0);
+                throw new Exception();
             }
 
             var result = Activator.CreateInstance<T>();
@@ -52,16 +53,18 @@ namespace ArgsUniform
                 var attr = uniformProperty.GetCustomAttribute<UniformAttribute>();
                 if (attr != null)
                 {
-                    if (!assigner.UniformAssign(result, attr, uniformProperty) && attr.Required)
+                    if (!UniformAssign(result, attr, uniformProperty) && attr.Required)
                     {
-                        missingRequired.Add(uniformProperty);
+                        {
+                            missingRequired.Add(uniformProperty);
+                        }
                     }
                 }
             }
 
             if (missingRequired.Any())
             {
-                PrintResults(printResult,result, uniformProperties);
+                PrintResults(result, uniformProperties);
                 Print("");
                 foreach (var missing in missingRequired)
                 {
@@ -72,39 +75,37 @@ namespace ArgsUniform
                 }
 
                 PrintHelp();
-                Environment.Exit(1);
+                throw new ArgumentException("Unable to assemble all required arguments");
             }
 
-            PrintResults(printResult, result, uniformProperties);
+            if (printResult)
+            {
+                PrintResults(result, uniformProperties);
+            }
 
             return result;
         }
 
+        private void PrintResults(T result, PropertyInfo[] uniformProperties)
+        {
+            Print("");
+            foreach (var p in uniformProperties)
+            {
+                Print($"\t{p.Name} = {p.GetValue(result)}");
+            }
+            Print("");
+        }
+
         public void PrintHelp()
         {
             Print("");
-            PrintAligned("CLI option:", "(short)", "Environment variable:", "Description", "(default)");
-            var props = typeof(T).GetProperties().Where(m => m.GetCustomAttributes(typeof(UniformAttribute), false).Length == 1).ToArray();
-            foreach (var prop in props)
+            PrintAligned("CLI option:", "(short)", "Environment variable:", "Description");
+            var attrs = typeof(T).GetProperties().Where(m => m.GetCustomAttributes(typeof(UniformAttribute), false).Length == 1).Select(p => p.GetCustomAttribute<UniformAttribute>()).Where(a => a != null).ToArray();
+            foreach (var attr in attrs)
             {
-                var a = prop.GetCustomAttribute<UniformAttribute>();
-                if (a != null)
-                {
-                    var optional = !a.Required ? " (optional)" : "";
-                    var def = assigner.DescribeDefaultFor(prop);
-                    PrintAligned($"--{a.Arg}=...", $"({a.ArgShort})", a.EnvVar, a.Description + optional, $"({def})");
-                }
-            }
-            Print("");
-        }
-
-        private void PrintResults(bool printResult, T result, PropertyInfo[] uniformProperties)
-        {
-            if (!printResult) return;
-            Print("");
-            foreach (var p in uniformProperties)
-            {
-                Print($"\t{p.Name} = {p.GetValue(result)}");
+                var a = attr!;
+                var optional = !a.Required ? " *" : "";
+                PrintAligned($"--{a.Arg}=...", $"({a.ArgShort})", a.EnvVar, a.Description + optional);
             }
             Print("");
         }
@@ -114,7 +115,7 @@ namespace ArgsUniform
             Console.WriteLine(msg);
         }
 
-        private void PrintAligned(string cli, string s, string env, string desc, string def)
+        private void PrintAligned(string cli, string s, string env, string desc)
         {
             Console.CursorLeft = cliStart;
             Console.Write(cli);
@@ -123,8 +124,132 @@ namespace ArgsUniform
             Console.CursorLeft = envStart;
             Console.Write(env);
             Console.CursorLeft = descStart;
-            Console.Write(desc + " ");
-            Console.Write(def + Environment.NewLine);
+            Console.Write(desc + Environment.NewLine);
+        }
+
+        private object GetDefaultValue(Type t)
+        {
+            if (t.IsValueType) return Activator.CreateInstance(t)!;
+            return null!;
+        }
+
+        private bool UniformAssign(T result, UniformAttribute attr, PropertyInfo uniformProperty)
+        {
+            if (AssignFromArgsIfAble(result, attr, uniformProperty)) return true;
+            if (AssignFromEnvVarIfAble(result, attr, uniformProperty)) return true;
+            if (AssignFromDefaultsIfAble(result, uniformProperty)) return true;
+            return false;
+        }
+
+        private bool AssignFromDefaultsIfAble(T result, PropertyInfo uniformProperty)
+        {
+            var currentValue = uniformProperty.GetValue(result);
+            var isEmptryString = (currentValue as string) == string.Empty;
+            if (currentValue != GetDefaultValue(uniformProperty.PropertyType) && !isEmptryString) return true;
+
+            if (defaultsProvider == null) return false;
+
+            var defaultProperty = defaultsProvider.GetType().GetProperties().SingleOrDefault(p => p.Name == uniformProperty.Name);
+            if (defaultProperty == null) return false;
+
+            var value = defaultProperty.GetValue(defaultsProvider);
+            if (value != null)
+            {
+                return Assign(result, uniformProperty, value);
+            }
+            return false;
+        }
+
+        private bool AssignFromEnvVarIfAble(T result, UniformAttribute attr, PropertyInfo uniformProperty)
+        {
+            var e = env.GetEnvVarOrDefault(attr.EnvVar, string.Empty);
+            if (!string.IsNullOrEmpty(e))
+            {
+                return Assign(result, uniformProperty, e);
+            }
+            return false;
+        }
+
+        private bool AssignFromArgsIfAble(T result, UniformAttribute attr, PropertyInfo uniformProperty)
+        {
+            var fromArg = GetFromArgs(attr.Arg);
+            if (fromArg != null)
+            {
+                return Assign(result, uniformProperty, fromArg);
+            }
+            var fromShort = GetFromArgs(attr.ArgShort);
+            if (fromShort != null)
+            {
+                return Assign(result, uniformProperty, fromShort);
+            }
+            return false;
+        }
+
+        private bool Assign(T result, PropertyInfo uniformProperty, object value)
+        {
+            if (uniformProperty.PropertyType == value.GetType())
+            {
+                uniformProperty.SetValue(result, value);
+                return true;
+            }
+            else
+            {
+                if (uniformProperty.PropertyType == typeof(string) || uniformProperty.PropertyType == typeof(int))
+                {
+                    uniformProperty.SetValue(result, Convert.ChangeType(value, uniformProperty.PropertyType));
+                    return true;
+                }
+                else
+                {
+                    if (uniformProperty.PropertyType == typeof(int?)) return AssignOptionalInt(result, uniformProperty, value);
+                    if (uniformProperty.PropertyType.IsEnum) return AssignEnum(result, uniformProperty, value);
+                    if (uniformProperty.PropertyType == typeof(bool)) return AssignBool(result, uniformProperty, value);
+                    
+                    throw new NotSupportedException();
+                }
+            }
+        }
+
+        private static bool AssignEnum(T result, PropertyInfo uniformProperty, object value)
+        {
+            var s = value.ToString();
+            if (Enum.TryParse(uniformProperty.PropertyType, s, out var e))
+            {
+                uniformProperty.SetValue(result, e);
+                return true;
+            }
+            return false;
+        }
+
+        private static bool AssignOptionalInt(T result, PropertyInfo uniformProperty, object value)
+        {
+            if (int.TryParse(value.ToString(), out int i))
+            {
+                uniformProperty.SetValue(result, i);
+                return true;
+            }
+            return false;
+        }
+
+        private static bool AssignBool(T result, PropertyInfo uniformProperty, object value)
+        {
+            var s = value.ToString();
+            if (s == "1" || (s != null && s.ToLowerInvariant() == "true"))
+            {
+                uniformProperty.SetValue(result, true);
+            }
+            return true;
+        }
+
+        private string? GetFromArgs(string key)
+        {
+            var argKey = $"--{key}=";
+            var arg = args.FirstOrDefault(a => a.StartsWith(argKey));
+            if (arg != null)
+            {
+                return arg.Substring(argKey.Length);
+            }
+            return null;
         }
     }
 }

Framework/ArgsUniform/ArgsUniform.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Framework/ArgsUniform/Assigner.cs

@@ -1,186 +0,0 @@
-using System.Globalization;
-using System.Numerics;
-using System.Reflection;
-
-namespace ArgsUniform
-{
-    public class Assigner<T>
-    {
-        private readonly IEnv.IEnv env;
-        private readonly string[] args;
-        private readonly object? defaultsProvider;
-
-        public Assigner(IEnv.IEnv env, string[] args, object? defaultsProvider)
-        {
-            this.env = env;
-            this.args = args;
-            this.defaultsProvider = defaultsProvider;
-        }
-
-        public bool UniformAssign(T result, UniformAttribute attr, PropertyInfo uniformProperty)
-        {
-            if (AssignFromArgsIfAble(result, attr, uniformProperty)) return true;
-            if (AssignFromEnvVarIfAble(result, attr, uniformProperty)) return true;
-            if (AssignFromDefaultsIfAble(result, uniformProperty)) return true;
-            return false;
-        }
-
-        public string DescribeDefaultFor(PropertyInfo property)
-        {
-            var obj = Activator.CreateInstance<T>();
-            var defaultValue = GetDefaultValue(obj, property);
-            if (defaultValue == null) return "";
-            if (defaultValue is string str)
-            {
-                return "\"" + str + "\"";
-            }
-            return defaultValue.ToString() ?? string.Empty;
-        }
-
-        private object? GetDefaultValue(T result, PropertyInfo uniformProperty)
-        {
-            // Get value from object's static initializer if it's there.
-            var currentValue = uniformProperty.GetValue(result);
-            if (currentValue != null) return currentValue;
-
-            // Get value from defaults-provider object if it's there.
-            if (defaultsProvider == null) return null;
-            var defaultProperty = defaultsProvider.GetType().GetProperties().SingleOrDefault(p => p.Name == uniformProperty.Name);
-            if (defaultProperty == null) return null;
-            return defaultProperty.GetValue(defaultsProvider);
-        }
-
-        private bool AssignFromDefaultsIfAble(T result, PropertyInfo uniformProperty)
-        {
-            var defaultValue = GetDefaultValue(result, uniformProperty);
-            var isEmptryString = (defaultValue as string) == string.Empty;
-            if (defaultValue != null && defaultValue != GetDefaultValueForType(uniformProperty.PropertyType) && !isEmptryString)
-            {
-                return Assign(result, uniformProperty, defaultValue);
-            }
-            return false;
-        }
-
-        private bool AssignFromEnvVarIfAble(T result, UniformAttribute attr, PropertyInfo uniformProperty)
-        {
-            var e = env.GetEnvVarOrDefault(attr.EnvVar, string.Empty);
-            if (!string.IsNullOrEmpty(e))
-            {
-                return Assign(result, uniformProperty, e);
-            }
-            return false;
-        }
-
-        private bool AssignFromArgsIfAble(T result, UniformAttribute attr, PropertyInfo uniformProperty)
-        {
-            var fromArg = GetFromArgs(attr.Arg);
-            if (fromArg != null)
-            {
-                return Assign(result, uniformProperty, fromArg);
-            }
-            var fromShort = GetFromArgs(attr.ArgShort);
-            if (fromShort != null)
-            {
-                return Assign(result, uniformProperty, fromShort);
-            }
-            return false;
-        }
-
-        private bool Assign(T result, PropertyInfo uniformProperty, object value)
-        {
-            if (uniformProperty.PropertyType == value.GetType())
-            {
-                uniformProperty.SetValue(result, value);
-                return true;
-            }
-            else
-            {
-                if (uniformProperty.PropertyType == typeof(string) || uniformProperty.PropertyType == typeof(int))
-                {
-                    uniformProperty.SetValue(result, Convert.ChangeType(value, uniformProperty.PropertyType));
-                    return true;
-                }
-                else
-                {
-                    if (uniformProperty.PropertyType == typeof(int?)) return AssignOptionalInt(result, uniformProperty, value);
-                    if (uniformProperty.PropertyType.IsEnum) return AssignEnum(result, uniformProperty, value);
-                    if (uniformProperty.PropertyType == typeof(bool)) return AssignBool(result, uniformProperty, value);
-                    if (uniformProperty.PropertyType == typeof(ulong)) return AssignUlong(result, uniformProperty, value);
-                    if (uniformProperty.PropertyType == typeof(BigInteger)) return AssignBigInt(result, uniformProperty, value);
-
-                    throw new NotSupportedException(
-                        $"Unsupported property type '${uniformProperty.PropertyType}' " +
-                        $"for property '${uniformProperty.Name}'.");
-                }
-            }
-        }
-
-        private static bool AssignEnum(T result, PropertyInfo uniformProperty, object value)
-        {
-            var s = value.ToString();
-            if (Enum.TryParse(uniformProperty.PropertyType, s, out var e))
-            {
-                uniformProperty.SetValue(result, e);
-                return true;
-            }
-            return false;
-        }
-
-        private static bool AssignOptionalInt(T result, PropertyInfo uniformProperty, object value)
-        {
-            if (int.TryParse(value.ToString(), CultureInfo.InvariantCulture, out int i))
-            {
-                uniformProperty.SetValue(result, i);
-                return true;
-            }
-            return false;
-        }
-
-        private bool AssignUlong(T? result, PropertyInfo uniformProperty, object value)
-        {
-            if (ulong.TryParse(value.ToString(), CultureInfo.InvariantCulture, out ulong i))
-            {
-                uniformProperty.SetValue(result, i);
-                return true;
-            }
-            return false;
-        }
-
-        private bool AssignBigInt(T result, PropertyInfo uniformProperty, object value)
-        {
-            if (BigInteger.TryParse(value.ToString(), CultureInfo.InvariantCulture, out BigInteger i))
-            {
-                uniformProperty.SetValue(result, i);
-                return true;
-            }
-            return false;
-        }
-
-        private static bool AssignBool(T result, PropertyInfo uniformProperty, object value)
-        {
-            var s = value.ToString();
-            if (s == "1" || (s != null && s.ToLowerInvariant() == "true"))
-            {
-                uniformProperty.SetValue(result, true);
-            }
-            return true;
-        }
-
-        private string? GetFromArgs(string key)
-        {
-            var argKey = $"--{key}=";
-            var arg = args.FirstOrDefault(a => a.StartsWith(argKey));
-            if (arg != null)
-            {
-                return arg.Substring(argKey.Length);
-            }
-            return null;
-        }
-
-        private static object GetDefaultValueForType(Type t)
-        {
-            if (t.IsValueType) return Activator.CreateInstance(t)!;
-            return null!;
-        }
-    }
-}

Framework/Core/Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Framework/Core/CoreInterface.cs

@@ -30,7 +30,11 @@ namespace Core
         public IDownloadedLog DownloadLog(RunningContainer container, int? tailLines = null)
         {
             var workflow = entryPoint.Tools.CreateWorkflow();
-            return workflow.DownloadContainerLog(container, tailLines);
+            var file = entryPoint.Tools.GetLog().CreateSubfile();
+            entryPoint.Tools.GetLog().Log($"Downloading container log for '{container.Name}' to file '{file.FullFilename}'...");
+            var logHandler = new LogDownloadHandler(container.Name, file);
+            workflow.DownloadContainerLog(container, logHandler, tailLines);
+            return logHandler.DownloadLog();
         }
 
         public string ExecuteContainerCommand(IHasContainer containerSource, string command, params string[] args)

Framework/Core/DownloadedLog.cs

@@ -1,15 +1,11 @@
 using Logging;
 
-namespace KubernetesWorkflow
+namespace Core
 {
     public interface IDownloadedLog
     {
-        string ContainerName { get; }
-
-        void IterateLines(Action<string> action, params string[] thatContain);
         string[] GetLinesContaining(string expectedString);
         string[] FindLinesThatContain(params string[] tags);
-        string GetFilepath();
         void DeleteFile();
     }
 
@@ -17,28 +13,9 @@ namespace KubernetesWorkflow
     {
         private readonly LogFile logFile;
 
-        internal DownloadedLog(WriteToFileLogHandler logHandler, string containerName)
+        internal DownloadedLog(LogFile logFile)
         {
-            logFile = logHandler.LogFile;
-            ContainerName = containerName;
-        }
-
-        public string ContainerName { get; }
-
-        public void IterateLines(Action<string> action, params string[] thatContain)
-        {
-            using var file = File.OpenRead(logFile.FullFilename);
-            using var streamReader = new StreamReader(file);
-
-            var line = streamReader.ReadLine();
-            while (line != null)
-            {
-                if (thatContain.All(line.Contains))
-                {
-                    action(line);
-                }
-                line = streamReader.ReadLine();
-            }
+            this.logFile = logFile;
         }
 
         public string[] GetLinesContaining(string expectedString)
@@ -80,11 +57,6 @@ namespace KubernetesWorkflow
             return result.ToArray();
         }
 
-        public string GetFilepath()
-        {
-            return logFile.FullFilename;
-        }
-
         public void DeleteFile()
         {
             File.Delete(logFile.FullFilename);

Framework/Core/EntryPoint.cs

@@ -38,14 +38,10 @@ namespace Core
             return new CoreInterface(this);
         }
 
-        /// <summary>
-        /// Deletes kubernetes and tracked file resources.
-        /// when `waitTillDone` is true, this function will block until resources are deleted.
-        /// </summary>
-        public void Decommission(bool deleteKubernetesResources, bool deleteTrackedFiles, bool waitTillDone)
+        public void Decommission(bool deleteKubernetesResources, bool deleteTrackedFiles)
         {
-            manager.DecommissionPlugins(deleteKubernetesResources, deleteTrackedFiles, waitTillDone);
-            Tools.Decommission(deleteKubernetesResources, deleteTrackedFiles, waitTillDone);
+            manager.DecommissionPlugins(deleteKubernetesResources, deleteTrackedFiles);
+            Tools.Decommission(deleteKubernetesResources, deleteTrackedFiles);
         }
 
         internal T GetPlugin<T>() where T : IProjectPlugin

Framework/Core/Http.cs

@@ -7,27 +7,23 @@ namespace Core
     {
         T OnClient<T>(Func<HttpClient, T> action);
         T OnClient<T>(Func<HttpClient, T> action, string description);
-        T OnClient<T>(Func<HttpClient, T> action, Retry retry);
         IEndpoint CreateEndpoint(Address address, string baseUrl, string? logAlias = null);
     }
 
     internal class Http : IHttp
     {
-        private static object lockLock = new object();
-        private static readonly Dictionary<string, object> httpLocks = new Dictionary<string, object>();
+        private static readonly object httpLock = new object();
         private readonly ILog log;
         private readonly ITimeSet timeSet;
         private readonly Action<HttpClient> onClientCreated;
-        private readonly string id;
 
-        internal Http(string id, ILog log, ITimeSet timeSet)
-            : this(id, log, timeSet, DoNothing)
+        internal Http(ILog log, ITimeSet timeSet)
+            : this(log, timeSet, DoNothing)
         {
         }
 
-        internal Http(string id, ILog log, ITimeSet timeSet, Action<HttpClient> onClientCreated)
+        internal Http(ILog log, ITimeSet timeSet, Action<HttpClient> onClientCreated)
         {
-            this.id = id;
             this.log = log;
             this.timeSet = timeSet;
             this.onClientCreated = onClientCreated;
@@ -39,19 +35,13 @@ namespace Core
         }
 
         public T OnClient<T>(Func<HttpClient, T> action, string description)
-        {
-            var retry = new Retry(description, timeSet.HttpRetryTimeout(), timeSet.HttpCallRetryDelay(), f => { });
-            return OnClient(action, retry);
-        }
-
-        public T OnClient<T>(Func<HttpClient, T> action, Retry retry)
         {
             var client = GetClient();
 
             return LockRetry(() =>
             {
                 return action(client);
-            }, retry);
+            }, description);
         }
 
         public IEndpoint CreateEndpoint(Address address, string baseUrl, string? logAlias = null)
@@ -64,21 +54,11 @@ namespace Core
             return DebugStack.GetCallerName(skipFrames: 2);
         }
 
-        private T LockRetry<T>(Func<T> operation, Retry retry)
+        private T LockRetry<T>(Func<T> operation, string description)
         {
-            var httpLock = GetLock();
             lock (httpLock)
             {
-                return retry.Run(operation);
-            }
-        }
-
-        private object GetLock()
-        {
-            lock (lockLock) // I had to.
-            {
-                if (!httpLocks.ContainsKey(id)) httpLocks.Add(id, new object());
-                return httpLocks[id];
+                return Time.Retry(operation, timeSet.HttpMaxNumberOfRetries(), timeSet.HttpCallRetryDelay(), description);
             }
         }
 

Framework/Core/LogDownloadHandler.cs

@@ -0,0 +1,28 @@
+using KubernetesWorkflow;
+using Logging;
+
+namespace Core
+{
+    internal class LogDownloadHandler : LogHandler, ILogHandler
+    {
+        private readonly LogFile log;
+
+        internal LogDownloadHandler(string description, LogFile log)
+        {
+            this.log = log;
+
+            log.Write($"{description} -->> {log.FullFilename}");
+            log.WriteRaw(description);
+        }
+
+        internal IDownloadedLog DownloadLog()
+        {
+            return new DownloadedLog(log);
+        }
+
+        protected override void ProcessLine(string line)
+        {
+            log.WriteRaw(line);
+        }
+    }
+}

Framework/Core/PluginManager.cs

@@ -34,12 +34,12 @@
             return metadata;
         }
 
-        internal void DecommissionPlugins(bool deleteKubernetesResources, bool deleteTrackedFiles, bool waitTillDone)
+        internal void DecommissionPlugins(bool deleteKubernetesResources, bool deleteTrackedFiles)
         {
             foreach (var pair in pairs)
             {
                 pair.Plugin.Decommission();
-                pair.Tools.Decommission(deleteKubernetesResources, deleteTrackedFiles, waitTillDone);
+                pair.Tools.Decommission(deleteKubernetesResources, deleteTrackedFiles);
             }
         }
 

Framework/Core/PluginTools.cs

@@ -6,13 +6,7 @@ namespace Core
 {
     public interface IPluginTools : IWorkflowTool, ILogTool, IHttpFactoryTool, IFileTool
     {
-        ITimeSet TimeSet { get; }
-
-        /// <summary>
-        /// Deletes kubernetes and tracked file resources.
-        /// when `waitTillDone` is true, this function will block until resources are deleted.
-        /// </summary>
-        void Decommission(bool deleteKubernetesResources, bool deleteTrackedFiles, bool waitTillDone);
+        void Decommission(bool deleteKubernetesResources, bool deleteTrackedFiles);
     }
 
     public interface IWorkflowTool
@@ -27,9 +21,9 @@ namespace Core
 
     public interface IHttpFactoryTool
     {
-        IHttp CreateHttp(string id, Action<HttpClient> onClientCreated);
-        IHttp CreateHttp(string id, Action<HttpClient> onClientCreated, ITimeSet timeSet);
-        IHttp CreateHttp(string id);
+        IHttp CreateHttp(Action<HttpClient> onClientCreated);
+        IHttp CreateHttp(Action<HttpClient> onClientCreated, ITimeSet timeSet);
+        IHttp CreateHttp();
     }
 
     public interface IFileTool
@@ -39,6 +33,7 @@ namespace Core
 
     internal class PluginTools : IPluginTools
     {
+        private readonly ITimeSet timeSet;
         private readonly WorkflowCreator workflowCreator;
         private readonly IFileManager fileManager;
         private readonly LogPrefixer log;
@@ -47,30 +42,28 @@ namespace Core
         {
             this.log = new LogPrefixer(log);
             this.workflowCreator = workflowCreator;
-            TimeSet = timeSet;
+            this.timeSet = timeSet;
             fileManager = new FileManager(log, fileManagerRootFolder);
         }
 
-        public ITimeSet TimeSet { get; }
-
         public void ApplyLogPrefix(string prefix)
         {
             log.Prefix = prefix;
         }
 
-        public IHttp CreateHttp(string id, Action<HttpClient> onClientCreated)
+        public IHttp CreateHttp(Action<HttpClient> onClientCreated)
         {
-            return CreateHttp(id, onClientCreated, TimeSet);
+            return CreateHttp(onClientCreated, timeSet);
         }
 
-        public IHttp CreateHttp(string id, Action<HttpClient> onClientCreated, ITimeSet ts)
+        public IHttp CreateHttp(Action<HttpClient> onClientCreated, ITimeSet ts)
         {
-            return new Http(id, log, ts, onClientCreated);
+            return new Http(log, ts, onClientCreated);
         }
 
-        public IHttp CreateHttp(string id)
+        public IHttp CreateHttp()
         {
-            return new Http(id, log, TimeSet);
+            return new Http(log, timeSet);
         }
 
         public IStartupWorkflow CreateWorkflow(string? namespaceOverride = null)
@@ -78,9 +71,9 @@ namespace Core
             return workflowCreator.CreateWorkflow(namespaceOverride);
         }
 
-        public void Decommission(bool deleteKubernetesResources, bool deleteTrackedFiles, bool waitTillDone)
+        public void Decommission(bool deleteKubernetesResources, bool deleteTrackedFiles)
         {
-            if (deleteKubernetesResources) CreateWorkflow().DeleteNamespace(waitTillDone);
+            if (deleteKubernetesResources) CreateWorkflow().DeleteNamespace();
             if (deleteTrackedFiles) fileManager.DeleteAllFiles();
         }
 

Framework/Core/TimeSet.cs

@@ -2,31 +2,10 @@
 {
     public interface ITimeSet
     {
-        /// <summary>
-        /// Timeout for a single HTTP call.
-        /// </summary>
         TimeSpan HttpCallTimeout();
-
-        /// <summary>
-        /// Maximum total time to attempt to make a successful HTTP call to a service.
-        /// When HTTP calls time out during this timespan, retries will be made.
-        /// </summary>
-        TimeSpan HttpRetryTimeout();
-
-        /// <summary>
-        /// After a failed HTTP call, wait this long before trying again.
-        /// </summary>
+        int HttpMaxNumberOfRetries();
         TimeSpan HttpCallRetryDelay();
-
-        /// <summary>
-        /// After a failed K8s operation, wait this long before trying again.
-        /// </summary>
-        TimeSpan K8sOperationRetryDelay();
-
-        /// <summary>
-        /// Maximum total time to attempt to perform a successful k8s operation.
-        /// If k8s operations fail during this timespan, retries will be made.
-        /// </summary>
+        TimeSpan WaitForK8sServiceDelay();
         TimeSpan K8sOperationTimeout();
     }
 
@@ -34,12 +13,12 @@
     {
         public TimeSpan HttpCallTimeout()
         {
-            return TimeSpan.FromMinutes(2);
+            return TimeSpan.FromMinutes(3);
         }
 
-        public TimeSpan HttpRetryTimeout()
+        public int HttpMaxNumberOfRetries()
         {
-            return TimeSpan.FromMinutes(5);
+            return 3;
         }
 
         public TimeSpan HttpCallRetryDelay()
@@ -47,7 +26,7 @@
             return TimeSpan.FromSeconds(1);
         }
 
-        public TimeSpan K8sOperationRetryDelay()
+        public TimeSpan WaitForK8sServiceDelay()
         {
             return TimeSpan.FromSeconds(10);
         }
@@ -62,27 +41,27 @@
     {
         public TimeSpan HttpCallTimeout()
         {
-            return TimeSpan.FromMinutes(30);
+            return TimeSpan.FromHours(2);
         }
 
-        public TimeSpan HttpRetryTimeout()
+        public int HttpMaxNumberOfRetries()
         {
-            return TimeSpan.FromHours(2.2);
+            return 1;
         }
 
         public TimeSpan HttpCallRetryDelay()
         {
-            return TimeSpan.FromSeconds(20);
+            return TimeSpan.FromSeconds(2);
         }
 
-        public TimeSpan K8sOperationRetryDelay()
+        public TimeSpan WaitForK8sServiceDelay()
         {
-            return TimeSpan.FromSeconds(30);
+            return TimeSpan.FromSeconds(10);
         }
 
         public TimeSpan K8sOperationTimeout()
         {
-            return TimeSpan.FromHours(1);
+            return TimeSpan.FromMinutes(15);
         }
     }
 }

Framework/DiscordRewards/CheckConfig.cs

@@ -13,9 +13,9 @@ namespace DiscordRewards
     public enum CheckType
     {
         Uninitialized,
-        HostFilledSlot,
-        HostFinishedSlot,
-        ClientPostedContract,
-        ClientStartedContract,
+        FilledSlot,
+        FinishedSlot,
+        PostedContract,
+        StartedContract,
     }
 }

Framework/DiscordRewards/DiscordRewards.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Framework/DiscordRewards/GiveRewardsCommand.cs

@@ -3,13 +3,8 @@
     public class GiveRewardsCommand
     {
         public RewardUsersCommand[] Rewards { get; set; } = Array.Empty<RewardUsersCommand>();
-        public ChainEventMessage[] EventsOverview { get; set; } = Array.Empty<ChainEventMessage>();
-        public string[] Errors { get; set; } = Array.Empty<string>();
-
-        public bool HasAny()
-        {
-            return Rewards.Any() || EventsOverview.Any();
-        }
+        public MarketAverage[] Averages { get; set; } = Array.Empty<MarketAverage>();
+        public string[] EventsOverview { get; set; } = Array.Empty<string>();
     }
 
     public class RewardUsersCommand
@@ -18,9 +13,14 @@
         public string[] UserAddresses { get; set; } = Array.Empty<string>();
     }
 
-    public class ChainEventMessage
+    public class MarketAverage
     {
-        public ulong BlockNumber { get; set; }
-        public string Message { get; set; } = string.Empty;
+        public int NumberOfFinished { get; set; }
+        public TimeSpan TimeRange { get; set; }
+        public float Price { get; set; }
+        public float Size { get; set; }
+        public float Duration { get; set; }
+        public float Collateral { get; set; }
+        public float ProofProbability { get; set; }
     }
 }

Framework/DiscordRewards/RewardRepo.cs

@@ -1,53 +1,53 @@
-namespace DiscordRewards
+using Utils;
+
+namespace DiscordRewards
 {
     public class RewardRepo
     {
         private static string Tag => RewardConfig.UsernameTag;
 
-        public RewardConfig[] Rewards { get; } = new RewardConfig[0];
+        public RewardConfig[] Rewards { get; } = new RewardConfig[]
+        {
+            // Filled any slot
+            new RewardConfig(1187039439558541498, $"{Tag} successfully filled their first slot!", new CheckConfig
+            {
+                Type = CheckType.FilledSlot
+            }),
 
-        // Example configuration, from test server:
-        //{
-        //    // Filled any slot
-        //    new RewardConfig(1187039439558541498, $"{Tag} successfully filled their first slot!", new CheckConfig
-        //    {
-        //        Type = CheckType.HostFilledSlot
-        //    }),
+            // Finished any slot
+            new RewardConfig(1202286165630390339, $"{Tag} successfully finished their first slot!", new CheckConfig
+            {
+                Type = CheckType.FinishedSlot
+            }),
 
-        //    // Finished any slot
-        //    new RewardConfig(1202286165630390339, $"{Tag} successfully finished their first slot!", new CheckConfig
-        //    {
-        //        Type = CheckType.HostFinishedSlot
-        //    }),
+            // Finished a sizable slot
+            new RewardConfig(1202286218738405418, $"{Tag} finished their first 1GB-24h slot! (10mb/5mins for test)", new CheckConfig
+            {
+                Type = CheckType.FinishedSlot,
+                MinSlotSize = 10.MB(),
+                MinDuration = TimeSpan.FromMinutes(5.0),
+            }),
 
-        //    // Finished a sizable slot
-        //    new RewardConfig(1202286218738405418, $"{Tag} finished their first 1GB-24h slot! (10mb/5mins for test)", new CheckConfig
-        //    {
-        //        Type = CheckType.HostFinishedSlot,
-        //        MinSlotSize = 10.MB(),
-        //        MinDuration = TimeSpan.FromMinutes(5.0),
-        //    }),
+            // Posted any contract
+            new RewardConfig(1202286258370383913, $"{Tag} posted their first contract!", new CheckConfig
+            {
+                Type = CheckType.PostedContract
+            }),
 
-        //    // Posted any contract
-        //    new RewardConfig(1202286258370383913, $"{Tag} posted their first contract!", new CheckConfig
-        //    {
-        //        Type = CheckType.ClientPostedContract
-        //    }),
+            // Started any contract
+            new RewardConfig(1202286330873126992, $"A contract created by {Tag} reached Started state for the first time!", new CheckConfig
+            {
+                Type = CheckType.StartedContract
+            }),
 
-        //    // Started any contract
-        //    new RewardConfig(1202286330873126992, $"A contract created by {Tag} reached Started state for the first time!", new CheckConfig
-        //    {
-        //        Type = CheckType.ClientStartedContract
-        //    }),
-
-        //    // Started a sizable contract
-        //    new RewardConfig(1202286381670608909, $"A large contract created by {Tag} reached Started state for the first time! (10mb/5mins for test)", new CheckConfig
-        //    {
-        //        Type = CheckType.ClientStartedContract,
-        //        MinNumberOfHosts = 4,
-        //        MinSlotSize = 10.MB(),
-        //        MinDuration = TimeSpan.FromMinutes(5.0),
-        //    })
-        //};
+            // Started a sizable contract
+            new RewardConfig(1202286381670608909, $"A large contract created by {Tag} reached Started state for the first time! (10mb/5mins for test)", new CheckConfig
+            {
+                Type = CheckType.StartedContract,
+                MinNumberOfHosts = 4,
+                MinSlotSize = 10.MB(),
+                MinDuration = TimeSpan.FromMinutes(5.0),
+            })
+        };
     }
 }

Framework/FileUtils/FileManager.cs

@@ -7,35 +7,27 @@ namespace FileUtils
     {
         TrackedFile CreateEmptyFile(string label = "");
         TrackedFile GenerateFile(ByteSize size, string label = "");
-        TrackedFile GenerateFile(Action<IGenerateOption> options, string label = "");
         void DeleteAllFiles();
         void ScopedFiles(Action action);
         T ScopedFiles<T>(Func<T> action);
     }
 
-    public interface IGenerateOption
-    {
-        IGenerateOption Random(ByteSize size);
-        IGenerateOption StringRepeat(string str, ByteSize size);
-        IGenerateOption StringRepeat(string str, int times);
-        IGenerateOption ByteRepeat(byte[] bytes, ByteSize size);
-        IGenerateOption ByteRepeat(byte[] bytes, int times);
-    }
-
     public class FileManager : IFileManager
     {
-        private static readonly NumberSource folderNumberSource = new NumberSource(0);
+        public const int ChunkSize = 1024 * 1024 * 100;
+        private static NumberSource folderNumberSource = new NumberSource(0);
+        private readonly Random random = new Random();
         private readonly ILog log;
+        private readonly string rootFolder;
         private readonly string folder;
         private readonly List<List<TrackedFile>> fileSetStack = new List<List<TrackedFile>>();
 
-        public const int ChunkSize = 1024 * 1024 * 100;
-
         public FileManager(ILog log, string rootFolder)
         {
             folder = Path.Combine(rootFolder, folderNumberSource.GetNextNumber().ToString("D5"));
 
             this.log = log;
+            this.rootFolder = rootFolder;
         }
 
         public TrackedFile CreateEmptyFile(string label = "")
@@ -49,15 +41,10 @@ namespace FileUtils
             return result;
         }
 
-        public TrackedFile GenerateFile(ByteSize size, string label = "")
-        {
-            return GenerateFile(o => o.Random(size), label);
-        }
-
-        public TrackedFile GenerateFile(Action<IGenerateOption> options, string label = "")
+        public TrackedFile GenerateFile(ByteSize size, string label)
         {
             var sw = Stopwatch.Begin(log);
-            var result = RunGenerators(options, label);
+            var result = GenerateRandomFile(size, label);
             sw.End($"Generated file {result.Describe()}.");
             return result;
         }
@@ -70,27 +57,16 @@ namespace FileUtils
         public void ScopedFiles(Action action)
         {
             PushFileSet();
-            try
-            {
-                action();
-            }
-            finally
-            {
-                PopFileSet();
-            }
+            action();
+            PopFileSet();
         }
 
         public T ScopedFiles<T>(Func<T> action)
         {
             PushFileSet();
-            try
-            {
-                return action();
-            }
-            finally
-            {
-                PopFileSet();
-            }
+            var result = action();
+            PopFileSet();
+            return result;
         }
 
         private void PushFileSet()
@@ -113,35 +89,26 @@ namespace FileUtils
             if (!Directory.GetFiles(folder).Any()) DeleteDirectory();
         }
 
-        private TrackedFile RunGenerators(Action<IGenerateOption> options, string label)
+        private TrackedFile GenerateRandomFile(ByteSize size, string label)
         {
             var result = CreateEmptyFile(label);
-            var generators = GetGenerators(options);
-            CheckSpaceAvailable(result, generators.GetRequiredSpace());
+            CheckSpaceAvailable(result, size);
 
-            using var stream = new FileStream(result.Filename, FileMode.Append);
-            generators.Run(stream);
+            GenerateFileBytes(result, size);
             return result;
         }
 
-        private GeneratorCollection GetGenerators(Action<IGenerateOption> options)
-        {
-            var result = new GeneratorCollection();
-            options(result);
-            return result;
-        }
-
-        private void CheckSpaceAvailable(TrackedFile testFile, long requiredSize)
+        private void CheckSpaceAvailable(TrackedFile testFile, ByteSize size)
         {
             var file = new FileInfo(testFile.Filename);
             var drive = new DriveInfo(file.Directory!.Root.FullName);
 
             var spaceAvailable = drive.TotalFreeSpace;
 
-            if (spaceAvailable < requiredSize)
+            if (spaceAvailable < size.SizeInBytes)
             {
                 var msg = $"Not enough disk space. " +
-                    $"{Formatter.FormatByteSize(requiredSize)} required. " +
+                    $"{Formatter.FormatByteSize(size.SizeInBytes)} required. " +
                     $"{Formatter.FormatByteSize(spaceAvailable)} available.";
 
                 log.Log(msg);
@@ -149,6 +116,34 @@ namespace FileUtils
             }
         }
 
+        private void GenerateFileBytes(TrackedFile result, ByteSize size)
+        {
+            long bytesLeft = size.SizeInBytes;
+            int chunkSize = ChunkSize;
+            while (bytesLeft > 0)
+            {
+                try
+                {
+                    var length = Math.Min(bytesLeft, chunkSize);
+                    AppendRandomBytesToFile(result, length);
+                    bytesLeft -= length;
+                }
+                catch
+                {
+                    chunkSize = chunkSize / 2;
+                    if (chunkSize < 1024) throw;
+                }
+            }
+        }
+
+        private void AppendRandomBytesToFile(TrackedFile result, long length)
+        {
+            var bytes = new byte[length];
+            random.NextBytes(bytes);
+            using var stream = new FileStream(result.Filename, FileMode.Append);
+            stream.Write(bytes, 0, bytes.Length);
+        }
+
         private void EnsureDirectory()
         {
             Directory.CreateDirectory(folder);

Framework/FileUtils/FileUtils.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Framework/FileUtils/Generators.cs

@@ -1,141 +0,0 @@
-using System.Text;
-using Utils;
-
-namespace FileUtils
-{
-    public class GeneratorCollection : IGenerateOption
-    {
-        private readonly List<IGenerator> generators = new List<IGenerator>();
-
-        public IGenerateOption ByteRepeat(byte[] bytes, ByteSize size)
-        {
-            var times = size.SizeInBytes / bytes.Length;
-            generators.Add(new ByteRepeater(bytes, times));
-            return this;
-        }
-
-        public IGenerateOption ByteRepeat(byte[] bytes, int times)
-        {
-            generators.Add(new ByteRepeater(bytes, times));
-            return this;
-        }
-
-        public IGenerateOption Random(ByteSize size)
-        {
-            generators.Add(new RandomGenerator(size));
-            return this;
-        }
-
-        public IGenerateOption StringRepeat(string str, ByteSize size)
-        {
-            var times = size.SizeInBytes / str.Length;
-            generators.Add(new StringRepeater(str, times));
-            return this;
-        }
-
-        public IGenerateOption StringRepeat(string str, int times)
-        {
-            generators.Add(new StringRepeater(str, times));
-            return this;
-        }
-
-        public void Run(FileStream file)
-        {
-            foreach (var generator in generators)
-            {
-                generator.Generate(file);
-            }
-        }
-
-        public long GetRequiredSpace()
-        {
-            return generators.Sum(g => g.GetRequiredSpace());
-        }
-    }
-
-    public interface IGenerator
-    {
-        void Generate(FileStream file);
-        long GetRequiredSpace();
-    }
-
-    public class ByteRepeater : IGenerator
-    {
-        private readonly byte[] bytes;
-        private readonly long times;
-
-        public ByteRepeater(byte[] bytes, long times)
-        {
-            this.bytes = bytes;
-            this.times = times;
-        }
-
-        public void Generate(FileStream file)
-        {
-            for (var i = 0; i < times; i++)
-            {
-                file.Write(bytes, 0, bytes.Length);
-            }
-        }
-
-        public long GetRequiredSpace()
-        {
-            return bytes.Length * times;
-        }
-    }
-
-    public class StringRepeater : IGenerator
-    {
-        private readonly string str;
-        private readonly long times;
-
-        public StringRepeater(string str, long times)
-        {
-            this.str = str;
-            this.times = times;
-        }
-
-        public void Generate(FileStream file)
-        {
-            using var writer = new StreamWriter(file);
-            for (var i = 0; i < times; i++)
-            {
-                writer.Write(str);
-            }
-        }
-
-        public long GetRequiredSpace()
-        {
-            return Encoding.ASCII.GetBytes(str).Length * times;
-        }
-    }
-
-    public class RandomGenerator : IGenerator
-    {
-        private readonly Random random = new Random();
-        private readonly ByteSize size;
-
-        public RandomGenerator(ByteSize size)
-        {
-            this.size = size;
-        }
-
-        public void Generate(FileStream file)
-        {
-            var bytesLeft = size.SizeInBytes;
-            while (bytesLeft > 0)
-            {
-                var size = Math.Min(bytesLeft, FileManager.ChunkSize);
-                var bytes = new byte[size];
-                random.NextBytes(bytes);
-                file.Write(bytes, 0, bytes.Length);
-                bytesLeft -= size;
-            }
-        }
-
-        public long GetRequiredSpace()
-        {
-            return size.SizeInBytes;
-        }
-    }
-}

Framework/FileUtils/TrackedFile.cs

@@ -65,7 +65,7 @@ namespace FileUtils
 
                 if (readExpected == 0 && readActual == 0)
                 {
-                    log.Log($"OK: {Describe()} is equal to {actual.Describe()}.");
+                    log.Log($"OK: '{Describe()}' is equal to '{actual.Describe()}'.");
                     return;
                 }
 

Framework/GethConnector/GethConnector.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Framework/KubernetesWorkflow/ByteSizeExtensions.cs

@@ -0,0 +1,41 @@
+using Utils;
+
+namespace KubernetesWorkflow
+{
+    public static class ByteSizeExtensions
+    {
+        public static string ToSuffixNotation(this ByteSize b)
+        {
+            long x = 1024;
+            var map = new Dictionary<long, string>
+            {
+                { Pow(x, 4), "Ti" },
+                { Pow(x, 3), "Gi" },
+                { Pow(x, 2), "Mi" },
+                { (x), "Ki" },
+            };
+
+            var bytes = b.SizeInBytes;
+            foreach (var pair in map)
+            {
+                if (bytes > pair.Key)
+                {
+                    double bytesD = bytes;
+                    double divD = pair.Key;
+                    double numD = Math.Ceiling(bytesD / divD);
+                    var v = Convert.ToInt64(numD);
+                    return $"{v}{pair.Value}";
+                }
+            }
+
+            return $"{bytes}";
+        }
+
+        private static long Pow(long x, int v)
+        {
+            long result = 1;
+            for (var i = 0; i < v; i++) result *= x;
+            return result;
+        }
+    }
+}

Framework/KubernetesWorkflow/CrashWatcher.cs

@@ -11,6 +11,7 @@ namespace KubernetesWorkflow
         private readonly string podName;
         private readonly string recipeName;
         private readonly string k8sNamespace;
+        private ILogHandler? logHandler;
         private CancellationTokenSource cts;
         private Task? worker;
         private Exception? workerException;
@@ -26,10 +27,11 @@ namespace KubernetesWorkflow
             cts = new CancellationTokenSource();
         }
 
-        public void Start()
+        public void Start(ILogHandler logHandler)
         {
             if (worker != null) throw new InvalidOperationException();
 
+            this.logHandler = logHandler;
             cts = new CancellationTokenSource();
             worker = Task.Run(Worker);
         }
@@ -48,9 +50,7 @@ namespace KubernetesWorkflow
         public bool HasContainerCrashed()
         {
             using var client = new Kubernetes(config);
-            var result = HasContainerBeenRestarted(client);
-            if (result) DownloadCrashedContainerLogs(client);
-            return result;
+            return HasContainerBeenRestarted(client);
         }
 
         private void Worker()
@@ -83,16 +83,14 @@ namespace KubernetesWorkflow
         private bool HasContainerBeenRestarted(Kubernetes client)
         {
             var podInfo = client.ReadNamespacedPod(podName, k8sNamespace);
-            var result = podInfo.Status.ContainerStatuses.Any(c => c.RestartCount > 0);
-            if (result) log.Log("Pod crash detected for " + containerName);
-            return result;
+            return podInfo.Status.ContainerStatuses.Any(c => c.RestartCount > 0);
         }
 
         private void DownloadCrashedContainerLogs(Kubernetes client)
         {
+            log.Log("Pod crash detected for " + containerName);
             using var stream = client.ReadNamespacedPodLog(podName, k8sNamespace, recipeName, previous: true);
-            var handler = new WriteToFileLogHandler(log, "Crash detected for " + containerName);
-            handler.Log(stream);
+            logHandler!.Log(stream);
         }
     }
 }

Framework/KubernetesWorkflow/K8sCluster.cs

@@ -16,7 +16,6 @@ namespace KubernetesWorkflow
         {
             var config = GetConfig();
             UpdateHostAddress(config);
-            config.SkipTlsVerify = true; // Required for operation on Wings cluster.
             return config;
         }
 

Framework/KubernetesWorkflow/K8sController.cs

@@ -43,11 +43,6 @@ namespace KubernetesWorkflow
             return new StartResult(cluster, containerRecipes, deployment, internalService, externalService);
         }
 
-        public void WaitUntilOnline(RunningContainer container)
-        {
-            WaitUntilDeploymentOnline(container);
-        }
-
         public PodInfo GetPodInfo(RunningDeployment deployment)
         {
             var pod = GetPodForDeployment(deployment);
@@ -64,14 +59,14 @@ namespace KubernetesWorkflow
             if (waitTillStopped) WaitUntilPodsForDeploymentAreOffline(startResult.Deployment);
         }
 
-        public void DownloadPodLog(RunningContainer container, ILogHandler logHandler, int? tailLines, bool? previous)
+        public void DownloadPodLog(RunningContainer container, ILogHandler logHandler, int? tailLines)
         {
             log.Debug();
 
             var podName = GetPodName(container);
             var recipeName = container.Recipe.Name;
 
-            using var stream = client.Run(c => c.ReadNamespacedPodLog(podName, K8sNamespace, recipeName, tailLines: tailLines, previous: previous));
+            using var stream = client.Run(c => c.ReadNamespacedPodLog(podName, K8sNamespace, recipeName, tailLines: tailLines));
             logHandler.Log(stream);
         }
 
@@ -115,7 +110,7 @@ namespace KubernetesWorkflow
             });
         }
 
-        public void DeleteAllNamespacesStartingWith(string prefix, bool wait)
+        public void DeleteAllNamespacesStartingWith(string prefix)
         {
             log.Debug();
 
@@ -124,28 +119,25 @@ namespace KubernetesWorkflow
 
             foreach (var ns in namespaces)
             {
-                DeleteNamespace(ns, wait);
+                DeleteNamespace(ns);
             }
         }
 
-        public void DeleteNamespace(bool wait)
+        public void DeleteNamespace()
         {
             log.Debug();
             if (IsNamespaceOnline(K8sNamespace))
             {
                 client.Run(c => c.DeleteNamespace(K8sNamespace, null, null, gracePeriodSeconds: 0));
-
-                if (wait) WaitUntilNamespaceDeleted(K8sNamespace);
             }
         }
 
-        public void DeleteNamespace(string ns, bool wait)
+        public void DeleteNamespace(string ns)
         {
             log.Debug();
             if (IsNamespaceOnline(ns))
             {
                 client.Run(c => c.DeleteNamespace(ns, null, null, gracePeriodSeconds: 0));
-                if (wait) WaitUntilNamespaceDeleted(ns);
             }
         }
 
@@ -380,6 +372,7 @@ namespace KubernetesWorkflow
             };
 
             client.Run(c => c.CreateNamespacedDeployment(deploymentSpec, K8sNamespace));
+            WaitUntilDeploymentOnline(deploymentSpec.Metadata.Name);
 
             var name = deploymentSpec.Metadata.Name;
             return new RunningDeployment(name, podLabel);
@@ -535,7 +528,7 @@ namespace KubernetesWorkflow
             }
             if (set.Memory.SizeInBytes != 0)
             {
-                result.Add("memory", new ResourceQuantity(set.Memory.SizeInBytes.ToString()));
+                result.Add("memory", new ResourceQuantity(set.Memory.ToSuffixNotation()));
             }
             return result;
         }
@@ -708,14 +701,14 @@ namespace KubernetesWorkflow
 
         private string GetPodName(RunningContainer container)
         {
-            return GetPodForDeployment(container.RunningPod.StartResult.Deployment).Metadata.Name;
+            return GetPodForDeployment(container.RunningContainers.StartResult.Deployment).Metadata.Name;
         }
 
         private V1Pod GetPodForDeployment(RunningDeployment deployment)
         {
             return Time.Retry(() => GetPodForDeplomentInternal(deployment),
                 // We will wait up to 1 minute, k8s might be moving pods around.
-                maxTimeout: TimeSpan.FromMinutes(1),
+                maxRetries: 6,
                 retryTime: TimeSpan.FromSeconds(10),
                 description: "Find pod by label for deployment.");
         }
@@ -871,45 +864,16 @@ namespace KubernetesWorkflow
 
         private void WaitUntilNamespaceCreated() 
         {
-            WaitUntil(() => IsNamespaceOnline(K8sNamespace), nameof(WaitUntilNamespaceCreated));
+            WaitUntil(() => IsNamespaceOnline(K8sNamespace));
         }
 
-        private void WaitUntilNamespaceDeleted(string @namespace)
-        {
-            WaitUntil(() => !IsNamespaceOnline(@namespace), nameof(WaitUntilNamespaceDeleted));
-        }
-
-        private void WaitUntilDeploymentOnline(RunningContainer container)
+        private void WaitUntilDeploymentOnline(string deploymentName)
         {
             WaitUntil(() =>
             {
-                CheckForCrash(container);
-
-                var deployment = client.Run(c => c.ReadNamespacedDeployment(container.Recipe.Name, K8sNamespace));
+                var deployment = client.Run(c => c.ReadNamespacedDeployment(deploymentName, K8sNamespace));
                 return deployment?.Status.AvailableReplicas != null && deployment.Status.AvailableReplicas > 0;
-            }, nameof(WaitUntilDeploymentOnline));
-        }
-
-        private void CheckForCrash(RunningContainer container)
-        {
-            var deploymentName = container.Recipe.Name;
-            var podName = GetPodName(container);
-
-            var podInfo = client.Run(c => c.ReadNamespacedPod(podName, K8sNamespace));
-            if (podInfo == null) return;
-            if (podInfo.Status == null) return;
-            if (podInfo.Status.ContainerStatuses == null) return;
-
-            var result = podInfo.Status.ContainerStatuses.Any(c => c.RestartCount > 0);
-            if (result)
-            {
-                var msg = $"Pod crash detected for deployment {deploymentName} (pod:{podName})";
-                log.Error(msg);
-
-                DownloadPodLog(container, new WriteToFileLogHandler(log, msg), tailLines: null, previous: true);
-
-                throw new Exception(msg);
-            }
+            });
         }
 
         private void WaitUntilDeploymentOffline(string deploymentName)
@@ -919,7 +883,7 @@ namespace KubernetesWorkflow
                 var deployments = client.Run(c => c.ListNamespacedDeployment(K8sNamespace));
                 var deployment = deployments.Items.SingleOrDefault(d => d.Metadata.Name == deploymentName);
                 return deployment == null || deployment.Status.AvailableReplicas == 0;
-            }, nameof(WaitUntilDeploymentOffline));
+            });
         }
 
         private void WaitUntilPodsForDeploymentAreOffline(RunningDeployment deployment)
@@ -928,19 +892,19 @@ namespace KubernetesWorkflow
             {
                 var pods = FindPodsByLabel(deployment.PodLabel);
                 return !pods.Any();
-            }, nameof(WaitUntilPodsForDeploymentAreOffline));
+            });
         }
 
-        private void WaitUntil(Func<bool> predicate, string msg)
+        private void WaitUntil(Func<bool> predicate)
         {
             var sw = Stopwatch.Begin(log, true);
             try
             {
-                Time.WaitUntil(predicate, cluster.K8sOperationTimeout(), cluster.K8sOperationRetryDelay(), msg);
+                Time.WaitUntil(predicate, cluster.K8sOperationTimeout(), cluster.K8sOperationRetryDelay());
             }
             finally
             {
-                sw.End(msg, 1);
+                sw.End("", 1);
             }
         }
 

Framework/KubernetesWorkflow/K8sHooks.cs

@@ -5,18 +5,18 @@ namespace KubernetesWorkflow
 {
     public interface IK8sHooks
     {
-        void OnContainersStarted(RunningPod runningPod);
-        void OnContainersStopped(RunningPod runningPod);
+        void OnContainersStarted(RunningContainers runningContainers);
+        void OnContainersStopped(RunningContainers runningContainers);
         void OnContainerRecipeCreated(ContainerRecipe recipe);
     }
 
     public class DoNothingK8sHooks : IK8sHooks
     {
-        public void OnContainersStarted(RunningPod runningPod)
+        public void OnContainersStarted(RunningContainers runningContainers)
         {
         }
 
-        public void OnContainersStopped(RunningPod runningPod)
+        public void OnContainersStopped(RunningContainers runningContainers)
         {
         }
 

Framework/KubernetesWorkflow/K8sNameUtils.cs

@@ -24,8 +24,8 @@
                 .Replace("]", "-")
                 .Replace(",", "-");
 
-            if (result.Length > maxLength) result = result.Substring(0, maxLength);
             result = result.Trim('-');
+            if (result.Length > maxLength) result = result.Substring(0, maxLength);
 
             return result;
         }

Framework/KubernetesWorkflow/KubernetesWorkflow.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 	  <RootNamespace>KubernetesWorkflow</RootNamespace>
 	  <ImplicitUsings>enable</ImplicitUsings>
 	  <Nullable>enable</Nullable>

Framework/KubernetesWorkflow/LogHandler.cs

@@ -1,6 +1,4 @@
-using Logging;
-
-namespace KubernetesWorkflow
+namespace KubernetesWorkflow
 {
     public interface ILogHandler
     {
@@ -22,25 +20,4 @@ namespace KubernetesWorkflow
 
         protected abstract void ProcessLine(string line);
     }
-
-    public class WriteToFileLogHandler : LogHandler, ILogHandler
-    {
-        public WriteToFileLogHandler(ILog sourceLog, string description)
-        {
-            LogFile = sourceLog.CreateSubfile();
-
-            var msg = $"{description} -->> {LogFile.FullFilename}";
-            sourceLog.Log(msg);
-
-            LogFile.Write(msg);
-            LogFile.WriteRaw(description);
-        }
-
-        public LogFile LogFile { get; }
-
-        protected override void ProcessLine(string line)
-        {
-            LogFile.WriteRaw(line);
-        }
-    }
 }

Framework/KubernetesWorkflow/Recipe/ContainerAdditionals.cs

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

Framework/KubernetesWorkflow/Recipe/ContainerRecipe.cs

@@ -2,9 +2,8 @@
 {
     public class ContainerRecipe
     {
-        public ContainerRecipe(DateTime recipeCreatedUtc, int number, string? nameOverride, string image, ContainerResources resources, SchedulingAffinity schedulingAffinity, CommandOverride commandOverride, bool setCriticalPriority, Port[] exposedPorts, Port[] internalPorts, EnvVar[] envVars, PodLabels podLabels, PodAnnotations podAnnotations, VolumeMount[] volumes, ContainerAdditionals additionals)
+        public ContainerRecipe(int number, string? nameOverride, string image, ContainerResources resources, SchedulingAffinity schedulingAffinity, CommandOverride commandOverride, bool setCriticalPriority, Port[] exposedPorts, Port[] internalPorts, EnvVar[] envVars, PodLabels podLabels, PodAnnotations podAnnotations, VolumeMount[] volumes, ContainerAdditionals additionals)
         {
-            RecipeCreatedUtc = recipeCreatedUtc;
             Number = number;
             NameOverride = nameOverride;
             Image = image;
@@ -32,7 +31,6 @@
             if (exposedPorts.Any(p => string.IsNullOrEmpty(p.Tag))) throw new Exception("Port tags are required for all exposed ports.");
         }
 
-        public DateTime RecipeCreatedUtc { get; }
         public string Name { get; }
         public int Number { get; }
         public string? NameOverride { get; }

Framework/KubernetesWorkflow/Recipe/ContainerRecipeFactory.cs

@@ -25,7 +25,7 @@ namespace KubernetesWorkflow.Recipe
 
             Initialize(config);
 
-            var recipe = new ContainerRecipe(DateTime.UtcNow, containerNumber, config.NameOverride, Image, resources, schedulingAffinity, commandOverride, setCriticalPriority,
+            var recipe = new ContainerRecipe(containerNumber, config.NameOverride, Image, resources, schedulingAffinity, commandOverride, setCriticalPriority,
                 exposedPorts.ToArray(),
                 internalPorts.ToArray(),
                 envVars.ToArray(),
@@ -73,6 +73,13 @@ namespace KubernetesWorkflow.Recipe
             return p;
         }
 
+        protected Port AddInternalPort(int number, string tag = "", PortProtocol protocol = PortProtocol.TCP)
+        {
+            var p = factory.CreateInternalPort(number, tag, protocol);
+            internalPorts.Add(p);
+            return p;
+        }
+
         protected void AddExposedPortAndVar(string name, string tag, PortProtocol protocol = PortProtocol.TCP)
         {
             AddEnvVar(name, AddExposedPort(tag, protocol));
@@ -105,7 +112,7 @@ namespace KubernetesWorkflow.Recipe
 
         protected void AddVolume(string name, string mountPath, string? subPath = null, string? secret = null, string? hostPath = null)
         {
-            var size = 10.MB().SizeInBytes.ToString();
+            var size = 10.MB().ToSuffixNotation();
             volumeMounts.Add(new VolumeMount(name, mountPath, subPath, size, secret, hostPath));
         }
 
@@ -114,7 +121,7 @@ namespace KubernetesWorkflow.Recipe
             volumeMounts.Add(new VolumeMount(
                 $"autovolume-{Guid.NewGuid().ToString().ToLowerInvariant()}",
                 mountPath,
-                resourceQuantity: volumeSize.SizeInBytes.ToString()));
+                resourceQuantity: volumeSize.ToSuffixNotation()));
         }
 
         protected void Additional(object userData)

Framework/KubernetesWorkflow/Recipe/RecipeComponentFactory.cs

@@ -16,7 +16,12 @@ namespace KubernetesWorkflow.Recipe
 
         public Port CreateInternalPort(string tag, PortProtocol protocol)
         {
-            return new Port(internalNumberSource.GetNextNumber(), tag, protocol);
+            return CreateInternalPort(internalNumberSource.GetNextNumber(), tag, protocol);
+        }
+
+        public Port CreateInternalPort(int number, string tag, PortProtocol protocol)
+        {
+            return new Port(number, tag, protocol);
         }
 
         public Port CreateExternalPort(int number, string tag, PortProtocol protocol)

Framework/KubernetesWorkflow/RunningPod.cs

@@ -1,5 +1,8 @@
-using KubernetesWorkflow.Recipe;
+using k8s;
+using k8s.Models;
+using KubernetesWorkflow.Recipe;
 using KubernetesWorkflow.Types;
+using Newtonsoft.Json;
 
 namespace KubernetesWorkflow
 {

Framework/KubernetesWorkflow/StartupWorkflow.cs

@@ -9,17 +9,16 @@ namespace KubernetesWorkflow
     public interface IStartupWorkflow
     {
         IKnownLocations GetAvailableLocations();
-        FutureContainers Start(int numberOfContainers, ContainerRecipeFactory recipeFactory, StartupConfig startupConfig);
-        FutureContainers Start(int numberOfContainers, ILocation location, ContainerRecipeFactory recipeFactory, StartupConfig startupConfig);
+        RunningContainers Start(int numberOfContainers, ContainerRecipeFactory recipeFactory, StartupConfig startupConfig);
+        RunningContainers Start(int numberOfContainers, ILocation location, ContainerRecipeFactory recipeFactory, StartupConfig startupConfig);
         PodInfo GetPodInfo(RunningContainer container);
-        PodInfo GetPodInfo(RunningPod pod);
+        PodInfo GetPodInfo(RunningContainers containers);
         CrashWatcher CreateCrashWatcher(RunningContainer container);
-        void Stop(RunningPod pod, bool waitTillStopped);
-        void DownloadContainerLog(RunningContainer container, ILogHandler logHandler, int? tailLines = null, bool? previous = null);
-        IDownloadedLog DownloadContainerLog(RunningContainer container, int? tailLines = null, bool? previous = null);
+        void Stop(RunningContainers containers, bool waitTillStopped);
+        void DownloadContainerLog(RunningContainer container, ILogHandler logHandler, int? tailLines = null);
         string ExecuteCommand(RunningContainer container, string command, params string[] args);
-        void DeleteNamespace(bool wait);
-        void DeleteNamespacesStartingWith(string namespacePrefix, bool wait);
+        void DeleteNamespace();
+        void DeleteNamespacesStartingWith(string namespacePrefix);
     }
 
     public class StartupWorkflow : IStartupWorkflow
@@ -46,12 +45,12 @@ namespace KubernetesWorkflow
             return locationProvider.GetAvailableLocations();
         }
 
-        public FutureContainers Start(int numberOfContainers, ContainerRecipeFactory recipeFactory, StartupConfig startupConfig)
+        public RunningContainers Start(int numberOfContainers, ContainerRecipeFactory recipeFactory, StartupConfig startupConfig)
         {
             return Start(numberOfContainers, KnownLocations.UnspecifiedLocation, recipeFactory, startupConfig);
         }
 
-        public FutureContainers Start(int numberOfContainers, ILocation location, ContainerRecipeFactory recipeFactory, StartupConfig startupConfig)
+        public RunningContainers Start(int numberOfContainers, ILocation location, ContainerRecipeFactory recipeFactory, StartupConfig startupConfig)
         {
             return K8s(controller =>
             {
@@ -61,36 +60,25 @@ namespace KubernetesWorkflow
                 var startResult = controller.BringOnline(recipes, location);
                 var containers = CreateContainers(startResult, recipes, startupConfig);
 
-                var rc = new RunningPod(Guid.NewGuid().ToString(), startupConfig, startResult, containers);
+                var rc = new RunningContainers(startupConfig, startResult, containers);
                 cluster.Configuration.Hooks.OnContainersStarted(rc);
 
                 if (startResult.ExternalService != null)
                 {
                     componentFactory.Update(controller);
                 }
-                return new FutureContainers(rc, this);
-            });
-        }
-
-        public void WaitUntilOnline(RunningPod rc)
-        {
-            K8s(controller =>
-            {
-                foreach (var c in rc.Containers)
-                {
-                    controller.WaitUntilOnline(c);
-                }
+                return rc;
             });
         }
 
         public PodInfo GetPodInfo(RunningContainer container)
         {
-            return K8s(c => c.GetPodInfo(container.RunningPod.StartResult.Deployment));
+            return K8s(c => c.GetPodInfo(container.RunningContainers.StartResult.Deployment));
         }
 
-        public PodInfo GetPodInfo(RunningPod pod)
+        public PodInfo GetPodInfo(RunningContainers containers)
         {
-            return K8s(c => c.GetPodInfo(pod.StartResult.Deployment));
+            return K8s(c => c.GetPodInfo(containers.StartResult.Deployment));
         }
 
         public CrashWatcher CreateCrashWatcher(RunningContainer container)
@@ -98,43 +86,21 @@ namespace KubernetesWorkflow
             return K8s(c => c.CreateCrashWatcher(container));
         }
 
-        public void Stop(RunningPod runningPod, bool waitTillStopped)
-        {
-            if (runningPod.IsStopped) return;
-            foreach (var c in runningPod.Containers)
-            {
-                c.StopLog = DownloadContainerLog(c);
-            }
-            runningPod.IsStopped = true;
-
-            K8s(controller =>
-            {
-                controller.Stop(runningPod.StartResult, waitTillStopped);
-            });
-
-            cluster.Configuration.Hooks.OnContainersStopped(runningPod);
-        }
-
-        public void DownloadContainerLog(RunningContainer container, ILogHandler logHandler, int? tailLines = null, bool? previous = null)
+        public void Stop(RunningContainers runningContainers, bool waitTillStopped)
         {
             K8s(controller =>
             {
-                controller.DownloadPodLog(container, logHandler, tailLines, previous);
+                controller.Stop(runningContainers.StartResult, waitTillStopped);
+                cluster.Configuration.Hooks.OnContainersStopped(runningContainers);
             });
         }
 
-        public IDownloadedLog DownloadContainerLog(RunningContainer container, int? tailLines = null, bool? previous = null)
+        public void DownloadContainerLog(RunningContainer container, ILogHandler logHandler, int? tailLines = null)
         {
-            var msg = $"Downloading container log for '{container.Name}'";
-            log.Log(msg);
-            var logHandler = new WriteToFileLogHandler(log, msg);
-
             K8s(controller =>
             {
-                controller.DownloadPodLog(container, logHandler, tailLines, previous);
+                controller.DownloadPodLog(container, logHandler, tailLines);
             });
-
-            return new DownloadedLog(logHandler, container.Name);
         }
 
         public string ExecuteCommand(RunningContainer container, string command, params string[] args)
@@ -145,19 +111,19 @@ namespace KubernetesWorkflow
             });
         }
 
-        public void DeleteNamespace(bool wait)
+        public void DeleteNamespace()
         {
             K8s(controller =>
             {
-                controller.DeleteNamespace(wait);
+                controller.DeleteNamespace();
             });
         }
 
-        public void DeleteNamespacesStartingWith(string namespacePrefix, bool wait)
+        public void DeleteNamespacesStartingWith(string namespacePrefix)
         {
             K8s(controller =>
             {
-                controller.DeleteAllNamespacesStartingWith(namespacePrefix, wait);
+                controller.DeleteAllNamespacesStartingWith(namespacePrefix);
             });
         }
 
@@ -170,7 +136,7 @@ namespace KubernetesWorkflow
                 var addresses = CreateContainerAddresses(startResult, r);
                 log.Debug($"{r}={name} -> container addresses: {string.Join(Environment.NewLine, addresses.Select(a => a.ToString()))}");
 
-                return new RunningContainer(Guid.NewGuid().ToString(), name, r, addresses);
+                return new RunningContainer(name, r, addresses);
 
             }).ToArray();
         }

Framework/KubernetesWorkflow/Types/FutureContainers.cs

@@ -1,20 +0,0 @@
-namespace KubernetesWorkflow.Types
-{
-    public class FutureContainers
-    {
-        private readonly RunningPod runningPod;
-        private readonly StartupWorkflow workflow;
-
-        public FutureContainers(RunningPod runningPod, StartupWorkflow workflow)
-        {
-            this.runningPod = runningPod;
-            this.workflow = workflow;
-        }
-
-        public RunningPod WaitForOnline()
-        {
-            workflow.WaitUntilOnline(runningPod);
-            return runningPod;
-        }
-    }
-}

Framework/KubernetesWorkflow/Types/RunningContainer.cs

@@ -7,29 +7,27 @@ namespace KubernetesWorkflow.Types
 {
     public class RunningContainer
     {
-        public RunningContainer(string id, string name, ContainerRecipe recipe, ContainerAddress[] addresses)
+        public RunningContainer(string name, ContainerRecipe recipe, ContainerAddress[] addresses)
         {
-            Id = id;
             Name = name;
             Recipe = recipe;
             Addresses = addresses;
         }
 
-        public string Id { get; }
         public string Name { get; }
         public ContainerRecipe Recipe { get; }
         public ContainerAddress[] Addresses { get; }
-        public IDownloadedLog? StopLog { get; internal set; }
 
         [JsonIgnore]
-        public RunningPod RunningPod { get; internal set; } = null!;
+        public RunningContainers RunningContainers { get; internal set; } = null!;
 
-        public Address GetAddress(string portTag)
+        public Address GetAddress(ILog log, string portTag)
         {
             var addresses = Addresses.Where(a => a.PortTag == portTag).ToArray();
             if (!addresses.Any()) throw new Exception("No addresses found for portTag: " + portTag);
 
             var select = SelectAddress(addresses);
+            log.Debug($"Container '{Name}' selected for tag '{portTag}' address: '{select}'");
             return select.Address;
         }
 
@@ -52,21 +50,5 @@ namespace KubernetesWorkflow.Types
             }
             throw new Exception("Running location not known.");
         }
-
-        public override string ToString()
-        {
-            return Name;
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return obj is RunningContainer container &&
-                   Id == container.Id;
-        }
-
-        public override int GetHashCode()
-        {
-            return HashCode.Combine(Id);
-        }
     }
 }

Framework/KubernetesWorkflow/Types/RunningContainers.cs

@@ -0,0 +1,44 @@
+using Newtonsoft.Json;
+
+namespace KubernetesWorkflow.Types
+{
+    public class RunningContainers
+    {
+        public RunningContainers(StartupConfig startupConfig, StartResult startResult, RunningContainer[] containers)
+        {
+            StartupConfig = startupConfig;
+            StartResult = startResult;
+            Containers = containers;
+
+            foreach (var c in containers) c.RunningContainers = this;
+        }
+
+        public StartupConfig StartupConfig { get; }
+        public StartResult StartResult { get; }
+        public RunningContainer[] Containers { get; }
+
+        [JsonIgnore]
+        public string Name
+        {
+            get { return $"{Containers.Length}x '{Containers.First().Name}'"; }
+        }
+
+        public string Describe()
+        {
+            return string.Join(",", Containers.Select(c => c.Name));
+        }
+    }
+
+    public static class RunningContainersExtensions
+    {
+        public static RunningContainer[] Containers(this RunningContainers[] runningContainers)
+        {
+            return runningContainers.SelectMany(c => c.Containers).ToArray();
+        }
+
+        public static string Describe(this RunningContainers[] runningContainers)
+        {
+            return string.Join(",", runningContainers.Select(c => c.Describe()));
+        }
+    }
+}

Framework/KubernetesWorkflow/Types/RunningPod.cs

@@ -1,61 +0,0 @@
-using Newtonsoft.Json;
-
-namespace KubernetesWorkflow.Types
-{
-    public class RunningPod
-    {
-        public RunningPod(string id, StartupConfig startupConfig, StartResult startResult, RunningContainer[] containers)
-        {
-            Id = id;
-            StartupConfig = startupConfig;
-            StartResult = startResult;
-            Containers = containers;
-
-            foreach (var c in containers) c.RunningPod = this;
-        }
-
-        public string Id { get; }
-        public StartupConfig StartupConfig { get; }
-        public StartResult StartResult { get; }
-        public RunningContainer[] Containers { get; }
-
-        [JsonIgnore]
-        public string Name
-        {
-            get { return $"'{string.Join("&", Containers.Select(c => c.Name).ToArray())}'"; }
-        }
-
-        [JsonIgnore]
-        public bool IsStopped { get; internal set; }
-
-        public string Describe()
-        {
-            return string.Join(",", Containers.Select(c => c.Name));
-        }
-
-        public override bool Equals(object? obj)
-        {
-            return obj is RunningPod pod &&
-                   Id == pod.Id;
-        }
-
-        public override int GetHashCode()
-        {
-            return HashCode.Combine(Id);
-        }
-
-        public override string ToString()
-        {
-            if (IsStopped) return Name + " (*)";
-            return Name;
-        }
-    }
-
-    public static class RunningContainersExtensions
-    {
-        public static string Describe(this RunningPod[] runningContainers)
-        {
-            return string.Join(",", runningContainers.Select(c => c.Describe()));
-        }
-    }
-}

Framework/Logging/BaseLog.cs

@@ -77,7 +77,7 @@ namespace Logging
             return new LogFile($"{GetFullName()}_{GetSubfileNumber()}", ext);
         }
 
-        protected string ApplyReplacements(string str)
+        private string ApplyReplacements(string str)
         {
             if (IsDebug) return str;
             foreach (var replacement in replacements)

Framework/Logging/ConsoleLog.cs

@@ -9,7 +9,7 @@
 
         public override void Log(string message)
         {
-            Console.WriteLine(ApplyReplacements(message));
+            Console.WriteLine(message);
         }
     }
 }

Framework/Logging/Logging.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 	  <RootNamespace>Logging</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

Framework/NethereumWorkflow/BlockUtils/BlockTimeFinder.cs

@@ -18,19 +18,10 @@ namespace NethereumWorkflow.BlockUtils
             bounds = new BlockchainBounds(cache, web3);
         }
 
-        public BlockTimeEntry Get(ulong blockNumber)
-        {
-            bounds.Initialize();
-            var b = cache.Get(blockNumber);
-            if (b != null) return b;
-            return GetBlock(blockNumber);
-        }
-
         public ulong? GetHighestBlockNumberBefore(DateTime moment)
         {
             bounds.Initialize();
-            if (moment < bounds.Genesis.Utc) return null;
-            if (moment == bounds.Genesis.Utc) return bounds.Genesis.BlockNumber;
+            if (moment <= bounds.Genesis.Utc) return null;
             if (moment >= bounds.Current.Utc) return bounds.Current.BlockNumber;
 
             return Log(() => Search(bounds.Genesis, bounds.Current, moment, HighestBeforeSelector));
@@ -39,8 +30,7 @@ namespace NethereumWorkflow.BlockUtils
         public ulong? GetLowestBlockNumberAfter(DateTime moment)
         {
             bounds.Initialize();
-            if (moment > bounds.Current.Utc) return null;
-            if (moment == bounds.Current.Utc) return bounds.Current.BlockNumber;
+            if (moment >= bounds.Current.Utc) return null;
             if (moment <= bounds.Genesis.Utc) return bounds.Genesis.BlockNumber;
 
             return Log(()=> Search(bounds.Genesis, bounds.Current, moment, LowestAfterSelector)); ;
@@ -48,7 +38,7 @@ namespace NethereumWorkflow.BlockUtils
 
         private ulong Log(Func<ulong> operation)
         {
-            var sw = Stopwatch.Begin(log, nameof(BlockTimeFinder), true);
+            var sw = Stopwatch.Begin(log, nameof(BlockTimeFinder));
             var result = operation();
             sw.End($"(Bounds: [{bounds.Genesis.BlockNumber}-{bounds.Current.BlockNumber}] Cache: {cache.Size})");
 

Framework/NethereumWorkflow/NethereumInteraction.cs

@@ -117,17 +117,9 @@ namespace NethereumWorkflow
             }
 
             return new BlockInterval(
-                timeRange: timeRange,
                 from: fromBlock.Value,
                 to: toBlock.Value
             );
         }
-
-        public BlockTimeEntry GetBlockForNumber(ulong number)
-        {
-            var wrapper = new Web3Wrapper(web3, log);
-            var blockTimeFinder = new BlockTimeFinder(blockCache, wrapper, log);
-            return blockTimeFinder.Get(number);
-        }
     }
 }

Framework/NethereumWorkflow/NethereumWorkflow.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 	<RootNamespace>NethereumWorkflow</RootNamespace>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>

Framework/OverwatchTranscript/ActionQueue.cs

@@ -1,61 +0,0 @@
-namespace OverwatchTranscript
-{
-    public class ActionQueue
-    {
-        // Using ConcurrentQueue<> here would make this process slower.
-        private readonly object queueLock = new object();
-        private readonly AutoResetEvent signal = new AutoResetEvent(false);
-        private List<Action> queue = new List<Action>();
-        private Task queueWorker = null!;
-        private bool stopping = false;
-
-        public void Start()
-        {
-            queueWorker = Task.Run(QueueWorker);
-        }
-
-        public int Count { get; private set; }
-
-        public void StopAndJoin()
-        {
-            stopping = true;
-            queueWorker.Wait();
-            if (queue.Count > 0) throw new Exception("not all acions handled");
-            queueWorker.Dispose();
-        }
-
-        public void Add(Action action)
-        {
-            if (stopping) throw new Exception("queue stopping");
-
-            lock (queueLock)
-            {
-                queue.Add(action);
-                Count = queue.Count;
-            }
-            signal.Set();
-        }
-
-        private void QueueWorker()
-        {
-            while (true)
-            {
-                signal.WaitOne(10);
-
-                List<Action> work = null!;
-                lock (queueLock)
-                {
-                    work = queue;
-                    queue = new List<Action>();
-                    Count = 0;
-                }
-                if (stopping && !work.Any()) return;
-                
-                foreach (var action in work)
-                {
-                    action();
-                }
-            }
-        }
-    }
-}

Framework/OverwatchTranscript/BucketSet.cs

@@ -1,110 +0,0 @@
-using Logging;
-using System.Collections.Concurrent;
-
-namespace OverwatchTranscript
-{
-    public class BucketSet
-    {
-        private const int numberOfActiveBuckets = 10;
-        private readonly ILog log;
-        private readonly string workingDir;
-        private readonly object _bucketLock = new object();
-        private readonly List<EventBucketWriter> fullBuckets = new List<EventBucketWriter>();
-        private readonly List<EventBucketWriter> activeBuckets = new List<EventBucketWriter>();
-        private readonly ActionQueue queue = new ActionQueue();
-        private int activeBucketIndex = 0;
-        private bool closed = false;
-        private string internalErrors = string.Empty;
-        
-        public BucketSet(ILog log, string workingDir)
-        {
-            this.log = log;
-            this.workingDir = workingDir;
-
-            for (var i = 0; i < numberOfActiveBuckets;i++)
-            {
-                AddNewBucket();
-            }
-
-            queue.Start();
-        }
-
-        public void Add(DateTime utc, object payload)
-        {
-            if (closed) throw new Exception("Buckets already closed!");
-            queue.Add(() => AddInternal(utc, payload));
-            
-            if (queue.Count > 1000)
-            {
-                Thread.Sleep(1);
-            }
-        }
-
-        public IFinalizedBucket[] FinalizeBuckets()
-        {
-            closed = true;
-            queue.StopAndJoin();
-
-            if (IsEmpty()) throw new Exception("No entries have been added.");
-            if (!string.IsNullOrEmpty(internalErrors)) throw new Exception(internalErrors);
-
-            var buckets = fullBuckets.Concat(activeBuckets).ToArray();
-            log.Debug($"Finalizing {buckets.Length} buckets...");
-
-            var finalized = new ConcurrentBag<IFinalizedBucket>();
-            var tasks = Parallel.ForEach(buckets, b => finalized.Add(b.FinalizeBucket()));
-            if (!tasks.IsCompleted) throw new Exception("Failed to finalize buckets: " + tasks);
-
-            return finalized.ToArray();
-        }
-
-        private bool IsEmpty()
-        {
-            return fullBuckets.All(b => b.Count == 0) && activeBuckets.All(b => b.Count == 0);
-        }
-
-        private void AddInternal(DateTime utc, object payload)
-        {
-            try
-            {
-                lock (_bucketLock)
-                {
-                    var current = activeBuckets[activeBucketIndex];
-                    current.Add(utc, payload);
-                    activeBucketIndex = (activeBucketIndex + 1) % numberOfActiveBuckets;
-
-                    if (current.IsFull)
-                    {
-                        log.Debug("Bucket is full. New bucket...");
-                        fullBuckets.Add(current);
-                        activeBuckets.Remove(current);
-                        AddNewBucket();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                internalErrors += ex.ToString();
-                log.Error(ex.ToString());
-            }
-        }
-
-        private static int bucketSizeIndex = 0;
-        private static int[] bucketSizes = new[]
-        {
-            10000,
-            15000,
-            20000,
-        };
-
-        private void AddNewBucket()
-        {
-            lock (_bucketLock)
-            {
-                var size = bucketSizes[bucketSizeIndex];
-                bucketSizeIndex = (bucketSizeIndex + 1) % bucketSizes.Length;
-                activeBuckets.Add(new EventBucketWriter(log, Path.Combine(workingDir, Guid.NewGuid().ToString()), size));
-            }
-        }
-    }
-}

Framework/OverwatchTranscript/EventBucketReader.cs

@@ -1,151 +0,0 @@
-using Logging;
-using Newtonsoft.Json;
-using System.Collections.Concurrent;
-
-namespace OverwatchTranscript
-{
-    public interface IFinalizedBucket
-    {
-        bool IsEmpty { get; }
-        void Update();
-        DateTime? SeeTopUtc();
-        BucketTop? TakeTop();
-    }
-
-    public class BucketTop
-    {
-        public BucketTop(DateTime utc, OverwatchEvent[] events)
-        {
-            Utc = utc;
-            Events = events;
-        }
-
-        public DateTime Utc { get; }
-        public OverwatchEvent[] Events { get; }
-    }
-
-    public class EventBucketReader : IFinalizedBucket
-    {
-        private readonly string bucketFile;
-        private readonly ConcurrentQueue<BucketTop> topQueue = new ConcurrentQueue<BucketTop>();
-        private readonly AutoResetEvent itemDequeued = new AutoResetEvent(false);
-        private readonly AutoResetEvent itemEnqueued = new AutoResetEvent(false);
-        private bool sourceIsEmpty;
-
-        public EventBucketReader(ILog log, string bucketFile)
-        {
-            this.bucketFile = bucketFile;
-            if (!File.Exists(bucketFile)) throw new Exception("Doesn't exist: " + bucketFile);
-
-            log.Debug("Read Bucket open: " + bucketFile);
-
-            Task.Run(ReadBucket);
-        }
-        
-        public bool IsEmpty { get; private set; }
-
-        public void Update()
-        {
-            if (IsEmpty) return;
-            while (topQueue.Count == 0)
-            {
-                UpdateIsEmpty();
-                if (IsEmpty) return;
-
-                itemDequeued.Set();
-                itemEnqueued.WaitOne(200);
-            }
-        }
-
-        public DateTime? SeeTopUtc()
-        {
-            if (IsEmpty) return null;
-            if (topQueue.TryPeek(out BucketTop? top))
-            {
-                return top.Utc;
-            }
-            return null;
-        }
-
-        public BucketTop? TakeTop()
-        {
-            if (IsEmpty) return null;
-            if (topQueue.TryDequeue(out BucketTop? top))
-            {
-                itemDequeued.Set();
-                return top;
-            }
-            return null;
-        }
-
-        private void ReadBucket()
-        {
-            using var file = File.OpenRead(bucketFile);
-            using var reader = new StreamReader(file);
-
-            while (true)
-            {
-                while (topQueue.Count < 5)
-                {
-                    var top = CreateNewTop(reader);
-                    if (top != null)
-                    {
-                        topQueue.Enqueue(top);
-                        itemEnqueued.Set();
-                    }
-                    else
-                    {
-                        sourceIsEmpty = true;
-                        UpdateIsEmpty();
-                        return;
-                    }
-                }
-
-                itemDequeued.Reset();
-                itemDequeued.WaitOne(5000);
-            }
-        }
-
-        private void UpdateIsEmpty()
-        {
-            var allEmpty = sourceIsEmpty && topQueue.IsEmpty;
-            if (!IsEmpty && allEmpty)
-            {
-                File.Delete(bucketFile);
-                IsEmpty = true;
-            }
-        }
-
-        private EventBucketEntry? nextEntry = null;
-        private BucketTop? CreateNewTop(StreamReader reader)
-        {
-            if (nextEntry == null)
-            {
-                nextEntry = ReadEntry(reader);
-                if (nextEntry == null) return null;
-            }
-
-            var topEntry = nextEntry;
-            var entries = new List<EventBucketEntry>
-            {
-                topEntry
-            };
-
-            nextEntry = ReadEntry(reader);
-            while (nextEntry != null && nextEntry.Utc == topEntry.Utc)
-            {
-                entries.Add(nextEntry);
-                nextEntry = ReadEntry(reader);
-            }
-
-            return new BucketTop(topEntry.Utc, entries.Select(e => e.Event).ToArray());
-        }
-
-        private EventBucketEntry? ReadEntry(StreamReader reader)
-        {
-            var line = reader.ReadLine();
-            if (string.IsNullOrEmpty(line)) return null;
-            return JsonConvert.DeserializeObject<EventBucketEntry>(line);
-        }
-    }
-}

Framework/OverwatchTranscript/EventBucketWriter.cs

@@ -1,113 +0,0 @@
-using Logging;
-using Newtonsoft.Json;
-
-namespace OverwatchTranscript
-{
-    public class EventBucketWriter
-    {
-        private const int MaxBuffer = 1000;
-
-        private readonly object _lock = new object();
-        private bool closed = false;
-        private readonly ILog log;
-        private readonly string bucketFile;
-        private readonly int maxCount;
-        private readonly List<EventBucketEntry> buffer = new List<EventBucketEntry>();
-
-        public EventBucketWriter(ILog log, string bucketFile, int maxCount)
-        {
-            this.log = log;
-            this.bucketFile = bucketFile;
-            this.maxCount = maxCount;
-            if (File.Exists(bucketFile)) throw new Exception("Already exists");
-
-            log.Debug("Write Bucket open: " + bucketFile);
-        }
-
-        public int Count { get; private set; }
-        public bool IsFull { get; private set; }
-
-        public void Add(DateTime utc, object payload)
-        {
-            lock (_lock)
-            {
-                if (closed) throw new Exception("Already closed");
-                AddToBuffer(utc, payload);
-                BufferToFile(emptyBuffer: false);
-            }
-        }
-
-        public IFinalizedBucket FinalizeBucket()
-        {
-            lock (_lock)
-            {
-                closed = true;
-                BufferToFile(emptyBuffer: true);
-                SortFileByTimestamps();
-            }
-            log.Debug($"Finalized bucket with {Count} entries");
-            return new EventBucketReader(log, bucketFile);
-        }
-
-        public override string ToString()
-        {
-            return $"EventBucket: " + Count;
-        }
-
-        private void AddToBuffer(DateTime utc, object payload)
-        {  
-            var typeName = payload.GetType().FullName;
-            if (string.IsNullOrEmpty(typeName)) throw new Exception("Empty typename for payload");
-            if (utc == default) throw new Exception("DateTimeUtc not set");
-
-            var entry = new EventBucketEntry
-            {
-                Utc = utc,
-                Event = new OverwatchEvent
-                {
-                    Type = typeName,
-                    Payload = Json.Serialize(payload)
-                }
-            };
-
-            Count++;
-            IsFull = Count > maxCount;
-
-            buffer.Add(entry);
-        }
-
-        private void BufferToFile(bool emptyBuffer)
-        {
-            if (emptyBuffer || buffer.Count > MaxBuffer)
-            {
-                using var file = File.Open(bucketFile, FileMode.Append);
-                using var writer = new StreamWriter(file);
-                foreach (var entry in buffer)
-                {
-                    writer.WriteLine(Json.Serialize(entry));
-                }
-                log.Debug($"Bucket wrote {buffer.Count} entries to file.");
-                buffer.Clear();
-            }
-        }
-
-        private void SortFileByTimestamps()
-        {
-            var lines = File.ReadAllLines(bucketFile);
-            var entries = lines.Select(Json.Deserialize<EventBucketEntry>)
-                .Cast<EventBucketEntry>()
-                .OrderBy(e => e.Utc)
-                .ToArray();
-
-            File.Delete(bucketFile);
-            File.WriteAllLines(bucketFile, entries.Select(e => Json.Serialize(e)));
-        }
-    }
-
-    [Serializable]
-    public class EventBucketEntry
-    {
-        public DateTime Utc { get; set; }
-        public OverwatchEvent Event { get; set; } = new();
-    }
-}

Framework/OverwatchTranscript/Json.cs

@@ -1,27 +0,0 @@
-using Newtonsoft.Json;
-using System.Globalization;
-
-namespace OverwatchTranscript
-{
-    public static class Json
-    {
-        private static JsonSerializerSettings settings = new JsonSerializerSettings
-        {
-            Formatting = Formatting.None,
-            NullValueHandling = NullValueHandling.Ignore,
-            Culture = CultureInfo.InvariantCulture,
-            DateFormatHandling = DateFormatHandling.IsoDateFormat,
-            FloatFormatHandling = FloatFormatHandling.Symbol
-        };
-
-        public static string Serialize(object obj, Formatting formatting = Formatting.None)
-        {
-            return JsonConvert.SerializeObject(obj, formatting, settings);
-        }
-
-        public static T Deserialize<T>(string json)
-        {
-            return JsonConvert.DeserializeObject<T>(json)!;
-        }
-    }
-}

Framework/OverwatchTranscript/Model.cs

@@ -1,56 +0,0 @@
-namespace OverwatchTranscript
-{
-    [Serializable]
-    public class OverwatchTranscript
-    {
-        public OverwatchHeader Header { get; set; } = new();
-        public OverwatchMomentReference[] MomentReferences { get; set; } = Array.Empty<OverwatchMomentReference>();
-    }
-
-    [Serializable]
-    public class OverwatchMomentReference
-    {
-        public string MomentsFile { get; set; } = string.Empty;
-        public int NumberOfMoments { get; set; }
-        public int NumberOfEvents { get; set; }
-        public DateTime EarliestUtc { get; set; }
-        public DateTime LatestUtc { get; set; }
-    }
-
-    [Serializable]
-    public class OverwatchHeader
-    {
-        public OverwatchCommonHeader Common { get; set; } = new();
-        public OverwatchHeaderEntry[] Entries { get; set; } = Array.Empty<OverwatchHeaderEntry>();
-    }
-
-    [Serializable]
-    public class OverwatchCommonHeader
-    {
-        public long NumberOfMoments { get; set; }
-        public long NumberOfEvents { get; set; }
-        public DateTime EarliestUtc { get; set; }
-        public DateTime LatestUtc { get; set; }
-    }
-
-    [Serializable]
-    public class OverwatchHeaderEntry
-    {
-        public string Key { get; set; } = string.Empty;
-        public string Value { get; set; } = string.Empty;
-    }
-
-    [Serializable]
-    public class OverwatchMoment
-    {
-        public DateTime Utc { get; set; }
-        public OverwatchEvent[] Events { get; set; } = Array.Empty<OverwatchEvent>();
-    }
-
-    [Serializable]
-    public class OverwatchEvent
-    {
-        public string Type { get; set; } = string.Empty;
-        public string Payload { get; set; } = string.Empty;
-    }
-}

Framework/OverwatchTranscript/MomentReader.cs

@@ -1,104 +0,0 @@
-using Newtonsoft.Json;
-
-namespace OverwatchTranscript
-{
-    public class MomentReader
-    {
-        private readonly OverwatchTranscript model;
-        private readonly string workingDir;
-        private int referenceIndex = 0;
-        private int momentsRead = 0;
-        private OpenReference currentRef;
-
-        public MomentReader(OverwatchTranscript model, string workingDir)
-        {
-            this.model = model;
-            this.workingDir = workingDir;
-
-            currentRef = CreateOpenReference();
-        }
-
-        public OverwatchMoment? Next()
-        {
-            if (referenceIndex >= model.MomentReferences.Length) return null;
-
-            var moment = currentRef.ReadNext();
-            if (moment == null)
-            {
-                Close();
-
-                // This reference file ran out.
-                // The number of moments read should match exactly the number of moments
-                // describe in the reference. If not, error:
-                var expected = model.MomentReferences[referenceIndex].NumberOfMoments;
-                if (momentsRead != expected)
-                {
-                    throw new Exception("Number of moments read from referenced file does not match number of moments value in model. " +
-                        $"Reads: { momentsRead} - model.MomentReferences[{referenceIndex}].NumberOfMoment: {expected}"); 
-                }
-
-                referenceIndex++;
-                if (referenceIndex < model.MomentReferences.Length)
-                {
-                    // Proceed to next reference file.
-                    currentRef = CreateOpenReference();
-                    momentsRead = 0;
-                    return Next();
-                }
-                else
-                {
-                    // That was the last one.
-                    return null;
-                }
-            }
-            else
-            {
-                momentsRead++;
-                return moment;
-            }
-        }
-
-        public void Close()
-        {
-            if (currentRef != null)
-            {
-                currentRef.Close();
-                currentRef = null!;
-            }
-        }
-
-        private OpenReference CreateOpenReference()
-        {
-            var filepath = Path.Combine(workingDir, model.MomentReferences[referenceIndex].MomentsFile);
-            return new OpenReference(filepath);
-        }
-
-        private class OpenReference
-        {
-            private readonly FileStream file;
-            private readonly StreamReader reader;
-
-            public OpenReference(string filePath)
-            {
-                file = File.OpenRead(filePath);
-                reader = new StreamReader(file);
-            }
-
-            public OverwatchMoment? ReadNext()
-            {
-                var line = reader.ReadLine();
-                if (string.IsNullOrEmpty(line)) return null;
-                return JsonConvert.DeserializeObject<OverwatchMoment>(line);
-            }
-
-            public void Close()
-            {
-                reader.Close();
-                file.Close();
-
-                reader.Dispose();
-                file.Dispose();
-            }
-        }
-    }
-}

Framework/OverwatchTranscript/MomentReferenceBuilder.cs

@@ -1,153 +0,0 @@
-using Logging;
-using Newtonsoft.Json;
-
-namespace OverwatchTranscript
-{
-    public class MomentReferenceBuilder
-    {
-        private const int MaxMomentsPerReference = 10000;
-        private readonly ILog log;
-        private readonly string workingDir;
-
-        public MomentReferenceBuilder(ILog log, string workingDir)
-        {
-            this.log = log;
-            this.workingDir = workingDir;
-        }
-
-        public OverwatchMomentReference[] Build(IFinalizedBucket[] finalizedBuckets)
-        {
-            var result = new List<OverwatchMomentReference>();
-            var currentBuilder = new Builder(log, workingDir);
-
-            var buckets = finalizedBuckets.ToList();
-            log.Debug($"Building references for {buckets.Count} buckets.");
-            while (buckets.Any())
-            {
-                foreach (var b in buckets) b.Update();
-
-                buckets.RemoveAll(b => b.IsEmpty);
-                if (!buckets.Any()) break;
-
-                var earliestUtc = GetEarliestUtc(buckets);
-                if (earliestUtc == null) continue;
-                
-                var tops = CollectAllTopsForUtc(earliestUtc.Value, buckets);
-                var moment = ConvertTopsToMoment(tops);
-                currentBuilder.Add(moment);
-                if (currentBuilder.NumberOfMoments == MaxMomentsPerReference)
-                {
-                    result.Add(currentBuilder.Build());
-                    currentBuilder = new Builder(log, workingDir);
-                }
-            }
-
-            if (currentBuilder.NumberOfMoments > 0)
-            {
-                result.Add(currentBuilder.Build());
-            }
-
-            return result.ToArray();
-        }
-
-        private OverwatchMoment ConvertTopsToMoment(List<BucketTop> tops)
-        {
-            var discintUtc = tops.Select(e => e.Utc).Distinct().ToArray();
-            if (discintUtc.Length != 1) throw new Exception("UTC mixing in moment construction.");
-
-            return new OverwatchMoment
-            {
-                Utc = tops[0].Utc,
-                Events = tops.SelectMany(e => e.Events).ToArray()
-            };
-        }
-
-        private List<BucketTop> CollectAllTopsForUtc(DateTime earliestUtc, List<IFinalizedBucket> buckets)
-        {
-            var result = new List<BucketTop>();
-
-            foreach (var bucket in buckets)
-            {
-                if (bucket.IsEmpty) continue;
-
-                var utc = bucket.SeeTopUtc();
-                if (utc == null) continue;
-
-                if (utc.Value == earliestUtc)
-                {
-                    var top = bucket.TakeTop();
-                    if (top == null) throw new Exception("top was null after top utc was not");
-                    result.Add(top);
-                }
-            }
-
-            return result;
-        }
-
-        private DateTime? GetEarliestUtc(List<IFinalizedBucket> buckets)
-        {
-            var earliest = DateTime.MaxValue;
-            foreach (var bucket in buckets)
-            {
-                var utc = bucket.SeeTopUtc();
-                if (utc == null) return null;
-
-                if (utc.Value < earliest) earliest = utc.Value;
-            }
-            return earliest;
-        }
-
-        public class Builder
-        {
-            private readonly ILog log;
-            private readonly string workingDir;
-            private OverwatchMomentReference reference;
-            private readonly ActionQueue queue = new ActionQueue();
-
-            public Builder(ILog log, string workingDir)
-            {
-                reference = new OverwatchMomentReference
-                {
-                    MomentsFile = Guid.NewGuid().ToString(),
-                    EarliestUtc = DateTime.MaxValue,
-                    LatestUtc = DateTime.MinValue,
-                    NumberOfEvents = 0,
-                    NumberOfMoments = 0,
-                };
-                this.log = log;
-                this.workingDir = workingDir;
-                queue.Start();
-            }
-
-            public int NumberOfMoments => reference.NumberOfMoments;
-
-            public void Add(OverwatchMoment moment)
-            {
-                if (moment.Utc < reference.EarliestUtc) reference.EarliestUtc = moment.Utc;
-                if (moment.Utc > reference.LatestUtc) reference.LatestUtc = moment.Utc;
-                reference.NumberOfMoments++;
-                reference.NumberOfEvents += moment.Events.Length;
-
-                var filePath = Path.Combine(workingDir, reference.MomentsFile);
-
-                queue.Add(() =>
-                {
-                    File.AppendAllLines(filePath, new[]
-                    {
-                        Json.Serialize(moment)
-                    });
-                });
-            }
-
-            public OverwatchMomentReference Build()
-            {
-                queue.StopAndJoin();
-
-                log.Debug($"Created reference with {reference.NumberOfMoments} moments and {reference.NumberOfEvents} events...");
-                var result = reference;
-                reference = null!;
-                return result;
-            }
-        }
-    }
-}

Framework/OverwatchTranscript/OverwatchTranscript.csproj

@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Logging\Logging.csproj" />
-  </ItemGroup>
-
-</Project>

Framework/OverwatchTranscript/Transcript.cs

@@ -1,23 +0,0 @@
-using Logging;
-
-namespace OverwatchTranscript
-{
-    public static class Transcript
-    {
-        public static ITranscriptWriter NewWriter(ILog log)
-        {
-            log = new LogPrefixer(log, "(TranscriptWriter) ");
-            return new TranscriptWriter(log, NewWorkDir());
-        }
-
-        public static ITranscriptReader NewReader(string transcriptFile)
-        {
-            return new TranscriptReader(NewWorkDir(), transcriptFile);
-        }
-
-        private static string NewWorkDir()
-        {
-            return Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
-        }
-    }
-}

Framework/OverwatchTranscript/TranscriptConstants.cs

@@ -1,8 +0,0 @@
-namespace OverwatchTranscript
-{
-    public static class TranscriptConstants
-    {
-        public const string TranscriptFilename = "transcript.json";
-        public const string ArtifactFolderName = "artifacts";
-    }
-}

Framework/OverwatchTranscript/TranscriptReader.cs

@@ -1,264 +0,0 @@
-using Newtonsoft.Json;
-using System.IO;
-using System;
-using System.IO.Compression;
-using System.Linq;
-using System.Collections.Generic;
-using System.Collections.Concurrent;
-
-namespace OverwatchTranscript
-{
-    public interface ITranscriptReader
-    {
-        OverwatchCommonHeader Header { get; }
-        T GetHeader<T>(string key);
-        void AddMomentHandler(Action<ActivateMoment> handler);
-        void AddEventHandler<T>(Action<ActivateEvent<T>> handler);
-        bool Next();
-        void Close();
-    }
-
-    public class TranscriptReader : ITranscriptReader
-    {
-        private readonly object handlersLock = new object();
-        private readonly string transcriptFile;
-        private readonly string artifactsFolder;
-        private readonly List<Action<ActivateMoment>> momentHandlers = new List<Action<ActivateMoment>>();
-        private readonly Dictionary<string, List<Action<ActivateMoment, string>>> eventHandlers = new Dictionary<string, List<Action<ActivateMoment, string>>>();
-        private readonly string workingDir;
-        private readonly OverwatchTranscript model;
-        private bool closed;
-        private long momentCounter;
-        private readonly ConcurrentQueue<OverwatchMoment> queue = new ConcurrentQueue<OverwatchMoment>();
-        private readonly Task queueFiller;
-
-        public TranscriptReader(string workingDir, string inputFilename)
-        {
-            closed = false;
-            this.workingDir = workingDir;
-            transcriptFile = Path.Combine(workingDir, TranscriptConstants.TranscriptFilename);
-            artifactsFolder = Path.Combine(workingDir, TranscriptConstants.ArtifactFolderName);
-
-            if (!Directory.Exists(workingDir)) Directory.CreateDirectory(workingDir);
-            if (File.Exists(transcriptFile) || Directory.Exists(artifactsFolder)) throw new Exception("workingdir not clean");
-
-            model = LoadModel(inputFilename);
-
-            queueFiller = Task.Run(() => FillQueue(model, workingDir));
-        }
-
-        public OverwatchCommonHeader Header
-        {
-            get
-            {
-                CheckClosed();
-                return model.Header.Common;
-            }
-        }
-
-        public T GetHeader<T>(string key)
-        {
-            CheckClosed();
-            var value = model.Header.Entries.First(e => e.Key == key).Value;
-            return JsonConvert.DeserializeObject<T>(value)!;
-        }
-
-        public void AddMomentHandler(Action<ActivateMoment> handler)
-        {
-            CheckClosed();
-            lock (handlersLock)
-            {
-                momentHandlers.Add(handler);
-            }
-        }
-
-        public void AddEventHandler<T>(Action<ActivateEvent<T>> handler)
-        {
-            CheckClosed();
-
-            var typeName = typeof(T).FullName;
-            if (string.IsNullOrEmpty(typeName)) throw new Exception("Empty typename for payload");
-
-            lock (handlersLock)
-            {
-                if (eventHandlers.ContainsKey(typeName))
-                {
-                    eventHandlers[typeName].Add(CreateEventAction(handler));
-                }
-                else
-                {
-                    eventHandlers.Add(typeName, new List<Action<ActivateMoment, string>>
-                    {
-                        CreateEventAction(handler)
-                    });
-                }
-            }
-        }
-
-        private readonly object nextLock = new object();
-        private OverwatchMoment? moment = null;
-        private OverwatchMoment? next = null;
-
-        public bool Next()
-        {
-            CheckClosed();
-
-            OverwatchMoment? m = null;
-            TimeSpan? duration = null;
-            lock (nextLock)
-            {
-                if (next == null)
-                {
-                    if (!queue.TryDequeue(out moment)) return false;
-                    queue.TryDequeue(out next);
-                }
-                else
-                {
-                    moment = next;
-                    next = null;
-                    queue.TryDequeue(out next);
-                }
-
-                m = moment;
-                duration = GetMomentDuration();
-            }
-
-            ActivateMoment(moment, duration);
-
-            return true;
-        }
-
-        public void Close()
-        {
-            CheckClosed();
-            closed = true;
-
-            queueFiller.Wait();
-
-            Directory.Delete(workingDir, true);
-        }
-
-        private Action<ActivateMoment, string> CreateEventAction<T>(Action<ActivateEvent<T>> handler)
-        {
-            return (m, s) =>
-            {
-                handler(new ActivateEvent<T>(m, JsonConvert.DeserializeObject<T>(s)!));
-            };
-        }
-
-        private void FillQueue(OverwatchTranscript model, string workingDir)
-        {
-            var reader = new MomentReader(model, workingDir);
-
-            while (true)
-            {
-                if (closed)
-                {
-                    reader.Close();
-                    return;
-                }
-
-                while (queue.Count < 10)
-                {
-                    var moment = reader.Next();
-                    if (moment == null)
-                    {
-                        reader.Close();
-                        return;
-                    }
-                    queue.Enqueue(moment);
-                }
-
-                Thread.Sleep(1);
-            }
-        }
-
-        private TimeSpan? GetMomentDuration()
-        {
-            if (moment == null) return null;
-            if (next == null) return null;
-
-            return next.Utc - moment.Utc;
-        }
-
-        private void ActivateMoment(OverwatchMoment moment, TimeSpan? duration)
-        {
-            var m = new ActivateMoment(moment.Utc, duration, momentCounter);
-
-            lock (handlersLock)
-            {
-                ActivateMomentHandlers(m);
-
-                foreach (var @event in moment.Events)
-                {
-                    ActivateEventHandlers(m, @event);
-                }
-            }
-
-            momentCounter++;
-        }
-
-        private void ActivateMomentHandlers(ActivateMoment m)
-        {
-            foreach (var handler in momentHandlers)
-            {
-                handler(m);
-            }
-        }
-
-        private void ActivateEventHandlers(ActivateMoment m, OverwatchEvent @event)
-        {
-            if (!eventHandlers.ContainsKey(@event.Type)) return;
-            var handlers = eventHandlers[@event.Type];
-
-            foreach (var handler in handlers)
-            {
-                handler(m, @event.Payload);
-            }
-        }
-
-        private OverwatchTranscript LoadModel(string inputFilename)
-        {
-            ZipFile.ExtractToDirectory(inputFilename, workingDir);
-
-            if (!File.Exists(transcriptFile))
-            {
-                closed = true;
-                throw new Exception("Is not a transcript file. Unzipped to: " + workingDir);
-            }
-
-            return JsonConvert.DeserializeObject<OverwatchTranscript>(File.ReadAllText(transcriptFile))!;
-        }
-
-        private void CheckClosed()
-        {
-            if (closed) throw new Exception("Transcript has already been closed.");
-        }
-    }
-
-    public class ActivateMoment
-    {
-        public ActivateMoment(DateTime utc, TimeSpan? duration, long index)
-        {
-            Utc = utc;
-            Duration = duration;
-            Index = index;
-        }
-
-        public DateTime Utc { get; }
-        public TimeSpan? Duration { get; }
-        public long Index { get; }
-    }
-
-    public class ActivateEvent<T>
-    {
-        public ActivateEvent(ActivateMoment moment, T payload)
-        {
-            Moment = moment;
-            Payload = payload;
-        }
-
-        public ActivateMoment Moment { get; }
-        public T Payload { get; }
-    }
-}

Framework/OverwatchTranscript/TranscriptWriter.cs

@@ -1,130 +0,0 @@
-using Logging;
-using Newtonsoft.Json;
-using System.IO.Compression;
-
-namespace OverwatchTranscript
-{
-    public interface ITranscriptWriter
-    {
-        void AddHeader(string key, object value);
-        void Add(DateTime utc, object payload);
-        void IncludeArtifact(string filePath);
-        void Write(string outputFilename);
-    }
-
-    public class TranscriptWriter : ITranscriptWriter
-    {
-        private readonly object _lock = new object();
-        private readonly MomentReferenceBuilder builder;
-        private readonly string transcriptFile;
-        private readonly string artifactsFolder;
-        private readonly Dictionary<string, string> header = new Dictionary<string, string>();
-        private readonly BucketSet bucketSet;
-        private readonly ILog log;
-        private readonly string workingDir;
-        private bool closed;
-
-        public TranscriptWriter(ILog log, string workingDir)
-        {
-            closed = false;
-            this.log = log;
-            this.workingDir = workingDir;
-            bucketSet = new BucketSet(log, workingDir);
-            builder = new MomentReferenceBuilder(log, workingDir);
-            transcriptFile = Path.Combine(workingDir, TranscriptConstants.TranscriptFilename);
-            artifactsFolder = Path.Combine(workingDir, TranscriptConstants.ArtifactFolderName);
-
-            if (!Directory.Exists(workingDir)) Directory.CreateDirectory(workingDir);
-            if (File.Exists(transcriptFile) || Directory.Exists(artifactsFolder)) throw new Exception("workingdir not clean");
-        }
-
-        public void Add(DateTime utc, object payload)
-        {
-            CheckClosed();
-            bucketSet.Add(utc, payload);
-        }
-
-        public void AddHeader(string key, object value)
-        {
-            CheckClosed();
-            lock (_lock)
-            {
-                header.Add(key, Json.Serialize(value));
-            }
-        }
-
-        public void IncludeArtifact(string filePath)
-        {
-            CheckClosed();
-            if (!File.Exists(filePath)) throw new Exception("File not found: " + filePath);
-            if (!Directory.Exists(artifactsFolder)) Directory.CreateDirectory(artifactsFolder);
-            var name = Path.GetFileName(filePath);
-            File.Copy(filePath, Path.Combine(artifactsFolder, name), overwrite: false);
-        }
-
-        public void Write(string outputFilename)
-        {
-            CheckClosed();
-            closed = true;
-
-            var momentReferences = builder.Build(bucketSet.FinalizeBuckets());
-            var model = CreateModel(momentReferences);
-
-            File.WriteAllText(transcriptFile, Json.Serialize(model, Formatting.Indented));
-
-            ZipFile.CreateFromDirectory(workingDir, outputFilename);
-            log.Debug($"Transcript written to {outputFilename}");
-            log.Debug($"Common header: {Json.Serialize(model.Header.Common, Formatting.Indented)}");
-
-            Directory.Delete(workingDir, true);
-            log.Debug($"Workdir {workingDir} deleted");
-        }
-
-        private OverwatchTranscript CreateModel(OverwatchMomentReference[] momentReferences)
-        {
-            lock (_lock)
-            {
-                var model = new OverwatchTranscript
-                {
-                    Header = new OverwatchHeader
-                    {
-                        Common = CreateCommonHeader(momentReferences),
-                        Entries = header.Select(h =>
-                        {
-                            return new OverwatchHeaderEntry
-                            {
-                                Key = h.Key,
-                                Value = h.Value
-                            };
-                        }).ToArray()
-                    },
-                    MomentReferences = momentReferences
-                };
-
-                header.Clear();
-                return model;
-            }
-        }
-
-        private OverwatchCommonHeader CreateCommonHeader(OverwatchMomentReference[] momentReferences)
-        {
-            var moments = momentReferences.Sum(m => m.NumberOfMoments);
-            var events = momentReferences.Sum(m => m.NumberOfEvents);
-            var earliest = momentReferences.Min(m => m.EarliestUtc);
-            var latest = momentReferences.Max(m => m.LatestUtc);
-
-            return new OverwatchCommonHeader
-            {
-                NumberOfMoments = moments,
-                NumberOfEvents = events,
-                EarliestUtc = earliest,
-                LatestUtc = latest
-            };
-        }
-
-        private void CheckClosed()
-        {
-            if (closed) throw new Exception("Transcript has already been written. Cannot modify or write again.");
-        }
-    }
-}

Framework/Utils/BlockInterval.cs

@@ -2,7 +2,7 @@
 {
     public class BlockInterval
     {
-        public BlockInterval(TimeRange timeRange, ulong from, ulong to)
+        public BlockInterval(ulong from, ulong to)
         {
             if (from < to)
             {
@@ -14,13 +14,10 @@
                 From = to;
                 To = from;
             }
-            TimeRange = timeRange;
         }
 
         public ulong From { get; }
         public ulong To { get; }
-        public TimeRange TimeRange { get; }
-        public ulong NumberOfBlocks => To - From;
 
         public override string ToString()
         {

Framework/Utils/ByteSize.cs

@@ -13,6 +13,7 @@
 
         public long SizeInBytes { get; }
 
+
         public long ToMB()
         {
             return SizeInBytes / (1024 * 1024);

Framework/Utils/Formatter.cs

@@ -1,6 +1,4 @@
-using System.Globalization;
-
-namespace Utils
+namespace Utils
 {
     public static class Formatter
     {
@@ -12,7 +10,7 @@ namespace Utils
 
             var sizeOrder = Convert.ToInt32(Math.Floor(Math.Log(bytes, 1024)));
             var digit = Math.Round(bytes / Math.Pow(1024, sizeOrder), 1);
-            return digit.ToString(CultureInfo.InvariantCulture) + sizeSuffixes[sizeOrder];
+            return digit.ToString() + sizeSuffixes[sizeOrder];
         }
     }
 }

Framework/Utils/NumberSource.cs

@@ -2,7 +2,6 @@
 {
     public class NumberSource
     {
-        private readonly object @lock = new object();
         private int number;
 
         public NumberSource(int start)
@@ -12,12 +11,8 @@
 
         public int GetNextNumber()
         {
-            var n = -1;
-            lock (@lock)
-            {
-                n = number;
-                number++;
-            }
+            var n = number;
+            number++;
             return n;
         }
     }

Framework/Utils/PluginPathUtils.cs

@@ -1,41 +0,0 @@
-namespace Utils
-{
-    public static class PluginPathUtils
-    {
-        private const string ProjectPluginsFolderName = "ProjectPlugins";
-        private static string projectPluginsDir = string.Empty;
-
-        public static string ProjectPluginsDir
-        {
-            get
-            {
-                if (string.IsNullOrEmpty(projectPluginsDir)) projectPluginsDir = FindProjectPluginsDir();
-                return projectPluginsDir;
-            }
-        }
-
-        private static string FindProjectPluginsDir()
-        {
-            var current = Directory.GetCurrentDirectory();
-            while (true)
-            {
-                var localFolders = Directory.GetDirectories(current);
-                var projectPluginsFolders = localFolders.Where(l => l.EndsWith(ProjectPluginsFolderName)).ToArray();
-                if (projectPluginsFolders.Length == 1)
-                {
-                    return projectPluginsFolders.Single();
-                }
-
-                var parent = Directory.GetParent(current);
-                if (parent == null)
-                {
-                    var msg = $"Unable to locate '{ProjectPluginsFolderName}' folder. Travelled up from: '{Directory.GetCurrentDirectory()}'";
-                    Console.WriteLine(msg);
-                    throw new Exception(msg);
-                }
-
-                current = parent.FullName;
-            }
-        }
-    }
-}

Framework/Utils/RandomUtils.cs

@@ -3,41 +3,13 @@
     public static class RandomUtils
     {
         private static readonly Random random = new Random();
-        private static readonly object @lock = new object();
-
-        public static T GetOneRandom<T>(this T[] items)
-        {
-            lock (@lock)
-            {
-                var i = random.Next(0, items.Length);
-                var result = items[i];
-                return result;
-            }
-        }
 
         public static T PickOneRandom<T>(this List<T> remainingItems)
         {
-            lock (@lock)
-            {
-                var i = random.Next(0, remainingItems.Count);
-                var result = remainingItems[i];
-                remainingItems.RemoveAt(i);
-                return result;
-            }
-        }
-
-        public static T[] Shuffled<T>(T[] items)
-        {
-            lock (@lock)
-            {
-                var result = new List<T>();
-                var source = items.ToList();
-                while (source.Any())
-                {
-                    result.Add(RandomUtils.PickOneRandom(source));
-                }
-                return result.ToArray();
-            }
+            var i = random.Next(0, remainingItems.Count);
+            var result = remainingItems[i];
+            remainingItems.RemoveAt(i);
+            return result;
         }
     }
 }

Framework/Utils/Retry.cs

@@ -1,135 +0,0 @@
-namespace Utils
-{
-    public class Retry
-    {
-        private readonly string description;
-        private readonly TimeSpan maxTimeout;
-        private readonly TimeSpan sleepAfterFail;
-        private readonly Action<Failure> onFail;
-
-        public Retry(string description, TimeSpan maxTimeout, TimeSpan sleepAfterFail, Action<Failure> onFail)
-        {
-            this.description = description;
-            this.maxTimeout = maxTimeout;
-            this.sleepAfterFail = sleepAfterFail;
-            this.onFail = onFail;
-        }
-
-        public void Run(Action task)
-        {
-            var run = new RetryRun(description, task, maxTimeout, sleepAfterFail, onFail);
-            run.Run();
-        }
-
-        public T Run<T>(Func<T> task)
-        {
-            T? result = default;
-
-            var run = new RetryRun(description, () =>
-            {
-                result = task();
-            }, maxTimeout, sleepAfterFail, onFail);
-            run.Run();
-
-            return result!;
-        }
-
-        private class RetryRun
-        {
-            private readonly string description;
-            private readonly Action task;
-            private readonly TimeSpan maxTimeout;
-            private readonly TimeSpan sleepAfterFail;
-            private readonly Action<Failure> onFail;
-            private readonly DateTime start = DateTime.UtcNow;
-            private readonly List<Failure> failures = new List<Failure>();
-            private int tryNumber;
-            private DateTime tryStart;
-
-            public RetryRun(string description, Action task, TimeSpan maxTimeout, TimeSpan sleepAfterFail, Action<Failure> onFail)
-            {
-                this.description = description;
-                this.task = task;
-                this.maxTimeout = maxTimeout;
-                this.sleepAfterFail = sleepAfterFail;
-                this.onFail = onFail;
-
-                tryNumber = 0;
-                tryStart = DateTime.UtcNow;
-            }
-
-            public void Run()
-            {
-                while (true)
-                {
-                    CheckMaximums();
-
-                    tryNumber++;
-                    tryStart = DateTime.UtcNow;
-                    try
-                    {
-                        task();
-                        return;
-                    }
-                    catch (OperationCanceledException)
-                    {
-                        return;
-                    }
-                    catch (Exception ex)
-                    {
-                        var failure = CaptureFailure(ex);
-                        onFail(failure);
-                        Time.Sleep(sleepAfterFail);
-                    }
-                }
-            }
-
-            private Failure CaptureFailure(Exception ex)
-            {
-                var f = new Failure(ex, DateTime.UtcNow - tryStart, tryNumber);
-                failures.Add(f);
-                return f;
-            }
-
-            private void CheckMaximums()
-            {
-                if (Duration() > maxTimeout) Fail();
-            }
-
-            private void Fail()
-            {
-                throw new TimeoutException($"Retry '{description}' timed out after {tryNumber} tries over {Time.FormatDuration(Duration())}: {GetFailureReport}",
-                        new AggregateException(failures.Select(f => f.Exception)));
-            }
-
-            private string GetFailureReport()
-            {
-                return Environment.NewLine + string.Join(Environment.NewLine, failures.Select(f => f.Describe()));
-            }
-
-            private TimeSpan Duration()
-            {
-                return DateTime.UtcNow - start;
-            }
-        }
-    }
-
-    public class Failure
-    {
-        public Failure(Exception exception, TimeSpan duration, int tryNumber)
-        {
-            Exception = exception;
-            Duration = duration;
-            TryNumber = tryNumber;
-        }
-
-        public Exception Exception { get; }
-        public TimeSpan Duration { get; }
-        public int TryNumber { get; }
-
-        public string Describe()
-        {
-            return $"Try {TryNumber} failed after {Time.FormatDuration(Duration)} with exception '{Exception}'";
-        }
-    }
-}

Framework/Utils/RollingAverage.cs

@@ -1,28 +0,0 @@
-namespace Utils
-{
-    public static class RollingAverage
-    {
-        /// <param name="currentAverage">Value of average before new value is added.</param>
-        /// <param name="newNumberOfValues">Number of values in average after new value is added.</param>
-        /// <param name="newValue">New value to be added.</param>
-        /// <returns>New average value.</returns>
-        /// <exception cref="Exception">newNumberOfValues must be 1 or greater.</exception>
-        public static float GetNewAverage(float currentAverage, int newNumberOfValues, float newValue)
-        {
-            if (newNumberOfValues < 1) throw new Exception("Should be at least 1 value.");
-
-            float n = newNumberOfValues;
-            var originalValue = currentAverage;
-            var originalValueWeight = ((n - 1.0f) / n);
-            var newValueWeight = (1.0f / n);
-            return GetWeightedAverage(originalValue, originalValueWeight, newValue, newValueWeight);
-        }
-
-        public static float GetWeightedAverage(float value1, float weight1, float value2, float weight2)
-        {
-            float totalWeight = weight1 + weight2;
-            if (totalWeight == 0.0f) return 0.0f;
-            return ((value1 * weight1) + (value2 * weight2)) / totalWeight;
-        }
-    }
-}

Framework/Utils/Str.cs

@@ -1,13 +0,0 @@
-namespace Utils
-{
-    public static class Str
-    {
-        public static string Between(string input, string open, string close)
-        {
-            var openIndex = input.IndexOf(open) + open.Length;
-            var closeIndex = input.LastIndexOf(close);
-
-            return input.Substring(openIndex, closeIndex - openIndex);
-        }
-    }
-}

Framework/Utils/Time.cs

@@ -18,12 +18,6 @@
             task.Wait();
         }
 
-        public static string FormatDuration(TimeSpan? d)
-        {
-            if (d == null) return "[NULL]";
-            return FormatDuration(d.Value);
-        }
-
         public static string FormatDuration(TimeSpan d)
         {
             var result = "";
@@ -63,70 +57,100 @@
             return result;
         }
 
-        public static void WaitUntil(Func<bool> predicate, string msg)
+        public static void WaitUntil(Func<bool> predicate)
         {
-            WaitUntil(predicate, TimeSpan.FromMinutes(1), TimeSpan.FromSeconds(1), msg);
+            WaitUntil(predicate, TimeSpan.FromMinutes(1), TimeSpan.FromSeconds(1));
         }
 
-        public static void WaitUntil(Func<bool> predicate, TimeSpan timeout, TimeSpan retryDelay, string msg)
+        public static void WaitUntil(Func<bool> predicate, TimeSpan timeout, TimeSpan retryDelay)
         {
             var start = DateTime.UtcNow;
-            var tries = 1;
             var state = predicate();
             while (!state)
             {
-                var duration = DateTime.UtcNow - start;
-                if (duration > timeout)
+                if (DateTime.UtcNow - start > timeout)
                 {
-                    throw new TimeoutException($"Operation timed out after {tries} tries over (total) {FormatDuration(duration)}. '{msg}'");
+                    throw new TimeoutException("Operation timed out.");
                 }
 
                 Sleep(retryDelay);
                 state = predicate();
-                tries++;
             }
         }
 
         public static void Retry(Action action, string description)
         {
-            Retry(action, TimeSpan.FromSeconds(30), description);
+            Retry(action, 1, description);
         }
 
         public static T Retry<T>(Func<T> action, string description)
         {
-            return Retry(action, TimeSpan.FromSeconds(30), description);
+            return Retry(action, 1, description);
         }
 
-        public static void Retry(Action action, TimeSpan maxTimeout, string description)
+        public static void Retry(Action action, int maxRetries, string description)
         {
-            Retry(action, maxTimeout, TimeSpan.FromSeconds(5), description);
+            Retry(action, maxRetries, TimeSpan.FromSeconds(5), description);
         }
 
-        public static T Retry<T>(Func<T> action, TimeSpan maxTimeout, string description)
+        public static T Retry<T>(Func<T> action, int maxRetries, string description)
         {
-            return Retry(action, maxTimeout, TimeSpan.FromSeconds(5), description);
+            return Retry(action, maxRetries, TimeSpan.FromSeconds(5), description);
         }
 
-        public static void Retry(Action action, TimeSpan maxTimeout, TimeSpan retryTime, string description)
+        public static void Retry(Action action, int maxRetries, TimeSpan retryTime, string description)
         {
-            Retry(action, maxTimeout, retryTime, description, f => { });
+            var start = DateTime.UtcNow;
+            var retries = 0;
+            var exceptions = new List<Exception>();
+            while (true)
+            {
+                if (retries > maxRetries)
+                {
+                    var duration = DateTime.UtcNow - start;
+                    throw new TimeoutException($"Retry '{description}' timed out after {maxRetries} tries over {Time.FormatDuration(duration)}.", new AggregateException(exceptions));
+                }
+
+                try
+                {
+                    action();
+                    return;
+                }
+                catch (Exception ex)
+                {
+                    exceptions.Add(ex);
+                    retries++;
+                }
+
+                Sleep(retryTime);
+            }
         }
 
-        public static T Retry<T>(Func<T> action, TimeSpan maxTimeout, TimeSpan retryTime, string description)
+        public static T Retry<T>(Func<T> action, int maxRetries, TimeSpan retryTime, string description)
         {
-            return Retry(action, maxTimeout, retryTime, description, f => { });
-        }
+            var start = DateTime.UtcNow;
+            var retries = 0;
+            var exceptions = new List<Exception>();
+            while (true)
+            {
+                if (retries > maxRetries)
+                {
+                    var duration = DateTime.UtcNow - start;
+                    throw new TimeoutException($"Retry '{description}' timed out after {maxRetries} tries over {Time.FormatDuration(duration)}.", new AggregateException(exceptions));
+                }
 
-        public static void Retry(Action action, TimeSpan maxTimeout, TimeSpan retryTime, string description, Action<Failure> onFail)
-        {
-            var r = new Retry(description, maxTimeout, retryTime, onFail);
-            r.Run(action);
-        }
+                try
+                {
+                    return action();
+                }
+                catch (Exception ex)
+                {
+                    exceptions.Add(ex);
+                    retries++;
+                }
 
-        public static T Retry<T>(Func<T> action, TimeSpan maxTimeout, TimeSpan retryTime, string description, Action<Failure> onFail)
-        {
-            var r = new Retry(description, maxTimeout, retryTime, onFail);
-            return r.Run(action);
+                Sleep(retryTime);
+            }
         }
     }
 }

Framework/Utils/Utils.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 	  <RootNamespace>Utils</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

ProjectPlugins/CodexContractsPlugin/ChainMonitor/ChainEvents.cs

@@ -1,76 +0,0 @@
-using CodexContractsPlugin.Marketplace;
-using System.Collections.Generic;
-using Utils;
-
-namespace CodexContractsPlugin.ChainMonitor
-{
-    public class ChainEvents
-    {
-        private ChainEvents(
-            BlockInterval blockInterval,
-            Request[] requests,
-            RequestFulfilledEventDTO[] fulfilled,
-            RequestCancelledEventDTO[] cancelled,
-            RequestFailedEventDTO[] failed,
-            SlotFilledEventDTO[] slotFilled,
-            SlotFreedEventDTO[] slotFreed,
-            SlotReservationsFullEventDTO[] slotReservationsFull
-            )
-        {
-            BlockInterval = blockInterval;
-            Requests = requests;
-            Fulfilled = fulfilled;
-            Cancelled = cancelled;
-            Failed = failed;
-            SlotFilled = slotFilled;
-            SlotFreed = slotFreed;
-            SlotReservationsFull = slotReservationsFull;
-
-            All = ConcatAll<IHasBlock>(requests, fulfilled, cancelled, failed, slotFilled, SlotFreed, SlotReservationsFull);
-        }
-
-        public BlockInterval BlockInterval { get; }
-        public Request[] Requests { get; }
-        public RequestFulfilledEventDTO[] Fulfilled { get; }
-        public RequestCancelledEventDTO[] Cancelled { get; }
-        public RequestFailedEventDTO[] Failed { get; }
-        public SlotFilledEventDTO[] SlotFilled { get; }
-        public SlotFreedEventDTO[] SlotFreed { get; }
-        public SlotReservationsFullEventDTO[] SlotReservationsFull { get; }
-        public IHasBlock[] All { get; }
-
-        public static ChainEvents FromBlockInterval(ICodexContracts contracts, BlockInterval blockInterval)
-        {
-            return FromContractEvents(contracts.GetEvents(blockInterval));
-        }
-
-        public static ChainEvents FromTimeRange(ICodexContracts contracts, TimeRange timeRange)
-        {
-            return FromContractEvents(contracts.GetEvents(timeRange));
-        }
-
-        public static ChainEvents FromContractEvents(ICodexContractsEvents events)
-        {
-            return new ChainEvents(
-                events.BlockInterval,
-                events.GetStorageRequests(),
-                events.GetRequestFulfilledEvents(),
-                events.GetRequestCancelledEvents(),
-                events.GetRequestFailedEvents(),
-                events.GetSlotFilledEvents(),
-                events.GetSlotFreedEvents(),
-                events.GetSlotReservationsFull()
-            );
-        }
-
-        private T[] ConcatAll<T>(params T[][] arrays)
-        {
-            var result = Array.Empty<T>();
-            foreach (var array in arrays)
-            {
-                result = result.Concat(array).ToArray();
-            }
-            return result;
-        }
-    }
-}

ProjectPlugins/CodexContractsPlugin/ChainMonitor/ChainState.cs

@@ -1,205 +0,0 @@
-using CodexContractsPlugin.Marketplace;
-using GethPlugin;
-using Logging;
-using NethereumWorkflow.BlockUtils;
-using System.Numerics;
-using Utils;
-
-namespace CodexContractsPlugin.ChainMonitor
-{
-    public interface IChainStateChangeHandler
-    {
-        void OnNewRequest(RequestEvent requestEvent);
-        void OnRequestFinished(RequestEvent requestEvent);
-        void OnRequestFulfilled(RequestEvent requestEvent);
-        void OnRequestCancelled(RequestEvent requestEvent);
-        void OnRequestFailed(RequestEvent requestEvent);
-        void OnSlotFilled(RequestEvent requestEvent, EthAddress host, BigInteger slotIndex);
-        void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex);
-        void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex);
-
-        void OnError(string msg);
-    }
-
-    public class RequestEvent
-    {
-        public RequestEvent(BlockTimeEntry block, IChainStateRequest request)
-        {
-            Block = block;
-            Request = request;
-        }
-
-        public BlockTimeEntry Block { get; }
-        public IChainStateRequest Request { get; }
-    }
-
-    public class ChainState
-    {
-        private readonly List<ChainStateRequest> requests = new List<ChainStateRequest>();
-        private readonly ILog log;
-        private readonly ICodexContracts contracts;
-        private readonly IChainStateChangeHandler handler;
-
-        public ChainState(ILog log, ICodexContracts contracts, IChainStateChangeHandler changeHandler, DateTime startUtc)
-        {
-            this.log = new LogPrefixer(log, "(ChainState) ");
-            this.contracts = contracts;
-            handler = changeHandler;
-            TotalSpan = new TimeRange(startUtc, startUtc);
-        }
-
-        public TimeRange TotalSpan { get; private set; }
-        public IChainStateRequest[] Requests => requests.ToArray();
-
-        public int Update()
-        {
-            return Update(DateTime.UtcNow);
-        }
-
-        public int Update(DateTime toUtc)
-        {
-            var span = new TimeRange(TotalSpan.To, toUtc);
-            var events = ChainEvents.FromTimeRange(contracts, span);
-            Apply(events);
-
-            TotalSpan = new TimeRange(TotalSpan.From, span.To);
-            return events.All.Length;
-        }
-
-        private void Apply(ChainEvents events)
-        {
-            if (events.BlockInterval.TimeRange.From < TotalSpan.From)
-            {
-                var msg = "Attempt to update ChainState with set of events from before its current record.";
-                handler.OnError(msg);
-                throw new Exception(msg);
-            }
-
-            log.Log($"ChainState updating: {events.BlockInterval}");
-
-            // Run through each block and apply the events to the state in order.
-            var span = events.BlockInterval.TimeRange.Duration;
-            var numBlocks = events.BlockInterval.NumberOfBlocks;
-            var spanPerBlock = span / numBlocks;
-
-            var eventUtc = events.BlockInterval.TimeRange.From;
-            for (var b = events.BlockInterval.From; b <= events.BlockInterval.To; b++)
-            {
-                var blockEvents = events.All.Where(e => e.Block.BlockNumber == b).ToArray();
-                ApplyEvents(b, blockEvents, eventUtc);
-
-                eventUtc += spanPerBlock;
-            }
-        }
-
-        private void ApplyEvents(ulong blockNumber, IHasBlock[] blockEvents, DateTime eventsUtc)
-        {
-            foreach (var e in blockEvents)
-            {
-                dynamic d = e;
-                ApplyEvent(d);
-            }
-
-            ApplyTimeImplicitEvents(blockNumber, eventsUtc);
-        }
-
-        private void ApplyEvent(Request request)
-        {
-            if (requests.Any(r => Equal(r.Request.RequestId, request.RequestId)))
-                throw new Exception("Received NewRequest event for id that already exists.");
-
-            var newRequest = new ChainStateRequest(log, request, RequestState.New);
-            requests.Add(newRequest);
-
-            handler.OnNewRequest(new RequestEvent(request.Block, newRequest));
-        }
-
-        private void ApplyEvent(RequestFulfilledEventDTO @event)
-        {
-            var r = FindRequest(@event);
-            if (r == null) return;
-            r.UpdateState(@event.Block.BlockNumber, RequestState.Started);
-            handler.OnRequestFulfilled(new RequestEvent(@event.Block, r));
-        }
-
-        private void ApplyEvent(RequestCancelledEventDTO @event)
-        {
-            var r = FindRequest(@event);
-            if (r == null) return;
-            r.UpdateState(@event.Block.BlockNumber, RequestState.Cancelled);
-            handler.OnRequestCancelled(new RequestEvent(@event.Block, r));
-        }
-
-        private void ApplyEvent(RequestFailedEventDTO @event)
-        {
-            var r = FindRequest(@event);
-            if (r == null) return;
-            r.UpdateState(@event.Block.BlockNumber, RequestState.Failed);
-            handler.OnRequestFailed(new RequestEvent(@event.Block, r));
-        }
-
-        private void ApplyEvent(SlotFilledEventDTO @event)
-        {
-            var r = FindRequest(@event);
-            if (r == null) return;
-            r.Hosts.Add(@event.Host, (int)@event.SlotIndex);
-            r.Log($"[{@event.Block.BlockNumber}] SlotFilled (host:'{@event.Host}', slotIndex:{@event.SlotIndex})");
-            handler.OnSlotFilled(new RequestEvent(@event.Block, r), @event.Host, @event.SlotIndex);
-        }
-
-        private void ApplyEvent(SlotFreedEventDTO @event)
-        {
-            var r = FindRequest(@event);
-            if (r == null) return;
-            r.Hosts.RemoveHost((int)@event.SlotIndex);
-            r.Log($"[{@event.Block.BlockNumber}] SlotFreed (slotIndex:{@event.SlotIndex})");
-            handler.OnSlotFreed(new RequestEvent(@event.Block, r), @event.SlotIndex);
-        }
-
-        private void ApplyEvent(SlotReservationsFullEventDTO @event)
-        {
-            var r = FindRequest(@event);
-            if (r == null) return;
-            r.Log($"[{@event.Block.BlockNumber}] SlotReservationsFull (slotIndex:{@event.SlotIndex})");
-            handler.OnSlotReservationsFull(new RequestEvent(@event.Block, r), @event.SlotIndex);
-        }
-
-        private void ApplyTimeImplicitEvents(ulong blockNumber, DateTime eventsUtc)
-        {
-            foreach (var r in requests)
-            {
-                if (r.State == RequestState.Started
-                    && r.FinishedUtc < eventsUtc)
-                {
-                    r.UpdateState(blockNumber, RequestState.Finished);
-                    handler.OnRequestFinished(new RequestEvent(new BlockTimeEntry(blockNumber, eventsUtc), r));
-                }
-            }
-        }
-
-        private ChainStateRequest? FindRequest(IHasRequestId request)
-        {
-            var r = requests.SingleOrDefault(r => Equal(r.Request.RequestId, request.RequestId));
-            if (r == null)
-            {
-                var blockNumber = "unknown";
-                if (request is IHasBlock blk)
-                {
-                    blockNumber = blk.Block.BlockNumber.ToString();
-                }
-
-                var msg = $"Received event of type '{request.GetType()}' in block '{blockNumber}' for request by Id: '{request.RequestId}'. " +
-                    $"Failed to find request. Request creation event not seen! (Tracker start time: {TotalSpan.From})";
-
-                log.Error(msg);
-                handler.OnError(msg);
-            }
-            return r;
-        }
-
-        private bool Equal(byte[] a, byte[] b)
-        {
-            return a.SequenceEqual(b);
-        }
-    }
-}

ProjectPlugins/CodexContractsPlugin/ChainMonitor/ChainStateChangeHandlerMux.cs

@@ -1,60 +0,0 @@
-using GethPlugin;
-using System.Numerics;
-
-namespace CodexContractsPlugin.ChainMonitor
-{
-    public class ChainStateChangeHandlerMux : IChainStateChangeHandler
-    {
-        public ChainStateChangeHandlerMux(params IChainStateChangeHandler[] handlers)
-        {
-            Handlers = handlers.ToList();
-        }
-
-        public List<IChainStateChangeHandler> Handlers { get; } = new List<IChainStateChangeHandler>();
-
-        public void OnNewRequest(RequestEvent requestEvent)
-        {
-            foreach (var handler in Handlers) handler.OnNewRequest(requestEvent);
-        }
-
-        public void OnRequestCancelled(RequestEvent requestEvent)
-        {
-            foreach (var handler in Handlers) handler.OnRequestCancelled(requestEvent);
-        }
-
-        public void OnRequestFailed(RequestEvent requestEvent)
-        {
-            foreach (var handler in Handlers) handler.OnRequestFailed(requestEvent);
-        }
-
-        public void OnRequestFinished(RequestEvent requestEvent)
-        {
-            foreach (var handler in Handlers) handler.OnRequestFinished(requestEvent);
-        }
-
-        public void OnRequestFulfilled(RequestEvent requestEvent)
-        {
-            foreach (var handler in Handlers) handler.OnRequestFulfilled(requestEvent);
-        }
-
-        public void OnSlotFilled(RequestEvent requestEvent, EthAddress host, BigInteger slotIndex)
-        {
-            foreach (var handler in Handlers) handler.OnSlotFilled(requestEvent, host, slotIndex);
-        }
-
-        public void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex)
-        {
-            foreach (var handler in Handlers) handler.OnSlotFreed(requestEvent, slotIndex);
-        }
-
-        public void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex)
-        {
-            foreach (var handler in Handlers) handler.OnSlotReservationsFull(requestEvent, slotIndex);
-        }
-
-        public void OnError(string msg)
-        {
-            foreach (var handler in Handlers) handler.OnError(msg);
-        }
-    }
-}

ProjectPlugins/CodexContractsPlugin/ChainMonitor/ChainStateRequest.cs

@@ -1,80 +0,0 @@
-using CodexContractsPlugin.Marketplace;
-using GethPlugin;
-using Logging;
-
-namespace CodexContractsPlugin.ChainMonitor
-{
-    public interface IChainStateRequest
-    {
-        Request Request { get; }
-        RequestState State { get; }
-        DateTime ExpiryUtc { get; }
-        DateTime FinishedUtc { get; }
-        EthAddress Client { get; }
-        RequestHosts Hosts { get; }
-    }
-
-    public class ChainStateRequest : IChainStateRequest
-    {
-        private readonly ILog log;
-
-        public ChainStateRequest(ILog log, Request request, RequestState state)
-        {
-            this.log = log;
-            Request = request;
-            State = state;
-
-            ExpiryUtc = request.Block.Utc + TimeSpan.FromSeconds((double)request.Expiry);
-            FinishedUtc = request.Block.Utc + TimeSpan.FromSeconds((double)request.Ask.Duration);
-
-            Log($"[{request.Block.BlockNumber}] Created as {State}.");
-
-            Client = new EthAddress(request.Client);
-            Hosts = new RequestHosts();
-        }
-
-        public Request Request { get; }
-        public RequestState State { get; private set; }
-        public DateTime ExpiryUtc { get; }
-        public DateTime FinishedUtc { get; }
-        public EthAddress Client { get; }
-        public RequestHosts Hosts { get; }
-
-        public void UpdateState(ulong blockNumber, RequestState newState)
-        {
-            Log($"[{blockNumber}] Transit: {State} -> {newState}");
-            State = newState;
-        }
-
-        public void Log(string msg)
-        {
-            log.Log($"Request '{Request.Id}': {msg}");
-        }
-    }
-
-    public class RequestHosts
-    {
-        private readonly Dictionary<int, EthAddress> hosts = new Dictionary<int, EthAddress>();
-
-        public void Add(EthAddress host, int index)
-        {
-            hosts.Add(index, host);
-        }
-        
-        public void RemoveHost(int index)
-        {
-            hosts.Remove(index);
-        }
-
-        public EthAddress? GetHost(int index)
-        {
-            if (!hosts.ContainsKey(index)) return null;
-            return hosts[index];
-        }
-
-        public EthAddress[] GetHosts()
-        {
-            return hosts.Values.ToArray();
-        }
-    }
-}

ProjectPlugins/CodexContractsPlugin/ChainMonitor/DoNothingChainEventHandler.cs

@@ -1,44 +0,0 @@
-using GethPlugin;
-using System.Numerics;
-
-namespace CodexContractsPlugin.ChainMonitor
-{
-    public class DoNothingChainEventHandler : IChainStateChangeHandler
-    {
-        public void OnNewRequest(RequestEvent requestEvent)
-        {
-        }
-
-        public void OnRequestCancelled(RequestEvent requestEvent)
-        {
-        }
-
-        public void OnRequestFailed(RequestEvent requestEvent)
-        {
-        }
-
-        public void OnRequestFinished(RequestEvent requestEvent)
-        {
-        }
-
-        public void OnRequestFulfilled(RequestEvent requestEvent)
-        {
-        }
-
-        public void OnSlotFilled(RequestEvent requestEvent, EthAddress host, BigInteger slotIndex)
-        {
-        }
-
-        public void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex)
-        {
-        }
-
-        public void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex)
-        {
-        }
-
-        public void OnError(string msg)
-        {
-        }
-    }
-}

ProjectPlugins/CodexContractsPlugin/CodexContractsAccess.cs

@@ -2,10 +2,9 @@
 using GethPlugin;
 using Logging;
 using Nethereum.ABI;
+using Nethereum.Hex.HexTypes;
 using Nethereum.Util;
 using NethereumWorkflow;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using Utils;
 
 namespace CodexContractsPlugin
@@ -20,13 +19,15 @@ namespace CodexContractsPlugin
         TestToken GetTestTokenBalance(IHasEthAddress owner);
         TestToken GetTestTokenBalance(EthAddress ethAddress);
 
-        ICodexContractsEvents GetEvents(TimeRange timeRange);
-        ICodexContractsEvents GetEvents(BlockInterval blockInterval);
+        Request[] GetStorageRequests(BlockInterval blockRange);
         EthAddress? GetSlotHost(Request storageRequest, decimal slotIndex);
         RequestState GetRequestState(Request request);
+        RequestFulfilledEventDTO[] GetRequestFulfilledEvents(BlockInterval blockRange);
+        RequestCancelledEventDTO[] GetRequestCancelledEvents(BlockInterval blockRange);
+        SlotFilledEventDTO[] GetSlotFilledEvents(BlockInterval blockRange);
+        SlotFreedEventDTO[] GetSlotFreedEvents(BlockInterval blockRange);
     }
 
-    [JsonConverter(typeof(StringEnumConverter))]
     public enum RequestState
     {
         New,
@@ -62,7 +63,7 @@ namespace CodexContractsPlugin
 
         public string MintTestTokens(EthAddress ethAddress, TestToken testTokens)
         {
-            return StartInteraction().MintTestTokens(ethAddress, testTokens.TstWei, Deployment.TokenAddress);
+            return StartInteraction().MintTestTokens(ethAddress, testTokens.Amount, Deployment.TokenAddress);
         }
 
         public TestToken GetTestTokenBalance(IHasEthAddress owner)
@@ -73,17 +74,68 @@ namespace CodexContractsPlugin
         public TestToken GetTestTokenBalance(EthAddress ethAddress)
         {
             var balance = StartInteraction().GetBalance(Deployment.TokenAddress, ethAddress.Address);
-            return balance.TstWei();
+            return balance.TestTokens();
         }
 
-        public ICodexContractsEvents GetEvents(TimeRange timeRange)
+        public Request[] GetStorageRequests(BlockInterval blockRange)
         {
-            return GetEvents(gethNode.ConvertTimeRangeToBlockRange(timeRange));
+            var events = gethNode.GetEvents<StorageRequestedEventDTO>(Deployment.MarketplaceAddress, blockRange);
+            var i = StartInteraction();
+            return events
+                    .Select(e =>
+                    {
+                        var requestEvent = i.GetRequest(Deployment.MarketplaceAddress, e.Event.RequestId);
+                        var result = requestEvent.ReturnValue1;
+                        result.BlockNumber = e.Log.BlockNumber.ToUlong();
+                        result.RequestId = e.Event.RequestId;
+                        return result;
+                    })
+                    .ToArray();
         }
 
-        public ICodexContractsEvents GetEvents(BlockInterval blockInterval)
+        public RequestFulfilledEventDTO[] GetRequestFulfilledEvents(BlockInterval blockRange)
         {
-            return new CodexContractsEvents(log, gethNode, Deployment, blockInterval);
+            var events = gethNode.GetEvents<RequestFulfilledEventDTO>(Deployment.MarketplaceAddress, blockRange);
+            return events.Select(e =>
+            {
+                var result = e.Event;
+                result.BlockNumber = e.Log.BlockNumber.ToUlong();
+                return result;
+            }).ToArray();
+        }
+
+        public RequestCancelledEventDTO[] GetRequestCancelledEvents(BlockInterval blockRange)
+        {
+            var events = gethNode.GetEvents<RequestCancelledEventDTO>(Deployment.MarketplaceAddress, blockRange);
+            return events.Select(e =>
+            {
+                var result = e.Event;
+                result.BlockNumber = e.Log.BlockNumber.ToUlong();
+                return result;
+            }).ToArray();
+        }
+
+        public SlotFilledEventDTO[] GetSlotFilledEvents(BlockInterval blockRange)
+        {
+            var events = gethNode.GetEvents<SlotFilledEventDTO>(Deployment.MarketplaceAddress, blockRange);
+            return events.Select(e =>
+            {
+                var result = e.Event;
+                result.BlockNumber = e.Log.BlockNumber.ToUlong();
+                result.Host = GetEthAddressFromTransaction(e.Log.TransactionHash);
+                return result;
+            }).ToArray();
+        }
+
+        public SlotFreedEventDTO[] GetSlotFreedEvents(BlockInterval blockRange)
+        {
+            var events = gethNode.GetEvents<SlotFreedEventDTO>(Deployment.MarketplaceAddress, blockRange);
+            return events.Select(e =>
+            {
+                var result = e.Event;
+                result.BlockNumber = e.Log.BlockNumber.ToUlong();
+                return result;
+            }).ToArray();
         }
 
         public EthAddress? GetSlotHost(Request storageRequest, decimal slotIndex)
@@ -114,6 +166,12 @@ namespace CodexContractsPlugin
             return gethNode.Call<RequestStateFunction, RequestState>(Deployment.MarketplaceAddress, func);
         }
 
+        private EthAddress GetEthAddressFromTransaction(string transactionHash)
+        {
+            var transaction = gethNode.GetTransaction(transactionHash);
+            return new EthAddress(transaction.From);
+        }
+
         private ContractInteractions StartInteraction()
         {
             return new ContractInteractions(log, gethNode);

ProjectPlugins/CodexContractsPlugin/CodexContractsContainerRecipe.cs

@@ -19,7 +19,7 @@ namespace CodexContractsPlugin
         {
             var config = startupConfig.Get<CodexContractsContainerConfig>();
 
-            var address = config.GethNode.StartResult.Container.GetAddress(GethContainerRecipe.HttpPortTag);
+            var address = config.GethNode.StartResult.Container.GetAddress(new NullLog(), GethContainerRecipe.HttpPortTag);
 
             SetSchedulingAffinity(notIn: "false");
 

ProjectPlugins/CodexContractsPlugin/CodexContractsEvents.cs

@@ -1,113 +0,0 @@
-using CodexContractsPlugin.Marketplace;
-using GethPlugin;
-using Logging;
-using Nethereum.Contracts;
-using Nethereum.Hex.HexTypes;
-using NethereumWorkflow.BlockUtils;
-using Utils;
-
-namespace CodexContractsPlugin
-{
-    public interface ICodexContractsEvents
-    {
-        BlockInterval BlockInterval { get; }
-        Request[] GetStorageRequests();
-        RequestFulfilledEventDTO[] GetRequestFulfilledEvents();
-        RequestCancelledEventDTO[] GetRequestCancelledEvents();
-        RequestFailedEventDTO[] GetRequestFailedEvents();
-        SlotFilledEventDTO[] GetSlotFilledEvents();
-        SlotFreedEventDTO[] GetSlotFreedEvents();
-        SlotReservationsFullEventDTO[] GetSlotReservationsFull();
-    }
-
-    public class CodexContractsEvents : ICodexContractsEvents
-    {
-        private readonly ILog log;
-        private readonly IGethNode gethNode;
-        private readonly CodexContractsDeployment deployment;
-
-        public CodexContractsEvents(ILog log, IGethNode gethNode, CodexContractsDeployment deployment, BlockInterval blockInterval)
-        {
-            this.log = log;
-            this.gethNode = gethNode;
-            this.deployment = deployment;
-            BlockInterval = blockInterval;
-        }
-        
-        public BlockInterval BlockInterval { get; }
-
-        public Request[] GetStorageRequests()
-        {
-            var events = gethNode.GetEvents<StorageRequestedEventDTO>(deployment.MarketplaceAddress, BlockInterval);
-            var i = new ContractInteractions(log, gethNode);
-            return events.Select(e =>
-            {
-                var requestEvent = i.GetRequest(deployment.MarketplaceAddress, e.Event.RequestId);
-                var result = requestEvent.ReturnValue1;
-                result.Block = GetBlock(e.Log.BlockNumber.ToUlong());
-                result.RequestId = e.Event.RequestId;
-                return result;
-            }).ToArray();
-        }
-
-        public RequestFulfilledEventDTO[] GetRequestFulfilledEvents()
-        {
-            var events = gethNode.GetEvents<RequestFulfilledEventDTO>(deployment.MarketplaceAddress, BlockInterval);
-            return events.Select(SetBlockOnEvent).ToArray();
-        }
-
-        public RequestCancelledEventDTO[] GetRequestCancelledEvents()
-        {
-            var events = gethNode.GetEvents<RequestCancelledEventDTO>(deployment.MarketplaceAddress, BlockInterval);
-            return events.Select(SetBlockOnEvent).ToArray();
-        }
-
-        public RequestFailedEventDTO[] GetRequestFailedEvents()
-        {
-            var events = gethNode.GetEvents<RequestFailedEventDTO>(deployment.MarketplaceAddress, BlockInterval);
-            return events.Select(SetBlockOnEvent).ToArray();
-        }
-
-        public SlotFilledEventDTO[] GetSlotFilledEvents()
-        {
-            var events = gethNode.GetEvents<SlotFilledEventDTO>(deployment.MarketplaceAddress, BlockInterval);
-            return events.Select(e =>
-            {
-                var result = e.Event;
-                result.Block = GetBlock(e.Log.BlockNumber.ToUlong());
-                result.Host = GetEthAddressFromTransaction(e.Log.TransactionHash);
-                return result;
-            }).ToArray();
-        }
-
-        public SlotFreedEventDTO[] GetSlotFreedEvents()
-        {
-            var events = gethNode.GetEvents<SlotFreedEventDTO>(deployment.MarketplaceAddress, BlockInterval);
-            return events.Select(SetBlockOnEvent).ToArray();
-        }
-
-        public SlotReservationsFullEventDTO[] GetSlotReservationsFull()
-        {
-            var events = gethNode.GetEvents<SlotReservationsFullEventDTO>(deployment.MarketplaceAddress, BlockInterval);
-            return events.Select(SetBlockOnEvent).ToArray();
-        }
-
-        private T SetBlockOnEvent<T>(EventLog<T> e) where T : IHasBlock
-        {
-            var result = e.Event;
-            result.Block = GetBlock(e.Log.BlockNumber.ToUlong());
-            return result;
-        }
-
-        private BlockTimeEntry GetBlock(ulong number)
-        {
-            return gethNode.GetBlockForNumber(number);
-        }
-
-        private EthAddress GetEthAddressFromTransaction(string transactionHash)
-        {
-            var transaction = gethNode.GetTransaction(transactionHash);
-            return new EthAddress(transaction.From);
-        }
-    }
-}

ProjectPlugins/CodexContractsPlugin/CodexContractsPlugin.csproj

@@ -1,16 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Nethereum.Generators" Version="4.21.4" />
-    <PackageReference Include="Nethereum.Generators.Net" Version="4.21.4" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\Framework\Core\Core.csproj" />
     <ProjectReference Include="..\GethPlugin\GethPlugin.csproj" />

ProjectPlugins/CodexContractsPlugin/CodexContractsStarter.cs

@@ -1,5 +1,4 @@
-using CodexContractsPlugin.Marketplace;
-using Core;
+using Core;
 using GethPlugin;
 using KubernetesWorkflow;
 using KubernetesWorkflow.Types;
@@ -25,7 +24,7 @@ namespace CodexContractsPlugin
             var startupConfig = CreateStartupConfig(gethNode);
             startupConfig.NameOverride = "codex-contracts";
 
-            var containers = workflow.Start(1, new CodexContractsContainerRecipe(), startupConfig).WaitForOnline();
+            var containers = workflow.Start(1, new CodexContractsContainerRecipe(), startupConfig);
             if (containers.Containers.Length != 1) throw new InvalidOperationException("Expected 1 Codex contracts container to be created. Test infra failure.");
             var container = containers.Containers[0];
 
@@ -60,46 +59,33 @@ namespace CodexContractsPlugin
                 var logHandler = new ContractsReadyLogHandler(tools.GetLog());
                 workflow.DownloadContainerLog(container, logHandler, 100);
                 return logHandler.Found;
-            }, nameof(DeployContract));
+            });
             Log("Contracts deployed. Extracting addresses...");
 
             var extractor = new ContractsContainerInfoExtractor(tools.GetLog(), workflow, container);
             var marketplaceAddress = extractor.ExtractMarketplaceAddress();
-            var (abi, bytecode) = extractor.ExtractMarketplaceAbiAndByteCode();
-            EnsureCompatbility(abi, bytecode);
+            var abi = extractor.ExtractMarketplaceAbi();
 
             var interaction = new ContractInteractions(tools.GetLog(), gethNode);
             var tokenAddress = interaction.GetTokenAddress(marketplaceAddress);
 
             Log("Extract completed. Checking sync...");
 
-            Time.WaitUntil(() => interaction.IsSynced(marketplaceAddress, abi), nameof(DeployContract));
+            Time.WaitUntil(() => interaction.IsSynced(marketplaceAddress, abi));
 
             Log("Synced. Codex SmartContracts deployed.");
 
             return new CodexContractsDeployment(marketplaceAddress, abi, tokenAddress);
         }
 
-        private void EnsureCompatbility(string abi, string bytecode)
-        {
-            var expectedByteCode = MarketplaceDeploymentBase.BYTECODE.ToLowerInvariant();
-
-            if (bytecode != expectedByteCode)
-            {
-                Log("Deployed contract is incompatible with current build of CodexContracts plugin. Running self-updater...");
-                var selfUpdater = new SelfUpdater();
-                selfUpdater.Update(abi, bytecode);
-            }
-        }
-
         private void Log(string msg)
         {
             tools.GetLog().Log(msg);
         }
 
-        private void WaitUntil(Func<bool> predicate, string msg)
+        private void WaitUntil(Func<bool> predicate)
         {
-            Time.WaitUntil(predicate, TimeSpan.FromMinutes(5), TimeSpan.FromSeconds(2), msg);
+            Time.WaitUntil(predicate, TimeSpan.FromMinutes(5), TimeSpan.FromSeconds(2));
         }
 
         private StartupConfig CreateStartupConfig(IGethNode gethNode)

ProjectPlugins/CodexContractsPlugin/ContractInteractions.cs

@@ -44,7 +44,7 @@ namespace CodexContractsPlugin
             }
         }
 
-        public string MintTestTokens(EthAddress address, BigInteger amount, string tokenAddress)
+        public string MintTestTokens(EthAddress address, decimal amount, string tokenAddress)
         {
             log.Debug($"{amount} -> {address} (token: {tokenAddress})");
             return MintTokens(address.Address, amount, tokenAddress);
@@ -85,7 +85,7 @@ namespace CodexContractsPlugin
             }
         }
 
-        private string MintTokens(string account, BigInteger amount, string tokenAddress)
+        private string MintTokens(string account, decimal amount, string tokenAddress)
         {
             log.Debug($"({tokenAddress}) {amount} --> {account}");
             if (string.IsNullOrEmpty(account)) throw new ArgumentException("Invalid arguments for MintTestTokens");
@@ -93,7 +93,7 @@ namespace CodexContractsPlugin
             var function = new MintTokensFunction
             {
                 Holder = account,
-                Amount = amount
+                Amount = amount.ToBig()
             };
 
             return gethNode.SendTransaction(tokenAddress, function);

ProjectPlugins/CodexContractsPlugin/ContractsContainerInfoExtractor.cs

@@ -1,5 +1,4 @@
-using CodexContractsPlugin.Marketplace;
-using KubernetesWorkflow;
+using KubernetesWorkflow;
 using KubernetesWorkflow.Types;
 using Logging;
 using Newtonsoft.Json;
@@ -31,14 +30,14 @@ namespace CodexContractsPlugin
             return marketplaceAddress;
         }
 
-        public (string, string) ExtractMarketplaceAbiAndByteCode()
+        public string ExtractMarketplaceAbi()
         {
             log.Debug();
-            var (abi, bytecode) = Retry(FetchMarketplaceAbiAndByteCode);
-            if (string.IsNullOrEmpty(abi)) throw new InvalidOperationException("Unable to fetch marketplace artifacts from codex-contracts node. Test infra failure.");
+            var marketplaceAbi = Retry(FetchMarketplaceAbi);
+            if (string.IsNullOrEmpty(marketplaceAbi)) throw new InvalidOperationException("Unable to fetch marketplace artifacts from codex-contracts node. Test infra failure.");
 
-            log.Debug("Got Marketplace ABI: " + abi);
-            return (abi, bytecode);
+            log.Debug("Got Marketplace ABI: " + marketplaceAbi);
+            return marketplaceAbi;
         }
 
         private string FetchMarketplaceAddress()
@@ -48,20 +47,16 @@ namespace CodexContractsPlugin
             return marketplace!.address;
         }
 
-        private (string, string) FetchMarketplaceAbiAndByteCode()
+        private string FetchMarketplaceAbi()
         {
             var json = workflow.ExecuteCommand(container, "cat", CodexContractsContainerRecipe.MarketplaceArtifactFilename);
 
             var artifact = JObject.Parse(json);
             var abi = artifact["abi"];
-            var byteCode = artifact["bytecode"];
-            var abiResult = abi!.ToString(Formatting.None);
-            var byteCodeResult = byteCode!.ToString(Formatting.None).ToLowerInvariant().Replace("\"", "");
-          
-            return (abiResult, byteCodeResult);
+            return abi!.ToString(Formatting.None);
         }
 
-        private static T Retry<T>(Func<T> fetch)
+        private static string Retry(Func<string> fetch)
         {
             return Time.Retry(fetch, nameof(ContractsContainerInfoExtractor));
         }

ProjectPlugins/CodexContractsPlugin/Marketplace/Customizations.cs

@@ -1,73 +1,41 @@
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
 using GethPlugin;
-using NethereumWorkflow.BlockUtils;
 using Newtonsoft.Json;
 
 namespace CodexContractsPlugin.Marketplace
 {
-    public interface IHasBlock
-    {
-        BlockTimeEntry Block { get; set; }
-    }
-
-    public interface IHasRequestId
-    {
-        byte[] RequestId { get; set; }
-    }
-
-    public partial class Request : RequestBase, IHasBlock, IHasRequestId
+    public partial class Request : RequestBase
     {
         [JsonIgnore]
-        public BlockTimeEntry Block { get; set; }
+        public ulong BlockNumber { get; set; }
         public byte[] RequestId { get; set; }
 
         public EthAddress ClientAddress { get { return new EthAddress(Client); } }
-
-        [JsonIgnore]
-        public string Id
-        {
-            get
-            {
-                return BitConverter.ToString(RequestId).Replace("-", "").ToLowerInvariant();
-            }
-        }
     }
 
-    public partial class RequestFulfilledEventDTO : IHasBlock, IHasRequestId
+    public partial class RequestFulfilledEventDTO
     {
         [JsonIgnore]
-        public BlockTimeEntry Block { get; set; }
+        public ulong BlockNumber { get; set; }
     }
 
-    public partial class RequestCancelledEventDTO : IHasBlock, IHasRequestId
+    public partial class RequestCancelledEventDTO
     {
         [JsonIgnore]
-        public BlockTimeEntry Block { get; set; }
+        public ulong BlockNumber { get; set; }
     }
 
-    public partial class RequestFailedEventDTO : IHasBlock, IHasRequestId
+    public partial class SlotFilledEventDTO
     {
         [JsonIgnore]
-        public BlockTimeEntry Block { get; set; }
-    }
-
-    public partial class SlotFilledEventDTO : IHasBlock, IHasRequestId
-    {
-        [JsonIgnore]
-        public BlockTimeEntry Block { get; set; }
+        public ulong BlockNumber { get; set; }
         public EthAddress Host { get; set; }
     }
 
-    public partial class SlotFreedEventDTO : IHasBlock, IHasRequestId
+    public partial class SlotFreedEventDTO
     {
         [JsonIgnore]
-        public BlockTimeEntry Block { get; set; }
-    }
-
-    public partial class SlotReservationsFullEventDTO : IHasBlock, IHasRequestId
-    {
-        [JsonIgnore]
-        public BlockTimeEntry Block { get; set; }
+        public ulong BlockNumber { get; set; }
     }
 }
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.

ProjectPlugins/CodexContractsPlugin/Marketplace/README.md

@@ -1,14 +1 @@
 This code was generated using the Nethereum code generator, here: http://playground.nethereum.com
-
-1. Go to site -> Abi Code Gen.
-1. Contract name = "Marketplace".
-1. In container, get "/hardhat/artifacts/contracts/Marketplace.sol/Marketplace.json".
-1. Save only ABI section as new JSON. (top-level is a json array.)
-1. From original JSON get byte code.
-1. Put ABI JSON and byte code into site.
-1. Generate.
-1. From site generated code, copy `public partial class MarketplaceDeployment` and everything after it. (be considerate of namespace brackets!)
-1. In Marketplace/Marketplace.cs, replace content of 'namespace CodexContractsPlugin.Marketplace'.
-
-
-

ProjectPlugins/CodexContractsPlugin/SelfUpdater.cs

@@ -1,96 +0,0 @@
-using Utils;
-
-namespace CodexContractsPlugin
-{
-    public class SelfUpdater
-    {
-        public void Update(string abi, string bytecode)
-        {
-            var filePath = GetMarketplaceFilePath();
-            var content = GenerateContent(abi, bytecode);
-            var contentLines = content.Split("\r\n");
-
-            var beginWith = new string[]
-            {
-                "using Nethereum.ABI.FunctionEncoding.Attributes;",
-                "using Nethereum.Contracts;",
-                "using System.Numerics;",
-                "",
-                "// Generated code, do not modify.",
-                "",
-                "#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.",
-                "namespace CodexContractsPlugin.Marketplace",
-                "{"
-            };
-
-            var endWith = new string[]
-            {
-                "}",
-                "#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable."
-            };
-
-            File.Delete(filePath);
-            File.WriteAllLines(filePath,
-                beginWith.Concat(
-                contentLines.Concat(
-                endWith))
-            );
-
-            throw new Exception("Oh no! CodexContracts were updated. Current build of CodexContractsPlugin is incompatible. " +
-                "But fear not! SelfUpdater.cs has automatically updated the plugin. Just rebuild and rerun and it should work. " +
-                "Just in case, manual update instructions are found here: 'CodexContractsPlugin/Marketplace/README.md'.");
-        }
-
-        private string GetMarketplaceFilePath()
-        {
-            var projectPluginDir = PluginPathUtils.ProjectPluginsDir;
-            var path = Path.Combine(projectPluginDir, "CodexContractsPlugin", "Marketplace", "Marketplace.cs");
-            if (!File.Exists(path)) throw new Exception("Marketplace file not found. Expected: " + path);
-            return path;
-        }
-
-        private string GenerateContent(string abi, string bytecode)
-        {
-            var deserializer = new Nethereum.Generators.Net.GeneratorModelABIDeserialiser();
-            var abiModel = deserializer.DeserialiseABI(abi);
-            var abiCtor = abiModel.Constructor;
-            var c = new Nethereum.Generators.CQS.ContractDeploymentCQSMessageGenerator(abiCtor, "namespace", bytecode, "Marketplace", Nethereum.Generators.Core.CodeGenLanguage.CSharp);
-            var lines = "";
-            lines += c.GenerateClass();
-            lines += "\r\n";
-
-            foreach (var eventAbi in abiModel.Events)
-            {
-                var d = new Nethereum.Generators.DTOs.EventDTOGenerator(eventAbi, "namespace", Nethereum.Generators.Core.CodeGenLanguage.CSharp);
-                lines += d.GenerateClass();
-                lines += "\r\n";
-            }
-
-            foreach (var errorAbi in abiModel.Errors)
-            {
-                var e = new Nethereum.Generators.DTOs.ErrorDTOGenerator(errorAbi, "namespace", Nethereum.Generators.Core.CodeGenLanguage.CSharp);
-                lines += e.GenerateClass();
-                lines += "\r\n";
-            }
-
-            foreach (var funcAbi in abiModel.Functions)
-            {
-                var f = new Nethereum.Generators.DTOs.FunctionOutputDTOGenerator(funcAbi, "namespace", Nethereum.Generators.Core.CodeGenLanguage.CSharp);
-                var ff = new Nethereum.Generators.CQS.FunctionCQSMessageGenerator(funcAbi, "namespace", "funcoutput", Nethereum.Generators.Core.CodeGenLanguage.CSharp);
-                lines += f.GenerateClass();
-                lines += "\r\n";
-                lines += ff.GenerateClass();
-                lines += "\r\n";
-            }
-
-            foreach (var structAbi in abiModel.Structs)
-            {
-                var g = new Nethereum.Generators.DTOs.StructTypeGenerator(structAbi, "namespace", Nethereum.Generators.Core.CodeGenLanguage.CSharp);
-                lines += g.GenerateClass();
-                lines += "\r\n";
-            }
-
-            return lines;
-        }
-    }
-}