Skip to content

Commit c0f9e25

Browse files
zhaozhao
zhao
authored and
zhao
committed
merge: sync with origin/develop and resolve conflicts
Resolve merge conflicts by accepting remote changes and re-applying our constant renames (TEST_CONF → TestConstants.TEST_CONF, TESTNET_CONF → NET_CONF). Accept remote deletion of BaseNet.java. Fix 6 new remote files that referenced old constant names.
2 parents 386400f + c158599 commit c0f9e25

312 files changed

Lines changed: 10100 additions & 4301 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 131 additions & 112 deletions
Large diffs are not rendered by default.

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@
2424
import java.util.List;
2525
import java.util.Objects;
2626
import lombok.extern.slf4j.Slf4j;
27+
import org.tron.common.math.StrictMathWrapper;
2728
import org.tron.common.utils.DecodeUtil;
2829
import org.tron.core.capsule.AccountCapsule;
2930
import org.tron.core.capsule.AssetIssueCapsule;
3031
import org.tron.core.capsule.TransactionResultCapsule;
32+
import org.tron.core.config.Parameter.ForkBlockVersionEnum;
3133
import org.tron.core.exception.BalanceInsufficientException;
3234
import org.tron.core.exception.ContractExeException;
3335
import org.tron.core.exception.ContractValidateException;
@@ -263,6 +265,16 @@ public boolean validate() throws ContractValidateException {
263265
"frozenDuration must be less than " + maxFrozenSupplyTime + " days "
264266
+ "and more than " + minFrozenSupplyTime + " days");
265267
}
268+
// make sure FrozenSupply.expireTime not overflow
269+
if (chainBaseManager.getForkController().pass(ForkBlockVersionEnum.VERSION_4_8_1)) {
270+
long frozenPeriod = next.getFrozenDays() * FROZEN_PERIOD;
271+
try {
272+
StrictMathWrapper.addExact(assetIssueContract.getStartTime(), frozenPeriod);
273+
} catch (ArithmeticException e) {
274+
throw new ContractValidateException(
275+
"Start time and frozen days would cause expire time overflow");
276+
}
277+
}
266278
remainSupply -= next.getFrozenAmount();
267279
}
268280

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import java.util.Map;
1010
import java.util.Objects;
1111
import lombok.extern.slf4j.Slf4j;
12-
import org.tron.common.parameter.CommonParameter;
1312
import org.tron.common.utils.DecodeUtil;
1413
import org.tron.common.utils.StringUtil;
1514
import org.tron.core.capsule.ProposalCapsule;
@@ -53,7 +52,7 @@ public boolean execute(Object result) throws ContractExeException {
5352

5453
long currentMaintenanceTime =
5554
chainBaseManager.getDynamicPropertiesStore().getNextMaintenanceTime();
56-
long now3 = now + CommonParameter.getInstance().getProposalExpireTime();
55+
long now3 = now + chainBaseManager.getDynamicPropertiesStore().getProposalExpireTime();
5756
long round = (now3 - currentMaintenanceTime) / maintenanceTimeInterval;
5857
long expirationTime =
5958
currentMaintenanceTime + (round + 1) * maintenanceTimeInterval;

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

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -170,28 +170,27 @@ private void executeShielded(List<SpendDescription> spends, List<ReceiveDescript
170170
}
171171
nullifierStore.put(new BytesCapsule(spend.getNullifier().toByteArray()));
172172
}
173-
if (CommonParameter.getInstance().isFullNodeAllowShieldedTransactionArgs()) {
174-
IncrementalMerkleTreeContainer currentMerkle = merkleContainer.getCurrentMerkle();
173+
174+
IncrementalMerkleTreeContainer currentMerkle = merkleContainer.getCurrentMerkle();
175+
try {
176+
currentMerkle.wfcheck();
177+
} catch (ZksnarkException e) {
178+
ret.setStatus(fee, code.FAILED);
179+
ret.setShieldedTransactionFee(fee);
180+
throw new ContractExeException(e.getMessage());
181+
}
182+
//handle receives
183+
for (ReceiveDescription receive : receives) {
175184
try {
176-
currentMerkle.wfcheck();
185+
merkleContainer
186+
.saveCmIntoMerkleTree(currentMerkle, receive.getNoteCommitment().toByteArray());
177187
} catch (ZksnarkException e) {
178-
ret.setStatus(fee, code.FAILED);
188+
ret.setStatus(0, code.FAILED);
179189
ret.setShieldedTransactionFee(fee);
180190
throw new ContractExeException(e.getMessage());
181191
}
182-
//handle receives
183-
for (ReceiveDescription receive : receives) {
184-
try {
185-
merkleContainer
186-
.saveCmIntoMerkleTree(currentMerkle, receive.getNoteCommitment().toByteArray());
187-
} catch (ZksnarkException e) {
188-
ret.setStatus(0, code.FAILED);
189-
ret.setShieldedTransactionFee(fee);
190-
throw new ContractExeException(e.getMessage());
191-
}
192-
}
193-
merkleContainer.setCurrentMerkle(currentMerkle);
194192
}
193+
merkleContainer.setCurrentMerkle(currentMerkle);
195194
}
196195

197196
@Override
@@ -236,8 +235,7 @@ public boolean validate() throws ContractValidateException {
236235
throw new ContractValidateException("duplicate sapling nullifiers in this transaction");
237236
}
238237
nfSet.add(spendDescription.getNullifier());
239-
if (CommonParameter.getInstance().isFullNodeAllowShieldedTransactionArgs()
240-
&& !merkleContainer.merkleRootExist(spendDescription.getAnchor().toByteArray())) {
238+
if (!merkleContainer.merkleRootExist(spendDescription.getAnchor().toByteArray())) {
241239
throw new ContractValidateException("Rt is invalid.");
242240
}
243241
if (nullifierStore.has(spendDescription.getNullifier().toByteArray())) {

‎actuator/src/main/java/org/tron/core/utils/ProposalUtil.java‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import static org.tron.core.Constant.CREATE_ACCOUNT_TRANSACTION_MIN_BYTE_SIZE;
55
import static org.tron.core.Constant.DYNAMIC_ENERGY_INCREASE_FACTOR_RANGE;
66
import static org.tron.core.Constant.DYNAMIC_ENERGY_MAX_FACTOR_RANGE;
7+
import static org.tron.core.Constant.MAX_PROPOSAL_EXPIRE_TIME;
8+
import static org.tron.core.Constant.MIN_PROPOSAL_EXPIRE_TIME;
79
import static org.tron.core.config.Parameter.ChainConstant.ONE_YEAR_BLOCK_NUMBERS;
810

911
import org.tron.common.utils.ForkController;
@@ -354,7 +356,8 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
354356
break;
355357
}
356358
case ALLOW_MARKET_TRANSACTION: {
357-
if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_1)) {
359+
if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_1)
360+
|| forkController.pass(ForkBlockVersionEnum.VERSION_4_8_1)) {
358361
throw new ContractValidateException(
359362
"Bad chain parameter id [ALLOW_MARKET_TRANSACTION]");
360363
}
@@ -839,6 +842,35 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
839842
}
840843
break;
841844
}
845+
case ALLOW_TVM_SELFDESTRUCT_RESTRICTION: {
846+
if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_8_1)) {
847+
throw new ContractValidateException(
848+
"Bad chain parameter id [ALLOW_TVM_SELFDESTRUCT_RESTRICTION]");
849+
}
850+
if (dynamicPropertiesStore.allowTvmSelfdestructRestriction()) {
851+
throw new ContractValidateException(
852+
"[ALLOW_TVM_SELFDESTRUCT_RESTRICTION] has been valid, no need to propose again");
853+
}
854+
if (value != 1) {
855+
throw new ContractValidateException(
856+
"This value[ALLOW_TVM_SELFDESTRUCT_RESTRICTION] is only allowed to be 1");
857+
}
858+
break;
859+
}
860+
case PROPOSAL_EXPIRE_TIME: {
861+
if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_8_1)) {
862+
throw new ContractValidateException(
863+
"Bad chain parameter id [PROPOSAL_EXPIRE_TIME]");
864+
}
865+
if (value <= MIN_PROPOSAL_EXPIRE_TIME
866+
|| value >= MAX_PROPOSAL_EXPIRE_TIME) {
867+
throw new ContractValidateException(
868+
"This value[PROPOSAL_EXPIRE_TIME] is only allowed to be greater than "
869+
+ MIN_PROPOSAL_EXPIRE_TIME + " and less than "
870+
+ MAX_PROPOSAL_EXPIRE_TIME + "!");
871+
}
872+
break;
873+
}
842874
default:
843875
break;
844876
}
@@ -921,7 +953,9 @@ public enum ProposalType { // current value, value range
921953
ALLOW_TVM_CANCUN(83), // 0, 1
922954
ALLOW_STRICT_MATH(87), // 0, 1
923955
CONSENSUS_LOGIC_OPTIMIZATION(88), // 0, 1
924-
ALLOW_TVM_BLOB(89); // 0, 1
956+
ALLOW_TVM_BLOB(89), // 0, 1
957+
PROPOSAL_EXPIRE_TIME(92), // (0, 31536003000)
958+
ALLOW_TVM_SELFDESTRUCT_RESTRICTION(94); // 0, 1
925959

926960
private long code;
927961

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public class EnergyCost {
5555
private static final long EXT_CODE_SIZE = 20;
5656
private static final long EXT_CODE_HASH = 400;
5757
private static final long SUICIDE = 0;
58+
private static final long SUICIDE_V2 = 5000;
5859
private static final long STOP = 0;
5960
private static final long CREATE_DATA = 200;
6061
private static final long TLOAD = 100;
@@ -289,6 +290,14 @@ public static long getSuicideCost2(Program program) {
289290
return getSuicideCost(program);
290291
}
291292

293+
public static long getSuicideCost3(Program program) {
294+
DataWord inheritorAddress = program.getStack().peek();
295+
if (isDeadAccount(program, inheritorAddress)) {
296+
return SUICIDE_V2 + NEW_ACCT_CALL;
297+
}
298+
return SUICIDE_V2;
299+
}
300+
292301
public static long getBalanceCost(Program ignored) {
293302
return BALANCE;
294303
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,4 +1072,19 @@ public static void suicideAction(Program program) {
10721072
program.stop();
10731073
}
10741074

1075+
public static void suicideAction2(Program program) {
1076+
if (program.isStaticCall()) {
1077+
throw new Program.StaticCallModificationException();
1078+
}
1079+
1080+
if (!program.canSuicide2()) {
1081+
program.getResult().setRevert();
1082+
} else {
1083+
DataWord address = program.stackPop();
1084+
program.suicide2(address);
1085+
}
1086+
1087+
program.stop();
1088+
}
1089+
10751090
}

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ public static JumpTable getTable() {
7979
adjustForFairEnergy(table);
8080
}
8181

82+
if (VMConfig.allowTvmSelfdestructRestriction()) {
83+
adjustSelfdestruct(table);
84+
}
85+
8286
return table;
8387
}
8488

@@ -695,4 +699,11 @@ public static void appendCancunOperations(JumpTable table) {
695699
OperationActions::blobBaseFeeAction,
696700
tvmBlobProposal));
697701
}
702+
703+
public static void adjustSelfdestruct(JumpTable table) {
704+
table.set(new Operation(
705+
Op.SUICIDE, 1, 0,
706+
EnergyCost::getSuicideCost3,
707+
OperationActions::suicideAction2));
708+
}
698709
}

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

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import static org.tron.common.utils.ByteUtil.parseWord;
1717
import static org.tron.common.utils.ByteUtil.stripLeadingZeroes;
1818
import static org.tron.core.config.Parameter.ChainConstant.TRX_PRECISION;
19+
import static org.tron.core.vm.VMConstant.SIG_LENGTH;
1920

2021
import com.google.protobuf.ByteString;
2122

@@ -41,6 +42,7 @@
4142
import org.apache.commons.lang3.tuple.Triple;
4243
import org.tron.common.crypto.Blake2bfMessageDigest;
4344
import org.tron.common.crypto.Hash;
45+
import org.tron.common.crypto.Rsv;
4446
import org.tron.common.crypto.SignUtils;
4547
import org.tron.common.crypto.SignatureInterface;
4648
import org.tron.common.crypto.zksnark.BN128;
@@ -201,7 +203,7 @@ public class PrecompiledContracts {
201203
public static PrecompiledContract getOptimizedContractForConstant(PrecompiledContract contract) {
202204
try {
203205
Constructor<?> constructor = contract.getClass().getDeclaredConstructor();
204-
return (PrecompiledContracts.PrecompiledContract) constructor.newInstance();
206+
return (PrecompiledContracts.PrecompiledContract) constructor.newInstance();
205207
} catch (Exception e) {
206208
throw new RuntimeException(e);
207209
}
@@ -352,22 +354,13 @@ private static byte[] encodeMultiRes(byte[]... words) {
352354
}
353355

354356
private static byte[] recoverAddrBySign(byte[] sign, byte[] hash) {
355-
byte v;
356-
byte[] r;
357-
byte[] s;
358357
byte[] out = null;
359358
if (ArrayUtils.isEmpty(sign) || sign.length < 65) {
360359
return new byte[0];
361360
}
362361
try {
363-
r = Arrays.copyOfRange(sign, 0, 32);
364-
s = Arrays.copyOfRange(sign, 32, 64);
365-
v = sign[64];
366-
if (v < 27) {
367-
v += 27;
368-
}
369-
370-
SignatureInterface signature = SignUtils.fromComponents(r, s, v,
362+
Rsv rsv = Rsv.fromSignature(sign);
363+
SignatureInterface signature = SignUtils.fromComponents(rsv.getR(), rsv.getS(), rsv.getV(),
371364
CommonParameter.getInstance().isECKeyCryptoEngine());
372365
if (signature.validateComponents()) {
373366
out = SignUtils.signatureToAddress(hash, signature,
@@ -403,6 +396,20 @@ private static byte[][] extractBytesArray(DataWord[] words, int offset, byte[] d
403396
return bytesArray;
404397
}
405398

399+
private static byte[][] extractSigArray(DataWord[] words, int offset, byte[] data) {
400+
if (offset > words.length - 1) {
401+
return new byte[0][];
402+
}
403+
int len = words[offset].intValueSafe();
404+
byte[][] bytesArray = new byte[len][];
405+
for (int i = 0; i < len; i++) {
406+
int bytesOffset = words[offset + i + 1].intValueSafe() / WORD_SIZE;
407+
bytesArray[i] = extractBytes(data, (bytesOffset + offset + 2) * WORD_SIZE,
408+
SIG_LENGTH);
409+
}
410+
return bytesArray;
411+
}
412+
406413
private static byte[] extractBytes(byte[] data, int offset, int len) {
407414
return Arrays.copyOfRange(data, offset, offset + len);
408415
}
@@ -944,8 +951,15 @@ public Pair<Boolean, byte[]> execute(byte[] rawData) {
944951
byte[] hash = Sha256Hash.hash(CommonParameter
945952
.getInstance().isECKeyCryptoEngine(), combine);
946953

947-
byte[][] signatures = extractBytesArray(
948-
words, words[3].intValueSafe() / WORD_SIZE, rawData);
954+
if (VMConfig.allowTvmSelfdestructRestriction()) {
955+
int sigArraySize = words[words[3].intValueSafe() / WORD_SIZE].intValueSafe();
956+
if (sigArraySize > MAX_SIZE) {
957+
return Pair.of(true, DATA_FALSE);
958+
}
959+
}
960+
byte[][] signatures = VMConfig.allowTvmSelfdestructRestriction() ?
961+
extractSigArray(words, words[3].intValueSafe() / WORD_SIZE, rawData) :
962+
extractBytesArray(words, words[3].intValueSafe() / WORD_SIZE, rawData);
949963

950964
if (signatures.length == 0 || signatures.length > MAX_SIZE) {
951965
return Pair.of(true, DATA_FALSE);
@@ -1029,8 +1043,18 @@ private Pair<Boolean, byte[]> doExecute(byte[] data)
10291043
throws InterruptedException, ExecutionException {
10301044
DataWord[] words = DataWord.parseArray(data);
10311045
byte[] hash = words[0].getData();
1032-
byte[][] signatures = extractBytesArray(
1033-
words, words[1].intValueSafe() / WORD_SIZE, data);
1046+
1047+
if (VMConfig.allowTvmSelfdestructRestriction()) {
1048+
int sigArraySize = words[words[1].intValueSafe() / WORD_SIZE].intValueSafe();
1049+
int addrArraySize = words[words[2].intValueSafe() / WORD_SIZE].intValueSafe();
1050+
if (sigArraySize > MAX_SIZE || addrArraySize > MAX_SIZE) {
1051+
return Pair.of(true, DATA_FALSE);
1052+
}
1053+
}
1054+
1055+
byte[][] signatures = VMConfig.allowTvmSelfdestructRestriction() ?
1056+
extractSigArray(words, words[1].intValueSafe() / WORD_SIZE, data) :
1057+
extractBytesArray(words, words[1].intValueSafe() / WORD_SIZE, data);
10341058
byte[][] addresses = extractBytes32Array(
10351059
words, words[2].intValueSafe() / WORD_SIZE);
10361060
int cnt = signatures.length;

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,10 @@ public static void play(Program program, JumpTable jumpTable) {
108108
} catch (JVMStackOverFlowException | OutOfTimeException e) {
109109
throw e;
110110
} catch (RuntimeException e) {
111-
if (StringUtils.isEmpty(e.getMessage())) {
111+
// https://openjdk.org/jeps/358
112+
// https://bugs.openjdk.org/browse/JDK-8220715
113+
// since jdk 14, the NullPointerExceptions message is not empty
114+
if (e instanceof NullPointerException || StringUtils.isEmpty(e.getMessage())) {
112115
logger.warn("Unknown Exception occurred, tx id: {}",
113116
Hex.toHexString(program.getRootTransactionId()), e);
114117
program.setRuntimeFailure(new RuntimeException("Unknown Exception"));

0 commit comments

Comments
 (0)