Fix/SDK integration

contracts/consumer/converter/src/contract.rs

@@ -360,26 +360,33 @@ impl ConverterApi for ConverterContract<'_> {
 
         // Send over IBC to the Consumer
         let channel = IBC_CHANNEL.load(ctx.deps.storage)?;
-        let add_msg = add_validators_msg(&ctx.env, &channel, &additions)?;
-        let tomb_msg = tombstone_validators_msg(&ctx.env, &channel, &tombstoned)?;
-        let jail_msg = jail_validators_msg(&ctx.env, &channel, &jailed)?;
-
-        let event = Event::new("valset_update").add_attribute(
-            "additions",
-            additions
-                .iter()
-                .map(|v| v.address.clone())
-                .collect::<Vec<String>>()
-                .join(","),
-        );
-        let event = event.add_attribute("jailed", jailed.join(","));
-        let event = event.add_attribute("tombstoned", tombstoned.join(","));
-        let resp = Response::new()
-            .add_event(event)
-            .add_message(add_msg)
-            .add_message(tomb_msg)
-            .add_message(jail_msg);
 
+        let mut resp = Response::new();
+        let mut event = Event::new("valset_update");
+
+        if !additions.is_empty() {
+            let add_msg = add_validators_msg(&ctx.env, &channel, &additions)?;
+            resp = resp.add_message(add_msg);
+            event = event.add_attribute(
+                "additions",
+                additions
+                    .iter()
+                    .map(|v| v.address.clone())
+                    .collect::<Vec<String>>()
+                    .join(","),
+            );
+        }
+        if !jailed.is_empty() {
+            let jail_msg = jail_validators_msg(&ctx.env, &channel, &jailed)?;
+            resp = resp.add_message(jail_msg);
+            event = event.add_attribute("jailed", jailed.join(","));
+        }
+        if !tombstoned.is_empty() {
+            let tomb_msg = tombstone_validators_msg(&ctx.env, &channel, &tombstoned)?;
+            resp = resp.add_message(tomb_msg);
+            event = event.add_attribute("tombstoned", tombstoned.join(","));
+        }
+        resp = resp.add_event(event);
         Ok(resp)
     }
 }

contracts/consumer/virtual-staking/src/contract.rs

@@ -531,12 +531,12 @@ pub fn sudo(
             tombstoned,
         } => VirtualStakingContract::new().handle_valset_update(
             deps,
-            &additions,
-            &removals,
-            &updated,
-            &jailed,
-            &unjailed,
-            &tombstoned,
+            &additions.unwrap_or_default(),
+            &removals.unwrap_or_default(),
+            &updated.unwrap_or_default(),
+            &jailed.unwrap_or_default(),
+            &unjailed.unwrap_or_default(),
+            &tombstoned.unwrap_or_default(),
         ),
     }
 }

contracts/consumer/virtual-staking/src/multitest.rs

@@ -150,12 +150,12 @@ fn valset_update_sudo() {
     let rems = vec!["cosmosval2".to_string()];
     let tombs = vec!["cosmosval3".to_string()];
     let msg = SudoMsg::ValsetUpdate {
-        additions: adds,
-        removals: rems,
-        updated: vec![],
-        jailed: vec![],
-        unjailed: vec![],
-        tombstoned: tombs,
+        additions: Some(adds),
+        removals: Some(rems),
+        updated: None,
+        jailed: None,
+        unjailed: None,
+        tombstoned: Some(tombs),
     };
 
     let res = app

packages/apis/src/ibc/packet.rs

@@ -144,7 +144,7 @@ pub struct RemoveValidatorsAck {}
 #[cw_serde]
 pub struct JailValidatorsAck {}
 
-/// Ack sent for ConsumerPacket::Distribute
+/// Ack sent for ConsumerPacket::Distribute and ConsumerPacket::DistributeBatch
 #[cw_serde]
 pub struct DistributeAck {}
 

packages/apis/src/virtual_staking_api.rs

@@ -44,11 +44,11 @@ pub enum SudoMsg {
     ///  - Addition of an existing validator to the active validator set.
     ///  - Permanent removal (i.e. tombstoning) of a validator from the active set. Implies slashing
     ValsetUpdate {
-        additions: Vec<Validator>,
-        removals: Vec<String>,
-        updated: Vec<Validator>,
-        jailed: Vec<String>,
-        unjailed: Vec<String>,
-        tombstoned: Vec<String>,
+        additions: Option<Vec<Validator>>,
+        removals: Option<Vec<String>>,
+        updated: Option<Vec<Validator>>,
+        jailed: Option<Vec<String>>,
+        unjailed: Option<Vec<String>>,
+        tombstoned: Option<Vec<String>>,
     },
 }