Merge pull request #359 from tronprotocol/feature/ls_debug1

Feature/ls debug1

Author: zhaohong

src/main/java/org/tron/core/capsule/BlockCapsule.java

@@ -237,8 +237,8 @@ public Sha256Hash calcMerkleRoot() {
 
   public void setMerkleRoot() {
     BlockHeader.raw blockHeaderRaw =
-            this.block.getBlockHeader().getRawData().toBuilder()
-                    .setTxTrieRoot(calcMerkleRoot().getByteString()).build();
+        this.block.getBlockHeader().getRawData().toBuilder()
+            .setTxTrieRoot(calcMerkleRoot().getByteString()).build();
 
     this.block = this.block.toBuilder().setBlockHeader(
         this.block.getBlockHeader().toBuilder().setRawData(blockHeaderRaw)).build();
@@ -249,6 +249,11 @@ public Sha256Hash getMerkleRoot() {
     return Sha256Hash.wrap(this.block.getBlockHeader().getRawData().getTxTrieRoot());
   }
 
+  public ByteString getWitnessAddress(){
+    unPack();
+    return this.block.getBlockHeader().getRawData().getWitnessAddress();
+  }
+
 
   private void pack() {
     if (data == null) {

src/main/java/org/tron/core/capsule/WitnessCapsule.java

@@ -82,10 +82,6 @@ public Witness getInstance() {
     return this.witness;
   }
 
-  public long getLatestBlockNum() {
-    return this.witness.getLatestBlockNum();
-  }
-
   public void setPubKey(final ByteString pubKey) {
     this.witness = this.witness.toBuilder().setPubKey(pubKey).build();
   }
@@ -98,6 +94,38 @@ public void setVoteCount(final long voteCount) {
     this.witness = this.witness.toBuilder().setVoteCount(voteCount).build();
   }
 
+  public void setTotalProduced(final long totalProduced) {
+    this.witness = this.witness.toBuilder().setTotalProduced(totalProduced).build();
+  }
+
+  public long getTotalProduced() {
+    return this.witness.getTotalProduced();
+  }
+
+  public void setTotalMissed(final long totalMissed) {
+    this.witness = this.witness.toBuilder().setTotalMissed(totalMissed).build();
+  }
+
+  public long getTotalMissed() {
+    return this.witness.getTotalMissed();
+  }
+
+  public void setLatestBlockNum(final long latestBlockNum) {
+    this.witness = this.witness.toBuilder().setLatestBlockNum(latestBlockNum).build();
+  }
+
+  public long getLatestBlockNum() {
+    return this.witness.getLatestBlockNum();
+  }
+
+  public void setLatestSlotNum(final long latestSlotNum) {
+    this.witness = this.witness.toBuilder().setLatestSlotNum(latestSlotNum).build();
+  }
+
+  public long getLatestSlotNum() {
+    return this.witness.getLatestSlotNum();
+  }
+
   public void setIsJobs(final boolean isJobs) {
     this.witness = this.witness.toBuilder().setIsJobs(isJobs).build();
   }

src/main/java/org/tron/core/db/Manager.java

@@ -595,7 +595,21 @@ public void pushBlock(final BlockCapsule block)
   }
 
   public void updateDynamicProperties(BlockCapsule block) {
+    long slot = 1;
+    if (block.getNum() != 1){
+      slot = getSlotAtTime(block.getTimeStamp());
+    }
+    for (int i = 1; i < slot; ++i){
+      if (!getScheduledWitness(i).equals(block.getWitnessAddress())){
+        WitnessCapsule w = this.witnessStore.get(createDbKey(getScheduledWitness(i)));
+        w.setTotalMissed(w.getTotalMissed()+1);
+        this.witnessStore.put(w.createDbKey(), w);
+        logger.info("{} miss a block. totalMissed = {}",
+            w.createReadableString(), w.getTotalMissed());
+      }
+    }
     this.head = block;
+    logger.info("update head, num = {}", block.getNum());
     this.dynamicPropertiesStore
         .saveLatestBlockHeaderHash(block.getBlockId().getByteString());
     this.dynamicPropertiesStore.saveLatestBlockHeaderNumber(block.getNum());
@@ -885,30 +899,34 @@ private void processMaintenance(BlockCapsule block) {
 
   /**
    * @param block the block update signed witness.  set witness who signed block the 1. the latest
-   * block num 2. pay the trx to witness. 3. (TODO)the latest slot num.
+   * block num 2. pay the trx to witness. 3. the latest slot num.
    */
 
   public void updateSignedWitness(BlockCapsule block) {
     //TODO: add verification
     WitnessCapsule witnessCapsule = witnessStore
         .get(block.getInstance().getBlockHeader().getRawData().getWitnessAddress().toByteArray());
-    long latestSlotNum = 0;
-    witnessCapsule.getInstance().toBuilder().setLatestBlockNum(block.getNum())
-        .setLatestSlotNum(latestSlotNum)
-        .build();
-    AccountCapsule sun = accountStore.getSun();
+    witnessCapsule.setTotalProduced(witnessCapsule.getTotalProduced()+1);
+    witnessCapsule.setLatestBlockNum(block.getNum());
+    witnessCapsule.setLatestSlotNum(getAbSlotAtTime(block.getTimeStamp()));
+
+    this.getWitnessStore().put(witnessCapsule.getAddress().toByteArray(),witnessCapsule);
 
+    AccountCapsule sun = accountStore.getSun();
     try {
       adjustBalance(sun.getAddress().toByteArray(), -WITNESS_PAY_PER_BLOCK);
     } catch (BalanceInsufficientException e) {
-
+      logger.debug(e.getMessage(), e);
     }
     try {
       adjustBalance(witnessCapsule.getAddress().toByteArray(), WITNESS_PAY_PER_BLOCK);
     } catch (BalanceInsufficientException e) {
       logger.debug(e.getMessage(), e);
     }
 
+    logger.info("updateSignedWitness. witness address:{}, blockNum:{}, totalProduced:{}",
+        witnessCapsule.createReadableString(), block.getNum(), witnessCapsule.getTotalProduced());
+
   }
 
   private long blockInterval() {