feat(freezeV2): Add bandwidth cost for delegating validation

tronprotocol · Nov 18, 2022 · 62e9c1a · 62e9c1a
1 parent 4afd4c5
commit 62e9c1a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/actuator/src/main/java/org/tron/core/actuator/DelegateResourceActuator.java b/actuator/src/main/java/org/tron/core/actuator/DelegateResourceActuator.java
@@ -28,6 +28,7 @@
 import org.tron.protos.Protocol.Transaction.Contract.ContractType;
 import org.tron.protos.Protocol.Transaction.Result.code;
 import org.tron.protos.contract.BalanceContract.DelegateResourceContract;
+import org.tron.core.utils.TransactionUtil;
 
 @Slf4j(topic = "actuator")
 public class DelegateResourceActuator extends AbstractActuator {
@@ -143,7 +144,12 @@ public boolean validate() throws ContractValidateException {
         BandwidthProcessor processor = new BandwidthProcessor(chainBaseManager);
         processor.updateUsage(ownerCapsule);
 
-        long netUsage = (long) (ownerCapsule.getNetUsage() * TRX_PRECISION * ((double)
+        long accountNetUsage = ownerCapsule.getNetUsage();
+        if (null != this.getTx() && this.getTx().isTransactionCreate()) {
+            accountNetUsage += TransactionUtil.estimateConsumeBandWidthSize(ownerCapsule,
+                    chainBaseManager);
+        }
+        long netUsage = (long) (accountNetUsage * TRX_PRECISION * ((double)
                 (dynamicStore.getTotalNetWeight()) / dynamicStore.getTotalNetLimit()));
 
         long ownerNetUsage = (long) (netUsage * ((double)(ownerCapsule

diff --git a/chainbase/src/main/java/org/tron/core/capsule/TransactionCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/TransactionCapsule.java
@@ -107,6 +107,10 @@ public class TransactionCapsule implements ProtoCapsule<Transaction> {
   private long order;
   private byte[] ownerAddress;
 
+  @Getter
+  @Setter
+  private boolean isTransactionCreate = false;
+
   public byte[] getOwnerAddress() {
     if (this.ownerAddress == null) {
       this.ownerAddress = getOwner(this.transaction.getRawData().getContract(0));

diff --git a/framework/src/main/java/org/tron/core/Wallet.java b/framework/src/main/java/org/tron/core/Wallet.java
@@ -457,14 +457,15 @@ public TransactionCapsule createTransactionCapsuleWithoutValidate(
   public TransactionCapsule createTransactionCapsule(com.google.protobuf.Message message,
       ContractType contractType) throws ContractValidateException {
     TransactionCapsule trx = new TransactionCapsule(message, contractType);
+    trx.setTransactionCreate(true);
     if (contractType != ContractType.CreateSmartContract
         && contractType != ContractType.TriggerSmartContract) {
       List<Actuator> actList = ActuatorFactory.createActuator(trx, chainBaseManager);
       for (Actuator act : actList) {
         act.validate();
       }
     }
-
+    trx.setTransactionCreate(false);
     if (contractType == ContractType.CreateSmartContract) {
 
       CreateSmartContract contract = ContractCapsule