Merge remote-tracking branch 'origin/feature/il-evm' into temp/always…

…-on-ilvm
NethermindEth · Nov 4, 2024 · 2bd8694 · 2bd8694
2 parents 7d56cde + 772f565
commit 2bd8694
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/Nethermind/Nethermind.Evm.Test/CodeAnalysis/IlEvmTests.cs b/src/Nethermind/Nethermind.Evm.Test/CodeAnalysis/IlEvmTests.cs
@@ -152,7 +152,7 @@ public override void Setup()
         public void Execute<T>(byte[] bytecode, T tracer, ForkActivation? fork = null, long gasAvailable = 1_000_000)
             where T : ITxTracer
         {
-            Execute<T>(tracer, bytecode, fork, gasAvailable);
+            Execute<T>(tracer, bytecode, fork ?? MainnetSpecProvider.PragueActivation, gasAvailable);
         }
 
         public Address InsertCode(byte[] bytecode)
@@ -1279,7 +1279,7 @@ public void ILVM_JIT_Execution_Equivalence_Tests((Instruction? opcode, byte[] by
             var tracer2 = new GethLikeTxMemoryTracer(tracerOptions);
 
             var bytecode = Prepare.EvmCode
-                .Call(address, 25000)
+                .Call(address, 750_000)
                 .STOP()
                 .Done;
 
@@ -1494,7 +1494,7 @@ public void JIT_Mode_Segment_Has_Jump_Into_Another_Segment_Agressive_Mode_Off()
             string[] desiredTracePattern = new[]
             {
                 $"ILEVM_PRECOMPILED_({main})[0..47]",
-                $"SomeAfterTwoPush",
+                $"ILEVM_PRECOMPILED_({aux})[0..5]",
                 $"ILEVM_PRECOMPILED_({main})[49..60]",
                 $"ILEVM_PRECOMPILED_({main})[0..47]",
                 $"AbortDestinationPattern",
@@ -1536,7 +1536,7 @@ public void JIT_invalid_opcode_results_in_failure()
 
             enhancedChain.ForceRunAnalysis(main);
             var tracer = new GethLikeTxMemoryTracer(GethTraceOptions.Default);
-            enhancedChain.Execute(driver, tracer);
+            enhancedChain.Execute(driver, tracer, (ForkActivation?)(MainnetSpecProvider.ByzantiumBlockNumber, 0));
             var traces = tracer.BuildResult();
 
             var HasIlvmTraces = traces.Entries.Where(tr => tr.SegmentID is not null).Any();
@@ -1605,7 +1605,7 @@ public void Ensure_Evm_ILvm_Compatibility((Instruction? opcode, byte[] bytecode,
             TestState.InsertCode(Address.FromNumber(1), testcase.bytecode, Prague.Instance);
 
             var state = new EvmState(
-                100_000_000,
+                750_000,
                 new ExecutionEnvironment(codeInfo, Address.FromNumber(1), Address.FromNumber(1), Address.FromNumber(1), ReadOnlyMemory<byte>.Empty, txExCtx, 0, 0),
                 ExecutionType.CALL,
                 Snapshot.Empty);
@@ -1642,7 +1642,7 @@ public void Test_ILVM_Trace_Mode((Instruction? opcode, byte[] bytecode, EvmExcep
             TestState.InsertCode(Address.FromNumber(1), testcase.bytecode, Prague.Instance);
 
             var state = new EvmState(
-                1_000_000,
+                750_000,
                 new ExecutionEnvironment(codeInfo, Address.FromNumber(1), Address.FromNumber(1), Address.FromNumber(1), ReadOnlyMemory<byte>.Empty, txExCtx, 0, 0),
                 ExecutionType.CALL,
                 Snapshot.Empty);
@@ -1687,7 +1687,7 @@ public void Test_ILVM_Trace_Mode_Has_0_Traces_When_TraceInstructions_Is_Off((Ins
             TestState.InsertCode(Address.FromNumber(1), testcase.bytecode, Prague.Instance);
 
             var state = new EvmState(
-                1_000_000,
+                750_000,
                 new ExecutionEnvironment(codeInfo, Address.FromNumber(1), Address.FromNumber(1), Address.FromNumber(1), ReadOnlyMemory<byte>.Empty, txExCtx, 0, 0),
                 ExecutionType.CALL,
                 Snapshot.Empty);
@@ -1731,7 +1731,7 @@ public void Extra()
             TestState.InsertCode(Address.FromNumber(1), bytecode, Prague.Instance);
 
             var state = new EvmState(
-                1_000_000,
+                750_000,
                 new ExecutionEnvironment(codeInfo, Address.FromNumber(1), Address.FromNumber(1), Address.FromNumber(1), ReadOnlyMemory<byte>.Empty, txExCtx, 0, 0),
                 ExecutionType.CALL,
                 Snapshot.Empty);