MonitoringService update + contracts recompilation

.travis.yml

@@ -7,7 +7,7 @@ python:
 env:
   global:
     - TEST_TYPE=raiden_contracts
-    - SOLC_VERSION='v0.5.4'
+    - SOLC_VERSION='v0.5.6'
     - SOLC_URL="https://github.com/ethereum/solidity/releases/download/$SOLC_VERSION/solc-static-linux"
     - CODECOV_TOKEN="52f50270-3657-4f84-9e36-e6c01b2be6da"
 

raiden_contracts/contract_source_manager.py

@@ -55,6 +55,7 @@ def relativise(path):
                     output_values=PRECOMPILED_DATA_FIELDS + ['ast'],
                     import_remappings=import_dir_map,
                     optimize=False,
+                    evm_version='byzantium',
                 )
 
                 # Strip `ast` part from result

raiden_contracts/data/source/lib/ECVerify.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 library ECVerify {
 

raiden_contracts/data/source/raiden/EndpointRegistry.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 /// @title Endpoint Registry
 /// @notice This contract is a registry which maps an Ethereum address to its

raiden_contracts/data/source/raiden/SecretRegistry.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 /// @title SecretRegistry
 /// @notice SecretRegistry contract for registering secrets from Raiden Network

raiden_contracts/data/source/raiden/Token.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 interface Token {
 

raiden_contracts/data/source/raiden/TokenNetwork.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 import "lib/ECVerify.sol";
 import "raiden/Token.sol";

raiden_contracts/data/source/raiden/TokenNetworkRegistry.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 import "raiden/Utils.sol";
 import "raiden/Token.sol";

raiden_contracts/data/source/raiden/Utils.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 /// @title Utils
 /// @notice Utils contract for various helpers used by the Raiden Network smart

raiden_contracts/data/source/services/MonitoringService.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 import "lib/ECVerify.sol";
 import "raiden/Token.sol";
@@ -231,15 +231,14 @@ contract MonitoringService is Utils {
             token_network_address
         ));
 
-        // Only allowed to claim, if channel is settled
-        // Channel is settled if it's data has been deleted
-        TokenNetwork.ChannelState channel_state;
-        (, channel_state) = token_network.getChannelInfo(
+        // Only allowed to claim, if channel is out of the settlement period
+        uint256 settle_block_number;
+        (settle_block_number,) = token_network.getChannelInfo(
             channel_identifier,
             closing_participant,
             non_closing_participant
         );
-        require(channel_state == TokenNetwork.ChannelState.Removed);
+        require(settle_block_number < block.number);
 
         Reward storage reward = rewards[reward_identifier];
 

raiden_contracts/data/source/services/OneToN.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 import "raiden/Utils.sol";
 import "services/UserDeposit.sol";

raiden_contracts/data/source/services/ServiceRegistry.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 import "raiden/Token.sol";
 import "raiden/Utils.sol";

raiden_contracts/data/source/services/UserDeposit.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 import "raiden/Token.sol";
 import "raiden/Utils.sol";

raiden_contracts/data/source/test/CustomToken.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 /*
 This Token Contract implements the standard token functionality (https://github.com/ethereum/EIPs/issues/20), the ERC223 functionality (https://github.com/ethereum/EIPs/issues/223) as well as the following OPTIONAL extras intended for use by humans.

raiden_contracts/data/source/test/HumanStandardToken.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 import "test/StandardToken.sol";
 

raiden_contracts/data/source/test/MonitoringServiceInternalsTest.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 import "services/MonitoringService.sol";
 

raiden_contracts/data/source/test/SignatureVerifyTest.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 /*
  * This is a contract used for testing the ECVerify library and ecrecover behaviour.

raiden_contracts/data/source/test/StandardToken.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 import "raiden/Token.sol";
 

raiden_contracts/data/source/test/TokenNetworkInternalsTest.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 import "raiden/TokenNetwork.sol";
 

raiden_contracts/data/source/test/UDCTransfer.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.4;
+pragma solidity 0.5.6;
 
 import "services/UserDeposit.sol";
 

raiden_contracts/tests/test_monitoring_service.py

@@ -75,7 +75,7 @@ def monitor_data(
     }
 
 
-def test_claimReward(
+def test_claimReward_with_settle_call(
         token_network,
         monitoring_service_external,
         user_deposit_contract,
@@ -96,7 +96,7 @@ def test_claimReward(
         monitor_data['reward_proof_signature'],
     ).transact({'from': ms_address})
 
-    # claiming before settlement must fail
+    # claiming before settlement timeout must fail
     with pytest.raises(TransactionFailed):
         monitoring_service_external.functions.claimReward(
             channel_identifier,
@@ -146,6 +146,66 @@ def test_claimReward(
     assert ms_balance_after_reward == REWARD_AMOUNT
 
 
+def test_claimReward_without_settle_call(
+        token_network,
+        monitoring_service_external,
+        user_deposit_contract,
+        event_handler,
+        monitor_data,
+        ms_address,
+):
+    A, B = monitor_data['participants']
+    channel_identifier = monitor_data['channel_identifier']
+
+    # MS updates closed channel on behalf of B
+    txn_hash = monitoring_service_external.functions.monitor(
+        A, B,
+        *monitor_data['balance_proof_B'],
+        monitor_data['non_closing_signature'],
+        REWARD_AMOUNT,
+        token_network.address,
+        monitor_data['reward_proof_signature'],
+    ).transact({'from': ms_address})
+
+    # claiming before settlement timeout must fail
+    with pytest.raises(TransactionFailed):
+        monitoring_service_external.functions.claimReward(
+            channel_identifier,
+            token_network.address,
+            A, B,
+        ).transact({'from': ms_address})
+
+    # Wait for settle_timeout to elapse
+    token_network.web3.testing.mine(8)
+
+    # Claim reward for MS
+    monitoring_service_external.functions.claimReward(
+        channel_identifier,
+        token_network.address,
+        A, B,
+    ).transact({'from': ms_address})
+
+    # Check REWARD_CLAIMED event
+    reward_identifier = Web3.sha3(
+        encode_single('uint256', channel_identifier) +
+        Web3.toBytes(hexstr=token_network.address),
+    )
+    ms_ev_handler = event_handler(monitoring_service_external)
+    ms_ev_handler.assert_event(
+        txn_hash,
+        MonitoringServiceEvent.REWARD_CLAIMED,
+        dict(
+            ms_address=ms_address,
+            amount=REWARD_AMOUNT,
+            reward_identifier=reward_identifier,
+        ),
+    )
+
+    # Check that MS balance has increased by claiming the reward
+    ms_balance_after_reward = user_deposit_contract.functions.balances(ms_address).call()
+    assert ms_balance_after_reward == REWARD_AMOUNT
+
+
 def test_monitor(
         token_network,
         monitoring_service_external,