Skip to content

Commit 05a0a76

Browse files
committed
chore(vm): drop config-file switch for ALLOW_TVM_OSAKA
Proposals are now activated exclusively through the on-chain committee vote; the config.conf / CommonParameter / ConfigKey / Args plumbing for committee.allowTvmOsaka is removed, and DynamicPropertiesStore#getAllowTvmOsaka falls back to 0L when the store has no entry (matching the shape used by ALLOW_TVM_SELFDESTRUCT_RESTRICTION). No behavioural change for nodes that did not set the config knob, since its unset default was already 0. Going forward new proposal flags should not grow a corresponding config-file override - this change establishes that precedent by retiring the one Osaka had.
1 parent f13e430 commit 05a0a76

5 files changed

Lines changed: 1 addition & 11 deletions

File tree

chainbase/src/main/java/org/tron/core/store/DynamicPropertiesStore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2986,7 +2986,7 @@ public long getAllowTvmOsaka() {
29862986
return Optional.ofNullable(getUnchecked(ALLOW_TVM_OSAKA))
29872987
.map(BytesCapsule::getData)
29882988
.map(ByteArray::toLong)
2989-
.orElse(CommonParameter.getInstance().getAllowTvmOsaka());
2989+
.orElse(0L);
29902990
}
29912991

29922992
public void saveAllowTvmOsaka(long value) {

common/src/main/java/org/tron/common/parameter/CommonParameter.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -633,10 +633,6 @@ public class CommonParameter {
633633
@Setter
634634
public long allowTvmBlob;
635635

636-
@Getter
637-
@Setter
638-
public long allowTvmOsaka;
639-
640636
private static double calcMaxTimeRatio() {
641637
return 5.0;
642638
}

framework/src/main/java/org/tron/core/config/args/Args.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,10 +1037,6 @@ public static void applyConfigParams(
10371037
config.hasPath(ConfigKey.COMMITTEE_ALLOW_TVM_BLOB) ? config
10381038
.getInt(ConfigKey.COMMITTEE_ALLOW_TVM_BLOB) : 0;
10391039

1040-
PARAMETER.allowTvmOsaka =
1041-
config.hasPath(ConfigKey.COMMITTEE_ALLOW_TVM_OSAKA) ? config
1042-
.getInt(ConfigKey.COMMITTEE_ALLOW_TVM_OSAKA) : 0;
1043-
10441040
logConfig();
10451041
}
10461042

framework/src/main/java/org/tron/core/config/args/ConfigKey.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ private ConfigKey() {
247247
public static final String COMMITTEE_ALLOW_TVM_CANCUN = "committee.allowTvmCancun";
248248
public static final String COMMITTEE_ALLOW_TVM_BLOB = "committee.allowTvmBlob";
249249
public static final String COMMITTEE_PROPOSAL_EXPIRE_TIME = "committee.proposalExpireTime";
250-
public static final String COMMITTEE_ALLOW_TVM_OSAKA = "committee.allowTvmOsaka";
251250
public static final String ALLOW_ACCOUNT_ASSET_OPTIMIZATION =
252251
"committee.allowAccountAssetOptimization";
253252
public static final String ALLOW_ASSET_OPTIMIZATION = "committee.allowAssetOptimization";

framework/src/main/resources/config.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,6 @@ committee = {
759759
# allowTvmBlob = 0
760760
# consensusLogicOptimization = 0
761761
# allowOptimizedReturnValueOfChainId = 0
762-
# allowTvmOsaka = 0
763762
}
764763

765764
event.subscribe = {

0 commit comments

Comments
 (0)