Skip to content

Commit 37ceba2

Browse files
committed
feat: Change Aptos feature flags number for GOVERNED_GAS_POOL
1 parent 6cb447b commit 37ceba2

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

types/src/on_chain_config/aptos_features.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,18 @@ pub enum FeatureFlag {
8787
LIMIT_VM_TYPE_SIZE = 69,
8888
ABORT_IF_MULTISIG_PAYLOAD_MISMATCH = 70,
8989
ALLOW_SERIALIZED_SCRIPT_ARGS = 72,
90-
GOVERNED_GAS_POOL = 73,
90+
/// Enabled on mainnet, cannot be disabled.
91+
_USE_COMPATIBILITY_CHECKER_V2 = 73,
9192
ENABLE_ENUM_TYPES = 74,
9293
FEDERATED_KEYLESS = 77,
9394
TRANSACTION_SIMULATION_ENHANCEMENT = 78,
9495
COLLECTION_OWNER = 79,
95-
DECOMMISSION_CORE_RESOURCES = 222,
9696
/// covers mem::swap and vector::move_range
9797
/// AIP-105 (https://github.com/aptos-foundation/AIPs/blob/main/aips/aip-105.md)
9898
NATIVE_MEMORY_OPERATIONS = 80,
9999
ACCOUNT_ABSTRACTION = 85,
100+
DECOMMISSION_CORE_RESOURCES = 222,
101+
GOVERNED_GAS_POOL = 223,
100102
}
101103

102104
impl FeatureFlag {
@@ -106,6 +108,8 @@ impl FeatureFlag {
106108
FeatureFlag::TREAT_FRIEND_AS_PRIVATE,
107109
FeatureFlag::SHA_512_AND_RIPEMD_160_NATIVES,
108110
FeatureFlag::APTOS_STD_CHAIN_ID_NATIVES,
111+
// Feature flag V6 is used to enable metadata v1 format and needs to stay on, even
112+
// if we enable a higher version.
109113
FeatureFlag::VM_BINARY_FORMAT_V6,
110114
FeatureFlag::VM_BINARY_FORMAT_V7,
111115
FeatureFlag::MULTI_ED25519_PK_VALIDATE_V2_NATIVES,

0 commit comments

Comments
 (0)