remove configuration acurator.whitelist

Author: 317787106

actuator/src/main/java/org/tron/core/actuator/AbstractActuator.java

@@ -2,6 +2,7 @@
 
 import com.google.protobuf.Any;
 import com.google.protobuf.GeneratedMessageV3;
+import lombok.Getter;
 import org.tron.common.math.Maths;
 import org.tron.common.utils.Commons;
 import org.tron.common.utils.ForkController;
@@ -16,48 +17,36 @@
 
 public abstract class AbstractActuator implements Actuator {
 
+  @Getter
   protected Any any;
+  @Getter
   protected ChainBaseManager chainBaseManager;
+  @Getter
   protected Contract contract;
+  @Getter
   protected TransactionCapsule tx;
   protected ForkController forkController;
 
   public AbstractActuator(ContractType type, Class<? extends GeneratedMessageV3> clazz) {
     TransactionFactory.register(type, getClass(), clazz);
   }
 
-  public Any getAny() {
-    return any;
-  }
-
   public AbstractActuator setAny(Any any) {
     this.any = any;
     return this;
   }
 
-  public ChainBaseManager getChainBaseManager() {
-    return chainBaseManager;
-  }
-
   public AbstractActuator setChainBaseManager(ChainBaseManager chainBaseManager) {
     this.chainBaseManager = chainBaseManager;
     return this;
   }
 
-  public Contract getContract() {
-    return contract;
-  }
-
   public AbstractActuator setContract(Contract contract) {
     this.contract = contract;
     this.any = contract.getParameter();
     return this;
   }
 
-  public TransactionCapsule getTx() {
-    return tx;
-  }
-
   public AbstractActuator setTx(TransactionCapsule tx) {
     this.tx = tx;
     return this;

chainbase/src/main/java/org/tron/core/actuator/TransactionFactory.java

@@ -2,17 +2,15 @@
 
 import com.google.protobuf.GeneratedMessageV3;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import org.tron.common.parameter.CommonParameter;
 import org.tron.protos.Protocol.Transaction.Contract.ContractType;
 import org.tron.protos.contract.SmartContractOuterClass.CreateSmartContract;
 import org.tron.protos.contract.SmartContractOuterClass.TriggerSmartContract;
 
 public class TransactionFactory {
 
-  private static Map<ContractType, Class<? extends Actuator>> actuatorMap = new ConcurrentHashMap<>();
-  private static Map<ContractType, Class<? extends GeneratedMessageV3>> contractMap = new ConcurrentHashMap<>();
+  private static final Map<ContractType, Class<? extends Actuator>> actuatorMap = new ConcurrentHashMap<>();
+  private static final Map<ContractType, Class<? extends GeneratedMessageV3>> contractMap = new ConcurrentHashMap<>();
 
   static {
     register(ContractType.CreateSmartContract, null, CreateSmartContract.class);
@@ -21,12 +19,6 @@ public class TransactionFactory {
 
   public static void register(ContractType type, Class<? extends Actuator> actuatorClass,
       Class<? extends GeneratedMessageV3> clazz) {
-    Set<String> actuatorSet = CommonParameter.getInstance().getActuatorSet();
-    if (actuatorClass != null && !actuatorSet.isEmpty() && !actuatorSet
-        .contains(actuatorClass.getSimpleName())) {
-      return;
-    }
-
     if (type != null && actuatorClass != null) {
       actuatorMap.put(type, actuatorClass);
     }
@@ -42,12 +34,4 @@ public static Class<? extends Actuator> getActuator(ContractType type) {
   public static Class<? extends GeneratedMessageV3> getContract(ContractType type) {
     return contractMap.get(type);
   }
-
-  public static Map<ContractType, Class<? extends Actuator>> getActuatorMap() {
-    return actuatorMap;
-  }
-
-  public static Map<ContractType, Class<? extends GeneratedMessageV3>> getContractMap() {
-    return contractMap;
-  }
 }

common/src/main/java/org/tron/common/parameter/CommonParameter.java

@@ -5,7 +5,6 @@
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 import lombok.Getter;
 import lombok.Setter;
 import org.tron.common.args.GenesisBlock;
@@ -367,9 +366,6 @@ public class CommonParameter {
   public long changedDelegation;
   @Getter
   @Setter
-  public Set<String> actuatorSet;
-  @Getter
-  @Setter
   public RateLimiterInitialization rateLimiterInitialization;
   @Getter
   @Setter

framework/src/main/java/org/tron/common/runtime/RuntimeImpl.java

@@ -2,11 +2,9 @@
 
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.tron.common.parameter.CommonParameter;
 import org.tron.core.actuator.Actuator;
 import org.tron.core.actuator.Actuator2;
 import org.tron.core.actuator.ActuatorCreator;
@@ -46,10 +44,6 @@ public void execute(TransactionContext context)
     switch (contractType.getNumber()) {
       case ContractType.TriggerSmartContract_VALUE:
       case ContractType.CreateSmartContract_VALUE:
-        Set<String> actuatorSet = CommonParameter.getInstance().getActuatorSet();
-        if (!actuatorSet.isEmpty() && !actuatorSet.contains(VMActuator.class.getSimpleName())) {
-          throw new ContractValidateException("not exist contract " + "SmartContract");
-        }
         actuator2 = new VMActuator(context.isStatic());
         break;
       default:

framework/src/main/java/org/tron/core/config/args/Args.java

@@ -32,7 +32,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -842,11 +841,6 @@ public static void applyConfigParams(
     initRocksDbBackupProperty(config);
     initRocksDbSettings(config);
 
-    PARAMETER.actuatorSet =
-        config.hasPath(ConfigKey.ACTUATOR_WHITELIST)
-            ? new HashSet<>(config.getStringList(ConfigKey.ACTUATOR_WHITELIST))
-            : Collections.emptySet();
-
     if (config.hasPath(ConfigKey.NODE_METRICS_ENABLE)) {
       PARAMETER.nodeMetricsEnable = config.getBoolean(ConfigKey.NODE_METRICS_ENABLE);
     }

framework/src/main/java/org/tron/core/config/args/ConfigKey.java

@@ -325,7 +325,4 @@ private ConfigKey() {
 
   // energy
   public static final String ENERGY_LIMIT_BLOCK_NUM = "enery.limit.block.num";
-
-  // actuator
-  public static final String ACTUATOR_WHITELIST = "actuator.whitelist";
 }

framework/src/test/java/org/tron/common/ParameterTest.java

@@ -218,8 +218,6 @@ public void testCommonParameter() {
     assertEquals(1, parameter.getShieldedTransInPendingMaxCounts());
     parameter.setChangedDelegation(1);
     assertEquals(1, parameter.getChangedDelegation());
-    parameter.setActuatorSet(new HashSet<>());
-    assertTrue(CollectionUtils.isEmpty(parameter.getActuatorSet()));
     parameter.setRateLimiterInitialization(new RateLimiterInitialization());
     assertNotNull(parameter.getRateLimiterInitialization());
     parameter.setRateLimiterGlobalQps(1000);

framework/src/test/java/org/tron/core/utils/TransactionRegisterTest.java

@@ -8,7 +8,6 @@
 import static org.mockito.Mockito.when;
 
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.After;
@@ -28,7 +27,6 @@ public class TransactionRegisterTest {
 
   @Before
   public void init() {
-    Args.getInstance().setActuatorSet(new HashSet<>());
     TransactionRegister.resetForTesting();
   }