Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/Nethermind/Nethermind.AuRa.Test/AuRaPluginTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,19 @@ public void Init_when_not_AuRa_doesnt_trow()
init.Should().NotThrow();
}

[Test]
public void DecorateReleaseSpecWithAuraReleaseSpec()
{
ChainSpec chainSpec = new();
chainSpec.EngineChainSpecParametersProvider = new TestChainSpecParametersProvider(new AuRaChainSpecEngineParameters());
using IContainer container = new ContainerBuilder()
.AddModule(new TestNethermindModule())
.AddModule(new AuRaModule(chainSpec))
.Build();

container.Resolve<ISpecProvider>().GetSpec(Build.A.BlockHeader.WithNumber(10).TestObject)
.Should().BeOfType<AuRaReleaseSpecDecorator>();
}

}
}
1 change: 1 addition & 0 deletions src/Nethermind/Nethermind.Consensus.AuRa/AuRaPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ protected override void Load(ContainerBuilder builder)

builder
.AddSingleton<NethermindApi, AuRaNethermindApi>()
.AddDecorator<ISpecProvider, AuRaSpecProvider>()
.AddSingleton<AuRaChainSpecEngineParameters>(specParam)
.AddDecorator<IBetterPeerStrategy, AuRaBetterPeerStrategy>()
.Add<StartBlockProducerAuRa>() // Note: Stateful. Probably just some strange unintentional side effect though.
Expand Down
18 changes: 18 additions & 0 deletions src/Nethermind/Nethermind.Core/Specs/AuRaSpecProvider.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
// SPDX-License-Identifier: LGPL-3.0-only

namespace Nethermind.Core.Specs;


public class AuRaSpecProvider(ISpecProvider baseSpecProvider) : SpecProviderDecorator(baseSpecProvider)
{
public override IReleaseSpec GetSpecInternal(ForkActivation forkActivation)
{
return new AuRaReleaseSpecDecorator(base.GetSpecInternal(forkActivation));
}
}

public class AuRaReleaseSpecDecorator(IReleaseSpec spec) : ReleaseSpecDecorator(spec)
{
public override bool IsEip158IgnoredAccount(Address address) => address == Address.SystemUser;
}
9 changes: 0 additions & 9 deletions src/Nethermind/Nethermind.Core/Specs/AuraSpecProvider.cs

This file was deleted.

6 changes: 1 addition & 5 deletions src/Nethermind/Nethermind.Core/Specs/ISpecProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,7 @@ public interface ISpecProvider

public static class SpecProviderExtensions
{
public static IReleaseSpec GetSpec(this ISpecProvider specProvider, ForkActivation forkActivation)
=> specProvider.SealEngine == SealEngineType.AuRa
? new AuraSpecProvider(specProvider.GetSpecInternal(forkActivation))
: specProvider.GetSpecInternal(forkActivation);

public static IReleaseSpec GetSpec(this ISpecProvider specProvider, ForkActivation forkActivation) => specProvider.GetSpecInternal(forkActivation);
public static IReleaseSpec GetSpec(this ISpecProvider specProvider, long blockNumber, ulong? timestamp) => specProvider.GetSpec(new ForkActivation(blockNumber, timestamp));
public static IReleaseSpec GetSpec(this ISpecProvider specProvider, BlockHeader blockHeader) => specProvider.GetSpec(new ForkActivation(blockHeader.Number, blockHeader.Timestamp));

Expand Down
31 changes: 31 additions & 0 deletions src/Nethermind/Nethermind.Core/Specs/SpecProviderDecorator.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited
// SPDX-License-Identifier: LGPL-3.0-only

using Nethermind.Int256;

namespace Nethermind.Core.Specs;

public class SpecProviderDecorator(ISpecProvider baseSpecProvider) : ISpecProvider
{
public void UpdateMergeTransitionInfo(long? blockNumber, UInt256? terminalTotalDifficulty = null) => baseSpecProvider.UpdateMergeTransitionInfo(blockNumber, terminalTotalDifficulty);

public ForkActivation? MergeBlockNumber => baseSpecProvider.MergeBlockNumber;

public ulong TimestampFork => baseSpecProvider.TimestampFork;

public UInt256? TerminalTotalDifficulty => baseSpecProvider.TerminalTotalDifficulty;

public IReleaseSpec GenesisSpec => baseSpecProvider.GenesisSpec;

public long? DaoBlockNumber => baseSpecProvider.DaoBlockNumber;

public ulong? BeaconChainGenesisTimestamp => baseSpecProvider.BeaconChainGenesisTimestamp;

public ulong NetworkId => baseSpecProvider.NetworkId;

public ulong ChainId => baseSpecProvider.ChainId;

public ForkActivation[] TransitionActivations => baseSpecProvider.TransitionActivations;

public virtual IReleaseSpec GetSpecInternal(ForkActivation forkActivation) => baseSpecProvider.GetSpecInternal(forkActivation);
}