Merge pull request #6405 from raiden-network/release-v1.1.1

Release v1.1.1

Author: palango

.bumpversion_client.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.0
+current_version = 1.1.1
 commit = True
 tag = False
 

.circleci/config.yml

@@ -181,10 +181,8 @@ commands:
           key: pip-cache-{{ arch }}-<< parameters.py-version >>
       - restore_cache:
           keys:
-          - python-deps-v3-{{ arch }}-<< parameters.py-version >>-{{ checksum "requirements/requirements-ci.txt" }}
-# hack: solving a inter-PR cache problem
-          - python-deps-v3-{{ arch }}-<< parameters.py-version >>-2uPiIM_pNv5neMjXtHsw_aV6BQGcFOekCBcy7TJEkhI=
-          - python-deps-v3-{{ arch }}-<< parameters.py-version >>-
+          - python-deps-v4-{{ arch }}-<< parameters.py-version >>-{{ checksum "requirements/requirements-ci.txt" }}
+          - python-deps-v4-{{ arch }}-<< parameters.py-version >>-
       - run:
           name: Creating virtualenv
           command: |
@@ -204,7 +202,7 @@ commands:
             pip-sync requirements-ci.txt _raiden-dev.txt
             popd
       - save_cache:
-          key: python-deps-v3-{{ arch }}-<< parameters.py-version >>-{{ checksum "requirements/requirements-ci.txt" }}
+          key: python-deps-v4-{{ arch }}-<< parameters.py-version >>-{{ checksum "requirements/requirements-ci.txt" }}
           paths:
           - "~/venv-<< parameters.py-version >>-LINUX"
           - "~/venv-<< parameters.py-version >>-MACOS"

docs/changelog.rst

@@ -2,39 +2,45 @@
 Changelog
 =========
 
+* :release:`1.1.1 <2020-07-20>`
+* :feature:`-` Update WebUI to version 1.0.2 https://github.com/raiden-network/webui/releases/tag/v1.0.2
+* :feature:`5407` Add ``/contracts`` endpoint with information about the used contracts.
+* :bug:`6217` Don't crash at ``/payments`` when no target address is given.
+* :feature:`-` Adds minimum required balance to send out MonitorRequest on mainnet.
+* :bug:`6323` Handling no ETH exception in the minting endpoint.
+
 * :release:`1.1.0 <2020-06-18>`
 
-* :release:`1.0.2-rc`
+* :release:`1.0.2-rc <2020-06-17>`
 * :feature:`-` Update WebUI to version 1.0.1 https://github.com/raiden-network/webui/releases/tag/v1.0.1
-* :bug:`6310` Fixed dependencies used in `setup.py`.
+* :bug:`6310` Fixed dependencies used in ``setup.py``.
 
-* :release:`1.0.1`
+* :release:`1.0.1 <2020-06-15>`
 * :feature:`-` Update WebUI to version 1.0.0 https://github.com/raiden-network/webui/releases/tag/v1.0.0
 * :feature:`6220` Make sure the configured PFS and Matrix servers use the same chain and smart contracts.
 * :bug:`6224` Fix ULID generation under Windows, nanosecond clock resolution is not necessary anymore.
 
-* :release:`1.0.0`
-
+* :release:`1.0.0 <2020-05-26>`
 * :feature:`-` Update WebUI to version 0.11.1 https://github.com/raiden-network/webui/releases/tag/v0.11.1
 
-* :release:`0.200.0-rc9`
+* :release:`0.200.0-rc9 <2020-05-19>`
 
-* :release:`0.200.0-rc8`
+* :release:`0.200.0-rc8 <2020-04-21>`
 * :feature:`5338` The number of blocks queried for events is now dynamically adjusted. This is necessary to prevent timeouts because the Ethereum client is overloaded.
 * :bug:`6082` Small bug fix, use of undefined variable.
 * :bug:`6083` Weakened byte code check to prevent errors with client pruning.
 * :bug:`6071` Fixed transport race condition which prevented a node to restart after a failure.
 * :bug:`6075` Fixed serialization problem for pending transactions.
 
-* :release:`0.200.0-rc7`
+* :release:`0.200.0-rc7 <2020-04-16>`
 * :bug:`6077` Fix missing requirement to build macOS binaries
 
-* :release:`0.200.0-rc6`
+* :release:`0.200.0-rc6 <2020-04-16>`
 * :bug:`6072` Always return valid JSON on the config endpoint, even when the REST API is starting.
 * :bug:`6067` Workaround gevent's bug on wait for single elements.
 * :bug:`6066` Workaround slow speed of geth on mainnet for eth_getLogs.
 
-* :release:`0.200.0-rc3`
+* :release:`0.200.0-rc3 <2020-03-26>`
 * :feature:`5281` Add a /status endpoint; start the API earlier and return 503 SERVICE UNAVAILABLE during the initial sync.
 * :feature:`4588` Remove the echo_node subcommand of the command line interface.
 * :bug:`5779` Handle the API exception when no further token networks can be registered by returning 403 FORBIDDEN.
@@ -50,7 +56,7 @@ Changelog
 * :feature:`5278` Always use private rooms in the matrix transport.
 * :feature:`5217` Fully support infura as an underlying ethereum rpc node.
 * :bug:`5064` Display a user-friendly error message when the PFS info request fails.
-* :bug:`5055` Fix withdraw messages deserialization when the messages are queued in `queueids_to_queues`.
+* :bug:`5055` Fix withdraw messages deserialization when the messages are queued in ``queueids_to_queues``.
 * :feature:`5053` Make mediation fees non-negative by default. This fixes some counter-intuitive behaviour.
 * :bug:`4835` Fix etherscan sync by passing user-agent in the HTTP request. The request was failing because etherscan is protected by Cloudflare.
 * :feature:`-` Update WebUI to version 0.10.1 https://github.com/raiden-network/webui/releases/tag/v0.10.1
@@ -223,7 +229,7 @@ Changelog
 
 * :release:`0.15.0 <2018-10-27>`
 * :bug:`2905` Mediator task must wait for the expired message, not just for the lock to expire, otherwise the channel will be unsychronized.
-* :feature:`2909` Add explicit flag `--unrecoverable-error-should-crash` to control UnrecoverableError crashing behaviour.
+* :feature:`2909` Add explicit flag ``--unrecoverable-error-should-crash`` to control UnrecoverableError crashing behaviour.
 * :bug:`2894` Raiden will no longer miss confirmation blocks at restart and will emit the block state change only for confirmed blocks.
 * :feature:`2857` Respect the ``--environment-type`` for private chain setup.
 * :feature:`2858` Changed contract address argument names to be consistent with the names of the contracts in the contracts repository.
@@ -249,7 +255,7 @@ Changelog
 * :bug:`2662` Fix wrong deserialization of snapshots in special cases.
 * :bug:`2730` Refuse to send a transfer and ignore it during receiving, if its secret is already registered on-chain.
 * :feature:`2713` Added the protocol version in the Ping message.
-* :feature:`2708` Add `--showconfig` CLI flag which dumps all configuration values that will control Raiden behavior.
+* :feature:`2708` Add ``--showconfig`` CLI flag which dumps all configuration values that will control Raiden behavior.
 * :bug:`2720` A lock expired message must be considered invalid if the block in which the lock expired has not been confirmed.
 
 * :release:`0.12.0 <2018-10-05>`

docs/conf.py

@@ -100,7 +100,7 @@ def setup(app):
 project = "Raiden Network"
 author = "Raiden Project"
 
-version_string = "1.1.0"
+version_string = "1.1.1"
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.

nix/envrc-nix-python

@@ -37,6 +37,8 @@ enable=
     gevent-joinall-raise-error,
     gevent-disable-wait,
     gevent-group-join,
+    gevent-input-forbidden,
+    gevent-sys-stdfds-forbidden,
     import-self,
     inconsistent-return-statements,
     no-member,

nix/leveldb.nix

@@ -35,7 +35,6 @@
     UnknownTokenAddress,
     WithdrawMismatch,
 )
-from raiden.messages.monitoring_service import RequestMonitoring
 from raiden.settings import DEFAULT_RETRY_TIMEOUT
 from raiden.storage.utils import TimestampedEvent
 from raiden.transfer import channel, views
@@ -46,13 +45,7 @@
     EventPaymentSentSuccess,
 )
 from raiden.transfer.mediated_transfer.tasks import InitiatorTask, MediatorTask, TargetTask
-from raiden.transfer.state import (
-    BalanceProofSignedState,
-    ChainState,
-    ChannelState,
-    NettingChannelState,
-    NetworkState,
-)
+from raiden.transfer.state import ChainState, ChannelState, NettingChannelState, NetworkState
 from raiden.transfer.state_change import ActionChannelClose
 from raiden.transfer.views import get_token_network_by_address
 from raiden.utils.formatting import to_checksum_address
@@ -1128,7 +1121,8 @@ def transfer_async(
 
     def get_raiden_events_payment_history_with_timestamps(
         self,
-        token_address: TokenAddress = None,
+        registry_address: TokenNetworkRegistryAddress,
+        token_address: Optional[TokenAddress] = None,
         target_address: Address = None,
         limit: int = None,
         offset: int = None,
@@ -1138,25 +1132,38 @@ def get_raiden_events_payment_history_with_timestamps(
                 "Expected binary address format for token in get_raiden_events_payment_history"
             )
 
+        chain_state = views.state_from_raiden(self.raiden)
+        token_network_address = None
+        if token_address:
+            token_network_address = views.get_token_network_address_by_token_address(
+                chain_state=chain_state,
+                token_network_registry_address=registry_address,
+                token_address=token_address,
+            )
+            if not token_network_address:
+                raise InvalidTokenAddress("Token address does not match a Raiden token network")
+
         if target_address and not is_binary_address(target_address):
             raise InvalidBinaryAddress(
                 "Expected binary address format for "
                 "target_address in get_raiden_events_payment_history"
             )
 
         assert self.raiden.wal, "Raiden service has to be started for the API to be usable."
-        events = self.raiden.wal.storage.get_events_with_timestamps(
+
+        event_types = [
+            "raiden.transfer.events.EventPaymentReceivedSuccess",
+            "raiden.transfer.events.EventPaymentSentFailed",
+            "raiden.transfer.events.EventPaymentSentSuccess",
+        ]
+
+        events = self.raiden.wal.storage.get_raiden_events_payment_history_with_timestamps(
+            event_types=event_types,
             limit=limit,
             offset=offset,
-            filters=[
-                ("_type", "raiden.transfer.events.EventPaymentReceivedSuccess"),
-                ("_type", "raiden.transfer.events.EventPaymentSentFailed"),
-                ("_type", "raiden.transfer.events.EventPaymentSentSuccess"),
-            ],
-            logical_and=False,
+            token_network_address=token_network_address,
+            partner_address=target_address,
         )
-
-        chain_state = views.state_from_raiden(self.raiden)
         events = [
             e
             for e in events
@@ -1167,22 +1174,8 @@ def get_raiden_events_payment_history_with_timestamps(
                 token_address=token_address,
             )
         ]
-
         return events
 
-    def get_raiden_events_payment_history(
-        self,
-        token_address: TokenAddress = None,
-        target_address: Address = None,
-        limit: int = None,
-        offset: int = None,
-    ) -> List[Event]:
-        timestamped_events = self.get_raiden_events_payment_history_with_timestamps(
-            token_address=token_address, target_address=target_address, limit=limit, offset=offset
-        )
-
-        return [event.wrapped_event for event in timestamped_events]
-
     def get_raiden_internal_events_with_timestamps(
         self, limit: int = None, offset: int = None
     ) -> List[TimestampedEvent]:
@@ -1283,30 +1276,6 @@ def get_blockchain_events_channel(
         returned_events.sort(key=lambda evt: evt.get("block_number"), reverse=True)
         return returned_events
 
-    def create_monitoring_request(
-        self, balance_proof: BalanceProofSignedState, reward_amount: TokenAmount
-    ) -> Optional[RequestMonitoring]:
-        """ This method can be used to create a `RequestMonitoring` message.
-        It will contain all data necessary for an external monitoring service to
-        - send an updateNonClosingBalanceProof transaction to the TokenNetwork contract,
-        for the `balance_proof` that we received from a channel partner.
-        - claim the `reward_amount` from the UDC.
-        """
-        # create RequestMonitoring message from the above + `reward_amount`
-
-        msg = "Default monitoring service address should not be None"
-        assert self.raiden.default_msc_address is not None, msg
-
-        monitor_request = RequestMonitoring.from_balance_proof_signed_state(
-            balance_proof=balance_proof,
-            non_closing_participant=self.raiden.address,
-            reward_amount=reward_amount,
-            monitoring_service_contract_address=self.raiden.default_msc_address,
-        )
-        # sign RequestMonitoring and return
-        monitor_request.sign(self.raiden.signer)
-        return monitor_request
-
     def get_pending_transfers(
         self, token_address: TokenAddress = None, partner_address: Address = None
     ) -> List[Dict[str, Any]]: