core/vm, core/txpool: Skip check for contract deployer after Venoki

core/txpool/validation.go

@@ -365,9 +365,12 @@ func ValidateTransactionWithState(tx *types.Transaction, signer types.Signer, op
 	}
 
 	if opts.Config != nil {
+		// The whitelisted deployer logic is not affective after Venoki
 		if tx.To() == nil && opts.Config.Consortium != nil {
 			var whitelisted bool
-			if opts.Config.IsAntenna(opts.Head.Number) {
+			if opts.Config.IsVenoki(opts.Head.Number) {
+				whitelisted = true
+			} else if opts.Config.IsAntenna(opts.Head.Number) {
 				whitelisted = state.IsWhitelistedDeployerV2(
 					opts.State,
 					from,

core/vm/evm.go

@@ -528,16 +528,18 @@ func (evm *EVM) create(caller ContractRef, codeAndHash *codeAndHash, gas uint64,
 		}
 	}
 
-	// Handle latest hardfork firstly.
-	if evm.chainRules.IsAntenna {
-		if !evm.StateDB.ValidDeployerV2(caller.Address(), evm.Context.Time, evm.ChainConfig().WhiteListDeployerContractV2Address) {
-			captureTraceEarly(ErrExecutionReverted)
-			return nil, common.Address{}, gas, ErrExecutionReverted
-		}
-	} else if evm.chainRules.IsOdysseusFork {
-		if !evm.StateDB.ValidDeployer(caller.Address()) {
-			captureTraceEarly(ErrExecutionReverted)
-			return nil, common.Address{}, gas, ErrExecutionReverted
+	// After Venoki, no need to check for whitelisted deployer anymore
+	if !evm.chainRules.IsVenoki {
+		if evm.chainRules.IsAntenna {
+			if !evm.StateDB.ValidDeployerV2(caller.Address(), evm.Context.Time, evm.ChainConfig().WhiteListDeployerContractV2Address) {
+				captureTraceEarly(ErrExecutionReverted)
+				return nil, common.Address{}, gas, ErrExecutionReverted
+			}
+		} else if evm.chainRules.IsOdysseusFork {
+			if !evm.StateDB.ValidDeployer(caller.Address()) {
+				captureTraceEarly(ErrExecutionReverted)
+				return nil, common.Address{}, gas, ErrExecutionReverted
+			}
 		}
 	}