Merge pull request #1088 from tronprotocol/release

Release

Author: zhaohong

src/main/java/org/tron/core/Wallet.java

@@ -346,7 +346,8 @@ public AssetIssueList getAssetIssueList() {
 
   public AssetIssueList getAssetIssueList(long offset, long limit) {
     AssetIssueList.Builder builder = AssetIssueList.newBuilder();
-    List<AssetIssueCapsule> assetIssueList = dbManager.getAssetIssueStore().getAssetIssuesPaginated(offset, limit);
+    List<AssetIssueCapsule> assetIssueList = dbManager.getAssetIssueStore()
+        .getAssetIssuesPaginated(offset, limit);
     if (null == assetIssueList || assetIssueList.size() == 0) {
       return null;
     }
@@ -467,6 +468,7 @@ public Transaction getTransactionById(ByteString transactionId) {
     try {
       transactionCapsule = dbManager.getTransactionStore()
           .get(transactionId.toByteArray());
+
     } catch (BadItemException e) {
     }
     if (transactionCapsule != null) {

src/main/java/org/tron/core/WalletSolidity.java

@@ -2,21 +2,28 @@
 
 import com.google.protobuf.ByteString;
 import java.util.List;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.tron.api.GrpcAPI.TransactionList;
 import org.tron.common.utils.ByteArray;
+import org.tron.core.capsule.TransactionInfoCapsule;
+import org.tron.core.db.Manager;
 import org.tron.core.db.api.StoreAPI;
+import org.tron.core.exception.BadItemException;
 import org.tron.core.exception.NonUniqueObjectException;
 import org.tron.protos.Protocol.Transaction;
+import org.tron.protos.Protocol.TransactionInfo;
 
 @Slf4j
 @Component
 public class WalletSolidity {
 
   @Autowired
   private StoreAPI storeAPI;
+  @Autowired
+  private Manager dbManager;
 
   public Transaction getTransactionById(ByteString id) {
     try {
@@ -28,7 +35,23 @@ public Transaction getTransactionById(ByteString id) {
     }
     return null;
   }
-  
+
+  public TransactionInfo getTransactionInfoById(ByteString id) {
+    if (Objects.isNull(id)) {
+      return null;
+    }
+    TransactionInfoCapsule transactionInfoCapsule = null;
+    try {
+      transactionInfoCapsule = dbManager.getTransactionHistoryStore()
+          .get(id.toByteArray());
+    } catch (BadItemException e) {
+    }
+    if (transactionInfoCapsule != null) {
+      return transactionInfoCapsule.getInstance();
+    }
+    return null;
+  }
+
   public TransactionList getTransactionsFromThis(ByteString thisAddress, long offset, long limit) {
     List<Transaction> transactionsFromThis = storeAPI
         .getTransactionsFromThis(ByteArray.toHexString(thisAddress.toByteArray()), offset, limit);

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

@@ -172,7 +172,6 @@ public TransactionCapsule(com.google.protobuf.Message message, ContractType cont
     Transaction.raw.Builder transactionBuilder = Transaction.raw.newBuilder().addContract(
         Transaction.Contract.newBuilder().setType(contractType).setParameter(
             Any.pack(message)).build());
-    logger.info("Transaction create succeeded！");
     transaction = Transaction.newBuilder().setRawData(transactionBuilder.build()).build();
   }
 
@@ -181,7 +180,6 @@ public void createTransaction(com.google.protobuf.Message message, ContractType
     Transaction.raw.Builder transactionBuilder = Transaction.raw.newBuilder().addContract(
         Transaction.Contract.newBuilder().setType(contractType).setParameter(
             Any.pack(message)).build());
-    logger.info("Transaction create succeeded！");
     transaction = Transaction.newBuilder().setRawData(transactionBuilder.build()).build();
   }
 

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

@@ -0,0 +1,82 @@
+package org.tron.core.capsule;
+
+import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
+import lombok.extern.slf4j.Slf4j;
+import org.tron.core.exception.BadItemException;
+import org.tron.protos.Protocol.TransactionInfo;
+
+@Slf4j
+public class TransactionInfoCapsule implements ProtoCapsule<TransactionInfo> {
+
+  private TransactionInfo transactionInfo;
+
+  /**
+   * constructor TransactionCapsule.
+   */
+  public TransactionInfoCapsule(TransactionInfo trxRet) {
+    this.transactionInfo = trxRet;
+  }
+
+  public TransactionInfoCapsule(byte[] data) throws BadItemException {
+    try {
+      this.transactionInfo = TransactionInfo.parseFrom(data);
+    } catch (InvalidProtocolBufferException e) {
+      throw new BadItemException("TransactionInfoCapsule proto data parse exception");
+    }
+  }
+
+  public TransactionInfoCapsule() {
+    this.transactionInfo = TransactionInfo.newBuilder().build();
+  }
+
+  public long getFee() {
+    return transactionInfo.getFee();
+  }
+
+  public void setId(byte[] id) {
+    this.transactionInfo = this.transactionInfo.toBuilder()
+        .setId(ByteString.copyFrom(id)).build();
+  }
+
+  public byte[] getId() {
+    return transactionInfo.getId().toByteArray();
+  }
+
+  public void setFee(long fee) {
+    this.transactionInfo = this.transactionInfo.toBuilder().setFee(fee).build();
+  }
+
+  public void addFee(long fee) {
+    this.transactionInfo = this.transactionInfo.toBuilder()
+        .setFee(this.transactionInfo.getFee() + fee).build();
+  }
+
+  public long getBlockNumber() {
+    return transactionInfo.getBlockNumber();
+  }
+
+  public void setBlockNumber(long num) {
+    this.transactionInfo = this.transactionInfo.toBuilder().setBlockNumber(num)
+        .build();
+  }
+
+  public long getBlockTimeStamp() {
+    return transactionInfo.getBlockTimeStamp();
+  }
+
+  public void setBlockTimeStamp(long time) {
+    this.transactionInfo = this.transactionInfo.toBuilder().setBlockTimeStamp(time)
+        .build();
+  }
+
+  @Override
+  public byte[] getData() {
+    return this.transactionInfo.toByteArray();
+  }
+
+  @Override
+  public TransactionInfo getInstance() {
+    return this.transactionInfo;
+  }
+}

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

@@ -1,6 +1,8 @@
 package org.tron.core.capsule;
 
+import com.google.protobuf.InvalidProtocolBufferException;
 import lombok.extern.slf4j.Slf4j;
+import org.tron.core.exception.BadItemException;
 import org.tron.protos.Protocol.Transaction;
 import org.tron.protos.Protocol.Transaction.Result;
 
@@ -16,6 +18,14 @@ public TransactionResultCapsule(Transaction.Result trxRet) {
     this.transactionResult = trxRet;
   }
 
+  public TransactionResultCapsule(byte[] data) throws BadItemException {
+    try {
+      this.transactionResult = Transaction.Result.parseFrom(data);
+    } catch (InvalidProtocolBufferException e) {
+      throw new BadItemException("TransactionResult proto data parse exception");
+    }
+  }
+
   public TransactionResultCapsule() {
     this.transactionResult = Transaction.Result.newBuilder().build();
   }

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

@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Properties;
-import java.util.Random;
 import java.util.stream.Collectors;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -34,7 +33,6 @@
 import org.springframework.stereotype.Component;
 import org.tron.common.crypto.ECKey;
 import org.tron.common.overlay.discover.node.Node;
-import org.tron.core.Constant;
 import org.tron.common.utils.ByteArray;
 import org.tron.core.Constant;
 import org.tron.core.Wallet;
@@ -175,9 +173,9 @@ public class Args {
   @Setter
   private String p2pNodeId;
 
+  //If you are running a solidity node for java tron, this flag is set to true
   @Getter
   @Setter
-  //If you are running a solidity node for java tron, this flag is set to true
   private boolean solidityNode = false;
 
   @Getter

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

@@ -109,7 +109,7 @@ public synchronized void onRemove(RevokingTuple tuple, byte[] value) {
   }
 
   @Override
-  public synchronized void merge() throws RevokingStoreIllegalStateException {
+  public synchronized void merge() {
     if (activeDialog <= 0) {
       throw new RevokingStoreIllegalStateException("activeDialog has to be greater than 0");
     }
@@ -148,7 +148,7 @@ public synchronized void merge() throws RevokingStoreIllegalStateException {
         .filter(e -> {
           boolean has = prevState.oldValues.containsKey(e.getKey());
           if (has) {
-            prevState.removed.put(e.getKey(), e.getValue());
+            prevState.removed.put(e.getKey(), prevState.oldValues.get(e.getKey()));
             prevState.oldValues.remove(e.getKey());
           }
 
@@ -161,7 +161,7 @@ public synchronized void merge() throws RevokingStoreIllegalStateException {
   }
 
   @Override
-  public synchronized void revoke() throws RevokingStoreIllegalStateException {
+  public synchronized void revoke() {
     if (disabled) {
       return;
     }
@@ -189,7 +189,7 @@ public synchronized void revoke() throws RevokingStoreIllegalStateException {
   }
 
   @Override
-  public synchronized void commit() throws RevokingStoreIllegalStateException {
+  public synchronized void commit() {
     if (activeDialog <= 0) {
       throw new RevokingStoreIllegalStateException("activeDialog has to be greater than 0");
     }
@@ -198,7 +198,7 @@ public synchronized void commit() throws RevokingStoreIllegalStateException {
   }
 
   @Override
-  public synchronized void pop() throws RevokingStoreIllegalStateException {
+  public synchronized void pop() {
     if (activeDialog != 0) {
       throw new RevokingStoreIllegalStateException("activeDialog has to be equal 0");
     }
@@ -311,28 +311,28 @@ public Dialog(RevokingDatabase revokingDatabase, boolean disableOnExit) {
       this.disableOnExit = disableOnExit;
     }
 
-    void commit() throws RevokingStoreIllegalStateException {
+    void commit() {
       applyRevoking = false;
       revokingDatabase.commit();
     }
 
-    void revoke() throws RevokingStoreIllegalStateException {
+    void revoke() {
       if (applyRevoking) {
         revokingDatabase.revoke();
       }
 
       applyRevoking = false;
     }
 
-    void merge() throws RevokingStoreIllegalStateException {
+    void merge() {
       if (applyRevoking) {
         revokingDatabase.merge();
       }
 
       applyRevoking = false;
     }
 
-    void copy(Dialog dialog) throws RevokingStoreIllegalStateException {
+    void copy(Dialog dialog) {
       if (this.equals(dialog)) {
         return;
       }
@@ -358,7 +358,7 @@ public void destroy() {
     }
 
     @Override
-    public void close() throws RevokingStoreIllegalStateException {
+    public void close() {
       try {
         if (applyRevoking) {
           revokingDatabase.revoke();

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

@@ -10,7 +10,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.tron.core.capsule.AssetIssueCapsule;
@@ -39,7 +38,6 @@ public AssetIssueCapsule get(byte[] key) {
   @Override
   public boolean has(byte[] key) {
     byte[] assetIssue = dbSource.getData(key);
-    logger.info("name is {}, asset issue is {}", key, assetIssue);
     return null != assetIssue;
   }
 

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

@@ -160,7 +160,6 @@ private void consumeForCreateNewAccount(AccountCapsule accountCapsule, long byte
     }
   }
 
-
   public boolean consumeBandwidthForCreateNewAccount(AccountCapsule accountCapsule, long bytes,
       long now) {
     long netUsage = accountCapsule.getNetUsage();
@@ -389,6 +388,7 @@ private boolean useFreeNet(AccountCapsule accountCapsule, long bytes, long now)
     return true;
 
   }
+
 }