Merge branch 'aptos-release-v1.25' into george/disable-loader-v2-1.25

aptos-move/aptos-gas-schedule/src/gas_schedule/transaction.rs

@@ -212,7 +212,7 @@ crate::gas_schedule::macros::define_gas_parameters!(
         [
             max_execution_gas_gov: InternalGas,
             { RELEASE_V1_13.. => "max_execution_gas.gov" },
-            4_300_000_000,
+            4_000_000_000,
         ],
         [
             max_io_gas: InternalGas,

aptos-move/aptos-gas-schedule/src/ver.rs

@@ -69,7 +69,7 @@
 ///       global operations.
 /// - V1
 ///   - TBA
-pub const LATEST_GAS_FEATURE_VERSION: u64 = gas_feature_versions::RELEASE_V1_24;
+pub const LATEST_GAS_FEATURE_VERSION: u64 = gas_feature_versions::RELEASE_V1_25;
 
 pub mod gas_feature_versions {
     pub const RELEASE_V1_8: u64 = 11;
@@ -89,4 +89,5 @@ pub mod gas_feature_versions {
     pub const RELEASE_V1_22: u64 = 26;
     pub const RELEASE_V1_23: u64 = 27;
     pub const RELEASE_V1_24: u64 = 28;
+    pub const RELEASE_V1_25: u64 = 29;
 }

aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/diamond_clicker.v2_exp

@@ -15,49 +15,45 @@ struct OuterStruct has key {
 }
 
 entry public test_upgrade(Arg0: &signer) /* def_idx: 0 */ {
-L1:	loc0: OuterStruct
-L2:	loc1: &mut vector<InnerStruct>
+L1:	loc0: &mut vector<InnerStruct>
+L2:	loc1: u64
 L3:	loc2: u64
-L4:	loc3: u64
-L5:	loc4: u64
 B0:
 	0: CopyLoc[0](Arg0: &signer)
 	1: Call signer::address_of(&signer): address
-	2: VecPack(3, 0)
-	3: Pack[1](OuterStruct)
-	4: StLoc[1](loc0: OuterStruct)
-	5: MoveLoc[0](Arg0: &signer)
-	6: MoveLoc[1](loc0: OuterStruct)
-	7: MoveTo[1](OuterStruct)
-	8: MutBorrowGlobal[1](OuterStruct)
-	9: MutBorrowField[0](OuterStruct.any_field: vector<InnerStruct>)
-	10: StLoc[2](loc1: &mut vector<InnerStruct>)
-	11: LdU64(0)
-	12: StLoc[3](loc2: u64)
-	13: CopyLoc[2](loc1: &mut vector<InnerStruct>)
-	14: FreezeRef
-	15: VecLen(3)
-	16: StLoc[4](loc3: u64)
+	2: MoveLoc[0](Arg0: &signer)
+	3: VecPack(3, 0)
+	4: Pack[1](OuterStruct)
+	5: MoveTo[1](OuterStruct)
+	6: MutBorrowGlobal[1](OuterStruct)
+	7: MutBorrowField[0](OuterStruct.any_field: vector<InnerStruct>)
+	8: StLoc[1](loc0: &mut vector<InnerStruct>)
+	9: LdU64(0)
+	10: StLoc[2](loc1: u64)
+	11: CopyLoc[1](loc0: &mut vector<InnerStruct>)
+	12: FreezeRef
+	13: VecLen(3)
+	14: StLoc[3](loc2: u64)
 B1:
-	17: CopyLoc[3](loc2: u64)
-	18: CopyLoc[4](loc3: u64)
-	19: Lt
-	20: BrFalse(31)
+	15: CopyLoc[2](loc1: u64)
+	16: CopyLoc[3](loc2: u64)
+	17: Lt
+	18: BrFalse(29)
 B2:
-	21: CopyLoc[2](loc1: &mut vector<InnerStruct>)
-	22: CopyLoc[3](loc2: u64)
-	23: VecMutBorrow(3)
-	24: FreezeRef
-	25: Call debug::print<InnerStruct>(&InnerStruct)
-	26: MoveLoc[3](loc2: u64)
-	27: LdU64(1)
-	28: Add
-	29: StLoc[3](loc2: u64)
-	30: Branch(17)
+	19: CopyLoc[1](loc0: &mut vector<InnerStruct>)
+	20: CopyLoc[2](loc1: u64)
+	21: VecMutBorrow(3)
+	22: FreezeRef
+	23: Call debug::print<InnerStruct>(&InnerStruct)
+	24: MoveLoc[2](loc1: u64)
+	25: LdU64(1)
+	26: Add
+	27: StLoc[2](loc1: u64)
+	28: Branch(15)
 B3:
-	31: MoveLoc[2](loc1: &mut vector<InnerStruct>)
-	32: Pop
-	33: Ret
+	29: MoveLoc[1](loc0: &mut vector<InnerStruct>)
+	30: Pop
+	31: Ret
 }
 }
 

aptos-move/framework/aptos-framework/tests/compiler-v2-doc/aptos_governance.md

@@ -883,6 +883,7 @@ This function is private because it's called directly from the vm.
     <a href="system_addresses.md#0x1_system_addresses_assert_aptos_framework">system_addresses::assert_aptos_framework</a>(aptos_framework);
 
     <a href="voting.md#0x1_voting_register">voting::register</a>&lt;GovernanceProposal&gt;(aptos_framework);
+    <a href="aptos_governance.md#0x1_aptos_governance_initialize_partial_voting">initialize_partial_voting</a>(aptos_framework);
     <b>move_to</b>(aptos_framework, <a href="aptos_governance.md#0x1_aptos_governance_GovernanceConfig">GovernanceConfig</a> {
         voting_duration_secs,
         min_voting_threshold,
@@ -2132,6 +2133,7 @@ Limit addition overflow.
 <b>ensures</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_GovernanceEvents">GovernanceEvents</a>&gt;(addr);
 <b>ensures</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>&gt;(addr);
 <b>ensures</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(addr);
+<b>ensures</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>&gt;(addr);
 </code></pre>
 
 
@@ -2204,6 +2206,7 @@ Abort if structs have already been created.
     <b>aborts_if</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecords">VotingRecords</a>&gt;(addr);
     <b>aborts_if</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_ApprovedExecutionHashes">ApprovedExecutionHashes</a>&gt;(addr);
     <b>aborts_if</b> !<b>exists</b>&lt;<a href="account.md#0x1_account_Account">account::Account</a>&gt;(addr);
+    <b>aborts_if</b> <b>exists</b>&lt;<a href="aptos_governance.md#0x1_aptos_governance_VotingRecordsV2">VotingRecordsV2</a>&gt;(addr);
 }
 </code></pre>