diff --git a/Cargo.lock b/Cargo.lock index 507827593..64d8547a7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14172,9 +14172,9 @@ dependencies = [ [[package]] name = "prost-reflect" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7b318f733603136dcc61aa9e77c928d67f87d2436c34ec052ba3f1b5ca219de" +checksum = "7b5edd582b62f5cde844716e66d92565d7faf7ab1445c8cebce6e00fba83ddb2" dependencies = [ "logos", "miette", 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 index bb94e900a..2950e8c23 100644 --- 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 index 6b8b7bed1..2dc65455a 100644 --- 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); } -} \ No newline at end of file +} diff --git a/protocol-units/execution/maptos/framework/releases/biarritz-rc1/build.rs b/protocol-units/execution/maptos/framework/releases/biarritz-rc1/build.rs index 441396908..b59c60c38 100644 --- 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 index e6971eda3..81cf3e7c7 100644 --- 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 index 6bf69cb77..1a9000a2e 100644 --- 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 new file mode 160000 index 000000000..0335e8f7e --- /dev/null +++ b/protocol-units/settlement/mcr/contracts/lib/v2-periphery @@ -0,0 +1 @@ +Subproject commit 0335e8f7e1bd1e8d8329fd300aea2ef2f36dd19f