release yaml for aip 57 (#11364)

aptos-labs · Dec 15, 2023 · 75bf51c · 75bf51c
1 parent 86a2fbc
commit 75bf51c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/aptos-move/aptos-release-builder/data/release.yaml b/aptos-move/aptos-release-builder/data/release.yaml
@@ -32,3 +32,26 @@ proposals:
       - FeatureFlag:
           enabled:
             - sponsored_automatic_account_creation
+  - name: step_4_update_block_limits
+    metadata: 
+      title: "AIP-57: Block Output Size Limit and Conflict-Aware Block Gas Limit"  
+      description: "AIP-57: Block Output Size Limit and Conflict-Aware Block Gas Limit"  
+      discussion_url: "https://github.com/aptos-foundation/AIPs/issues/285" 
+    execution_mode: MultiStep 
+    update_sequence:  
+      - Execution:  
+          V4:  
+            transaction_shuffler_type:  
+              sender_aware_v2: 32  
+            block_gas_limit_type: 
+              complex_limit_v1:  
+                effective_block_gas_limit: 40000  
+                execution_gas_effective_multiplier: 1  
+                io_gas_effective_multiplier: 1  
+                conflict_penalty_window: 6  
+                use_granular_resource_group_conflicts: false  
+                use_module_publishing_block_conflict: false  
+                block_output_limit: 5242880
+                include_user_txn_size_in_block_output: true  
+                add_block_limit_outcome_onchain: false  
+            transaction_deduper_type: txn_hash_and_authenticator_v1
diff --git a/types/src/on_chain_config/execution_config.rs b/types/src/on_chain_config/execution_config.rs
@@ -152,6 +152,7 @@ pub enum TransactionDeduperType {
 }
 
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+#[serde(rename_all = "snake_case")] // cannot use tag = "type" as nested enums cannot work, and bcs doesn't support it
 pub enum BlockGasLimitType {
     NoLimit,
     Limit(u64),