Skip to content

Commit eb9e858

Browse files
committed
Merge branch 'release/0.7.2'
2 parents e5f9bdb + c556419 commit eb9e858

21 files changed

+1240
-343
lines changed

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[submodule "genesis-be/genesis-scripts"]
22
path = genesis-be/genesis-scripts
3-
url = https://github.com/blitzstern5/genesis-scripts
3+
url = git@github.com:blitzstern5/genesis-scripts
44
branch = master
55
[submodule "genesis-bf/genesis-scripts"]
66
path = genesis-bf/genesis-scripts
7-
url = https://github.com/blitzstern5/genesis-scripts
7+
url = git@github.com:blitzstern5/genesis-scripts
88
branch = master
99
[submodule "genesis-blex/genesis-scripts"]
1010
path = genesis-blex/genesis-scripts
11-
url = https://github.com/blitzstern5/genesis-scripts
11+
url = git@github.com:blitzstern5/genesis-scripts
1212
branch = master

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
## Version 0.7.2 / 2018-Dec-26 19:26
2+
* Upgrade mac docker to version Community Edition 2.0.0.0-mac81 2018-12-07
3+
* Upgrade backend to version 1.1.10
4+
* Upgrade applications to version 1.2.1
5+
* Upgrade frontend to version 0.11.1
6+
* Switch to NodeJS 10.x when building frontend
7+
* Upgrade scripts to v0.2.0
8+
* Upgrade PostgreSQL to version 11.x
9+
* Add Redis Queue container/image
10+
* Upgrade Block Explorer version v0.3.0
11+
* Fix issues in the management script
12+
* Fix errors in README
13+
114
## Version 0.7.1 / 2018-Nov-03 04:57
215
* Switch demo apps to tag v1.0.0
316

CONTENT.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Version 0.7.2
2+
3+
* [Backend v1.1.10](https://github.com/AplaProject/go-apla/releases/tag/1.1.10)
4+
* [Frontend v0.11.1](https://github.com/GenesisKernel/genesis-front/releases/tag/v0.11.1)
5+
* [Applications v1.2.1](https://github.com/AplaProject/apps/releases/tag/v1.2.1)
6+
* [Block Explorer v0.3.0](https://github.com/GenesisKernel/blockexplorer/releases/tag/v0.3.0)
7+
* [Scripts v0.2.0](https://github.com/blitzstern5/genesis-scripts/releases/tag/v0.2.0)

README.md

Lines changed: 63 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,120 @@
11
About Genesis
22
=============
33

4-
Genesis is an open source blockchain platform which implemented as blockchain network consisting of nodes communicating each other. Each node is backend service having own database and can be interacted by the end user with a client or web ui.
4+
Genesis is an open source blockchain platform which implemented as blockchain network consisting of nodes communicating each other. Each node is backend service having own database and can be interacted by the end user with a client or web UI.
55

66
The goal of this quick start solution is to run a local testing network of several Genesis nodes (backends with GUI clients) to give the end user an idea of how Genesis blockchain works and provide usage examples of graphical interface elements as well as smart-contracts.
77

8-
The backend-side (backend itlsef and database engine) software runs in docker containers and clients run nativly on the host system side.
8+
The backend-side (backend itsef and database engine) software runs in docker containers and clients run natively on the host system side.
99
As soon as clients start user can interact with local testing Genesis blockchain network.
1010

1111
Usage
1212
=====
1313

1414
Currently Genesis quick start was tested on Mac and Linux.
15-
Windows support is comming.
15+
Windows support is coming.
1616

1717
Use manage.sh to manage Genesis testbed on Linux/Mac and manage.exe to
1818
manage Genesis testbed on Windows.
1919

2020
### Linux/Mac
2121

22-
To create testing network of 5 nodes on Linux/Mac use the following command:
22+
To create a testing network of 5 nodes on Linux/Mac use the following command:
23+
24+
on Mac with Admin account:
2325

2426
```shell
2527
./manage.sh install 5
2628
```
29+
on Linux with sudo-enabled account:
30+
31+
```shell
32+
sudo ./manage.sh install 5
33+
```
2734

2835
This will download and install all required software (docker if it's not installed yet, docker containers with Genesis backends and databases and Genesis clients)
2936
and start 5 Genesis backend instances and 5 accordingly connected Genesis clients.
3037

3138
To stop clients and to stop and delete docker containers run this command:
3239

40+
on Mac with Admin account:
3341
```shell
3442
./manage delete
3543
```
44+
on Linux with sudo-enabled account:
45+
```shell
46+
sudo ./manage delete
47+
```
3648

3749
To stop clients and to stop and delete docker containers and images run this command:
3850

51+
on Mac with Admin account:
3952
```shell
4053
./manage delete-all
4154
```
55+
on Linux with sudo-enabled account:
56+
```shell
57+
sudo ./manage delete-all
58+
```
4259

43-
To check the status of testing network run this command:
60+
To check the status of the testing network run this command:
4461

62+
on Mac with Admin account:
63+
```shell
64+
./manage status
65+
```
66+
on Linux with sudo-enabled account:
4567
```shell
4668
./manage status
4769
```
4870

4971
To start database shell connected to appropriate backend's database run:
5072

73+
on Mac with Admin account:
5174
```shell
5275
./manage db-shell N
5376
```
77+
on Linux with sudo-enabled account:
78+
```shell
79+
sudo ./manage db-shell N
80+
```
81+
5482

5583
where N is the number of a backend.
5684

5785
To stop all clients run:
5886

87+
on Mac with Admin account:
5988
```shell
6089
./manage stop-clients
6190
```
91+
on Linux with sudo-enabled account:
92+
```shell
93+
sudo ./manage stop-clients
94+
```
6295

6396
To start clients again run:
6497

98+
on Mac with Admin account:
6599
```shell
66100
./manage start-clients
67101
```
102+
on Linux with sudo-enabled account:
103+
```shell
104+
sudo ./manage start-clients
105+
```
68106

69107
To reinstall (delete all Genesis-related containers and run installation again with the last installation parameters) run:
70108

109+
on Mac with Admin account:
71110
```shell
72111
./manage reinstall
73112
```
113+
on Linux with sudo-enabled account:
114+
```shell
115+
sudo ./manage reinstall
116+
```
117+
74118
### Windows
75119

76120
Please see [Genesis Quick Start for Windows](https://github.com/GenesisKernel/quick-start-win)
@@ -83,15 +127,20 @@ A password is required to confirm transactions. The default password is 'genesis
83127
Exposed ports
84128
=============
85129

86-
By default docker backends and database listening ports are exposed to system by
130+
By default docker backends and database listening ports are exposed to the system by
87131
the following rules:
88132

89133
* Database port is exposed to the system port 15432
90-
* Web frontend ports are exposed to 'web port shift' value (8300 by default) plus the index number of a backend, for example the listening port of the first backend by default is exposed to 8301, the second - to 8302 and so on
91-
* Client ports are exposed to 'client port shift' value (17300 by default) plus the index number of a backend, for example the listening port of the first backend by default is exposed to 17301, the second - to 17302 and so on
134+
* Web frontend ports are exposed to 'web port shift' value (8300 by default) plus the index number of a backend, for example, the listening port of the first backend by default is exposed to 8301, the second - to 8302 and so on
135+
* Client ports are exposed to 'client port shift' value (17300 by default) plus the index number of a backend, for example, the listening port of the first backend by default is exposed to 17301, the second - to 17302 and so on
92136

93137
These default ports shifts values can be changed during installation:
94138

139+
on Mac with Admin account:
140+
```shell
141+
./manage.sh install N WPS CPS DBP BLEXP
142+
```
143+
on Linux with sudo-enabled account:
95144
```shell
96145
./manage.sh install N WPS CPS DBP BLEXP
97146
```
@@ -106,21 +155,22 @@ where:
106155

107156
So running this command:
108157

158+
on Mac with Admin account:
159+
```shell
160+
./manage.sh install 4 9000 19000 6000
161+
```
162+
on Linux with sudo-enabled account:
109163
```shell
110164
./manage.sh install 4 9000 19000 6000
111165
```
112166

113-
will start 4 backends and 4 clients, and fronend ports will be exposed to system port: 9001, 9002, 9003, 9004, clients ports will be exposed to system ports: 19001, 19002, 19003, 19004, and database port will be exposed to system port 6000
167+
will start 4 backends and 4 clients, and frontend ports will be exposed to system port: 9001, 9002, 9003, 9004, clients ports will be exposed to system ports: 19001, 19002, 19003, 19004, and database port will be exposed to system port 6000
114168

115169
Block Explorer
116170
==============
117171

118172
Initial support of Block Explorer was implemented. The default host port for it is 18200, use browser to open it.
119173

120-
Known bugs:
121-
* In some cases requests lead to AJAX-errors
122-
* Some blocks internals are parsed with errors
123-
124174
Useful Links
125175
============
126176

genesis-be/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ ENV PATH /go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr
55
ENV GOLANG_VER 1.11
66
ENV BACKEND_GO_URL github.com/GenesisKernel/go-genesis
77
ENV BACKEND_BRANCH 1.0.4
8+
ENV BE_BIN_BASENAME go-genesis
89
ENV SCRIPTS_REPO_URL https://github.com/blitzstern5/genesis-scripts
910
ENV SCRIPTS_BRANCH develop
1011
ENV DEMO_APPS_URL https://raw.githubusercontent.com/GenesisKernel/apps/master/system.json

genesis-be/genesis-scripts

genesis-bf/Dockerfile

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ FROM debian:stretch-slim
22

33
ENV GOPATH /go
44
ENV PATH /go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
5-
ENV GOLANG_VER 1.11
6-
ENV NODEJS_SETUP_SCRIPT_URL https://deb.nodesource.com/setup_8.x
7-
ENV BACKEND_GO_URL github.com/GenesisKernel/go-genesis
8-
ENV BACKEND_BRANCH 1.0.4
5+
ENV GOLANG_VER 1.11.4
6+
ENV NODEJS_SETUP_SCRIPT_URL https://deb.nodesource.com/setup_10.x
7+
ENV BACKEND_GO_URL github.com/AplaProject/go-apla
8+
ENV BACKEND_BRANCH 1.1.10
9+
ENV BE_BIN_BASENAME go-apla
910
ENV FRONTEND_REPO_URL https://github.com/GenesisKernel/genesis-front
10-
ENV FRONTEND_BRANCH v0.9.2
11+
ENV FRONTEND_BRANCH v0.11.1
1112
ENV SCRIPTS_REPO_URL https://github.com/blitzstern5/genesis-scripts
12-
ENV SCRIPTS_BRANCH develop
13-
ENV DEMO_APPS_URL https://github.com/GenesisKernel/apps/releases/download/v1.0.0/system.json
13+
ENV SCRIPTS_BRANCH v0.2.0
14+
ENV DEMO_APPS_URL https://github.com/GenesisKernel/apps/releases/download/v1.2.0/system.json
1415

1516
RUN set -ex; apt-get update -y && \
1617
mkdir -p /usr/share/man/man1 && mkdir -p /usr/share/man/man7 && \
@@ -20,7 +21,7 @@ RUN set -ex; apt-get update -y && \
2021

2122
RUN curl -L -o /go$GOLANG_VER.linux-amd64.tar.gz https://dl.google.com/go/go$GOLANG_VER.linux-amd64.tar.gz && tar xvf /go$GOLANG_VER.linux-amd64.tar.gz && mv /go /usr/local/ && find /go$GOLANG_VER.linux-amd64.tar.gz -delete
2223

23-
RUN go get -d $BACKEND_GO_URL && cd /go/src/$BACKEND_GO_URL && git checkout $BACKEND_BRANCH && go get $BACKEND_GO_URL && mkdir -p /genesis-back/bin && git rev-parse --abbrev-ref HEAD > /genesis-back/bin/go-genesis.git_branch && git rev-parse HEAD > /genesis-back/bin/go-genesis.git_commit && mkdir -p /genesis-back/data/node1 && mv $GOPATH/bin/go-genesis /genesis-back/bin/go-genesis && rm -rf /go
24+
RUN go get -d $BACKEND_GO_URL && cd /go/src/$BACKEND_GO_URL && git checkout $BACKEND_BRANCH && go get $BACKEND_GO_URL && mkdir -p /genesis-back/bin && git rev-parse --abbrev-ref HEAD > /genesis-back/bin/$BE_BIN_BASENAME.git_branch && git rev-parse HEAD > /genesis-back/bin/$BE_BIN_BASENAME.git_commit && mkdir -p /genesis-back/data/node1 && mv $GOPATH/bin/$BE_BIN_BASENAME /genesis-back/bin/$BE_BIN_BASENAME && rm -rf /go
2425

2526
RUN mkdir /genesis-apps && \
2627
echo -n "$DEMO_APPS_URL" > /genesis-apps/demo_apps.url
@@ -40,7 +41,7 @@ RUN apt-get remove -y build-essential && apt-get autoremove -y && \
4041
COPY supervisor/supervisord.conf /etc/supervisor/
4142

4243
RUN apt-get update -y && \
43-
apt-get install -y --no-install-recommends nginx curl git gnupg2 && \
44+
apt-get install -y --no-install-recommends nginx curl git gnupg2 build-essential && \
4445
apt-get clean; (rm -rf /var/lib/apt/lists/*; :)
4546

4647
RUN curl -sL $NODEJS_SETUP_SCRIPT_URL | bash - && \
@@ -55,7 +56,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
5556
RUN git clone --recursive $FRONTEND_REPO_URL genesis-front && cd /genesis-front && git checkout $FRONT_BRANCH && git pull origin $FRONT_BRANCH && git rev-parse --abbrev-ref HEAD > /genesis-front.git_branch && git rev-parse HEAD > /genesis-front.git_commit && yarn install && yarn build && find /genesis-front -maxdepth 1 -mindepth 1 -not -name 'build*' -exec rm -rf {} \;
5657
COPY genesis-front/settings.json /genesis-front/build/
5758

58-
RUN apt-get remove -y gnupg2 && \
59+
RUN apt-get remove -y gnupg2 build-essential && \
5960
apt-get autoremove -y && \
6061
apt-get clean; (rm -rf /var/lib/apt/lists/*; :)
6162

genesis-bf/genesis-scripts

genesis-bf/scripts.config.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,24 @@ DB_PASSWORD="genesis"
66
CENT_URL="http://genesis-cf:8000"
77
BLEX_REPO_URL="https://github.com/GenesisKernel/blockexplorer"
88
BLEX_BRANCH="develop"
9+
10+
ENV_VARS_PREFIX="GENESIS"
11+
12+
BE_BIN_BASENAME="go-apla"
13+
BE_ROOT_LOG_DIR="/var/log/$BE_BIN_BASENAME"
14+
BE_BIN_DIR="$BE_ROOT/bin"
15+
BE_BIN_PATH="$BE_BIN_DIR/$BE_BIN_BASENAME"
16+
17+
SUPERVISOR_BASE_CONF_DIR="/etc/supervisor"
18+
SUPERVISOR_CONF_D_DIR="$SUPERVISOR_BASE_CONF_DIR/conf.d"
19+
SUPERVISOR_CONF_PATH="$SUPERVISOR_BASE_CONF_DIR/supervisord.conf"
20+
SUPERVISOR_BE_NODE1_CONF_PATH="$SUPERVISOR_CONF_D_DIR/$BE_BIN_BASENAME.conf"
21+
22+
read -r -d '' SUPERVISOR_BE_NODE1_CONF << EOM
23+
[program:$BE_BIN_BASENAME]
24+
command=$BE_BIN_PATH start --config=$BE_ROOT_DATA_DIR/node1/config.toml
25+
user = root
26+
stdout_events_enabled = true
27+
stderr_events_enabled = true
28+
autorestart = true
29+
EOM

genesis-blex/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
FROM debian:stretch-slim
22

33
ENV BLEX_REPO_URL https://github.com/GenesisKernel/blockexplorer
4-
ENV BLEX_BRANCH v0.2.6
4+
ENV BLEX_BRANCH v0.3.0
55
ENV SCRIPTS_REPO_URL https://github.com/blitzstern5/genesis-scripts
6-
ENV SCRIPTS_BRANCH develop
6+
ENV SCRIPTS_BRANCH v0.2.0
77

88
RUN set -ex; apt-get update -y && \
99
mkdir -p /usr/share/man/man1 && mkdir -p /usr/share/man/man7 && \
@@ -25,8 +25,8 @@ RUN git clone -b $SCRIPTS_BRANCH $SCRIPTS_REPO_URL /genesis-scripts
2525
COPY scripts.config.sh /genesis-scripts/.env
2626
COPY config.py /genesis-blex/
2727

28-
COPY start_blockexplorer.sh /
28+
#COPY start_blockexplorer.sh /
2929
COPY supervisor/supervisord.conf /etc/supervisor/
30-
COPY supervisor/conf.d/blockexplorer.conf /etc/supervisor/conf.d/
30+
#COPY supervisor/conf.d/blockexplorer.conf /etc/supervisor/conf.d/
3131

3232
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]

0 commit comments

Comments
 (0)