Merge remote-tracking branch 'origin/andygolay/destroy-account' into andygolay/is-core-resource-false

andygolay · andygolay · commit c1345470d474 · 2025-05-05T11:33:49.000-04:00
diff --git a/aptos-move/aptos-release-builder/src/components/feature_flags.rs b/aptos-move/aptos-release-builder/src/components/feature_flags.rs
@@ -122,6 +122,7 @@ pub enum FeatureFlag {
     LimitVMTypeSize,
     AbortIfMultisigPayloadMismatch,
     GovernedGasPool,
+    DecommissionCoreResources,
 }
 
 fn generate_features_blob(writer: &CodeWriter, data: &[u64]) {
@@ -332,6 +333,7 @@ impl From<FeatureFlag> for AptosFeatureFlag {
                 AptosFeatureFlag::ABORT_IF_MULTISIG_PAYLOAD_MISMATCH
             },
             FeatureFlag::GovernedGasPool => AptosFeatureFlag::GOVERNED_GAS_POOL,
+            FeatureFlag::DecommissionCoreResources => AptosFeatureFlag::DECOMMISSION_CORE_RESOURCES,
         }
     }
 }
@@ -457,6 +459,7 @@ impl From<AptosFeatureFlag> for FeatureFlag {
                 FeatureFlag::AbortIfMultisigPayloadMismatch
             },
             AptosFeatureFlag::GOVERNED_GAS_POOL => FeatureFlag::GovernedGasPool,
+            AptosFeatureFlag::DECOMMISSION_CORE_RESOURCES => FeatureFlag::DecommissionCoreResources,
         }
     }
 }
diff --git a/aptos-move/framework/aptos-framework/doc/account.md b/aptos-move/framework/aptos-framework/doc/account.md
@@ -1056,7 +1056,7 @@ Used to destroy the core resources account on mainnet.
 
 
 <pre><code><b>public</b> entry <b>fun</b> <a href="account.md#0x1_account_destroy_account_from">destroy_account_from</a>(<a href="account.md#0x1_account">account</a>: &<a href="../../aptos-stdlib/../move-stdlib/doc/signer.md#0x1_signer">signer</a>, from: <b>address</b>) <b>acquires</b> <a href="account.md#0x1_account_Account">Account</a> {
-    <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(<a href="account.md#0x1_account">account</a>);
+    <a href="system_addresses.md#0x1_system_addresses_assert_core_resource">system_addresses::assert_core_resource</a>(<a href="account.md#0x1_account">account</a>);
 
     // Assert that the feature flag for decommissioning core resources is enabled
     <b>assert</b>!(
diff --git a/types/src/on_chain_config/aptos_features.rs b/types/src/on_chain_config/aptos_features.rs
@@ -87,6 +87,7 @@ pub enum FeatureFlag {
     LIMIT_VM_TYPE_SIZE = 69,
     ABORT_IF_MULTISIG_PAYLOAD_MISMATCH = 70,
     GOVERNED_GAS_POOL = 73,
+    DECOMMISSION_CORE_RESOURCES = 222,
 }
 
 impl FeatureFlag {

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,7 @@ pub enum FeatureFlag {`
`122`	`122`	`LimitVMTypeSize,`
`123`	`123`	`AbortIfMultisigPayloadMismatch,`
`124`	`124`	`GovernedGasPool,`
	`125`	`+ DecommissionCoreResources,`
`125`	`126`	`}`
`126`	`127`
`127`	`128`	`fn generate_features_blob(writer: &CodeWriter, data: &[u64]) {`
`@@ -332,6 +333,7 @@ impl From<FeatureFlag> for AptosFeatureFlag {`
`332`	`333`	`AptosFeatureFlag::ABORT_IF_MULTISIG_PAYLOAD_MISMATCH`
`333`	`334`	`},`
`334`	`335`	`FeatureFlag::GovernedGasPool => AptosFeatureFlag::GOVERNED_GAS_POOL,`
	`336`	`+ FeatureFlag::DecommissionCoreResources => AptosFeatureFlag::DECOMMISSION_CORE_RESOURCES,`
`335`	`337`	`}`
`336`	`338`	`}`
`337`	`339`	`}`
`@@ -457,6 +459,7 @@ impl From<AptosFeatureFlag> for FeatureFlag {`
`457`	`459`	`FeatureFlag::AbortIfMultisigPayloadMismatch`
`458`	`460`	`},`
`459`	`461`	`AptosFeatureFlag::GOVERNED_GAS_POOL => FeatureFlag::GovernedGasPool,`
	`462`	`+ AptosFeatureFlag::DECOMMISSION_CORE_RESOURCES => FeatureFlag::DecommissionCoreResources,`
`460`	`463`	`}`
`461`	`464`	`}`
`462`	`465`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ pub enum FeatureFlag {`
`87`	`87`	`LIMIT_VM_TYPE_SIZE = 69,`
`88`	`88`	`ABORT_IF_MULTISIG_PAYLOAD_MISMATCH = 70,`
`89`	`89`	`GOVERNED_GAS_POOL = 73,`
	`90`	`+ DECOMMISSION_CORE_RESOURCES = 222,`
`90`	`91`	`}`
`91`	`92`
`92`	`93`	`impl FeatureFlag {`