Skip to content

Commit db71d26

Browse files
aregngisaacdoidge
andauthored
[Issue-1811] Guared eth_trie APIs with SUPRA_ETH_TRIE feature flag (#211)
* [Issue-1811] Guared eth_trie APIs with SUPRA_BRIDGE feature flag * Added feature flag protection for the ETH Trie native function and renamed the feature flag. Related to smr-moonshot issue 1811. --------- Co-authored-by: Aregnaz Harutyunyan <> Co-authored-by: Isaac Doidge <i.doidge@supraoracles.com>
1 parent abdec34 commit db71d26

File tree

9 files changed

+613
-258
lines changed

9 files changed

+613
-258
lines changed

aptos-move/aptos-release-builder/src/components/feature_flags.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ pub enum FeatureFlag {
122122
LimitVMTypeSize,
123123
AbortIfMultisigPayloadMismatch,
124124
SupraNativeAutomation,
125+
SupraEthTrie,
125126
}
126127

127128
fn generate_features_blob(writer: &CodeWriter, data: &[u64]) {
@@ -317,7 +318,8 @@ impl From<FeatureFlag> for AptosFeatureFlag {
317318
FeatureFlag::AbortIfMultisigPayloadMismatch => {
318319
AptosFeatureFlag::ABORT_IF_MULTISIG_PAYLOAD_MISMATCH
319320
},
320-
FeatureFlag::SupraNativeAutomation => AptosFeatureFlag::SUPRA_NATIVE_AUTOMATION
321+
FeatureFlag::SupraNativeAutomation => AptosFeatureFlag::SUPRA_NATIVE_AUTOMATION,
322+
FeatureFlag::SupraEthTrie => AptosFeatureFlag::SUPRA_ETH_TRIE,
321323
}
322324
}
323325
}
@@ -442,7 +444,8 @@ impl From<AptosFeatureFlag> for FeatureFlag {
442444
AptosFeatureFlag::ABORT_IF_MULTISIG_PAYLOAD_MISMATCH => {
443445
FeatureFlag::AbortIfMultisigPayloadMismatch
444446
},
445-
AptosFeatureFlag::SUPRA_NATIVE_AUTOMATION => FeatureFlag::SupraNativeAutomation
447+
AptosFeatureFlag::SUPRA_NATIVE_AUTOMATION => FeatureFlag::SupraNativeAutomation,
448+
AptosFeatureFlag::SUPRA_ETH_TRIE=> FeatureFlag::SupraEthTrie,
446449
}
447450
}
448451
}

aptos-move/framework/move-stdlib/doc/features.md

Lines changed: 250 additions & 89 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)