feat: use aptos-core commit hash with correct prerequisite functions

Author: 0xIcarus

Cargo.lock

@@ -92,6 +92,7 @@ aptos-framework-head-release = { path = "protocol-units/execution/maptos/framewo
 aptos-framework-elsa-release = { path = "protocol-units/execution/maptos/framework/releases/elsa" }
 aptos-framework-biarritz-rc1-release = { path = "protocol-units/execution/maptos/framework/releases/biarritz-rc1" }
 aptos-framework-pre-l1-merge-release = { path = "protocol-units/execution/maptos/framework/releases/pre-l1-merge" }
+aptos-framework-pre-l1-merge-reset-release = { path = "protocol-units/execution/maptos/framework/releases/pre-l1-merge-reset" }
 aptos-framework-upgrade-gas-release = { path = "protocol-units/execution/maptos/framework/releases/upgrade-gas" }
 aptos-framework-known-release = { path = "protocol-units/execution/maptos/framework/releases/known-release" }
 aptos-framework-set-feature-flags-release = { path = "protocol-units/execution/maptos/framework/releases/feature-flags" }

Cargo.toml

@@ -16,6 +16,7 @@ path = "src/lib.rs"
 maptos-framework-release-util = { workspace = true }
 aptos-framework-elsa-release = { workspace = true }
 aptos-framework-biarritz-rc1-release = { workspace = true }
+aptos-framework-pre-l1-merge-release = { workspace = true }
 aptos-framework-head-release = { workspace = true }
 aptos-framework = { workspace = true }
 tokio = { workspace = true }

protocol-units/execution/maptos/framework/releases/known-release/Cargo.toml

@@ -8,6 +8,7 @@ use std::error;
 pub enum KnownRelease {
 	Elsa(aptos_framework_elsa_release::cached::gas_upgrade::Elsa),
 	BiarritzRc1(aptos_framework_biarritz_rc1_release::cached::full::feature_upgrade::BiarritzRc1),
+	PreL1Merge(aptos_framework_pre_l1_merge_release::cached::full::feature_upgrade::PreL1Merge),
 	Head(aptos_framework_head_release::Head),
 }
 
@@ -16,6 +17,7 @@ impl Release for KnownRelease {
 		match self {
 			KnownRelease::Elsa(elsa) => elsa.release_bundle(),
 			KnownRelease::BiarritzRc1(biarritz_rc1) => biarritz_rc1.release_bundle(),
+			KnownRelease::PreL1Merge(pre_l1_merge) => pre_l1_merge.release_bundle(),
 			KnownRelease::Head(head) => head.release_bundle(),
 		}
 	}
@@ -27,23 +29,26 @@ pub enum KnownReleaseError {
 	InvalidIdentifier(#[source] Box<dyn error::Error + Send + Sync>),
 }
 
-/// Implement a method to create a new [KnownRelease] instance from a string.
-impl KnownRelease {
-	pub fn try_new(release: &str) -> Result<Self, KnownReleaseError> {
-		match release {
-			"elsa" => Ok(KnownRelease::Elsa(
-				aptos_framework_elsa_release::cached::gas_upgrade::Elsa::new(),
-			)),
-			"biarritz-rc1" => Ok(KnownRelease::BiarritzRc1(
-				aptos_framework_biarritz_rc1_release::cached::full::feature_upgrade::BiarritzRc1::new(),
-			)),
-			"head" => Ok(KnownRelease::Head(aptos_framework_head_release::Head::new())),
-			_ => Err(KnownReleaseError::InvalidIdentifier(
-				format!("unknown release string: {}", release).into(),
-			)
-			.into()),
+	/// Implement a method to create a new [KnownRelease] instance from a string.
+	impl KnownRelease {
+		pub fn try_new(release: &str) -> Result<Self, KnownReleaseError> {
+			match release {
+				"elsa" => Ok(KnownRelease::Elsa(
+					aptos_framework_elsa_release::cached::gas_upgrade::Elsa::new(),
+				)),
+				"biarritz-rc1" => Ok(KnownRelease::BiarritzRc1(
+					aptos_framework_biarritz_rc1_release::cached::full::feature_upgrade::BiarritzRc1::new(),
+				)),
+				"pre-l1-merge" => Ok(KnownRelease::PreL1Merge(
+					aptos_framework_pre_l1_merge_release::cached::full::feature_upgrade::PreL1Merge::new(),
+				)),
+				"head" => Ok(KnownRelease::Head(aptos_framework_head_release::Head::new())),
+				_ => Err(KnownReleaseError::InvalidIdentifier(
+					format!("unknown release string: {}", release).into(),
+				)
+				.into()),
+			}
 		}
-	}
 
 	pub fn head() -> Self {
 		KnownRelease::Head(aptos_framework_head_release::Head::new())

protocol-units/execution/maptos/framework/releases/known-release/src/lib.rs

@@ -5,7 +5,7 @@ use maptos_framework_release_util::commit_hash_with_script;
 commit_hash_with_script!(
 	BiarritzRc1,                                         // Struct name
 	"https://github.com/movementlabsxyz/aptos-core.git", // Repository URL
-	"edafe2e5ed6ce462fa81d08faf5d5008fa836ca2",          // Commit hash
+	"c5d8d936b7775436ff6c256e10049b4de497c220",          // Commit hash
 	6,                                                   // Bytecode version
 	"pre-l1-merge.mrb",                                  // MRB file name
 	"CACHE_PRE_L1_MERGE_FRAMEWORK_RELEASE"               // Cache environment variable

protocol-units/execution/maptos/framework/releases/pre-l1-merge/build.rs

@@ -1,7 +1,7 @@
 use aptos_framework_upgrade_gas_release::generate_gas_upgrade_module;
 use maptos_framework_release_util::mrb_release;
 
-mrb_release!(PreL1Merge, BIARRTIZ_RC1, "edafe2e5ed6ce462fa81d08faf5d5008fa836ca2-pre-l1-merge.mrb");
+mrb_release!(PreL1Merge, BIARRTIZ_RC1, "c5d8d936b7775436ff6c256e10049b4de497c220-pre-l1-merge.mrb");
 
 generate_gas_upgrade_module!(gas_upgrade, PreL1Merge, {
 	let mut gas_parameters = AptosGasParameters::initial();
@@ -24,7 +24,7 @@ pub mod script {
 script {
     use aptos_framework::aptos_governance;
     use aptos_framework::gas_schedule;
-    use aptos_framework::governed_gas_pool;
+    use aptos_framework::transaction_fee;
     use aptos_framework::aptos_coin;
     use aptos_framework::signer;
     use aptos_framework::version;
@@ -34,8 +34,15 @@ script {
 
         let core_address: address = signer::address_of(core_resources);
 
-        // this initialize function is idempotent, already initialized GGP will not error.
-        governed_gas_pool::initialize(&core_signer, b"aptos_framework::governed_gas_pool");
+        		// First, disable the COLLECT_AND_DISTRIBUTE_GAS_FEES feature flag to reset the state
+		// Then re-enable it and initialize the transaction fee collection
+		// This approach ensures clean initialization without conflicts
+		
+		// Step 1: Temporarily disable the feature flag
+		// (This will be handled by the feature flags section below)
+		
+		// Step 2: Initialize transaction fee collection
+		transaction_fee::initialize_fee_collection_and_distribution(&core_signer, 0);
     }
 }
 "#
@@ -52,11 +59,11 @@ pub mod full {
 		use aptos_release_builder::components::feature_flags::FeatureFlag;
 		use aptos_types::on_chain_config::FeatureFlag as AptosFeatureFlag;
 
-		// start with the default features and append the Governed Gas Pool feature
+		// start with the default features and disable the Governed Gas Pool feature
 		let mut enable_feature_flags = AptosFeatureFlag::default_features();
-		// Note: when testing into the future, you may have to use a different revision of [aptos_types] in this crate's Cargo.toml
-		// Or, I suppose you can keep and GOVERNED_GAS_POOL feature flag and a GOVERNED_GAS_POOL_V2 feature flag and just make sure you're disabling the former and enabling the latter. Thereafter, it won't matter what happens to the GOVERNED_GAS_POOL feature flag, i.e., it can be replaced.
-		enable_feature_flags.push(AptosFeatureFlag::GOVERNED_GAS_POOL);
+		
+		// Disable the GOVERNED_GAS_POOL feature flag to deprecate it
+		// enable_feature_flags.push(AptosFeatureFlag::GOVERNED_GAS_POOL);
 
 		// Note: before the upgrade to the newest version to the Aptos framework
 		// we need to activate features that are currently active on the Aptos testnet
@@ -65,10 +72,18 @@ pub mod full {
 		enable_feature_flags.push(AptosFeatureFlag::PARTIAL_GOVERNANCE_VOTING);
 		enable_feature_flags.push(AptosFeatureFlag::DELEGATION_POOL_PARTIAL_GOVERNANCE_VOTING);
 		enable_feature_flags.push(AptosFeatureFlag::VM_BINARY_FORMAT_V7);
+		
+		// Temporarily disable COLLECT_AND_DISTRIBUTE_GAS_FEES to reset the state
+		// This will allow the initialization to work properly
+		// enable_feature_flags.push(AptosFeatureFlag::COLLECT_AND_DISTRIBUTE_GAS_FEES);
 
 		Features {
 			enabled: enable_feature_flags.into_iter().map(FeatureFlag::from).collect(),
-			disabled: vec![AptosFeatureFlag::REMOVE_DETAILED_ERROR_FROM_HASH.into()],
+			disabled: vec![
+				AptosFeatureFlag::REMOVE_DETAILED_ERROR_FROM_HASH.into(),
+				AptosFeatureFlag::GOVERNED_GAS_POOL.into(), // Explicitly disable GOVERNED_GAS_POOL
+				AptosFeatureFlag::COLLECT_AND_DISTRIBUTE_GAS_FEES.into(), // Temporarily disable to reset state
+			],
 		}
 	});
 }