Merge pull request #1 from avolabs-io/wyn1

General housekeeping changes and closes avolabs-io#41
wynstrol · May 3, 2021 · 1bc942a · 1bc942a
2 parents 4f9b700 + 343e448
commit 1bc942a
Show file tree

Hide file tree

Showing 8 changed files with 426 additions and 85 deletions.
diff --git a/backend/.example.env b/backend/.example.env
@@ -10,7 +10,8 @@ ACTIONS_PORT=9898
 ACTIONS_PORT_EXTERNAL=9898
 ACTIONS_START_COMMAND=yarn watch
 
-ETH_RPC_ENDPIONT="https://rpc.goerli.mudit.blog/"
+ETH_RPC_ENDPIONT="https://rpc.goerli.mudit.blog"
+
 NODE1_ETH_ADDRESS=<put-your-eth-node-address-here>
 NODE2_ETH_ADDRESS=<put-your-eth-node-address-here>
 NODE3_ETH_ADDRESS=<put-your-eth-node-address-here>

diff --git a/backend/docker-compose.yaml b/backend/docker-compose.yaml
@@ -115,7 +115,7 @@ services:
     image: ${RAIDEN_NODE_VERSION:-raidennetwork/raiden:v1.2.0}
     container_name: raiden1
     restart: unless-stopped
-    command: --address "${NODE1_ETH_ADDRESS}" --keystore-path /raiden/keystore --password-file /raiden/password.txt --eth-rpc-endpoint "${ETH_RPC_ENDPIONT}" --network-id goerli --environment-type development --api-address "0.0.0.0:5001" --pathfinding-service-address "https://pfs.demo001.env.raiden.network" --matrix-server "https://transport.transport01.raiden.network" --accept-disclaimer
+    command: --address "${NODE1_ETH_ADDRESS}" --keystore-path /raiden/keystore --password-file /raiden/password.txt --eth-rpc-endpoint "${ETH_RPC_ENDPIONT}" --network-id goerli --environment-type development --api-address "0.0.0.0:5001" --pathfinding-service-address "https://pfs.demo001.env.raiden.network" --matrix-server "https://transport.demo001.env.raiden.network" --accept-disclaimer
     ports:
       - "5001:5001"
     volumes:
@@ -128,7 +128,7 @@ services:
     image: ${RAIDEN_NODE_VERSION:-raidennetwork/raiden:v1.2.0}
     container_name: raiden2
     restart: unless-stopped
-    command: --address "${NODE2_ETH_ADDRESS}" --keystore-path /raiden/keystore --password-file /raiden/password.txt --eth-rpc-endpoint "${ETH_RPC_ENDPIONT}" --network-id goerli --environment-type development --api-address "0.0.0.0:5001" --pathfinding-service-address "https://pfs.demo001.env.raiden.network" --matrix-server "https://transport.transport01.raiden.network" --accept-disclaimer
+    command: --address "${NODE2_ETH_ADDRESS}" --keystore-path /raiden/keystore --password-file /raiden/password.txt --eth-rpc-endpoint "${ETH_RPC_ENDPIONT}" --network-id goerli --environment-type development --api-address "0.0.0.0:5001" --pathfinding-service-address "https://pfs.demo001.env.raiden.network" --matrix-server "https://transport.demo001.env.raiden.network" --accept-disclaimer
     ports:
       - "5002:5001"
     volumes:

diff --git a/backend/hasura-actions/src/Scheduler.bs.js b/backend/hasura-actions/src/Scheduler.bs.js
diff --git a/backend/hasura-actions/src/Scheduler.res b/backend/hasura-actions/src/Scheduler.res
@@ -147,15 +147,13 @@ let startProcess = () => {
                     let paymentState = payment.paymentState
                     //let paymentAmount = payment.paymentAmount
                     //let paymentTimestamp = payment.paymentTimestamp
-                    if paymentState == #COMPLETE {
+                    switch paymentState {
+                    | #COMPLETE =>
                       Js.log("last payment is COMPLETE")
                       let _ = makePayment(~recipientAddress=recipient, ~paymentData)
-                    }
-                    if paymentState == #PENDING {
-                      Js.log("last payment is PENDING")
-                    }
-                    if paymentState == #ERROR {
-                      Js.log("last payment is ERROR")
+                    | #PENDING => Js.log("last payment is PENDING")
+                    | #ERROR => Js.log("last payment is ERROR")
+                    | _ => Js.log("future value added")
                     }
                   })
                 | Error(error) => Js.log2("error last payment: ", error)

diff --git a/dApp/user/package.json b/dApp/user/package.json
@@ -28,7 +28,7 @@
     "ethers": "^5.0.26",
     "moment": "^2.29.1",
     "pouchdb-adapter-memory": "^7.2.2",
-    "raiden-ts": "^0.15.0",
+    "raiden-ts": "^0.16.0",
     "re-formality": "4.0.0-beta.7",
     "react": "^17.0.0",
     "react-dom": "^17.0.0",