Skip to content

Commit bcfc56b

Browse files
committed
feat: Add feature flags required for pre-l1-merge framework upgrade to default features (with exception of PERIODICAL_REWARD_RATE_DECREASE)
1 parent c34b9e9 commit bcfc56b

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

types/src/on_chain_config/aptos_features.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ impl FeatureFlag {
111111
// Feature flag V6 is used to enable metadata v1 format and needs to stay on, even
112112
// if we enable a higher version.
113113
FeatureFlag::VM_BINARY_FORMAT_V6,
114-
//FeatureFlag::VM_BINARY_FORMAT_V7,
114+
FeatureFlag::VM_BINARY_FORMAT_V7,
115115
FeatureFlag::MULTI_ED25519_PK_VALIDATE_V2_NATIVES,
116116
FeatureFlag::BLAKE2B_256_NATIVE,
117117
FeatureFlag::RESOURCE_GROUPS,
@@ -121,12 +121,12 @@ impl FeatureFlag {
121121
FeatureFlag::BLS12_381_STRUCTURES,
122122
FeatureFlag::ED25519_PUBKEY_VALIDATE_RETURN_FALSE_WRONG_LENGTH,
123123
FeatureFlag::STRUCT_CONSTRUCTORS,
124-
//FeatureFlag::PERIODICAL_REWARD_RATE_DECREASE,
124+
// FeatureFlag::PERIODICAL_REWARD_RATE_DECREASE,
125125
FeatureFlag::PARTIAL_GOVERNANCE_VOTING,
126126
FeatureFlag::SIGNATURE_CHECKER_V2,
127127
FeatureFlag::STORAGE_SLOT_METADATA,
128128
FeatureFlag::CHARGE_INVARIANT_VIOLATION,
129-
//FeatureFlag::DELEGATION_POOL_PARTIAL_GOVERNANCE_VOTING,
129+
FeatureFlag::DELEGATION_POOL_PARTIAL_GOVERNANCE_VOTING,
130130
FeatureFlag::APTOS_UNIQUE_IDENTIFIERS,
131131
FeatureFlag::GAS_PAYER_ENABLED,
132132
FeatureFlag::BULLETPROOFS_NATIVES,
@@ -151,7 +151,7 @@ impl FeatureFlag {
151151
FeatureFlag::WEBAUTHN_SIGNATURE,
152152
// FeatureFlag::RECONFIGURE_WITH_DKG, //TODO: re-enable once randomness is ready.
153153
FeatureFlag::KEYLESS_ACCOUNTS,
154-
//FeatureFlag::FEDERATED_KEYLESS,
154+
FeatureFlag::FEDERATED_KEYLESS,
155155
FeatureFlag::KEYLESS_BUT_ZKLESS_ACCOUNTS,
156156
FeatureFlag::JWK_CONSENSUS,
157157
FeatureFlag::REFUNDABLE_BYTES,
@@ -171,13 +171,13 @@ impl FeatureFlag {
171171
FeatureFlag::CONCURRENT_FUNGIBLE_BALANCE,
172172
FeatureFlag::LIMIT_VM_TYPE_SIZE,
173173
FeatureFlag::ABORT_IF_MULTISIG_PAYLOAD_MISMATCH,
174-
//FeatureFlag::ALLOW_SERIALIZED_SCRIPT_ARGS,
175-
//FeatureFlag::ENABLE_ENUM_TYPES,
176-
//FeatureFlag::TRANSACTION_SIMULATION_ENHANCEMENT,
177-
//FeatureFlag::NATIVE_MEMORY_OPERATIONS,
178-
//FeatureFlag::COLLECTION_OWNER,
179-
//FeatureFlag::ACCOUNT_ABSTRACTION,
180-
//FeatureFlag::GOVERNED_GAS_POOL, // governed gas pool should be voted in
174+
FeatureFlag::ALLOW_SERIALIZED_SCRIPT_ARGS,
175+
FeatureFlag::ENABLE_ENUM_TYPES,
176+
FeatureFlag::TRANSACTION_SIMULATION_ENHANCEMENT,
177+
FeatureFlag::NATIVE_MEMORY_OPERATIONS,
178+
FeatureFlag::COLLECTION_OWNER,
179+
FeatureFlag::ACCOUNT_ABSTRACTION,
180+
// FeatureFlag::GOVERNED_GAS_POOL, // governed gas pool should be voted in
181181
]
182182
}
183183
}

0 commit comments

Comments
 (0)