Skip to content

feat(*): disable market transaction #6499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lvs0075 merged 3 commits into from
Dec 29, 2025
+52 −1
Merged

feat(*): disable market transaction #6499

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7b976f
feat(*): disable market transaction
halibobo1205 Dec 25, 2025
6518122
test(proposal): reactor market proposal test
halibobo1205 Dec 26, 2025
9f932ec
test(proposal): reactor activateFork
halibobo1205 Dec 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion actuator/src/main/java/org/tron/core/utils/ProposalUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,8 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
break;
}
case ALLOW_MARKET_TRANSACTION: {
if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_1)) {
if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_1)
|| forkController.pass(ForkBlockVersionEnum.VERSION_4_8_1)) {
throw new ContractValidateException(
"Bad chain parameter id [ALLOW_MARKET_TRANSACTION]");
}
Expand Down
26 changes: 24 additions & 2 deletions framework/src/test/java/org/tron/core/actuator/utils/ProposalUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package org.tron.core.actuator.utils;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;

import com.google.protobuf.ByteString;
import java.util.ArrayList;
import java.util.Arrays;
Expand All @@ -11,6 +14,7 @@
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.function.ThrowingRunnable;
import org.tron.common.BaseTest;
import org.tron.common.utils.ByteArray;
import org.tron.common.utils.ForkController;
Expand Down Expand Up @@ -438,9 +442,28 @@ public void validateCheck() {
testAllowTvmCancunProposal();

testAllowTvmBlobProposal();

ThrowingRunnable r0 = () -> ProposalUtil.validator(dynamicPropertiesStore, forkUtils,
ProposalType.ALLOW_MARKET_TRANSACTION.getCode(), 0);
ThrowingRunnable r1 = () -> ProposalUtil.validator(dynamicPropertiesStore, forkUtils,
ProposalType.ALLOW_MARKET_TRANSACTION.getCode(), 1);
ContractValidateException thrown = assertThrows(ContractValidateException.class, r1);
assertEquals("Bad chain parameter id [ALLOW_MARKET_TRANSACTION]", thrown.getMessage());

forkUtils.getManager().getDynamicPropertiesStore().statsByVersion(
ForkBlockVersionEnum.VERSION_4_1.getValue(), stats);
try {
r1.run();
} catch (Throwable e) {
Assert.fail(e.getMessage());
}
thrown = assertThrows(ContractValidateException.class, r0);
assertEquals("This value[ALLOW_MARKET_TRANSACTION] is only allowed to be 1",
thrown.getMessage());
testAllowTvmSelfdestructRestrictionProposal();

thrown = assertThrows(ContractValidateException.class, r1);
assertEquals("Bad chain parameter id [ALLOW_MARKET_TRANSACTION]", thrown.getMessage());
Copy link

@3for 3for Dec 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the boundary version be explicitly set here?

forkUtils.getManager().getDynamicPropertiesStore().statsByVersion(
        ForkBlockVersionEnum.VERSION_4_8_1.getValue(), stats);

Copy link
Contributor Author

@halibobo1205 halibobo1205 Dec 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done


forkUtils.getManager().getDynamicPropertiesStore()
.statsByVersion(ForkBlockVersionEnum.ENERGY_LIMIT.getValue(), stats);
forkUtils.reset();
Expand Down Expand Up @@ -710,7 +733,6 @@ private void testAllowTvmSelfdestructRestrictionProposal() {
"[ALLOW_TVM_SELFDESTRUCT_RESTRICTION] has been valid, no need to propose again",
e.getMessage());
}

}

@Test
Expand Down