Cache PrecompiledAddressesArbOS30 and update precompile in evm.go

OffchainLabs · Apr 19, 2024 · 6d749bf · 6d749bf
1 parent 96743fd
commit 6d749bf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/core/vm/contracts.go b/core/vm/contracts.go
@@ -162,11 +162,10 @@ func init() {
 func ActivePrecompiles(rules params.Rules) []common.Address {
 	switch {
 	case rules.IsArbitrum:
-		var ret []common.Address
 		if rules.ArbOSVersion >= 30 {
-			ret = append(ret, PrecompiledAddressesP256Verify...)
+			return PrecompiledAddressesArbOS30
 		}
-		return append(ret, PrecompiledAddressesArbitrum...)
+		return PrecompiledAddressesArbitrum
 	case rules.IsCancun:
 		return PrecompiledAddressesCancun
 	case rules.IsBerlin:

diff --git a/core/vm/contracts_arbitrum.go b/core/vm/contracts_arbitrum.go
@@ -5,4 +5,6 @@ import "github.com/ethereum/go-ethereum/common"
 var (
 	PrecompiledContractsArbitrum = make(map[common.Address]PrecompiledContract)
 	PrecompiledAddressesArbitrum []common.Address
+	PrecompiledContractsArbOS30  = make(map[common.Address]PrecompiledContract)
+	PrecompiledAddressesArbOS30  []common.Address
 )
diff --git a/core/vm/evm.go b/core/vm/evm.go
@@ -42,6 +42,10 @@ func (evm *EVM) precompile(addr common.Address) (PrecompiledContract, bool) {
 	var precompiles map[common.Address]PrecompiledContract
 	switch {
 	case evm.chainRules.IsArbitrum:
+		if evm.chainRules.ArbOSVersion >= 30 {
+			precompiles = PrecompiledContractsArbOS30
+			break
+		}
 		precompiles = PrecompiledContractsArbitrum
 	case evm.chainRules.IsCancun:
 		precompiles = PrecompiledContractsCancun