Upgrade Framework Script w/ Burn (#1084)

Co-authored-by: Andy Golay <andygolay@gmail.com> Co-authored-by: musitdev <philippe.delrieu@free.fr> Co-authored-by: Mikhail Zabaluev <mikhail.zabaluev@movementlabs.xyz> Co-authored-by: Richard Melkonian <35300528+0xmovses@users.noreply.github.com> Co-authored-by: Icarus131 <anirudhprasad131@protonmail.com> Co-authored-by: primata <primata@movementlabs.xyz> Co-authored-by: Icarus131 <anirudhprasad131@gmail.com> Co-authored-by: Richard Melkonian <r.v.melkonian@gmail.com> Co-authored-by: Radu Popa <radupopa21be@gmail.com>
movementlabsxyz · Mar 9, 2025 · 179f2d3 · 179f2d3
1 parent bc45d4f
commit 179f2d3
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/process-compose/movement-full-node/process-compose.test-migrate-elsa-to-biarritz-rc1.yml b/process-compose/movement-full-node/process-compose.test-migrate-elsa-to-biarritz-rc1.yml
@@ -5,6 +5,8 @@ processes:
   setup:
     environment:
       - "KNOWN_FRAMEWORK_RELEASE=elsa"
+      - APTOS_ACCOUNT_WHITELIST=$DOT_MOVEMENT_PATH/default_signer_address_whitelist
+      - MAPTOS_PRIVATE_KEY=random
 
   test-migrate-elsa-to-biarritz-rc1:
     command: |

diff --git a/protocol-units/bridge/contracts/minter/sources/minter.move b/protocol-units/bridge/contracts/minter/sources/minter.move
@@ -4,11 +4,9 @@ script {
 
     fun main(core_resources: &signer) {
 
-        let core_signer = aptos_governance::get_signer_testnet_only(core_resources, @0x1);
-
-        let framework_signer = &core_signer;
-
-		transaction_fee::burn_from(framework_signer, @0xdead, 4);
+      let core_signer = aptos_governance::get_signer_testnet_only(core_resources, @0x1);
 
+      let framework_signer = &core_signer;
+		  transaction_fee::burn_from(framework_signer, @0xdead, 4);
 	}
-}
+}
diff --git a/protocol-units/execution/maptos/framework/releases/biarritz-rc1/build.rs b/protocol-units/execution/maptos/framework/releases/biarritz-rc1/build.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
-	"aa45303216be96ea30d361ab7eb2e95fb08c2dcb",          // Commit hash
+	"27397b5835e6a466c06c884a395653c9ff13d1fe",          // Commit hash
 	6,                                                   // Bytecode version
 	"biarritz-rc1.mrb",                                  // MRB file name
 	"CACHE_BIARRITZ_RC1_FRAMEWORK_RELEASE"               // Cache environment variable for Elsa

diff --git a/protocol-units/execution/maptos/framework/releases/biarritz-rc1/src/cached.rs b/protocol-units/execution/maptos/framework/releases/biarritz-rc1/src/cached.rs
@@ -4,7 +4,7 @@ use maptos_framework_release_util::mrb_release;
 mrb_release!(
 	BiarritzRc1,
 	BIARRTIZ_RC1,
-	"aa45303216be96ea30d361ab7eb2e95fb08c2dcb-biarritz-rc1.mrb"
+	"27397b5835e6a466c06c884a395653c9ff13d1fe-biarritz-rc1.mrb"
 );
 
 generate_gas_upgrade_module!(gas_upgrade, BiarritzRc1, {
@@ -28,16 +28,21 @@ pub mod script {
 script {
     use aptos_framework::aptos_governance;
     use aptos_framework::gas_schedule;
-	use aptos_framework::governed_gas_pool;
+    use aptos_framework::governed_gas_pool;
+    use aptos_framework::aptos_coin;
+    use aptos_framework::signer;
 
     fun main(core_resources: &signer) {
-        let core_signer = aptos_governance::get_signer_testnet_only(core_resources, @0x1);
+        let core_signer = aptos_governance::get_signer_testnet_only(core_resources, @0000000000000000000000000000000000000000000000000000000000000001);
 
-        let framework_signer = &core_signer;
+        let core_address: address = signer::address_of(core_resources);
 
-		governed_gas_pool::initialize(framework_signer, b"aptos_framework::governed_gas_pool");
+        // this initialize function is idempotent, already initialized GGP will not error.
+        governed_gas_pool::initialize(&core_signer, b"aptos_framework::governed_gas_pool");
 
-	}
+        // this will burn the mint capability for the core_resource signer
+        aptos_coin::destroy_mint_capability_from(&core_signer, core_address);
+    }
 }
 "#
 		.to_string()

diff --git a/protocol-units/execution/maptos/framework/releases/biarritz-rc1/src/lib.rs b/protocol-units/execution/maptos/framework/releases/biarritz-rc1/src/lib.rs
@@ -7,7 +7,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
-	"aa45303216be96ea30d361ab7eb2e95fb08c2dcb",          // Commit hash
+	"27397b5835e6a466c06c884a395653c9ff13d1fe",          // Commit hash
 	6,                                                   // Bytecode version
 	"biarritz-rc1.mrb",                                  // MRB file name
 	"CACHE_BIARRITZ_RC1_FRAMEWORK_RELEASE"               // Cache environment variable for Elsa

diff --git a/protocol-units/settlement/mcr/contracts/lib/v2-periphery b/protocol-units/settlement/mcr/contracts/lib/v2-periphery