diff --git a/Framework/NethereumWorkflow/NethereumInteraction.cs b/Framework/NethereumWorkflow/NethereumInteraction.cs index 47b7ee20..7e16e451 100644 --- a/Framework/NethereumWorkflow/NethereumInteraction.cs +++ b/Framework/NethereumWorkflow/NethereumInteraction.cs @@ -110,11 +110,22 @@ namespace NethereumWorkflow public List> GetEvents(string address, ulong fromBlockNumber, ulong toBlockNumber) where TEvent : IEventDTO, new() { - var eventHandler = web3.Eth.GetEvent(address); + var logs = new List(); + var p = web3.Processing.Logs.CreateProcessor( + action: logs.Add, + minimumBlockConfirmations: 1, + criteria: l => l.IsLogForEvent() + ); + var from = new BlockParameter(fromBlockNumber); var to = new BlockParameter(toBlockNumber); - var blockFilter = Time.Wait(eventHandler.CreateFilterBlockRangeAsync(from, to)); - return Time.Wait(eventHandler.GetAllChangesAsync(blockFilter)); + var ct = new CancellationTokenSource().Token; + Time.Wait(p.ExecuteAsync(toBlockNumber: to.BlockNumber, cancellationToken: ct, startAtBlockNumberIfNotProcessed: from.BlockNumber)); + + return logs + .Where(l => l.IsLogForEvent()) + .Select(l => l.DecodeEvent()) + .ToList(); } public BlockInterval ConvertTimeRangeToBlockRange(TimeRange timeRange) diff --git a/ProjectPlugins/CodexPlugin/CodexDockerImage.cs b/ProjectPlugins/CodexPlugin/CodexDockerImage.cs index c7f0f35b..bbb09c0b 100644 --- a/ProjectPlugins/CodexPlugin/CodexDockerImage.cs +++ b/ProjectPlugins/CodexPlugin/CodexDockerImage.cs @@ -2,7 +2,7 @@ { public class CodexDockerImage { - private const string DefaultDockerImage = "codexstorage/nim-codex:sha-e324ac8-dist-tests"; + private const string DefaultDockerImage = "codexstorage/nim-codex:latest-dist-tests"; public static string Override { get; set; } = string.Empty; diff --git a/Tools/BiblioTech/CommandHandler.cs b/Tools/BiblioTech/CommandHandler.cs index 10e1e24b..52f0388d 100644 --- a/Tools/BiblioTech/CommandHandler.cs +++ b/Tools/BiblioTech/CommandHandler.cs @@ -6,7 +6,6 @@ using BiblioTech.Rewards; using Logging; using BiblioTech.CodexChecking; using Nethereum.Model; -using static Org.BouncyCastle.Math.EC.ECCurve; namespace BiblioTech {