feat(actuator): include pq signatures in getTransactionSignWeight

Author: Federico2014

actuator/src/main/java/org/tron/core/utils/TransactionUtil.java

@@ -37,6 +37,7 @@
 import org.tron.api.GrpcAPI.TransactionExtention;
 import org.tron.api.GrpcAPI.TransactionSignWeight;
 import org.tron.api.GrpcAPI.TransactionSignWeight.Result;
+import org.tron.common.math.StrictMathWrapper;
 import org.tron.common.parameter.CommonParameter;
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.ChainBaseManager;
@@ -221,11 +222,24 @@ public TransactionSignWeight getTransactionSignWeight(Transaction trx) {
           }
         }
         tswBuilder.setPermission(permission);
-        if (trx.getSignatureCount() > 0) {
+        if (trx.getSignatureCount() > 0 || trx.getPqAuthSigCount() > 0) {
           List<ByteString> approveList = new ArrayList<>();
-          long currentWeight = TransactionCapsule.checkWeight(permission, trx.getSignatureList(),
-              Sha256Hash.hash(CommonParameter.getInstance()
-                  .isECKeyCryptoEngine(), trx.getRawData().toByteArray()), approveList);
+          long currentWeight = 0L;
+          if (trx.getSignatureCount() > 0) {
+            currentWeight = TransactionCapsule.checkWeight(permission, trx.getSignatureList(),
+                Sha256Hash.hash(CommonParameter.getInstance()
+                    .isECKeyCryptoEngine(), trx.getRawData().toByteArray()), approveList);
+          }
+          if (trx.getPqAuthSigCount() > 0) {
+            java.util.Set<ByteString> signedAddresses = new java.util.HashSet<>(approveList);
+            try {
+              currentWeight = StrictMathWrapper.addExact(currentWeight,
+                  TransactionCapsule.validatePQSignature(trx, permission, signedAddresses,
+                      chainBaseManager.getDynamicPropertiesStore(), approveList));
+            } catch (ArithmeticException e) {
+              throw new PermissionException("weight overflow");
+            }
+          }
           tswBuilder.addAllApprovedList(approveList);
           tswBuilder.setCurrentWeight(currentWeight);
         }

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

@@ -504,7 +504,7 @@ public static boolean validateSignature(Transaction transaction,
       try {
         weight = StrictMathWrapper.addExact(weight,
             validatePQSignature(transaction, permission, signedAddresses,
-                dynamicPropertiesStore));
+                dynamicPropertiesStore, approveList));
       } catch (ArithmeticException e) {
         throw new PermissionException("weight overflow");
       }
@@ -723,9 +723,10 @@ void logSlowSigVerify(long startNs) {
    *       part of {@code raw_data}.</li>
    * </ol>
    */
-  static long validatePQSignature(Transaction transaction, Permission permission,
+  public static long validatePQSignature(Transaction transaction, Permission permission,
       java.util.Set<ByteString> signedAddresses,
-      DynamicPropertiesStore dynamicPropertiesStore)
+      DynamicPropertiesStore dynamicPropertiesStore,
+      List<ByteString> approveList)
       throws PermissionException {
     byte[] digest = computeRawHash(transaction).getBytes();
 
@@ -770,6 +771,9 @@ static long validatePQSignature(Transaction transaction, Permission permission,
       } catch (ArithmeticException e) {
         throw new PermissionException("weight overflow");
       }
+      if (approveList != null) {
+        approveList.add(addrBs);
+      }
     }
     return weight;
   }