Next

.circleci/config.yml

@@ -7,7 +7,7 @@ parameters:
 
   e2e_environment_docker_image:
     type: string
-    default: raidennetwork/lightclient-e2e-environment:v1.1.2
+    default: raidennetwork/lightclient-e2e-environment:v1.1.4
 
   working_directory:
     type: string

e2e-environment/Dockerfile

@@ -1,12 +1,13 @@
-ARG RAIDEN_VERSION="v1.2.0"
-ARG CONTRACTS_PACKAGE_VERSION="0.37.1"
+ARG RAIDEN_VERSION="v2.0.0"
+ARG CONTRACTS_PACKAGE_VERSION="0.37.6"
 ARG CONTRACTS_VERSION="0.37.0"
-ARG SERVICES_VERSION="v0.13.1"
-ARG SYNAPSE_VERSION="v1.19.1"
+ARG SERVICES_VERSION="v0.15.4"
+ARG SYNAPSE_VERSION="v1.35.1"
+ARG RAIDEN_SYNAPSE_MODULES="0.1.3"
 ARG OS_NAME="LINUX"
-ARG GETH_VERSION="1.9.23"
-ARG GETH_URL_LINUX="https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.9.23-8c2f2715.tar.gz"
-ARG GETH_MD5_LINUX="4817ce02025ba3f876f7055e1e456555"
+ARG GETH_VERSION="1.10.3"
+ARG GETH_URL_LINUX="https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.10.3-991384a7.tar.gz"
+ARG GETH_MD5_LINUX="c601f6a651e23878229dd4a39fa2e6e4"
 
 FROM python:3.9 as raiden-builder
 ARG RAIDEN_VERSION
@@ -21,13 +22,27 @@ RUN git checkout ${RAIDEN_VERSION}
 RUN make install
 
 FROM python:3.9 as synapse-builder
+
+RUN python -m venv /synapse-venv && /synapse-venv/bin/pip install wheel
+
 ARG SYNAPSE_VERSION
+ARG RAIDEN_SYNAPSE_MODULES
+
+RUN /synapse-venv/bin/pip install \
+    "matrix-synapse[postgres,redis]==${SYNAPSE_VERSION}" \
+    psycopg2 \
+    coincurve \
+    pycryptodome \
+    "twisted>=20.3.0" \
+    click==7.1.2 \
+    docker-py \
+    raiden-synapse-modules==${RAIDEN_SYNAPSE_MODULES}
 
-RUN python -m venv /synapse-venv \
-    && /synapse-venv/bin/pip install "matrix-synapse==${SYNAPSE_VERSION}" \
-    && /synapse-venv/bin/pip install psycopg2 coincurve pycryptodome
+# XXX Temporary hot-patch while https://github.com/matrix-org/synapse/pull/9820 is not released yet -- note: this should
+# be run in  in workerless setup
+RUN sed -i 's/\(\s*\)if self.worker_type/\1if True or self.worker_type/' /synapse-venv/lib/python3.9/site-packages/raiden_synapse_modules/pfs_presence_router.py
 
-COPY synapse/auth/ /synapse-venv/lib/python3.7/site-packages/
+COPY synapse/auth/ /synapse-venv/lib/python3.9/site-packages/
 
 FROM python:3.9
 LABEL maintainer="Raiden Network Team <[email protected]>"
@@ -67,7 +82,7 @@ ARG LOCAL_BASE=/usr/local
 ARG DATA_DIR=/opt/chain
 
 RUN download_geth.sh && deploy.sh \
-    && cp -R /opt/deployment/* ${VENV}/lib/python3.7/site-packages/raiden_contracts/data_${CONTRACTS_VERSION}/
+    && cp -R /opt/deployment/* ${VENV}/lib/python3.9/site-packages/raiden_contracts/data_${CONTRACTS_VERSION}/
 
 RUN mkdir -p /opt/synapse/config \
     && mkdir -p /opt/synapse/data_well_known \
@@ -88,11 +103,13 @@ RUN git checkout "${SERVICES_VERSION}"
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends python3-dev \
+    # FIXME: why use the system 3.7 here?
     && /usr/bin/python3 -m virtualenv -p /usr/bin/python3 /opt/services/venv \
+    && /opt/services/venv/bin/pip install -U pip wheel \
     && /opt/services/venv/bin/pip install -r requirements.txt \
     && /opt/services/venv/bin/pip install -e . \
-    && mkdir -p /opt/services/keystore \
-    && cp -R /opt/raiden/lib/python3.7/site-packages/raiden_contracts/data_${CONTRACTS_VERSION}/* /opt/services/venv/lib/python3.7/site-packages/raiden_contracts/data \
+    && mkdir -p /opt/services/keystore
+RUN cp -R ${VENV}/lib/python3.9/site-packages/raiden_contracts/data_${CONTRACTS_VERSION}/* /opt/services/venv/lib/python3.7/site-packages/raiden_contracts/data \
     && rm -rf ~/.cache/pip \
     && apt-get -y remove python3-dev \
     && apt-get -y autoremove \
@@ -104,10 +121,28 @@ ENV DEPLOYMENT_SERVICES_INFO=/opt/deployment/deployment_services_private_net.jso
 
 COPY services/keystore/UTC--2020-03-11T15-39-16.935381228Z--2b5e1928c25c5a326dbb61fc9713876dd2904e34 /opt/services/keystore
 
+ENV ETH_RPC="http://localhost:8545"
+
 RUN setup_channels.sh
-#                                                           HTTP, HTTP metrics, TCP replication, HTTP replication
-# GETH                               | RAIDEN  |SUP |PFS | Matrix
-EXPOSE 8545 8546 8547 30303 30303/udp 5001 5002 9001 5555 80 9101 9092 9093
+
+## GETH
+EXPOSE 8545 8546 8547 30303 30303/udp
+## PFS
+EXPOSE 5555
+## RAIDEN
+# HTTP
+EXPOSE 5001 5002
+## MATRIX
+# HTTP
+EXPOSE 8008 80
+# HTTP metrics
+EXPOSE 9101
+# TCP replication
+EXPOSE 9092
+# HTTP replication
+EXPOSE 9093
+## ???
+EXPOSE 9001
 
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 

e2e-environment/README.md

@@ -25,9 +25,10 @@ docker pull raidennetwork/lightclient-e2e-environment
 ```
 
 Alternatively it can be built locally as well. This requires to use the
-according script for the maintaince of the deployment information files. These
+according script for the maintenance of the deployment information files. These
 will be automatically staged to the VCS after the script has run and need to be
-commited afterwards.
+committed afterwards.
+
 ```sh
 bash ./build-e2e-environment.sh
 ```
@@ -170,7 +171,6 @@ The configuration has been slightly modified over the original `RSB`
 configuration to fit the purposes of the integration image. When merging changes
 from upstream please evaluate if these changes are required or not.
 
-- `setup/room_ensurer.py` is based on [room_ensurer.py](https://github.com/raiden-network/raiden-service-bundle/blob/master/build/room_ensurer/room_ensurer.py)
 - `synapse/auth/admin_user_auth_provider.py` is based on [admin_user_auth_provider.py](https://github.com/raiden-network/raiden-service-bundle/blob/master/build/synapse/admin_user_auth_provider.py)
 - `synapse/auth/eth_auth_provider.py` is based on [eth_auth_provider.py](https://github.com/raiden-network/raiden-service-bundle/blob/master/build/synapse/eth_auth_provider.py)
 - `synapse/exec/synapse-entrypoint.sh` is based on [synapse-entrypoint.sh](https://github.com/raiden-network/raiden-service-bundle/blob/master/build/synapse/synapse-entrypoint.sh)
@@ -185,3 +185,25 @@ file. Watch-out for the `SYNAPSE_VERSION` constant variable. Then update the
 ```dockerfile
 ARG SYNAPSE_VERSION=1.10.1
 ```
+
+## Upgrade image version for tests and CI
+
+To upgrade the end-to-end environment you need to build and upload a new image.
+First update any component as described above.
+
+Then build and test those versions locally. Finally you need to increment
+`DOCKER_IMAGE_TAG` in `shared-script.sh` and build the new image version:
+
+```sh
+./build-e2e-environment.sh
+```
+
+This will also tag the image. You can then upload it to docker hub:
+
+```
+docker push raidennetwork/lightclient-e2e-environment:v1.1.4
+```
+
+Once this is done, don't forget to update the image version used in CI. In
+`.circleci/config.yml` update `e2e_environment_docker_image` to the version you
+just created.

e2e-environment/deployment_information/deployment_private_net.json

@@ -3,19 +3,19 @@
   "chain_id": 4321,
   "contracts": {
     "SecretRegistry": {
-      "address": "0x6D214Ac1068e70bfc0B7C8FD695D885DD29a2f1f",
-      "transaction_hash": "0xa9c0eab62235069586feb8479c169222361acf116ccefe288ecdc1d4da311ce1",
+      "address": "0x970514b8403ae51fd278Cd6bdDB65030B0D6E0c4",
+      "transaction_hash": "0x6f321e34860ab1bba642463e45bf99edb1014e1705ef45b8c6bd90b6156bc967",
       "block_number": 4,
       "gas_cost": 292942,
       "constructor_arguments": []
     },
     "TokenNetworkRegistry": {
-      "address": "0x7439D10dd5EfB111c2434C190C23934baf6101be",
-      "transaction_hash": "0xb28ca185ec39f2bc1be824d22f80c61b188981a07dbcf6e9930dd03c649aa80d",
+      "address": "0x0b5b27dB8F19F5a2E4cebCe21BAD26DAd7021d3f",
+      "transaction_hash": "0x29e4ab150530586192a465edf5ee44551108375e492d8944fd4abf213b53ac5f",
       "block_number": 14,
       "gas_cost": 4907586,
       "constructor_arguments": [
-        "0x6D214Ac1068e70bfc0B7C8FD695D885DD29a2f1f",
+        "0x970514b8403ae51fd278Cd6bdDB65030B0D6E0c4",
         4321,
         20,
         555428,

e2e-environment/deployment_information/deployment_services_private_net.json

@@ -3,13 +3,13 @@
   "chain_id": 4321,
   "contracts": {
     "ServiceRegistry": {
-      "address": "0x2bC1401E8995d7F6a6eA289226E6DD59451cc632",
-      "transaction_hash": "0xd2d50a6ba84f20eebfb8d962a6f146b22037c52baf35193007a7f23e8ac24461",
-      "block_number": 57,
+      "address": "0x1BDA6f48607297E2E361Ec9ed714DABFa3D2566c",
+      "transaction_hash": "0x9016279be30fe4d8349515cea39cb24288919a0bb3af183f5343c7fae860581a",
+      "block_number": 56,
       "gas_cost": 2496148,
       "constructor_arguments": [
-        "0xb8f14F655A867D738bB1F9F3A829C87437E3c157",
-        "0x78b601c1464d6e8B1b7ae030ba9771dC18E13a5c",
+        "0xD68bA462913F1c4397bb9562326eA2D5DE042514",
+        "0xcAe3348675485be8885cdf8Db0072de3503f8cbA",
         2000000000000000000000,
         6,
         5,
@@ -19,36 +19,36 @@
       ]
     },
     "UserDeposit": {
-      "address": "0xCeC4467491Eb80DA00bfb3cA1A0b5A72808CBE99",
-      "transaction_hash": "0x5b6b23dc49fb35a31f8efb633abc2c2428d2af23f3d65d7a458a37c4fc804c13",
-      "block_number": 67,
+      "address": "0x8129F1294058086171F945196fE0A4E07593f522",
+      "transaction_hash": "0x302423bcf6ef7e228f3470e74d7d8929e942555091d41c9a4ead3a91bd825f45",
+      "block_number": 66,
       "gas_cost": 1874250,
       "constructor_arguments": [
-        "0xb8f14F655A867D738bB1F9F3A829C87437E3c157",
+        "0xD68bA462913F1c4397bb9562326eA2D5DE042514",
         115792089237316195423570985008687907853269984665640564039457584007913129639935
       ]
     },
     "MonitoringService": {
-      "address": "0x2045951D64A323B19C284D1C9782be29A29257A9",
-      "transaction_hash": "0xc7b7669ec409c244fb0bf1554922dc7901d3feb284af69ffa8757dcb81694a7b",
-      "block_number": 77,
-      "gas_cost": 2415017,
+      "address": "0x0F8ad70f3DEe8118a6E2cA71321c312E7C3dc3ee",
+      "transaction_hash": "0x53050f3fdac4b9ff4d7b47c0d4fe1ab8f9d718a9df4c3c343a93de5edc2303e0",
+      "block_number": 76,
+      "gas_cost": 2415081,
       "constructor_arguments": [
-        "0xb8f14F655A867D738bB1F9F3A829C87437E3c157",
-        "0x2bC1401E8995d7F6a6eA289226E6DD59451cc632",
-        "0xCeC4467491Eb80DA00bfb3cA1A0b5A72808CBE99",
-        "0x7439D10dd5EfB111c2434C190C23934baf6101be"
+        "0xD68bA462913F1c4397bb9562326eA2D5DE042514",
+        "0x1BDA6f48607297E2E361Ec9ed714DABFa3D2566c",
+        "0x8129F1294058086171F945196fE0A4E07593f522",
+        "0x0b5b27dB8F19F5a2E4cebCe21BAD26DAd7021d3f"
       ]
     },
     "OneToN": {
-      "address": "0x20E39a07624623f64a60825b2282Bf1069D04A45",
-      "transaction_hash": "0x22a8f8448ebb9343eb8e98cfb12555531dcdabcbcf115cdca9ac8a297c52d14e",
-      "block_number": 87,
-      "gas_cost": 1326177,
+      "address": "0xfd5500337063D12236bB6cc9330D32b210c1e5FD",
+      "transaction_hash": "0x9f368f62adf7ade9fd8b60901a6e82b47a83645a426c7a735c4f2a1f2008ef93",
+      "block_number": 86,
+      "gas_cost": 1326241,
       "constructor_arguments": [
-        "0xCeC4467491Eb80DA00bfb3cA1A0b5A72808CBE99",
+        "0x8129F1294058086171F945196fE0A4E07593f522",
         4321,
-        "0x2bC1401E8995d7F6a6eA289226E6DD59451cc632"
+        "0x1BDA6f48607297E2E361Ec9ed714DABFa3D2566c"
       ]
     }
   }

e2e-environment/deployment_information/smartcontracts.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
-export TTT_TOKEN_ADDRESS=0x0a5A3BEc2Fd467872740fd587A49f8EeBd6DF39e
-export SVT_TOKEN_ADDRESS=0xb8f14F655A867D738bB1F9F3A829C87437E3c157
-export USER_DEPOSIT_ADDRESS=0xCeC4467491Eb80DA00bfb3cA1A0b5A72808CBE99
-export TOKEN_NETWORK_REGISTRY_ADDRESS=0x7439D10dd5EfB111c2434C190C23934baf6101be
-export TOKEN_NETWORK_REGISTRY_ADDRESS=0x7439D10dd5EfB111c2434C190C23934baf6101be
-export ONE_TO_N_ADDRESS=0x20E39a07624623f64a60825b2282Bf1069D04A45
+export TTT_TOKEN_ADDRESS=0xe814154d412F0D708090873B198E0c9d6764D42f
+export SVT_TOKEN_ADDRESS=0xD68bA462913F1c4397bb9562326eA2D5DE042514
+export USER_DEPOSIT_ADDRESS=0x8129F1294058086171F945196fE0A4E07593f522
+export TOKEN_NETWORK_REGISTRY_ADDRESS=0x0b5b27dB8F19F5a2E4cebCe21BAD26DAd7021d3f
+export SERVICE_REGISTRY=0x1BDA6f48607297E2E361Ec9ed714DABFa3D2566c
+export ONE_TO_N_ADDRESS=0xfd5500337063D12236bB6cc9330D32b210c1e5FD

e2e-environment/deployment_information/version

@@ -1 +1 @@
-v1.1.2
+v1.1.4

e2e-environment/geth/deploy.sh

@@ -6,6 +6,7 @@ echo "Setting up private chain"
 VENV=/tmp/deploy_venv
 python3 -m venv $VENV
 source $VENV/bin/activate
+pip install -U pip wheel
 pip install mypy_extensions
 pip install click>=7.0
 pip install raiden-contracts==${CONTRACTS_PACKAGE_VERSION}
@@ -21,16 +22,15 @@ echo "${ACCOUNT}" > "${DEPLOYMENT_DIRECTORY}"/miner.sh
 genesis.py --validator "${ACCOUNT}" --output /tmp/genesis.json
 geth --datadir "${DATA_DIR}" init /tmp/genesis.json
 
-geth --rpc --syncmode full \
+geth --syncmode full \
   --gcmode archive \
   --datadir "${DATA_DIR}" \
   --networkid 4321 \
   --nodiscover \
-  --rpc \
-  --rpcapi "eth,net,web3,txpool" \
-  --minerthreads=1 \
+  --http \
+  --http.api "eth,net,web3,txpool" \
+  --miner.threads 1 \
   --mine \
-  --nousb \
   --unlock "${ACCOUNT}" \
   --password "${PASSWORD_FILE}" \
   --allow-insecure-unlock &
@@ -43,8 +43,8 @@ deploy_contracts.py --contract-version "${CONTRACTS_VERSION}" \
   --password "${PASSWORD}"
 
 if [[ -f ${SMARTCONTRACTS_ENV_FILE} ]]; then
-  cp ${VENV}/lib/python3.7/site-packages/raiden_contracts/data_${CONTRACTS_VERSION}/deployment_private_net.json /opt/deployment/
-  cp ${VENV}/lib/python3.7/site-packages/raiden_contracts/data_${CONTRACTS_VERSION}/deployment_services_private_net.json /opt/deployment/
+  cp ${VENV}/lib/python3.9/site-packages/raiden_contracts/data_${CONTRACTS_VERSION}/deployment_private_net.json /opt/deployment/
+  cp ${VENV}/lib/python3.9/site-packages/raiden_contracts/data_${CONTRACTS_VERSION}/deployment_services_private_net.json /opt/deployment/
 
   if [[ ! -f /opt/deployment/deployment_private_net.json ]]; then
     echo 'Could not find the deployment_private_net.json'
@@ -68,7 +68,3 @@ else
   kill -s TERM ${GETH_PID}
   exit 1
 fi
-
-
-
-

e2e-environment/geth/deploy_contracts.py

@@ -5,7 +5,7 @@
 import click
 from eth_account import Account
 from raiden_contracts.constants import CONTRACT_TOKEN_NETWORK_REGISTRY, CONTRACT_USER_DEPOSIT, \
-    CONTRACT_ONE_TO_N
+    CONTRACT_ONE_TO_N, CONTRACT_SERVICE_REGISTRY
 from raiden_contracts.deploy.__main__ import (
     ContractDeployer,
 )
@@ -142,7 +142,8 @@ def main(keystore_file: str, contract_version: str, password: str, output: str,
             decay_constant=SERVICE_DEPOSIT_DECAY_CONSTANT,
             min_price=SERVICE_DEPOSIT_MIN_PRICE,
             registration_duration=SERVICE_REGISTRATION_DURATION,
-            token_network_registry_address=token_network_registry_address
+            token_network_registry_address=token_network_registry_address,
+            reuse_service_registry_from_deploy_file=None,
         )
     except Exception as err:
         print(f'Service contract deployment failed: {err}')
@@ -169,12 +170,14 @@ def main(keystore_file: str, contract_version: str, password: str, output: str,
             contracts_info = deployed_service_contracts_info['contracts']
             user_deposit_address = contracts_info[CONTRACT_USER_DEPOSIT]['address']
             one_to_n_address = contracts_info[CONTRACT_ONE_TO_N]['address']
+            service_registry_address = contracts_info[CONTRACT_SERVICE_REGISTRY]['address']
+
             address_file.write(f'#!/bin/sh\n')
             address_file.write(f'export TTT_TOKEN_ADDRESS={ttt_token_address}\n')
             address_file.write(f'export SVT_TOKEN_ADDRESS={svt_token_address}\n')
             address_file.write(f'export USER_DEPOSIT_ADDRESS={user_deposit_address}\n')
             address_file.write(f'export TOKEN_NETWORK_REGISTRY_ADDRESS={token_network_registry_address}\n')
-            address_file.write(f'export TOKEN_NETWORK_REGISTRY_ADDRESS={token_network_registry_address}\n')
+            address_file.write(f'export SERVICE_REGISTRY={service_registry_address}\n')
             address_file.write(f'export ONE_TO_N_ADDRESS={one_to_n_address}\n')
             address_file.close()
     except Exception as err:

e2e-environment/geth/genesis.py

@@ -43,7 +43,8 @@ def main(validator: str, output: str):
         "0x517aAD51D0e9BbeF3c64803F86b3B9136641D9ec",
         "0x14791697260E4c9A71f18484C9f997B308e59325",
         "0x4C42F75ceae7b0CfA9588B940553EB7008546C29",
-        "0x9fe3a28D581c2e9d7b3632EfDdfc76022E9FA7Ea"
+        "0x9fe3a28D581c2e9d7b3632EfDdfc76022E9FA7Ea",
+        "0x2b5e1928c25c5a326dbb61fc9713876dd2904e34"
     ]
 
     GENESIS_STUB['config']['clique']['validators'].append(validator)

e2e-environment/raiden/node1.toml

@@ -19,6 +19,7 @@ routing-mode = "pfs"
 pathfinding-service-address = "http://localhost:5555"
 # Misc
 address = "0x517aAD51D0e9BbeF3c64803F86b3B9136641D9ec"
+blockchain-query-interval = 1.0
 
 log-json = true
 

e2e-environment/raiden/node2.toml

@@ -19,6 +19,7 @@ routing-mode = "pfs"
 pathfinding-service-address = "http://localhost:5555"
 # Misc
 address = "0xCBC49ec22c93DB69c78348C90cd03A323267db86"
+blockchain-query-interval = 1.0
 
 log-json = true