Compare revisions

Josh Brooks · Josh Brooks · Josh Brooks · Josh Brooks · Josh Brooks · Jono Wenger
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ bin/*
 blob*
 junk*
 *.wasm
+tmp

 # Vim swap files
 *.swp

--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -151,6 +151,62 @@ fileTransfer:
      - fileTransfer/
      - bin/

+connect:
+  stage: tests
+  image: $DOCKER_IMAGE
+  script:
+    - mkdir -p ~/.elixxir
+    - echo $PWD
+    - cd connect #modify with your package name
+    - cp ../network/network.sh network.sh
+    - rm -fr results
+    - ./run.sh
+    - if [ -f network.sh ]; then   rm network.sh; fi
+    - cd ..
+  artifacts:
+    when: always
+    expire_in: '1 day'
+    paths:
+      - connect/ #modify with your package name
+      - bin/
+
+broadcast:
+  stage: tests
+  image: $DOCKER_IMAGE
+  script:
+    - mkdir -p ~/.elixxir
+    - echo $PWD
+    - cd broadcast #modify with your package name
+    - cp ../network/network.sh network.sh
+    - rm -fr results
+    - ./run.sh
+    - if [ -f network.sh ]; then   rm network.sh; fi
+    - cd ..
+  artifacts:
+    when: always
+    expire_in: '1 day'
+    paths:
+      - broadcast/ #modify with your package name
+      - bin/
+
+singleUse:
+  stage: tests
+  image: $DOCKER_IMAGE
+  script:
+    - mkdir -p ~/.elixxir
+    - echo $PWD
+    - cd singleUse #modify with your package name
+    - cp ../network/network.sh network.sh
+    - rm -fr results
+    - ./run.sh
+    - if [ -f network.sh ]; then   rm network.sh; fi
+    - cd ..
+  artifacts:
+    when: always
+    expire_in: '1 day'
+    paths:
+      - singleUse/ #modify with your package name
+      - bin/

 ephemeralRegistration:
  stage: tests

--- a/basice2e/-
+++ b/basice2e/-
-<xxc(2)AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADrgZ7Ugdw/BAr6ase6CPp9wwWT/OMFBjuzZ4jQtM48iVNmDk9kXPjUUJHT/o9ujZi/OKzrG52YTUdbCxLOTq3NVtQQ7EgQgkt9xa4poqAskuY+FsQqVlJ8ihzeDvoM/yUzieXQUaq7c0mokIiNOWAxQIbA+IU15fI4Y6RIM8i4rsRTRaRMHsCAvQrp3S753rvIhWghYKoh62clV4xV/2UXbZbF7exNctTOlrmvZN8EN/68S4UuTGq/I/DxyZ3IRbKbrkl9Q2vNsPu/tGQz8CfJJrRMAKdl397qr4KTi5lcYQkhPHrL2egawa9hw3mFaYln7yKTVj3tWJBCO5x/QS/+YMr0Vio8Nmnik6XhcuQg68zTP4hy9BEgG4sgtKl81FMTc5jhBhbPFI9dKqEl731Qu/cSZ+VUjjbhRTqFDzktSx0rCi+NOUUHHaVCPzvYV41ErOT3PYUmV0lCkLE/5e+x9m4vjMYZA/mgPiOiJsT4rOJM0pCxRyHSTA4brsi7bggQU+LP4yj9hO6VMDznmqgYU2nMJtgfsGsUAAAAgA7+mFy5/ffrhps9NQZs6HY+g==xxc>
\ No newline at end of file
+<xxc(2)AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADrgZ7Ugdw/BAr6aVzSIM900EqY40/W5o3YY6wA0nxEnY24HWzbZb2dJZzBKjFpByuwIrb3lCZjB7YYO5dby5dVfTO3v2zz39gYQgevQE+l7ldt1Zs+WRF+Aj8u62ne0ueiH+3LON4GKg7zexrn85M0xvUoLuhmcmlwMWkhKNFHFINj6YinnQtVW0yA/B749mjacXwFnNB/mfy87Q/sRxGTvTELegB8u4whqJe3TuTicNnclSyWtDBZs7v1THRlw+sMNVR6jf4Kz/8UPUCEWRReIrn8wGqwLragnxCN2QYmvGhY55gfdvJaPLULG38I5FKeHVALI4YFmJJmIMv+uVBY9ftYV/lX+hUrchazXeZ+MP1RSINKQkLyBhEStyHevxEpfWNltkb0fX+x+HLz1376VsOIHPVYNpXZcAsOz7B6yy0NYJudGjJfke63BbGi+ZIKdOVc4NDH0HRJnOeNlmKuy67WziPL0J2IxmNJaU2eoPjeL+64mhSnE5DulwwVpCruNJ8Wee82WJFYcr24WG/nGT/0AfKohk1+gAAAgA7UzPW3Wfs4l75kY4xsCao1A==xxc>
\ No newline at end of file
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -37,12 +37,10 @@ CLIENTOPTS="--password hello --ndf results/ndf.json --verify-sends --sendDelay 1
 CLIENTEPHREGOPTS="--password hello --ndf results/ndf.json --verify-sends --sendDelay 100 --waitTimeout 360 -v $DEBUGLEVEL --disableNodeRegistration --enableEphemeralRegistration"
 CLIENTDMOPTS="--password hello --ndf results/ndf.json --waitTimeout 360 -v $DEBUGLEVEL"
 CLIENTUDOPTS="--password hello --ndf results/ndf.json -v $DEBUGLEVEL"
-CLIENTSINGLEOPTS="--password hello --waitTimeout 360 --ndf results/ndf.json -v $DEBUGLEVEL"
 CLIENTGROUPOPTS="--password hello --waitTimeout 600 --ndf results/ndf.json -v $DEBUGLEVEL"
 CLIENTFILETRANSFEROPTS="--password hello --waitTimeout 600 --ndf results/ndf.json -v $DEBUGLEVEL"
 CLIENTREKEYOPTS="--password hello --ndf results/ndf.json --verify-sends --waitTimeout 600 -v $DEBUGLEVEL"
 CLIENTBACKUPOPTS="--password hello --ndf results/ndf.json -v $DEBUGLEVEL"
-CONNECTIONOPTS="--password hello --waitTimeout 360 --ndf results/ndf.json -v $DEBUGLEVEL"

 mkdir -p $SERVERLOGS
 mkdir -p $GATEWAYLOGS
@@ -754,35 +752,6 @@ echo "$CLIENTCMD -- $PIDVAL"
 wait $PIDVAL
 wait $PIDVAL2

-###############################################################################
-# Test  Single Use
-###############################################################################
-
-# Single-use test: client53 sends message to client52; client52 responds with
-# the same message in the set number of message parts
-echo "TESTING SINGLE-USE"
-
-# Generate contact file for client52
-CLIENTCMD="../bin/client init -s blob52 -l $CLIENTOUT/client52.log --password hello --ndf results/ndf.json --writeContact $CLIENTOUT/jono52-contact.bin"
-eval $CLIENTCMD >> /dev/null 2>&1 &
-PIDVAL=$!
-echo "$CLIENTCMD -- $PIDVAL"
-wait $PIDVAL
-
-# Start client53, which sends a message and then waits for a response
-CLIENTCMD="timeout 240s ../bin/client single $CLIENTSINGLEOPTS -l $CLIENTOUT/client53.log -s blob53 --maxMessages 8 --message \"Test single-use message\" --send -c $CLIENTOUT/jono52-contact.bin --timeout 90s"
-eval $CLIENTCMD >> $CLIENTOUT/client53.txt 2>&1 &
-PIDVAL2=$!
-echo "$CLIENTCMD -- $PIDVAL2"
-
-# Start client52, which waits for a message and then responds
-CLIENTCMD="timeout 240s ../bin/client single $CLIENTSINGLEOPTS -l $CLIENTOUT/client52.log -s blob52 --reply --timeout 90s"
-eval $CLIENTCMD >> $CLIENTOUT/client52.txt 2>&1 &
-PIDVAL1=$!
-echo "$CLIENTCMD -- $PIDVAL1"
-wait $PIDVAL1
-wait $PIDVAL2
-
 ###############################################################################
 # Test  User Discovery
 ###############################################################################
@@ -1066,134 +1035,6 @@ wait $PIDVAL3

 echo "GROUP CHAT FINISHED!"

-# echo "TESTING BROADCAST CHANNELS..."
-
-# New broadcast channel...
-CLIENTCMD="timeout 240s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 1800 -l $CLIENTOUT/client130.log -s blob130 --new --channelName \"broadcast_test\" --description \"Integration test channel\" --chanPath results/integration-channel.json --keyPath results/integration-chan-key.pem --receiveCount 0"
-eval $CLIENTCMD >> $CLIENTOUT/client130.txt &
-PIDVAL1=$!
-echo "$CLIENTCMD -- $PIDVAL1"
-wait $PIDVAL1
-
-# Start client to listen for messages on the channel
-CLIENTCMD="timeout 480s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 1800 -l $CLIENTOUT/client131.log -s blob131 --chanPath results/integration-channel.json --receiveCount 4"
-eval $CLIENTCMD >> $CLIENTOUT/client131.txt &
-PIDVAL1=$!
-echo "$CLIENTCMD -- $PIDVAL1"
-
-sleep 10
-
-# Send symmetric broadcast to channel
-CLIENTCMD="timeout 240s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 360 -l $CLIENTOUT/client132.log -s blob132 --chanPath results/integration-channel.json --receiveCount 0 --sendDelay 5000 --symmetric \"Hello to symmetric channel from channel client 122!\""
-eval $CLIENTCMD >> $CLIENTOUT/client132.txt &
-PIDVAL2=$!
-echo "$CLIENTCMD -- $PIDVAL2"
-
-# Send asymmetric broadcast to channel
-CLIENTCMD="timeout 240s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 360 -l $CLIENTOUT/client133.log -s blob133 --chanPath results/integration-channel.json --receiveCount 0 --sendDelay 5000 --keyPath results/integration-chan-key.pem --asymmetric \"Hello to asymmetric channel from channel client 123!\""
-eval $CLIENTCMD >> $CLIENTOUT/client133.txt &
-PIDVAL3=$!
-echo "$CLIENTCMD -- $PIDVAL3"
-
-# Send symmetric & asymmetric broadcasts to channel
-CLIENTCMD="timeout 240s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 360 -l $CLIENTOUT/client134.log -s blob134 --chanPath results/integration-channel.json --receiveCount 0 --sendDelay 5000 --keyPath results/integration-chan-key.pem --asymmetric \"Hello to asymmetric channel from channel client 124!\" --symmetric \"Hello to symmetric channel from channel client 124!\""
-eval $CLIENTCMD >> $CLIENTOUT/client134.txt &
-PIDVAL4=$!
-echo "$CLIENTCMD -- $PIDVAL4"
-
-wait $PIDVAL2
-wait $PIDVAL3
-wait $PIDVAL4
-wait $PIDVAL1
-
-echo "BROADCAST CHANNELS FINISHED..."
-
-###############################################################################
-# Test ephemeral connections
-###############################################################################
-
-echo "TESTING EPEHMERAL CONNECTIONS..."
-# Initiate server
-CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob200 $CONNECTIONOPTS --writeContact $CLIENTOUT/client200-server.bin -l $CLIENTOUT/client200.log --startServer --serverTimeout 1m30s"
-eval $CLIENTCMD > $CLIENTOUT/client200.txt 2>&1 &
-PIDVAL1=$!
-echo "$CLIENTCMD -- $PIDVAL1"
-echo "Sleeping to ensure connection server instantiation"
-sleep 5
-
-# Initiate client and send message to server
-CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob201 --connect $CLIENTOUT/client200-server.bin $CONNECTIONOPTS -l $CLIENTOUT/client201.log  -m \"Hello 200 from 201, using connections\" --receiveCount 0"
-eval $CLIENTCMD > $CLIENTOUT/client201.txt 2>&1 &
-PIDVAL2=$!
-echo "$CLIENTCMD -- $PIDVAL2"
-wait $PIDVAL2
-wait $PIDVAL1
-echo "EPHEMERAL CONNECTION TESTS FINISHED"
-
-###############################################################################
-# Test ephemeral authenticated connections
-###############################################################################
-echo "TESTING EPHEMERAL AUTHENTICATED CONNECTIONS..."
-# Initiate server
-CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob202 --authenticated $CONNECTIONOPTS --writeContact $CLIENTOUT/client202-server.bin -l $CLIENTOUT/client202.log --startServer --serverTimeout 1m30s"
-eval $CLIENTCMD > $CLIENTOUT/client202.txt 2>&1 &
-PIDVAL1=$!
-echo "$CLIENTCMD -- $PIDVAL1"
-echo "Sleeping to ensure connection server instantiation"
-sleep 5
-
-# Initiate client and send message to server
-CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob203 --authenticated --connect $CLIENTOUT/client202-server.bin $CONNECTIONOPTS -l $CLIENTOUT/client203.log  -m \"Hello 202 from 203, using connections\" --receiveCount 0"
-eval $CLIENTCMD > $CLIENTOUT/client203.txt 2>&1 &
-PIDVAL2=$!
-echo "$CLIENTCMD -- $PIDVAL2"
-wait $PIDVAL2
-wait $PIDVAL1
-echo "EPHEMERAL AUTHENTICATED CONNECTION TESTS FINISHED"
-
-###############################################################################
-# Test non-ephemeral authenticated connections
-###############################################################################
-
-echo "TESTING NON-EPHEMERAL CONNECTIONS"
-# Initiate server
-CLIENTCMD="timeout 240s ../bin/client connection -s blob204 $CONNECTIONOPTS --writeContact $CLIENTOUT/client204-server.bin -l $CLIENTOUT/client204.log --startServer --serverTimeout 1m30s"
-eval $CLIENTCMD > $CLIENTOUT/client204.txt 2>&1 &
-PIDVAL1=$!
-echo "$CLIENTCMD -- $PIDVAL1"
-echo "Sleeping to ensure connection server instantiation"
-sleep 5
-
-# Initiate client and send message to server
-CLIENTCMD="timeout 240s ../bin/client connection -s blob205 --connect $CLIENTOUT/client204-server.bin $CONNECTIONOPTS -l $CLIENTOUT/client205.log  -m \"Hello 204 from 205, using connections\" --receiveCount 0"
-eval $CLIENTCMD > $CLIENTOUT/client205.txt 2>&1 &
-PIDVAL2=$!
-echo "$CLIENTCMD -- $PIDVAL2"
-wait $PIDVAL2
-wait $PIDVAL1
-echo "NON-EPHEMERAL CONNECTION TEST FINISHED."
-
-echo "TESTING EPHEMERAL AUTHENTICATED CONNECTIONS..."
-# Initiate server
-CLIENTCMD="timeout 240s ../bin/client connection -s blob206 --authenticated $CONNECTIONOPTS --writeContact $CLIENTOUT/client206-server.bin -l $CLIENTOUT/client206.log --startServer --serverTimeout 1m30s"
-eval $CLIENTCMD > $CLIENTOUT/client206.txt 2>&1 &
-PIDVAL1=$!
-echo "$CLIENTCMD -- $PIDVAL1"
-echo "Sleeping to ensure connection server instantiation"
-sleep 5
-
-# Initiate client and send message to server
-CLIENTCMD="timeout 240s ../bin/client connection -s blob207 --authenticated --connect $CLIENTOUT/client206-server.bin $CONNECTIONOPTS -l $CLIENTOUT/client207.log  -m \"Hello 206 from 207, using connections\" --receiveCount 0"
-eval $CLIENTCMD > $CLIENTOUT/client207.txt 2>&1 &
-PIDVAL2=$!
-echo "$CLIENTCMD -- $PIDVAL2"
-wait $PIDVAL2
-wait $PIDVAL1
-echo "Non-Ephemeral Test Complete."
-
-
-
-

 echo "TESTS EXITED SUCCESSFULLY, CHECKING OUTPUT..."


--- a/broadcast/-
+++ b/broadcast/-
+<xxc(2)iM+XXLWaD+0URs7rIg/VuNqdZMN81u1mdsmg63WIsgEDrgZ7Ugdw/BAr6TRLgP/lKjVRl0Dl+CWyFvZo0SzyA7cbr8juCKGPQbiQGV+HnU75423wf5Tv6Sd8rQH2bz+YE+HQv+3P8G9B+NczUkL4FRRX8Vm3HusBBNdR3dFI+yiOvOCMXrYriGAglVM9kx8XDLJv129Urqief7d2tr3Nn+KyuB070K56+6Hgizu8PxdHI3beEso7c+q50kIB7gynejHLFkpGfkogBe9evTN4MOyGgiL4SMgRtwMH3g/DNnmZQyRh4KkgFB6iCj+BTtrxjJlO/wO6Spci+LmM/9qRBEPcnutGqkmvMFe6IZL7YMZNUw0EnFEYmt1aqRn0Cc/1HC1htxzUhzAyCI4xq/B0B8uBhqumk/yfY6vaacjU7yENsOnGAY8FwYBAS0gMo6LF/6Z5x+j+9CDzQiano6N2cS0Q29aWnHLIBg/d4jGT0OE2SCcit7UhnmHoxEJfscwjHLG4hUwKLhe4aeBd+kf0YXDsLiggQVjkpO+G1poTX3JSKEQR5BmCEyryDwYNApLm7upRqUrBVUPgxQAAAgA7BukWBeqDgVfuMIY+MXzdxw==xxc>
\ No newline at end of file
--- a/broadcast/betanet.txt
+++ b/broadcast/betanet.txt
+188.187.190.53:22840
+135.181.134.215:22840
+90.64.159.233:22840
+63.224.248.74:22840
+78.63.197.35:22840
+95.217.225.220:22840
+167.86.89.25:22840
+134.17.158.63:22840
+77.92.107.203:22840
+136.50.65.29:22840
+176.99.131.128:22840
+109.251.8.131:22840
+85.237.9.101:22840
+195.93.180.119:22840
+193.106.95.173:22840
+193.106.95.227:22840
+168.119.49.161:22840
+193.106.94.75:22840
+176.99.131.188:22840
+180.150.125.93:22840
+135.181.29.63:22840
+116.202.99.94:22840
+94.130.150.94:22840
+93.81.246.111:22840
+183.99.96.180:22101
+62.171.131.155:22840
+159.65.122.44:22840
+45.122.123.134:22840
+157.90.34.21:22840
+107.182.163.106:22840
+52.124.124.210:22840
+170.187.225.94:22840
+95.217.228.117:22840
+88.99.13.205:22840
+52.183.38.229:22840
+77.223.99.126:22840
+37.228.116.99:22840
+167.99.247.6:22840
+5.45.81.112:22840
+193.47.33.51:22840
+5.45.81.110:22840
+69.197.179.42:22840
+69.197.179.162:22840
+94.244.64.115:22840
+109.100.137.105:22840
+86.57.132.29:22840
+178.248.81.38:22840
+213.55.169.27:22840
+212.24.106.228:22840
+195.181.247.171:22840
+82.148.29.76:22840
+81.163.28.252:22840
+80.249.150.70:22840
+79.98.24.202:22840
+62.173.145.42:22840
+77.223.98.157:22840
+193.47.33.132:22840
+82.148.19.245:22840
+31.184.254.81:22840
+195.64.234.210:22840
+195.64.234.98:22840
+78.26.169.79:22840
+62.77.156.70:22840
+77.223.97.164:22840
+193.47.33.50:22840
+62.173.140.126:22840
+93.81.246.64:22840
+149.210.192.112:22840
+77.120.176.213:22840
+188.138.242.248:22840
+178.168.101.47:22840
+37.97.220.128:22840
+69.197.147.18:22840
+81.240.39.28:22840
+141.105.67.92:22840
+213.10.138.128:22840
+217.136.119.184:22840
+85.201.32.4:22840
+92.64.19.232:22840
+89.221.20.22:22840
+62.167.123.100:22800
+161.230.93.70:22840
+76.65.147.14:22840
+86.7.108.18:22840
+109.129.225.57:22840
+194.158.207.84:22840
+116.203.252.237:22840
+217.12.210.152:22840
+45.115.107.124:22840
+178.128.199.183:22840
+93.107.156.53:22840
+82.15.128.246:22840
+70.75.89.186:22840
+109.87.172.237:22840
+80.90.47.210:22840
+90.189.180.24:22840
+46.98.0.118:22840
+85.221.55.10:22840
+191.32.173.237:22840
+80.5.16.132:22840
+173.212.199.13:22840
+120.88.119.219:22840
+135.19.193.9:22840
+134.249.187.129:22840
+188.194.110.16:22840
+195.38.9.10:22840
+46.42.16.25:22840
+31.165.163.210:22840
+89.232.195.123:22840
+77.122.54.99:22840
+85.105.79.102:22840
+163.172.149.150:22840
+5.53.16.225:22840
+178.124.192.61:22840
+167.99.130.234:22840
+95.158.15.24:22840
+195.239.181.117:22840
+104.158.0.184:22840
+62.171.142.152:22840
+77.122.89.98:22840
+200.37.209.49:22840
+181.43.154.26:22840
+185.230.88.227:22840
+91.169.185.175:62840
+217.136.102.221:22840
+149.210.229.230:22840
+176.37.104.235:22840
+37.97.224.62:22840
+94.107.24.186:22840
+151.252.109.180:22840
+195.93.181.189:22840
+195.93.181.192:22840
+149.210.229.210:22840
+77.122.48.168:22840
+185.4.65.20:22840
+37.97.224.55:22840
+178.170.47.131:22840
+37.97.224.32:22840
+178.170.39.140:22840
+135.181.139.234:22840
+78.129.38.119:22840
+78.181.101.251:22840
+68.183.34.147:22840
+5.255.173.96:22840
+195.177.94.31:22840
+37.57.87.184:22840
+37.97.224.19:22840
+209.145.53.106:22840
+176.214.77.176:22840
+143.178.133.206:22840
+85.118.207.56:22840
+88.211.82.66:22840
+185.23.83.59:22840
+93.75.3.51:22840
+176.210.55.44:22840
+83.144.175.13:22840
+78.188.200.189:22840
+174.114.197.104:22840
+188.83.79.190:22840
+66.183.0.247:22840
+5.61.52.49:22840
+149.210.229.197:22840
+82.118.17.160:22841
+31.202.122.239:22840
+46.150.9.16:22840
+205.250.188.151:22840
+149.210.229.175:22840
+77.122.91.193:22840
+31.202.122.152:22840
+151.95.102.130:22840
+91.245.37.80:22840
+199.119.86.179:22840
+93.72.67.70:22840
+195.134.65.165:22840
+103.56.39.162:20090
+178.27.238.236:22840
+149.210.192.41:22840
+103.56.39.183:20090
+5.61.54.13:22840
+78.188.51.20:22840
+93.157.248.142:22840
+31.172.140.126:22840
+95.189.106.118:22840
+86.94.128.12:22840
+5.132.111.41:22840
+109.129.220.59:22840
+84.83.206.46:22840
+136.144.240.106:22840
+89.28.86.208:22840
+89.28.6.19:22840
+5.255.173.43:22840
+77.122.29.37:22840
+136.144.203.178:22840
+136.144.230.186:22840
+136.144.206.186:22840
+61.6.46.179:22840
+31.202.123.194:22840
+135.125.235.32:22840
+103.83.149.90:22840
+66.183.0.246:22840
+185.12.142.45:22840
+46.37.194.90:22840
+78.26.140.125:22840
+89.191.125.159:22840
+31.201.104.137:22840
+77.92.109.45:22840
+108.249.110.153:22840
+196.41.195.118:22840
+101.98.209.195:22840
+77.92.109.43:22840
+188.127.250.195:22840
+76.176.192.12:22840
+91.177.2.56:22840
+82.193.107.60:22840
+86.83.150.15:22840
+134.249.121.177:22840
+46.166.138.219:22840
+75.156.104.27:22840
+109.100.137.83:22840
+174.88.128.201:22840
+178.168.68.129:22840
+66.183.0.245:22840
+62.238.247.127:22840
+65.21.151.29:22841
+207.81.171.109:22840
+155.93.136.90:22840
+190.22.170.63:22840
+136.144.230.185:22840
+102.182.202.19:22840
+70.52.24.55:22841
+195.191.174.168:22840
+88.223.114.249:22840
+46.142.181.156:22840
+174.94.125.212:22840
+184.146.45.46:22840
+136.144.236.167:22840
+174.88.104.199:22840
+88.223.115.74:22840
+178.170.40.34:22840
+91.149.187.22:22840
+178.150.223.30:22840
+195.138.68.0:22840
+77.122.59.150:22840
+91.241.178.180:22840
+95.164.8.35:22840
+188.138.162.9:22840
+77.122.80.204:22840
+46.150.9.21:22840
+46.119.158.146:22840
+5.34.183.246:22842
+65.21.180.158:22840
+188.187.188.47:22840
+62.171.137.40:22840
+178.151.197.49:22840
+213.231.5.100:22840
+194.28.172.72:22840
+76.71.65.212:22840
+76.71.65.96:22840
+185.46.60.30:22840
+185.172.34.211:22840
+87.255.69.231:22840
+91.222.114.19:22840
+162.55.58.184:22840
+91.233.171.9:22840
+82.16.173.238:22840
+77.169.225.166:22840
+87.248.171.27:22840
+81.243.65.75:22840
+207.6.218.81:22840
+207.6.218.110:22840
+188.124.46.130:22840
+159.196.176.42:22840
+143.244.158.201:22840
+185.224.108.251:22840
+80.100.87.204:22840
+185.48.197.184:22840
+95.67.28.111:22840
+171.25.167.187:22840
+176.100.12.243:22840
+185.224.108.82:22840
+217.12.223.90:22852
+185.224.110.37:22840
+195.138.85.182:22840
+176.104.49.11:22840
+176.104.52.215:22840
+88.204.18.134:22840
+217.26.167.45:22840
+185.172.34.212:22840
+87.255.69.232:22840
+5.165.211.128:22840
+136.144.205.104:22840
+178.168.57.176:22840
+87.255.69.238:22840
+194.233.67.188:22840
+88.159.77.30:22840
+195.74.67.235:22840
+174.94.68.31:22840
+91.5.88.185:22841
+179.223.85.90:22840
+139.59.245.228:22840
+199.119.86.185:22840
+105.228.133.62:22840
+139.59.126.219:22840
+91.5.83.238:22842
+95.216.221.129:22840
+158.140.234.119:22840
--- a/broadcast/client-registrar.yaml
+++ b/broadcast/client-registrar.yaml
+# ==================================
+# Client Registrar Configuration
+# ==================================
+
+# Log message level (0 = info, 1 = debug, >1 = trace)
+logLevel: 0
+# Path to log file
+logPath: "results/client-registrar.log"
+
+# Public address, used in NDF it gives to client
+publicAddress: "0.0.0.0:20111"
+# The listening port of this server
+port: 20111
+
+# === REQUIRED FOR ENABLING TLS ===
+# Path to the registration server private key file
+keyPath: "../keys/cmix.rip.key"
+# Path to the registration server certificate file
+certPath: "../keys/cmix.rip.crt"
+
+# Maximum number of connections per period
+userRegCapacity: 1000
+# How often the number of connections is reset
+userRegLeakPeriod: "24h"
+
+# Database connection information
+dbUsername: "cmix"
+dbPassword: ""
+dbName: "cmix_server"
+dbAddress: ""
+
+# List of client codes to be added to the database (for testing)
+clientRegCodes:
+  - "AAAA"
+  - "BBBB"
+  - "CCCC"
--- a/basice2e/clients.goldoutput/client130.txt
+++ b/basice2e/clients.goldoutput/client130.txt
--- a/basice2e/clients.goldoutput/client131.txt
+++ b/basice2e/clients.goldoutput/client131.txt
--- a/basice2e/clients.goldoutput/client132.txt
+++ b/basice2e/clients.goldoutput/client132.txt
--- a/basice2e/clients.goldoutput/client133.txt
+++ b/basice2e/clients.goldoutput/client133.txt
--- a/basice2e/clients.goldoutput/client134.txt
+++ b/basice2e/clients.goldoutput/client134.txt
--- a/broadcast/devnet.txt
+++ b/broadcast/devnet.txt
+34.222.125.145:11420
+35.163.143.85:11420
+34.218.59.127:11420
--- a/broadcast/gateway-1.yaml
+++ b/broadcast/gateway-1.yaml
+# START YAML ===
+################################################################################
+## Copyright © 2018 Privategrity Corporation                                   #
+##                                                                             #
+## All rights reserved.                                                        #
+################################################################################
+
+##
+# Gateway Configuration File
+##
+
+# Used for debugging
+loglevel: 2
+
+# Output log file
+log: "results/gateways/gateway-1.log"
+
+# The public IP address and port of the node associated with this gateway
+cmixAddress:  "0.0.0.0:10110"
+
+# The listening port of this gateway
+Port: 1110
+
+# The public IPv4 address of the Gateway, as reported to the network, to use
+# instead of dynamically looking up Gateway's own IP address. If a port is not
+# included, then the port flag is used instead.
+overridePublicIP: "0.0.0.0"
+
+# Period in which the message cleanup function executes. Recommended period is on the order of a minute.
+messageTimeout: "1800s"
+
+# Path to where the IDF is saved. This is used by the wrapper management script.
+idfPath: "results/gateways/gatewayIDF-0.json"
+
+# === REQUIRED FOR ENABLING TLS ===
+# Path to the private key file
+keyPath: "../keys/cmix.rip.key"
+# Path to the certificate file
+certPath: "../keys/cmix.rip.crt"
+# Path to the permissioning certificate
+schedulingCertPath: "../keys/cmix.rip.crt"
+# Path to the certificate file
+cmixCertPath: "../keys/cmix.rip.crt"
+
+
+devMode: true
+
+minRegisteredNodes: 0
+# === END YAML
--- a/broadcast/gateway-2.yaml
+++ b/broadcast/gateway-2.yaml
+# START YAML ===
+################################################################################
+## Copyright © 2018 Privategrity Corporation                                   #
+##                                                                             #
+## All rights reserved.                                                        #
+################################################################################
+
+##
+# Gateway Configuration File
+##
+
+# Used for debugging
+loglevel: 2
+
+# Output log file
+log: "results/gateways/gateway-2.log"
+
+# The public IP address and port of the node associated with this gateway
+cmixAddress:  "0.0.0.0:10111"
+
+# The listening port of this gateway
+Port: 1111
+
+# The public IPv4 address of the Gateway, as reported to the network, to use
+# instead of dynamically looking up Gateway's own IP address. If a port is not
+# included, then the port flag is used instead.
+overridePublicIP: "0.0.0.0"
+
+# Period in which the message cleanup function executes. Recommended period is on the order of a minute.
+messageTimeout: "1800s"
+
+# Path to where the IDF is saved. This is used by the wrapper management script.
+idfPath: "results/gateways/gatewayIDF-1.json"
+
+# === REQUIRED FOR ENABLING TLS ===
+# Path to the private key file
+keyPath: "../keys/cmix.rip.key"
+# Path to the certificate file
+certPath: "../keys/cmix.rip.crt"
+# Path to the permissioning certificate
+schedulingCertPath: "../keys/cmix.rip.crt"
+# Path to the certificate file
+cmixCertPath: "../keys/cmix.rip.crt"
+
+
+devMode: true
+
+minRegisteredNodes: 0
+# === END YAML
--- a/broadcast/gateway-3.yaml
+++ b/broadcast/gateway-3.yaml
+# START YAML ===
+################################################################################
+## Copyright © 2018 Privategrity Corporation                                   #
+##                                                                             #
+## All rights reserved.                                                        #
+################################################################################
+
+##
+# Gateway Configuration File
+##
+
+# Used for debugging
+loglevel: 2
+
+# Output log file
+log: "results/gateways/gateway-3.log"
+
+# The public IP address and port of the node associated with this gateway
+cmixAddress:  "0.0.0.0:10112"
+
+# The listening port of this gateway
+Port: 1112
+
+# The public IPv4 address of the Gateway, as reported to the network, to use
+# instead of dynamically looking up Gateway's own IP address. If a port is not
+# included, then the port flag is used instead.
+overridePublicIP: "0.0.0.0"
+
+# Period in which the message cleanup function executes. Recommended period is on the order of a minute.
+messageTimeout: "1800s"
+
+# Path to where the IDF is saved. This is used by the wrapper management script.
+idfPath: "results/gateways/gatewayIDF-2.json"
+
+# === REQUIRED FOR ENABLING TLS ===
+# Path to the private key file
+keyPath: "../keys/cmix.rip.key"
+# Path to the certificate file
+certPath: "../keys/cmix.rip.crt"
+# Path to the permissioning certificate
+schedulingCertPath: "../keys/cmix.rip.crt"
+# Path to the certificate file
+cmixCertPath: "../keys/cmix.rip.crt"
+
+
+devMode: true
+
+minRegisteredNodes: 0
+# === END YAML
--- a/broadcast/gateway-4.yaml
+++ b/broadcast/gateway-4.yaml
+# START YAML ===
+################################################################################
+## Copyright © 2018 Privategrity Corporation                                   #
+##                                                                             #
+## All rights reserved.                                                        #
+################################################################################
+
+##
+# Gateway Configuration File
+##
+
+# Used for debugging
+loglevel: 2
+
+# Output log file
+log: "results/gateways/gateway-4.log"
+
+# The public IP address and port of the node associated with this gateway
+cmixAddress:  "0.0.0.0:10113"
+
+# The listening port of this gateway
+Port: 1113
+
+# The public IPv4 address of the Gateway, as reported to the network, to use
+# instead of dynamically looking up Gateway's own IP address. If a port is not
+# included, then the port flag is used instead.
+overridePublicIP: "0.0.0.0"
+
+# Period in which the message cleanup function executes. Recommended period is on the order of a minute.
+messageTimeout: "1800s"
+
+# Path to where the IDF is saved. This is used by the wrapper management script.
+idfPath: "results/gateways/gatewayIDF-3.json"
+
+# === REQUIRED FOR ENABLING TLS ===
+# Path to the private key file
+keyPath: "../keys/cmix.rip.key"
+# Path to the certificate file
+certPath: "../keys/cmix.rip.crt"
+# Path to the permissioning certificate
+schedulingCertPath: "../keys/cmix.rip.crt"
+# Path to the certificate file
+cmixCertPath: "../keys/cmix.rip.crt"
+
+
+devMode: true
+
+minRegisteredNodes: 0
+# === END YAML
--- a/broadcast/gateway-5.yaml
+++ b/broadcast/gateway-5.yaml
+# START YAML ===
+################################################################################
+## Copyright © 2018 Privategrity Corporation                                   #
+##                                                                             #
+## All rights reserved.                                                        #
+################################################################################
+
+##
+# Gateway Configuration File
+##
+
+# Used for debugging
+loglevel: 2
+
+# Output log file
+log: "results/gateways/gateway-5.log"
+
+# The public IP address and port of the node associated with this gateway
+cmixAddress:  "0.0.0.0:10114"
+
+# The listening port of this gateway
+Port: 1114
+
+# The public IPv4 address of the Gateway, as reported to the network, to use
+# instead of dynamically looking up Gateway's own IP address. If a port is not
+# included, then the port flag is used instead.
+overridePublicIP: "0.0.0.0"
+
+# Period in which the message cleanup function executes. Recommended period is on the order of a minute.
+messageTimeout: "1800s"
+
+# Path to where the IDF is saved. This is used by the wrapper management script.
+idfPath: "results/gateways/gatewayIDF-4.json"
+
+# === REQUIRED FOR ENABLING TLS ===
+# Path to the private key file
+keyPath: "../keys/cmix.rip.key"
+# Path to the certificate file
+certPath: "../keys/cmix.rip.crt"
+# Path to the permissioning certificate
+schedulingCertPath: "../keys/cmix.rip.crt"
+# Path to the certificate file
+cmixCertPath: "../keys/cmix.rip.crt"
+
+
+devMode: true
+
+minRegisteredNodes: 0
+# === END YAML
--- a/broadcast/mainnet.txt
+++ b/broadcast/mainnet.txt
+"65.21.170.29:22840"
+"88.198.2.52:22840"
+"188.40.70.250:22840"
+"185.218.125.248:22840"
+"31.202.122.131:22840"
+"173.249.60.80:22840"
+"65.21.76.35:22840"
+"195.201.171.211:22840"
+"65.21.221.236:22840"
+"37.97.220.130:22840"
+"159.148.31.238:22840"
+"nodochile.myddns.me:22840"
+"94.130.10.38:22840"
+"188.240.52.205:22840"
+"212.38.189.73:22840"
+"xerxesgw.caius.ovh:22840"
+"46.4.50.57:22840"
+"103.195.101.143:22840"
+"49.12.45.179:22840"
+"167.172.88.140:22840"
+"5.189.176.210:22840"
+"135.181.213.94:22840"
+"213.136.70.8:22840"
+"194.163.163.77:22840"
+"65.21.204.13:22840"
+"88.119.195.16:22840"
+"88.198.2.51:22840"
+"181.43.194.251:22840"
+"159.148.31.232:22840"
+"65.108.52.154:11098"
+"138.201.37.166:22840"
+"kmil.go.ro:22840"
+"37.97.169.197:22840"
+"144.76.65.107:22840"
+"178.18.253.13:22840"
+"162.55.131.110:22840"
+"91.230.111.8:22840"
+"109.98.108.250:22840"
+"15.161.170.171:22840"
+"37.97.224.110:22840"
+"54.79.206.112:22840"
+"144.126.149.30:22840"
+"194.163.171.145:22840"
+"37.97.220.129:22840"
+"194.163.170.125:22840"
+"65.21.143.248:22840"
+"149.210.229.175:22840"
+"149.210.192.112:22840"
+"149.210.192.111:22840"
+"65.21.234.163:22840"
+"149.210.229.223:22840"
+"173.249.44.133:22840"
+"75.119.130.123:22840"
+"194.233.77.127:22840"
+"66.94.99.187:22840"
+"144.91.99.106:22840"
+"185.214.134.207:22840"
+"95.217.207.236:22840"
+"95.217.206.164:22840"
+"173.212.233.67:22840"
+"37.55.17.106:22840"
+"65.108.3.162:22840"
+"186.106.188.155:22840"
+"109.237.108.117:22840"
+"65.108.42.168:22840"
+"65.21.234.86:22840"
+"65.21.50.177:22840"
+"194.163.189.115:22840"
+"135.181.212.170:22840"
+"23.88.104.166:22840"
+"103.107.182.192:22840"
+"65.108.2.254:22840"
+"94.130.136.136:22840"
+"162.55.100.14:22840"
--- a/broadcast/network.config
+++ b/broadcast/network.config
+localhost:1110
+# This is the network configuration file. The top line of this file,
+# when not set via command line, is used to determine to which network
+# the integration test will be run against.
+
+# Note you can also specify "release", "betanet", or "protonet" on run.sh
+
+# Betanet gateways
+109.169.15.30:22840
+5.12.137.118:22840
+92.246.20.92:22840
+178.16.39.203:22840
+86.135.17.18:22840
+
+# Release (messenger test) network gateways
+34.221.74.216:11420
+52.25.9.28:11420
+54.149.122.115:11420
+
+
+# protonet
+185.152.3.247:11420
+93.151.207.39:11420
+93.107.154.131:11420
+173.208.225.75:11421
+92.246.20.92:11420
No results found