From 00f0d218d41b77db7e329c44177afe0c20710da2 Mon Sep 17 00:00:00 2001 From: MariusVanDerWijden Date: Thu, 22 May 2025 16:50:39 +0200 Subject: [PATCH] core/vm: fix cherry-picking --- core/vm/contracts.go | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/core/vm/contracts.go b/core/vm/contracts.go index aa2a54e1f8..330ace48d8 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -148,29 +148,7 @@ var PrecompiledContractsOsaka = PrecompiledContracts{ common.BytesToAddress([]byte{0x02}): &sha256hash{}, common.BytesToAddress([]byte{0x03}): &ripemd160hash{}, common.BytesToAddress([]byte{0x04}): &dataCopy{}, - common.BytesToAddress([]byte{0x05}): &bigModExp{eip2565: true, eip7883: true}, - common.BytesToAddress([]byte{0x06}): &bn256AddIstanbul{}, - common.BytesToAddress([]byte{0x07}): &bn256ScalarMulIstanbul{}, - common.BytesToAddress([]byte{0x08}): &bn256PairingIstanbul{}, - common.BytesToAddress([]byte{0x09}): &blake2F{}, - common.BytesToAddress([]byte{0x0a}): &kzgPointEvaluation{}, - common.BytesToAddress([]byte{0x0b}): &bls12381G1Add{}, - common.BytesToAddress([]byte{0x0c}): &bls12381G1MultiExp{}, - common.BytesToAddress([]byte{0x0d}): &bls12381G2Add{}, - common.BytesToAddress([]byte{0x0e}): &bls12381G2MultiExp{}, - common.BytesToAddress([]byte{0x0f}): &bls12381Pairing{}, - common.BytesToAddress([]byte{0x10}): &bls12381MapG1{}, - common.BytesToAddress([]byte{0x11}): &bls12381MapG2{}, -} - -// PrecompiledContractsOsaka contains the set of pre-compiled Ethereum -// contracts used in the Osaka release. -var PrecompiledContractsOsaka = PrecompiledContracts{ - common.BytesToAddress([]byte{0x01}): &ecrecover{}, - common.BytesToAddress([]byte{0x02}): &sha256hash{}, - common.BytesToAddress([]byte{0x03}): &ripemd160hash{}, - common.BytesToAddress([]byte{0x04}): &dataCopy{}, - common.BytesToAddress([]byte{0x05}): &bigModExp{eip2565: true, eip7823: true}, + common.BytesToAddress([]byte{0x5}): &bigModExp{eip2565: false, eip7823: true, eip7883: true}, common.BytesToAddress([]byte{0x06}): &bn256AddIstanbul{}, common.BytesToAddress([]byte{0x07}): &bn256ScalarMulIstanbul{}, common.BytesToAddress([]byte{0x08}): &bn256PairingIstanbul{},