merge finished

Author: benbierens

ProjectPlugins/CodexContractsPlugin/ChainMonitor/ChainState.cs

@@ -47,7 +47,7 @@ public ChainState(ILog log, ICodexContracts contracts, IChainStateChangeHandler
             handler = changeHandler;
             this.doProofPeriodMonitoring = doProofPeriodMonitoring;
             TotalSpan = new TimeRange(startUtc, startUtc);
-            PeriodMonitor = new PeriodMonitor(contracts);
+            PeriodMonitor = new PeriodMonitor(log, contracts);
         }
 
         public TimeRange TotalSpan { get; private set; }

ProjectPlugins/CodexContractsPlugin/Marketplace/Customizations.cs

@@ -96,7 +96,8 @@ public partial class ReserveSlotFunction : IHasBlock, IHasRequestId, IHasSlotInd
 
     public partial class MarketplaceConfig : IMarketplaceConfigInput
     {
-
+        public int MaxNumberOfSlashes => this.Collateral.MaxNumberOfSlashes;
+        public TimeSpan PeriodDuration => TimeSpan.FromSeconds(this.Proofs.Period);
     }
 }
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.

Tests/CodexReleaseTests/Utils/MarketplaceAutoBootstrapDistTest.cs

@@ -53,11 +53,15 @@ protected TimeSpan GetPeriodDuration()
         protected abstract ByteSize HostAvailabilitySize { get; }
         protected abstract TimeSpan HostAvailabilityMaxDuration { get; }
         protected virtual bool MonitorChainState { get; } = true;
+        protected TimeSpan HostBlockTTL { get; } = TimeSpan.FromMinutes(1.0);
 
         public ICodexNodeGroup StartHosts()
         {
             var hosts = StartCodex(NumberOfHosts, s => s
                 .WithName("host")
+                .WithBlockTTL(HostBlockTTL)
+                .WithBlockMaintenanceNumber(1000)
+                .WithBlockMaintenanceInterval(HostBlockTTL / 2)
                 .EnableMarketplace(GetGeth(), GetContracts(), m => m
                     .WithInitial(StartingBalanceEth.Eth(), StartingBalanceTST.Tst())
                     .AsStorageNode()
@@ -70,7 +74,7 @@ public ICodexNodeGroup StartHosts()
                 AssertTstBalance(host, StartingBalanceTST.Tst(), nameof(StartHosts));
                 AssertEthBalance(host, StartingBalanceEth.Eth(), nameof(StartHosts));
 
-                host.Marketplace.MakeStorageAvailable(new StorageAvailability(
+                host.Marketplace.MakeStorageAvailable(new CreateStorageAvailability(
                     totalSpace: HostAvailabilitySize,
                     maxDuration: HostAvailabilityMaxDuration,
                     minPricePerBytePerSecond: 1.TstWei(),
@@ -84,6 +88,9 @@ public ICodexNode StartOneHost()
         {
             var host = StartCodex(s => s
                 .WithName("singlehost")
+                .WithBlockTTL(HostBlockTTL)
+                .WithBlockMaintenanceNumber(1000)
+                .WithBlockMaintenanceInterval(HostBlockTTL / 2)
                 .EnableMarketplace(GetGeth(), GetContracts(), m => m
                     .WithInitial(StartingBalanceEth.Eth(), StartingBalanceTST.Tst())
                     .AsStorageNode()
@@ -94,7 +101,7 @@ public ICodexNode StartOneHost()
             AssertTstBalance(host, StartingBalanceTST.Tst(), nameof(StartOneHost));
             AssertEthBalance(host, StartingBalanceEth.Eth(), nameof(StartOneHost));
 
-            host.Marketplace.MakeStorageAvailable(new StorageAvailability(
+            host.Marketplace.MakeStorageAvailable(new CreateStorageAvailability(
                 totalSpace: HostAvailabilitySize,
                 maxDuration: HostAvailabilityMaxDuration,
                 minPricePerBytePerSecond: 1.TstWei(),