Merge branch 'ethereum:master' into gethintegration

GrapeBaBa · web-flow · commit a976527f4248 · 2025-05-26T18:20:15.000+08:00
diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go
@@ -370,7 +370,7 @@ func BenchmarkPrecompiledBLS12381G1MultiExpWorstCase(b *testing.B) {
 		Name:        "WorstCaseG1",
 		NoBenchmark: false,
 	}
-	benchmarkPrecompiled("f0c", testcase, b)
+	benchmarkPrecompiled("f0b", testcase, b)
 }
 
 // BenchmarkPrecompiledBLS12381G2MultiExpWorstCase benchmarks the worst case we could find that still fits a gaslimit of 10MGas.
@@ -391,5 +391,5 @@ func BenchmarkPrecompiledBLS12381G2MultiExpWorstCase(b *testing.B) {
 		Name:        "WorstCaseG2",
 		NoBenchmark: false,
 	}
-	benchmarkPrecompiled("f0f", testcase, b)
+	benchmarkPrecompiled("f0d", testcase, b)
 }

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ func BenchmarkPrecompiledBLS12381G1MultiExpWorstCase(b *testing.B) {`
`370`	`370`	`Name: "WorstCaseG1",`
`371`	`371`	`NoBenchmark: false,`
`372`	`372`	`}`
`373`		`- benchmarkPrecompiled("f0c", testcase, b)`
	`373`	`+ benchmarkPrecompiled("f0b", testcase, b)`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`// BenchmarkPrecompiledBLS12381G2MultiExpWorstCase benchmarks the worst case we could find that still fits a gaslimit of 10MGas.`
`@@ -391,5 +391,5 @@ func BenchmarkPrecompiledBLS12381G2MultiExpWorstCase(b *testing.B) {`
`391`	`391`	`Name: "WorstCaseG2",`
`392`	`392`	`NoBenchmark: false,`
`393`	`393`	`}`
`394`		`- benchmarkPrecompiled("f0f", testcase, b)`
	`394`	`+ benchmarkPrecompiled("f0d", testcase, b)`
`395`	`395`	`}`