Skip to content

Commit

Permalink
Merge pull request #12 from bytzcurrency/develop
Browse files Browse the repository at this point in the history
Merge develop into master
  • Loading branch information
celbalrai authored Sep 10, 2021
2 parents 8a351fb + ff2f67a commit 2f804c7
Show file tree
Hide file tree
Showing 12 changed files with 287 additions and 569 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ jobs:
./autogen.sh
./configure --host=${HOST} --prefix=`pwd`/depends/${HOST} --enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++
make -j${JOBS}
make -j${JOBS} check
git clone http://github.com/bytzcurrency/bytz_hash
cd bytz_hash
python3 setup.py install
Expand Down Expand Up @@ -218,8 +219,7 @@ jobs:
tar -C `pwd`/depends/SDKs -xJf ./MacOSX10.11.sdk.tar.xz
make -j${JOBS} -C depends HOST=${HOST}
./autogen.sh
./configure --host=${HOST} --prefix=`pwd`/depends/${HOST} --enable-reduce-exports --enable-werror --disable-ccache --disable-maintainer-mode --disable-dependency-tracking --disable-bench --disable-gui-tests
CONFIG_SITE=`pwd`/depends/${HOST}/share/config.site ./configure --host=${HOST} --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking --enable-reduce-exports --disable-bench --disable-gui-tests --enable-crash-hooks
make -j${JOBS}
workflows:
version: 2.1
Expand Down Expand Up @@ -247,6 +247,6 @@ workflows:
- win64_bionic:
requires:
- lint_all
#- mac_bionic:
# requires:
# - lint_all
- mac_bionic:
requires:
- lint_all
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 2)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_BUILD, 1)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2021)
define(_COPYRIGHT_HOLDERS,[The %s developers])
Expand Down
310 changes: 100 additions & 210 deletions contrib/seeds/nodes_main.txt
Original file line number Diff line number Diff line change
@@ -1,210 +1,100 @@
1.248.134.139:37415
2.56.213.221:37415
5.2.67.190:37415
5.2.73.58:37415
5.9.237.34:37415
5.45.99.13:37415
5.79.109.243:37415
5.132.191.109:37415
5.132.191.112:37415
18.222.134.5:37415
20.71.243.27:37415
23.81.246.42:37415
23.106.123.152:37415
23.163.0.127:37415
23.227.163.23:37415
23.228.232.76:37415
23.228.232.81:37415
23.253.213.225:37415
31.10.97.36:37415
31.31.73.82:37415
31.178.4.50:37415
34.82.91.118:37415
34.83.46.25:37415
34.83.170.242:37415
34.105.19.132:37415
34.209.237.242:37415
34.239.31.246:37415
34.255.85.157:37415
37.18.227.56:37415
37.97.227.21:37415
43.229.77.46:37415
45.33.24.24:37415
45.34.121.127:37415
45.56.64.107:37415
45.76.39.241:37415
45.79.46.71:37415
45.86.162.83:37415
45.86.162.85:37415
46.21.155.50:37415
46.36.40.242:37415
46.254.241.28:37415
47.56.118.20:37415
47.91.152.232:37415
47.91.204.190:37415
47.98.66.94:37415
47.98.123.106:37415
47.105.35.2:37415
47.244.130.9:37415
50.17.175.91:37415
51.15.96.206:37415
51.38.179.230:37415
51.144.71.213:37415
51.158.169.237:37415
52.71.18.27:37415
52.202.141.60:37415
54.218.218.43:37415
62.138.3.192:37415
63.142.253.85:37415
63.250.45.250:37415
64.251.65.206:37415
66.172.12.86:37415
66.244.243.68:37415
66.244.243.69:37415
69.61.107.215:37415
69.61.107.216:37415
69.61.107.218:37415
69.61.107.240:37415
74.118.137.69:37415
74.118.137.96:37415
74.118.137.97:37415
78.67.236.159:37415
78.83.19.0:37415
79.98.30.156:37415
79.98.31.59:37415
80.100.30.50:37415
80.211.221.139:37415
81.171.2.245:37415
82.211.21.23:37415
82.211.21.179:37415
82.211.21.226:37415
82.211.21.240:37415
82.223.197.237:37415
83.96.169.215:37415
84.242.179.204:37415
85.206.165.89:37415
85.209.241.35:37415
85.209.241.190:37415
85.209.241.201:37415
85.209.242.4:37415
85.217.170.206:37415
88.119.171.76:37415
89.40.13.44:37415
89.45.67.54:37415
91.219.237.108:37415
91.219.237.111:37415
91.219.239.82:37415
94.176.238.201:37415
95.183.50.97:37415
95.183.51.141:37415
95.183.52.43:37415
95.183.53.39:37415
95.211.196.34:37415
95.215.45.225:37415
95.215.110.120:37415
103.218.240.67:37415
104.160.42.35:37415
107.161.24.90:37415
108.61.178.122:37415
108.61.247.70:37415
118.178.158.10:37415
123.193.64.166:37415
133.130.102.22:37415
138.68.28.8:37415
139.9.199.240:37415
140.238.170.170:37415
144.91.127.166:37415
144.202.120.194:37415
145.131.28.66:37415
145.131.28.68:37415
145.131.28.116:37415
145.131.28.117:37415
145.239.163.130:37415
146.59.12.224:37415
146.185.175.206:37415
151.236.10.109:37415
152.67.65.145:37415
158.101.162.74:37415
158.101.168.28:37415
163.44.167.237:37415
163.44.169.29:37415
163.44.171.51:37415
163.172.96.100:37415
167.71.51.205:37415
168.119.54.138:37415
168.235.85.241:37415
168.235.93.49:37415
168.235.104.190:37415
169.62.139.168:37415
170.75.162.219:37415
172.81.178.88:37415
172.86.120.107:37415
173.212.218.130:37415
173.214.162.200:37415
173.231.204.69:37415
176.94.17.220:37415
176.123.57.198:37415
176.123.57.200:37415
176.123.57.203:37415
176.123.57.205:37415
178.33.189.154:37415
178.63.121.129:37415
178.79.130.187:37415
178.157.91.126:37415
178.157.91.176:37415
178.157.91.179:37415
178.170.8.182:37415
180.68.191.77:37415
185.26.126.250:37415
185.43.210.125:37415
185.45.193.207:37415
185.45.193.209:37415
185.62.56.198:37415
185.64.104.222:37415
185.64.104.223:37415
185.113.33.3:37415
185.113.33.5:37415
185.113.33.6:37415
185.141.27.109:37415
185.141.62.97:37415
185.142.212.144:37415
185.165.168.23:37415
185.165.168.25:37415
185.165.168.27:37415
185.165.168.243:37415
185.175.158.40:37415
185.177.59.140:37415
185.183.98.157:37415
185.219.220.71:37415
185.228.83.73:37415
185.228.83.112:37415
185.228.83.115:37415
185.228.83.157:37415
185.248.150.135:37415
185.248.150.148:37415
188.40.241.106:37415
188.166.98.146:37415
190.2.149.236:37415
190.4.184.180:37415
192.169.6.25:37415
194.182.75.136:37415
195.98.95.219:37415
195.154.179.244:37415
195.181.210.17:37415
195.181.211.64:37415
198.57.27.227:37415
202.61.248.211:37415
204.101.220.194:37415
207.180.228.70:37415
208.73.200.203:37415
209.95.51.204:37415
212.83.61.246:37415
212.83.61.247:37415
212.237.9.59:37415
213.136.78.104:37415
216.107.217.62:37415
216.189.147.95:37415
216.189.147.178:37415
216.189.151.94:37415
216.189.151.207:37415
220.121.224.91:37415
192.219.30.102:37415
192.219.30.110:37415
192.219.30.119:37415
192.219.30.122:37415
192.219.30.134:37415
192.219.30.136:37415
192.219.30.140:37415
192.219.30.143:37415
192.219.30.148:37415
192.219.30.151:37415
192.219.30.152:37415
192.219.30.156:37415
192.219.30.158:37415
192.219.30.163:37415
192.219.30.167:37415
192.219.30.168:37415
192.219.30.171:37415
192.219.30.177:37415
192.219.30.183:37415
192.219.30.190:37415
192.219.30.197:37415
192.219.30.201:37415
192.219.30.203:37415
192.219.30.211:37415
192.219.30.213:37415
192.219.30.214:37415
192.219.30.216:37415
192.219.30.222:37415
192.219.30.228:37415
192.219.30.229:37415
192.219.30.230:37415
192.219.30.233:37415
192.219.30.236:37415
192.219.30.238:37415
192.219.30.244:37415
192.219.30.254:37415
192.219.30.34:37415
192.219.30.35:37415
192.219.30.42:37415
192.219.30.49:37415
192.219.30.51:37415
192.219.30.52:37415
192.219.30.60:37415
192.219.30.62:37415
192.219.30.75:37415
192.219.30.80:37415
192.219.30.83:37415
192.219.30.90:37415
192.219.30.94:37415
192.219.30.98:37415
205.210.146.102:37415
205.210.146.10:37415
205.210.146.109:37415
205.210.146.11:37415
205.210.146.114:37415
205.210.146.115:37415
205.210.146.118:37415
205.210.146.120:37415
205.210.146.124:37415
205.210.146.133:37415
205.210.146.136:37415
205.210.146.139:37415
205.210.146.140:37415
205.210.146.146:37415
205.210.146.160:37415
205.210.146.163:37415
205.210.146.16:37415
205.210.146.164:37415
205.210.146.167:37415
205.210.146.172:37415
205.210.146.174:37415
205.210.146.188:37415
205.210.146.195:37415
205.210.146.198:37415
205.210.146.207:37415
205.210.146.212:37415
205.210.146.217:37415
205.210.146.219:37415
205.210.146.224:37415
205.210.146.225:37415
205.210.146.226:37415
205.210.146.228:37415
205.210.146.23:37415
205.210.146.236:37415
205.210.146.237:37415
205.210.146.241:37415
205.210.146.24:37415
205.210.146.28:37415
205.210.146.32:37415
205.210.146.3:37415
205.210.146.34:37415
205.210.146.40:37415
205.210.146.42:37415
205.210.146.44:37415
205.210.146.5:37415
205.210.146.75:37415
205.210.146.77:37415
205.210.146.83:37415
205.210.146.87:37415
205.210.146.92:37415
12 changes: 6 additions & 6 deletions doc/man/bytz-cli.1
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH BYTZ-CLI "1" "July 2021" "bytz-cli v0.2.0.0" "User Commands"
.TH BYTZ-CLI "1" "September 2021" "bytz-cli v0.2.0.1" "User Commands"
.SH NAME
bytz-cli \- manual page for bytz-cli v0.2.0.0
bytz-cli \- manual page for bytz-cli v0.2.0.1
.SH DESCRIPTION
Bytz Core RPC client version v0.2.0.0\-dirty
BYTZ Core RPC client version v0.2.0.1\-dirty
.SS "Usage:"
.TP
bytz\-cli [options] <command> [params]
Send command to Bytz Core
Send command to BYTZ Core
.IP
bytz\-cli [options] \fB\-named\fR <command> [name=value] ... Send command to Bytz Core (with named arguments)
bytz\-cli [options] \fB\-named\fR <command> [name=value] ... Send command to BYTZ Core (with named arguments)
bytz\-cli [options] help List commands
bytz\-cli [options] help <command> Get help for a command
.SH OPTIONS
Expand Down Expand Up @@ -98,7 +98,7 @@ Copyright (C) 2014-2021 The Bytz Core developers
Copyright (C) 2014-2021 The Dash Core developers
Copyright (C) 2009-2021 The Bitcoin Core developers

Please contribute if you find Bytz Core useful. Visit <https://bytz.gg> for
Please contribute if you find BYTZ Core useful. Visit <https://bytz.gg> for
further information about the software.
The source code is available from <https://github.com/bytzcurrency/bytz>.

Expand Down
8 changes: 4 additions & 4 deletions doc/man/bytz-qt.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH BYTZ-QT "1" "July 2021" "bytz-qt v0.2.0.0" "User Commands"
.TH BYTZ-QT "1" "September 2021" "bytz-qt v0.2.0.1" "User Commands"
.SH NAME
bytz-qt \- manual page for bytz-qt v0.2.0.0
bytz-qt \- manual page for bytz-qt v0.2.0.1
.SH DESCRIPTION
Bytz Core version v0.2.0.0\-dirty (64\-bit)
BYTZ Core version v0.2.0.1\-dirty (64\-bit)
Usage:
.IP
bytz\-qt [command\-line options]
Expand Down Expand Up @@ -891,7 +891,7 @@ Copyright (C) 2014-2021 The Bytz Core developers
Copyright (C) 2014-2021 The Dash Core developers
Copyright (C) 2009-2021 The Bitcoin Core developers

Please contribute if you find Bytz Core useful. Visit <https://bytz.gg> for
Please contribute if you find BYTZ Core useful. Visit <https://bytz.gg> for
further information about the software.
The source code is available from <https://github.com/bytzcurrency/bytz>.

Expand Down
Loading

0 comments on commit 2f804c7

Please sign in to comment.