revert SR reward

vae520283995 · Nov 17, 2020 · 490f0b2 · 490f0b2
1 parent d8bbaeb
commit 490f0b2
Show file tree

Hide file tree

Showing 22 changed files with 0 additions and 1,600 deletions.
diff --git a/chainbase/src/main/java/org/tron/core/store/DynamicPropertiesStore.java b/chainbase/src/main/java/org/tron/core/store/DynamicPropertiesStore.java
@@ -143,7 +143,6 @@ public class DynamicPropertiesStore extends TronStoreWithRevoking<BytesCapsule>
   private static final byte[] CURRENT_CYCLE_NUMBER = "CURRENT_CYCLE_NUMBER".getBytes();
   private static final byte[] CHANGE_DELEGATION = "CHANGE_DELEGATION".getBytes();
   private static final byte[] ALLOW_PBFT = "ALLOW_PBFT".getBytes();
-  private static final byte[] CURRENT_CYCLE_TIMESTAMP = "CURRENT_CYCLE_TIMESTAMP".getBytes();
 
   private static final byte[] ALLOW_MARKET_TRANSACTION = "ALLOW_MARKET_TRANSACTION".getBytes();
   private static final byte[] MARKET_SELL_FEE = "MARKET_SELL_FEE".getBytes();
@@ -1999,18 +1998,6 @@ public long getAllowAccountStateRoot() {
             () -> new IllegalArgumentException("not found ALLOW_ACCOUNT_STATE_ROOT"));
   }
 
-  public void saveCurrentCycleTiimeStamp(long timeStamp) {
-    this.put(CURRENT_CYCLE_TIMESTAMP, new BytesCapsule(ByteArray.fromLong(timeStamp)));
-
-  }
-
-  public long getCurrentCycleTimeStamp() {
-    return Optional.ofNullable(getUnchecked(CURRENT_CYCLE_TIMESTAMP))
-        .map(BytesCapsule::getData)
-        .map(ByteArray::toLong)
-        .orElse(0L);
-  }
-
   public boolean allowAccountStateRoot() {
     return getAllowAccountStateRoot() == 1;
   }

diff --git a/common/src/main/java/org/tron/common/parameter/CommonParameter.java b/common/src/main/java/org/tron/common/parameter/CommonParameter.java
@@ -379,9 +379,6 @@ public class CommonParameter {
   public boolean solidityNodeHttpEnable = true;
   @Getter
   @Setter
-  public boolean nodeHttpStatisticsSRRewardEnable = false;
-  @Getter
-  @Setter
   public int maxTransactionPendingSize;
   @Getter
   @Setter

diff --git a/common/src/main/java/org/tron/core/Constant.java b/common/src/main/java/org/tron/core/Constant.java
@@ -92,7 +92,6 @@ public class Constant {
   public static final String NODE_HTTP_SOLIDITY_PORT = "node.http.solidityPort";
   public static final String NODE_HTTP_FULLNODE_ENABLE = "node.http.fullNodeEnable";
   public static final String NODE_HTTP_SOLIDITY_ENABLE = "node.http.solidityEnable";
-  public static final String NODE_HTTP_STATISTICS_SR_REWARD_SWITCH = "node.http.statisticsSRRewardSwitch"; // deprecated
   public static final String NODE_HTTP_PBFT_PORT = "node.http.PBFTPort";
 
   public static final String NODE_RPC_THREAD = "node.rpc.thread";

diff --git a/common/src/main/java/org/tron/core/exception/AddressNotFound.java b/common/src/main/java/org/tron/core/exception/AddressNotFound.java
diff --git a/common/src/main/java/org/tron/core/exception/InvalidAddress.java b/common/src/main/java/org/tron/core/exception/InvalidAddress.java
diff --git a/consensus/src/main/java/org/tron/consensus/dpos/MaintenanceManager.java b/consensus/src/main/java/org/tron/consensus/dpos/MaintenanceManager.java
@@ -144,8 +144,6 @@ public void doMaintenance() {
     if (dynamicPropertiesStore.allowChangeDelegation()) {
       long nextCycle = dynamicPropertiesStore.getCurrentCycleNumber() + 1;
       dynamicPropertiesStore.saveCurrentCycleNumber(nextCycle);
-      dynamicPropertiesStore.saveCurrentCycleTiimeStamp(dynamicPropertiesStore
-          .getLatestBlockHeaderTimestamp());
       consensusDelegate.getAllWitnesses().forEach(witness -> {
         delegationStore.setBrokerage(nextCycle, witness.createDbKey(),
             delegationStore.getBrokerage(witness.createDbKey()));
-Original file line number
+Diff line change
@@ Expand Up / @@ -379,9 +379,6 @@ public class CommonParameter { @@
       public boolean solidityNodeHttpEnable = true;
       @Getter
       @Setter
-      public boolean nodeHttpStatisticsSRRewardEnable = false;
-      @Getter
-      @Setter
       public int maxTransactionPendingSize;
       @Getter
       @Setter
@@ Expand Down @@