Skip to content

Commit c446162

Browse files
author
Liulei
committed
feat(tvm): compare dataword in mcopy energy cost
1 parent 6660adb commit c446162

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

actuator/src/main/java/org/tron/core/vm/EnergyCost.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,9 @@ public static long getMCopyCost(Program program) {
248248
Stack stack = program.getStack();
249249
long oldMemSize = program.getMemSize();
250250

251-
int dstOffset = stack.peek().intValue();
252-
int srcOffset = stack.get(stack.size() - 2).intValue();
253-
DataWord maxOffset = new DataWord(max(dstOffset, srcOffset, VMConfig.allowStrictMath2()));
251+
DataWord dstOffset = stack.peek();
252+
DataWord srcOffset = stack.get(stack.size() - 2);
253+
DataWord maxOffset = dstOffset.compareTo(srcOffset) > 0 ? dstOffset : srcOffset;
254254
return VERY_LOW_TIER + calcMemEnergy(oldMemSize,
255255
memNeeded(maxOffset, stack.get(stack.size() - 3)),
256256
stack.get(stack.size() - 3).longValueSafe(), Op.MCOPY);

actuator/src/main/java/org/tron/core/vm/repository/RepositoryImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ public byte[] getTransientStorageValue(byte[] address, byte[] key) {
456456
byte[] value;
457457
if (parent != null) {
458458
value = parent.getTransientStorageValue(address, key);
459-
} else{
459+
} else {
460460
value = null;
461461
}
462462

0 commit comments

Comments
 (0)