Fixes too-frequent save of overview json. Resets failure count on upload.

Adds proofSubmitted event
Adds proof-period report to chain-events.
2025-03-04 16:14:29 +01:00 · 2025-03-04 15:58:45 +01:00 · 2025-03-04 15:24:25 +01:00 · 2025-03-04 10:33:22 +01:00 · 2025-03-04 10:03:55 +01:00 · 2025-03-03 18:56:18 +01:00
302 changed files with 9194 additions and 3062 deletions
@@ -0,0 +1,10 @@
+# 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
@@ -1,5 +1,6 @@
 name: Docker - AutoClient

+
 on:
  push:
    branches:
@@ -12,15 +13,15 @@ on:
      - '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
+    uses: codex-storage/github-actions/.github/workflows/docker-reusable.yml@master
    with:
      docker_file: Tools/AutoClient/docker/Dockerfile
-      docker_repo: codexstorage/codex-autoclient
+      dockerhub_repo: codexstorage/codex-autoclient
+      tag_latest: ${{ github.ref_name == github.event.repository.default_branch || startsWith(github.ref, 'refs/tags/') }}
    secrets: inherit
-
@@ -13,16 +13,15 @@ on:
      - 'Framework/**'
      - 'ProjectPlugins/**'
      - .github/workflows/docker-discordbot.yml
-      - .github/workflows/docker-reusable.yml
  workflow_dispatch:


 jobs:
  build-and-push:
    name: Build and Push
-    uses: ./.github/workflows/docker-reusable.yml
+    uses: codex-storage/github-actions/.github/workflows/docker-reusable.yml@master
    with:
      docker_file: Tools/BiblioTech/docker/Dockerfile
-      docker_repo: codexstorage/codex-discordbot
+      dockerhub_repo: codexstorage/codex-discordbot
+      tag_latest: ${{ github.ref_name == github.event.repository.default_branch || startsWith(github.ref, 'refs/tags/') }}
    secrets: inherit
-
@@ -11,17 +11,16 @@ on:
      - 'Tools/KeyMaker/**'
      - 'Framework/**'
      - 'ProjectPlugins/**'
-      - .github/workflows/docker-KeyMaker.yml
-      - .github/workflows/docker-reusable.yml
+      - .github/workflows/docker-keymaker.yml
  workflow_dispatch:


 jobs:
  build-and-push:
    name: Build and Push
-    uses: ./.github/workflows/docker-reusable.yml
+    uses: codex-storage/github-actions/.github/workflows/docker-reusable.yml@master
    with:
      docker_file: Tools/KeyMaker/docker/Dockerfile
-      docker_repo: codexstorage/codex-keymaker
+      dockerhub_repo: codexstorage/codex-keymaker
+      tag_latest: ${{ github.ref_name == github.event.repository.default_branch || startsWith(github.ref, 'refs/tags/') }}
    secrets: inherit
-
@@ -12,16 +12,15 @@ on:
      - '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
+    uses: codex-storage/github-actions/.github/workflows/docker-reusable.yml@master
    with:
      docker_file: Tools/MarketInsights/Dockerfile
-      docker_repo: codexstorage/codex-marketinsights
+      dockerhub_repo: codexstorage/codex-marketinsights
+      tag_latest: ${{ github.ref_name == github.event.repository.default_branch || startsWith(github.ref, 'refs/tags/') }}
    secrets: inherit
-
@@ -1,178 +0,0 @@
-name: Reusable - Docker
-
-
-on:
-  workflow_call:
-    inputs:
-      docker_file:
-        default: docker/Dockerfile
-        description: Dockerfile
-        required: false
-        type: string
-      docker_repo:
-        default: codexstorage/cs-codex-dist-tests
-        description: DockerHub repository
-        required: false
-        type: string
-      tag_latest:
-        default: true
-        description: Set latest tag for Docker images
-        required: false
-        type: boolean
-      tag_sha:
-        default: true
-        description: Set Git short commit as Docker tag
-        required: false
-        type: boolean
-      tag_suffix:
-        default: ''
-        description: Suffix for Docker images tag
-        required: false
-        type: string
-
-
-env:
-  DOCKER_FILE: ${{ inputs.docker_file }}
-  DOCKER_REPO: ${{ inputs.docker_repo }}
-  TAG_LATEST: ${{ inputs.tag_latest }}
-  TAG_SHA: ${{ inputs.tag_sha }}
-  TAG_SUFFIX: ${{ inputs.tag_suffix }}
-
-
-jobs:
-  # Build platform specific image
-  build:
-    strategy:
-      fail-fast: true
-      matrix:
-        target:
-          - os: linux
-            arch: amd64
-          - os: linux
-            arch: arm64
-        include:
-          - target:
-              os: linux
-              arch: amd64
-            builder: ubuntu-22.04
-          - target:
-              os: linux
-              arch: arm64
-            builder: buildjet-4vcpu-ubuntu-2204-arm
-
-    name: Build ${{ matrix.target.os }}/${{ matrix.target.arch }}
-    runs-on: ${{ matrix.builder }}
-    env:
-      PLATFORM: ${{ format('{0}/{1}', 'linux', matrix.target.arch) }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Docker - Meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.DOCKER_REPO }}
-
-      - name: Docker - Set up Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Docker - Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Docker - Build and Push by digest
-        id: build
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ${{ env.DOCKER_FILE }}
-          platforms: ${{ env.PLATFORM }}
-          push: true
-          labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=${{ env.DOCKER_REPO }},push-by-digest=true,name-canonical=true,push=true
-
-      - name: Docker - Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-
-      - name: Docker - Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-${{ matrix.target.arch }}
-          path: /tmp/digests
-          if-no-files-found: error
-          retention-days: 1
-
-
-  # Publish multi-platform image
-  publish:
-    name: Publish multi-platform image
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Docker - Variables
-        run: |
-          # Adjust custom suffix when set and
-          if [[ -n "${{ env.TAG_SUFFIX }}" ]]; then
-            echo "TAG_SUFFIX=-${{ env.TAG_SUFFIX }}" >>$GITHUB_ENV
-          fi
-          # Disable SHA tags on tagged release
-          if [[ ${{ startsWith(github.ref, 'refs/tags/') }} == "true" ]]; then
-            echo "TAG_SHA=false" >>$GITHUB_ENV
-          fi
-          # Handle latest and latest-custom using raw
-          if [[ ${{ env.TAG_SHA }} == "false" ]]; then
-            echo "TAG_LATEST=false" >>$GITHUB_ENV
-            echo "TAG_RAW=true" >>$GITHUB_ENV
-            if [[ -z "${{ env.TAG_SUFFIX }}" ]]; then
-              echo "TAG_RAW_VALUE=latest" >>$GITHUB_ENV
-            else
-              echo "TAG_RAW_VALUE=latest-{{ env.TAG_SUFFIX }}" >>$GITHUB_ENV
-            fi
-          else
-            echo "TAG_RAW=false" >>$GITHUB_ENV
-          fi
-
-      - name: Docker - Download digests
-        uses: actions/download-artifact@v4
-        with:
-          pattern: digests-*
-          merge-multiple: true
-          path: /tmp/digests
-
-      - name: Docker - Set up Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Docker - Meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.DOCKER_REPO }}
-          flavor: |
-            latest=${{ env.TAG_LATEST }}
-            suffix=${{ env.TAG_SUFFIX }},onlatest=true
-          tags: |
-            type=semver,pattern={{version}}
-            type=raw,enable=${{ env.TAG_RAW }},value=latest
-            type=sha,enable=${{ env.TAG_SHA }}
-
-      - name: Docker - Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Docker - Create manifest list and push
-        working-directory: /tmp/digests
-        run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.DOCKER_REPO }}@sha256:%s ' *)
-
-      - name: Docker - Inspect image
-        run: |
-          docker buildx imagetools inspect ${{ env.DOCKER_REPO }}:${{ steps.meta.outputs.version }}
@@ -1,5 +1,6 @@
 name: Docker - Rewarder Bot

+
 on:
  push:
    branches:
@@ -12,15 +13,15 @@ on:
      - 'Framework/**'
      - 'ProjectPlugins/**'
      - .github/workflows/docker-rewarder.yml
-      - .github/workflows/docker-reusable.yml
  workflow_dispatch:

+
 jobs:
  build-and-push:
    name: Build and Push
-    uses: ./.github/workflows/docker-reusable.yml
+    uses: codex-storage/github-actions/.github/workflows/docker-reusable.yml@master
    with:
      docker_file: Tools/TestNetRewarder/docker/Dockerfile
-      docker_repo: codexstorage/codex-rewarderbot
+      dockerhub_repo: codexstorage/codex-rewarderbot
+      tag_latest: ${{ github.ref_name == github.event.repository.default_branch || startsWith(github.ref, 'refs/tags/') }}
    secrets: inherit
-
@@ -11,12 +11,15 @@ on:
      - docker/Dockerfile
      - docker/docker-entrypoint.sh
      - .github/workflows/docker-runner.yml
-      - .github/workflows/docker-reusable.yml
  workflow_dispatch:


 jobs:
  build-and-push:
    name: Build and Push
-    uses: ./.github/workflows/docker-reusable.yml
+    uses: codex-storage/github-actions/.github/workflows/docker-reusable.yml@master
+    with:
+      docker_file: docker/Dockerfile
+      dockerhub_repo: codexstorage/cs-codex-dist-tests
+      tag_latest: ${{ github.ref_name == github.event.repository.default_branch || startsWith(github.ref, 'refs/tags/') }}
    secrets: inherit
@@ -80,7 +80,7 @@ env:
  TESTS_TARGET_DURATION: 2d
  TESTS_FILTER: ""
  TESTS_CLEANUP: true
-  JOB_MANIFEST: docker/continuous-tests-job.yaml
+  JOB_MANIFEST: docker/job-continuous-tests.yaml
  KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
  KUBE_VERSION: v1.28.2

@@ -146,7 +146,7 @@ jobs:
        if: false
        run: |
          # Variables
-          # We need more than 300 seconds because Auto Scaler may take 3 minutes to tun a node 
+          # We need more than 300 seconds because Auto Scaler may take 3 minutes to run a node
          duration=600
          namespace="${{ env.NAMESPACE }}"
          pod=$(kubectl get pod --selector job-name=${{ env.NAMEPREFIX }} -o jsonpath="{.items[0].metadata.name}")
@@ -32,7 +32,7 @@ env:
  NAMEPREFIX: d-tests-runner
  NAMESPACE: default
  COMMAND: dotnet test Tests/CodexTests
-  JOB_MANIFEST: docker/dist-tests-job.yaml
+  JOB_MANIFEST: docker/job-dist-tests.yaml
  KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
  KUBE_VERSION: v1.28.2

@@ -0,0 +1,122 @@
+name: Run Release Tests
+
+
+on:
+  workflow_dispatch:
+    inputs:
+      codexdockerimage:
+        description: "Codex Docker image (example: 'codexstorage/nim-codex:0.1.8-dist-tests')"
+        required: true
+        type: string
+  workflow_call:
+    inputs:
+      source:
+        description: Repository with tests (current)
+        required: false
+        type: string
+      branch:
+        description: Branch with tests (master)
+        required: false
+        type: string
+      codexdockerimage:
+        description: "Codex Docker image (example: 'codexstorage/nim-codex:0.1.8-dist-tests')"
+        required: true
+        type: string
+      workflow_source:
+        description: Workflow source
+        required: false
+        type: string
+        default: ''
+
+env:
+  SOURCE: ${{ format('{0}/{1}', github.server_url, github.repository) }}
+  BRANCH: ${{ github.ref_name }}
+  CODEXDOCKERIMAGE: codexstorage/nim-codex:latest-dist-tests
+  TEST_TYPE: release-tests
+  NAMEPREFIX: r-tests
+  NAMESPACE: default
+  JOB_MANIFEST: docker/job-release-tests.yaml
+  COMMAND: dotnet test Tests/CodexReleaseTests
+  KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
+  KUBE_VERSION: v1.30.5
+
+
+jobs:
+  run_tests:
+    name: Run Release Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ inputs.workflow_source }}
+
+      - name: Variables
+        run: |
+          RUNID=$(date +%Y%m%d-%H%M%S)
+          echo "RUNID=${RUNID}" >> $GITHUB_ENV
+          echo "TESTID=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+          [[ -n "${{ inputs.source }}" ]] && echo "SOURCE=${{ inputs.source }}" >>"$GITHUB_ENV" || echo "SOURCE=${{ env.SOURCE }}" >>"$GITHUB_ENV"
+          [[ -n "${{ inputs.branch }}" ]] && echo "BRANCH=${{ inputs.branch }}" >>"$GITHUB_ENV" || echo "BRANCH=${{ env.BRANCH }}" >>"$GITHUB_ENV"
+          [[ -n "${{ inputs.codexdockerimage }}" ]] && echo "CODEXDOCKERIMAGE=${{ inputs.codexdockerimage }}" >>"$GITHUB_ENV" || echo "CODEXDOCKERIMAGE=${{ env.CODEXDOCKERIMAGE }}" >>"$GITHUB_ENV"
+          [[ -n "${{ inputs.nameprefix }}" ]] && NAMEPREFIX="`awk '{ print tolower($0) }' <<< ${{ inputs.nameprefix }}`" || NAMEPREFIX="`awk '{ print tolower($0) }' <<< ${{ env.NAMEPREFIX }}`"
+          echo "NAMEPREFIX=${NAMEPREFIX}-${RUNID}" >>"$GITHUB_ENV"
+          [[ -n "${{ inputs.namespace }}" ]] && echo "NAMESPACE=${{ inputs.namespace }}" >>"$GITHUB_ENV" || echo "NAMESPACE=${{ env.NAMESPACE }}" >>"$GITHUB_ENV"
+          [[ -n "${{ inputs.command }}" ]] && COMMAND="${{ inputs.command }}" || COMMAND="${{ env.COMMAND }}"
+          echo "COMMAND=$(jq -c 'split(" ")' <<< '"'${COMMAND}'"')" >>"$GITHUB_ENV"
+
+      - name: Kubectl - Install ${{ env.KUBE_VERSION }}
+        uses: azure/setup-kubectl@v4
+        with:
+          version: ${{ env.KUBE_VERSION }}
+
+      - name: Kubectl - Kubeconfig
+        run: |
+          mkdir -p "${HOME}"/.kube
+          echo "${{ env.KUBE_CONFIG }}" | base64 -d > "${HOME}"/.kube/config
+
+      - name: Kubectl - Create Job to run tests
+        run: |
+          envsubst < ${{ env.JOB_MANIFEST }} | kubectl apply -f -
+
+      - name: Tests Identification
+        run: |
+          echo "----"
+          echo "Repository: ${{ env.SOURCE }}"
+          echo "Branch: ${{ env.BRANCH }}"
+          echo "Runner job: ${{ env.NAMEPREFIX }}"
+          echo "Runner pod: $(kubectl get pod --selector job-name=${{ env.NAMEPREFIX }} -ojsonpath='{.items[0].metadata.name}')"
+          echo "Runner namespace: ${{ env.NAMESPACE }}"
+          echo "----"
+
+      - name: Show Runner logs
+        run: |
+          # Variables
+          # We need more than 300 seconds because Auto Scaler may take 3 minutes to tun a node 
+          namespace="${{ env.NAMESPACE }}"
+          pod=$(kubectl get pod --selector job-name=${{ env.NAMEPREFIX }} -o jsonpath='{.items[0].metadata.name}')
+
+          # Check Pod status
+          WAIT=120
+          SECONDS=0
+          sleep=1
+          while (( SECONDS < WAIT )); do
+            phase=$(kubectl get pod ${pod} -n ${namespace} -o jsonpath='{.status.phase}')
+            [[ "${phase}" == "Running" ]] && { echo "Pod $pod is in the $phase state - Get the logs"; break; } || { echo "Pod $pod is in the $phase state - Retry in $sleep second(s) / $((WAIT - SECONDS))"; }
+            sleep $sleep
+          done
+
+          # Get logs
+          while [[ $(kubectl get pod ${pod} -n ${namespace} -o jsonpath='{.status.phase}') == "Running" ]]; do
+            echo "Show ${pod} logs ..."
+            echo "----"
+            kubectl logs $pod -n $namespace -f || true
+            sleep 1
+          done
+
+      - name: Set workflow status from job status
+        run: |
+          sleep 5
+          job_status=$(kubectl get jobs ${{ env.NAMEPREFIX }} -n ${{ env.NAMESPACE }} -o jsonpath='{.status.conditions[0].type}')
+          echo "Job status: $job_status"
+          if [[ "${job_status}" != "Complete" ]]; then exit 1; fi
@@ -3,3 +3,4 @@ obj
 bin
 .vscode
 Tools/AutoClient/datapath
+.editorconfig
@@ -1,4 +1,4 @@
-namespace NethereumWorkflow.BlockUtils
+namespace BlockchainUtils
 {
    public class BlockCache
    {
@@ -1,4 +1,4 @@
-namespace NethereumWorkflow.BlockUtils
+namespace BlockchainUtils
 {
    public class BlockTimeEntry
    {
@@ -1,6 +1,6 @@
 using Logging;

-namespace NethereumWorkflow.BlockUtils
+namespace BlockchainUtils
 {
    public class BlockTimeFinder
    {
@@ -29,7 +29,8 @@ namespace NethereumWorkflow.BlockUtils
        public ulong? GetHighestBlockNumberBefore(DateTime moment)
        {
            bounds.Initialize();
-            if (moment <= bounds.Genesis.Utc) return null;
+            if (moment < bounds.Genesis.Utc) return null;
+            if (moment == bounds.Genesis.Utc) return bounds.Genesis.BlockNumber;
            if (moment >= bounds.Current.Utc) return bounds.Current.BlockNumber;

            return Log(() => Search(bounds.Genesis, bounds.Current, moment, HighestBeforeSelector));
@@ -38,7 +39,8 @@ namespace NethereumWorkflow.BlockUtils
        public ulong? GetLowestBlockNumberAfter(DateTime moment)
        {
            bounds.Initialize();
-            if (moment >= bounds.Current.Utc) return null;
+            if (moment > bounds.Current.Utc) return null;
+            if (moment == bounds.Current.Utc) return bounds.Current.BlockNumber;
            if (moment <= bounds.Genesis.Utc) return bounds.Genesis.BlockNumber;

            return Log(()=> Search(bounds.Genesis, bounds.Current, moment, LowestAfterSelector)); ;
@@ -1,5 +1,11 @@
-namespace NethereumWorkflow.BlockUtils
+namespace BlockchainUtils
 {
+    public interface IWeb3Blocks
+    {
+        ulong GetCurrentBlockNumber();
+        DateTime? GetTimestampForBlock(ulong blockNumber);
+    }
+
    public class BlockchainBounds
    {
        private readonly BlockCache cache;
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Nethereum.Web3" Version="4.14.0" />
+	</ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Logging\Logging.csproj" />
+  </ItemGroup>
+
+</Project>
@@ -1,7 +1,7 @@
 using Nethereum.Hex.HexTypes;
 using System.Numerics;

-namespace NethereumWorkflow
+namespace BlockchainUtils
 {
    public static class ConversionExtensions
    {
@@ -9,6 +9,7 @@
  <ItemGroup>
    <ProjectReference Include="..\FileUtils\FileUtils.csproj" />
    <ProjectReference Include="..\KubernetesWorkflow\KubernetesWorkflow.csproj" />
+    <ProjectReference Include="..\WebUtils\WebUtils.csproj" />
  </ItemGroup>

 </Project>
@@ -1,5 +1,6 @@
 using KubernetesWorkflow;
 using KubernetesWorkflow.Types;
+using Logging;

 namespace Core
 {
@@ -1,5 +1,6 @@
 using KubernetesWorkflow;
 using Logging;
+using WebUtils;

 namespace Core
 {
@@ -8,16 +9,16 @@ namespace Core
        private readonly IToolsFactory toolsFactory;
        private readonly PluginManager manager = new PluginManager();

-        public EntryPoint(ILog log, Configuration configuration, string fileManagerRootFolder, ITimeSet timeSet)
+        public EntryPoint(ILog log, Configuration configuration, string fileManagerRootFolder, IWebCallTimeSet webCallTimeSet, IK8sTimeSet k8STimeSet)
        {
-            toolsFactory = new ToolsFactory(log, configuration, fileManagerRootFolder, timeSet);
+            toolsFactory = new ToolsFactory(log, configuration, fileManagerRootFolder, webCallTimeSet, k8STimeSet);

            Tools = toolsFactory.CreateTools();
            manager.InstantiatePlugins(PluginFinder.GetPluginTypes(), toolsFactory);
        }

        public EntryPoint(ILog log, Configuration configuration, string fileManagerRootFolder)
-            : this(log, configuration, fileManagerRootFolder, new DefaultTimeSet())
+            : this(log, configuration, fileManagerRootFolder, new DefaultWebCallTimeSet(), new DefaultK8sTimeSet())
        {
        }

@@ -1,12 +1,14 @@
 using FileUtils;
 using KubernetesWorkflow;
 using Logging;
+using WebUtils;

 namespace Core
 {
-    public interface IPluginTools : IWorkflowTool, ILogTool, IHttpFactoryTool, IFileTool
+    public interface IPluginTools : IWorkflowTool, ILogTool, IHttpFactory, IFileTool
    {
-        ITimeSet TimeSet { get; }
+        IWebCallTimeSet WebCallTimeSet { get; }
+        IK8sTimeSet K8STimeSet { get; }

        /// <summary>
        /// Deletes kubernetes and tracked file resources.
@@ -25,13 +27,6 @@ namespace Core
        ILog GetLog();
    }

-    public interface IHttpFactoryTool
-    {
-        IHttp CreateHttp(string id, Action<HttpClient> onClientCreated);
-        IHttp CreateHttp(string id, Action<HttpClient> onClientCreated, ITimeSet timeSet);
-        IHttp CreateHttp(string id);
-    }
-
    public interface IFileTool
    {
        IFileManager GetFileManager();
@@ -40,18 +35,22 @@ namespace Core
    internal class PluginTools : IPluginTools
    {
        private readonly WorkflowCreator workflowCreator;
+        private readonly HttpFactory httpFactory;
        private readonly IFileManager fileManager;
        private readonly LogPrefixer log;

-        internal PluginTools(ILog log, WorkflowCreator workflowCreator, string fileManagerRootFolder, ITimeSet timeSet)
+        internal PluginTools(ILog log, WorkflowCreator workflowCreator, string fileManagerRootFolder, IWebCallTimeSet webCallTimeSet, IK8sTimeSet k8STimeSet)
        {
            this.log = new LogPrefixer(log);
            this.workflowCreator = workflowCreator;
-            TimeSet = timeSet;
+            httpFactory = new HttpFactory(log, webCallTimeSet);
+            WebCallTimeSet = webCallTimeSet;
+            K8STimeSet = k8STimeSet;
            fileManager = new FileManager(log, fileManagerRootFolder);
        }

-        public ITimeSet TimeSet { get; }
+        public IWebCallTimeSet WebCallTimeSet { get; }
+        public IK8sTimeSet K8STimeSet { get; }

        public void ApplyLogPrefix(string prefix)
        {
@@ -60,17 +59,17 @@ namespace Core

        public IHttp CreateHttp(string id, Action<HttpClient> onClientCreated)
        {
-            return CreateHttp(id, onClientCreated, TimeSet);
+            return httpFactory.CreateHttp(id, onClientCreated);
        }

-        public IHttp CreateHttp(string id, Action<HttpClient> onClientCreated, ITimeSet ts)
+        public IHttp CreateHttp(string id, Action<HttpClient> onClientCreated, IWebCallTimeSet timeSet)
        {
-            return new Http(id, log, ts, onClientCreated);
+            return httpFactory.CreateHttp(id, onClientCreated, timeSet);
        }

        public IHttp CreateHttp(string id)
        {
-            return new Http(id, log, TimeSet);
+            return httpFactory.CreateHttp(id);
        }

        public IStartupWorkflow CreateWorkflow(string? namespaceOverride = null)
@@ -1,5 +1,6 @@
 using KubernetesWorkflow;
 using Logging;
+using WebUtils;

 namespace Core
 {
@@ -13,19 +14,21 @@ namespace Core
        private readonly ILog log;
        private readonly WorkflowCreator workflowCreator;
        private readonly string fileManagerRootFolder;
-        private readonly ITimeSet timeSet;
+        private readonly IWebCallTimeSet webCallTimeSet;
+        private readonly IK8sTimeSet k8STimeSet;

-        public ToolsFactory(ILog log, Configuration configuration, string fileManagerRootFolder, ITimeSet timeSet)
+        public ToolsFactory(ILog log, Configuration configuration, string fileManagerRootFolder, IWebCallTimeSet webCallTimeSet, IK8sTimeSet k8STimeSet)
        {
            this.log = log;
            workflowCreator = new WorkflowCreator(log, configuration);
            this.fileManagerRootFolder = fileManagerRootFolder;
-            this.timeSet = timeSet;
+            this.webCallTimeSet = webCallTimeSet;
+            this.k8STimeSet = k8STimeSet;
        }

        public PluginTools CreateTools()
        {
-            return new PluginTools(log, workflowCreator, fileManagerRootFolder, timeSet);
+            return new PluginTools(log, workflowCreator, fileManagerRootFolder, webCallTimeSet, k8STimeSet);
        }
    }
 }
@@ -3,7 +3,8 @@
    public class GiveRewardsCommand
    {
        public RewardUsersCommand[] Rewards { get; set; } = Array.Empty<RewardUsersCommand>();
-        public string[] EventsOverview { get; set; } = Array.Empty<string>();
+        public ChainEventMessage[] EventsOverview { get; set; } = Array.Empty<ChainEventMessage>();
+        public string[] Errors { get; set; } = Array.Empty<string>();

        public bool HasAny()
        {
@@ -16,4 +17,10 @@
        public ulong RewardId { get; set; }
        public string[] UserAddresses { get; set; } = Array.Empty<string>();
    }
+
+    public class ChainEventMessage
+    {
+        public ulong BlockNumber { get; set; }
+        public string Message { get; set; } = string.Empty;
+    }
 }
@@ -14,6 +14,12 @@ namespace FileUtils
            Label = label;
        }

+        public static TrackedFile FromPath(ILog log, string filepath)
+        {
+            // todo: I don't wanne have to do this to call upload.
+            return new TrackedFile(log, filepath, string.Empty);
+        }
+
        public string Filename { get; }
        public string Label { get; }

@@ -1,4 +1,6 @@
-using CodexContractsPlugin;
+using BlockchainUtils;
+using CodexContractsPlugin;
+using CodexContractsPlugin.Marketplace;
 using GethPlugin;
 using Logging;

@@ -18,18 +20,29 @@ namespace GethConnector
                return null;
            }

+            var gethNode = new CustomGethNode(log, new BlockCache(), GethInput.GethHost, GethInput.GethPort, GethInput.PrivateKey);
+
+            var config = GetCodexMarketplaceConfig(gethNode, GethInput.MarketplaceAddress);
+
            var contractsDeployment = new CodexContractsDeployment(
+                config: config,
                marketplaceAddress: GethInput.MarketplaceAddress,
                abi: GethInput.ABI,
                tokenAddress: GethInput.TokenAddress
            );

-            var gethNode = new CustomGethNode(log, GethInput.GethHost, GethInput.GethPort, GethInput.PrivateKey);
            var contracts = new CodexContractsAccess(log, gethNode, contractsDeployment);

            return new GethConnector(gethNode, contracts);
        }

+        private static MarketplaceConfig GetCodexMarketplaceConfig(IGethNode gethNode, string marketplaceAddress)
+        {
+            var func = new ConfigurationFunctionBase();
+            var response = gethNode.Call<ConfigurationFunctionBase, ConfigurationOutputDTO>(marketplaceAddress, func);
+            return response.ReturnValue1;
+        }
+
        private GethConnector(IGethNode gethNode, ICodexContracts codexContracts)
        {
            GethNode = gethNode;
@@ -45,8 +45,12 @@
        private static string? GetEnvVar(List<string> error, string name)
        {
            var result = Environment.GetEnvironmentVariable(name);
-            if (string.IsNullOrEmpty(result)) error.Add($"'{name}' is not set.");
-            return result;
+            if (string.IsNullOrEmpty(result))
+            {
+                error.Add($"'{name}' is not set.");
+                return null;
+            }
+            return result.Trim();
        }
    }
 }
@@ -3,7 +3,7 @@ using Logging;

 namespace KubernetesWorkflow
 {
-    public class CrashWatcher
+    public class ContainerCrashWatcher
    {
        private readonly ILog log;
        private readonly KubernetesClientConfiguration config;
@@ -15,7 +15,7 @@ namespace KubernetesWorkflow
        private Task? worker;
        private Exception? workerException;

-        public CrashWatcher(ILog log, KubernetesClientConfiguration config, string containerName, string podName, string recipeName, string k8sNamespace)
+        public ContainerCrashWatcher(ILog log, KubernetesClientConfiguration config, string containerName, string podName, string recipeName, string k8sNamespace)
        {
            this.log = log;
            this.config = config;
@@ -45,7 +45,7 @@ namespace KubernetesWorkflow
            if (workerException != null) throw new Exception("Exception occurred in CrashWatcher worker thread.", workerException);
        }

-        public bool HasContainerCrashed()
+        public bool HasCrashed()
        {
            using var client = new Kubernetes(config);
            var result = HasContainerBeenRestarted(client);
@@ -70,13 +70,13 @@ namespace KubernetesWorkflow
            using var client = new Kubernetes(config);
            while (!token.IsCancellationRequested)
            {
-                token.WaitHandle.WaitOne(TimeSpan.FromSeconds(10));
-
                if (HasContainerBeenRestarted(client))
                {
                    DownloadCrashedContainerLogs(client);
                    return;
                }
+
+                token.WaitHandle.WaitOne(TimeSpan.FromSeconds(10));
            }
        }

@@ -91,7 +91,7 @@ namespace KubernetesWorkflow
        private void DownloadCrashedContainerLogs(Kubernetes client)
        {
            using var stream = client.ReadNamespacedPodLog(podName, k8sNamespace, recipeName, previous: true);
-            var handler = new WriteToFileLogHandler(log, "Crash detected for " + containerName);
+            var handler = new WriteToFileLogHandler(log, "Crash detected for " + containerName, containerName);
            handler.Log(stream);
        }
    }
@@ -1,93 +0,0 @@
-using Logging;
-
-namespace KubernetesWorkflow
-{
-    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();
-    }
-
-    internal class DownloadedLog : IDownloadedLog
-    {
-        private readonly LogFile logFile;
-
-        internal DownloadedLog(WriteToFileLogHandler logHandler, string containerName)
-        {
-            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();
-            }
-        }
-
-        public string[] GetLinesContaining(string expectedString)
-        {
-            using var file = File.OpenRead(logFile.FullFilename);
-            using var streamReader = new StreamReader(file);
-            var lines = new List<string>();
-
-            var line = streamReader.ReadLine();
-            while (line != null)
-            {
-                if (line.Contains(expectedString))
-                {
-                    lines.Add(line);
-                }
-                line = streamReader.ReadLine();
-            }
-
-            return lines.ToArray(); ;
-        }
-
-        public string[] FindLinesThatContain(params string[] tags)
-        {
-            var result = new List<string>();
-            using var file = File.OpenRead(logFile.FullFilename);
-            using var streamReader = new StreamReader(file);
-
-            var line = streamReader.ReadLine();
-            while (line != null)
-            {
-                if (tags.All(line.Contains))
-                {
-                    result.Add(line);
-                }
-
-                line = streamReader.ReadLine();
-            }
-
-            return result.ToArray();
-        }
-
-        public string GetFilepath()
-        {
-            return logFile.FullFilename;
-        }
-
-        public void DeleteFile()
-        {
-            File.Delete(logFile.FullFilename);
-        }
-    }
-}
@@ -122,6 +122,16 @@ namespace KubernetesWorkflow
            var all = client.Run(c => c.ListNamespace().Items);
            var namespaces = all.Select(n => n.Name()).Where(n => n.StartsWith(prefix));

+            if (wait)
+            {
+                // If we're going to wait, trigger the delete for all the namespaces immediately.
+                // Then wait for them to finish one by one.
+                foreach (var ns in namespaces)
+                {
+                    DeleteNamespace(ns, false);
+                }
+            }
+
            foreach (var ns in namespaces)
            {
                DeleteNamespace(ns, wait);
@@ -735,7 +745,10 @@ namespace KubernetesWorkflow
                throw new Exception($"Expected to find 1 pod by podLabel '{deployment.PodLabel}'. Found: {pods.Length}. " +
                    $"Total number of pods: {allPods.Items.Count}. Their labels: {string.Join(Environment.NewLine, allLabels)}");
            }
-            return pods[0];
+            var pod = pods[0];
+            if (pod.Status == null) throw new Exception("Pod status unknown");
+            if (string.IsNullOrEmpty(pod.Status.PodIP)) throw new Exception("Pod IP unknown");
+            return pod;
        }

        #endregion
@@ -906,7 +919,7 @@ namespace KubernetesWorkflow
                var msg = $"Pod crash detected for deployment {deploymentName} (pod:{podName})";
                log.Error(msg);

-                DownloadPodLog(container, new WriteToFileLogHandler(log, msg), tailLines: null, previous: true);
+                DownloadPodLog(container, new WriteToFileLogHandler(log, msg, deploymentName), tailLines: null, previous: true);

                throw new Exception(msg);
            }
@@ -946,13 +959,13 @@ namespace KubernetesWorkflow

        #endregion

-        public CrashWatcher CreateCrashWatcher(RunningContainer container)
+        public ContainerCrashWatcher CreateCrashWatcher(RunningContainer container)
        {
            var containerName = container.Name;
            var podName = GetPodName(container);
            var recipeName = container.Recipe.Name;

-            return new CrashWatcher(log, cluster.GetK8sClientConfig(), containerName, podName, recipeName, K8sNamespace);
+            return new ContainerCrashWatcher(log, cluster.GetK8sClientConfig(), containerName, podName, recipeName, K8sNamespace);
        }

        private V1Pod[] FindPodsByLabel(string podLabel)
@@ -0,0 +1,42 @@
+namespace Core
+{
+    public interface IK8sTimeSet
+    {
+        /// <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 K8sOperationTimeout();
+    }
+
+    public class DefaultK8sTimeSet : IK8sTimeSet
+    {
+        public TimeSpan K8sOperationRetryDelay()
+        {
+            return TimeSpan.FromSeconds(10);
+        }
+
+        public TimeSpan K8sOperationTimeout()
+        {
+            return TimeSpan.FromMinutes(30);
+        }
+    }
+
+    public class LongK8sTimeSet : IK8sTimeSet
+    {
+        public TimeSpan K8sOperationRetryDelay()
+        {
+            return TimeSpan.FromSeconds(30);
+        }
+
+        public TimeSpan K8sOperationTimeout()
+        {
+            return TimeSpan.FromHours(1);
+        }
+    }
+}
@@ -25,11 +25,11 @@ namespace KubernetesWorkflow

    public class WriteToFileLogHandler : LogHandler, ILogHandler
    {
-        public WriteToFileLogHandler(ILog sourceLog, string description)
+        public WriteToFileLogHandler(ILog sourceLog, string description, string addFileName)
        {
-            LogFile = sourceLog.CreateSubfile();
+            LogFile = sourceLog.CreateSubfile(addFileName);

-            var msg = $"{description} -->> {LogFile.FullFilename}";
+            var msg = $"{description} -->> {LogFile.Filename}";
            sourceLog.Log(msg);

            LogFile.Write(msg);
@@ -13,7 +13,7 @@ namespace KubernetesWorkflow
        FutureContainers Start(int numberOfContainers, ILocation location, ContainerRecipeFactory recipeFactory, StartupConfig startupConfig);
        PodInfo GetPodInfo(RunningContainer container);
        PodInfo GetPodInfo(RunningPod pod);
-        CrashWatcher CreateCrashWatcher(RunningContainer container);
+        ContainerCrashWatcher 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);
@@ -61,7 +61,8 @@ 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 info = GetPodInfo(startResult.Deployment);
+                var rc = new RunningPod(Guid.NewGuid().ToString(), info, startupConfig, startResult, containers);
                cluster.Configuration.Hooks.OnContainersStarted(rc);

                if (startResult.ExternalService != null)
@@ -83,9 +84,14 @@ namespace KubernetesWorkflow
            });
        }

+        public PodInfo GetPodInfo(RunningDeployment deployment)
+        {
+            return K8s(c => c.GetPodInfo(deployment));
+        }
+
        public PodInfo GetPodInfo(RunningContainer container)
        {
-            return K8s(c => c.GetPodInfo(container.RunningPod.StartResult.Deployment));
+            return GetPodInfo(container.RunningPod.StartResult.Deployment);
        }

        public PodInfo GetPodInfo(RunningPod pod)
@@ -93,7 +99,7 @@ namespace KubernetesWorkflow
            return K8s(c => c.GetPodInfo(pod.StartResult.Deployment));
        }

-        public CrashWatcher CreateCrashWatcher(RunningContainer container)
+        public ContainerCrashWatcher CreateCrashWatcher(RunningContainer container)
        {
            return K8s(c => c.CreateCrashWatcher(container));
        }
@@ -127,14 +133,14 @@ namespace KubernetesWorkflow
        {
            var msg = $"Downloading container log for '{container.Name}'";
            log.Log(msg);
-            var logHandler = new WriteToFileLogHandler(log, msg);
+            var logHandler = new WriteToFileLogHandler(log, msg, container.Name);

            K8s(controller =>
            {
                controller.DownloadPodLog(container, logHandler, tailLines, previous);
            });

-            return new DownloadedLog(logHandler, container.Name);
+            return new DownloadedLog(logHandler.LogFile, container.Name);
        }

        public string ExecuteCommand(RunningContainer container, string command, params string[] args)
@@ -209,6 +215,7 @@ namespace KubernetesWorkflow
            var port = startResult.GetExternalServicePorts(recipe, tag);

            return new Address(
+                logName: $"{recipe.Name}:{tag}",
                startResult.Cluster.HostAddress,
                port.Number);
        }
@@ -220,6 +227,7 @@ namespace KubernetesWorkflow
            var port = startResult.GetInternalServicePorts(recipe, tag);

            return new Address(
+                logName: $"{serviceName}:{tag}",
                $"http://{serviceName}.{namespaceName}.svc.cluster.local",
                port.Number);
        }
@@ -4,9 +4,10 @@ namespace KubernetesWorkflow.Types
 {
    public class RunningPod
    {
-        public RunningPod(string id, StartupConfig startupConfig, StartResult startResult, RunningContainer[] containers)
+        public RunningPod(string id, PodInfo podInfo, StartupConfig startupConfig, StartResult startResult, RunningContainer[] containers)
        {
            Id = id;
+            PodInfo = podInfo;
            StartupConfig = startupConfig;
            StartResult = startResult;
            Containers = containers;
@@ -15,6 +16,7 @@ namespace KubernetesWorkflow.Types
        }

        public string Id { get; }
+        public PodInfo PodInfo { get; }
        public StartupConfig StartupConfig { get; }
        public StartResult StartResult { get; }
        public RunningContainer[] Containers { get; }
@@ -8,7 +8,7 @@ namespace Logging
        void Debug(string message = "", int skipFrames = 0);
        void Error(string message);
        void AddStringReplace(string from, string to);
-        LogFile CreateSubfile(string ext = "log");
+        LogFile CreateSubfile(string addName, string ext = "log");
    }

    public abstract class BaseLog : ILog
@@ -34,7 +34,7 @@ namespace Logging
        {
            get
            {
-                if (logFile == null) logFile = new LogFile(GetFullName(), "log");
+                if (logFile == null) logFile = new LogFile(GetFullName() + ".log");
                return logFile;
            }
        }
@@ -69,12 +69,16 @@ namespace Logging

        public virtual void Delete()
        {
-            File.Delete(LogFile.FullFilename);
+            File.Delete(LogFile.Filename);
        }

-        public LogFile CreateSubfile(string ext = "log")
+        public LogFile CreateSubfile(string addName, string ext = "log")
        {
-            return new LogFile($"{GetFullName()}_{GetSubfileNumber()}", ext);
+            addName = addName
+                .Replace("<", "")
+                .Replace(">", "");
+
+            return new LogFile($"{GetFullName()}_{GetSubfileNumber()}_{addName}.{ext}");
        }

        protected string ApplyReplacements(string str)
@@ -0,0 +1,79 @@
+namespace Logging
+{
+    public interface IDownloadedLog
+    {
+        string SourceName { get; }
+
+        void IterateLines(Action<string> action);
+        void IterateLines(Action<string> action, params string[] thatContain);
+        string[] GetLinesContaining(string expectedString);
+        string[] FindLinesThatContain(params string[] tags);
+        string GetFilepath();
+        void DeleteFile();
+    }
+
+    public class DownloadedLog : IDownloadedLog
+    {
+        private readonly LogFile logFile;
+
+        public DownloadedLog(string filepath, string sourceName)
+        {
+            logFile = new LogFile(filepath);
+            SourceName = sourceName;
+        }
+
+        public DownloadedLog(LogFile logFile, string sourceName)
+        {
+            this.logFile = logFile;
+            SourceName = sourceName;
+        }
+
+        public string SourceName { get; }
+
+        public void IterateLines(Action<string> action)
+        {
+            using var file = File.OpenRead(logFile.Filename);
+            using var streamReader = new StreamReader(file);
+
+            var line = streamReader.ReadLine();
+            while (line != null)
+            {
+                action(line);
+                line = streamReader.ReadLine();
+            }
+        }
+
+        public void IterateLines(Action<string> action, params string[] thatContain)
+        {
+            IterateLines(line =>
+            {
+                if (thatContain.All(line.Contains))
+                {
+                    action(line);
+                }
+            });
+        }
+
+        public string[] GetLinesContaining(string expectedString)
+        {
+            return FindLinesThatContain([expectedString]);
+        }
+
+        public string[] FindLinesThatContain(params string[] tags)
+        {
+            var result = new List<string>();
+            IterateLines(result.Add, tags);
+            return result.ToArray();
+        }
+
+        public string GetFilepath()
+        {
+            return logFile.Filename;
+        }
+
+        public void DeleteFile()
+        {
+            File.Delete(logFile.Filename);
+        }
+    }
+}
@@ -1,21 +1,19 @@
-namespace Logging
+using Utils;
+
+namespace Logging
 {
    public class LogFile
    {
-        private readonly string extension;
        private readonly object fileLock = new object();
-        private string filename;

-        public LogFile(string filename, string extension)
+        public LogFile(string filename)
        {
-            this.filename = filename;
-            this.extension = extension;
-            FullFilename = filename + "." + extension;
+            Filename = filename;

            EnsurePathExists(filename);
        }

-        public string FullFilename { get; private set; }
+        public string Filename { get; private set; }

        public void Write(string message)
        {
@@ -28,7 +26,7 @@
            {
                lock (fileLock)
                { 
-                    File.AppendAllLines(FullFilename, new[] { message });
+                    File.AppendAllLines(Filename, new[] { message });
                }
            }
            catch (Exception ex)
@@ -37,19 +35,24 @@
            }
        }

-        public void ConcatToFilename(string toAdd)
+        public void WriteRawMany(IEnumerable<string> lines)
        {
-            var oldFullName = FullFilename;
-
-            filename += toAdd;
-            FullFilename = filename + "." + extension;
-
-            File.Move(oldFullName, FullFilename);
+            try
+            {
+                lock (fileLock)
+                {
+                    File.AppendAllLines(Filename, lines);
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("Writing to log has failed: " + ex);
+            }
        }

        private static string GetTimestamp()
        {
-            return $"[{DateTime.UtcNow.ToString("o")}]";
+            return $"[{Time.FormatTimestamp(DateTime.UtcNow)}]";
        }

        private void EnsurePathExists(string filename)
@@ -18,9 +18,9 @@
        public string Prefix { get; set; } = string.Empty;


-        public LogFile CreateSubfile(string ext = "log")
+        public LogFile CreateSubfile(string addName, string ext = "log")
        {
-            return backingLog.CreateSubfile(ext);
+            return backingLog.CreateSubfile(addName, ext);
        }

        public void Debug(string message = "", int skipFrames = 0)
@@ -14,9 +14,9 @@
            OnAll(l => l.AddStringReplace(from, to));
        }

-        public LogFile CreateSubfile(string ext = "log")
+        public LogFile CreateSubfile(string addName, string ext = "log")
        {
-            return targetLogs.First().CreateSubfile(ext);
+            return targetLogs.First().CreateSubfile(addName, ext);
        }

        public void Debug(string message = "", int skipFrames = 0)
@@ -1,25 +1,25 @@
-using Logging;
+using BlockchainUtils;
+using Logging;
 using Nethereum.ABI.FunctionEncoding.Attributes;
 using Nethereum.Contracts;
 using Nethereum.RPC.Eth.DTOs;
 using Nethereum.Web3;
-using NethereumWorkflow.BlockUtils;
 using Utils;

 namespace NethereumWorkflow
 {
    public class NethereumInteraction
    {
-        // BlockCache is a static instance: It stays alive for the duration of the application runtime.
-        private readonly static BlockCache blockCache = new BlockCache();
+        private readonly BlockCache blockCache;

        private readonly ILog log;
        private readonly Web3 web3;

-        internal NethereumInteraction(ILog log, Web3 web3)
+        internal NethereumInteraction(ILog log, Web3 web3, BlockCache blockCache)
        {
            this.log = log;
            this.web3 = web3;
+            this.blockCache = blockCache;
        }

        public string SendEth(string toAddress, decimal ethAmount)
@@ -50,6 +50,21 @@ namespace NethereumWorkflow
            return Time.Wait(handler.QueryAsync<TResult>(contractAddress, function));
        }

+        public TResult Call<TFunction, TResult>(string contractAddress, TFunction function, ulong blockNumber) where TFunction : FunctionMessage, new()
+        {
+            log.Debug(typeof(TFunction).ToString());
+            var handler = web3.Eth.GetContractQueryHandler<TFunction>();
+            return Time.Wait(handler.QueryAsync<TResult>(contractAddress, function, new BlockParameter(blockNumber)));
+        }
+
+        public void Call<TFunction>(string contractAddress, TFunction function, ulong blockNumber) where TFunction : FunctionMessage, new()
+        {
+            log.Debug(typeof(TFunction).ToString());
+            var handler = web3.Eth.GetContractQueryHandler<TFunction>();
+            var result = Time.Wait(handler.QueryRawAsync(contractAddress, function, new BlockParameter(blockNumber)));
+            var aaaa = 0;
+        }
+
        public string SendTransaction<TFunction>(string contractAddress, TFunction function) where TFunction : FunctionMessage, new()
        {
            log.Debug();
@@ -1,4 +1,5 @@
-using Logging;
+using BlockchainUtils;
+using Logging;
 using Nethereum.Web3;

 namespace NethereumWorkflow
@@ -6,13 +7,15 @@ namespace NethereumWorkflow
    public class NethereumInteractionCreator
    {
        private readonly ILog log;
+        private readonly BlockCache blockCache;
        private readonly string ip;
        private readonly int port;
        private readonly string privateKey;

-        public NethereumInteractionCreator(ILog log, string ip, int port, string privateKey)
+        public NethereumInteractionCreator(ILog log, BlockCache blockCache, string ip, int port, string privateKey)
        {
            this.log = log;
+            this.blockCache = blockCache;
            this.ip = ip;
            this.port = port;
            this.privateKey = privateKey;
@@ -21,7 +24,7 @@ namespace NethereumWorkflow
        public NethereumInteraction CreateWorkflow()
        {
            log.Debug("Starting interaction to " + ip + ":" + port);
-            return new NethereumInteraction(log, CreateWeb3());
+            return new NethereumInteraction(log, CreateWeb3(), blockCache);
        }

        private Web3 CreateWeb3()
@@ -12,6 +12,7 @@
 	</ItemGroup>

  <ItemGroup>
+    <ProjectReference Include="..\BlockchainUtils\BlockchainUtils.csproj" />
    <ProjectReference Include="..\Logging\Logging.csproj" />
    <ProjectReference Include="..\Utils\Utils.csproj" />
  </ItemGroup>
@@ -1,16 +1,11 @@
-using Logging;
+using BlockchainUtils;
+using Logging;
 using Nethereum.RPC.Eth.DTOs;
 using Nethereum.Web3;
 using Utils;

 namespace NethereumWorkflow
 {
-    public interface IWeb3Blocks
-    {
-        ulong GetCurrentBlockNumber();
-        DateTime? GetTimestampForBlock(ulong blockNumber);
-    }
-
    public class Web3Wrapper : IWeb3Blocks
    {
        private readonly Web3 web3;
@@ -7,6 +7,7 @@ namespace OverwatchTranscript
    public interface IFinalizedBucket
    {
        bool IsEmpty { get; }
+        void Update();
        DateTime? SeeTopUtc();
        BucketTop? TakeTop();
    }
@@ -28,7 +29,8 @@ namespace OverwatchTranscript
        private readonly string bucketFile;
        private readonly ConcurrentQueue<BucketTop> topQueue = new ConcurrentQueue<BucketTop>();
        private readonly AutoResetEvent itemDequeued = new AutoResetEvent(false);
-        private bool stopping;
+        private readonly AutoResetEvent itemEnqueued = new AutoResetEvent(false);
+        private bool sourceIsEmpty;

        public EventBucketReader(ILog log, string bucketFile)
        {
@@ -42,34 +44,38 @@ namespace OverwatchTranscript
        
        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;
-            while (true)
+            if (topQueue.TryPeek(out BucketTop? top))
            {
-                UpdateIsEmpty();
-                if (IsEmpty) return null;
-                if (topQueue.TryPeek(out BucketTop? top))
-                {
-                    return top.Utc;
-                }
+                return top.Utc;
            }
+            return null;
        }

        public BucketTop? TakeTop()
        {
            if (IsEmpty) return null;
-
-            while (true)
+            if (topQueue.TryDequeue(out BucketTop? top))
            {
-                UpdateIsEmpty();
-                if (IsEmpty) return null;
-                if (topQueue.TryDequeue(out BucketTop? top))
-                {
-                    itemDequeued.Set();
-                    return top;
-                }
+                itemDequeued.Set();
+                return top;
            }
+            return null;
        }

        private void ReadBucket()
@@ -85,23 +91,25 @@ namespace OverwatchTranscript
                    if (top != null)
                    {
                        topQueue.Enqueue(top);
+                        itemEnqueued.Set();
                    }
                    else
                    {
-                        stopping = true;
+                        sourceIsEmpty = true;
+                        UpdateIsEmpty();
                        return;
                    }
                }

                itemDequeued.Reset();
-                itemDequeued.WaitOne();
+                itemDequeued.WaitOne(5000);
            }
        }

        private void UpdateIsEmpty()
        {
-            var empty = stopping && topQueue.IsEmpty;
-            if (!IsEmpty && empty)
+            var allEmpty = sourceIsEmpty && topQueue.IsEmpty;
+            if (!IsEmpty && allEmpty)
            {
                File.Delete(bucketFile);
                IsEmpty = true;
@@ -24,6 +24,8 @@ namespace OverwatchTranscript
            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;

@@ -2,12 +2,14 @@
 {
    public class Address
    {
-        public Address(string host, int port)
+        public Address(string logName, string host, int port)
        {
+            LogName = logName;
            Host = host;
            Port = port;
        }

+        public string LogName { get; }
        public string Host { get; }
        public int Port { get; }

@@ -20,5 +22,21 @@
        {
            return !string.IsNullOrEmpty(Host) && Port > 0;
        }
+
+        public static Address Empty()
+        {
+            return new Address(string.Empty, string.Empty, 0);
+        }
    }
+
+    public interface IHasMetricsScrapeTarget
+    {
+        Address GetMetricsScrapeTarget();
+    }
+    
+    public interface IHasManyMetricScrapeTargets
+    {
+        Address[] GetMetricsScrapeTargets();
+    }
+
 }
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Utils
+{
+    public static class Base58
+    {
+        private const string Digits = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+
+        public static string Encode(byte[] data)
+        {
+            // Decode byte[] to BigInteger
+            BigInteger intData = 0;
+            for (int i = 0; i < data.Length; i++)
+            {
+                intData = intData * 256 + data[i];
+            }
+
+            // Encode BigInteger to Base58 string
+            string result = "";
+            while (intData > 0)
+            {
+                int remainder = (int)(intData % 58);
+                intData /= 58;
+                result = Digits[remainder] + result;
+            }
+
+            // Append `1` for each leading 0 byte
+            for (int i = 0; i < data.Length && data[i] == 0; i++)
+            {
+                result = '1' + result;
+            }
+            return result;
+        }
+
+        public static byte[] Decode(string s)
+        {
+            BigInteger intData = 0;
+            for (int i = 0; i < s.Length; i++)
+            {
+                int digit = Digits.IndexOf(s[i]); //Slow
+                if (digit < 0)
+                    throw new FormatException(string.Format("Invalid Base58 character `{0}` at position {1}", s[i], i));
+                intData = intData * 58 + digit;
+            }
+
+            // Encode BigInteger to byte[]
+            // Leading zero bytes get encoded as leading `1` characters
+            int leadingZeroCount = s.TakeWhile(c => c == '1').Count();
+            var leadingZeros = Enumerable.Repeat((byte)0, leadingZeroCount);
+            var bytesWithoutLeadingZeros =
+                intData.ToByteArray()
+                .Reverse()// to big endian
+                .SkipWhile(b => b == 0);//strip sign byte
+            var result = leadingZeros.Concat(bytesWithoutLeadingZeros).ToArray();
+            return result;
+        }
+    }
+}
@@ -15,12 +15,13 @@
                To = from;
            }
            TimeRange = timeRange;
+            NumberOfBlocks = (To - From) + 1;
        }

        public ulong From { get; }
        public ulong To { get; }
        public TimeRange TimeRange { get; }
-        public ulong NumberOfBlocks => To - From;
+        public ulong NumberOfBlocks { get; }

        public override string ToString()
        {
@@ -0,0 +1,9 @@
+namespace Utils
+{
+    //public interface ICrashWatcher
+    //{
+    //    void Start();
+    //    void Stop();
+    //    bool HasCrashed();
+    //}
+}
@@ -0,0 +1,20 @@
+namespace Utils
+{
+    [Serializable]
+    public class EthAccount
+    {
+        public EthAccount(EthAddress ethAddress, string privateKey)
+        {
+            EthAddress = ethAddress;
+            PrivateKey = privateKey;
+        }
+
+        public EthAddress EthAddress { get; }
+        public string PrivateKey { get; }
+
+        public override string ToString()
+        {
+            return EthAddress.ToString();
+        }
+    }
+}
@@ -1,4 +1,4 @@
-namespace GethPlugin
+namespace Utils
 {
    public interface IHasEthAddress
    {
@@ -1,4 +1,4 @@
-namespace GethPlugin
+namespace Utils
 {
    public class Ether : IComparable<Ether>
    {
@@ -0,0 +1,41 @@
+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;
+            }
+        }
+    }
+}
@@ -5,6 +5,16 @@
        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)
@@ -71,6 +71,10 @@
                        task();
                        return;
                    }
+                    catch (OperationCanceledException)
+                    {
+                        return;
+                    }
                    catch (Exception ex)
                    {
                        var failure = CaptureFailure(ex);
@@ -94,7 +98,7 @@

            private void Fail()
            {
-                throw new TimeoutException($"Retry '{description}' timed out after {tryNumber} tries over {Time.FormatDuration(Duration())}: {GetFailureReport}",
+                throw new TimeoutException($"Retry '{description}' timed out after {tryNumber} tries over {Time.FormatDuration(Duration())}: {GetFailureReport()}",
                        new AggregateException(failures.Select(f => f.Exception)));
            }

@@ -1,6 +1,6 @@
 using System.Numerics;

-namespace CodexContractsPlugin
+namespace Utils
 {
    public class TestToken : IComparable<TestToken>
    {
@@ -46,6 +46,16 @@ namespace CodexContractsPlugin
            return new TestToken(a.TstWei + b.TstWei);
        }

+        public static TestToken operator -(TestToken a, TestToken b)
+        {
+            return new TestToken(a.TstWei - b.TstWei);
+        }
+
+        public static TestToken operator *(TestToken a, int b)
+        {
+            return new TestToken(a.TstWei * b);
+        }
+
        public static bool operator <(TestToken a, TestToken b)
        {
            return a.TstWei < b.TstWei;
@@ -71,7 +81,7 @@ namespace CodexContractsPlugin
    {
        public static TestToken TstWei(this int i)
        {
-            return TstWei(Convert.ToDecimal(i));
+            return new TestToken(new BigInteger(i));
        }

        public static TestToken TstWei(this decimal i)
@@ -84,6 +94,11 @@ namespace CodexContractsPlugin
            return new TestToken(i);
        }

+        public static TestToken TstWei(this string s)
+        {
+            return new TestToken(BigInteger.Parse(s));
+        }
+
        public static TestToken Tst(this int i)
        {
            return Tst(Convert.ToDecimal(i));
@@ -98,5 +113,10 @@ namespace CodexContractsPlugin
        {
            return new TestToken(i * TestToken.WeiFactor);
        }
+
+        public static TestToken Tst(this string s)
+        {
+            return new TestToken(BigInteger.Parse(s) * TestToken.WeiFactor);
+        }
    }
 }
@@ -33,6 +33,11 @@
            result += $"{d.Seconds} secs";
            return result;
        }
+
+        public static string FormatTimestamp(DateTime d)
+        {
+            return d.ToString("o");
+        }
        
        public static TimeSpan ParseTimespan(string span)
        {
@@ -1,11 +1,10 @@
-using Logging;
-using Newtonsoft.Json;
-using Serialization = Newtonsoft.Json.Serialization;
-using System.Net.Http.Headers;
+using System.Net.Http.Headers;
 using System.Net.Http.Json;
+using Logging;
+using Newtonsoft.Json;
 using Utils;

-namespace Core
+namespace WebUtils
 {
    public interface IEndpoint
    {
@@ -119,7 +118,7 @@ namespace Core
            var errors = new List<string>();
            var deserialized = JsonConvert.DeserializeObject<T>(json, new JsonSerializerSettings()
            {
-                Error = delegate (object? sender, Serialization.ErrorEventArgs args)
+                Error = delegate (object? sender, Newtonsoft.Json.Serialization.ErrorEventArgs args)
                {
                    if (args.CurrentObject == args.ErrorContext.OriginalObject)
                    {
@@ -1,7 +1,7 @@
 using Logging;
 using Utils;

-namespace Core
+namespace WebUtils
 {
    public interface IHttp
    {
@@ -16,16 +16,16 @@ namespace Core
        private static object lockLock = new object();
        private static readonly Dictionary<string, object> httpLocks = new Dictionary<string, object>();
        private readonly ILog log;
-        private readonly ITimeSet timeSet;
+        private readonly IWebCallTimeSet timeSet;
        private readonly Action<HttpClient> onClientCreated;
        private readonly string id;

-        internal Http(string id, ILog log, ITimeSet timeSet)
+        internal Http(string id, ILog log, IWebCallTimeSet timeSet)
            : this(id, log, timeSet, DoNothing)
        {
        }

-        internal Http(string id, ILog log, ITimeSet timeSet, Action<HttpClient> onClientCreated)
+        internal Http(string id, ILog log, IWebCallTimeSet timeSet, Action<HttpClient> onClientCreated)
        {
            this.id = id;
            this.log = log;
@@ -0,0 +1,43 @@
+using Logging;
+
+namespace WebUtils
+{
+    public interface IHttpFactory
+    {
+        IHttp CreateHttp(string id, Action<HttpClient> onClientCreated);
+        IHttp CreateHttp(string id, Action<HttpClient> onClientCreated, IWebCallTimeSet timeSet);
+        IHttp CreateHttp(string id);
+    }
+
+    public class HttpFactory : IHttpFactory
+    {
+        private readonly ILog log;
+        private readonly IWebCallTimeSet defaultTimeSet;
+
+        public HttpFactory(ILog log)
+            : this (log, new DefaultWebCallTimeSet())
+        {
+        }
+
+        public HttpFactory(ILog log, IWebCallTimeSet defaultTimeSet)
+        {
+            this.log = log;
+            this.defaultTimeSet = defaultTimeSet;
+        }
+
+        public IHttp CreateHttp(string id, Action<HttpClient> onClientCreated)
+        {
+            return CreateHttp(id, onClientCreated, defaultTimeSet);
+        }
+
+        public IHttp CreateHttp(string id, Action<HttpClient> onClientCreated, IWebCallTimeSet ts)
+        {
+            return new Http(id, log, ts, onClientCreated);
+        }
+
+        public IHttp CreateHttp(string id)
+        {
+            return new Http(id, log, defaultTimeSet);
+        }
+    }
+}
@@ -1,6 +1,6 @@
-namespace Core
+namespace WebUtils
 {
-    public interface ITimeSet
+    public interface IWebCallTimeSet
    {
        /// <summary>
        /// Timeout for a single HTTP call.
@@ -17,20 +17,9 @@
        /// After a failed HTTP call, wait this long before trying again.
        /// </summary>
        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 K8sOperationTimeout();
    }

-    public class DefaultTimeSet : ITimeSet
+    public class DefaultWebCallTimeSet : IWebCallTimeSet
    {
        public TimeSpan HttpCallTimeout()
        {
@@ -46,19 +35,9 @@
        {
            return TimeSpan.FromSeconds(1);
        }
-
-        public TimeSpan K8sOperationRetryDelay()
-        {
-            return TimeSpan.FromSeconds(10);
-        }
-
-        public TimeSpan K8sOperationTimeout()
-        {
-            return TimeSpan.FromMinutes(30);
-        }
    }

-    public class LongTimeSet : ITimeSet
+    public class LongWebCallTimeSet : IWebCallTimeSet
    {
        public TimeSpan HttpCallTimeout()
        {
@@ -74,15 +53,5 @@
        {
            return TimeSpan.FromSeconds(20);
        }
-
-        public TimeSpan K8sOperationRetryDelay()
-        {
-            return TimeSpan.FromSeconds(30);
-        }
-
-        public TimeSpan K8sOperationTimeout()
-        {
-            return TimeSpan.FromHours(1);
-        }
    }
 }
@@ -0,0 +1,18 @@
+<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" />
+    <ProjectReference Include="..\Utils\Utils.csproj" />
+  </ItemGroup>
+
+</Project>
@@ -0,0 +1,314 @@
+using CodexOpenApi;
+using Logging;
+using Newtonsoft.Json;
+using Utils;
+using WebUtils;
+
+namespace CodexClient
+{
+    public class CodexAccess
+    {
+        private readonly ILog log;
+        private readonly IHttpFactory httpFactory;
+        private readonly IProcessControl processControl;
+        private ICodexInstance instance;
+        private readonly Mapper mapper = new Mapper();
+
+        public CodexAccess(ILog log, IHttpFactory httpFactory, IProcessControl processControl, ICodexInstance instance)
+        {
+            this.log = log;
+            this.httpFactory = httpFactory;
+            this.processControl = processControl;
+            this.instance = instance;
+        }
+
+        public void Stop(bool waitTillStopped)
+        {
+            processControl.Stop(waitTillStopped);
+            // Prevents accidental use after stop:
+            instance = null!;
+        }
+
+        public IDownloadedLog DownloadLog(string additionalName = "")
+        {
+            var file = log.CreateSubfile(GetName() + additionalName);
+            Log($"Downloading logs to '{file.Filename}'");
+            return processControl.DownloadLog(file);
+        }
+
+        public string GetImageName()
+        {
+            return instance.ImageName;
+        }
+
+        public DateTime GetStartUtc()
+        {
+            return instance.StartUtc;
+        }
+
+        public DebugInfo GetDebugInfo()
+        {
+            return mapper.Map(OnCodex(api => api.GetDebugInfoAsync()));
+        }
+
+        public void SetLogLevel(string logLevel)
+        {
+            try
+            {
+                OnCodex(async api =>
+                {
+                    await api.SetDebugLogLevelAsync(logLevel);
+                    return string.Empty;
+                });
+            }
+            catch (Exception exc)
+            {
+                log.Error("Failed to set log level: " + exc);
+            }
+        }
+
+        public string GetSpr()
+        {
+            return CrashCheck(() =>
+            {
+                var endpoint = GetEndpoint();
+                var json = endpoint.HttpGetString("spr");
+                var response = JsonConvert.DeserializeObject<SprResponse>(json);
+                return response!.Spr;
+            });
+        }
+
+        private class SprResponse
+        {
+            public string Spr { get; set; } = string.Empty;
+        }
+
+        public DebugPeer GetDebugPeer(string peerId)
+        {
+            // Cannot use openAPI: debug/peer endpoint is not specified there.
+            return CrashCheck(() =>
+            {
+                var endpoint = GetEndpoint();
+                var str = endpoint.HttpGetString($"debug/peer/{peerId}");
+
+                if (str.ToLowerInvariant() == "unable to find peer!")
+                {
+                    return new DebugPeer
+                    {
+                        IsPeerFound = false
+                    };
+                }
+
+                var result = endpoint.Deserialize<DebugPeer>(str);
+                result.IsPeerFound = true;
+                return result;
+            });
+        }
+
+        public void ConnectToPeer(string peerId, string[] peerMultiAddresses)
+        {
+            OnCodex(api =>
+            {
+                Time.Wait(api.ConnectPeerAsync(peerId, peerMultiAddresses));
+                return Task.FromResult(string.Empty);
+            });
+        }
+
+        public string UploadFile(UploadInput uploadInput)
+        {
+            return OnCodex(api => api.UploadAsync(uploadInput.ContentType, uploadInput.ContentDisposition, uploadInput.FileStream));
+        }
+
+        public Stream DownloadFile(string contentId)
+        {
+            var fileResponse = OnCodex(api => api.DownloadNetworkStreamAsync(contentId));
+            if (fileResponse.StatusCode != 200) throw new Exception("Download failed with StatusCode: " + fileResponse.StatusCode);
+            return fileResponse.Stream;
+        }
+
+        public LocalDataset DownloadStreamless(ContentId cid)
+        {
+            var response = OnCodex(api => api.DownloadNetworkAsync(cid.Id));
+            return mapper.Map(response);
+        }
+
+        public LocalDataset DownloadManifestOnly(ContentId cid)
+        {
+            var response = OnCodex(api => api.DownloadNetworkManifestAsync(cid.Id));
+            return mapper.Map(response);
+        }
+
+        public LocalDatasetList LocalFiles()
+        {
+            return mapper.Map(OnCodex(api => api.ListDataAsync()));
+        }
+
+        public StorageAvailability SalesAvailability(StorageAvailability request)
+        {
+            var body = mapper.Map(request);
+            var read = OnCodex(api => api.OfferStorageAsync(body));
+            return mapper.Map(read);
+        }
+
+        public StorageAvailability[] GetAvailabilities()
+        {
+            var collection = OnCodex(api => api.GetAvailabilitiesAsync());
+            return mapper.Map(collection);
+        }
+
+        public string RequestStorage(StoragePurchaseRequest request)
+        {
+            var body = mapper.Map(request);
+            return OnCodex(api => api.CreateStorageRequestAsync(request.ContentId.Id, body));
+        }
+
+        public CodexSpace Space()
+        {
+            var space = OnCodex(api => api.SpaceAsync());
+            return mapper.Map(space);
+        }
+
+        public StoragePurchase? GetPurchaseStatus(string purchaseId)
+        {
+            return CrashCheck(() =>
+            {
+                var endpoint = GetEndpoint();
+                try
+                {
+                    return Time.Retry(() =>
+                    {
+                        var str = endpoint.HttpGetString($"storage/purchases/{purchaseId}");
+                        if (string.IsNullOrEmpty(str)) throw new Exception("Empty response.");
+                        return JsonConvert.DeserializeObject<StoragePurchase>(str)!;
+                    }, nameof(GetPurchaseStatus));
+                }
+                catch (Exception exc)
+                {
+                    log.Error($"Failed to fetch purchase information for id: '{purchaseId}'. Exception: {exc.Message}");
+                    return null;
+                }
+            });
+
+            // TODO: current getpurchase api does not line up with its openapi spec.
+            // return mapper.Map(OnCodex(api => api.GetPurchaseAsync(purchaseId)));
+        }
+
+        public string GetName()
+        {
+            return instance.Name;
+        }
+
+        public Address GetDiscoveryEndpoint()
+        {
+            return instance.DiscoveryEndpoint;
+        }
+
+        public Address GetApiEndpoint()
+        {
+            return instance.ApiEndpoint;
+        }
+
+        public Address GetListenEndpoint()
+        {
+            return instance.ListenEndpoint;
+        }
+
+        public bool HasCrashed()
+        {
+            return processControl.HasCrashed();
+        }
+
+        public Address? GetMetricsEndpoint()
+        {
+            return instance.MetricsEndpoint;
+        }
+
+        public EthAccount? GetEthAccount()
+        {
+            return instance.EthAccount;
+        }
+
+        public void DeleteDataDirFolder()
+        {
+            processControl.DeleteDataDirFolder();
+        }
+
+        private T OnCodex<T>(Func<CodexApiClient, Task<T>> action)
+        {
+            var result = httpFactory.CreateHttp(GetHttpId(), h => CheckContainerCrashed()).OnClient(client => CallCodex(client, action));
+            return result;
+        }
+
+        private T OnCodex<T>(Func<CodexApiClient, Task<T>> action, Retry retry)
+        {
+            var result = httpFactory.CreateHttp(GetHttpId(), h => CheckContainerCrashed()).OnClient(client => CallCodex(client, action), retry);
+            return result;
+        }
+
+        private T CallCodex<T>(HttpClient client, Func<CodexApiClient, Task<T>> action)
+        {
+            var address = GetAddress();
+            var api = new CodexApiClient(client);
+            api.BaseUrl = $"{address.Host}:{address.Port}/api/codex/v1";
+            return CrashCheck(() => Time.Wait(action(api)));
+        }
+
+        private T CrashCheck<T>(Func<T> action)
+        {
+            try
+            {
+                return action();
+            }
+            finally
+            {
+                CheckContainerCrashed();
+            }
+        }
+
+        private IEndpoint GetEndpoint()
+        {
+            return httpFactory
+                .CreateHttp(GetHttpId(), h => CheckContainerCrashed())
+                .CreateEndpoint(GetAddress(), "/api/codex/v1/", GetName());
+        }
+
+        private Address GetAddress()
+        {
+            return instance.ApiEndpoint;
+        }
+
+        private string GetHttpId()
+        {
+            return GetAddress().ToString();
+        }
+
+        private void CheckContainerCrashed()
+        {
+            if (processControl.HasCrashed()) throw new Exception($"Container {GetName()} has crashed.");
+        }
+
+        private void Throw(Failure failure)
+        {
+            throw failure.Exception;
+        }
+
+        private void Log(string msg)
+        {
+            log.Log($"({GetName()}) {msg}");
+        }
+    }
+
+    public class UploadInput
+    {
+        public UploadInput(string contentType, string contentDisposition, FileStream fileStream)
+        {
+            ContentType = contentType;
+            ContentDisposition = contentDisposition;
+            FileStream = fileStream;
+        }
+
+        public string ContentType { get; }
+        public string ContentDisposition { get; }
+        public FileStream FileStream { get; }
+    }
+}
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="openapi.yaml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <OpenApiReference Include="openapi.yaml" CodeGenerator="NSwagCSharp" Namespace="CodexOpenApi" ClassName="CodexApiClient" />
+  </ItemGroup>
+
+<ItemGroup>
+	<PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="7.0.2">
+		<PrivateAssets>all</PrivateAssets>
+		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+	</PackageReference>
+	<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+	<PackageReference Include="NSwag.ApiDescription.Client" Version="13.18.2">
+		<PrivateAssets>all</PrivateAssets>
+		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+	</PackageReference>
+</ItemGroup>
+	
+  <ItemGroup>
+    <ProjectReference Include="..\..\Framework\FileUtils\FileUtils.csproj" />
+    <ProjectReference Include="..\..\Framework\Logging\Logging.csproj" />
+    <ProjectReference Include="..\..\Framework\WebUtils\WebUtils.csproj" />
+  </ItemGroup>
+
+</Project>
@@ -0,0 +1,54 @@
+using Utils;
+
+namespace CodexClient
+{
+    public interface ICodexInstance
+    {
+        string Name { get; }
+        string ImageName { get; }
+        DateTime StartUtc { get; }
+        Address DiscoveryEndpoint { get; }
+        Address ApiEndpoint { get; }
+        Address ListenEndpoint { get; }
+        EthAccount? EthAccount { get; }
+        Address? MetricsEndpoint { get; }
+    }
+
+    public class CodexInstance : ICodexInstance
+    {
+        public CodexInstance(string name, string imageName, DateTime startUtc, Address discoveryEndpoint, Address apiEndpoint, Address listenEndpoint, EthAccount? ethAccount, Address? metricsEndpoint)
+        {
+            Name = name;
+            ImageName = imageName;
+            StartUtc = startUtc;
+            DiscoveryEndpoint = discoveryEndpoint;
+            ApiEndpoint = apiEndpoint;
+            ListenEndpoint = listenEndpoint;
+            EthAccount = ethAccount;
+            MetricsEndpoint = metricsEndpoint;
+        }
+
+        public string Name { get; }
+        public string ImageName { get; }
+        public DateTime StartUtc { get; }
+        public Address DiscoveryEndpoint { get; }
+        public Address ApiEndpoint { get; }
+        public Address ListenEndpoint { get; }
+        public EthAccount? EthAccount { get; }
+        public Address? MetricsEndpoint { get; }
+
+        public static ICodexInstance CreateFromApiEndpoint(string name, Address apiEndpoint, EthAccount? ethAccount = null)
+        {
+            return new CodexInstance(
+                name,
+                imageName: "-",
+                startUtc: DateTime.UtcNow,
+                discoveryEndpoint: Address.Empty(),
+                apiEndpoint: apiEndpoint,
+                listenEndpoint: Address.Empty(),
+                ethAccount: ethAccount,
+                metricsEndpoint: null
+            );
+        }
+    }
+}
@@ -1,4 +1,4 @@
-namespace CodexPlugin
+namespace CodexClient
 {
    public enum CodexLogLevel
    {
@@ -1,6 +1,6 @@
 using System.Globalization;

-namespace CodexPlugin
+namespace CodexClient
 {
    public class CodexLogLine
    {
@@ -0,0 +1,409 @@
+using CodexClient.Hooks;
+using FileUtils;
+using Logging;
+using Utils;
+
+namespace CodexClient
+{
+    public partial interface ICodexNode : IHasEthAddress, IHasMetricsScrapeTarget
+    {
+        string GetName();
+        string GetImageName();
+        string GetPeerId();
+        DebugInfo GetDebugInfo(bool log = false);
+        void SetLogLevel(string logLevel);
+        string GetSpr();
+        DebugPeer GetDebugPeer(string peerId);
+        ContentId UploadFile(TrackedFile file);
+        ContentId UploadFile(TrackedFile file, string contentType, string contentDisposition);
+        TrackedFile? DownloadContent(ContentId contentId, string fileLabel = "");
+        LocalDataset DownloadStreamless(ContentId cid);
+        /// <summary>
+        /// TODO: This will monitor the quota-used of the node until 'size' bytes are added. That's a very bad way
+        /// to track the streamless download progress. Replace it once we have a good API for this.
+        /// </summary>
+        LocalDataset DownloadStreamlessWait(ContentId cid, ByteSize size);
+        LocalDataset DownloadManifestOnly(ContentId cid);
+        LocalDatasetList LocalFiles();
+        CodexSpace Space();
+        void ConnectToPeer(ICodexNode node);
+        DebugInfoVersion Version { get; }
+        IMarketplaceAccess Marketplace { get; }
+        ITransferSpeeds TransferSpeeds { get; }
+        EthAccount EthAccount { get; }
+        StoragePurchase? GetPurchaseStatus(string purchaseId);
+
+        Address GetDiscoveryEndpoint();
+        Address GetApiEndpoint();
+        Address GetListenEndpoint();
+
+        /// <summary>
+        /// Warning! The node is not usable after this.
+        /// TODO: Replace with delete-blocks debug call once available in Codex.
+        /// </summary>
+        void DeleteDataDirFolder();
+        void Stop(bool waitTillStopped);
+        IDownloadedLog DownloadLog(string additionalName = "");
+        bool HasCrashed();
+    }
+
+    public class CodexNode : ICodexNode
+    {
+        private const string UploadFailedMessage = "Unable to store block";
+        private readonly ILog log;
+        private readonly ICodexNodeHooks hooks;
+        private readonly TransferSpeeds transferSpeeds;
+        private string peerId = string.Empty;
+        private string nodeId = string.Empty;
+        private readonly CodexAccess codexAccess;
+        private readonly IFileManager fileManager;
+
+        public CodexNode(ILog log, CodexAccess codexAccess, IFileManager fileManager, IMarketplaceAccess marketplaceAccess, ICodexNodeHooks hooks)
+        {
+            this.codexAccess = codexAccess;
+            this.fileManager = fileManager;
+            Marketplace = marketplaceAccess;
+            this.hooks = hooks;
+            Version = new DebugInfoVersion();
+            transferSpeeds = new TransferSpeeds();
+
+            this.log = new LogPrefixer(log, $"{GetName()} ");
+        }
+
+        public void Awake()
+        {
+            hooks.OnNodeStarting(codexAccess.GetStartUtc(), codexAccess.GetImageName(), codexAccess.GetEthAccount());
+        }
+
+        public void Initialize()
+        {
+            InitializePeerNodeId();
+            InitializeLogReplacements();
+
+            hooks.OnNodeStarted(this, peerId, nodeId);
+        }
+
+        public IMarketplaceAccess Marketplace { get; }
+        public DebugInfoVersion Version { get; private set; }
+        public ITransferSpeeds TransferSpeeds { get => transferSpeeds; }
+
+        public StoragePurchase? GetPurchaseStatus(string purchaseId)
+        {
+            return codexAccess.GetPurchaseStatus(purchaseId);
+        }
+
+        public EthAddress EthAddress 
+        {
+            get
+            {
+                EnsureMarketplace();
+                return codexAccess.GetEthAccount()!.EthAddress;
+            }
+        }
+
+        public EthAccount EthAccount
+        {
+            get
+            {
+                EnsureMarketplace();
+                return codexAccess.GetEthAccount()!;
+            }
+        }
+
+        public string GetName()
+        {
+            return codexAccess.GetName();
+        }
+
+        public string GetImageName()
+        {
+            return codexAccess.GetImageName();
+        }
+
+        public string GetPeerId()
+        {
+            return peerId;
+        }
+
+        public DebugInfo GetDebugInfo(bool log = false)
+        {
+            var debugInfo = codexAccess.GetDebugInfo();
+            if (log)
+            {
+                var known = string.Join(",", debugInfo.Table.Nodes.Select(n => n.PeerId));
+                Log($"Got DebugInfo with id: {debugInfo.Id}. This node knows: [{known}]");
+            }
+            return debugInfo;
+        }
+
+        public void SetLogLevel(string logLevel)
+        {
+            codexAccess.SetLogLevel(logLevel);
+        }
+
+        public string GetSpr()
+        {
+            return codexAccess.GetSpr();
+        }
+
+        public DebugPeer GetDebugPeer(string peerId)
+        {
+            return codexAccess.GetDebugPeer(peerId);
+        }
+
+        public ContentId UploadFile(TrackedFile file)
+        {
+            return UploadFile(file, "application/octet-stream", $"attachment; filename=\"{Path.GetFileName(file.Filename)}\"");
+        }
+
+        public ContentId UploadFile(TrackedFile file, string contentType, string contentDisposition)
+        {
+            using var fileStream = File.OpenRead(file.Filename);
+            var uniqueId = Guid.NewGuid().ToString();
+            var size = file.GetFilesize();
+
+            hooks.OnFileUploading(uniqueId, size);
+
+            var input = new UploadInput(contentType, contentDisposition, fileStream);
+            var logMessage = $"Uploading file {file.Describe()} with contentType: '{input.ContentType}' and disposition: '{input.ContentDisposition}'...";
+            var measurement = Stopwatch.Measure(log, logMessage, () =>
+            {
+                return codexAccess.UploadFile(input);
+            });
+
+            var response = measurement.Value;
+            transferSpeeds.AddUploadSample(size, measurement.Duration);
+
+            if (string.IsNullOrEmpty(response)) FrameworkAssert.Fail("Received empty response.");
+            if (response.StartsWith(UploadFailedMessage)) FrameworkAssert.Fail("Node failed to store block.");
+
+            Log($"Uploaded file {file.Describe()}. Received contentId: '{response}'.");
+
+            var cid = new ContentId(response);
+            hooks.OnFileUploaded(uniqueId, size, cid);
+            return cid;
+        }
+
+        public TrackedFile? DownloadContent(ContentId contentId, string fileLabel = "")
+        {
+            var file = fileManager.CreateEmptyFile(fileLabel);
+            hooks.OnFileDownloading(contentId);
+            Log($"Downloading '{contentId}'...");
+
+            var logMessage = $"Downloaded '{contentId}' to '{file.Filename}'";
+            var measurement = Stopwatch.Measure(log, logMessage, () => DownloadToFile(contentId.Id, file));
+
+            var size = file.GetFilesize();
+            transferSpeeds.AddDownloadSample(size, measurement);
+            hooks.OnFileDownloaded(size, contentId);
+
+            return file;
+        }
+
+        public LocalDataset DownloadStreamless(ContentId cid)
+        {
+            Log($"Downloading streamless '{cid}' (no-wait)");
+            return codexAccess.DownloadStreamless(cid);
+        }
+
+        public LocalDataset DownloadStreamlessWait(ContentId cid, ByteSize size)
+        {
+            Log($"Downloading streamless '{cid}' (wait till finished)");
+
+            var sw = Stopwatch.Measure(log, nameof(DownloadStreamlessWait), () =>
+            {
+                var startSpace = Space();
+                var result = codexAccess.DownloadStreamless(cid);
+                WaitUntilQuotaUsedIncreased(startSpace, size);
+                return result;
+            });
+
+            return sw.Value;
+        }
+
+        public LocalDataset DownloadManifestOnly(ContentId cid)
+        {
+            Log($"Downloading manifest-only '{cid}'");
+            return codexAccess.DownloadManifestOnly(cid);
+        }
+
+        public LocalDatasetList LocalFiles()
+        {
+            return codexAccess.LocalFiles();
+        }
+
+        public CodexSpace Space()
+        {
+            return codexAccess.Space();
+        }
+
+        public void ConnectToPeer(ICodexNode node)
+        {
+            var peer = (CodexNode)node;
+
+            Log($"Connecting to peer {peer.GetName()}...");
+            var peerInfo = node.GetDebugInfo();
+            codexAccess.ConnectToPeer(peerInfo.Id, GetPeerMultiAddresses(peer, peerInfo));
+
+            Log($"Successfully connected to peer {peer.GetName()}.");
+        }
+
+        public void DeleteDataDirFolder()
+        {
+            codexAccess.DeleteDataDirFolder();
+        }
+
+        public void Stop(bool waitTillStopped)
+        {
+            Log("Stopping...");
+            hooks.OnNodeStopping();
+            codexAccess.Stop(waitTillStopped);
+        }
+
+        public IDownloadedLog DownloadLog(string additionalName = "")
+        {
+            return codexAccess.DownloadLog(additionalName);
+        }
+
+        public Address GetDiscoveryEndpoint()
+        {
+            return codexAccess.GetDiscoveryEndpoint();
+        }
+
+        public Address GetApiEndpoint()
+        {
+            return codexAccess.GetApiEndpoint();
+        }
+
+        public Address GetListenEndpoint()
+        {
+            return codexAccess.GetListenEndpoint();
+        }
+
+        public Address GetMetricsScrapeTarget()
+        {
+            var address = codexAccess.GetMetricsEndpoint();
+            if (address == null) throw new Exception("Metrics ScrapeTarget accessed, but node was not started with EnableMetrics()");
+            return address;
+        }
+
+        public bool HasCrashed()
+        {
+            return codexAccess.HasCrashed();
+        }
+
+        public override string ToString()
+        {
+            return $"CodexNode:{GetName()}";
+        }
+
+        private void InitializePeerNodeId()
+        {
+            var debugInfo = Time.Retry(codexAccess.GetDebugInfo, "ensure online");
+            if (!debugInfo.Version.IsValid())
+            {
+                throw new Exception($"Invalid version information received from Codex node {GetName()}: {debugInfo.Version}");
+            }
+
+            peerId = debugInfo.Id;
+            nodeId = debugInfo.Table.LocalNode.NodeId;
+            Version = debugInfo.Version;
+        }
+
+        private void InitializeLogReplacements()
+        {
+            var nodeName = GetName();
+
+            log.AddStringReplace(peerId, nodeName);
+            log.AddStringReplace(CodexUtils.ToShortId(peerId), nodeName);
+            log.AddStringReplace(nodeId, nodeName);
+            log.AddStringReplace(CodexUtils.ToShortId(nodeId), nodeName);
+        }
+
+        private string[] GetPeerMultiAddresses(CodexNode peer, DebugInfo peerInfo)
+        {
+            var peerId = peer.GetDiscoveryEndpoint().Host
+                .Replace("http://", "")
+                .Replace("https://", "");
+
+            return peerInfo.Addrs.Select(a => a
+                .Replace("0.0.0.0", peerId))
+                .ToArray();
+        }
+
+        private void DownloadToFile(string contentId, TrackedFile file)
+        {
+            using var fileStream = File.OpenWrite(file.Filename);
+            var timeout = TimeSpan.FromMinutes(2.0); // todo: make this user-controllable.
+            try
+            {
+                // Type of stream generated by openAPI client does not support timeouts.
+                var start = DateTime.UtcNow;
+                var cts = new CancellationTokenSource();
+                var downloadTask = Task.Run(() =>
+                {
+                    using var downloadStream = codexAccess.DownloadFile(contentId);
+                    downloadStream.CopyTo(fileStream);
+                }, cts.Token);
+                
+                while (DateTime.UtcNow - start < timeout)
+                {
+                    if (downloadTask.IsFaulted) throw downloadTask.Exception;
+                    if (downloadTask.IsCompletedSuccessfully) return;
+                    Thread.Sleep(100);
+                }
+
+                cts.Cancel();
+                throw new TimeoutException($"Download of '{contentId}' timed out after {Time.FormatDuration(timeout)}");
+            }
+            catch (Exception ex)
+            {
+                Log($"Failed to download file '{contentId}': {ex}");
+                throw;
+            }
+        }
+
+        public void WaitUntilQuotaUsedIncreased(CodexSpace startSpace, ByteSize expectedIncreaseOfQuotaUsed)
+        {
+            WaitUntilQuotaUsedIncreased(startSpace, expectedIncreaseOfQuotaUsed, TimeSpan.FromMinutes(2));
+        }
+
+        public void WaitUntilQuotaUsedIncreased(
+            CodexSpace startSpace,
+            ByteSize expectedIncreaseOfQuotaUsed,
+            TimeSpan maxTimeout)
+        {
+            Log($"Waiting until quotaUsed " +
+                $"(start: {startSpace.QuotaUsedBytes}) " +
+                $"increases by {expectedIncreaseOfQuotaUsed} " +
+                $"to reach {startSpace.QuotaUsedBytes + expectedIncreaseOfQuotaUsed.SizeInBytes}");
+
+            var retry = new Retry($"Checking local space for quotaUsed increase of {expectedIncreaseOfQuotaUsed}",
+            maxTimeout: maxTimeout,
+            sleepAfterFail: TimeSpan.FromSeconds(3),
+            onFail: f => { });
+
+            retry.Run(() =>
+            {
+                var space = Space();
+                var increase = space.QuotaUsedBytes - startSpace.QuotaUsedBytes;
+
+                if (increase < expectedIncreaseOfQuotaUsed.SizeInBytes)
+                    throw new Exception($"Expected quota-used not reached. " +
+                        $"Expected increase: {expectedIncreaseOfQuotaUsed.SizeInBytes} " +
+                        $"Actual increase: {increase} " +
+                        $"Actual used: {space.QuotaUsedBytes}");
+            });
+        }
+
+        private void EnsureMarketplace()
+        {
+            if (codexAccess.GetEthAccount() == null) throw new Exception("Marketplace is not enabled for this Codex node. Please start it with the option '.EnableMarketplace(...)' to enable it.");
+        }
+
+        private void Log(string msg)
+        {
+            log.Log(msg);
+        }
+    }
+}
@@ -0,0 +1,52 @@
+using CodexClient.Hooks;
+using FileUtils;
+using Logging;
+using WebUtils;
+
+namespace CodexClient
+{
+    public class CodexNodeFactory
+    {
+        private readonly ILog log;
+        private readonly IFileManager fileManager;
+        private readonly CodexHooksFactory hooksFactory;
+        private readonly IHttpFactory httpFactory;
+        private readonly IProcessControlFactory processControlFactory;
+
+        public CodexNodeFactory(ILog log, IFileManager fileManager, CodexHooksFactory hooksFactory, IHttpFactory httpFactory, IProcessControlFactory processControlFactory)
+        {
+            this.log = log;
+            this.fileManager = fileManager;
+            this.hooksFactory = hooksFactory;
+            this.httpFactory = httpFactory;
+            this.processControlFactory = processControlFactory;
+        }
+
+        public CodexNodeFactory(ILog log, HttpFactory httpFactory, string dataDir)
+            : this(log, new FileManager(log, dataDir), new CodexHooksFactory(), httpFactory, new DoNothingProcessControlFactory())
+        {
+        }
+
+        public CodexNodeFactory(ILog log, string dataDir)
+            : this(log, new HttpFactory(log), dataDir)
+        {
+        }
+
+        public ICodexNode CreateCodexNode(ICodexInstance instance)
+        {
+            var processControl = processControlFactory.CreateProcessControl(instance);
+            var access = new CodexAccess(log, httpFactory, processControl, instance);
+            var hooks = hooksFactory.CreateHooks(access.GetName());
+            var marketplaceAccess = CreateMarketplaceAccess(instance, access, hooks);
+            var node =  new CodexNode(log, access, fileManager, marketplaceAccess, hooks);
+            node.Initialize();
+            return node;
+        }
+
+        private IMarketplaceAccess CreateMarketplaceAccess(ICodexInstance instance, CodexAccess access, ICodexNodeHooks hooks)
+        {
+            if (instance.EthAccount == null) return new MarketplaceUnavailable();
+            return new MarketplaceAccess(log, access, hooks);
+        }
+    }
+}
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using Utils;

-namespace CodexPlugin
+namespace CodexClient
 {
    public class DebugInfo
    {
@@ -109,6 +109,16 @@ namespace CodexPlugin
        {
            return HashCode.Combine(Id);
        }
+
+        public static bool operator ==(ContentId a, ContentId b)
+        {
+            return a.Id == b.Id;
+        }
+
+        public static bool operator !=(ContentId a, ContentId b)
+        {
+            return a.Id != b.Id;
+        }
    }

    public class CodexSpace
@@ -1,4 +1,4 @@
-namespace CodexPlugin
+namespace CodexClient
 {
    public static class CodexUtils
    {
@@ -1,7 +1,6 @@
-using GethPlugin;
-using Utils;
+using Utils;

-namespace CodexPlugin.Hooks
+namespace CodexClient.Hooks
 {
    public interface ICodexHooksProvider
    {
@@ -10,11 +9,14 @@ namespace CodexPlugin.Hooks

    public class CodexHooksFactory
    {
-        public ICodexHooksProvider Provider { get; set; } = new DoNothingHooksProvider();
+        public List<ICodexHooksProvider> Providers { get; } = new List<ICodexHooksProvider>();

        public ICodexNodeHooks CreateHooks(string nodeName)
        {
-            return Provider.CreateHooks(nodeName);
+            if (Providers.Count == 0) return new DoNothingCodexHooks();
+
+            var hooks = Providers.Select(p => p.CreateHooks(nodeName)).ToArray();
+            return new MuxingCodexNodeHooks(hooks);
        }
    }

@@ -44,7 +46,7 @@ namespace CodexPlugin.Hooks
        {
        }

-        public void OnNodeStarted(string peerId, string nodeId)
+        public void OnNodeStarted(ICodexNode node, string peerId, string nodeId)
        {
        }

@@ -0,0 +1,78 @@
+using Utils;
+
+namespace CodexClient.Hooks
+{
+    public interface ICodexNodeHooks
+    {
+        void OnNodeStarting(DateTime startUtc, string image, EthAccount? ethAccount);
+        void OnNodeStarted(ICodexNode node, string peerId, string nodeId);
+        void OnNodeStopping();
+        void OnFileUploading(string uid, ByteSize size);
+        void OnFileUploaded(string uid, ByteSize size, ContentId cid);
+        void OnFileDownloading(ContentId cid);
+        void OnFileDownloaded(ByteSize size, ContentId cid);
+        void OnStorageContractSubmitted(StoragePurchaseContract storagePurchaseContract);
+        void OnStorageContractUpdated(StoragePurchase purchaseStatus);
+        void OnStorageAvailabilityCreated(StorageAvailability response);
+    }
+
+    public class MuxingCodexNodeHooks : ICodexNodeHooks
+    {
+        private readonly ICodexNodeHooks[] backingHooks;
+
+        public MuxingCodexNodeHooks(ICodexNodeHooks[] backingHooks)
+        {
+            this.backingHooks = backingHooks;
+        }
+
+        public void OnFileDownloaded(ByteSize size, ContentId cid)
+        {
+            foreach (var h in backingHooks) h.OnFileDownloaded(size, cid);
+        }
+
+        public void OnFileDownloading(ContentId cid)
+        {
+            foreach (var h in backingHooks) h.OnFileDownloading(cid);
+        }
+
+        public void OnFileUploaded(string uid, ByteSize size, ContentId cid)
+        {
+            foreach (var h in backingHooks) h.OnFileUploaded(uid, size, cid);
+        }
+
+        public void OnFileUploading(string uid, ByteSize size)
+        {
+            foreach (var h in backingHooks) h.OnFileUploading(uid, size);
+        }
+
+        public void OnNodeStarted(ICodexNode node, string peerId, string nodeId)
+        {
+            foreach (var h in backingHooks) h.OnNodeStarted(node, peerId, nodeId);
+        }
+
+        public void OnNodeStarting(DateTime startUtc, string image, EthAccount? ethAccount)
+        {
+            foreach (var h in backingHooks) h.OnNodeStarting(startUtc, image, ethAccount);
+        }
+
+        public void OnNodeStopping()
+        {
+            foreach (var h in backingHooks) h.OnNodeStopping();
+        }
+
+        public void OnStorageAvailabilityCreated(StorageAvailability response)
+        {
+            foreach (var h in backingHooks) h.OnStorageAvailabilityCreated(response);
+        }
+
+        public void OnStorageContractSubmitted(StoragePurchaseContract storagePurchaseContract)
+        {
+            foreach (var h in backingHooks) h.OnStorageContractSubmitted(storagePurchaseContract);
+        }
+
+        public void OnStorageContractUpdated(StoragePurchase purchaseStatus)
+        {
+            foreach (var h in backingHooks) h.OnStorageContractUpdated(purchaseStatus);
+        }
+    }
+}
@@ -1,10 +1,9 @@
-using CodexContractsPlugin;
-using CodexOpenApi;
+using CodexOpenApi;
 using Newtonsoft.Json.Linq;
 using System.Numerics;
 using Utils;

-namespace CodexPlugin
+namespace CodexClient
 {
    public class Mapper
    {
@@ -15,9 +14,9 @@ namespace CodexPlugin
                Id = debugInfo.Id,
                Spr = debugInfo.Spr,
                Addrs = debugInfo.Addrs.ToArray(),
-                AnnounceAddresses = JArray(debugInfo.AdditionalProperties, "announceAddresses").Select(x => x.ToString()).ToArray(),
-                Version = MapDebugInfoVersion(JObject(debugInfo.AdditionalProperties, "codex")),
-                Table = MapDebugInfoTable(JObject(debugInfo.AdditionalProperties, "table"))
+                AnnounceAddresses = debugInfo.AnnounceAddresses.ToArray(),
+                Version = Map(debugInfo.Codex),
+                Table = Map(debugInfo.Table)
            };
        }

@@ -43,8 +42,8 @@ namespace CodexPlugin
            return new CodexOpenApi.SalesAvailabilityCREATE
            {
                Duration = ToDecInt(availability.MaxDuration.TotalSeconds),
-                MinPrice = ToDecInt(availability.MinPriceForTotalSpace),
-                MaxCollateral = ToDecInt(availability.MaxCollateral),
+                MinPricePerBytePerSecond = ToDecInt(availability.MinPricePerBytePerSecond),
+                TotalCollateral = ToDecInt(availability.TotalCollateral),
                TotalSize = ToDecInt(availability.TotalSpace.SizeInBytes)
            };
        }
@@ -55,27 +54,27 @@ namespace CodexPlugin
            {
                Duration = ToDecInt(purchase.Duration.TotalSeconds),
                ProofProbability = ToDecInt(purchase.ProofProbability),
-                Reward = ToDecInt(purchase.PricePerSlotPerSecond),
-                Collateral = ToDecInt(purchase.RequiredCollateral),
+                PricePerBytePerSecond = ToDecInt(purchase.PricePerBytePerSecond),
+                CollateralPerByte = ToDecInt(purchase.CollateralPerByte),
                Expiry = ToDecInt(purchase.Expiry.TotalSeconds),
                Nodes = Convert.ToInt32(purchase.MinRequiredNumberOfNodes),
                Tolerance = Convert.ToInt32(purchase.NodeFailureTolerance)
            };
        }

-        public StorageAvailability[] Map(ICollection<SalesAvailabilityREAD> availabilities)
+        public StorageAvailability[] Map(ICollection<CodexOpenApi.SalesAvailabilityREAD> availabilities)
        {
            return availabilities.Select(a => Map(a)).ToArray();
        }

-        public StorageAvailability Map(SalesAvailabilityREAD availability)
+        public StorageAvailability Map(CodexOpenApi.SalesAvailabilityREAD availability)
        {
            return new StorageAvailability
            (
                ToByteSize(availability.TotalSize),
                ToTimespan(availability.Duration),
-                new TestToken(ToBigIng(availability.MinPrice)),
-                new TestToken(ToBigIng(availability.MaxCollateral))
+                new TestToken(ToBigIng(availability.MinPricePerBytePerSecond)),
+                new TestToken(ToBigIng(availability.TotalCollateral))
            )
            {
                Id = availability.Id,
@@ -83,49 +82,80 @@ namespace CodexPlugin
            };
        }

-        // TODO: Fix openapi spec for this call.
-        //public StoragePurchase Map(CodexOpenApi.Purchase purchase)
-        //{
-        //    return new StoragePurchase(Map(purchase.Request))
-        //    {
-        //        State = purchase.State,
-        //        Error = purchase.Error
-        //    };
-        //}
+        public StoragePurchase Map(CodexOpenApi.Purchase purchase)
+        {
+            return new StoragePurchase
+            {
+                Request = Map(purchase.Request),
+                State = purchase.State.ToString(), //Map(purchase.State),
+                Error = purchase.Error
+            };
+        }

-        //public StorageRequest Map(CodexOpenApi.StorageRequest request)
-        //{
-        //    return new StorageRequest(Map(request.Ask), Map(request.Content))
-        //    {
-        //        Id = request.Id,
-        //        Client = request.Client,
-        //        Expiry = TimeSpan.FromSeconds(Convert.ToInt64(request.Expiry)),
-        //        Nonce = request.Nonce
-        //    };
-        //}
+        public StoragePurchaseState Map(PurchaseState purchaseState)
+        {
+            // TODO: to be re-enabled when marketplace api lines up with openapi.yaml.

-        //public StorageAsk Map(CodexOpenApi.StorageAsk ask)
-        //{
-        //    return new StorageAsk
-        //    {
-        //        Duration = TimeSpan.FromSeconds(Convert.ToInt64(ask.Duration)),
-        //        MaxSlotLoss = ask.MaxSlotLoss,
-        //        ProofProbability = ask.ProofProbability,
-        //        Reward = Convert.ToDecimal(ask.Reward).TstWei(),
-        //        Slots = ask.Slots,
-        //        SlotSize = new ByteSize(Convert.ToInt64(ask.SlotSize))
-        //    };
-        //}
+            // Explicit mapping: If the API changes, we will get compile errors here.
+            // That's what we want.
+            switch (purchaseState)
+            {
+                case PurchaseState.Cancelled:
+                    return StoragePurchaseState.Cancelled;
+                case PurchaseState.Error:
+                    return StoragePurchaseState.Error;
+                case PurchaseState.Failed:
+                    return StoragePurchaseState.Failed;
+                case PurchaseState.Finished:
+                    return StoragePurchaseState.Finished;
+                case PurchaseState.Pending:
+                    return StoragePurchaseState.Pending;
+                case PurchaseState.Started:
+                    return StoragePurchaseState.Started;
+                case PurchaseState.Submitted:
+                    return StoragePurchaseState.Submitted;
+                case PurchaseState.Unknown:
+                    return StoragePurchaseState.Unknown;
+            }

-        //public StorageContent Map(CodexOpenApi.Content content)
-        //{
-        //    return new StorageContent
-        //    {
-        //        Cid = content.Cid
-        //    };
-        //}
+            throw new Exception("API incompatibility detected. Unknown purchaseState: " + purchaseState.ToString());
+        }

-        public CodexSpace Map(Space space)
+        public StorageRequest Map(CodexOpenApi.StorageRequest request)
+        {
+            return new StorageRequest
+            {
+                Ask = Map(request.Ask),
+                Content = Map(request.Content),
+                Id = request.Id,
+                Client = request.Client,
+                Expiry = request.Expiry,
+                Nonce = request.Nonce
+            };
+        }
+
+        public StorageAsk Map(CodexOpenApi.StorageAsk ask)
+        {
+            return new StorageAsk
+            {
+                Duration = ask.Duration,
+                MaxSlotLoss = ask.MaxSlotLoss,
+                ProofProbability = ask.ProofProbability,
+                PricePerBytePerSecond = ask.PricePerBytePerSecond,
+                Slots = ask.Slots,
+                SlotSize = ask.SlotSize
+            };
+        }
+
+        public StorageContent Map(CodexOpenApi.Content content)
+        {
+            return new StorageContent
+            {
+                Cid = content.Cid
+            };
+        }
+
+        public CodexSpace Map(CodexOpenApi.Space space)
        {
            return new CodexSpace
            {
@@ -136,47 +166,45 @@ namespace CodexPlugin
            };
        }

-        private DebugInfoVersion MapDebugInfoVersion(JObject obj)
+        private DebugInfoVersion Map(CodexOpenApi.CodexVersion obj)
        {
            return new DebugInfoVersion
            {
-                Version = StringOrEmpty(obj, "version"),
-                Revision = StringOrEmpty(obj, "revision")
+                Version = obj.Version,
+                Revision = obj.Revision
            };
        }

-        private DebugInfoTable MapDebugInfoTable(JObject obj)
+        private DebugInfoTable Map(CodexOpenApi.PeersTable obj)
        {
            return new DebugInfoTable
            {
-                LocalNode = MapDebugInfoTableNode(obj.GetValue("localNode")),
-                Nodes = MapDebugInfoTableNodeArray(obj.GetValue("nodes") as JArray)
+                LocalNode = Map(obj.LocalNode),
+                Nodes = Map(obj.Nodes)
            };
        }

-        private DebugInfoTableNode MapDebugInfoTableNode(JToken? token)
+        private DebugInfoTableNode Map(CodexOpenApi.Node? token)
        {
-            var obj = token as JObject;
-            if (obj == null) return new DebugInfoTableNode();
-
+            if (token == null) return new DebugInfoTableNode();
            return new DebugInfoTableNode
            {
-                Address = StringOrEmpty(obj, "address"),
-                NodeId = StringOrEmpty(obj, "nodeId"),
-                PeerId = StringOrEmpty(obj, "peerId"),
-                Record = StringOrEmpty(obj, "record"),
-                Seen = Bool(obj, "seen")
+                Address = token.Address,
+                NodeId = token.NodeId,
+                PeerId = token.PeerId,
+                Record = token.Record,
+                Seen = token.Seen
            };
        }

-        private DebugInfoTableNode[] MapDebugInfoTableNodeArray(JArray? nodes)
+        private DebugInfoTableNode[] Map(ICollection<CodexOpenApi.Node> nodes)
        {
            if (nodes == null || nodes.Count == 0)
            {
                return new DebugInfoTableNode[0];
            }

-            return nodes.Select(MapDebugInfoTableNode).ToArray();
+            return nodes.Select(Map).ToArray();
        }

        private Manifest MapManifest(CodexOpenApi.ManifestItem manifest)
@@ -184,8 +212,8 @@ namespace CodexPlugin
            return new Manifest
            {
                BlockSize = new ByteSize(Convert.ToInt64(manifest.BlockSize)),
-                OriginalBytes = new ByteSize(Convert.ToInt64(manifest.OriginalBytes)),
-                RootHash = manifest.RootHash,
+                OriginalBytes = new ByteSize(Convert.ToInt64(manifest.DatasetSize)),
+                RootHash = manifest.TreeCid,
                Protected = manifest.Protected
            };
        }
@@ -1,8 +1,8 @@
-using CodexPlugin.Hooks;
+using CodexClient.Hooks;
 using Logging;
 using Utils;

-namespace CodexPlugin
+namespace CodexClient
 {
    public interface IMarketplaceAccess
    {
@@ -27,8 +27,12 @@ namespace CodexPlugin
        public IStoragePurchaseContract RequestStorage(StoragePurchaseRequest purchase)
        {
            purchase.Log(log);
+            var swResult = Stopwatch.Measure(log, nameof(RequestStorage), () =>
+            {
+                return codexAccess.RequestStorage(purchase);
+            });

-            var response = codexAccess.RequestStorage(purchase);
+            var response = swResult.Value;

            if (string.IsNullOrEmpty(response) ||
                response == "Unable to encode manifest" ||
@@ -42,12 +46,7 @@ namespace CodexPlugin

            Log($"Storage requested successfully. PurchaseId: '{response}'.");

-            var contract = new StoragePurchaseContract(log, codexAccess, response, purchase, hooks);
-            contract.WaitForStorageContractSubmitted();
-
-            hooks.OnStorageContractSubmitted(contract);
-
-            return contract;
+            return new StoragePurchaseContract(log, codexAccess, response, purchase, hooks);
        }

        public string MakeStorageAvailable(StorageAvailability availability)
@@ -72,7 +71,7 @@ namespace CodexPlugin

        private void Log(string msg)
        {
-            log.Log($"{codexAccess.Container.Containers.Single().Name} {msg}");
+            log.Log($"{codexAccess.GetName()} {msg}");
        }
    }

@@ -1,10 +1,7 @@
-using CodexContractsPlugin;
-using CodexOpenApi;
-using Logging;
-using System.Data;
+using Logging;
 using Utils;

-namespace CodexPlugin
+namespace CodexClient
 {
    public class StoragePurchaseRequest
    {
@@ -14,8 +11,8 @@ namespace CodexPlugin
        }

        public ContentId ContentId { get; set; }
-        public TestToken PricePerSlotPerSecond { get; set; } = 1.TstWei();
-        public TestToken RequiredCollateral { get; set; } = 1.TstWei();
+        public TestToken PricePerBytePerSecond { get; set; } = 1.TstWei();
+        public TestToken CollateralPerByte { get; set; } = 1.TstWei();
        public uint MinRequiredNumberOfNodes { get; set; }
        public uint NodeFailureTolerance { get; set; }
        public int ProofProbability { get; set; }
@@ -25,8 +22,8 @@ namespace CodexPlugin
        public void Log(ILog log)
        {
            log.Log($"Requesting storage for: {ContentId.Id}... (" +
-                $"pricePerSlotPerSecond: {PricePerSlotPerSecond}, " +
-                $"requiredCollateral: {RequiredCollateral}, " +
+                $"pricePerBytePerSecond: {PricePerBytePerSecond}, " +
+                $"collateralPerByte: {CollateralPerByte}, " +
                $"minRequiredNumberOfNodes: {MinRequiredNumberOfNodes}, " +
                $"nodeFailureTolerance: {NodeFailureTolerance}, " +
                $"proofProbability: {ProofProbability}, " +
@@ -40,6 +37,24 @@ namespace CodexPlugin
        public string State { get; set; } = string.Empty;
        public string Error { get; set; } = string.Empty;
        public StorageRequest Request { get; set; } = null!;
+
+        public bool IsCancelled => State.ToLowerInvariant().Contains("cancel");
+        public bool IsError => State.ToLowerInvariant().Contains("error");
+        public bool IsFinished => State.ToLowerInvariant().Contains("finished");
+        public bool IsStarted => State.ToLowerInvariant().Contains("started");
+        public bool IsSubmitted => State.ToLowerInvariant().Contains("submitted");
+    }
+
+    public enum StoragePurchaseState
+    {
+        Cancelled = 0,
+        Error = 1,
+        Failed = 2,
+        Finished = 3,
+        Pending = 4,
+        Started = 5,
+        Submitted = 6,
+        Unknown = 7,
    }

    public class StorageRequest
@@ -58,7 +73,7 @@ namespace CodexPlugin
        public string SlotSize { get; set; } = string.Empty;
        public string Duration { get; set; } = string.Empty;
        public string ProofProbability { get; set; } = string.Empty;
-        public string Reward { get; set; } = string.Empty;
+        public string PricePerBytePerSecond { get; set; } = string.Empty;
        public int MaxSlotLoss { get; set; }
    }

@@ -71,19 +86,19 @@ namespace CodexPlugin

    public class StorageAvailability
    {
-        public StorageAvailability(ByteSize totalSpace, TimeSpan maxDuration, TestToken minPriceForTotalSpace, TestToken maxCollateral)
+        public StorageAvailability(ByteSize totalSpace, TimeSpan maxDuration, TestToken minPricePerBytePerSecond, TestToken totalCollateral)
        {
            TotalSpace = totalSpace;
            MaxDuration = maxDuration;
-            MinPriceForTotalSpace = minPriceForTotalSpace;
-            MaxCollateral = maxCollateral;
+            MinPricePerBytePerSecond = minPricePerBytePerSecond;
+            TotalCollateral = totalCollateral;
        }

        public string Id { get; set; } = string.Empty;
        public ByteSize TotalSpace { get; }
        public TimeSpan MaxDuration { get; }
-        public TestToken MinPriceForTotalSpace { get; }
-        public TestToken MaxCollateral { get; } 
+        public TestToken MinPricePerBytePerSecond { get; }
+        public TestToken TotalCollateral { get; } 
        public ByteSize FreeSpace { get; set; } = ByteSize.Zero;

        public void Log(ILog log)
@@ -91,8 +106,8 @@ namespace CodexPlugin
            log.Log($"Storage Availability: (" +
                $"totalSize: {TotalSpace}, " +
                $"maxDuration: {Time.FormatDuration(MaxDuration)}, " + 
-                $"minPriceForTotalSpace: {MinPriceForTotalSpace}, " +
-                $"maxCollateral: {MaxCollateral})");
+                $"minPricePerBytePerSecond: {MinPricePerBytePerSecond}, " +
+                $"totalCollateral: {TotalCollateral})");
        }
    }
 }
@@ -0,0 +1,46 @@
+using Logging;
+
+namespace CodexClient
+{
+    public interface IProcessControlFactory
+    {
+        IProcessControl CreateProcessControl(ICodexInstance instance);
+    }
+
+    public interface IProcessControl
+    {
+        void Stop(bool waitTillStopped);
+        IDownloadedLog DownloadLog(LogFile file);
+        void DeleteDataDirFolder();
+        bool HasCrashed();
+    }
+
+    public class DoNothingProcessControlFactory : IProcessControlFactory
+    {
+        public IProcessControl CreateProcessControl(ICodexInstance instance)
+        {
+            return new DoNothingProcessControl();
+        }
+    }
+
+    public class DoNothingProcessControl : IProcessControl
+    {
+        public void DeleteDataDirFolder()
+        {
+        }
+
+        public IDownloadedLog DownloadLog(LogFile file)
+        {
+            throw new NotImplementedException("Not supported by DoNothingProcessControl");
+        }
+
+        public bool HasCrashed()
+        {
+            return false;
+        }
+
+        public void Stop(bool waitTillStopped)
+        {
+        }
+    }
+}
@@ -1,18 +1,20 @@
-using CodexPlugin.Hooks;
+using CodexClient.Hooks;
 using Logging;
 using Newtonsoft.Json;
 using Utils;

-namespace CodexPlugin
+namespace CodexClient
 {
    public interface IStoragePurchaseContract
    {
        string PurchaseId { get; }
        StoragePurchaseRequest Purchase { get; }
        ContentId ContentId { get; }
+        StoragePurchase? GetStatus();
        void WaitForStorageContractSubmitted();
        void WaitForStorageContractStarted();
        void WaitForStorageContractFinished();
+        void WaitForContractFailed();
    }

    public class StoragePurchaseContract : IStoragePurchaseContract
@@ -20,11 +22,13 @@ namespace CodexPlugin
        private readonly ILog log;
        private readonly CodexAccess codexAccess;
        private readonly ICodexNodeHooks hooks;
-        private readonly TimeSpan gracePeriod = TimeSpan.FromSeconds(30);
+        private readonly TimeSpan gracePeriod = TimeSpan.FromSeconds(60);
        private readonly DateTime contractPendingUtc = DateTime.UtcNow;
        private DateTime? contractSubmittedUtc = DateTime.UtcNow;
        private DateTime? contractStartedUtc;
        private DateTime? contractFinishedUtc;
+        private string lastState = string.Empty;
+        private ContentId encodedContentId = new ContentId();

        public StoragePurchaseContract(ILog log, CodexAccess codexAccess, string purchaseId, StoragePurchaseRequest purchase, ICodexNodeHooks hooks)
        {
@@ -33,21 +37,40 @@ namespace CodexPlugin
            PurchaseId = purchaseId;
            Purchase = purchase;
            this.hooks = hooks;
-            ContentId = new ContentId(codexAccess.GetPurchaseStatus(purchaseId).Request.Content.Cid);
        }

        public string PurchaseId { get; }
        public StoragePurchaseRequest Purchase { get; }
-        public ContentId ContentId { get; }
+        public ContentId ContentId
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(encodedContentId.Id)) GetStatus();
+                return encodedContentId;
+            }
+        }

        public TimeSpan? PendingToSubmitted => contractSubmittedUtc - contractPendingUtc;
        public TimeSpan? SubmittedToStarted => contractStartedUtc - contractSubmittedUtc;
        public TimeSpan? SubmittedToFinished => contractFinishedUtc - contractSubmittedUtc;

+        public StoragePurchase? GetStatus()
+        {
+            var status = codexAccess.GetPurchaseStatus(PurchaseId);
+            if (status != null)
+            {
+                encodedContentId = new ContentId(status.Request.Content.Cid);
+            }
+            return status;
+        }
+
        public void WaitForStorageContractSubmitted()
        {
-            WaitForStorageContractState(gracePeriod, "submitted", sleep: 200);
+            var timeout = Purchase.Expiry + gracePeriod;
+            var raiseHook = lastState != "submitted";
+            WaitForStorageContractState(timeout, "submitted", sleep: 200);
            contractSubmittedUtc = DateTime.UtcNow;
+            if (raiseHook) hooks.OnStorageContractSubmitted(this);
            LogSubmittedDuration();
            AssertDuration(PendingToSubmitted, gracePeriod, nameof(PendingToSubmitted));
        }
@@ -76,14 +99,19 @@ namespace CodexPlugin
            AssertDuration(SubmittedToFinished, timeout, nameof(SubmittedToFinished));
        }

-        public StoragePurchase GetPurchaseStatus(string purchaseId)
+        public void WaitForContractFailed()
        {
-            return codexAccess.GetPurchaseStatus(purchaseId);
+            if (!contractStartedUtc.HasValue)
+            {
+                WaitForStorageContractStarted();
+            }
+            var currentContractTime = DateTime.UtcNow - contractSubmittedUtc!.Value;
+            var timeout = (Purchase.Duration - currentContractTime) + gracePeriod;
+            WaitForStorageContractState(timeout, "failed");
        }

        private void WaitForStorageContractState(TimeSpan timeout, string desiredState, int sleep = 1000)
        {
-            var lastState = "";
            var waitStart = DateTime.UtcNow;

            Log($"Waiting for {Time.FormatDuration(timeout)} to reach state '{desiredState}'.");
@@ -115,7 +143,7 @@ namespace CodexPlugin
        private void LogSubmittedDuration()
        {
            Log($"Pending to Submitted in {Time.FormatDuration(PendingToSubmitted)} " +
-                $"( < {Time.FormatDuration(gracePeriod)})");
+                $"( < {Time.FormatDuration(Purchase.Expiry + gracePeriod)})");
        }

        private void LogStartedDuration()
@@ -1,6 +1,6 @@
 using Utils;

-namespace CodexPlugin
+namespace CodexClient
 {
    public interface ITransferSpeeds
    {
@@ -6,7 +6,7 @@ info:
  description: "List of endpoints and interfaces available to Codex API users"

 security:
-  - { }
+  - {}

 components:
  schemas:
@@ -50,9 +50,9 @@ components:
      type: string
      description: Address of Ethereum address

-    Reward:
+    PricePerBytePerSecond:
      type: string
-      description: The maximum amount of tokens paid per second per slot to hosts the client is willing to pay
+      description: The amount of tokens paid per byte per second per slot to hosts the client is willing to pay

    Duration:
      type: string
@@ -83,33 +83,46 @@ components:
        id:
          $ref: "#/components/schemas/PeerId"

-    ErasureParameters:
-      type: object
-      properties:
-        totalChunks:
-          type: integer
-
-    PoRParameters:
-      description: Parameters for Proof of Retrievability
-      type: object
-      properties:
-        u:
-          type: string
-        publicKey:
-          type: string
-        name:
-          type: string
-
    Content:
      type: object
      description: Parameters specifying the content
      properties:
        cid:
          $ref: "#/components/schemas/Cid"
-        erasure:
-          $ref: "#/components/schemas/ErasureParameters"
-        por:
-          $ref: "#/components/schemas/PoRParameters"
+
+    Node:
+      type: object
+      properties:
+        nodeId:
+          type: string
+        peerId:
+          type: string
+        record:
+          type: string
+        address:
+          type: string
+        seen:
+          type: boolean
+
+    CodexVersion:
+      type: object
+      properties:
+        version:
+          type: string
+          example: v0.1.7
+        revision:
+          type: string
+          example: 0c647d8
+
+    PeersTable:
+      type: object
+      properties:
+        localNode:
+          $ref: "#/components/schemas/Node"
+        nodes:
+          type: array
+          items:
+            $ref: "#/components/schemas/Node"

    DebugInfo:
      type: object
@@ -125,6 +138,14 @@ components:
          description: Path of the data repository where all nodes data are stored
        spr:
          $ref: "#/components/schemas/SPR"
+        announceAddresses:
+          type: array
+          items:
+            $ref: "#/components/schemas/MultiAddress"
+        table:
+          $ref: "#/components/schemas/PeersTable"
+        codex:
+          $ref: "#/components/schemas/CodexVersion"

    SalesAvailability:
      type: object
@@ -136,12 +157,12 @@ components:
          description: Total size of availability's storage in bytes as decimal string
        duration:
          $ref: "#/components/schemas/Duration"
-        minPrice:
+        minPricePerBytePerSecond:
          type: string
-          description: Minimal price paid (in amount of tokens) for the whole hosted request's slot for the request's duration as decimal string
-        maxCollateral:
+          description: Minimal price per byte per second paid (in amount of tokens) for the hosted request's slot for the request's duration as decimal string
+        totalCollateral:
          type: string
-          description: Maximum collateral user is willing to pay per filled Slot (in amount of tokens) as decimal string
+          description: Total collateral (in amount of tokens) that can be used for matching requests

    SalesAvailabilityREAD:
      allOf:
@@ -157,8 +178,8 @@ components:
        - $ref: "#/components/schemas/SalesAvailability"
        - required:
            - totalSize
-            - minPrice
-            - maxCollateral
+            - minPricePerBytePerSecond
+            - totalCollateral
            - duration

    Slot:
@@ -222,16 +243,16 @@ components:
    StorageRequestCreation:
      type: object
      required:
-        - reward
+        - pricePerBytePerSecond
        - duration
        - proofProbability
-        - collateral
+        - collateralPerByte
        - expiry
      properties:
        duration:
          $ref: "#/components/schemas/Duration"
-        reward:
-          $ref: "#/components/schemas/Reward"
+        pricePerBytePerSecond:
+          $ref: "#/components/schemas/PricePerBytePerSecond"
        proofProbability:
          $ref: "#/components/schemas/ProofProbability"
        nodes:
@@ -242,16 +263,16 @@ components:
          description: Additional number of nodes on top of the `nodes` property that can be lost before pronouncing the content lost
          type: integer
          default: 0
-        collateral:
+        collateralPerByte:
          type: string
-          description: Number as decimal string that represents how much collateral is asked from hosts that wants to fill a slots
+          description: Number as decimal string that represents how much collateral per byte is asked from hosts that wants to fill a slots
        expiry:
          type: string
          description: Number as decimal string that represents expiry threshold in seconds from when the Request is submitted. When the threshold is reached and the Request does not find requested amount of nodes to host the data, the Request is voided. The number of seconds can not be higher then the Request's duration itself.
    StorageAsk:
      type: object
      required:
-        - reward
+        - pricePerBytePerSecond
      properties:
        slots:
          description: Number of slots (eq. hosts) that the Request want to have the content spread over
@@ -263,8 +284,8 @@ components:
          $ref: "#/components/schemas/Duration"
        proofProbability:
          $ref: "#/components/schemas/ProofProbability"
-        reward:
-          $ref: "#/components/schemas/Reward"
+        pricePerBytePerSecond:
+          $ref: "#/components/schemas/PricePerBytePerSecond"
        maxSlotLoss:
          type: integer
          description: Max slots that can be lost without data considered to be lost
@@ -304,6 +325,7 @@ components:
            - unknown
        error:
          type: string
+          nullable: true
          description: If Request failed, then here is presented the error message
        request:
          $ref: "#/components/schemas/StorageRequest"
@@ -327,10 +349,10 @@ components:
    ManifestItem:
      type: object
      properties:
-        rootHash:
+        treeCid:
          $ref: "#/components/schemas/Cid"
-          description: "Root hash of the content"
-        originalBytes:
+          description: "Unique data identifier"
+        datasetSize:
          type: integer
          format: int64
          description: "Length of original content in bytes"
@@ -340,6 +362,16 @@ components:
        protected:
          type: boolean
          description: "Indicates if content is protected by erasure-coding"
+        filename:
+          type: string
+          nullable: true
+          description: "The original name of the uploaded content (optional)"
+          example: codex.png
+        mimetype:
+          type: string
+          nullable: true
+          description: "The original mimetype of the uploaded content (optional)"
+          example: image/png

    Space:
      type: object
@@ -351,15 +383,15 @@ components:
        quotaMaxBytes:
          type: integer
          format: int64
-          description: "Maximum storage space used by the node"
+          description: "Maximum storage space (in bytes) available for the node in Codex's local repository."
        quotaUsedBytes:
          type: integer
          format: int64
-          description: "Amount of storage space currently in use"
+          description: "Amount of storage space (in bytes) currently used for storing files in Codex's local repository."
        quotaReservedBytes:
          type: integer
          format: int64
-          description: "Amount of storage space reserved"
+          description: "Amount of storage reserved (in bytes) in the Codex's local repository for future use when storage requests will be picked up and hosted by the node using node's availabilities. This does not include the storage currently in use."

 servers:
  - url: "http://localhost:8080/api/codex/v1"
@@ -381,14 +413,14 @@ paths:
      description: |
        If `addrs` param is supplied, it will be used to dial the peer, otherwise the `peerId` is used
        to invoke peer discovery, if it succeeds the returned addresses will be used to dial.
-      tags: [ Node ]
+      tags: [Node]
      operationId: connectPeer
      parameters:
        - in: path
          name: peerId
          required: true
          schema:
-              $ref: "#/components/schemas/PeerId"
+            $ref: "#/components/schemas/PeerId"
          description: Peer that should be dialed.
        - in: query
          name: addrs
@@ -411,7 +443,7 @@ paths:
  "/data":
    get:
      summary: "Lists manifest CIDs stored locally in node."
-      tags: [ Data ]
+      tags: [Data]
      operationId: listData
      responses:
        "200":
@@ -425,12 +457,29 @@ paths:
          description: Invalid CID is specified
        "404":
          description: Content specified by the CID is not found
+        "422":
+          description: The content type is not a valid content type or the filename is not valid
        "500":
          description: Well it was bad-bad
    post:
      summary: "Upload a file in a streaming manner. Once finished, the file is stored in the node and can be retrieved by any node in the network using the returned CID."
-      tags: [ Data ]
+      tags: [Data]
      operationId: upload
+      parameters:
+        - name: content-type
+          in: header
+          required: false
+          description: The content type of the file. Must be valid.
+          schema:
+            type: string
+            example: "image/png"
+        - name: content-disposition
+          in: header
+          required: false
+          description: The content disposition used to send the filename.
+          schema:
+            type: string
+            example: 'attachment; filename="codex.png"'
      requestBody:
        content:
          application/octet-stream:
@@ -450,14 +499,14 @@ paths:
  "/data/{cid}":
    get:
      summary: "Download a file from the local node in a streaming manner. If the file is not available locally, a 404 is returned."
-      tags: [ Data ]
+      tags: [Data]
      operationId: downloadLocal
      parameters:
        - in: path
          name: cid
          required: true
          schema:
-              $ref: "#/components/schemas/Cid"
+            $ref: "#/components/schemas/Cid"
          description: File to be downloaded.

      responses:
@@ -476,16 +525,42 @@ paths:
          description: Well it was bad-bad

  "/data/{cid}/network":
-    get:
-      summary: "Download a file from the network in a streaming manner. If the file is not available locally, it will be retrieved from other nodes in the network if able."
-      tags: [ Data ]
+    post:
+      summary: "Download a file from the network to the local node if it's not available locally. Note: Download is performed async. Call can return before download is completed."
+      tags: [Data]
      operationId: downloadNetwork
      parameters:
        - in: path
          name: cid
          required: true
          schema:
-              $ref: "#/components/schemas/Cid"
+            $ref: "#/components/schemas/Cid"
+          description: "File to be downloaded."
+      responses:
+        "200":
+          description: Manifest information for download that has been started.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/DataItem"
+        "400":
+          description: Invalid CID is specified
+        "404":
+          description: Failed to download dataset manifest
+        "500":
+          description: Well it was bad-bad
+
+  "/data/{cid}/network/stream":
+    get:
+      summary: "Download a file from the network in a streaming manner. If the file is not available locally, it will be retrieved from other nodes in the network if able."
+      tags: [Data]
+      operationId: downloadNetworkStream
+      parameters:
+        - in: path
+          name: cid
+          required: true
+          schema:
+            $ref: "#/components/schemas/Cid"
          description: "File to be downloaded."
      responses:
        "200":
@@ -502,10 +577,36 @@ paths:
        "500":
          description: Well it was bad-bad

+  "/data/{cid}/network/manifest":
+    get:
+      summary: "Download only the dataset manifest from the network to the local node if it's not available locally."
+      tags: [Data]
+      operationId: downloadNetworkManifest
+      parameters:
+        - in: path
+          name: cid
+          required: true
+          schema:
+            $ref: "#/components/schemas/Cid"
+          description: "File for which the manifest is to be downloaded."
+      responses:
+        "200":
+          description: Manifest information.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/DataItem"
+        "400":
+          description: Invalid CID is specified
+        "404":
+          description: Failed to download dataset manifest
+        "500":
+          description: Well it was bad-bad
+
  "/space":
    get:
      summary: "Gets a summary of the storage space allocation of the node."
-      tags: [ Data ]
+      tags: [Data]
      operationId: space
      responses:
        "200":
@@ -521,7 +622,7 @@ paths:
  "/sales/slots":
    get:
      summary: "Returns active slots"
-      tags: [ Marketplace ]
+      tags: [Marketplace]
      operationId: getActiveSlots
      responses:
        "200":
@@ -539,7 +640,7 @@ paths:
  "/sales/slots/{slotId}":
    get:
      summary: "Returns active slot with id {slotId} for the host"
-      tags: [ Marketplace ]
+      tags: [Marketplace]
      operationId: getActiveSlotById
      parameters:
        - in: path
@@ -568,7 +669,7 @@ paths:
  "/sales/availability":
    get:
      summary: "Returns storage that is for sale"
-      tags: [ Marketplace ]
+      tags: [Marketplace]
      operationId: getAvailabilities
      responses:
        "200":
@@ -587,7 +688,7 @@ paths:
    post:
      summary: "Offers storage for sale"
      operationId: offerStorage
-      tags: [ Marketplace ]
+      tags: [Marketplace]
      requestBody:
        content:
          application/json:
@@ -615,7 +716,7 @@ paths:
        The new parameters will be only considered for new requests.
        Existing Requests linked to this Availability will continue as is.
      operationId: updateOfferedStorage
-      tags: [ Marketplace ]
+      tags: [Marketplace]
      parameters:
        - in: path
          name: id
@@ -647,7 +748,7 @@ paths:
      summary: "Get availability's reservations"
      description: Return's list of Reservations for ongoing Storage Requests that the node hosts.
      operationId: getReservations
-      tags: [ Marketplace ]
+      tags: [Marketplace]
      parameters:
        - in: path
          name: id
@@ -676,7 +777,7 @@ paths:
  "/storage/request/{cid}":
    post:
      summary: "Creates a new Request for storage"
-      tags: [ Marketplace ]
+      tags: [Marketplace]
      operationId: createStorageRequest
      parameters:
        - in: path
@@ -707,7 +808,7 @@ paths:
  "/storage/purchases":
    get:
      summary: "Returns list of purchase IDs"
-      tags: [ Marketplace ]
+      tags: [Marketplace]
      operationId: getPurchases
      responses:
        "200":
@@ -724,7 +825,7 @@ paths:
  "/storage/purchases/{id}":
    get:
      summary: "Returns purchase details"
-      tags: [ Marketplace ]
+      tags: [Marketplace]
      operationId: getPurchase
      parameters:
        - in: path
@@ -747,11 +848,11 @@ paths:
        "503":
          description: Persistence is not enabled

-  "/node/spr":
+  "/spr":
    get:
      summary: "Get Node's SPR"
      operationId: getSPR
-      tags: [ Node ]
+      tags: [Node]
      responses:
        "200":
          description: Node's SPR
@@ -765,11 +866,11 @@ paths:
        "503":
          description: Node SPR not ready, try again later

-  "/node/peerid":
+  "/peerid":
    get:
      summary: "Get Node's PeerID"
      operationId: getPeerId
-      tags: [ Node ]
+      tags: [Node]
      responses:
        "200":
          description: Node's Peer ID
@@ -784,7 +885,7 @@ paths:
  "/debug/chronicles/loglevel":
    post:
      summary: "Set log level at run time"
-      tags: [ Debug ]
+      tags: [Debug]
      operationId: setDebugLogLevel

      parameters:
@@ -806,11 +907,11 @@ paths:
    get:
      summary: "Gets node information"
      operationId: getDebugInfo
-      tags: [ Debug ]
+      tags: [Debug]
      responses:
        "200":
          description: Node's information
          content:
            application/json:
              schema:
-                $ref: "#/components/schemas/DebugInfo"
+                $ref: "#/components/schemas/DebugInfo"
@@ -1,4 +1,5 @@
 using CodexContractsPlugin.Marketplace;
+using System.Collections.Generic;
 using Utils;

 namespace CodexContractsPlugin.ChainMonitor
@@ -12,7 +13,9 @@ namespace CodexContractsPlugin.ChainMonitor
            RequestCancelledEventDTO[] cancelled,
            RequestFailedEventDTO[] failed,
            SlotFilledEventDTO[] slotFilled,
-            SlotFreedEventDTO[] slotFreed
+            SlotFreedEventDTO[] slotFreed,
+            SlotReservationsFullEventDTO[] slotReservationsFull,
+            ProofSubmittedEventDTO[] proofSubmitted
            )
        {
            BlockInterval = blockInterval;
@@ -22,6 +25,9 @@ namespace CodexContractsPlugin.ChainMonitor
            Failed = failed;
            SlotFilled = slotFilled;
            SlotFreed = slotFreed;
+            SlotReservationsFull = slotReservationsFull;
+            ProofSubmitted = proofSubmitted;
+            All = ConcatAll<IHasBlock>(requests, fulfilled, cancelled, failed, slotFilled, SlotFreed, SlotReservationsFull, ProofSubmitted);
        }

        public BlockInterval BlockInterval { get; }
@@ -31,21 +37,9 @@ namespace CodexContractsPlugin.ChainMonitor
        public RequestFailedEventDTO[] Failed { get; }
        public SlotFilledEventDTO[] SlotFilled { get; }
        public SlotFreedEventDTO[] SlotFreed { get; }
-
-        public IHasBlock[] All
-        {
-            get
-            {
-                var all = new List<IHasBlock>();
-                all.AddRange(Requests);
-                all.AddRange(Fulfilled);
-                all.AddRange(Cancelled);
-                all.AddRange(Failed);
-                all.AddRange(SlotFilled);
-                all.AddRange(SlotFreed);
-                return all.ToArray();
-            }
-        }
+        public SlotReservationsFullEventDTO[] SlotReservationsFull { get; }
+        public ProofSubmittedEventDTO[] ProofSubmitted { get; }
+        public IHasBlock[] All { get; }

        public static ChainEvents FromBlockInterval(ICodexContracts contracts, BlockInterval blockInterval)
        {
@@ -66,8 +60,20 @@ namespace CodexContractsPlugin.ChainMonitor
                events.GetRequestCancelledEvents(),
                events.GetRequestFailedEvents(),
                events.GetSlotFilledEvents(),
-                events.GetSlotFreedEvents()
+                events.GetSlotFreedEvents(),
+                events.GetSlotReservationsFullEvents(),
+                events.GetProofSubmittedEvents()
            );
        }
+
+        private T[] ConcatAll<T>(params T[][] arrays)
+        {
+            var result = Array.Empty<T>();
+            foreach (var array in arrays)
+            {
+                result = result.Concat(array).ToArray();
+            }
+            return result;
+        }
    }
 }
@@ -1,7 +1,7 @@
-using CodexContractsPlugin.Marketplace;
+using BlockchainUtils;
+using CodexContractsPlugin.Marketplace;
 using GethPlugin;
 using Logging;
-using NethereumWorkflow.BlockUtils;
 using System.Numerics;
 using Utils;

@@ -16,6 +16,9 @@ namespace CodexContractsPlugin.ChainMonitor
        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 OnProofSubmitted(BlockTimeEntry block, string id);
+        void OnError(string msg);
    }

    public class RequestEvent
@@ -36,17 +39,21 @@ namespace CodexContractsPlugin.ChainMonitor
        private readonly ILog log;
        private readonly ICodexContracts contracts;
        private readonly IChainStateChangeHandler handler;
+        private readonly bool doProofPeriodMonitoring;

-        public ChainState(ILog log, ICodexContracts contracts, IChainStateChangeHandler changeHandler, DateTime startUtc)
+        public ChainState(ILog log, ICodexContracts contracts, IChainStateChangeHandler changeHandler, DateTime startUtc, bool doProofPeriodMonitoring)
        {
            this.log = new LogPrefixer(log, "(ChainState) ");
            this.contracts = contracts;
            handler = changeHandler;
+            this.doProofPeriodMonitoring = doProofPeriodMonitoring;
            TotalSpan = new TimeRange(startUtc, startUtc);
+            PeriodMonitor = new PeriodMonitor(this.log, contracts);
        }

        public TimeRange TotalSpan { get; private set; }
        public IChainStateRequest[] Requests => requests.ToArray();
+        public PeriodMonitor PeriodMonitor { get; }

        public int Update()
        {
@@ -66,13 +73,18 @@ namespace CodexContractsPlugin.ChainMonitor
        private void Apply(ChainEvents events)
        {
            if (events.BlockInterval.TimeRange.From < TotalSpan.From)
-                throw new Exception("Attempt to update ChainState with set of events from before its current record.");
+            {
+                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}");
+            log.Log($"ChainState updating: {events.BlockInterval} = {events.All.Length} events.");

            // Run through each block and apply the events to the state in order.
            var span = events.BlockInterval.TimeRange.Duration;
            var numBlocks = events.BlockInterval.NumberOfBlocks;
+            if (numBlocks == 0) return;
            var spanPerBlock = span / numBlocks;

            var eventUtc = events.BlockInterval.TimeRange.From;
@@ -80,11 +92,18 @@ namespace CodexContractsPlugin.ChainMonitor
            {
                var blockEvents = events.All.Where(e => e.Block.BlockNumber == b).ToArray();
                ApplyEvents(b, blockEvents, eventUtc);
+                UpdatePeriodMonitor(b, eventUtc);

                eventUtc += spanPerBlock;
            }
        }

+        private void UpdatePeriodMonitor(ulong blockNumber, DateTime eventUtc)
+        {
+            if (!doProofPeriodMonitoring) return;
+            PeriodMonitor.Update(blockNumber, eventUtc, Requests);
+        }
+
        private void ApplyEvents(ulong blockNumber, IHasBlock[] blockEvents, DateTime eventsUtc)
        {
            foreach (var e in blockEvents)
@@ -109,7 +128,7 @@ namespace CodexContractsPlugin.ChainMonitor

        private void ApplyEvent(RequestFulfilledEventDTO @event)
        {
-            var r = FindRequest(@event.RequestId);
+            var r = FindRequest(@event);
            if (r == null) return;
            r.UpdateState(@event.Block.BlockNumber, RequestState.Started);
            handler.OnRequestFulfilled(new RequestEvent(@event.Block, r));
@@ -117,7 +136,7 @@ namespace CodexContractsPlugin.ChainMonitor

        private void ApplyEvent(RequestCancelledEventDTO @event)
        {
-            var r = FindRequest(@event.RequestId);
+            var r = FindRequest(@event);
            if (r == null) return;
            r.UpdateState(@event.Block.BlockNumber, RequestState.Cancelled);
            handler.OnRequestCancelled(new RequestEvent(@event.Block, r));
@@ -125,7 +144,7 @@ namespace CodexContractsPlugin.ChainMonitor

        private void ApplyEvent(RequestFailedEventDTO @event)
        {
-            var r = FindRequest(@event.RequestId);
+            var r = FindRequest(@event);
            if (r == null) return;
            r.UpdateState(@event.Block.BlockNumber, RequestState.Failed);
            handler.OnRequestFailed(new RequestEvent(@event.Block, r));
@@ -133,7 +152,7 @@ namespace CodexContractsPlugin.ChainMonitor

        private void ApplyEvent(SlotFilledEventDTO @event)
        {
-            var r = FindRequest(@event.RequestId);
+            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})");
@@ -142,13 +161,28 @@ namespace CodexContractsPlugin.ChainMonitor

        private void ApplyEvent(SlotFreedEventDTO @event)
        {
-            var r = FindRequest(@event.RequestId);
+            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 ApplyEvent(ProofSubmittedEventDTO @event)
+        {
+            var id = Base58.Encode(@event.Id);
+            log.Log($"[{@event.Block.BlockNumber}] Proof submitted (id:{id})");
+            handler.OnProofSubmitted(@event.Block, id);
+        }
+
        private void ApplyTimeImplicitEvents(ulong blockNumber, DateTime eventsUtc)
        {
            foreach (var r in requests)
@@ -162,10 +196,23 @@ namespace CodexContractsPlugin.ChainMonitor
            }
        }

-        private ChainStateRequest? FindRequest(byte[] requestId)
+        private ChainStateRequest? FindRequest(IHasRequestId request)
        {
-            var r = requests.SingleOrDefault(r => Equal(r.Request.RequestId, requestId));
-            if (r == null) log.Log("Unable to find request by ID!");
+            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;
        }

@@ -1,10 +1,6 @@
-using GethPlugin;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using BlockchainUtils;
 using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
+using Utils;

 namespace CodexContractsPlugin.ChainMonitor
 {
@@ -51,5 +47,20 @@ namespace CodexContractsPlugin.ChainMonitor
        {
            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);
+        }
+
+        public void OnProofSubmitted(BlockTimeEntry block, string id)
+        {
+            foreach (var handler in Handlers) handler.OnProofSubmitted(block, id);
+        }
    }
 }
@@ -1,6 +1,6 @@
 using CodexContractsPlugin.Marketplace;
-using GethPlugin;
 using Logging;
+using Utils;

 namespace CodexContractsPlugin.ChainMonitor
 {
@@ -1,5 +1,6 @@
-using GethPlugin;
+using BlockchainUtils;
 using System.Numerics;
+using Utils;

 namespace CodexContractsPlugin.ChainMonitor
 {
@@ -32,5 +33,17 @@ namespace CodexContractsPlugin.ChainMonitor
        public void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex)
        {
        }
+
+        public void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex)
+        {
+        }
+
+        public void OnError(string msg)
+        {
+        }
+
+        public void OnProofSubmitted(BlockTimeEntry block, string id)
+        {
+        }
    }
 }
@@ -0,0 +1,99 @@
+using Logging;
+using Utils;
+
+namespace CodexContractsPlugin.ChainMonitor
+{
+    public class PeriodMonitor
+    {
+        private readonly ILog log;
+        private readonly ICodexContracts contracts;
+        private readonly List<PeriodReport> reports = new List<PeriodReport>();
+        private ulong? currentPeriod = null;
+
+        public PeriodMonitor(ILog log, ICodexContracts contracts)
+        {
+            this.log = log;
+            this.contracts = contracts;
+        }
+
+        public void Update(ulong blockNumber, DateTime eventUtc, IChainStateRequest[] requests)
+        {
+            var period = contracts.GetPeriodNumber(eventUtc);
+            if (!currentPeriod.HasValue)
+            {
+                currentPeriod = period;
+                return;
+            }
+            if (period == currentPeriod.Value) return;
+
+            CreateReportForPeriod(blockNumber - 1, currentPeriod.Value, requests);
+            currentPeriod = period;
+        }
+
+        public PeriodReport[] GetAndClearReports()
+        {
+            var result = reports.ToArray();
+            reports.Clear();
+            return result;
+        }
+
+        private void CreateReportForPeriod(ulong lastBlockInPeriod, ulong periodNumber, IChainStateRequest[] requests)
+        {
+            log.Log("Creating report for period " + periodNumber);
+
+            ulong total = 0;
+            ulong required = 0;
+            var missed = new List<PeriodProofMissed>();
+            foreach (var request in requests)
+            {
+                for (ulong slotIndex = 0; slotIndex < request.Request.Ask.Slots; slotIndex++)
+                {
+                    var state = contracts.GetProofState(request.Request, slotIndex, lastBlockInPeriod, periodNumber);
+
+                    total++;
+                    if (state.Required)
+                    {
+                        required++;
+                        if (state.Missing)
+                        {
+                            var idx = Convert.ToInt32(slotIndex);
+                            var host = request.Hosts.GetHost(idx);
+                            missed.Add(new PeriodProofMissed(host, request, idx));
+                        }
+                    }
+                }
+            }
+            reports.Add(new PeriodReport(periodNumber, total, required, missed.ToArray()));
+        }
+    }
+
+    public class PeriodReport
+    {
+        public PeriodReport(ulong periodNumber, ulong totalNumSlots, ulong totalProofsRequired, PeriodProofMissed[] missedProofs)
+        {
+            PeriodNumber = periodNumber;
+            TotalNumSlots = totalNumSlots;
+            TotalProofsRequired = totalProofsRequired;
+            MissedProofs = missedProofs;
+        }
+
+        public ulong PeriodNumber { get; }
+        public ulong TotalNumSlots { get; }
+        public ulong TotalProofsRequired { get; }
+        public PeriodProofMissed[] MissedProofs { get; }
+    }
+
+    public class PeriodProofMissed
+    {
+        public PeriodProofMissed(EthAddress? host, IChainStateRequest request, int slotIndex)
+        {
+            Host = host;
+            Request = request;
+            SlotIndex = slotIndex;
+        }
+
+        public EthAddress? Host { get; }
+        public IChainStateRequest Request { get; }
+        public int SlotIndex { get; }
+    }
+}
@@ -1,7 +1,11 @@
-using CodexContractsPlugin.Marketplace;
+using BlockchainUtils;
+using CodexContractsPlugin.Marketplace;
 using GethPlugin;
 using Logging;
 using Nethereum.ABI;
+using Nethereum.ABI.FunctionEncoding.Attributes;
+using Nethereum.Contracts;
+using Nethereum.Hex.HexConvertors.Extensions;
 using Nethereum.Util;
 using NethereumWorkflow;
 using Newtonsoft.Json;
@@ -24,6 +28,21 @@ namespace CodexContractsPlugin
        ICodexContractsEvents GetEvents(BlockInterval blockInterval);
        EthAddress? GetSlotHost(Request storageRequest, decimal slotIndex);
        RequestState GetRequestState(Request request);
+        ulong GetPeriodNumber(DateTime utc);
+        void WaitUntilNextPeriod();
+        ProofState GetProofState(Request storageRequest, decimal slotIndex, ulong blockNumber, ulong period);
+    }
+
+    public class ProofState
+    {
+        public ProofState(bool required, bool missing)
+        {
+            Required = required;
+            Missing = missing;
+        }
+
+        public bool Required { get; }
+        public bool Missing { get; }
    }

    [JsonConverter(typeof(StringEnumConverter))]
@@ -86,19 +105,23 @@ namespace CodexContractsPlugin
            return new CodexContractsEvents(log, gethNode, Deployment, blockInterval);
        }

-        public EthAddress? GetSlotHost(Request storageRequest, decimal slotIndex)
+        public byte[] GetSlotId(Request request, decimal slotIndex)
        {
            var encoder = new ABIEncode();
            var encoded = encoder.GetABIEncoded(
-                new ABIValue("bytes32", storageRequest.RequestId),
+                new ABIValue("bytes32", request.RequestId),
                new ABIValue("uint256", slotIndex.ToBig())
            );

-            var hashed = Sha3Keccack.Current.CalculateHash(encoded);
+            return Sha3Keccack.Current.CalculateHash(encoded);
+        }

+        public EthAddress? GetSlotHost(Request storageRequest, decimal slotIndex)
+        {
+            var slotId = GetSlotId(storageRequest, slotIndex);
            var func = new GetHostFunction
            {
-                SlotId = hashed
+                SlotId = slotId
            };
            var address = gethNode.Call<GetHostFunction, string>(Deployment.MarketplaceAddress, func);
            if (string.IsNullOrEmpty(address)) return null;
@@ -114,6 +137,70 @@ namespace CodexContractsPlugin
            return gethNode.Call<RequestStateFunction, RequestState>(Deployment.MarketplaceAddress, func);
        }

+        public ulong GetPeriodNumber(DateTime utc)
+        {
+            DateTimeOffset utco = DateTime.SpecifyKind(utc, DateTimeKind.Utc);
+            var now = utco.ToUnixTimeSeconds();
+            var periodSeconds = (int)Deployment.Config.Proofs.Period;
+            var result = now / periodSeconds;
+            return Convert.ToUInt64(result);
+        }
+
+        public void WaitUntilNextPeriod()
+        {
+            log.Log("Waiting until next proof period...");
+            var now = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
+            var periodSeconds = (int)Deployment.Config.Proofs.Period;
+            var secondsLeft = now % periodSeconds;
+            Thread.Sleep(TimeSpan.FromSeconds(secondsLeft + 1));
+        }
+
+        public ProofState GetProofState(Request storageRequest, decimal slotIndex, ulong blockNumber, ulong period)
+        {
+            var slotId = GetSlotId(storageRequest, slotIndex);
+
+            var required = IsProofRequired(slotId, blockNumber);
+            if (!required) return new ProofState(false, false);
+
+            var missing = IsProofMissing(slotId, blockNumber, period);
+            return new ProofState(required, missing);
+        }
+
+        private bool IsProofRequired(byte[] slotId, ulong blockNumber)
+        {
+            var func = new IsProofRequiredFunction
+            {
+                Id = slotId
+            };
+            var result = gethNode.Call<IsProofRequiredFunction, IsProofRequiredOutputDTO>(Deployment.MarketplaceAddress, func, blockNumber);
+            return result.ReturnValue1;
+        }
+
+        private bool IsProofMissing(byte[] slotId, ulong blockNumber, ulong period)
+        {
+            try
+            {
+                var funcB = new MarkProofAsMissingFunction
+                {
+                    SlotId = slotId,
+                    Period = period
+                };
+                gethNode.Call<MarkProofAsMissingFunction>(Deployment.MarketplaceAddress, funcB, blockNumber);
+            }
+            catch (AggregateException exc)
+            {
+                if (exc.InnerExceptions.Count == 1)
+                {
+                    if (exc.InnerExceptions[0].GetType() == typeof(SmartContractCustomErrorRevertException))
+                    {
+                        return false;
+                    }
+                }
+                throw;
+            }
+            return true;
+        }
+
        private ContractInteractions StartInteraction()
        {
            return new ContractInteractions(log, gethNode);
@@ -1,7 +1,6 @@
 using GethPlugin;
 using KubernetesWorkflow;
 using KubernetesWorkflow.Recipe;
-using Logging;

 namespace CodexContractsPlugin
 {
@@ -1,14 +1,18 @@
-namespace CodexContractsPlugin
+using CodexContractsPlugin.Marketplace;
+
+namespace CodexContractsPlugin
 {
    public class CodexContractsDeployment
    {
-        public CodexContractsDeployment(string marketplaceAddress, string abi, string tokenAddress)
+        public CodexContractsDeployment(MarketplaceConfig config, string marketplaceAddress, string abi, string tokenAddress)
        {
+            Config = config;
            MarketplaceAddress = marketplaceAddress;
            Abi = abi;
            TokenAddress = tokenAddress;
        }

+        public MarketplaceConfig Config { get; }
        public string MarketplaceAddress { get; }
        public string Abi { get; }
        public string TokenAddress { get; }
@@ -1,8 +1,9 @@
-using CodexContractsPlugin.Marketplace;
+using BlockchainUtils;
+using CodexContractsPlugin.Marketplace;
 using GethPlugin;
 using Logging;
+using Nethereum.Contracts;
 using Nethereum.Hex.HexTypes;
-using NethereumWorkflow.BlockUtils;
 using Utils;

 namespace CodexContractsPlugin
@@ -16,6 +17,8 @@ namespace CodexContractsPlugin
        RequestFailedEventDTO[] GetRequestFailedEvents();
        SlotFilledEventDTO[] GetSlotFilledEvents();
        SlotFreedEventDTO[] GetSlotFreedEvents();
+        SlotReservationsFullEventDTO[] GetSlotReservationsFullEvents();
+        ProofSubmittedEventDTO[] GetProofSubmittedEvents();
    }

    public class CodexContractsEvents : ICodexContractsEvents
@@ -38,49 +41,32 @@ namespace CodexContractsPlugin
        {
            var events = gethNode.GetEvents<StorageRequestedEventDTO>(deployment.MarketplaceAddress, BlockInterval);
            var i = new ContractInteractions(log, gethNode);
-            return events
-            .Select(e =>
+            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();
+                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(e =>
-            {
-                var result = e.Event;
-                result.Block = GetBlock(e.Log.BlockNumber.ToUlong());
-                return result;
-            }).ToArray();
+            return events.Select(SetBlockOnEvent).ToArray();
        }

        public RequestCancelledEventDTO[] GetRequestCancelledEvents()
        {
            var events = gethNode.GetEvents<RequestCancelledEventDTO>(deployment.MarketplaceAddress, BlockInterval);
-            return events.Select(e =>
-            {
-                var result = e.Event;
-                result.Block = GetBlock(e.Log.BlockNumber.ToUlong());
-                return result;
-            }).ToArray();
+            return events.Select(SetBlockOnEvent).ToArray();
        }

        public RequestFailedEventDTO[] GetRequestFailedEvents()
        {
            var events = gethNode.GetEvents<RequestFailedEventDTO>(deployment.MarketplaceAddress, BlockInterval);
-            return events.Select(e =>
-            {
-                var result = e.Event;
-                result.Block = GetBlock(e.Log.BlockNumber.ToUlong());
-                return result;
-            }).ToArray();
+            return events.Select(SetBlockOnEvent).ToArray();
        }

        public SlotFilledEventDTO[] GetSlotFilledEvents()
@@ -98,12 +84,26 @@ namespace CodexContractsPlugin
        public SlotFreedEventDTO[] GetSlotFreedEvents()
        {
            var events = gethNode.GetEvents<SlotFreedEventDTO>(deployment.MarketplaceAddress, BlockInterval);
-            return events.Select(e =>
-            {
-                var result = e.Event;
-                result.Block = GetBlock(e.Log.BlockNumber.ToUlong());
-                return result;
-            }).ToArray();
+            return events.Select(SetBlockOnEvent).ToArray();
+        }
+
+        public SlotReservationsFullEventDTO[] GetSlotReservationsFullEvents()
+        {
+            var events = gethNode.GetEvents<SlotReservationsFullEventDTO>(deployment.MarketplaceAddress, BlockInterval);
+            return events.Select(SetBlockOnEvent).ToArray();
+        }
+
+        public ProofSubmittedEventDTO[] GetProofSubmittedEvents()
+        {
+            var events = gethNode.GetEvents<ProofSubmittedEventDTO>(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)
@@ -4,6 +4,7 @@ using GethPlugin;
 using KubernetesWorkflow;
 using KubernetesWorkflow.Types;
 using Logging;
+using Newtonsoft.Json;
 using Utils;

 namespace CodexContractsPlugin
@@ -34,6 +35,7 @@ namespace CodexContractsPlugin
            try
            {
                var result = DeployContract(container, workflow, gethNode);
+
                workflow.Stop(containers, waitTillStopped: false);
                Log("Container stopped.");
                return result;
@@ -75,9 +77,20 @@ namespace CodexContractsPlugin

            Time.WaitUntil(() => interaction.IsSynced(marketplaceAddress, abi), nameof(DeployContract));

-            Log("Synced. Codex SmartContracts deployed.");
+            Log("Synced. Codex SmartContracts deployed. Getting configuration...");

-            return new CodexContractsDeployment(marketplaceAddress, abi, tokenAddress);
+            var config = GetMarketplaceConfiguration(marketplaceAddress, gethNode);
+
+            Log("Got config: " + JsonConvert.SerializeObject(config));
+
+            return new CodexContractsDeployment(config, marketplaceAddress, abi, tokenAddress);
+        }
+
+        private MarketplaceConfig GetMarketplaceConfiguration(string marketplaceAddress, IGethNode gethNode)
+        {
+            var func = new ConfigurationFunctionBase();
+            var response = gethNode.Call<ConfigurationFunctionBase, ConfigurationOutputDTO>(marketplaceAddress, func);
+            return response.ReturnValue1;
        }

        private void EnsureCompatbility(string abi, string bytecode)
@@ -1,11 +1,12 @@
-using CodexContractsPlugin.Marketplace;
+using BlockchainUtils;
+using CodexContractsPlugin.Marketplace;
 using GethPlugin;
 using Logging;
 using Nethereum.ABI.FunctionEncoding.Attributes;
 using Nethereum.Contracts;
 using Nethereum.Hex.HexConvertors.Extensions;
-using NethereumWorkflow;
 using System.Numerics;
+using Utils;

 namespace CodexContractsPlugin
 {
@@ -23,9 +24,8 @@ namespace CodexContractsPlugin
        public string GetTokenAddress(string marketplaceAddress)
        {
            log.Debug(marketplaceAddress);
-            var function = new GetTokenFunction();
-
-            return gethNode.Call<GetTokenFunction, string>(marketplaceAddress, function);
+            var function = new TokenFunctionBase();
+            return gethNode.Call<TokenFunctionBase, string>(marketplaceAddress, function);
        }

        public string GetTokenName(string tokenAddress)
@@ -111,11 +111,6 @@ namespace CodexContractsPlugin
        }
    }

-    [Function("token", "address")]
-    public class GetTokenFunction : FunctionMessage
-    {
-    }
-
    [Function("name", "string")]
    public class GetTokenNameFunction : FunctionMessage
    {
@@ -1,7 +1,7 @@
 #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 BlockchainUtils;
 using Newtonsoft.Json;
+using Utils;

 namespace CodexContractsPlugin.Marketplace
 {
@@ -10,7 +10,12 @@ namespace CodexContractsPlugin.Marketplace
        BlockTimeEntry Block { get; set; }
    }

-    public partial class Request : RequestBase, IHasBlock
+    public interface IHasRequestId
+    {
+        byte[] RequestId { get; set; }
+    }
+
+    public partial class Request : RequestBase, IHasBlock, IHasRequestId
    {
        [JsonIgnore]
        public BlockTimeEntry Block { get; set; }
@@ -28,32 +33,44 @@ namespace CodexContractsPlugin.Marketplace
        }
    }

-    public partial class RequestFulfilledEventDTO : IHasBlock
+    public partial class RequestFulfilledEventDTO : IHasBlock, IHasRequestId
    {
        [JsonIgnore]
        public BlockTimeEntry Block { get; set; }
    }

-    public partial class RequestCancelledEventDTO : IHasBlock
+    public partial class RequestCancelledEventDTO : IHasBlock, IHasRequestId
    {
        [JsonIgnore]
        public BlockTimeEntry Block { get; set; }
    }

-    public partial class RequestFailedEventDTO : IHasBlock
+    public partial class RequestFailedEventDTO : IHasBlock, IHasRequestId
    {
        [JsonIgnore]
        public BlockTimeEntry Block { get; set; }
    }

-    public partial class SlotFilledEventDTO : IHasBlock
+    public partial class SlotFilledEventDTO : IHasBlock, IHasRequestId
    {
        [JsonIgnore]
        public BlockTimeEntry Block { get; set; }
        public EthAddress Host { get; set; }
    }

-    public partial class SlotFreedEventDTO : IHasBlock
+    public partial class SlotFreedEventDTO : IHasBlock, IHasRequestId
+    {
+        [JsonIgnore]
+        public BlockTimeEntry Block { get; set; }
+    }
+
+    public partial class SlotReservationsFullEventDTO : IHasBlock, IHasRequestId
+    {
+        [JsonIgnore]
+        public BlockTimeEntry Block { get; set; }
+    }
+
+    public partial class ProofSubmittedEventDTO : IHasBlock
    {
        [JsonIgnore]
        public BlockTimeEntry Block { get; set; }
@@ -1,4 +1,6 @@
-namespace CodexContractsPlugin
+using Utils;
+
+namespace CodexContractsPlugin
 {
    public class SelfUpdater
    {
@@ -41,24 +43,10 @@

        private string GetMarketplaceFilePath()
        {
-            var here = Directory.GetCurrentDirectory();
-            while (true)
-            {
-                var path = GetMarketplaceFile(here);
-                if (path != null) return path;
-
-                var parent = Directory.GetParent(here);
-                var up = parent?.FullName;
-                if (up == null || up == here) throw new Exception("Unable to locate ProjectPlugins folder. Unable to update contracts.");
-                here = up;
-            }
-        }
-
-        private string? GetMarketplaceFile(string root)
-        {
-            var path = Path.Combine(root, "ProjectPlugins", "CodexContractsPlugin", "Marketplace", "Marketplace.cs");
-            if (File.Exists(path)) return path;
-            return null;
+            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)
@@ -3,13 +3,14 @@ using KubernetesWorkflow.Types;
 using Logging;
 using System.Security.Cryptography;
 using System.Text;
+using Utils;

 namespace CodexPlugin
 {
    public class ApiChecker
    {
        // <INSERT-OPENAPI-YAML-HASH>
-        private const string OpenApiYamlHash = "6B-94-24-A4-D5-01-6F-12-E9-34-74-36-80-57-7A-3A-79-8C-E8-02-68-B7-05-DA-50-A0-5C-B1-02-B9-AE-C6";
+        private const string OpenApiYamlHash = "00-7D-C3-0B-D2-23-D6-6C-CA-C2-43-D0-9B-B4-63-FC-4F-FE-23-9F-B8-82-5F-3B-3F-6B-4F-1F-11-E9-48-16";
        private const string OpenApiFilePath = "/codex/openapi.yaml";
        private const string DisableEnvironmentVariable = "CODEXPLUGIN_DISABLE_APICHECK";

@@ -21,8 +22,9 @@ namespace CodexPlugin

        private const string Failure =
            "Codex API compatibility check failed! " +
-            "openapi.yaml used by CodexPlugin does not match openapi.yaml in Codex container. Please update the openapi.yaml in " +
-            "'ProjectPlugins/CodexPlugin' and rebuild this project. If you wish to disable API compatibility checking, please set " +
+            "openapi.yaml used by CodexPlugin does not match openapi.yaml in Codex container. The openapi.yaml in " +
+            "'ProjectPlugins/CodexPlugin' has been overwritten with the container one. " +
+            "Please and rebuild this project. If you wish to disable API compatibility checking, please set " +
            $"the environment variable '{DisableEnvironmentVariable}' or set the disable bool in 'ProjectPlugins/CodexPlugin/ApiChecker.cs'.";

        private static bool checkPassed = false;
@@ -71,10 +73,23 @@ namespace CodexPlugin
                return;
            }

+            OverwriteOpenApiYaml(containerApi);
+
            log.Error(Failure);
            throw new Exception(Failure);
        }

+        private void OverwriteOpenApiYaml(string containerApi)
+        {
+            Log("API compatibility check failed. Updating CodexPlugin...");
+            var openApiFilePath = Path.Combine(PluginPathUtils.ProjectPluginsDir, "CodexClient", "openapi.yaml");
+            if (!File.Exists(openApiFilePath)) throw new Exception("Unable to locate CodexClient/openapi.yaml. Expected: " + openApiFilePath);
+
+            File.Delete(openApiFilePath);
+            File.WriteAllText(openApiFilePath, containerApi);
+            Log("CodexClient/openapi.yaml has been updated.");
+        }
+
        private string Hash(string file)
        {
            var fileBytes = Encoding.ASCII.GetBytes(file
@@ -0,0 +1,156 @@
+using CodexClient;
+using Core;
+using Utils;
+using System.Diagnostics;
+
+namespace CodexPlugin
+{
+    public class BinaryCodexStarter : ICodexStarter
+    {
+        private readonly IPluginTools pluginTools;
+        private readonly ProcessControlMap processControlMap;
+        private readonly static NumberSource numberSource = new NumberSource(1);
+        private readonly static FreePortFinder freePortFinder = new FreePortFinder();
+        private readonly static object _lock = new object();
+        private readonly static string dataParentDir = "codex_disttest_datadirs";
+        private readonly static CodexExePath codexExePath = new CodexExePath();
+
+        static BinaryCodexStarter()
+        {
+            StopAllCodexProcesses();
+            DeleteParentDataDir();
+        }
+
+        public BinaryCodexStarter(IPluginTools pluginTools, ProcessControlMap processControlMap)
+        {
+            this.pluginTools = pluginTools;
+            this.processControlMap = processControlMap;
+        }
+
+        public ICodexInstance[] BringOnline(CodexSetup codexSetup)
+        {
+            lock (_lock)
+            {
+                LogSeparator();
+                Log($"Starting {codexSetup.Describe()}...");
+
+                return StartCodexBinaries(codexSetup, codexSetup.NumberOfNodes);
+            }
+        }
+
+        public void Decommission()
+        {
+            lock (_lock)
+            {
+                processControlMap.StopAll();
+            }
+        }
+
+        private ICodexInstance[] StartCodexBinaries(CodexStartupConfig startupConfig, int numberOfNodes)
+        {
+            var result = new List<ICodexInstance>();
+            for (var i = 0; i < numberOfNodes; i++)
+            {
+                result.Add(StartBinary(startupConfig));
+            }
+
+            return result.ToArray();
+        }
+
+        private ICodexInstance StartBinary(CodexStartupConfig config)
+        {
+            var name = GetName(config);
+            var dataDir = Path.Combine(dataParentDir, $"datadir_{numberSource.GetNextNumber()}");
+            var pconfig = new CodexProcessConfig(name, freePortFinder, dataDir);
+            Log(pconfig);
+
+            var factory = new CodexProcessRecipe(pconfig, codexExePath);
+            var recipe = factory.Initialize(config);
+
+            var startInfo = new ProcessStartInfo(
+                fileName: recipe.Cmd,
+                arguments: recipe.Args
+            );
+            //startInfo.UseShellExecute = true;
+            startInfo.RedirectStandardOutput = true;
+            startInfo.RedirectStandardError = true;
+
+            var process = Process.Start(startInfo);
+            if (process == null || process.HasExited)
+            {
+                throw new Exception("Failed to start");
+            }
+
+            var local = "localhost";
+            var instance = new CodexInstance(
+                name: name,
+                imageName: "binary",
+                startUtc: DateTime.UtcNow,
+                discoveryEndpoint: new Address("Disc", pconfig.LocalIpAddrs.ToString(), pconfig.DiscPort),
+                apiEndpoint: new Address("Api", "http://" + local, pconfig.ApiPort),
+                listenEndpoint: new Address("Listen", local, pconfig.ListenPort),
+                ethAccount: null,
+                metricsEndpoint: null
+            );
+
+            var pc = new BinaryProcessControl(pluginTools.GetLog(), process, pconfig);
+            processControlMap.Add(instance, pc);
+
+            return instance;
+        }
+
+        private string GetName(CodexStartupConfig config)
+        {
+            if (!string.IsNullOrEmpty(config.NameOverride))
+            {
+                return config.NameOverride + "_" + numberSource.GetNextNumber();
+            }
+            return "codex_" + numberSource.GetNextNumber();
+        }
+
+        private void LogSeparator()
+        {
+            Log("----------------------------------------------------------------------------");
+        }
+
+        private void Log(CodexProcessConfig pconfig)
+        {
+            Log(
+                "NodeConfig:Name=" + pconfig.Name +
+                "ApiPort=" + pconfig.ApiPort +
+                "DiscPort=" + pconfig.DiscPort +
+                "ListenPort=" + pconfig.ListenPort +
+                "DataDir=" + pconfig.DataDir
+            );
+        }
+
+        private void Log(string message)
+        {
+            pluginTools.GetLog().Log(message);
+        }
+
+        private static void DeleteParentDataDir()
+        {
+            if (Directory.Exists(dataParentDir))
+            {
+                Directory.Delete(dataParentDir, true);
+            }
+        }
+
+        private static void StopAllCodexProcesses()
+        {
+            var processes = Process.GetProcesses();
+            var codexes = processes.Where(p =>
+                p.ProcessName.ToLowerInvariant() == "codex" &&
+                p.MainModule != null &&
+                p.MainModule.FileName == codexExePath.Get()
+            ).ToArray();
+
+            foreach (var c in codexes)
+            {
+                c.Kill();
+                c.WaitForExit();
+            }
+        }
+    }
+}
@@ -0,0 +1,93 @@
+using System.Diagnostics;
+using CodexClient;
+using Logging;
+
+namespace CodexPlugin
+{
+    public class BinaryProcessControl : IProcessControl
+    {
+        private readonly LogFile logFile;
+        private readonly Process process;
+        private readonly CodexProcessConfig config;
+        private List<string> logBuffer = new List<string>();
+        private readonly object bufferLock = new object();
+        private readonly List<Task> streamTasks = new List<Task>();
+        private bool running;
+
+        public BinaryProcessControl(ILog log, Process process, CodexProcessConfig config)
+        {
+            logFile = log.CreateSubfile(config.Name);
+
+            running = true;
+            this.process = process;
+            this.config = config;
+            streamTasks.Add(Task.Run(() => ReadProcessStream(process.StandardOutput)));
+            streamTasks.Add(Task.Run(() => ReadProcessStream(process.StandardError)));
+            streamTasks.Add(Task.Run(() => WriteLog()));
+        }
+
+        private void ReadProcessStream(StreamReader reader)
+        {
+            while (running)
+            {
+                var line = reader.ReadLine();
+                if (!string.IsNullOrEmpty(line))
+                {
+                    lock (bufferLock)
+                    {
+                        logBuffer.Add(line);
+                    }
+                }
+            }
+        }
+
+        private void WriteLog()
+        {
+            while (running || logBuffer.Count > 0)
+            {
+                if (logBuffer.Count > 0)
+                {
+                    List<string> lines = null!;
+                    lock (bufferLock)
+                    {
+                        lines = logBuffer;
+                        logBuffer = new List<string>();
+                    }
+
+                    logFile.WriteRawMany(lines);
+                }
+                else Thread.Sleep(100);
+            }
+        }
+
+        public void DeleteDataDirFolder()
+        {
+            if (!Directory.Exists(config.DataDir)) throw new Exception("datadir not found");
+            Directory.Delete(config.DataDir, true);
+        }
+
+        public IDownloadedLog DownloadLog(LogFile file)
+        {
+            return new DownloadedLog(logFile, config.Name);
+        }
+
+        public bool HasCrashed()
+        {
+            return process.HasExited;
+        }
+
+        public void Stop(bool waitTillStopped)
+        {
+            running = false;
+            process.Kill();
+
+            if (waitTillStopped)
+            {
+                process.WaitForExit();
+                foreach (var t in streamTasks) t.Wait();
+            }
+
+            DeleteDataDirFolder();
+        }
+    }
+}
@@ -1,264 +0,0 @@
-using CodexOpenApi;
-using Core;
-using KubernetesWorkflow;
-using KubernetesWorkflow.Types;
-using Logging;
-using Newtonsoft.Json;
-using Utils;
-
-namespace CodexPlugin
-{
-    public class CodexAccess
-    {
-        private readonly ILog log;
-        private readonly IPluginTools tools;
-        private readonly Mapper mapper = new Mapper();
-
-        public CodexAccess(IPluginTools tools, RunningPod container, CrashWatcher crashWatcher)
-        {
-            this.tools = tools;
-            log = tools.GetLog();
-            Container = container;
-            CrashWatcher = crashWatcher;
-
-            CrashWatcher.Start();
-        }
-
-        public RunningPod Container { get; }
-        public CrashWatcher CrashWatcher { get; }
-
-        public DebugInfo GetDebugInfo()
-        {
-            return mapper.Map(OnCodex(api => api.GetDebugInfoAsync()));
-        }
-
-        public DebugPeer GetDebugPeer(string peerId)
-        {
-            // Cannot use openAPI: debug/peer endpoint is not specified there.
-            return CrashCheck(() =>
-            {
-                var endpoint = GetEndpoint();
-                var str = endpoint.HttpGetString($"debug/peer/{peerId}");
-
-                if (str.ToLowerInvariant() == "unable to find peer!")
-                {
-                    return new DebugPeer
-                    {
-                        IsPeerFound = false
-                    };
-                }
-
-                var result = endpoint.Deserialize<DebugPeer>(str);
-                result.IsPeerFound = true;
-                return result;
-            });
-        }
-
-        public void ConnectToPeer(string peerId, string[] peerMultiAddresses)
-        {
-            OnCodex(api =>
-            {
-                Time.Wait(api.ConnectPeerAsync(peerId, peerMultiAddresses));
-                return Task.FromResult(string.Empty);
-            });
-        }
-
-        public string UploadFile(FileStream fileStream, Action<Failure> onFailure)
-        {
-            return OnCodex(
-                api => api.UploadAsync(fileStream),
-                CreateRetryConfig(nameof(UploadFile), onFailure));
-        }
-
-        public Stream DownloadFile(string contentId, Action<Failure> onFailure)
-        {
-            var fileResponse = OnCodex(
-                api => api.DownloadNetworkAsync(contentId),
-                CreateRetryConfig(nameof(DownloadFile), onFailure));
-
-            if (fileResponse.StatusCode != 200) throw new Exception("Download failed with StatusCode: " + fileResponse.StatusCode);
-            return fileResponse.Stream;
-        }
-
-        public LocalDatasetList LocalFiles()
-        {
-            return mapper.Map(OnCodex(api => api.ListDataAsync()));
-        }
-
-        public StorageAvailability SalesAvailability(StorageAvailability request)
-        {
-            var body = mapper.Map(request);
-            var read = OnCodex<SalesAvailabilityREAD>(api => api.OfferStorageAsync(body));
-            return mapper.Map(read);
-        }
-
-        public StorageAvailability[] GetAvailabilities()
-        {
-            var collection = OnCodex<ICollection<SalesAvailabilityREAD>>(api => api.GetAvailabilitiesAsync());
-            return mapper.Map(collection);
-        }
-
-        public string RequestStorage(StoragePurchaseRequest request)
-        {
-            var body = mapper.Map(request);
-            return OnCodex<string>(api => api.CreateStorageRequestAsync(request.ContentId.Id, body));
-        }
-
-        public CodexSpace Space()
-        {
-            var space = OnCodex<Space>(api => api.SpaceAsync());
-            return mapper.Map(space);
-        }
-
-        public StoragePurchase GetPurchaseStatus(string purchaseId)
-        {
-            return CrashCheck(() =>
-            {
-                var endpoint = GetEndpoint();
-                return Time.Retry(() =>
-                {
-                    var str = endpoint.HttpGetString($"storage/purchases/{purchaseId}");
-                    if (string.IsNullOrEmpty(str)) throw new Exception("Empty response.");
-                    return JsonConvert.DeserializeObject<StoragePurchase>(str)!;
-                }, nameof(GetPurchaseStatus));
-            });
-
-            // TODO: current getpurchase api does not line up with its openapi spec.
-            // return mapper.Map(OnCodex(api => api.GetPurchaseAsync(purchaseId)));
-        }
-
-        public string GetName()
-        {
-            return Container.Name;
-        }
-
-        public PodInfo GetPodInfo()
-        {
-            var workflow = tools.CreateWorkflow();
-            return workflow.GetPodInfo(Container);
-        }
-
-        public void DeleteRepoFolder()
-        {
-            try
-            {
-                var containerNumber = Container.Containers.First().Recipe.Number;
-                var dataDir = $"datadir{containerNumber}";
-                var workflow = tools.CreateWorkflow();
-                workflow.ExecuteCommand(Container.Containers.First(), "rm", "-Rfv", $"/codex/{dataDir}/repo");
-                Log("Deleted repo folder.");
-            }
-            catch (Exception e)
-            {
-                Log("Unable to delete repo folder: " + e);
-            }
-        }
-
-        private T OnCodex<T>(Func<CodexApi, Task<T>> action)
-        {
-            var result = tools.CreateHttp(GetHttpId(), CheckContainerCrashed).OnClient(client => CallCodex(client, action));
-            return result;
-        }
-
-        private T OnCodex<T>(Func<CodexApi, Task<T>> action, Retry retry)
-        {
-            var result = tools.CreateHttp(GetHttpId(), CheckContainerCrashed).OnClient(client => CallCodex(client, action), retry);
-            return result;
-        }
-
-        private T CallCodex<T>(HttpClient client, Func<CodexApi, Task<T>> action)
-        {
-            var address = GetAddress();
-            var api = new CodexApi(client);
-            api.BaseUrl = $"{address.Host}:{address.Port}/api/codex/v1";
-            return CrashCheck(() => Time.Wait(action(api)));
-        }
-
-        private T CrashCheck<T>(Func<T> action)
-        {
-            try
-            {
-                return action();
-            }
-            finally
-            {
-                CrashWatcher.HasContainerCrashed();
-            }
-        }
-
-        private IEndpoint GetEndpoint()
-        {
-            return tools
-                .CreateHttp(GetHttpId(), CheckContainerCrashed)
-                .CreateEndpoint(GetAddress(), "/api/codex/v1/", Container.Name);
-        }
-
-        private Address GetAddress()
-        {
-            return Container.Containers.Single().GetAddress(CodexContainerRecipe.ApiPortTag);
-        }
-
-        private string GetHttpId()
-        {
-            return GetAddress().ToString();
-        }
-
-        private void CheckContainerCrashed(HttpClient client)
-        {
-            if (CrashWatcher.HasContainerCrashed()) throw new Exception($"Container {GetName()} has crashed.");
-        }
-
-        private Retry CreateRetryConfig(string description, Action<Failure> onFailure)
-        {
-            var timeSet = tools.TimeSet;
-
-            return new Retry(description, timeSet.HttpRetryTimeout(), timeSet.HttpCallRetryDelay(), failure =>
-            {
-                onFailure(failure);
-                Investigate(failure, timeSet);
-            });
-        }
-
-        private void Investigate(Failure failure, ITimeSet timeSet)
-        {
-            Log($"Retry {failure.TryNumber} took {Time.FormatDuration(failure.Duration)} and failed with '{failure.Exception}'. " +
-                $"(HTTP timeout = {Time.FormatDuration(timeSet.HttpCallTimeout())}) " +
-                $"Checking if node responds to debug/info...");
-
-            try
-            {
-                var debugInfo = GetDebugInfo();
-                if (string.IsNullOrEmpty(debugInfo.Spr))
-                {
-                    Log("Did not get value debug/info response.");
-                    Throw(failure);
-                }
-                else
-                {
-                    Log("Got valid response from debug/info.");
-                }
-            }
-            catch (Exception ex)
-            {
-                Log("Got exception from debug/info call: " + ex);
-                Throw(failure);
-            }
-
-            if (failure.Duration < timeSet.HttpCallTimeout())
-            {
-                Log("Retry failed within HTTP timeout duration.");
-                Throw(failure);
-            }
-        }
-
-        private void Throw(Failure failure)
-        {
-            throw failure.Exception;
-        }
-
-        private void Log(string msg)
-        {
-            log.Log($"{GetName()} {msg}");
-        }
-    }
-}
@@ -0,0 +1,70 @@
+using CodexClient;
+using Core;
+using KubernetesWorkflow;
+using KubernetesWorkflow.Types;
+using Logging;
+
+namespace CodexPlugin
+{
+    public class CodexContainerProcessControl : IProcessControl
+    {
+        private readonly IPluginTools tools;
+        private readonly RunningPod pod;
+        private readonly Action onStop;
+        private readonly ContainerCrashWatcher crashWatcher;
+
+        public CodexContainerProcessControl(IPluginTools tools, RunningPod pod, Action onStop)
+        {
+            this.tools = tools;
+            this.pod = pod;
+            this.onStop = onStop;
+
+            crashWatcher = tools.CreateWorkflow().CreateCrashWatcher(pod.Containers.Single());
+            crashWatcher.Start();
+        }
+
+        public void Stop(bool waitTillStopped)
+        {
+            Log($"Stopping node...");
+            crashWatcher.Stop();
+            var workflow = tools.CreateWorkflow();
+            workflow.Stop(pod, waitTillStopped);
+            onStop();
+            Log("Stopped.");
+        }
+
+        public IDownloadedLog DownloadLog(LogFile file)
+        {
+            var workflow = tools.CreateWorkflow();
+            return workflow.DownloadContainerLog(pod.Containers.Single());
+        }
+
+        public void DeleteDataDirFolder()
+        {
+            var container = pod.Containers.Single();
+
+            try
+            {
+                var dataDirVar = container.Recipe.EnvVars.Single(e => e.Name == "CODEX_DATA_DIR");
+                var dataDir = dataDirVar.Value;
+                var workflow = tools.CreateWorkflow();
+                workflow.ExecuteCommand(container, "rm", "-Rfv", $"/codex/{dataDir}/repo");
+                Log("Deleted repo folder.");
+            }
+            catch (Exception e)
+            {
+                Log("Unable to delete repo folder: " + e);
+            }
+        }
+
+        public bool HasCrashed()
+        {
+            return crashWatcher.HasCrashed();
+        }
+
+        private void Log(string message)
+        {
+            tools.GetLog().Log(message);
+        }
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ben	96510df5cf	Fixes too-frequent save of overview json. Resets failure count on upload.	2025-03-04 16:14:29 +01:00
Ben	07c3e5fc18	Adds proofSubmitted event	2025-03-04 15:58:45 +01:00
Ben	d6cd7762c4	Adds proof-period report to chain-events.	2025-03-04 15:24:25 +01:00
Ben	c5de3dcb4c	Fixes whitespace issue with geth env vars	2025-03-04 10:33:22 +01:00
Ben	37b98dbb05	adds balance checker to autoclient foldersaver	2025-03-04 10:03:55 +01:00
ThatBen	288ad81faa	sets timeout for contract submits to equal expiry	2025-03-03 18:56:18 +01:00
ThatBen	64e917f3c2	removes "codex" from warn-level log list	2025-03-03 17:12:02 +01:00
ThatBen	f33e343432	Sets log level at autoclient startup	2025-03-03 16:44:04 +01:00
ThatBen	855b627823	handles exception in GetPurchaseStatus	2025-03-03 16:27:10 +01:00
ThatBen	f58a42a1ca	Removes waitForSubmitted from RequestStorage call.	2025-03-03 15:56:52 +01:00
ThatBen	789852bf1a	Updates api. sets marketplace-infra log level	2025-03-03 15:46:43 +01:00
ThatBen	5c56e4796f	Debugs local file fetch	2025-02-28 16:45:14 +01:00
ThatBen	5dacffa720	debugging local files	2025-02-28 16:40:35 +01:00
ThatBen	9629060570	debugging resume-wait	2025-02-28 16:36:31 +01:00
ThatBen	7e37299deb	immediate saves, resumable waiting	2025-02-28 16:19:26 +01:00
ThatBen	eaa69bcc95	Logs duration of creating a storage request	2025-02-27 12:16:31 +01:00
ThatBen	df5efa4dde	Tests for local data expiry	2025-02-27 11:52:50 +01:00
ThatBen	320865460d	Log quota when checking	2025-02-27 11:04:04 +01:00
ThatBen	a96a9ce319	Considers local quota before uploading.	2025-02-27 10:53:35 +01:00
ThatBen	3ab1e2ea47	Use local-files api instead of download-manifest to detect existing files.	2025-02-27 10:18:35 +01:00
ThatBen	9b432ded46	oops forgot to save folderStatus after padding.	2025-02-27 10:09:03 +01:00
ThatBen	e862094014	Tracks whether work item has changed.	2025-02-27 09:22:57 +01:00
ThatBen	d701e2a73d	Applies padding for folder file. Adds stats.	2025-02-27 09:15:28 +01:00
Ben	22e37c15e5	sets entry filename	2025-02-26 16:24:11 +01:00
Ben	f7de11e9c2	Cleanup foldersaver mode	2025-02-26 16:18:42 +01:00
Ben	278b6c95c2	Sets autoclient long webcall timeout	2025-02-26 14:05:41 +01:00
Ben	fe75609ecb	Fix cid formatting in bot. Fix autoclient folder-uploader crash. Fix several openapi alignments.	2025-02-26 11:59:50 +01:00
Ben	3af71b1f66	Fixes marketplace api mismatch	2025-02-25 15:51:14 +01:00
Slava	3cd989c04a	ci: use common docker reusable workflow (#119 )	2025-02-25 08:24:02 +02:00
ThatBen	804423ec81	enables marketplace access for codex node used in autoclient	2025-02-22 14:41:05 +01:00
ThatBen	92a5a1e361	fixes crashwatcher stop	2025-02-21 15:21:42 +01:00
ThatBen	0c961b8348	updates marketplace contract, fixes type conversions	2025-02-21 14:17:13 +01:00
ThatBen	dc7a034566	Merge branch 'feature/containerless-codex' # Conflicts: # Tests/CodexReleaseTests/MarketTests/ContractSuccessfulTest.cs	2025-02-21 13:58:27 +01:00
ThatBen	3459547f20	update	2025-02-21 13:57:25 +01:00
ThatBen	5d9247f82f	Updates marketplace contracts	2025-02-19 12:36:29 +01:00
Ben	9e80b650c5	updates marketplace	2025-02-18 10:18:02 +01:00
Ben	ce6cbf59d2	Updates codex API	2025-02-12 13:55:55 +01:00
Ben	23fdc2d60a	Fixes marketplace release test	2025-02-04 13:52:30 +01:00
Ben	fee42c785e	Fixes collatoral issue for marketplace test	2025-02-04 10:13:59 +01:00
Ben	02d1292acc	Updates contract	2025-02-04 09:39:38 +01:00
Ben	1e035d6a68	Faster binary-process log writing	2025-02-03 10:47:37 +01:00
Ben	413a46c761	Fixes namespaces for experimental tests	2025-02-03 10:08:29 +01:00
ThatBen	c1e3e8be09	testing in progress	2025-01-31 14:24:55 +01:00
ThatBen	0784804fa4	workaround for downloading codex logs	2025-01-29 14:44:19 +01:00
ThatBen	8969e9a080	Merge branch 'master' into feature/containerless-codex	2025-01-29 10:26:28 +01:00
ThatBen	a62c6f5108	Setup single and multiple dataset test plans	2025-01-29 10:26:16 +01:00
ThatBen	e24d5e02f2	Fixes build for continuous tests	2025-01-28 15:29:25 +01:00
ThatBen	50e58dc799	cleanup on startup	2025-01-28 14:58:37 +01:00
ThatBen	b1197975a1	cleanup process and datadir after test stop	2025-01-28 11:21:47 +01:00
ThatBen	e4512438ed	working two-client test with binary instances	2025-01-27 15:45:46 +01:00
ThatBen	2c549c5410	extracts codex wrapper	2025-01-27 10:22:34 +01:00
ThatBen	d6afc6874b	Applies codexStarter interface	2025-01-27 09:59:19 +01:00
ThatBen	940b8122e7	Replaces Pod types on codex plugin and starter interface	2025-01-27 09:49:21 +01:00
ThatBen	2586f4a756	update	2025-01-25 14:11:50 +01:00
ThatBen	951da1888d	Merge branch 'master' into feature/containerless-codex # Conflicts: # Tools/AutoClient/CodexInstance.cs	2025-01-25 14:07:41 +01:00
ThatBen	caa0423bd5	Updates codex api	2025-01-25 14:07:15 +01:00
ThatBen	064fc241cb	classname for generated openapi client	2025-01-16 15:16:00 +01:00
ThatBen	1a8b7b79ef	wip	2025-01-16 15:13:16 +01:00
ThatBen	9a227b3d0e	lots of using-statement fixes	2025-01-16 13:51:29 +01:00
ThatBen	c73fa186fc	wip	2025-01-16 13:24:57 +01:00
ThatBen	4a151880d4	Extracts codexClient assembly	2025-01-16 11:31:50 +01:00
ThatBen	48f4614e5d	working container log connection	2025-01-16 10:21:03 +01:00
ThatBen	ec644eed4a	Moving downloadedlog to logging module	2025-01-16 10:15:02 +01:00
ThatBen	0c7b8fb33e	debugs rewiring	2025-01-15 16:24:36 +01:00
ThatBen	0aac2d8e98	wired up except for container log access	2025-01-15 16:05:57 +01:00
ThatBen	ee0193c879	wiring up started	2025-01-15 15:43:50 +01:00
ThatBen	e45ed0c21e	pushes container concepts out of codexAccess	2025-01-15 15:00:25 +01:00
ThatBen	2292d2e672	Removes container-related concepts from CodexNode type	2025-01-15 14:15:40 +01:00
ThatBen	8ef190baad	Fixes incorrect float formatting in metricsquery.	2025-01-15 10:40:57 +01:00
Ben	9461968bd3	Disables contract-failed market test.	2025-01-13 14:03:55 +01:00
benbierens	01cefcc008	Fixes mapping of announce addresses	2025-01-08 11:52:48 +01:00
benbierens	d13f6c94d3	Updates openapi.yaml	2025-01-08 11:11:28 +01:00
Ben	4801e33986	sets up combinatorials for swarm test	2024-12-18 12:54:12 +01:00
Ben	5b42b764fb	Adds streamless small-swarm test	2024-12-18 12:47:54 +01:00
Ben	2afcb92d08	removes combinatorial args from marketplace tests	2024-12-18 09:28:10 +01:00
Ben	a4ba1fbe2c	Restores parallel settings, fixes filename test-args formatting	2024-12-18 09:21:45 +01:00
Ben	8ee5eb5767	might have been false detection	2024-12-17 16:07:01 +01:00
Ben	70622cf923	connects blockCaches from test lifecycle	2024-12-17 16:06:06 +01:00
Ben	459cb2e981	setting up for support for parallel marketplace-enabled tests	2024-12-17 15:54:52 +01:00
Ben	95aa6fd4b2	Merge branch 'feature/folder-saver'	2024-12-16 15:03:50 +01:00
Ben	1d9f22c96d	Creates new overview after 3 new changes.	2024-12-16 15:03:39 +01:00
Slava	c24861e932	ci: run-release-tests workflow adjustment (#108 ) (#118 )	2024-12-16 15:30:51 +02:00
benbierens	8274c4da14	updates marketplace contracts	2024-12-13 09:35:42 +01:00
Ben	e45b8bde54	adds container names to container log filenames	2024-12-09 15:57:10 +01:00
Ben	1af216592a	Rewarder bot now sends initialization message to events channel	2024-12-09 10:17:47 +01:00
Ben	37f037c7b0	Fixes giving of altruistic role	2024-12-09 10:04:33 +01:00
benbierens	e19311cef9	Downloads 1 file per node at a time in swarm test.	2024-12-05 11:29:21 +01:00
benbierens	b8476f697e	Rainbow emojis for request-IDs!	2024-12-05 08:56:01 +01:00
Ben	3e2cad3c17	Fixes issue where occassionally a CID contains 'ERR' and fails the log assert.	2024-12-04 15:57:49 +01:00
Slava	770ba6dcdc	Pass repository and branch to release tests workflow (#108 ) (#117 )	2024-12-04 09:30:31 +02:00
Slava	5cecb63307	Add workflow_source to the inputs when workflow is called (#116 )	2024-12-03 14:59:28 +02:00
Ben	33153a2b76	Applies mutex in codex CidChecker	2024-12-03 08:50:50 +01:00
Slava	ac8f01c922	Fix job status check (#115 ) * Fix job status check * Add a delay before get Kubernetes job status	2024-12-02 17:30:48 +02:00
Slava	4ae17c5b1d	Make kubectl logs redundant for connection failure (#114 )	2024-12-02 16:38:02 +02:00
Ben	35e9dd5894	Reduces swarm size for smallswarm test	2024-12-02 15:37:50 +01:00
Slava	abf297263c	Use variable name properly (#113 )	2024-12-02 15:43:45 +02:00
Ben	ed764bc38c	wip	2024-12-02 14:04:17 +01:00
Slava	047384a7af	Set workflow status from Kubernetes job (#108 ) (#112 )	2024-12-02 14:59:57 +02:00
Ben	03c6b287cf	Adds how to run tests	2024-12-02 10:57:07 +01:00
Ben	d7c3fe6c5f	Fixes PeerTableTests of CodexReleaseTests	2024-12-02 10:34:09 +01:00
Slava	86d5ab22f6	Remove timestamp from Release tests logs (#111 )	2024-11-29 17:31:30 +02:00
benbierens	4bcdbf3e8c	Only check CID when purchase needs to be made	2024-11-29 16:22:49 +01:00
benbierens	f2442fc032	disables location selection for now	2024-11-29 09:24:43 +01:00
Ben Bierens	694b16fdd6	Merge pull request #110 from codex-storage/feature/release-tests-cleanup Release tests cleanup	2024-11-29 09:21:32 +01:00
benbierens	10b01362e0	Merge remote-tracking branch 'origin/feature/bot-assigns-altruisticmode-role'	2024-11-29 08:52:38 +01:00
Ben Bierens	7989cdd1a2	Merge pull request #106 from hackyguru/master Bot assigning 'Altruistic mode' role to user if the CID is valid and unique	2024-11-29 08:50:33 +01:00
Slava	58ed7ad41d	Add Release tests workflow and job template (#108 )	2024-11-28 20:15:38 +02:00
Slava	8d5f68609a	Adjust Docker entrypoint (#108 )	2024-11-28 19:57:28 +02:00
Slava	b5fd8954ba	Rename d-tests and c-tests jobs templates (#108 )	2024-11-28 19:56:32 +02:00
Ben	f84bba801b	Renames codexTests to experimentalTests	2024-11-28 09:42:58 +01:00
Ben	513853d929	Better safe-duration	2024-11-27 13:43:38 +01:00
benbierens	a40d5d77d7	Slow down logging when waiting for requests to start.	2024-11-27 11:35:56 +01:00
benbierens	23622245f0	cleaner log	2024-11-27 11:26:19 +01:00
benbierens	f2b84ebfd6	Stores encoded-CID in worker state	2024-11-27 11:09:47 +01:00
benbierens	9853a0b7db	Limits number of concurrently starting contracts	2024-11-27 10:44:05 +01:00
benbierens	025c85c1aa	fixes file-backed worker issue	2024-11-27 10:30:30 +01:00
benbierens	f0cbc0a53a	Debugging worker files	2024-11-27 10:25:52 +01:00
benbierens	e91a574b2c	writes overview CID to file	2024-11-27 10:18:33 +01:00
Ben	f18ff24bb6	savestate	2024-11-26 16:23:56 +01:00
Ben	529d48a758	show index	2024-11-26 16:22:43 +01:00
Ben	d136345df4	sleep	2024-11-26 16:19:54 +01:00
Ben	a3b9e7bf8d	Uploads zipfile with archive overview periodically	2024-11-26 16:15:28 +01:00
Ben	6f778ec04f	Fixes re-purchase issue	2024-11-26 15:57:34 +01:00
Ben	4b7ceda572	Split to files	2024-11-26 15:14:31 +01:00
Ben	797dc096da	Wraps up market tests for now	2024-11-26 14:52:24 +01:00
Ben	208cd2e8dc	Replaces CheckHistory config of rewarder bot with RelativeHistory with sane default for testnet.	2024-11-26 14:49:22 +01:00
Ben	db46a0c686	Logs at start of ensure-calls	2024-11-26 12:37:36 +01:00
Ben	c2df15436f	Merge branch 'master' into feature/folder-saver	2024-11-26 12:27:47 +01:00
Ben	dfa2322127	Setting up multiple-contracts test	2024-11-25 16:10:17 +01:00
Ben	92d504ef9c	Sets up github workflow for running release tests	2024-11-25 15:57:57 +01:00
Ben	4990bb2282	contract successful test passed	2024-11-25 15:45:09 +01:00
benbierens	d032b77abe	wip: withdraw funds	2024-11-22 16:09:18 +01:00
benbierens	e7a59de207	wip	2024-11-22 08:57:50 +01:00
Ben	fd3567347b	setting up marketplace tests	2024-11-21 15:30:56 +01:00
Ben	f67e67c493	Setting up market tests	2024-11-21 15:10:53 +01:00
Ben	339cf2b824	Peer table test	2024-11-21 14:34:13 +01:00
Ben	e743a1cd7b	basic info tests	2024-11-21 14:17:57 +01:00
Ben	7c4ad416d4	running data tests	2024-11-21 12:15:15 +01:00
Ben	cfb6297357	Implements streamless and manifestonly calls	2024-11-21 11:28:18 +01:00
Ben	f1f3b0f173	streamelss and manifestonly tests	2024-11-21 11:21:41 +01:00
Ben	704847001d	Sets up data tests	2024-11-21 10:46:11 +01:00
Ben	f4c622a1d3	setting up	2024-11-21 10:03:09 +01:00
Ben	3c7892e4be	Switches to latest, updates API	2024-11-21 09:39:28 +01:00
benbierens	833421b2b2	workaround for faulty local-dataset api match	2024-11-12 16:51:32 +01:00
benbierens	55cc0ab0ef	sets http client timeout to 1h	2024-11-11 16:21:58 +01:00
benbierens	0129af6fd7	for vm running	2024-11-11 16:12:25 +01:00
benbierens	d48caa44d6	stops autoclient after 5 failures	2024-11-11 13:41:02 +01:00
Ben	e0755a1101	Updates to 0.1.8. Fixes issue in blockchain monitor	2024-11-04 12:21:39 +01:00
Ben Bierens	1dd17037ba	Merge pull request #107 from codex-storage/feat/switch-docker-variable Use ETH_PRIVATE_KEY variable instead of deprecated PRIV_KEY	2024-11-04 12:02:55 +01:00
Slava	22e6439731	Use ETH_PRIVATE_KEY variable instead of deprecated PRIV_KEY https://github.com/codex-storage/nim-codex/pull/982	2024-11-04 12:36:25 +02:00
Kumaraguru	693880069b	improving codereadability and reducing redundant file operations	2024-11-01 14:43:29 +00:00
benbierens	365032978b	better status logging, faster revisiting	2024-11-01 11:14:07 +01:00
Kumaraguru	eb2e61938e	providing user with altrustic mode role after verifying if the cid being checked is unique	2024-11-01 01:59:28 +00:00
benbierens	5c1ffbb8af	Updates codex contracts	2024-10-31 08:52:07 +01:00
Ben	3e12baaafe	debug	2024-10-30 14:32:49 +01:00
Ben	605bb6411f	logging	2024-10-30 11:43:57 +01:00
Ben	2554645abc	debug	2024-10-30 11:38:30 +01:00
Ben	2dfcf20ecd	rigged for local running on eth mainnet history	2024-10-30 11:15:33 +01:00
Ben	c35784c90f	Implements folder-storing	2024-10-30 11:09:13 +01:00
Ben	b54c9ff9a3	Retrofitting autoclient to support folder-uploader mode	2024-10-30 08:56:31 +01:00
Ben	ff4711e802	sets content-type correctly	2024-10-30 08:40:46 +01:00
Ben	b8d6ac929b	Update to new codex image	2024-10-30 08:34:41 +01:00
Ben	acb0bf4f29	Updates to latest	2024-10-29 14:02:00 +01:00
Ben	8fe0bd6307	Applies http-timeout to download stream	2024-10-25 12:39:10 +02:00
benbierens	e6a5838b05	Loops in metrics from Giuliano's async profiler	2024-10-24 16:10:07 +02:00
Ben	5c65d1d74e	Fixes message length issue for admin-channel messages.	2024-10-22 13:55:52 +02:00
Ben	292b4b9b06	bumps to 0.1.7	2024-10-22 12:57:07 +02:00
Ben	ddbe5b111a	Merge branch 'feature/block-retransmit'	2024-10-22 12:54:33 +02:00
Ben	a0abea4432	Merge branch 'master' into feature/block-retransmit # Conflicts: # ProjectPlugins/CodexPlugin/ApiChecker.cs	2024-10-22 12:54:22 +02:00
Ben	2f39327db2	Adds multiswarm test	2024-10-22 10:19:00 +02:00
Ben	d452293cac	makes autoclient delete old data files	2024-10-21 11:10:39 +02:00
benbierens	3e245b707c	Fix updating of moment buckets	2024-10-21 11:05:48 +02:00
benbierens	9e842207ab	improves error reporting for discord bot	2024-10-18 11:03:05 +02:00
benbierens	e29ffe4f9c	blockTimeFinder now uses inclusive time ranges	2024-10-18 10:35:49 +02:00
benbierens	d8a6df5845	attempt to fix infinite loop in moment-reference-builder	2024-10-18 09:03:19 +02:00
benbierens	1859994ec6	nice csv outputs	2024-10-18 08:45:54 +02:00
Ben Bierens	60b489ced1	Merge pull request #104 from codex-storage/feature/bot-checks-cids Feature/bot checks cids	2024-10-18 08:23:58 +02:00
benbierens	b72b4a850b	writes csv	2024-10-17 09:37:15 +02:00
benbierens	fc942b11f8	Implements /check command	2024-10-16 14:05:02 +02:00
benbierens	2c88ddfb6b	brings in api with new calls	2024-10-16 12:42:52 +02:00
benbierens	e352e5c65c	Moves code to file	2024-10-14 11:30:07 +02:00
benbierens	2cbe030cff	Implements logical operations for indexSets	2024-10-14 11:19:40 +02:00
benbierens	a38e93a607	set up logical operations for indexset	2024-10-14 10:10:18 +02:00
benbierens	269365e101	Orders chain events by blocknumber	2024-10-14 09:43:05 +02:00
benbierens	02ca9db001	wip: blockreceives to csv	2024-10-14 09:11:29 +02:00
benbierens	672092b232	handles codex events without node or peer	2024-10-14 09:11:09 +02:00
benbierens	1bd84a4892	combinatorial swarm tests	2024-10-11 11:20:59 +02:00
benbierens	5896735884	set up swarm test	2024-10-11 10:30:07 +02:00
Ben	bebeb3766e	Fixes unstable transcript test.	2024-10-10 15:31:38 +02:00
Ben	e0cbf8c84d	Updates emoji maps	2024-10-10 14:03:42 +02:00
Ben	3ed91d7310	Bumps containers to dotnet 8.0	2024-10-10 11:54:42 +02:00
Ben	9573814574	Adds emoji icons to chain events log	2024-10-10 11:45:04 +02:00
Ben	5313f8a7ac	Adds SlotReservationsFull event to chain state tracker	2024-10-10 11:15:07 +02:00
Ben	c239d555dc	More reliable test	2024-10-09 11:37:16 +02:00
Ben	2e9d7641a3	Adds test to capture upload-interrupt node crash.	2024-10-09 09:11:04 +02:00
Ben	fc9249da20	updates to 0.1.6	2024-10-08 14:49:19 +02:00
Ben	978e085219	updates contracts plugin	2024-10-08 10:38:49 +02:00
Ben	960b0c3788	Automatic updating of CodexPlugin openapi.yaml.	2024-10-08 09:29:26 +02:00
benbierens	9ca4bf8afc	Updates marketplace plugin	2024-10-07 15:59:05 +02:00
Slava	cfdc25335c	Add .gitattributes for line endings in .bat, .cmd and .sh scripts (#103 )	2024-10-05 23:08:49 +03:00