Merge pull request tronprotocol#3118 from tronprotocol/HotFix/getRewardForSR

statistics SR Reward

Author: DorianRust

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

@@ -54,6 +54,10 @@ public boolean execute(Object result) throws ContractExeException {
     delegationService.withdrawReward(withdrawBalanceContract.getOwnerAddress()
         .toByteArray());
 
+    delegationService.getDelegationStore().setLastWithdrawCycle(
+        dynamicStore.getCurrentCycleNumber(), withdrawBalanceContract.getOwnerAddress()
+            .toByteArray());
+
     AccountCapsule accountCapsule = accountStore.
         get(withdrawBalanceContract.getOwnerAddress().toByteArray());
     long oldBalance = accountCapsule.getBalance();

chainbase/src/main/java/org/tron/core/db/DelegationService.java

@@ -4,11 +4,13 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.spongycastle.util.encoders.Hex;
 import org.springframework.stereotype.Component;
+import org.tron.common.parameter.CommonParameter;
 import org.tron.common.utils.StringUtil;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.WitnessCapsule;
@@ -28,6 +30,7 @@ public class DelegationService {
   private WitnessStore witnessStore;
 
   @Setter
+  @Getter
   private DelegationStore delegationStore;
 
   @Setter
@@ -64,6 +67,8 @@ public void payStandbyWitness() {
         double eachVotePay = (double) totalPay / voteSum;
         long pay = (long) (getWitnesseByAddress(b).getVoteCount() * eachVotePay);
         logger.debug("pay {} stand reward {}", Hex.toHexString(b.toByteArray()), pay);
+        delegationStore.addVodeReward(dynamicPropertiesStore
+            .getCurrentCycleNumber(), b.toByteArray(), pay);
         payReward(b.toByteArray(), pay);
       }
     }
@@ -72,6 +77,8 @@ public void payStandbyWitness() {
 
   public void payBlockReward(byte[] witnessAddress, long value) {
     logger.debug("pay {} block reward {}", Hex.toHexString(witnessAddress), value);
+    long cycle = dynamicPropertiesStore.getCurrentCycleNumber();
+    delegationStore.addBlockReward(cycle, witnessAddress, value);
     payReward(witnessAddress, value);
   }
 
@@ -117,6 +124,7 @@ public void withdrawReward(byte[] address) {
     //
     endCycle = currentCycle;
     if (CollectionUtils.isEmpty(accountCapsule.getVotesList())) {
+      delegationStore.setRemark(endCycle, address);
       delegationStore.setBeginCycle(address, endCycle + 1);
       return;
     }
@@ -225,5 +233,4 @@ private void sortWitness(List<ByteString> list) {
     list.sort(Comparator.comparingLong((ByteString b) -> getWitnesseByAddress(b).getVoteCount())
         .reversed().thenComparing(Comparator.comparingInt(ByteString::hashCode).reversed()));
   }
-
 }

chainbase/src/main/java/org/tron/core/db2/core/RevokingDBWithCachingOldValue.java

@@ -5,6 +5,8 @@
 import java.util.Objects;
 import java.util.Set;
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import lombok.extern.slf4j.XSlf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.iq80.leveldb.WriteOptions;
 import org.tron.common.parameter.CommonParameter;
@@ -14,7 +16,7 @@
 import org.tron.core.db.RevokingStore;
 import org.tron.core.db2.common.IRevokingDB;
 import org.tron.core.exception.ItemNotFoundException;
-
+@Slf4j
 public class RevokingDBWithCachingOldValue implements IRevokingDB {
 
   private AbstractRevokingStore revokingDatabase;

chainbase/src/main/java/org/tron/core/store/DelegationStore.java

@@ -1,5 +1,6 @@
 package org.tron.core.store;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.spongycastle.util.encoders.Hex;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +11,7 @@
 import org.tron.core.capsule.BytesCapsule;
 import org.tron.core.db.TronStoreWithRevoking;
 
+@Slf4j
 @Component
 public class DelegationStore extends TronStoreWithRevoking<BytesCapsule> {
 
@@ -27,6 +29,48 @@ public BytesCapsule get(byte[] key) {
     return ArrayUtils.isEmpty(value) ? null : new BytesCapsule(value);
   }
 
+  public void addBlockReward(long cycle, byte[] address, long value) {
+    byte[] key = buildRewardBlockKey(cycle, address);
+    BytesCapsule bytesCapsule = get(key);
+
+    if (bytesCapsule == null) {
+      put(key, new BytesCapsule(ByteArray.fromLong(value)));
+    } else {
+      put(key, new BytesCapsule(ByteArray
+          .fromLong(ByteArray.toLong(bytesCapsule.getData()) + value)));
+    }
+  }
+
+  public long getBlockReward(long cycle, byte[] address) {
+    BytesCapsule bytesCapsule = get(buildRewardBlockKey(cycle, address));
+    if (bytesCapsule == null) {
+      return 0L;
+    } else {
+      return ByteArray.toLong(bytesCapsule.getData());
+    }
+  }
+
+  public void addVodeReward(long cycle, byte[] address, long value) {
+    byte[] key = buildRewardVoteKey(cycle, address);
+    BytesCapsule bytesCapsule = get(key);
+
+    if (bytesCapsule == null) {
+      put(key, new BytesCapsule(ByteArray.fromLong(value)));
+    } else {
+      put(key, new BytesCapsule(ByteArray
+          .fromLong(ByteArray.toLong(bytesCapsule.getData()) + value)));
+    }
+  }
+
+  public long getVoteReward(long cycle, byte[] address) {
+    BytesCapsule bytesCapsule = get(buildRewardVoteKey(cycle, address));
+    if (bytesCapsule == null) {
+      return 0L;
+    } else {
+      return ByteArray.toLong(bytesCapsule.getData());
+    }
+  }
+
   public void addReward(long cycle, byte[] address, long value) {
     byte[] key = buildRewardKey(cycle, address);
     BytesCapsule bytesCapsule = get(key);
@@ -51,6 +95,23 @@ public void setBeginCycle(byte[] address, long number) {
     put(address, new BytesCapsule(ByteArray.fromLong(number)));
   }
 
+  public BytesCapsule getRemark(long cycle, byte[] address) {
+    return get(buildRemarkKey(cycle, address));
+  }
+
+  public void setLastWithdrawCycle(long cycle, byte[] address) {
+    put(buildLastWithdrawCycleKey(address), new BytesCapsule(ByteArray.fromLong(cycle)));
+  }
+
+  public long getLastWithdrawCycle(byte[] address) {
+    BytesCapsule bytesCapsule = get(buildLastWithdrawCycleKey(address));
+    return bytesCapsule == null ? REMARK : ByteArray.toLong(bytesCapsule.getData());
+  }
+
+  public void setRemark(long cycle, byte[] address) {
+    put(buildRemarkKey(cycle, address), new BytesCapsule(ByteArray.fromLong(REMARK)));
+  }
+
   public long getBeginCycle(byte[] address) {
     BytesCapsule bytesCapsule = get(address);
     return bytesCapsule == null ? 0 : ByteArray.toLong(bytesCapsule.getData());
@@ -120,6 +181,22 @@ private byte[] buildRewardKey(long cycle, byte[] address) {
     return (cycle + "-" + Hex.toHexString(address) + "-reward").getBytes();
   }
 
+  private byte[] buildRewardBlockKey(long cycle, byte[] address) {
+    return (cycle + "-" + Hex.toHexString(address) + "-block").getBytes();
+  }
+
+  private byte[] buildRewardVoteKey(long cycle, byte[] address) {
+    return (cycle + "-" + Hex.toHexString(address) + "-reward-vote").getBytes();
+  }
+
+  private byte[] buildRemarkKey(long cycle, byte[] address) {
+    return (cycle + "-" + Hex.toHexString(address) + "-remark").getBytes();
+  }
+
+  private byte[] buildLastWithdrawCycleKey(byte[] address) {
+    return ("lastWithdraw-" + Hex.toHexString(address)).getBytes();
+  }
+
   private byte[] buildAccountVoteKey(long cycle, byte[] address) {
     return (cycle + "-" + Hex.toHexString(address) + "-account-vote").getBytes();
   }

chainbase/src/main/java/org/tron/core/store/DynamicPropertiesStore.java

@@ -133,6 +133,7 @@ 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();
 
   @Autowired
   private DynamicPropertiesStore(@Value("properties") String dbName) {
@@ -1811,6 +1812,18 @@ 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;
   }

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

@@ -371,6 +371,9 @@ public class CommonParameter {
   public boolean solidityNodeHttpEnable = true;
   @Getter
   @Setter
+  public boolean nodeHttpStatisticsSRRewardEnable = false;
+  @Getter
+  @Setter
   public int maxTransactionPendingSize;
 
   @Getter

common/src/main/java/org/tron/core/Constant.java

@@ -88,6 +88,7 @@ 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";
   public static final String NODE_HTTP_PBFT_PORT = "node.http.PBFTPort";
 
   public static final String NODE_RPC_THREAD = "node.rpc.thread";

common/src/main/java/org/tron/core/exception/AddressNotFound.java

@@ -0,0 +1,12 @@
+package org.tron.core.exception;
+
+public class AddressNotFound extends StoreException {
+
+  public AddressNotFound() {
+    super();
+  }
+
+  public AddressNotFound(String message) {
+    super(message);
+  }
+}

common/src/main/java/org/tron/core/exception/InvalidAddress.java

@@ -0,0 +1,12 @@
+package org.tron.core.exception;
+
+public class InvalidAddress  extends StoreException {
+
+  public InvalidAddress() {
+    super();
+  }
+
+  public InvalidAddress(String message) {
+    super(message);
+  }
+}

consensus/src/main/java/org/tron/consensus/dpos/MaintenanceManager.java

@@ -138,6 +138,8 @@ 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()));