From 9480233ca390de608f882267113673c0292f9e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bogdan-=C8=98tefan=20Neac=C5=9Fu?= <bogdan@nymtech.net>
Date: Mon, 20 Dec 2021 16:09:42 +0200
Subject: [PATCH] Feature/enable signature check (#989)

* Revert "Do not set proxy only for this time"

This reverts commit 47946ad79e9e4089a4e2f87ae99317600b71debb.

* Reinstate signature check

* Enable migrate entry point
---
 contracts/mixnet/src/contract.rs                 |  3 +--
 contracts/mixnet/src/delegations/transactions.rs |  9 ++++++++-
 contracts/mixnet/src/gateways/transactions.rs    | 12 ++++++++++--
 contracts/mixnet/src/mixnodes/transactions.rs    | 12 ++++++++++--
 contracts/mixnet/src/support/helpers.rs          |  4 ----
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/contracts/mixnet/src/contract.rs b/contracts/mixnet/src/contract.rs
index 245888d88a..d46c7aa3c7 100644
--- a/contracts/mixnet/src/contract.rs
+++ b/contracts/mixnet/src/contract.rs
@@ -282,8 +282,7 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<QueryResponse, Cont
 }
 #[entry_point]
 pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
-    todo!("ACTIVE_STATE_WORK_FACTOR to State");
-    // Ok(Default::default())
+    Ok(Default::default())
 }
 
 #[cfg(test)]
diff --git a/contracts/mixnet/src/delegations/transactions.rs b/contracts/mixnet/src/delegations/transactions.rs
index 67d707c64e..5de8764e93 100644
--- a/contracts/mixnet/src/delegations/transactions.rs
+++ b/contracts/mixnet/src/delegations/transactions.rs
@@ -56,7 +56,14 @@ pub(crate) fn try_delegate_to_mixnode_on_behalf(
     // check if the delegation contains any funds of the appropriate denomination
     let amount = validate_delegation_stake(info.funds)?;
 
-    _try_delegate_to_mixnode(deps, env, mix_identity, &delegate, amount, None)
+    _try_delegate_to_mixnode(
+        deps,
+        env,
+        mix_identity,
+        &delegate,
+        amount,
+        Some(info.sender),
+    )
 }
 
 pub(crate) fn _try_delegate_to_mixnode(
diff --git a/contracts/mixnet/src/gateways/transactions.rs b/contracts/mixnet/src/gateways/transactions.rs
index a33a23a3dd..14cd6881c6 100644
--- a/contracts/mixnet/src/gateways/transactions.rs
+++ b/contracts/mixnet/src/gateways/transactions.rs
@@ -52,8 +52,16 @@ pub fn try_add_gateway_on_behalf(
         .minimum_mixnode_pledge;
     let pledge = validate_gateway_pledge(info.funds, minimum_pledge)?;
 
-    let _proxy = info.sender;
-    _try_add_gateway(deps, env, gateway, pledge, &owner, owner_signature, None)
+    let proxy = info.sender;
+    _try_add_gateway(
+        deps,
+        env,
+        gateway,
+        pledge,
+        &owner,
+        owner_signature,
+        Some(proxy),
+    )
 }
 
 pub(crate) fn _try_add_gateway(
diff --git a/contracts/mixnet/src/mixnodes/transactions.rs b/contracts/mixnet/src/mixnodes/transactions.rs
index 2c156bfa70..3f7c3d40e3 100644
--- a/contracts/mixnet/src/mixnodes/transactions.rs
+++ b/contracts/mixnet/src/mixnodes/transactions.rs
@@ -54,8 +54,16 @@ pub fn try_add_mixnode_on_behalf(
         .minimum_mixnode_pledge;
     let pledge = validate_mixnode_pledge(info.funds, minimum_pledge)?;
 
-    let _proxy = info.sender;
-    _try_add_mixnode(deps, env, mix_node, pledge, &owner, owner_signature, None)
+    let proxy = info.sender;
+    _try_add_mixnode(
+        deps,
+        env,
+        mix_node,
+        pledge,
+        &owner,
+        owner_signature,
+        Some(proxy),
+    )
 }
 
 fn _try_add_mixnode(
diff --git a/contracts/mixnet/src/support/helpers.rs b/contracts/mixnet/src/support/helpers.rs
index 8513636da5..a5994b42d2 100644
--- a/contracts/mixnet/src/support/helpers.rs
+++ b/contracts/mixnet/src/support/helpers.rs
@@ -47,15 +47,12 @@ pub(crate) fn ensure_no_existing_bond(
     Ok(())
 }
 
-#[allow(unreachable_code)]
-#[allow(unused_variables)]
 pub(crate) fn validate_node_identity_signature(
     deps: Deps,
     owner: &Addr,
     signature: String,
     identity: IdentityKeyRef,
 ) -> Result<(), ContractError> {
-    return Ok(());
     let owner_bytes = owner.as_bytes();
 
     let mut identity_bytes = [0u8; 32];
@@ -99,7 +96,6 @@ mod tests {
     use rand_chacha::rand_core::SeedableRng;
 
     #[test]
-    #[ignore]
     fn validating_node_signature() {
         let deps = mock_dependencies();