Merge branch 'tronprotocol:develop' into feature/improve_test_coverage

tronprotocol · Sep 4, 2023 · b80f53e · b80f53e
2 parents edb3620 + d6ff733
commit b80f53e
Show file tree

Hide file tree

Showing 11 changed files with 1,202 additions and 10 deletions.
diff --git a/chainbase/src/main/java/org/tron/core/db2/core/AbstractSnapshot.java b/chainbase/src/main/java/org/tron/core/db2/core/AbstractSnapshot.java
@@ -15,6 +15,8 @@ public abstract class AbstractSnapshot<K, V> implements Snapshot {
 
   protected WeakReference<Snapshot> next;
 
+  protected boolean isOptimized;
+
   @Override
   public Snapshot advance() {
     return new SnapshotImpl(this);
@@ -34,4 +36,9 @@ public void setNext(Snapshot next) {
   public String getDbName() {
     return db.getDbName();
   }
+
+  @Override
+  public boolean isOptimized(){
+    return isOptimized;
+  }
 }
diff --git a/chainbase/src/main/java/org/tron/core/db2/core/Snapshot.java b/chainbase/src/main/java/org/tron/core/db2/core/Snapshot.java
@@ -46,4 +46,8 @@ static boolean isImpl(Snapshot snapshot) {
   void updateSolidity();
 
   String getDbName();
+
+  boolean isOptimized();
+
+  void reloadToMem();
 }
diff --git a/chainbase/src/main/java/org/tron/core/db2/core/SnapshotImpl.java b/chainbase/src/main/java/org/tron/core/db2/core/SnapshotImpl.java
@@ -30,6 +30,10 @@ public class SnapshotImpl extends AbstractSnapshot<Key, Value> {
     }
     previous = snapshot;
     snapshot.setNext(this);
+    isOptimized = snapshot.isOptimized();
+    if (isOptimized &&  root == previous) {
+      Streams.stream(root.iterator()).forEach( e -> put(e.getKey(),e.getValue()));
+    }
   }
 
   @Override
@@ -40,6 +44,7 @@ public byte[] get(byte[] key) {
   private byte[] get(Snapshot head, byte[] key) {
     Snapshot snapshot = head;
     Value value;
+
     while (Snapshot.isImpl(snapshot)) {
       if ((value = ((SnapshotImpl) snapshot).db.get(Key.of(key))) != null) {
         return value.getBytes();
@@ -83,6 +88,19 @@ public void merge(Snapshot from) {
     Streams.stream(fromImpl.db).forEach(e -> db.put(e.getKey(), e.getValue()));
   }
 
+  public void mergeAhead(Snapshot from) {
+    if (from instanceof SnapshotRoot) {
+      return ;
+    }
+    SnapshotImpl fromImpl = (SnapshotImpl) from;
+    Streams.stream(fromImpl.db).forEach(e -> {
+      if (db.get(e.getKey()) == null) {
+        db.put(e.getKey(), e.getValue());
+      }
+    }
+    );
+  }
+
   @Override
   public Snapshot retreat() {
     return previous;
@@ -177,4 +195,9 @@ public String getDbName() {
   public Snapshot newInstance() {
     return new SnapshotImpl(this);
   }
+
+  @Override
+  public void reloadToMem() {
+      mergeAhead(previous);
+  }
 }
diff --git a/chainbase/src/main/java/org/tron/core/db2/core/SnapshotManager.java b/chainbase/src/main/java/org/tron/core/db2/core/SnapshotManager.java
@@ -221,6 +221,12 @@ public synchronized void commit() {
     }
 
     --activeSession;
+
+    dbs.forEach(db -> {
+      if (db.getHead().isOptimized()) {
+        db.getHead().reloadToMem();
+      }
+    });
   }
 
   public synchronized void pop() {

diff --git a/chainbase/src/main/java/org/tron/core/db2/core/SnapshotRoot.java b/chainbase/src/main/java/org/tron/core/db2/core/SnapshotRoot.java
@@ -38,6 +38,7 @@ public SnapshotRoot(DB<byte[], byte[]> db) {
     if (CACHE_DBS.contains(this.db.getDbName())) {
       this.cache = CacheManager.allocate(CacheType.findByType(this.db.getDbName()));
     }
+    isOptimized = "properties".equalsIgnoreCase(db.getDbName());
   }
 
   private boolean needOptAsset() {
@@ -221,4 +222,7 @@ public String getDbName() {
   public Snapshot newInstance() {
     return new SnapshotRoot(db.newInstance());
   }
+
+  @Override
+  public void reloadToMem() { }
 }
diff --git a/common/src/main/java/org/tron/common/logsfilter/trigger/TransactionLogTrigger.java b/common/src/main/java/org/tron/common/logsfilter/trigger/TransactionLogTrigger.java
@@ -1,6 +1,8 @@
 package org.tron.common.logsfilter.trigger;
 
 import java.util.List;
+import java.util.Map;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -91,6 +93,10 @@ public class TransactionLogTrigger extends Trigger {
   @Setter
   private long energyUnitPrice;
 
+  @Getter
+  @Setter
+  private Map<String, Long> extMap;
+
   public TransactionLogTrigger() {
     setTriggerName(Trigger.TRANSACTION_TRIGGER_NAME);
   }

diff --git a/framework/src/main/java/org/tron/common/logsfilter/capsule/TransactionLogTriggerCapsule.java b/framework/src/main/java/org/tron/common/logsfilter/capsule/TransactionLogTriggerCapsule.java
@@ -1,6 +1,7 @@
 package org.tron.common.logsfilter.capsule;
 
 import static org.tron.protos.Protocol.Transaction.Contract.ContractType.CreateSmartContract;
+import static org.tron.protos.contract.Common.ResourceCode.ENERGY;
 
 import com.google.protobuf.Any;
 import com.google.protobuf.ByteString;
@@ -26,7 +27,14 @@
 import org.tron.protos.Protocol.Transaction.Contract.ContractType;
 import org.tron.protos.Protocol.TransactionInfo;
 import org.tron.protos.contract.AssetIssueContractOuterClass.TransferAssetContract;
+import org.tron.protos.contract.BalanceContract.CancelAllUnfreezeV2Contract;
+import org.tron.protos.contract.BalanceContract.DelegateResourceContract;
+import org.tron.protos.contract.BalanceContract.FreezeBalanceV2Contract;
 import org.tron.protos.contract.BalanceContract.TransferContract;
+import org.tron.protos.contract.BalanceContract.UnDelegateResourceContract;
+import org.tron.protos.contract.BalanceContract.UnfreezeBalanceContract;
+import org.tron.protos.contract.BalanceContract.UnfreezeBalanceV2Contract;
+import org.tron.protos.contract.BalanceContract.WithdrawExpireUnfreezeContract;
 import org.tron.protos.contract.SmartContractOuterClass.CreateSmartContract;
 import org.tron.protos.contract.SmartContractOuterClass.TriggerSmartContract;
 
@@ -156,6 +164,82 @@ public TransactionLogTriggerCapsule(TransactionCapsule trxCapsule, BlockCapsule
                     StringUtil.encode58Check(createSmartContract.getOwnerAddress().toByteArray()));
               }
               break;
+            case UnfreezeBalanceContract:
+              UnfreezeBalanceContract unfreezeBalanceContract = contractParameter
+                  .unpack(UnfreezeBalanceContract.class);
+
+              transactionLogTrigger.setFromAddress(StringUtil
+                  .encode58Check(unfreezeBalanceContract.getOwnerAddress().toByteArray()));
+              if (!ByteString.EMPTY.equals(unfreezeBalanceContract.getReceiverAddress())) {
+                transactionLogTrigger.setToAddress(StringUtil
+                    .encode58Check(unfreezeBalanceContract.getReceiverAddress().toByteArray()));
+              }
+              transactionLogTrigger.setAssetName("trx");
+              transactionLogTrigger.setAssetAmount(
+                  transactionInfo.getUnfreezeAmount());
+              break;
+            case FreezeBalanceV2Contract:
+              FreezeBalanceV2Contract freezeBalanceV2Contract = contractParameter
+                  .unpack(FreezeBalanceV2Contract.class);
+
+              transactionLogTrigger.setFromAddress(StringUtil
+                  .encode58Check(freezeBalanceV2Contract.getOwnerAddress().toByteArray()));
+              transactionLogTrigger.setAssetName("trx");
+              transactionLogTrigger.setAssetAmount(freezeBalanceV2Contract.getFrozenBalance());
+              break;
+            case UnfreezeBalanceV2Contract:
+              UnfreezeBalanceV2Contract unfreezeBalanceV2Contract = contractParameter
+                  .unpack(UnfreezeBalanceV2Contract.class);
+
+              transactionLogTrigger.setFromAddress(StringUtil
+                  .encode58Check(unfreezeBalanceV2Contract.getOwnerAddress().toByteArray()));
+              transactionLogTrigger.setAssetName("trx");
+              transactionLogTrigger.setAssetAmount(
+                  unfreezeBalanceV2Contract.getUnfreezeBalance());
+              break;
+            case WithdrawExpireUnfreezeContract:
+              WithdrawExpireUnfreezeContract withdrawExpireUnfreezeContract = contractParameter
+                  .unpack(WithdrawExpireUnfreezeContract.class);
+
+              transactionLogTrigger.setFromAddress(StringUtil.encode58Check(
+                  withdrawExpireUnfreezeContract.getOwnerAddress().toByteArray()));
+              transactionLogTrigger.setAssetName("trx");
+              transactionLogTrigger.setAssetAmount(transactionInfo.getWithdrawExpireAmount());
+              break;
+            case DelegateResourceContract:
+              DelegateResourceContract delegateResourceContract = contractParameter
+                  .unpack(DelegateResourceContract.class);
+
+              transactionLogTrigger.setFromAddress(StringUtil
+                  .encode58Check(delegateResourceContract.getOwnerAddress().toByteArray()));
+              transactionLogTrigger.setToAddress(StringUtil
+                      .encode58Check(delegateResourceContract.getReceiverAddress().toByteArray()));
+              transactionLogTrigger.setAssetName("trx");
+              transactionLogTrigger.setAssetAmount(
+                      delegateResourceContract.getBalance());
+              break;
+            case UnDelegateResourceContract:
+              UnDelegateResourceContract unDelegateResourceContract = contractParameter
+                  .unpack(UnDelegateResourceContract.class);
+
+              transactionLogTrigger.setFromAddress(StringUtil
+                  .encode58Check(unDelegateResourceContract.getOwnerAddress().toByteArray()));
+              transactionLogTrigger.setToAddress(StringUtil.encode58Check(
+                  unDelegateResourceContract.getReceiverAddress().toByteArray()));
+
+              transactionLogTrigger.setAssetName("trx");
+              transactionLogTrigger.setAssetAmount(
+                    unDelegateResourceContract.getBalance());
+              break;
+            case CancelAllUnfreezeV2Contract:
+              CancelAllUnfreezeV2Contract cancelAllUnfreezeV2Contract = contractParameter
+                  .unpack(CancelAllUnfreezeV2Contract.class);
+
+              transactionLogTrigger.setFromAddress(StringUtil
+                  .encode58Check(cancelAllUnfreezeV2Contract.getOwnerAddress().toByteArray()));
+              transactionLogTrigger.setAssetName("trx");
+              transactionLogTrigger.setExtMap(transactionInfo.getCancelUnfreezeV2AmountMap());
+              break;
             default:
               break;
           }
@@ -269,4 +353,5 @@ private List<InternalTransactionPojo> getInternalTransactionList(
   public void processTrigger() {
     EventPluginLoader.getInstance().postTransactionTrigger(transactionLogTrigger);
   }
+
 }
diff --git a/framework/src/main/java/org/tron/core/services/RpcApiService.java b/framework/src/main/java/org/tron/core/services/RpcApiService.java
@@ -1893,6 +1893,7 @@ private void callContract(TriggerSmartContract request,
       }
     }
 
+    @Override
     public void getPaginatedAssetIssueList(PaginatedMessage request,
         StreamObserver<AssetIssueList> responseObserver) {
       responseObserver.onNext(wallet.getAssetIssueList(request.getOffset(), request.getLimit()));