Modify the method of getting the address of black hole

sean-liu55 · sean-liu55 · commit 95d53baf72f2 · 2020-12-15T11:06:31.000+08:00
diff --git a/actuator/src/main/java/org/tron/core/actuator/AccountPermissionUpdateActuator.java b/actuator/src/main/java/org/tron/core/actuator/AccountPermissionUpdateActuator.java
@@ -53,7 +53,7 @@ public boolean execute(Object object) throws ContractExeException {
       accountStore.put(ownerAddress, account);
 
       Commons.adjustBalance(accountStore, ownerAddress, -fee);
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), fee);
+      Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
 
       result.setStatus(fee, code.SUCESS);
     } catch (BalanceInsufficientException | InvalidProtocolBufferException e) {
diff --git a/actuator/src/main/java/org/tron/core/actuator/AssetIssueActuator.java b/actuator/src/main/java/org/tron/core/actuator/AssetIssueActuator.java
@@ -85,7 +85,7 @@ public boolean execute(Object result) throws ContractExeException {
       }
 
       Commons.adjustBalance(accountStore, ownerAddress, -fee);
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().getAddress().toByteArray(),
+      Commons.adjustBalance(accountStore, accountStore.getBlackhole(),
           fee);//send to blackhole
 
       AccountCapsule accountCapsule = accountStore.get(ownerAddress);
diff --git a/actuator/src/main/java/org/tron/core/actuator/CreateAccountActuator.java b/actuator/src/main/java/org/tron/core/actuator/CreateAccountActuator.java
@@ -49,7 +49,7 @@ public boolean execute(Object result)
       Commons
           .adjustBalance(accountStore, accountCreateContract.getOwnerAddress().toByteArray(), -fee);
       // Add to blackhole address
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), fee);
+      Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
 
       ret.setStatus(fee, code.SUCESS);
     } catch (BalanceInsufficientException | InvalidProtocolBufferException e) {
diff --git a/actuator/src/main/java/org/tron/core/actuator/ExchangeCreateActuator.java b/actuator/src/main/java/org/tron/core/actuator/ExchangeCreateActuator.java
@@ -119,7 +119,7 @@ public boolean execute(Object object) throws ContractExeException {
       accountStore.put(accountCapsule.createDbKey(), accountCapsule);
       dynamicStore.saveLatestExchangeNum(id);
 
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), fee);
+      Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
 
       ret.setExchangeId(id);
       ret.setStatus(fee, code.SUCESS);
diff --git a/actuator/src/main/java/org/tron/core/actuator/MarketCancelOrderActuator.java b/actuator/src/main/java/org/tron/core/actuator/MarketCancelOrderActuator.java
@@ -93,7 +93,7 @@ public boolean execute(Object object) throws ContractExeException {
 
       // fee
       accountCapsule.setBalance(accountCapsule.getBalance() - fee);
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), fee);
+      Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
 
       // 1. return balance and token
       MarketUtils.returnSellTokenRemain(orderCapsule, accountCapsule, dynamicStore, assetIssueStore);
diff --git a/actuator/src/main/java/org/tron/core/actuator/MarketSellAssetActuator.java b/actuator/src/main/java/org/tron/core/actuator/MarketSellAssetActuator.java
@@ -124,7 +124,7 @@ public boolean execute(Object object) throws ContractExeException {
       // fee
       accountCapsule.setBalance(accountCapsule.getBalance() - fee);
       // add to blackhole address
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), fee);
+      Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
 
       // 1. transfer of balance
       transferBalanceOrToken(accountCapsule);
diff --git a/actuator/src/main/java/org/tron/core/actuator/ShieldedTransferActuator.java b/actuator/src/main/java/org/tron/core/actuator/ShieldedTransferActuator.java
@@ -76,7 +76,7 @@ public boolean execute(Object result)
         executeTransparentFrom(shieldedTransferContract.getTransparentFromAddress().toByteArray(),
             shieldedTransferContract.getFromAmount(), ret, fee);
       }
-      Commons.adjustAssetBalanceV2(accountStore.getBlackhole().createDbKey(),
+      Commons.adjustAssetBalanceV2(accountStore.getBlackhole(),
           CommonParameter.getInstance().getZenTokenId(), fee,
           accountStore, assetIssueStore, dynamicStore);
     } catch (BalanceInsufficientException e) {
diff --git a/actuator/src/main/java/org/tron/core/actuator/TransferActuator.java b/actuator/src/main/java/org/tron/core/actuator/TransferActuator.java
@@ -56,7 +56,7 @@ public boolean execute(Object object) throws ContractExeException {
         fee = fee + dynamicStore.getCreateNewAccountFeeInSystemContract();
       }
       Commons.adjustBalance(accountStore, ownerAddress, -fee);
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), fee);
+      Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
       ret.setStatus(fee, code.SUCESS);
       Commons.adjustBalance(accountStore, ownerAddress, -amount);
       Commons.adjustBalance(accountStore, toAddress, amount);
diff --git a/actuator/src/main/java/org/tron/core/actuator/TransferAssetActuator.java b/actuator/src/main/java/org/tron/core/actuator/TransferAssetActuator.java
@@ -74,7 +74,7 @@ public boolean execute(Object result) throws ContractExeException {
       long amount = transferAssetContract.getAmount();
 
       Commons.adjustBalance(accountStore, ownerAddress, -fee);
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), fee);
+      Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);
 
       AccountCapsule ownerAccountCapsule = accountStore.get(ownerAddress);
       if (!ownerAccountCapsule
diff --git a/actuator/src/main/java/org/tron/core/actuator/WitnessCreateActuator.java b/actuator/src/main/java/org/tron/core/actuator/WitnessCreateActuator.java
@@ -140,7 +140,7 @@ private void createWitness(final WitnessCreateContract witnessCreateContract)
     Commons
         .adjustBalance(accountStore, witnessCreateContract.getOwnerAddress().toByteArray(), -cost);
 
-    Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), +cost);
+    Commons.adjustBalance(accountStore, accountStore.getBlackhole(), +cost);
 
     dynamicStore.addTotalCreateWitnessCost(cost);
   }
diff --git a/actuator/src/main/java/org/tron/core/vm/repository/RepositoryImpl.java b/actuator/src/main/java/org/tron/core/vm/repository/RepositoryImpl.java
@@ -635,7 +635,7 @@ public long getTokenBalance(byte[] address, byte[] tokenId) {
 
   @Override
   public byte[] getBlackHoleAddress() {
-    return getAccountStore().getBlackhole().getAddress().toByteArray();
+    return getAccountStore().getBlackholeAddress();
   }
 
   @Override
diff --git a/chainbase/src/main/java/org/tron/core/capsule/ReceiptCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/ReceiptCapsule.java
@@ -194,7 +194,7 @@ private void payEnergyBill(
       account.setBalance(balance - energyFee);
 
       //send to blackHole
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().getAddress().toByteArray(),
+      Commons.adjustBalance(accountStore, accountStore.getBlackhole(),
           energyFee);
     }
 
diff --git a/chainbase/src/main/java/org/tron/core/db/ResourceProcessor.java b/chainbase/src/main/java/org/tron/core/db/ResourceProcessor.java
@@ -72,7 +72,7 @@ protected boolean consumeFee(AccountCapsule accountCapsule, long fee) {
       long latestOperationTime = dynamicPropertiesStore.getLatestBlockHeaderTimestamp();
       accountCapsule.setLatestOperationTime(latestOperationTime);
       Commons.adjustBalance(accountStore, accountCapsule, -fee);
-      Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), +fee);
+      Commons.adjustBalance(accountStore, accountStore.getBlackhole(), +fee);
       return true;
     } catch (BalanceInsufficientException e) {
       return false;
diff --git a/chainbase/src/main/java/org/tron/core/store/AccountStore.java b/chainbase/src/main/java/org/tron/core/store/AccountStore.java
@@ -64,6 +64,11 @@ public AccountCapsule getBlackhole() {
     return getUnchecked(assertsAddress.get("Blackhole"));
   }
 
+
+  public byte[] getBlackholeAddress() {
+    return assertsAddress.get("Blackhole");
+  }
+
   /**
    * Get foundation account info.
    */
diff --git a/framework/src/main/java/org/tron/common/storage/DepositImpl.java b/framework/src/main/java/org/tron/common/storage/DepositImpl.java
@@ -176,7 +176,7 @@ public synchronized AccountCapsule getAccount(byte[] address) {
   public byte[] getBlackHoleAddress() {
     // using dbManager directly, black hole address should not be changed
     // when executing smart contract.
-    return getAccountStore().getBlackhole().getAddress().toByteArray();
+    return getAccountStore().getBlackholeAddress();
   }
 
   @Override
diff --git a/framework/src/main/java/org/tron/core/db/Manager.java b/framework/src/main/java/org/tron/core/db/Manager.java
@@ -679,7 +679,7 @@ public void consumeMultiSignFee(TransactionCapsule trx, TransactionTrace trace)
           if (accountCapsule != null) {
             adjustBalance(getAccountStore(), accountCapsule, -fee);
             adjustBalance(getAccountStore(), this.getAccountStore()
-                .getBlackhole().createDbKey(), +fee);
+                .getBlackhole(), +fee);
           }
         } catch (BalanceInsufficientException e) {
           throw new AccountResourceInsufficientException(

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public boolean execute(Object result) throws ContractExeException {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`Commons.adjustBalance(accountStore, ownerAddress, -fee);`
`88`		`- Commons.adjustBalance(accountStore, accountStore.getBlackhole().getAddress().toByteArray(),`
	`88`	`+ Commons.adjustBalance(accountStore, accountStore.getBlackhole(),`
`89`	`89`	`fee);//send to blackhole`
`90`	`90`
`91`	`91`	`AccountCapsule accountCapsule = accountStore.get(ownerAddress);`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public boolean execute(Object result)`
`76`	`76`	`executeTransparentFrom(shieldedTransferContract.getTransparentFromAddress().toByteArray(),`
`77`	`77`	`shieldedTransferContract.getFromAmount(), ret, fee);`
`78`	`78`	`}`
`79`		`- Commons.adjustAssetBalanceV2(accountStore.getBlackhole().createDbKey(),`
	`79`	`+ Commons.adjustAssetBalanceV2(accountStore.getBlackhole(),`
`80`	`80`	`CommonParameter.getInstance().getZenTokenId(), fee,`
`81`	`81`	`accountStore, assetIssueStore, dynamicStore);`
`82`	`82`	`} catch (BalanceInsufficientException e) {`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public boolean execute(Object object) throws ContractExeException {`
`56`	`56`	`fee = fee + dynamicStore.getCreateNewAccountFeeInSystemContract();`
`57`	`57`	`}`
`58`	`58`	`Commons.adjustBalance(accountStore, ownerAddress, -fee);`
`59`		`- Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), fee);`
	`59`	`+ Commons.adjustBalance(accountStore, accountStore.getBlackhole(), fee);`
`60`	`60`	`ret.setStatus(fee, code.SUCESS);`
`61`	`61`	`Commons.adjustBalance(accountStore, ownerAddress, -amount);`
`62`	`62`	`Commons.adjustBalance(accountStore, toAddress, amount);`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ private void createWitness(final WitnessCreateContract witnessCreateContract)`
`140`	`140`	`Commons`
`141`	`141`	`.adjustBalance(accountStore, witnessCreateContract.getOwnerAddress().toByteArray(), -cost);`
`142`	`142`
`143`		`- Commons.adjustBalance(accountStore, accountStore.getBlackhole().createDbKey(), +cost);`
	`143`	`+ Commons.adjustBalance(accountStore, accountStore.getBlackhole(), +cost);`
`144`	`144`
`145`	`145`	`dynamicStore.addTotalCreateWitnessCost(cost);`
`146`	`146`	`}`