feat: pre-l1-merge framework upgrade + e2e tests (#1212)

Co-authored-by: Liam Monninger <[email protected]>
Co-authored-by: Liam Monninger <[email protected]>

Author: andygolay

.github/workflows/checks-all.yml

@@ -230,10 +230,10 @@ jobs:
           nix develop --command bash  -c "just movement-full-node native build.setup.eth-holesky.celestia-local.test -t=false"
           nix develop --command bash  -c "just movement-full-node native build.setup.eth-holesky.celestia-local.test -t=false"
 
-  # Elsa to Biarritz RC1
-  movement-elsa-to-biarritz-rc1-bring-up:
+  # Gas Dos
+  gas-dos:
     if: >
-      github.event.label.name == 'cicd:movement-elsa-to-biarritz-rc1'
+      github.event.label.name == 'cicd:gas-dos'
       || github.ref == 'refs/heads/main'
       || startsWith(github.ref, 'refs/tags/')
 
@@ -360,9 +360,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-
-    - name: Run MCR Client Tests
-      run: nix develop --command bash  -c "just mcr-client native build.local.test -t=false"
+      - name: Run MCR Client Tests
+        run: nix develop --command bash  -c "just mcr-client native build.local.test -t=false"
 
   cargo-fmt-check:
     name: Cargo Format Check
@@ -376,6 +375,124 @@ jobs:
         run: |
           cargo fmt --all -- --check
 
+  # Elsa to Biarritz RC1 Checks
+  bring-up-elsa-to-biarritz-rc1:
+    if: >
+      github.event.label.name == 'cicd:bring-up-elsa-to-biarritz-rc1'
+      || github.ref == 'refs/heads/main'
+      || startsWith(github.ref, 'refs/tags/')
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-22.04
+            arch: x86_64
+            runs-on: buildjet-16vcpu-ubuntu-2204
+
+    runs-on: ${{ matrix.runs-on }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
+
+      - name: Run Elsa to Biarritz RC1 Bring Up Test
+        env:
+          CELESTIA_LOG_LEVEL: FATAL
+        run: |
+          nix develop --command bash  -c "just movement-full-node native build.setup.eth-local.celestia-local.test-bring-up-elsa-to-biarritz-rc1 -t=false"
+
+  migrate-elsa-to-biarritz-rc1:
+    if: >
+      github.event.label.name == 'cicd:migrate-elsa-to-biarritz-rc1'
+      || github.ref == 'refs/heads/main'
+      || startsWith(github.ref, 'refs/tags/')
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-22.04
+            arch: x86_64
+            runs-on: buildjet-16vcpu-ubuntu-2204
+
+    runs-on: ${{ matrix.runs-on }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
+
+      - name: Run Elsa to Biarritz RC1 Migrate Test
+        env:
+          CELESTIA_LOG_LEVEL: FATAL
+        run: |
+          nix develop --command bash  -c "just movement-full-node native build.setup.eth-local.celestia-local.test-migrate-elsa-to-biarritz-rc1 -t=false" 
+
+  # Biarritz RC1 to Pre-L1 Merge Checks
+  bring-up-biarritz-rc1-to-pre-l1-merge:
+    if: >
+      github.event.label.name == 'cicd:bring-up-biarritz-rc1-to-pre-l1-merge'
+      || github.ref == 'refs/heads/main'
+      || startsWith(github.ref, 'refs/tags/')
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-22.04
+            arch: x86_64
+            runs-on: buildjet-16vcpu-ubuntu-2204
+
+    runs-on: ${{ matrix.runs-on }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
+
+      - name: Run Biarritz RC1 to Pre-L1 Merge Bring Up Test
+        env:
+          CELESTIA_LOG_LEVEL: FATAL
+        run: |
+          nix develop --command bash  -c "just movement-full-node native build.setup.eth-local.celestia-local.test-bring-up-biarritz-rc1-to-pre-l1-merge -t=false"
+
+  migrate-biarritz-rc1-to-pre-l1-merge:
+    if: >
+      github.event.label.name == 'cicd:migrate-biarritz-rc1-to-pre-l1-merge'
+      || github.ref == 'refs/heads/main'
+      || startsWith(github.ref, 'refs/tags/')
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-22.04
+            arch: x86_64
+            runs-on: buildjet-16vcpu-ubuntu-2204
+
+    runs-on: ${{ matrix.runs-on }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
+
+      - name: Run Biarritz RC1 to Pre-L1 Merge Migrate Test
+        env:
+          CELESTIA_LOG_LEVEL: FATAL
+        run: |
+          nix develop --command bash  -c "just movement-full-node native build.setup.eth-local.celestia-local.test-migrate-biarritz-rc1-to-pre-l1-merge -t=false"
+
 #  Indexer:
 #    strategy:
 #      matrix:

Cargo.lock

@@ -82,13 +82,15 @@ maptos-framework-release-util = { path = "protocol-units/execution/maptos/framew
 aptos-framework-head-release = { path = "protocol-units/execution/maptos/framework/releases/head" }
 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-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" }
 aptos-framework-release-script-release = { path = "protocol-units/execution/maptos/framework/releases/release-script" }
 
 # framework migrations
 aptos-framework-elsa-to-biarritz-rc1-migration = { path = "protocol-units/execution/maptos/framework/migrations/elsa-to-biarritz-rc1" }
+aptos-framework-biarritz-rc1-to-pre-l1-merge-migration = { path = "protocol-units/execution/maptos/framework/migrations/biarritz-rc1-to-pre-l1-merge" }
 
 ## infra
 movement-rest = { path = "protocol-units/movement-rest" }

Cargo.toml

@@ -136,7 +136,7 @@ async fn main() -> Result<(), anyhow::Error> {
 		.transfer(&mut alice, bob.address(), 1_000, None)
 		.await
 		.context("Failed to submit transaction to transfer coins")?; // <:!:section_5
-															 // :!:>section_6
+															   // :!:>section_6
 	rest_client
 		.wait_for_transaction(&txn_hash)
 		.await

networks/movement/movement-client/src/bin/e2e/simple_interaction.rs

@@ -159,7 +159,7 @@ async fn test_example_interaction() -> Result<(), anyhow::Error> {
 		.transfer(&mut alice, bob.address(), 1_000, None)
 		.await
 		.context("Failed to submit transaction to transfer coins")?; // <:!:section_5
-															 // :!:>section_6
+															   // :!:>section_6
 	rest_client
 		.wait_for_transaction(&txn_hash)
 		.await

networks/movement/movement-client/src/tests/mod.rs

@@ -44,6 +44,7 @@ mcr-settlement-config = { workspace = true }
 clap = { workspace =  true }
 movement-da-light-node-client = { workspace = true}
 aptos-framework-elsa-to-biarritz-rc1-migration = { workspace = true }
+aptos-framework-biarritz-rc1-to-pre-l1-merge-migration = { workspace = true }
 movement-signer = { workspace = true }
 movement-signer-loader = { workspace = true }
 syncador = { workspace = true }

networks/movement/movement-full-node/Cargo.toml

@@ -0,0 +1,15 @@
+use crate::common_args::MovementArgs;
+use clap::Parser;
+
+#[derive(Debug, Parser, Clone)]
+#[clap(rename_all = "kebab-case", about = "Downgrades from Pre L1 Merge to Biarritz RC1")]
+pub struct Downgrade {
+	#[clap(flatten)]
+	pub movement_args: MovementArgs,
+}
+
+impl Downgrade {
+	pub async fn execute(&self) -> Result<(), anyhow::Error> {
+		Ok(())
+	}
+}

networks/movement/movement-full-node/src/admin/bring_up/biarritz_rc1_to_pre_l1_merge/downgrade.rs

@@ -0,0 +1,23 @@
+pub mod downgrade;
+pub mod upgrade;
+
+use clap::Subcommand;
+
+#[derive(Subcommand, Debug)]
+#[clap(
+	rename_all = "kebab-case",
+	about = "Commands for migrating from Biarritz RC1 to Pre-L1 Merge"
+)]
+pub enum BiarritzRc1ToPreL1Merge {
+	Upgrade(upgrade::Upgrade),
+	Downgrade(downgrade::Downgrade),
+}
+
+impl BiarritzRc1ToPreL1Merge {
+	pub async fn execute(&self) -> Result<(), anyhow::Error> {
+		match self {
+			BiarritzRc1ToPreL1Merge::Upgrade(upgrade) => upgrade.execute().await,
+			BiarritzRc1ToPreL1Merge::Downgrade(downgrade) => downgrade.execute().await,
+		}
+	}
+}

networks/movement/movement-full-node/src/admin/bring_up/biarritz_rc1_to_pre_l1_merge/mod.rs

@@ -0,0 +1,28 @@
+use crate::common_args::MovementArgs;
+use aptos_framework_biarritz_rc1_to_pre_l1_merge_migration::MigrateBiarritzRc1ToPreL1Merge;
+use clap::Parser;
+
+#[derive(Debug, Parser, Clone)]
+#[clap(rename_all = "kebab-case", about = "Upgrades from Biarritz RC1 to Pre-L1 Merge")]
+pub struct Upgrade {
+	#[clap(flatten)]
+	pub movement_args: MovementArgs,
+	/// The canonical string for the Maptos signer used in the upgrade.
+	pub maptos_signer: String,
+	/// The canonical string for the DA signer used in the upgrade
+	pub da_signer: String,
+	/// The canonical string for the DA signer used in the upgrade
+	pub mcr_signer: String,
+}
+
+impl Upgrade {
+	pub async fn execute(&self) -> Result<(), anyhow::Error> {
+		// get the movement config from dot movement
+		let dot_movement = self.movement_args.dot_movement()?;
+
+		// run the framework migration
+		dot_movement.migrate_framework_from_biarritz_rc1_to_pre_l1_merge().await?;
+
+		Ok(())
+	}
+}

networks/movement/movement-full-node/src/admin/bring_up/biarritz_rc1_to_pre_l1_merge/upgrade.rs

@@ -1,3 +1,4 @@
+pub mod biarritz_rc1_to_pre_l1_merge;
 pub mod elsa_to_biarritz_rc1;
 use clap::Subcommand;
 
@@ -6,6 +7,8 @@ use clap::Subcommand;
 pub enum BringUp {
 	#[clap(subcommand)]
 	ElsaToBiarritzRc1(elsa_to_biarritz_rc1::ElsaToBiarritzRc1),
+	#[clap(subcommand)]
+	BiarritzRc1ToPreL1Merge(biarritz_rc1_to_pre_l1_merge::BiarritzRc1ToPreL1Merge),
 }
 
 impl BringUp {
@@ -14,6 +17,9 @@ impl BringUp {
 			BringUp::ElsaToBiarritzRc1(elsa_to_biarritz_rc1) => {
 				elsa_to_biarritz_rc1.execute().await
 			}
+			BringUp::BiarritzRc1ToPreL1Merge(biarritz_rc1_to_pre_l1_merge) => {
+				biarritz_rc1_to_pre_l1_merge.execute().await
+			}
 		}
 	}
 }