Skip to content

Commit 7f1c1ba

Browse files
halibobo1205halibobo1205
committed
reactor(*): rename allowStrictMath2 to disableJavaLangMath
1 parent 29bb7bc commit 7f1c1ba

File tree

14 files changed

+74
-72
lines changed

14 files changed

+74
-72
lines changed

‎actuator/src/main/java/org/tron/core/actuator/AbstractActuator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public void adjustBalance(AccountStore accountStore, AccountCapsule account, lon
122122
Commons.adjustBalance(accountStore, account, amount, this.disableJavaLangMath());
123123
}
124124

125-
private boolean disableJavaLangMath() {
125+
boolean disableJavaLangMath() {
126126
return chainBaseManager.getDynamicPropertiesStore().disableJavaLangMath();
127127
}
128128
}

‎actuator/src/main/java/org/tron/core/actuator/MarketSellAssetActuator.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -400,10 +400,9 @@ private void matchSingleOrder(MarketOrderCapsule takerOrderCapsule,
400400
// => takerBuyTokenQuantityCurrent_A = takerSellTokenQuantityRemain_TRX *
401401
// makerSellTokenQuantity_A/makerBuyTokenQuantity_TRX
402402

403-
boolean disableMath = dynamicStore.disableJavaLangMath();
404403
long takerBuyTokenQuantityRemain = MarketUtils
405404
.multiplyAndDivide(takerSellRemainQuantity, makerSellQuantity, makerBuyQuantity,
406-
disableMath);
405+
this.disableJavaLangMath());
407406

408407
if (takerBuyTokenQuantityRemain == 0) {
409408
// quantity too small, return sellToken to user
@@ -427,7 +426,7 @@ private void matchSingleOrder(MarketOrderCapsule takerOrderCapsule,
427426

428427
makerBuyTokenQuantityReceive = MarketUtils
429428
.multiplyAndDivide(makerSellRemainQuantity, makerBuyQuantity, makerSellQuantity,
430-
chainBaseManager.getDynamicPropertiesStore().disableJavaLangMath());
429+
this.disableJavaLangMath());
431430
takerBuyTokenQuantityReceive = makerOrderCapsule.getSellTokenQuantityRemain();
432431

433432
long takerSellTokenLeft =
@@ -462,7 +461,7 @@ private void matchSingleOrder(MarketOrderCapsule takerOrderCapsule,
462461
// makerSellTokenQuantity_A/makerBuyTokenQuantity_TRX
463462
makerBuyTokenQuantityReceive = MarketUtils
464463
.multiplyAndDivide(makerSellRemainQuantity, makerBuyQuantity, makerSellQuantity,
465-
chainBaseManager.getDynamicPropertiesStore().disableJavaLangMath());
464+
this.disableJavaLangMath());
466465

467466
MarketUtils.updateOrderState(makerOrderCapsule, State.INACTIVE, marketAccountStore);
468467
if (makerBuyTokenQuantityReceive == 0) {

‎actuator/src/main/java/org/tron/core/actuator/VMActuator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -603,10 +603,10 @@ private long getAccountEnergyLimitWithFloatRatio(AccountCapsule account, long fe
603603
}
604604
// can change the calc way
605605
long leftEnergyFromFreeze = rootRepository.getAccountLeftEnergyFromFreeze(account);
606-
boolean isStrict2 = VMConfig.disableJavaLangMath();
607-
callValue = max(callValue, 0, isStrict2);
606+
callValue = max(callValue, 0, VMConfig.disableJavaLangMath());
608607
long energyFromBalance = floorDiv(max(
609-
account.getBalance() - callValue, 0, isStrict2), sunPerEnergy, isStrict2);
608+
account.getBalance() - callValue, 0, VMConfig.disableJavaLangMath()), sunPerEnergy,
609+
VMConfig.disableJavaLangMath());
610610

611611
long energyFromFeeLimit;
612612
long totalBalanceForEnergyFreeze = account.getAllFrozenBalanceForEnergy();

‎actuator/src/main/java/org/tron/core/vm/PrecompiledContracts.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -636,17 +636,16 @@ public long getEnergyForData(byte[] data) {
636636
int expLen = parseLen(data, 1);
637637
int modLen = parseLen(data, 2);
638638

639-
boolean allowStrictMath2 = VMConfig.disableJavaLangMath();
640639

641640
byte[] expHighBytes = parseBytes(data, addSafely(ARGS_OFFSET, baseLen), min(expLen, 32,
642-
allowStrictMath2));
641+
VMConfig.disableJavaLangMath()));
643642

644-
long multComplexity = getMultComplexity(max(baseLen, modLen, allowStrictMath2));
643+
long multComplexity = getMultComplexity(max(baseLen, modLen, VMConfig.disableJavaLangMath()));
645644
long adjExpLen = getAdjustedExponentLength(expHighBytes, expLen);
646645

647646
// use big numbers to stay safe in case of overflow
648647
BigInteger energy = BigInteger.valueOf(multComplexity)
649-
.multiply(BigInteger.valueOf(max(adjExpLen, 1, allowStrictMath2)))
648+
.multiply(BigInteger.valueOf(max(adjExpLen, 1, VMConfig.disableJavaLangMath())))
650649
.divide(GQUAD_DIVISOR);
651650

652651
return isLessThan(energy, BigInteger.valueOf(Long.MAX_VALUE)) ? energy.longValueExact()

‎actuator/src/main/java/org/tron/core/vm/nativecontract/DelegateResourceProcessor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void validate(DelegateResourceParam param, Repository repo) throws Contra
5353
throw new ContractValidateException("delegateBalance must be greater than or equal to 1 TRX");
5454
}
5555

56-
boolean allowStrictMath2 = dynamicStore.disableJavaLangMath();
56+
boolean disableJavaLangMath = dynamicStore.disableJavaLangMath();
5757
switch (param.getResourceType()) {
5858
case BANDWIDTH: {
5959
BandwidthProcessor processor = new BandwidthProcessor(ChainBaseManager.getInstance());
@@ -62,7 +62,7 @@ public void validate(DelegateResourceParam param, Repository repo) throws Contra
6262
long netUsage = (long) (ownerCapsule.getNetUsage() * TRX_PRECISION * ((double)
6363
(repo.getTotalNetWeight()) / dynamicStore.getTotalNetLimit()));
6464

65-
long v2NetUsage = getV2NetUsage(ownerCapsule, netUsage, allowStrictMath2);
65+
long v2NetUsage = getV2NetUsage(ownerCapsule, netUsage, disableJavaLangMath);
6666

6767
if (ownerCapsule.getFrozenV2BalanceForBandwidth() - v2NetUsage < delegateBalance) {
6868
throw new ContractValidateException(
@@ -78,7 +78,7 @@ public void validate(DelegateResourceParam param, Repository repo) throws Contra
7878
long energyUsage = (long) (ownerCapsule.getEnergyUsage() * TRX_PRECISION * ((double)
7979
(repo.getTotalEnergyWeight()) / dynamicStore.getTotalEnergyCurrentLimit()));
8080

81-
long v2EnergyUsage = getV2EnergyUsage(ownerCapsule, energyUsage, allowStrictMath2);
81+
long v2EnergyUsage = getV2EnergyUsage(ownerCapsule, energyUsage, disableJavaLangMath);
8282

8383
if (ownerCapsule.getFrozenV2BalanceForEnergy() - v2EnergyUsage < delegateBalance) {
8484
throw new ContractValidateException(

‎actuator/src/main/java/org/tron/core/vm/program/Memory.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,17 @@ public void extend(int address, int size) {
105105
if (size <= 0) {
106106
return;
107107
}
108-
boolean allowStrictMath2 = VMConfig.disableJavaLangMath();
109-
final int newSize = addExact(address, size, allowStrictMath2);
108+
final int newSize = addExact(address, size, VMConfig.disableJavaLangMath());
110109
int toAllocate = newSize - internalSize();
111110
if (toAllocate > 0) {
112-
addChunks((int) ceil((double) toAllocate / CHUNK_SIZE, allowStrictMath2));
111+
addChunks((int) ceil((double) toAllocate / CHUNK_SIZE, VMConfig.disableJavaLangMath()));
113112
}
114113

115114
toAllocate = newSize - softSize;
116115
if (toAllocate > 0) {
117-
toAllocate = (int) ceil((double) toAllocate / WORD_SIZE, allowStrictMath2) * WORD_SIZE;
118-
softSize = addExact(softSize, toAllocate, allowStrictMath2);
116+
toAllocate = (int) ceil((double) toAllocate / WORD_SIZE,
117+
VMConfig.disableJavaLangMath()) * WORD_SIZE;
118+
softSize = addExact(softSize, toAllocate, VMConfig.disableJavaLangMath());
119119

120120
if (programListener != null) {
121121
programListener.onMemoryExtend(toAllocate);

‎actuator/src/main/java/org/tron/core/vm/program/Program.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2170,13 +2170,12 @@ public boolean voteWitness(int witnessArrayOffset, int witnessArrayLength,
21702170
try {
21712171
VoteWitnessParam param = new VoteWitnessParam();
21722172
param.setVoterAddress(owner);
2173-
boolean allowStrictMath2 = VMConfig.disableJavaLangMath();
21742173
byte[] witnessArrayData = memoryChunk(
2175-
addExact(witnessArrayOffset, DataWord.WORD_SIZE, allowStrictMath2),
2176-
multiplyExact(witnessArrayLength, DataWord.WORD_SIZE, allowStrictMath2));
2174+
addExact(witnessArrayOffset, DataWord.WORD_SIZE, VMConfig.disableJavaLangMath()),
2175+
multiplyExact(witnessArrayLength, DataWord.WORD_SIZE, VMConfig.disableJavaLangMath()));
21772176
byte[] amountArrayData = memoryChunk(
2178-
addExact(amountArrayOffset, DataWord.WORD_SIZE, allowStrictMath2),
2179-
multiplyExact(amountArrayLength, DataWord.WORD_SIZE, allowStrictMath2));
2177+
addExact(amountArrayOffset, DataWord.WORD_SIZE, VMConfig.disableJavaLangMath()),
2178+
multiplyExact(amountArrayLength, DataWord.WORD_SIZE, VMConfig.disableJavaLangMath()));
21802179

21812180
for (int i = 0; i < witnessArrayLength; i++) {
21822181
DataWord witness = new DataWord(Arrays.copyOfRange(witnessArrayData,

‎actuator/src/main/java/org/tron/core/vm/utils/FreezeV2Util.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ public static long queryDelegatableResource(byte[] address, long type, Repositor
144144
return 0L;
145145
}
146146

147-
boolean allowStrictMath2 = VMConfig.disableJavaLangMath();
148147
AccountCapsule accountCapsule = repository.getAccount(address);
149148
if (accountCapsule == null) {
150149
return 0L;
@@ -166,8 +165,8 @@ public static long queryDelegatableResource(byte[] address, long type, Repositor
166165
return frozenV2Resource;
167166
}
168167

169-
long v2NetUsage = getV2NetUsage(accountCapsule, usage, allowStrictMath2);
170-
return max(0L, frozenV2Resource - v2NetUsage, allowStrictMath2);
168+
long v2NetUsage = getV2NetUsage(accountCapsule, usage, VMConfig.disableJavaLangMath());
169+
return max(0L, frozenV2Resource - v2NetUsage, VMConfig.disableJavaLangMath());
171170
}
172171

173172
if (type == 1) {
@@ -186,8 +185,8 @@ public static long queryDelegatableResource(byte[] address, long type, Repositor
186185
return frozenV2Resource;
187186
}
188187

189-
long v2EnergyUsage = getV2EnergyUsage(accountCapsule, usage, allowStrictMath2);
190-
return max(0L, frozenV2Resource - v2EnergyUsage, allowStrictMath2);
188+
long v2EnergyUsage = getV2EnergyUsage(accountCapsule, usage, VMConfig.disableJavaLangMath());
189+
return max(0L, frozenV2Resource - v2EnergyUsage, VMConfig.disableJavaLangMath());
191190
}
192191

193192
return 0L;
@@ -244,21 +243,21 @@ private static List<Protocol.Account.UnFreezeV2> getTotalWithdrawList(List<Proto
244243
}
245244

246245
public static long getV2NetUsage(AccountCapsule ownerCapsule, long netUsage, boolean
247-
allowStrictMath2) {
246+
disableJavaLangMath) {
248247
long v2NetUsage= netUsage
249248
- ownerCapsule.getFrozenBalance()
250249
- ownerCapsule.getAcquiredDelegatedFrozenBalanceForBandwidth()
251250
- ownerCapsule.getAcquiredDelegatedFrozenV2BalanceForBandwidth();
252-
return max(0, v2NetUsage, allowStrictMath2);
251+
return max(0, v2NetUsage, disableJavaLangMath);
253252
}
254253

255254
public static long getV2EnergyUsage(AccountCapsule ownerCapsule, long energyUsage, boolean
256-
allowStrictMath2) {
255+
disableJavaLangMath) {
257256
long v2EnergyUsage= energyUsage
258257
- ownerCapsule.getEnergyFrozenBalance()
259258
- ownerCapsule.getAcquiredDelegatedFrozenBalanceForEnergy()
260259
- ownerCapsule.getAcquiredDelegatedFrozenV2BalanceForEnergy();
261-
return max(0, v2EnergyUsage, allowStrictMath2);
260+
return max(0, v2EnergyUsage, disableJavaLangMath);
262261
}
263262

264263
}

‎chainbase/src/main/java/org/tron/core/capsule/AccountCapsule.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ public boolean addAssetAmount(byte[] key, long amount, boolean useStrict) {
733733
public boolean addAssetAmountV2(byte[] key, long amount,
734734
DynamicPropertiesStore dynamicPropertiesStore, AssetIssueStore assetIssueStore) {
735735
importAsset(key);
736-
boolean useStrict2 = dynamicPropertiesStore.disableJavaLangMath();
736+
boolean disableJavaLangMath = dynamicPropertiesStore.disableJavaLangMath();
737737
//key is token name
738738
if (dynamicPropertiesStore.getAllowSameTokenName() == 0) {
739739
Map<String, Long> assetMap = this.account.getAssetMap();
@@ -745,8 +745,8 @@ public boolean addAssetAmountV2(byte[] key, long amount,
745745
currentAmount = 0L;
746746
}
747747
this.account = this.account.toBuilder()
748-
.putAsset(nameKey, addExact(currentAmount, amount, useStrict2))
749-
.putAssetV2(tokenID, addExact(currentAmount, amount, useStrict2))
748+
.putAsset(nameKey, addExact(currentAmount, amount, disableJavaLangMath))
749+
.putAssetV2(tokenID, addExact(currentAmount, amount, disableJavaLangMath))
750750
.build();
751751
}
752752
//key is token id
@@ -758,19 +758,19 @@ public boolean addAssetAmountV2(byte[] key, long amount,
758758
currentAmount = 0L;
759759
}
760760
this.account = this.account.toBuilder()
761-
.putAssetV2(tokenIDStr, addExact(currentAmount, amount, useStrict2))
761+
.putAssetV2(tokenIDStr, addExact(currentAmount, amount, disableJavaLangMath))
762762
.build();
763763
}
764764
return true;
765765
}
766766

767-
public boolean reduceAssetAmount(byte[] key, long amount, boolean useStrict2) {
767+
public boolean reduceAssetAmount(byte[] key, long amount, boolean disableJavaLangMath) {
768768
Map<String, Long> assetMap = this.account.getAssetMap();
769769
String nameKey = ByteArray.toStr(key);
770770
Long currentAmount = assetMap.get(nameKey);
771771
if (amount > 0 && null != currentAmount && amount <= currentAmount) {
772772
this.account = this.account.toBuilder()
773-
.putAsset(nameKey, subtractExact(currentAmount, amount, useStrict2)).build();
773+
.putAsset(nameKey, subtractExact(currentAmount, amount, disableJavaLangMath)).build();
774774
return true;
775775
}
776776

@@ -781,7 +781,7 @@ public boolean reduceAssetAmountV2(byte[] key, long amount,
781781
DynamicPropertiesStore dynamicPropertiesStore, AssetIssueStore assetIssueStore) {
782782
importAsset(key);
783783
//key is token name
784-
boolean useStrict2 = dynamicPropertiesStore.disableJavaLangMath();
784+
boolean disableJavaLangMath = dynamicPropertiesStore.disableJavaLangMath();
785785
if (dynamicPropertiesStore.getAllowSameTokenName() == 0) {
786786
Map<String, Long> assetMap = this.account.getAssetMap();
787787
AssetIssueCapsule assetIssueCapsule = assetIssueStore.get(key);
@@ -790,8 +790,8 @@ public boolean reduceAssetAmountV2(byte[] key, long amount,
790790
Long currentAmount = assetMap.get(nameKey);
791791
if (amount > 0 && null != currentAmount && amount <= currentAmount) {
792792
this.account = this.account.toBuilder()
793-
.putAsset(nameKey, subtractExact(currentAmount, amount, useStrict2))
794-
.putAssetV2(tokenID, subtractExact(currentAmount, amount, useStrict2))
793+
.putAsset(nameKey, subtractExact(currentAmount, amount, disableJavaLangMath))
794+
.putAssetV2(tokenID, subtractExact(currentAmount, amount, disableJavaLangMath))
795795
.build();
796796
return true;
797797
}
@@ -803,7 +803,7 @@ public boolean reduceAssetAmountV2(byte[] key, long amount,
803803
Long currentAmount = assetMapV2.get(tokenID);
804804
if (amount > 0 && null != currentAmount && amount <= currentAmount) {
805805
this.account = this.account.toBuilder()
806-
.putAssetV2(tokenID, subtractExact(currentAmount, amount, useStrict2))
806+
.putAssetV2(tokenID, subtractExact(currentAmount, amount, disableJavaLangMath))
807807
.build();
808808
return true;
809809
}

‎chainbase/src/main/java/org/tron/core/capsule/ReceiptCapsule.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,14 @@ public void payEnergyBill(DynamicPropertiesStore dynamicPropertiesStore,
218218
receipt.getEnergyUsageTotal(), receipt.getResult(), energyProcessor, now);
219219
return;
220220
}
221-
boolean useStrict2 = dynamicPropertiesStore.disableJavaLangMath();
221+
boolean disableJavaLangMath = dynamicPropertiesStore.disableJavaLangMath();
222222

223223
if ((!Objects.isNull(origin)) && caller.getAddress().equals(origin.getAddress())) {
224224
payEnergyBill(dynamicPropertiesStore, accountStore, forkController, caller,
225225
receipt.getEnergyUsageTotal(), receipt.getResult(), energyProcessor, now);
226226
} else {
227-
long originUsage = multiplyExact(receipt.getEnergyUsageTotal(), percent, useStrict2) / 100;
227+
long originUsage = multiplyExact(receipt.getEnergyUsageTotal(), percent, disableJavaLangMath)
228+
/ 100;
228229
originUsage = getOriginUsage(dynamicPropertiesStore, origin, originEnergyLimit,
229230
energyProcessor,
230231
originUsage);
@@ -240,18 +241,20 @@ public void payEnergyBill(DynamicPropertiesStore dynamicPropertiesStore,
240241
private long getOriginUsage(DynamicPropertiesStore dynamicPropertiesStore, AccountCapsule origin,
241242
long originEnergyLimit,
242243
EnergyProcessor energyProcessor, long originUsage) {
243-
boolean useStrict2 = dynamicPropertiesStore.disableJavaLangMath();
244+
boolean disableJavaLangMath = dynamicPropertiesStore.disableJavaLangMath();
244245
if (dynamicPropertiesStore.getAllowTvmFreeze() == 1
245246
|| dynamicPropertiesStore.supportUnfreezeDelay()) {
246-
return min(originUsage, min(originEnergyLeft, originEnergyLimit, useStrict2), useStrict2);
247+
return min(originUsage, min(originEnergyLeft, originEnergyLimit, disableJavaLangMath),
248+
disableJavaLangMath);
247249
}
248250

249251
if (checkForEnergyLimit(dynamicPropertiesStore)) {
250252
return min(originUsage,
251253
min(energyProcessor.getAccountLeftEnergyFromFreeze(origin), originEnergyLimit,
252-
useStrict2), useStrict2);
254+
disableJavaLangMath), disableJavaLangMath);
253255
}
254-
return min(originUsage, energyProcessor.getAccountLeftEnergyFromFreeze(origin), useStrict2);
256+
return min(originUsage, energyProcessor.getAccountLeftEnergyFromFreeze(origin),
257+
disableJavaLangMath);
255258
}
256259

257260
private void payEnergyBill(

0 commit comments

Comments
 (0)