Restored call to remove_malicious_node in mixnet contract migration

Mixnet and vesting contracts v1.0.2
2022-10-12 17:33:54 +01:00 · 2022-09-13 09:44:16 +01:00
7 changed files with 18 additions and 10 deletions
@@ -6720,7 +6720,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

 [[package]]
 name = "vesting-contract"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
 "cosmwasm-std",
 "cw-storage-plus",
@@ -1,4 +1,4 @@
-## Unreleased
+## [nym-contracts-v1.0.2](https://github.com/nymtech/nym/tree/nym-contracts-v1.0.2) (2022-09-13)

 ### Added

@@ -1050,7 +1050,7 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"

 [[package]]
 name = "mixnet-contract"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
 "az",
 "bs58",
@@ -1852,7 +1852,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

 [[package]]
 name = "vesting-contract"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
 "cosmwasm-std",
 "cw-storage-plus",
@@ -1,6 +1,6 @@
 [package]
 name = "mixnet-contract"
-version = "1.0.1"
+version = "1.0.2"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"

@@ -492,7 +492,6 @@ fn blacklist_malicious_node(storage: &mut dyn Storage, owner: &Addr) -> Result<(
 }

 // Removes nodes we've deemed malicious, returns the pledge to the owners, but does not send any rewards
-#[allow(unused)]
 fn remove_malicious_node(
    storage: &mut dyn Storage,
    api: &dyn Api,
@@ -509,8 +508,17 @@ fn remove_malicious_node(
 }

 #[entry_point]
-pub fn migrate(_deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
-    Ok(Response::default())
+pub fn migrate(deps: DepsMut<'_>, env: Env, msg: MigrateMsg) -> Result<Response, ContractError> {
+    let mut response = Response::new();
+    for node in msg.nodes_to_remove().iter() {
+        let mut sub_response = remove_malicious_node(deps.storage, deps.api, &env, node)
+            .unwrap_or_else(|_| panic!("Could not remove node: {:?}", node));
+        response.messages.append(&mut sub_response.messages);
+        response.attributes.append(&mut sub_response.attributes);
+        response.events.append(&mut sub_response.events);
+    }
+
+    Ok(response)
 }

 #[cfg(test)]
@@ -1,6 +1,6 @@
 [package]
 name = "vesting-contract"
-version = "1.0.1"
+version = "1.0.2"
 authors = ["Drazen Urch <durch@users.noreply.github.com>"]
 edition = "2021"

@@ -5620,7 +5620,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

 [[package]]
 name = "vesting-contract"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
 "cosmwasm-std",
 "cw-storage-plus",
Author	SHA1	Message	Date
Jędrzej Stuczyński	0ef120df0e	Restored call to remove_malicious_node in mixnet contract migration	2022-10-12 17:33:54 +01:00
Mark Sinclair	1023feb06e	Mixnet and vesting contracts v1.0.2	2022-09-13 09:44:16 +01:00