Use uint256 for sig values

NethermindEth · Sep 4, 2024 · 19f3ad5 · 19f3ad5
1 parent 419d727
commit 19f3ad5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 26 deletions.
diff --git a/src/Nethermind/Nethermind.Core/AuthorizationTuple.cs b/src/Nethermind/Nethermind.Core/AuthorizationTuple.cs
@@ -6,7 +6,6 @@
 using Nethermind.Int256;
 using Nethermind.Logging;
 using System;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Nethermind.Core;
 public class AuthorizationTuple(
@@ -21,8 +20,8 @@ public AuthorizationTuple(
         Address codeAddress,
         ulong nonce,
         ulong yParity,
-        byte[] r,
-        byte[] s,
+        UInt256 r,
+        UInt256 s,
         Address? authority = null) : this(chainId, codeAddress, nonce, new Signature(r, s, yParity + Signature.VOffset), authority)
     { }
 

diff --git a/src/Nethermind/Nethermind.Evm.Test/IntrinsicGasCalculatorTests.cs b/src/Nethermind/Nethermind.Evm.Test/IntrinsicGasCalculatorTests.cs
@@ -127,8 +127,8 @@ [new AuthorizationTuple(
                     new Address(TestContext.CurrentContext.Random.NextBytes(20)),
                     TestContext.CurrentContext.Random.NextULong(),
                     TestContext.CurrentContext.Random.NextULong(),
-                    TestContext.CurrentContext.Random.NextBytes(10),
-                    TestContext.CurrentContext.Random.NextBytes(10))
+                    new UInt256(TestContext.CurrentContext.Random.NextBytes(10)),
+                    new UInt256(TestContext.CurrentContext.Random.NextBytes(10)))
                 ],
                 GasCostOf.PerAuthBaseCost);
             yield return (
@@ -137,15 +137,15 @@ [new AuthorizationTuple(
                     new Address(TestContext.CurrentContext.Random.NextBytes(20)),
                     TestContext.CurrentContext.Random.NextULong(),
                     TestContext.CurrentContext.Random.NextULong(),
-                    TestContext.CurrentContext.Random.NextBytes(10),
-                    TestContext.CurrentContext.Random.NextBytes(10)),
+                    new UInt256(TestContext.CurrentContext.Random.NextBytes(10)),
+                    new UInt256(TestContext.CurrentContext.Random.NextBytes(10))),
                    new AuthorizationTuple(
                     TestContext.CurrentContext.Random.NextULong(),
                     new Address(TestContext.CurrentContext.Random.NextBytes(20)),
                     TestContext.CurrentContext.Random.NextULong(),
                     TestContext.CurrentContext.Random.NextULong(),
-                    TestContext.CurrentContext.Random.NextBytes(10),
-                    TestContext.CurrentContext.Random.NextBytes(10))
+                    new UInt256(TestContext.CurrentContext.Random.NextBytes(10)),
+                    new UInt256(TestContext.CurrentContext.Random.NextBytes(10)))
                ],
                GasCostOf.PerAuthBaseCost * 2);
             yield return (
@@ -154,22 +154,22 @@ [new AuthorizationTuple(
                     new Address(TestContext.CurrentContext.Random.NextBytes(20)),
                     TestContext.CurrentContext.Random.NextULong(),
                     TestContext.CurrentContext.Random.NextULong(),
-                    TestContext.CurrentContext.Random.NextBytes(10),
-                    TestContext.CurrentContext.Random.NextBytes(10)),
+                    new UInt256(TestContext.CurrentContext.Random.NextBytes(10)),
+                    new UInt256(TestContext.CurrentContext.Random.NextBytes(10))),
                    new AuthorizationTuple(
                     TestContext.CurrentContext.Random.NextULong(),
                     new Address(TestContext.CurrentContext.Random.NextBytes(20)),
                     TestContext.CurrentContext.Random.NextULong(),
                     TestContext.CurrentContext.Random.NextULong(),
-                    TestContext.CurrentContext.Random.NextBytes(10),
-                    TestContext.CurrentContext.Random.NextBytes(10)),
+                    new UInt256(TestContext.CurrentContext.Random.NextBytes(10)),
+                    new UInt256(TestContext.CurrentContext.Random.NextBytes(10))),
                    new AuthorizationTuple(
                     TestContext.CurrentContext.Random.NextULong(),
                     new Address(TestContext.CurrentContext.Random.NextBytes(20)),
                     TestContext.CurrentContext.Random.NextULong(),
                     TestContext.CurrentContext.Random.NextULong(),
-                    TestContext.CurrentContext.Random.NextBytes(10),
-                    TestContext.CurrentContext.Random.NextBytes(10))
+                    new UInt256(TestContext.CurrentContext.Random.NextBytes(10)),
+                    new UInt256(TestContext.CurrentContext.Random.NextBytes(10)))
                ],
                GasCostOf.PerAuthBaseCost * 3);
         }
@@ -194,8 +194,8 @@ public void Calculate_TxHasAuthorizationListBeforePrague_ThrowsInvalidDataExcept
                     TestItem.AddressF,
                     0,
                     TestContext.CurrentContext.Random.NextULong(),
-                    TestContext.CurrentContext.Random.NextBytes(10),
-                    TestContext.CurrentContext.Random.NextBytes(10))
+                    new UInt256(TestContext.CurrentContext.Random.NextBytes(10)),
+                    new UInt256(TestContext.CurrentContext.Random.NextBytes(10)))
                 )
                 .TestObject;
 

diff --git a/src/Nethermind/Nethermind.Evm/TransactionProcessing/TransactionProcessor.cs b/src/Nethermind/Nethermind.Evm/TransactionProcessing/TransactionProcessor.cs
@@ -107,12 +107,9 @@ protected virtual TransactionResult Execute(Transaction tx, in BlockExecutionCon
 
             HashSet<Address> accessedAddresses = new();
             int delegationRefunds = 0;
-            if (spec.IsEip7702Enabled)
+            if (spec.IsEip7702Enabled && tx.HasAuthorizationList)
             {
-                if (tx.HasAuthorizationList)
-                {
-                    delegationRefunds = _codeInfoRepository.InsertFromAuthorizations(WorldState, tx.AuthorizationList, accessedAddresses, spec);
-                }
+                delegationRefunds = _codeInfoRepository.InsertFromAuthorizations(WorldState, tx.AuthorizationList, accessedAddresses, spec);
             }
 
             ExecutionEnvironment env = BuildExecutionEnvironment(tx, in blCtx, spec, effectiveGasPrice, _codeInfoRepository, accessedAddresses);

diff --git a/src/Nethermind/Nethermind.Serialization.Rlp/Eip7702/AuthorizationTupleDecoder.cs b/src/Nethermind/Nethermind.Serialization.Rlp/Eip7702/AuthorizationTupleDecoder.cs
@@ -24,8 +24,8 @@ public AuthorizationTuple Decode(RlpStream stream, RlpBehaviors rlpBehaviors = R
         ulong nonce = stream.DecodeULong();
 
         ulong yParity = stream.DecodeULong();
-        byte[] r = stream.DecodeByteArray();
-        byte[] s = stream.DecodeByteArray();
+        UInt256 r = stream.DecodeUInt256();
+        UInt256 s = stream.DecodeUInt256();
         if (!rlpBehaviors.HasFlag(RlpBehaviors.AllowExtraBytes))
             stream.Check(check);
         return new AuthorizationTuple(
@@ -48,8 +48,8 @@ public AuthorizationTuple Decode(ref Rlp.ValueDecoderContext decoderContext, Rlp
         ulong nonce = decoderContext.DecodeULong();
 
         ulong yParity = decoderContext.DecodeULong();
-        byte[] r = decoderContext.DecodeByteArray();
-        byte[] s = decoderContext.DecodeByteArray();
+        UInt256 r = decoderContext.DecodeUInt256();
+        UInt256 s = decoderContext.DecodeUInt256();
         if (!rlpBehaviors.HasFlag(RlpBehaviors.AllowExtraBytes))
             decoderContext.Check(check);
         return new AuthorizationTuple(