Skip to content

Commit 410b33d

Browse files
committed
feat: discard code_hash and trx_hash fields during contract deployment
1 parent f8b05d4 commit 410b33d

4 files changed

Lines changed: 86 additions & 2 deletions

File tree

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,9 @@ public void execute(Object object) throws ContractExeException {
217217
} else {
218218
result.spendEnergy(saveCodeEnergy);
219219
if (VMConfig.allowTvmConstantinople()) {
220+
CreateSmartContract createContract =
221+
ContractCapsule.getSmartContractFromTransaction(trx);
222+
checkContractHashFields(createContract.getNewContract());
220223
rootRepository.saveCode(program.getContractAddress().getNoLeadZeroesData(), code);
221224
}
222225
}
@@ -330,6 +333,7 @@ private void create()
330333
if (contract == null) {
331334
throw new ContractValidateException("Cannot get CreateSmartContract from transaction");
332335
}
336+
333337
SmartContract newSmartContract;
334338
if (VMConfig.allowTvmCompatibleEvm()) {
335339
newSmartContract = contract.getNewContract().toBuilder().setVersion(1).build();
@@ -455,6 +459,12 @@ private void create()
455459

456460
}
457461

462+
static void checkContractHashFields(SmartContract contract) {
463+
if (!contract.getCodeHash().isEmpty() || !contract.getTrxHash().isEmpty()) {
464+
MUtil.checkCPUTimeForContractHashFields();
465+
}
466+
}
467+
458468
/**
459469
* **
460470
*/

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@ public static boolean isNotNullOrEmpty(String str) {
5959
return !isNullOrEmpty(str);
6060
}
6161

62+
public static void checkCPUTimeForContractHashFields() {
63+
if (ForkController.instance().pass(Parameter.ForkBlockVersionEnum.VERSION_4_8_2_2)) {
64+
throw new OutOfTimeException("CPU timeout for contract hash fields");
65+
}
66+
}
67+
6268
public static void checkCPUTime() {
6369
if (ForkController.instance().pass(Parameter.ForkBlockVersionEnum.VERSION_4_7_1)) {
6470
throw new OutOfTimeException("CPU timeout for 0x0a executing");

‎common/src/main/java/org/tron/core/config/Parameter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ public enum ForkBlockVersionEnum {
3030
VERSION_4_8_0_1(33, 1596780000000L, 70),
3131
VERSION_4_8_1(34, 1596780000000L, 80),
3232
VERSION_4_8_1_1(35, 1596780000000L, 70),
33-
VERSION_4_8_2(36, 1596780000000L, 80);
33+
VERSION_4_8_2(36, 1596780000000L, 80),
34+
VERSION_4_8_2_2(37, 1596780000000L, 70);
3435
// if add a version, modify BLOCK_VERSION simultaneously
3536

3637
@Getter
@@ -79,7 +80,7 @@ public class ChainConstant {
7980
public static final int SINGLE_REPEAT = 1;
8081
public static final int BLOCK_FILLED_SLOTS_NUMBER = 128;
8182
public static final int MAX_FROZEN_NUMBER = 1;
82-
public static final int BLOCK_VERSION = 36;
83+
public static final int BLOCK_VERSION = 37;
8384
public static final long FROZEN_PERIOD = 86_400_000L;
8485
public static final long DELEGATE_PERIOD = 3 * 86_400_000L;
8586
public static final long TRX_PRECISION = 1000_000L;
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
package org.tron.core.actuator;
2+
3+
import static org.junit.Assert.assertEquals;
4+
import static org.junit.Assert.assertThrows;
5+
import static org.mockito.Mockito.mock;
6+
import static org.mockito.Mockito.when;
7+
8+
import com.google.protobuf.ByteString;
9+
import org.junit.Test;
10+
import org.mockito.MockedStatic;
11+
import org.mockito.Mockito;
12+
import org.tron.common.utils.ForkController;
13+
import org.tron.core.config.Parameter.ForkBlockVersionEnum;
14+
import org.tron.core.vm.program.Program.OutOfTimeException;
15+
import org.tron.protos.contract.SmartContractOuterClass.SmartContract;
16+
17+
public class ContractHashValidationTest {
18+
19+
@Test
20+
public void acceptsHashFieldsBeforeActivation() {
21+
SmartContract contract = SmartContract.newBuilder()
22+
.setCodeHash(ByteString.copyFromUtf8("code"))
23+
.setTrxHash(ByteString.copyFromUtf8("transaction"))
24+
.build();
25+
26+
runWithActivation(false, () -> VMActuator.checkContractHashFields(contract));
27+
}
28+
29+
@Test
30+
public void rejectsCodeHashAfterActivation() {
31+
SmartContract contract = SmartContract.newBuilder()
32+
.setCodeHash(ByteString.copyFromUtf8("code"))
33+
.build();
34+
35+
OutOfTimeException exception = assertThrows(OutOfTimeException.class,
36+
() -> runWithActivation(true, () -> VMActuator.checkContractHashFields(contract)));
37+
38+
assertEquals("CPU timeout for contract hash fields", exception.getMessage());
39+
}
40+
41+
@Test
42+
public void rejectsTransactionHashAfterActivation() {
43+
SmartContract contract = SmartContract.newBuilder()
44+
.setTrxHash(ByteString.copyFromUtf8("transaction"))
45+
.build();
46+
47+
OutOfTimeException exception = assertThrows(OutOfTimeException.class,
48+
() -> runWithActivation(true, () -> VMActuator.checkContractHashFields(contract)));
49+
50+
assertEquals("CPU timeout for contract hash fields", exception.getMessage());
51+
}
52+
53+
@Test
54+
public void acceptsEmptyHashFieldsAfterActivation() {
55+
runWithActivation(true,
56+
() -> VMActuator.checkContractHashFields(SmartContract.getDefaultInstance()));
57+
}
58+
59+
private void runWithActivation(boolean activated, Runnable action) {
60+
ForkController controller = mock(ForkController.class);
61+
when(controller.pass(ForkBlockVersionEnum.VERSION_4_8_2_2)).thenReturn(activated);
62+
try (MockedStatic<ForkController> controllerMock = Mockito.mockStatic(ForkController.class)) {
63+
controllerMock.when(ForkController::instance).thenReturn(controller);
64+
action.run();
65+
}
66+
}
67+
}

0 commit comments

Comments
 (0)