feat(iota-framework): Committee Selection (DRAFT)

crates/iota-e2e-tests/tests/protocol_version_tests.rs

@@ -974,7 +974,7 @@ mod sim_only_tests {
         // The system state object will be upgraded next time we execute advance_epoch
         // transaction at epoch boundary.
         let system_state = test_cluster.wait_for_epoch(Some(2)).await;
-        if let IotaSystemState::V1(inner) = system_state {
+        if let IotaSystemState::V2(inner) = system_state {
             assert_eq!(inner.parameters.min_validator_count, 4);
         } else {
             unreachable!("Unexpected iota system state version");

crates/iota-e2e-tests/tests/reconfiguration_tests.rs

@@ -847,7 +847,7 @@ async fn safe_mode_reconfig_test() {
     let system_state = test_cluster.wait_for_epoch(Some(1)).await;
     assert!(!system_state.safe_mode());
     assert_eq!(system_state.epoch(), 1);
-    assert_eq!(system_state.system_state_version(), 1);
+    assert_eq!(system_state.system_state_version(), 2);
 
     let prev_epoch_start_timestamp = system_state.epoch_start_timestamp_ms();
 
@@ -876,7 +876,7 @@ async fn safe_mode_reconfig_test() {
     let system_state = test_cluster.wait_for_epoch(Some(3)).await;
     assert!(!system_state.safe_mode());
     assert_eq!(system_state.epoch(), 3);
-    assert_eq!(system_state.system_state_version(), 1);
+    assert_eq!(system_state.system_state_version(), 2);
 }
 
 async fn add_validator_candidate(

crates/iota-e2e-tests/tests/snapshot_tests.rs

@@ -68,7 +68,7 @@ async fn basic_read_cmd_snapshot_tests() -> Result<(), anyhow::Error> {
         // 0x3b5121a0603ef7ab4cb57827fceca17db3338ef2cd76126cc1523b681df27cee --bcs", // valid
         // object BCS
         "iota client object 0x0000000000000000000000000000000000000000000000000000000000000000", /* non-existent object */
-        "iota client tx-block 5zibcom3dMckjyN16ygFwr5XNa9Exi1MmY3BQs984x1N", // valid tx digest
+        "iota client tx-block ATrNp2hJwQz1EgbEuZgsbt6Hn7DRmhNWbBxneyyawyxf", // valid tx digest
         "iota client tx-block 11111111111111111111111111111111",             /* non-existent tx
                                                                               * digest */
     ];

crates/iota-framework-snapshot/manifest.json

@@ -8,5 +8,15 @@
       "0x000000000000000000000000000000000000000000000000000000000000000b",
       "0x000000000000000000000000000000000000000000000000000000000000107a"
     ]
+  },
+  "2": {
+    "git_revision": "cb723f4d0988",
+    "package_ids": [
+      "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "0x0000000000000000000000000000000000000000000000000000000000000002",
+      "0x0000000000000000000000000000000000000000000000000000000000000003",
+      "0x000000000000000000000000000000000000000000000000000000000000000b",
+      "0x000000000000000000000000000000000000000000000000000000000000107a"
+    ]
   }
 }

crates/iota-framework/packages/iota-system/sources/iota_system.move

@@ -49,13 +49,13 @@ module iota_system::iota_system {
     use iota::system_admin_cap::IotaSystemAdminCap;
     use iota_system::validator::ValidatorV1;
     use iota_system::validator_cap::UnverifiedValidatorOperationCap;
-    use iota_system::iota_system_state_inner::{Self, SystemParametersV1, IotaSystemStateV1};
+    use iota_system::iota_system_state_inner::{Self, SystemParametersV1, IotaSystemStateV1, IotaSystemStateV2 as IotaSystemStateLatest};
     use iota_system::staking_pool::PoolTokenExchangeRate;
     use iota::dynamic_field;
     use iota::vec_map::VecMap;
 
     #[test_only] use iota::balance;
-    #[test_only] use iota_system::validator_set::ValidatorSetV1;
+    #[test_only] use iota_system::validator_set_v2::ValidatorSet as ValidatorSetLatest;
     #[test_only] use iota::vec_set::VecSet;
 
     public struct IotaSystemState has key {
@@ -548,16 +548,23 @@ module iota_system::iota_system {
         storage_rebate
     }
 
-    fun load_system_state(self: &mut IotaSystemState): &IotaSystemStateV1 {
+    fun load_system_state(self: &mut IotaSystemState): &IotaSystemStateLatest {
         load_inner_maybe_upgrade(self)
     }
 
-    fun load_system_state_mut(self: &mut IotaSystemState): &mut IotaSystemStateV1 {
+    fun load_system_state_mut(self: &mut IotaSystemState): &mut IotaSystemStateLatest {
         load_inner_maybe_upgrade(self)
     }
 
-    fun load_inner_maybe_upgrade(self: &mut IotaSystemState): &mut IotaSystemStateV1 {
-        let inner: &mut IotaSystemStateV1 = dynamic_field::borrow_mut(
+    fun load_inner_maybe_upgrade(self: &mut IotaSystemState): &mut IotaSystemStateLatest {
+        if (self.version == 1) {
+            let old_version: IotaSystemStateV1 = dynamic_field::remove(&mut self.id, self.version);
+            let new_version = old_version.v1_to_v2();
+            self.version = 2;
+            dynamic_field::add(&mut self.id, self.version, new_version);
+        };
+
+        let inner: &mut IotaSystemStateLatest = dynamic_field::borrow_mut(
             &mut self.id,
             self.version
         );
@@ -624,7 +631,7 @@ module iota_system::iota_system {
 
     #[test_only]
     /// Return the current validator set
-    public fun validators(wrapper: &mut IotaSystemState): &ValidatorSetV1 {
+    public fun validators(wrapper: &mut IotaSystemState): &ValidatorSetLatest {
         let self = load_system_state(wrapper);
         self.validators()
     }