From 0507fb1b24e1bf66451770a5fc97de2072164c2c Mon Sep 17 00:00:00 2001 From: Ceyhun Onur Date: Sat, 26 Feb 2022 15:45:24 +0300 Subject: [PATCH] simplify prevent address set --- core/vm/evm.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/core/vm/evm.go b/core/vm/evm.go index 8fab4284d6..020ea56bbf 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -41,25 +41,20 @@ import ( "github.com/holiman/uint256" ) -var ( - prohibitedAddresses = append( - []common.Address{constants.BlackholeAddr}, - precompile.PrecompileAddresses..., - ) - prohibitedAddressesSet map[common.Address]struct{} -) +var prohibitedAddresses = map[common.Address]struct{}{ + constants.BlackholeAddr: {}, +} func init() { - prohibitedAddressesSet = make(map[common.Address]struct{}) - for _, addr := range prohibitedAddresses { - prohibitedAddressesSet[addr] = struct{}{} + for _, addr := range precompile.PrecompileAddresses { + prohibitedAddresses[addr] = struct{}{} } } // IsProhibited returns true if [addr] is in the prohibited list of addresses which should // not be allowed as an EOA or newly created contract address. func IsProhibited(addr common.Address) bool { - _, ok := prohibitedAddressesSet[addr] + _, ok := prohibitedAddresses[addr] return ok }