diff --git a/channels/betanet.txt b/channels/betanet.txt new file mode 100644 index 0000000000000000000000000000000000000000..e35ebcf24ff6d2bbf54f6c994bfd35de7becbd33 --- /dev/null +++ b/channels/betanet.txt @@ -0,0 +1,306 @@ +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 diff --git a/channels/devnet.txt b/channels/devnet.txt new file mode 100644 index 0000000000000000000000000000000000000000..922c0de14aa0c5f53ae073466dbc7e4869862eb3 --- /dev/null +++ b/channels/devnet.txt @@ -0,0 +1,3 @@ +34.222.125.145:11420 +35.163.143.85:11420 +34.218.59.127:11420 diff --git a/channels/mainnet.txt b/channels/mainnet.txt new file mode 100644 index 0000000000000000000000000000000000000000..3fbbb1c4181299e5380dbb76870d73576e29d43f --- /dev/null +++ b/channels/mainnet.txt @@ -0,0 +1,74 @@ +"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" diff --git a/channels/network.sh b/channels/network.sh new file mode 100755 index 0000000000000000000000000000000000000000..2a7b2cc2adb2c633f711ed15fe2825a00a4caee9 --- /dev/null +++ b/channels/network.sh @@ -0,0 +1,110 @@ +# This script is used to start a basic 5 node network for running clients on. It is meant to be `source`'d into a script +# which will run clients on the network, such as `client-session-tests.sh` or the main `run.sh`. +# +# You **must** source it, because otherwise the `trap finish EXIT` instruction will cause the network to stop when +# network.sh returns to your script or shell. Sourcing it will "import" the commands into your script instead, causing +# the trap instruction to stop the network when your script/shell exits. + +echo "STARTING SERVERS..." + +SERVERLOGS=results/servers +GATEWAYLOGS=results/gateways +UDBOUT=results/udb-console.txt + +# Copy udbContact into place when running locally. +cp udbContact.bin results/udbContact.bin + +PERMCMD="../bin/permissioning --logLevel $DEBUGLEVEL -c permissioning.yaml " +$PERMCMD > results/permissioning-console.txt 2>&1 & +PIDVAL=$! +echo "$PERMCMD -- $PIDVAL" + + +# Run Client Registrar +CLIENT_REG_CMD="../bin/client-registrar \ +-l 2 -c client-registrar.yaml" +$CLIENT_REG_CMD > results/client-registrat-console.txt 2>&1 & +PIDVAL=$! +echo "$CLIENT_REG_CMD -- $PIDVAL" + +for SERVERID in $(seq 5 -1 1) +do + IDX=$(($SERVERID - 1)) + SERVERCMD="../bin/server --logLevel $DEBUGLEVEL --config server-$SERVERID.yaml" + if [ $SERVERID -eq 5 ] && [ -n "$NSYSENABLED" ] + then + SERVERCMD="nsys profile --session-new=gputest --trace=cuda -o server-$SERVERID $SERVERCMD" + fi + $SERVERCMD > $SERVERLOGS/server-$SERVERID-console.txt 2>&1 & + PIDVAL=$! + echo "$SERVERCMD -- $PIDVAL" +done + +# Start gateways +for GWID in $(seq 5 -1 1) +do + IDX=$(($GWID - 1)) + GATEWAYCMD="../bin/gateway --logLevel $DEBUGLEVEL --config gateway-$GWID.yaml" + $GATEWAYCMD > $GATEWAYLOGS/gateway-$GWID-console.txt 2>&1 & + PIDVAL=$! + echo "$GATEWAYCMD -- $PIDVAL" +done + +jobs -p > results/serverpids + +finish() { + echo "STOPPING SERVERS AND GATEWAYS..." + if [ -n "$NSYSENABLED" ] + then + nsys stop --session=gputest + fi + # NOTE: jobs -p doesn't work in a signal handler + for job in $(cat results/serverpids) + do + echo "KILLING $job" + kill $job || true + done + + sleep 5 + + for job in $(cat results/serverpids) + do + echo "KILL -9 $job" + kill -9 $job || true + done + #tail $SERVERLOGS/* + #tail $CLIENTCLEAN/* + #diff -aruN clients.goldoutput $CLIENTCLEAN +} + +trap finish EXIT +trap finish INT + +# Sleeps can die in a fire on the sun, we wait for the servers to start running +# rounds +rm rid.txt || true +touch rid.txt +cnt=0 +echo -n "Waiting for a round to run" +while [ ! -s rid.txt ] && [ $cnt -lt 120 ]; do + sleep 1 + grep -a "RID 1 ReceiveFinishRealtime END" results/servers/server-* > rid.txt || true + cnt=$(($cnt + 1)) + echo -n "." +done + +# Start a user discovery bot server +echo "STARTING UDB..." +UDBCMD="../bin/udb --logLevel $DEBUGLEVEL --skipVerification --protoUserPath udbProto.json --config udb.yaml -l 1" +$UDBCMD >> $UDBOUT 2>&1 & +PIDVAL=$! +echo $PIDVAL >> results/serverpids +echo "$UDBCMD -- $PIDVAL" +rm rid.txt || true +while [ ! -s rid.txt ] && [ $cnt -lt 30 ]; do + sleep 1 + grep -a "Sending Poll message" results/udb-console.txt > rid.txt || true + cnt=$(($cnt + 1)) + echo -n "." +done + diff --git a/channels/regCodes.json b/channels/regCodes.json index 7020c8559d8abb5cee17dde41305b3be6b9e6307..f5fea21d8ff35a22a497025a30d5ced4dc57e086 100644 --- a/channels/regCodes.json +++ b/channels/regCodes.json @@ -1 +1 @@ -[{"RegCode": "ihne", "Order": "CR"},{"RegCode": "rlqh", "Order": "CR"},{"RegCode": "nujo", "Order": "CR"},{"RegCode": "owdc", "Order": "CR"},{"RegCode": "rvwz", "Order": "CR"}] \ No newline at end of file +[{"RegCode": "mdli", "Order": "CR"},{"RegCode": "pxqt", "Order": "CR"},{"RegCode": "rckg", "Order": "CR"},{"RegCode": "xcfn", "Order": "CR"},{"RegCode": "zxia", "Order": "CR"}] \ No newline at end of file diff --git a/channels/release.txt b/channels/release.txt new file mode 100644 index 0000000000000000000000000000000000000000..444256765d3f3402799c47b75e3e399dbcd4facf --- /dev/null +++ b/channels/release.txt @@ -0,0 +1,3 @@ +34.222.230.124:11420 +54.187.42.105:11420 +54.149.115.63:11420 diff --git a/channels/run.sh b/channels/run.sh index 86a4aa66be65e8a28cbedd0a8a7f9e62860afd24..bab7fe67c01600e4997ec93a7ba143e493a5ab9b 100755 --- a/channels/run.sh +++ b/channels/run.sh @@ -4,6 +4,12 @@ ## Initial Set Up & Clean Up of Past Runs ################################################################################ +# Copy file into folder if it does not already exist +if [ ! -f network.sh ]; then + cp ../network/network.sh . +fi + + set -e rm -fr results.bak || true mv results results.bak || rm -fr results || true @@ -229,3 +235,8 @@ then #diff -aruN client121BackupDiff.txt noerrors.txt fi + +# Remove the file if it exists +if [ -f network.sh ]; then + rm network.sh +fi \ No newline at end of file diff --git a/channels/server-1.yaml b/channels/server-1.yaml index 33d51f40a2973cb618e87091a03b5bbd0cf31a60..b638db3d74fd952b5c3d7ff5f83cab6d5c580525 100644 --- a/channels/server-1.yaml +++ b/channels/server-1.yaml @@ -1,5 +1,5 @@ # START YAML === -registrationCode: "ihne" +registrationCode: "mdli" useGPU: false devMode: true rawPermAddr: true diff --git a/channels/server-2.yaml b/channels/server-2.yaml index 4dad25c0a67e2166f4e9082d7d74fff76afeee4a..1a00304f34cffb47965df3042686021cb6d45259 100644 --- a/channels/server-2.yaml +++ b/channels/server-2.yaml @@ -1,5 +1,5 @@ # START YAML === -registrationCode: "rlqh" +registrationCode: "pxqt" useGPU: false devMode: true rawPermAddr: true diff --git a/channels/server-3.yaml b/channels/server-3.yaml index bd4a7dea39756aefb2a8fa864e1e9e27b52acfe2..ae14ea1f0d979a25b419bcfa3a6be7efaa1adeed 100644 --- a/channels/server-3.yaml +++ b/channels/server-3.yaml @@ -1,5 +1,5 @@ # START YAML === -registrationCode: "nujo" +registrationCode: "rckg" useGPU: false devMode: true rawPermAddr: true diff --git a/channels/server-4.yaml b/channels/server-4.yaml index e0404e9fd7176e90dcd080d149f00b32f7f055b8..7c3f23085d4ecf8d57011d956ceddb751c9edccc 100644 --- a/channels/server-4.yaml +++ b/channels/server-4.yaml @@ -1,5 +1,5 @@ # START YAML === -registrationCode: "owdc" +registrationCode: "xcfn" useGPU: false devMode: true rawPermAddr: true diff --git a/channels/server-5.yaml b/channels/server-5.yaml index 549819833fd7f19e6494c2cb91bb38ba229dc616..771078366142475c6a7f662ca29510c62820bf31 100644 --- a/channels/server-5.yaml +++ b/channels/server-5.yaml @@ -1,5 +1,5 @@ # START YAML === -registrationCode: "rvwz" +registrationCode: "zxia" useGPU: false devMode: true rawPermAddr: true diff --git a/channels/whitelist.txt b/channels/whitelist.txt new file mode 100644 index 0000000000000000000000000000000000000000..446eca0cad0a5393cf757e761a7c33576aab024d --- /dev/null +++ b/channels/whitelist.txt @@ -0,0 +1 @@ +["0.0.0.0", "127.0.0.1"] \ No newline at end of file diff --git a/gen/betanet.txt b/gen/betanet.txt new file mode 100644 index 0000000000000000000000000000000000000000..e35ebcf24ff6d2bbf54f6c994bfd35de7becbd33 --- /dev/null +++ b/gen/betanet.txt @@ -0,0 +1,306 @@ +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 diff --git a/gen/devnet.txt b/gen/devnet.txt new file mode 100644 index 0000000000000000000000000000000000000000..922c0de14aa0c5f53ae073466dbc7e4869862eb3 --- /dev/null +++ b/gen/devnet.txt @@ -0,0 +1,3 @@ +34.222.125.145:11420 +35.163.143.85:11420 +34.218.59.127:11420 diff --git a/gen/mainnet.txt b/gen/mainnet.txt new file mode 100644 index 0000000000000000000000000000000000000000..3fbbb1c4181299e5380dbb76870d73576e29d43f --- /dev/null +++ b/gen/mainnet.txt @@ -0,0 +1,74 @@ +"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" diff --git a/gen/release.txt b/gen/release.txt new file mode 100644 index 0000000000000000000000000000000000000000..444256765d3f3402799c47b75e3e399dbcd4facf --- /dev/null +++ b/gen/release.txt @@ -0,0 +1,3 @@ +34.222.230.124:11420 +54.187.42.105:11420 +54.149.115.63:11420 diff --git a/gen/whitelist.txt b/gen/whitelist.txt new file mode 100644 index 0000000000000000000000000000000000000000..446eca0cad0a5393cf757e761a7c33576aab024d --- /dev/null +++ b/gen/whitelist.txt @@ -0,0 +1 @@ +["0.0.0.0", "127.0.0.1"] \ No newline at end of file diff --git a/generatePackage.py b/generatePackage.py index 5673c8c0d7a4d8096cea6d54eb9b8c386acadc3a..efd3bb9c8104d3365a1ab72d446a6faad2a04888 100755 --- a/generatePackage.py +++ b/generatePackage.py @@ -61,6 +61,31 @@ def generate_server_side_config(offset: int, newPackage: string): with open("gen/noerrors.txt") as f: no_errors = f.read() + # Open whitelist template + whitelist = "" + with open("gen/whitelist.txt") as f: + whitelist = f.read() + + # Open release template + release_template = "" + with open("gen/release.txt") as f: + release_template = f.read() + + # Open mainnet template + mainnet_template = "" + with open("gen/mainnet.txt") as f: + mainnet_template = f.read() + + # Open devnet template + devnet_template = "" + with open("gen/devnet.txt") as f: + devnet_template = f.read() + + #Open betanet template + betanet_template = "" + with open("gen/betanet.txt") as f: + betanet_template = f.read() + # Open permissioning template reg_template = "" with open("gen/permissioning.yaml") as f: @@ -192,6 +217,26 @@ def generate_server_side_config(offset: int, newPackage: string): os.chmod("{}/run.sh".format(newPackage), 0o755) + # Write whitelist to package + with open("{}/whitelist.txt".format(newPackage), "w") as f: + f.write(whitelist) + + # Write release to package + with open("{}/release.txt".format(newPackage), "w") as f: + f.write(release_template) + + # Write mainnet to package + with open("{}/mainnet.txt".format(newPackage), "w") as f: + f.write(mainnet_template) + + # Write devnet to package + with open("{}/devnet.txt".format(newPackage), "w") as f: + f.write(devnet_template) + + # Write betanet to package + with open("{}/betanet.txt".format(newPackage), "w") as f: + f.write(betanet_template) + # Write udb config with open("{}/udb.yaml".format(newPackage), "w") as f: