Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix null pointer in RecoverSignatures #7564

Merged
merged 10 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
138 changes: 138 additions & 0 deletions src/Nethermind/Nethermind.Consensus.Test/RecoverSignaturesTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
// SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
// SPDX-License-Identifier: LGPL-3.0-only

using Nethermind.Core.Test.Builders;
using Nethermind.Core;
using NUnit.Framework;
using Nethermind.Consensus.Processing;
using NSubstitute;
using Nethermind.Crypto;
using Nethermind.Core.Specs;
using Nethermind.Logging;
using Nethermind.TxPool;
using System.Linq;
using Nethermind.Core.Crypto;

namespace Nethermind.Consensus.Test;
[TestFixture]
public class RecoverSignaturesTest
{
private static readonly IEthereumEcdsa _ecdsa = new EthereumEcdsa(BlockchainIds.GenericNonRealNetwork);

[Test]
public void RecoverData_SenderIsNotRecoveredAndNotInPool_SenderAndAuthorityIsRecovered()
{
PrivateKey signer = TestItem.PrivateKeyA;
PrivateKey authority = TestItem.PrivateKeyB;
Transaction tx = Build.A.Transaction
.WithType(TxType.SetCode)
.WithAuthorizationCode(_ecdsa.Sign(authority, 0, Address.Zero, 0))
.SignedAndResolved(signer)
.WithSenderAddress(null)
.TestObject;

Block block = Build.A.Block
.WithTransactions([tx])
.TestObject;

ISpecProvider specProvider = Substitute.For<ISpecProvider>();
IReleaseSpec releaseSpec = Substitute.For<IReleaseSpec>();
releaseSpec.IsAuthorizationListEnabled.Returns(true);
specProvider.GetSpec(Arg.Any<ForkActivation>()).Returns(releaseSpec);
RecoverSignatures sut = new(
_ecdsa,
NullTxPool.Instance,
specProvider,
Substitute.For<ILogManager>());

sut.RecoverData(block);

Assert.That(tx.SenderAddress, Is.EqualTo(signer.Address));
Assert.That(tx.AuthorizationList.First().Authority, Is.EqualTo(authority.Address));
}

[Test]
public void RecoverData_AuthorityIsNotRecoveredAndNotInPool_SenderAndAuthorityIsRecovered()
{
PrivateKey signer = TestItem.PrivateKeyA;
PrivateKey authority = TestItem.PrivateKeyB;
Transaction tx = Build.A.Transaction
.WithType(TxType.SetCode)
.WithAuthorizationCode(_ecdsa.Sign(authority, 0, Address.Zero, 0))
.SignedAndResolved(signer)
.TestObject;

Block block = Build.A.Block
.WithTransactions([tx])
.TestObject;

ISpecProvider specProvider = Substitute.For<ISpecProvider>();
IReleaseSpec releaseSpec = Substitute.For<IReleaseSpec>();
releaseSpec.IsAuthorizationListEnabled.Returns(true);
specProvider.GetSpec(Arg.Any<ForkActivation>()).Returns(releaseSpec);
RecoverSignatures sut = new(
_ecdsa,
NullTxPool.Instance,
specProvider,
Substitute.For<ILogManager>());

sut.RecoverData(block);

Assert.That(tx.SenderAddress, Is.EqualTo(signer.Address));
Assert.That(tx.AuthorizationList.First().Authority, Is.EqualTo(authority.Address));
}


[Test]
public void RecoverData_TxIsInPool_SenderIsSetToSameAsInPool()
{
PrivateKey signer = TestItem.PrivateKeyA;
PrivateKey poolSender = TestItem.PrivateKeyB;
Transaction tx = Build.A.Transaction
.WithType(TxType.SetCode)
.WithAuthorizationCode
([
_ecdsa.Sign(signer, 0, Address.Zero, 0),
_ecdsa.Sign(signer, 0, Address.Zero, 0)
])
.SignedAndResolved(signer)
.WithSenderAddress(null)
.TestObject;

Block block = Build.A.Block
.WithTransactions([tx])
.TestObject;

Transaction txInPool = Build.A.Transaction
.WithType(TxType.SetCode)
.WithAuthorizationCode
([
new AuthorizationTuple(0, Address.Zero, 0, new Signature(new byte[65]), poolSender.Address),
new AuthorizationTuple(0, Address.Zero, 0, new Signature(new byte[65]), poolSender.Address),
])
.SignedAndResolved(poolSender)
.TestObject;
ITxPool txPool = Substitute.For<ITxPool>();
txPool
.TryGetPendingTransaction(Arg.Any<Hash256>(), out Arg.Any<Transaction>())
.Returns(x =>
{
x[1] = txInPool;
return true;
});
ISpecProvider specProvider = Substitute.For<ISpecProvider>();
IReleaseSpec releaseSpec = Substitute.For<IReleaseSpec>();
releaseSpec.IsAuthorizationListEnabled.Returns(true);
specProvider.GetSpec(Arg.Any<ForkActivation>()).Returns(releaseSpec);
RecoverSignatures sut = new(
_ecdsa,
txPool,
specProvider,
Substitute.For<ILogManager>());

sut.RecoverData(block);

Assert.That(tx.SenderAddress, Is.EqualTo(poolSender.Address));
Assert.That(tx.AuthorizationList.Select(a=>a.Authority), Is.All.EqualTo(poolSender.Address));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void RecoverData(Block block)
recoverFromEcdsa++;
}

if (tx.HasAuthorizationList)
if (poolTx is not null && tx.HasAuthorizationList)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still increment recoverFromEcdsa++; ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to trigger the recovery if an authority is missing. We could add
else if(tx.AuthorizationList[i].Authority is null)
maybe?

{
for (int i = 0; i < tx.AuthorizationList.Length; i++)
{
Expand Down
Loading