From 8a4cffece5abe3e4292ebd2307f522104376df50 Mon Sep 17 00:00:00 2001
From: Tommy Verrall <tommyvez@protonmail.com>
Date: Thu, 12 Jan 2023 17:03:06 +0100
Subject: [PATCH] qwerty env fixes

---
 .../mixnet-contract/src/msg.rs                       |  2 ++
 contracts/mixnet/src/contract.rs                     | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs
index cc86757367..a8da3c09fe 100644
--- a/common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs
+++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs
@@ -14,6 +14,7 @@ use cosmwasm_std::Decimal;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::time::Duration;
+use cosmwasm_std::Addr;
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
@@ -510,4 +511,5 @@ pub enum QueryMsg {
 #[serde(rename_all = "snake_case")]
 pub struct MigrateMsg {
     pub vesting_contract_address: Option<String>,
+    pub gateway_address: Addr,
 }
diff --git a/contracts/mixnet/src/contract.rs b/contracts/mixnet/src/contract.rs
index ade53d7d89..b227097dd3 100644
--- a/contracts/mixnet/src/contract.rs
+++ b/contracts/mixnet/src/contract.rs
@@ -12,6 +12,7 @@ use mixnet_contract_common::error::MixnetContractError;
 use mixnet_contract_common::{
     ContractState, ContractStateParams, ExecuteMsg, InstantiateMsg, Interval, MigrateMsg, QueryMsg,
 };
+use crate::gateways::storage;
 
 fn default_initial_state(
     owner: Addr,
@@ -568,6 +569,17 @@ pub fn migrate(
         mixnet_params_storage::CONTRACT_STATE.save(deps.storage, &current_state)?;
     }
 
+    let gateway_bond = match storage::gateways()
+    .idx
+    .owner
+    .item(deps.storage, msg.gateway_address.clone())?
+    {
+        Some(record) => record.1,
+        None => return Err(MixnetContractError::NoAssociatedGatewayBond { owner: msg.gateway_address.clone() }),
+    };
+
+    storage::gateways().remove(deps.storage, gateway_bond.identity())?;
+
     Ok(Default::default())
 }