Merge branch 'develop' into fast-sync-use-cpdb

Author: lvs007

src/main/java/org/tron/common/logsfilter/capsule/BlockLogTriggerCapsule.java

@@ -22,6 +22,10 @@ public BlockLogTriggerCapsule(BlockCapsule block) {
     );
   }
 
+  public void setLatestSolidifiedBlockNumber(long latestSolidifiedBlockNumber) {
+    blockLogTrigger.setLatestSolidifiedBlockNumber(latestSolidifiedBlockNumber);
+  }
+
   @Override
   public void processTrigger() {
     EventPluginLoader.getInstance().postBlockTrigger(blockLogTrigger);

src/main/java/org/tron/common/logsfilter/capsule/ContractEventTriggerCapsule.java

@@ -28,6 +28,10 @@ public class ContractEventTriggerCapsule extends TriggerCapsule {
   @Setter
   private Entry abiEntry;
 
+  public void setLatestSolidifiedBlockNumber(long latestSolidifiedBlockNumber) {
+    contractEventTrigger.setLatestSolidifiedBlockNumber(latestSolidifiedBlockNumber);
+  }
+
   public ContractEventTriggerCapsule(LogEventWrapper log) {
     this.contractEventTrigger = new ContractEventTrigger();
 

src/main/java/org/tron/common/logsfilter/capsule/ContractLogTriggerCapsule.java

@@ -15,6 +15,10 @@ public ContractLogTriggerCapsule(ContractLogTrigger contractLogTrigger) {
     this.contractLogTrigger = contractLogTrigger;
   }
 
+  public void setLatestSolidifiedBlockNumber(long latestSolidifiedBlockNumber) {
+    contractLogTrigger.setLatestSolidifiedBlockNumber(latestSolidifiedBlockNumber);
+  }
+
   @Override
   public void processTrigger() {
     if (FilterQuery.matchFilter(contractLogTrigger)) {

src/main/java/org/tron/common/logsfilter/capsule/TransactionLogTriggerCapsule.java

@@ -35,13 +35,17 @@ public class TransactionLogTriggerCapsule extends TriggerCapsule {
   @Setter
   TransactionLogTrigger transactionLogTrigger;
 
+  public void setLatestSolidifiedBlockNumber(long latestSolidifiedBlockNumber) {
+    transactionLogTrigger.setLatestSolidifiedBlockNumber(latestSolidifiedBlockNumber);
+  }
+
   public TransactionLogTriggerCapsule(TransactionCapsule trxCasule, BlockCapsule blockCapsule) {
     transactionLogTrigger = new TransactionLogTrigger();
     if (Objects.nonNull(blockCapsule)) {
       transactionLogTrigger.setBlockHash(blockCapsule.getBlockId().toString());
     }
     transactionLogTrigger.setTransactionId(trxCasule.getTransactionId().toString());
-    transactionLogTrigger.setTimeStamp(trxCasule.getTimestamp());
+    transactionLogTrigger.setTimeStamp(blockCapsule.getTimeStamp());
     transactionLogTrigger.setBlockNumber(trxCasule.getBlockNum());
 
     TransactionTrace trxTrace = trxCasule.getTrxTrace();
@@ -152,7 +156,7 @@ private List<InternalTransactionPojo> getInternalTransactionList(List<InternalTr
       item.setCallValue(internalTransaction.getValue());
       item.setTokenInfo(internalTransaction.getTokenInfo());
       item.setCaller_address(Hex.toHexString(internalTransaction.getSender()));
-      item.setTransferTo_address(Hex.toHexString(internalTransaction.getReceiveAddress()));
+      item.setTransferTo_address(Hex.toHexString(internalTransaction.getTransferToAddress()));
       item.setData(Hex.toHexString(internalTransaction.getData()));
       item.setRejected(internalTransaction.isRejected());
       item.setNote(internalTransaction.getNote());

src/main/java/org/tron/common/logsfilter/trigger/BlockLogTrigger.java

@@ -18,6 +18,10 @@ public class BlockLogTrigger extends Trigger {
   @Setter
   private long transactionSize;
 
+  @Getter
+  @Setter
+  private long latestSolidifiedBlockNumber;
+
   @Getter
   @Setter
   private List<String> transactionList = new ArrayList<>();
@@ -37,6 +41,8 @@ public String toString() {
       .append(blockHash)
       .append(", transactionSize: ")
       .append(transactionSize)
+      .append(", latestSolidifiedBlockNumber: ")
+      .append(latestSolidifiedBlockNumber)
       .append(", transactionList: ")
       .append(transactionList).toString();
   }

src/main/java/org/tron/common/logsfilter/trigger/ContractTrigger.java

@@ -53,4 +53,8 @@ public class ContractTrigger extends Trigger {
   @Getter
   @Setter
   private boolean removed;
+
+  @Getter
+  @Setter
+  private long latestSolidifiedBlockNumber;
 }

src/main/java/org/tron/common/logsfilter/trigger/TransactionLogTrigger.java

@@ -90,6 +90,10 @@ public void setTimeStamp(long ts) {
   @Setter
   private long assetAmount;
 
+  @Getter
+  @Setter
+  private long latestSolidifiedBlockNumber;
+
   //internal transaction
   @Getter
   @Setter

src/main/java/org/tron/common/runtime/RuntimeImpl.java

@@ -452,7 +452,7 @@ private void create()
           && isCheckTransaction()){
 
         logInfoTriggerParser = new LogInfoTriggerParser(newSmartContract.getAbi(),
-            blockCap.getNum(), trx.getRawData().getTimestamp(), txId,
+            blockCap.getNum(), blockCap.getTimeStamp(), txId,
             callerAddress, callerAddress, callerAddress, contractAddress);
 
       }
@@ -580,7 +580,7 @@ private void call()
           && isCheckTransaction()){
 
         logInfoTriggerParser = new LogInfoTriggerParser(deployedContract.getInstance().getAbi(),
-            blockCap.getNum(), trx.getRawData().getTimestamp(), txId,
+            blockCap.getNum(), blockCap.getTimeStamp(), txId,
             callerAddress, creatorAddress, originAddress, contractAddress);
       }
     }
@@ -765,12 +765,13 @@ public void finalization() {
     }
 
   }
+
   public void checkTokenValueAndId(long tokenValue, long tokenId) throws ContractValidateException {
     if (VMConfig.allowTvmTransferTrc10()) {
       if (VMConfig.isVERSION_3_5_HARD_FORK()) { //3.5 hard fork
         // tokenid can only be 0
         // or (MIN_TOKEN_ID, Long.Max]
-        if (tokenId <= VMConstant.MIN_TOKEN_ID && tokenId != 0){
+        if (tokenId <= VMConstant.MIN_TOKEN_ID && tokenId != 0) {
           throw new ContractValidateException("tokenId must > " + VMConstant.MIN_TOKEN_ID);
         }
         // tokenid can only be 0 when tokenvalue = 0,

src/main/java/org/tron/common/runtime/vm/VM.java

@@ -1359,6 +1359,7 @@ public void play(Program program) {
       throw e;
     } catch (RuntimeException e) {
       if (StringUtils.isEmpty(e.getMessage())) {
+        logger.warn("Unknown Exception occurred, tx id: {}", Hex.toHexString(program.getRootTransactionId()), e);
         program.setRuntimeFailure(new RuntimeException("Unknown Exception"));
       } else {
         program.setRuntimeFailure(e);

src/main/java/org/tron/common/storage/Value.java

@@ -1,8 +1,10 @@
 package org.tron.common.storage;
 
+import static org.tron.common.storage.Type.VALUE_TYPE_UNKNOWN;
+
 import java.util.Arrays;
 import org.apache.commons.lang3.ArrayUtils;
-import org.tron.common.utils.ByteArray;
+import org.tron.common.runtime.config.VMConfig;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.AssetIssueCapsule;
 import org.tron.core.capsule.BlockCapsule;
@@ -40,6 +42,10 @@ public Value(byte[] any, int type) {
             this.any = new byte[any.length];
             System.arraycopy(any, 0, this.any, 0, any.length);
             this.type = new Type(type);
+        } else {
+            if (VMConfig.isVERSION_3_5_HARD_FORK()) {
+                this.type = new Type(VALUE_TYPE_UNKNOWN);
+            }
         }
     }
 
@@ -51,6 +57,10 @@ private Value(Value value) {
             this.any = new byte[value.any.length];
             System.arraycopy(value.getAny(), 0, this.any, 0, value.getAny().length);
             this.type = value.getType().clone();
+        } else {
+            if (VMConfig.isVERSION_3_5_HARD_FORK()) {
+                this.type = new Type(VALUE_TYPE_UNKNOWN);
+            }
         }
     }
 
@@ -211,9 +221,9 @@ public static Value create(byte[] any, int type) {
         return new Value(any, type);
     }
 
-    public static Value create(byte[] any, Type type) {
-        return new Value(any, type);
-    }
+//    public static Value create(byte[] any, Type type) {
+//        return new Value(any, type);
+//    }
 
     public static Value create(byte[] any) {
         return new Value(any, Type.VALUE_TYPE_NORMAL);

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

@@ -64,8 +64,6 @@
 import org.tron.api.GrpcAPI.WitnessList;
 import org.tron.common.crypto.ECKey;
 import org.tron.common.crypto.Hash;
-import org.tron.common.logsfilter.EventPluginLoader;
-import org.tron.common.logsfilter.FilterQuery;
 import org.tron.common.overlay.discover.node.NodeHandler;
 import org.tron.common.overlay.discover.node.NodeManager;
 import org.tron.common.overlay.message.Message;
@@ -128,6 +126,7 @@
 import org.tron.protos.Protocol.DelegatedResourceAccountIndex;
 import org.tron.protos.Protocol.Exchange;
 import org.tron.protos.Protocol.Permission;
+import org.tron.protos.Protocol.Permission.PermissionType;
 import org.tron.protos.Protocol.Proposal;
 import org.tron.protos.Protocol.SmartContract;
 import org.tron.protos.Protocol.SmartContract.ABI;
@@ -151,8 +150,8 @@ public class Wallet {
   private Manager dbManager;
   @Autowired
   private NodeManager nodeManager;
-  private static String addressPreFixString = Constant.ADD_PRE_FIX_STRING_TESTNET;  //default testnet
-  private static byte addressPreFixByte = Constant.ADD_PRE_FIX_BYTE_TESTNET;
+  private static String addressPreFixString = Constant.ADD_PRE_FIX_STRING_MAINNET;  //default testnet
+  private static byte addressPreFixByte = Constant.ADD_PRE_FIX_BYTE_MAINNET;
 
   private int minEffectiveConnection = Args.getInstance().getMinEffectiveConnection();
 
@@ -437,7 +436,6 @@ public GrpcAPI.Return broadcastTransaction(Transaction signaturedTransaction) {
         }
       }
 
-
       if (dbManager.isTooManyPending()) {
         logger.warn("Broadcast transaction {} failed, too many pending.", trx.getTransactionId());
         return builder.setResult(false).setCode(response_code.SERVER_BUSY).build();
@@ -525,6 +523,17 @@ public TransactionCapsule addSign(TransactionSign transactionSign)
     return trx;
   }
 
+  public static boolean checkPermissionOprations(Permission permission, Contract contract)
+      throws PermissionException {
+    ByteString operations = permission.getOperations();
+    if (operations.size() != 32) {
+      throw new PermissionException("operations size must 32");
+    }
+    int contractType = contract.getTypeValue();
+    boolean b = (operations.byteAt(contractType / 8) & (1 << (contractType % 8))) != 0;
+    return b;
+  }
+
   public TransactionSignWeight getTransactionSignWeight(Transaction trx) {
     TransactionSignWeight.Builder tswBuilder = TransactionSignWeight.newBuilder();
     TransactionExtention.Builder trxExBuilder = TransactionExtention.newBuilder();
@@ -542,9 +551,20 @@ public TransactionSignWeight getTransactionSignWeight(Transaction trx) {
       if (account == null) {
         throw new PermissionException("Account is not exist!");
       }
-      String permissionName = TransactionCapsule.getPermissionName(contract);
-      Permission permission = TransactionCapsule
-          .getPermission(account.getInstance(), permissionName);
+      int permissionId = contract.getPermissionId();
+      Permission permission = account.getPermissionById(permissionId);
+      if (permission == null) {
+        throw new PermissionException("permission isn't exit");
+      }
+      if (permissionId != 0) {
+        if (permission.getType() != PermissionType.Active) {
+          throw new PermissionException("Permission type is error");
+        }
+        //check oprations
+        if (!checkPermissionOprations(permission, contract)){
+          throw new PermissionException("Permission denied");
+        }
+      }
       tswBuilder.setPermission(permission);
       if (trx.getSignatureCount() > 0) {
         List<ByteString> approveList = new ArrayList<ByteString>();