Differentiate close and update signature checks

CHANGELOG.md

@@ -7,6 +7,7 @@ Documents changes that result in:
 
 ## Unreleased
 
+- [#1150](https://github.com/raiden-network/raiden-contracts/pull/1150) Use different message ID for chnanelClose() and updateNonClosingBalanceProof()
 - [#1148](https://github.com/raiden-network/raiden-contracts/pull/1148) Add TokenNetworkRegistry's address to MonitoringService's constructor arguments
 - [#PR ID] Revert the upgrade web3.py and other dependencies
 - [#1151](https://github.com/raiden-network/raiden-contracts/pull/1151) OneToN doesn't work for service providers not registered in ServiceRegistry

raiden_contracts/data/source/raiden/TokenNetwork.sol

@@ -517,6 +517,7 @@ contract TokenNetwork is Utils {
 
         // The closing participant must have signed the balance proof.
         address recovered_closing_participant_address = recoverAddressFromBalanceProofCounterSignature(
+            MessageTypeId.BalanceProof,
             channel_identifier,
             balance_hash,
             nonce,
@@ -621,6 +622,7 @@ contract TokenNetwork is Utils {
         // We need the signature from the non-closing participant to allow
         // anyone to make this transaction. E.g. a monitoring service.
         recovered_non_closing_participant = recoverAddressFromBalanceProofCounterSignature(
+            MessageTypeId.BalanceProofUpdate,
             channel_identifier,
             balance_hash,
             nonce,
@@ -1508,6 +1510,7 @@ contract TokenNetwork is Utils {
     }
 
     function recoverAddressFromBalanceProofCounterSignature(
+        MessageTypeId message_type_id,
         uint256 channel_identifier,
         bytes32 balance_hash,
         uint256 nonce,
@@ -1527,7 +1530,7 @@ contract TokenNetwork is Utils {
             message_length,
             address(this),
             chain_id,
-            uint256(MessageTypeId.BalanceProofUpdate),
+            uint256(message_type_id),
             channel_identifier,
             balance_hash,
             nonce,

raiden_contracts/data/source/test/TokenNetworkInternalsTest.sol

@@ -184,6 +184,7 @@ contract TokenNetworkSignatureTest is TokenNetwork {
     }
 
     function recoverAddressFromBalanceProofCounterSignaturePublic(
+        MessageTypeId message_type_id,
         uint256 channel_identifier,
         bytes32 balance_hash,
         uint256 nonce,
@@ -196,6 +197,7 @@ contract TokenNetworkSignatureTest is TokenNetwork {
         returns (address signature_address)
     {
         return recoverAddressFromBalanceProofCounterSignature(
+            message_type_id,
             channel_identifier,
             balance_hash,
             nonce,

raiden_contracts/tests/fixtures/channel.py

@@ -6,7 +6,7 @@
 from web3 import Web3
 from web3.contract import Contract
 
-from raiden_contracts.constants import TEST_SETTLE_TIMEOUT_MIN, ChannelState
+from raiden_contracts.constants import TEST_SETTLE_TIMEOUT_MIN, ChannelState, MessageTypeId
 from raiden_contracts.tests.utils import (
     EMPTY_ADDITIONAL_HASH,
     EMPTY_BALANCE_HASH,
@@ -24,7 +24,7 @@
 from raiden_contracts.utils.proofs import (
     hash_balance_data,
     sign_balance_proof,
-    sign_balance_proof_update_message,
+    sign_balance_proof_message,
     sign_cooperative_settle_message,
     sign_withdraw_message,
 )
@@ -203,10 +203,10 @@ def get(
             additional_hash2,
         )
         balance_proof_close_signature_1 = create_balance_proof_countersignature(
-            participant1, channel_identifier, *balance_proof_2
+            participant1, channel_identifier, MessageTypeId.BALANCE_PROOF, *balance_proof_2
         )
         balance_proof_update_signature_2 = create_balance_proof_countersignature(
-            participant2, channel_identifier, *balance_proof_1
+            participant2, channel_identifier, MessageTypeId.BALANCE_PROOF_UPDATE, *balance_proof_1
         )
 
         token_network.functions.closeChannel(
@@ -647,6 +647,7 @@ def get(
             _token_network.address,
             int(_token_network.functions.chain_id().call()),
             channel_identifier,
+            MessageTypeId.BALANCE_PROOF,
             balance_hash,
             nonce,
             additional_hash,
@@ -664,6 +665,7 @@ def create_balance_proof_countersignature(
     def get(
         participant: HexAddress,
         channel_identifier: int,
+        msg_type: MessageTypeId,
         balance_hash: bytes,
         nonce: int,
         additional_hash: bytes,
@@ -674,11 +676,12 @@ def get(
         _token_network = other_token_network or token_network
         private_key = get_private_key(participant)
 
-        non_closing_signature = sign_balance_proof_update_message(
+        non_closing_signature = sign_balance_proof_message(
             private_key,
             _token_network.address,
             int(_token_network.functions.chain_id().call()),
             channel_identifier,
+            msg_type,
             balance_hash,
             nonce,
             additional_hash,
@@ -703,11 +706,12 @@ def get(
         _token_network = other_token_network or token_network
         private_key = get_private_key(participant)
 
-        non_closing_signature = sign_balance_proof_update_message(
+        non_closing_signature = sign_balance_proof_message(
             private_key,
             _token_network.address,
             int(_token_network.functions.chain_id().call()),
             channel_identifier,
+            MessageTypeId.BALANCE_PROOF,
             EMPTY_BALANCE_HASH,
             0,
             EMPTY_ADDITIONAL_HASH,

raiden_contracts/tests/test_channel_close.py

@@ -5,7 +5,12 @@
 from web3 import Web3
 from web3.contract import Contract
 
-from raiden_contracts.constants import TEST_SETTLE_TIMEOUT_MIN, ChannelEvent, ChannelState
+from raiden_contracts.constants import (
+    TEST_SETTLE_TIMEOUT_MIN,
+    ChannelEvent,
+    ChannelState,
+    MessageTypeId,
+)
 from raiden_contracts.tests.utils import (
     EMPTY_ADDITIONAL_HASH,
     EMPTY_BALANCE_HASH,
@@ -124,7 +129,7 @@ def test_close_wrong_signature(
         channel_identifier, C, transferred_amount, 0, nonce, locksroot
     )
     closing_signature_A = create_balance_proof_countersignature(
-        A, channel_identifier, *balance_proof
+        A, channel_identifier, MessageTypeId.BALANCE_PROOF, *balance_proof
     )
 
     with pytest.raises(TransactionFailed):
@@ -225,7 +230,9 @@ def test_close_nonce_zero(
         vals_B.nonce,
         vals_B.locksroot,
     )
-    close_sig_A = create_balance_proof_countersignature(A, channel_identifier, *balance_proof_B)
+    close_sig_A = create_balance_proof_countersignature(
+        A, channel_identifier, MessageTypeId.BALANCE_PROOF, *balance_proof_B
+    )
 
     (
         _,
@@ -285,8 +292,12 @@ def test_close_first_argument_is_for_partner_transfer(
 
     # Create balance proofs
     balance_proof = create_balance_proof(channel_identifier, B)
-    closing_sig_A = create_balance_proof_countersignature(A, channel_identifier, *balance_proof)
-    closing_sig_B = create_balance_proof_countersignature(B, channel_identifier, *balance_proof)
+    closing_sig_A = create_balance_proof_countersignature(
+        A, channel_identifier, MessageTypeId.BALANCE_PROOF, *balance_proof
+    )
+    closing_sig_B = create_balance_proof_countersignature(
+        B, channel_identifier, MessageTypeId.BALANCE_PROOF, *balance_proof
+    )
 
     # closeChannel fails, if the provided balance proof is from the same participant who closes
     with pytest.raises(TransactionFailed):
@@ -460,7 +471,9 @@ def test_close_channel_state(
         vals_B.nonce,
         vals_B.locksroot,
     )
-    closing_sig_A = create_balance_proof_countersignature(A, channel_identifier, *balance_proof_B)
+    closing_sig_A = create_balance_proof_countersignature(
+        A, channel_identifier, MessageTypeId.BALANCE_PROOF, *balance_proof_B
+    )
 
     txn_hash = token_network.functions.closeChannel(
         channel_identifier, B, A, *balance_proof_B, closing_sig_A
@@ -568,7 +581,9 @@ def test_close_replay_reopened_channel(
         nonce,
         values_B.locksroot,
     )
-    closing_sig_A = create_balance_proof_countersignature(A, channel_identifier1, *balance_proof_B)
+    closing_sig_A = create_balance_proof_countersignature(
+        A, channel_identifier1, MessageTypeId.BALANCE_PROOF, *balance_proof_B
+    )
     token_network.functions.closeChannel(
         channel_identifier1, B, A, *balance_proof_B, closing_sig_A
     ).call_and_transact({"from": A})
@@ -605,7 +620,7 @@ def test_close_replay_reopened_channel(
         values_B.locksroot,
     )
     closing_sig_A2 = create_balance_proof_countersignature(
-        A, channel_identifier2, *balance_proof_B2
+        A, channel_identifier2, MessageTypeId.BALANCE_PROOF, *balance_proof_B2
     )
     token_network.functions.closeChannel(
         channel_identifier2, B, A, *balance_proof_B2, closing_sig_A2
@@ -631,7 +646,9 @@ def test_close_channel_event(
     balance_proof = create_balance_proof(
         channel_identifier, B, transferred_amount=5, locked_amount=0, nonce=3
     )
-    close_sig = create_balance_proof_countersignature(A, channel_identifier, *balance_proof)
+    close_sig = create_balance_proof_countersignature(
+        A, channel_identifier, MessageTypeId.BALANCE_PROOF, *balance_proof
+    )
 
     txn_hash = token_network.functions.closeChannel(
         channel_identifier, B, A, *balance_proof, close_sig

raiden_contracts/tests/test_channel_settle.py

@@ -6,7 +6,12 @@
 from web3 import Web3
 from web3.contract import Contract
 
-from raiden_contracts.constants import TEST_SETTLE_TIMEOUT_MIN, ChannelEvent, ChannelState
+from raiden_contracts.constants import (
+    TEST_SETTLE_TIMEOUT_MIN,
+    ChannelEvent,
+    ChannelState,
+    MessageTypeId,
+)
 from raiden_contracts.tests.fixtures.channel import call_settle
 from raiden_contracts.tests.utils import (
     EMPTY_ADDITIONAL_HASH,
@@ -184,7 +189,9 @@ def test_settle_single_direct_transfer_for_closing_party(
         1,
         LOCKSROOT_OF_NO_LOCKS,
     )
-    closing_sig_A = create_balance_proof_countersignature(A, channel_identifier, *balance_proof_B)
+    closing_sig_A = create_balance_proof_countersignature(
+        A, channel_identifier, MessageTypeId.BALANCE_PROOF, *balance_proof_B
+    )
     token_network.functions.closeChannel(
         channel_identifier, B, A, *balance_proof_B, closing_sig_A
     ).call_and_transact({"from": A})
@@ -266,7 +273,7 @@ def test_settle_single_direct_transfer_for_counterparty(
     )
 
     balance_proof_update_signature_B = create_balance_proof_countersignature(
-        B, channel_identifier, *balance_proof_A
+        B, channel_identifier, MessageTypeId.BALANCE_PROOF_UPDATE, *balance_proof_A
     )
     token_network.functions.updateNonClosingBalanceProof(
         channel_identifier, A, B, *balance_proof_A, balance_proof_update_signature_B
@@ -584,9 +591,11 @@ def test_settle_channel_event(
     balance_proof_A = create_balance_proof(channel_identifier, A, 10, 0, 1, LOCKSROOT_OF_NO_LOCKS)
     balance_proof_B = create_balance_proof(channel_identifier, B, 5, 0, 3, LOCKSROOT_OF_NO_LOCKS)
     balance_proof_update_signature_B = create_balance_proof_countersignature(
-        B, channel_identifier, *balance_proof_A
+        B, channel_identifier, MessageTypeId.BALANCE_PROOF_UPDATE, *balance_proof_A
+    )
+    close_sig_A = create_balance_proof_countersignature(
+        A, channel_identifier, MessageTypeId.BALANCE_PROOF, *balance_proof_B
     )
-    close_sig_A = create_balance_proof_countersignature(A, channel_identifier, *balance_proof_B)
 
     token_network.functions.closeChannel(
         channel_identifier, B, A, *balance_proof_B, close_sig_A