Adds SlotReservationsFull event to chain state tracker

benbierens · benbierens · commit 5313f8a7ac1b · 2024-10-10T11:15:07.000+02:00
diff --git a/ProjectPlugins/CodexContractsPlugin/ChainMonitor/ChainEvents.cs b/ProjectPlugins/CodexContractsPlugin/ChainMonitor/ChainEvents.cs
@@ -1,4 +1,5 @@
 ﻿using CodexContractsPlugin.Marketplace;
+using System.Collections.Generic;
 using Utils;
 
 namespace CodexContractsPlugin.ChainMonitor
@@ -12,7 +13,8 @@ private ChainEvents(
             RequestCancelledEventDTO[] cancelled,
             RequestFailedEventDTO[] failed,
             SlotFilledEventDTO[] slotFilled,
-            SlotFreedEventDTO[] slotFreed
+            SlotFreedEventDTO[] slotFreed,
+            SlotReservationsFullEventDTO[] slotReservationsFull
             )
         {
             BlockInterval = blockInterval;
@@ -22,6 +24,9 @@ SlotFreedEventDTO[] slotFreed
             Failed = failed;
             SlotFilled = slotFilled;
             SlotFreed = slotFreed;
+            SlotReservationsFull = slotReservationsFull;
+
+            All = ConcatAll<IHasBlock>(requests, fulfilled, cancelled, failed, slotFilled, SlotFreed, SlotReservationsFull);
         }
 
         public BlockInterval BlockInterval { get; }
@@ -31,21 +36,8 @@ SlotFreedEventDTO[] slotFreed
         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 IHasBlock[] All { get; }
 
         public static ChainEvents FromBlockInterval(ICodexContracts contracts, BlockInterval blockInterval)
         {
@@ -66,8 +58,19 @@ public static ChainEvents FromContractEvents(ICodexContractsEvents events)
                 events.GetRequestCancelledEvents(),
                 events.GetRequestFailedEvents(),
                 events.GetSlotFilledEvents(),
-                events.GetSlotFreedEvents()
+                events.GetSlotFreedEvents(),
+                events.GetSlotReservationsFull()
             );
         }
+
+        private T[] ConcatAll<T>(params T[][] arrays)
+        {
+            var result = Array.Empty<T>();
+            foreach (var array in arrays)
+            {
+                result = result.Concat(array).ToArray();
+            }
+            return result;
+        }
     }
 }
diff --git a/ProjectPlugins/CodexContractsPlugin/ChainMonitor/ChainState.cs b/ProjectPlugins/CodexContractsPlugin/ChainMonitor/ChainState.cs
@@ -16,6 +16,7 @@ public interface IChainStateChangeHandler
         void OnRequestFailed(RequestEvent requestEvent);
         void OnSlotFilled(RequestEvent requestEvent, EthAddress host, BigInteger slotIndex);
         void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex);
+        void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex);
     }
 
     public class RequestEvent
@@ -149,6 +150,14 @@ private void ApplyEvent(SlotFreedEventDTO @event)
             handler.OnSlotFreed(new RequestEvent(@event.Block, r), @event.SlotIndex);
         }
 
+        private void ApplyEvent(SlotReservationsFullEventDTO @event)
+        {
+            var r = FindRequest(@event.RequestId);
+            if (r == null) return;
+            r.Log($"[{@event.Block.BlockNumber}] SlotReservationsFull (slotIndex:{@event.SlotIndex})");
+            handler.OnSlotReservationsFull(new RequestEvent(@event.Block, r), @event.SlotIndex);
+        }
+
         private void ApplyTimeImplicitEvents(ulong blockNumber, DateTime eventsUtc)
         {
             foreach (var r in requests)
diff --git a/ProjectPlugins/CodexContractsPlugin/ChainMonitor/ChainStateChangeHandlerMux.cs b/ProjectPlugins/CodexContractsPlugin/ChainMonitor/ChainStateChangeHandlerMux.cs
@@ -51,5 +51,10 @@ public void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex)
         {
             foreach (var handler in Handlers) handler.OnSlotFreed(requestEvent, slotIndex);
         }
+
+        public void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex)
+        {
+            foreach (var handler in Handlers) handler.OnSlotReservationsFull(requestEvent, slotIndex);
+        }
     }
 }
diff --git a/ProjectPlugins/CodexContractsPlugin/ChainMonitor/DoNothingChainEventHandler.cs b/ProjectPlugins/CodexContractsPlugin/ChainMonitor/DoNothingChainEventHandler.cs
@@ -32,5 +32,9 @@ public void OnSlotFilled(RequestEvent requestEvent, EthAddress host, BigInteger
         public void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex)
         {
         }
+
+        public void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex)
+        {
+        }
     }
 }
diff --git a/ProjectPlugins/CodexContractsPlugin/CodexContractsEvents.cs b/ProjectPlugins/CodexContractsPlugin/CodexContractsEvents.cs
@@ -1,6 +1,7 @@
 ﻿using CodexContractsPlugin.Marketplace;
 using GethPlugin;
 using Logging;
+using Nethereum.Contracts;
 using Nethereum.Hex.HexTypes;
 using NethereumWorkflow.BlockUtils;
 using Utils;
@@ -16,6 +17,7 @@ public interface ICodexContractsEvents
         RequestFailedEventDTO[] GetRequestFailedEvents();
         SlotFilledEventDTO[] GetSlotFilledEvents();
         SlotFreedEventDTO[] GetSlotFreedEvents();
+        SlotReservationsFullEventDTO[] GetSlotReservationsFull();
     }
 
     public class CodexContractsEvents : ICodexContractsEvents
@@ -38,49 +40,32 @@ public Request[] GetStorageRequests()
         {
             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 +83,20 @@ public SlotFilledEventDTO[] GetSlotFilledEvents()
         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[] GetSlotReservationsFull()
+        {
+            var events = gethNode.GetEvents<SlotReservationsFullEventDTO>(deployment.MarketplaceAddress, BlockInterval);
+            return events.Select(SetBlockOnEvent).ToArray();
+        }
+
+        private T SetBlockOnEvent<T>(EventLog<T> e) where T : IHasBlock
+        {
+            var result = e.Event;
+            result.Block = GetBlock(e.Log.BlockNumber.ToUlong());
+            return result;
         }
 
         private BlockTimeEntry GetBlock(ulong number)
diff --git a/ProjectPlugins/CodexContractsPlugin/Marketplace/Customizations.cs b/ProjectPlugins/CodexContractsPlugin/Marketplace/Customizations.cs
@@ -58,5 +58,11 @@ public partial class SlotFreedEventDTO : IHasBlock
         [JsonIgnore]
         public BlockTimeEntry Block { get; set; }
     }
+
+    public partial class SlotReservationsFullEventDTO : IHasBlock
+    {
+        [JsonIgnore]
+        public BlockTimeEntry Block { get; set; }
+    }
 }
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
diff --git a/Tools/MarketInsights/ContributionBuilder.cs b/Tools/MarketInsights/ContributionBuilder.cs
@@ -51,6 +51,10 @@ public void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex)
         {
         }
 
+        public void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex)
+        {
+        }
+
         public MarketTimeSegment GetSegment()
         {
             return segment;
diff --git a/Tools/TestNetRewarder/EventsFormatter.cs b/Tools/TestNetRewarder/EventsFormatter.cs
@@ -75,6 +75,13 @@ public void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex)
             );
         }
 
+        public void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex)
+        {
+            AddRequestBlock(requestEvent, "Slot Reservations Full",
+                $"Slot Index: {slotIndex}"
+            );
+        }
+
         private void AddRequestBlock(RequestEvent requestEvent, string eventName, params string[] content)
         {
             var blockNumber = $"[{requestEvent.Block.BlockNumber} {FormatDateTime(requestEvent.Block.Utc)}]";
diff --git a/Tools/TestNetRewarder/RewardCheck.cs b/Tools/TestNetRewarder/RewardCheck.cs
@@ -72,6 +72,10 @@ public void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex)
         {
         }
 
+        public void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex)
+        {
+        }
+
         private void GiveReward(RewardConfig reward, EthAddress receiver)
         {
             giver.Give(reward, receiver);

Original file line number	Diff line number	Diff line change
`@@ -51,5 +51,10 @@ public void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex)`
`51`	`51`	`{`
`52`	`52`	`foreach (var handler in Handlers) handler.OnSlotFreed(requestEvent, slotIndex);`
`53`	`53`	`}`
	`54`	`+`
	`55`	`+ public void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex)`
	`56`	`+ {`
	`57`	`+ foreach (var handler in Handlers) handler.OnSlotReservationsFull(requestEvent, slotIndex);`
	`58`	`+ }`
`54`	`59`	`}`
`55`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,9 @@ public void OnSlotFilled(RequestEvent requestEvent, EthAddress host, BigInteger`
`32`	`32`	`public void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex)`
`33`	`33`	`{`
`34`	`34`	`}`
	`35`	`+`
	`36`	`+ public void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex)`
	`37`	`+ {`
	`38`	`+ }`
`35`	`39`	`}`
`36`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,5 +58,11 @@ public partial class SlotFreedEventDTO : IHasBlock`
`58`	`58`	`[JsonIgnore]`
`59`	`59`	`public BlockTimeEntry Block { get; set; }`
`60`	`60`	`}`
	`61`	`+`
	`62`	`+ public partial class SlotReservationsFullEventDTO : IHasBlock`
	`63`	`+ {`
	`64`	`+ [JsonIgnore]`
	`65`	`+ public BlockTimeEntry Block { get; set; }`
	`66`	`+ }`
`61`	`67`	`}`
`62`	`68`	`#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,10 @@ public void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex)`
`51`	`51`	`{`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ public void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex)`
	`55`	`+ {`
	`56`	`+ }`
	`57`	`+`
`54`	`58`	`public MarketTimeSegment GetSegment()`
`55`	`59`	`{`
`56`	`60`	`return segment;`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,13 @@ public void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex)`
`75`	`75`	`);`
`76`	`76`	`}`
`77`	`77`
	`78`	`+ public void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex)`
	`79`	`+ {`
	`80`	`+ AddRequestBlock(requestEvent, "Slot Reservations Full",`
	`81`	`+ $"Slot Index: {slotIndex}"`
	`82`	`+ );`
	`83`	`+ }`
	`84`	`+`
`78`	`85`	`private void AddRequestBlock(RequestEvent requestEvent, string eventName, params string[] content)`
`79`	`86`	`{`
`80`	`87`	`var blockNumber = $"[{requestEvent.Block.BlockNumber} {FormatDateTime(requestEvent.Block.Utc)}]";`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,10 @@ public void OnSlotFreed(RequestEvent requestEvent, BigInteger slotIndex)`
`72`	`72`	`{`
`73`	`73`	`}`
`74`	`74`
	`75`	`+ public void OnSlotReservationsFull(RequestEvent requestEvent, BigInteger slotIndex)`
	`76`	`+ {`
	`77`	`+ }`
	`78`	`+`
`75`	`79`	`private void GiveReward(RewardConfig reward, EthAddress receiver)`
`76`	`80`	`{`
`77`	`81`	`giver.Give(reward, receiver);`