feat: enable zklogin inside multisig (MystenLabs#17607)

lispking · May 9, 2024 · ed0b1dc · ed0b1dc
1 parent b0eea4e
commit ed0b1dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/crates/sui-protocol-config/src/lib.rs b/crates/sui-protocol-config/src/lib.rs
@@ -124,6 +124,7 @@ const MAX_PROTOCOL_VERSION: u64 = 45;
 // Version 45: Use tonic networking for Mysticeti consensus.
 //             Enable random beacon protocol on testnet.
 //             Set min Move binary format version to 6.
+//             Enable transactions to be signed with zkLogin inside multisig signature.
 
 #[derive(Copy, Clone, Debug, Hash, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub struct ProtocolVersion(u64);
@@ -2153,6 +2154,7 @@ impl ProtocolConfig {
                         cfg.random_beacon_min_round_interval_ms = Some(150);
                     }
                     cfg.min_move_binary_format_version = Some(6);
+                    cfg.feature_flags.accept_zklogin_in_multisig = true;
                     // Also bumps framework snapshot to fix binop issue.
                 }
                 // Use this template when making changes:

diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_45.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_45.snap
@@ -36,6 +36,7 @@ feature_flags:
   narwhal_certificate_v2: true
   verify_legacy_zklogin_address: true
   recompute_has_public_transfer_in_execution: true
+  accept_zklogin_in_multisig: true
   include_consensus_digest_in_prologue: true
   hardened_otw_check: true
   allow_receiving_object_id: true