Skip to content

Commit c046174

Browse files
YoshihitoAsoYoshihitoAso
authored
Merge pull request #176 from BoostryJP/dev-2.4
Release v2.4
2 parents 46ec1d2 + 9f6b633 commit c046174

File tree

26 files changed

+203
-124
lines changed

26 files changed

+203
-124
lines changed

‎README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1+
<p align="center">
2+
<img width="33%" src="https://user-images.githubusercontent.com/963333/130191619-f1f0c342-ab8f-499d-b8f8-52309c13d2cb.png"/>
3+
</p>
4+
15
# ibet-Network
26

37
<p>
4-
<img alt="Version" src="https://img.shields.io/badge/version-2.3-blue.svg?cacheSeconds=2592000" />
8+
<img alt="Version" src="https://img.shields.io/badge/version-2.4-blue.svg?cacheSeconds=2592000" />
59
</p>
610

711
English | [日本語](./README_JA.md)
812

9-
<img width="33%" align="right" src="https://user-images.githubusercontent.com/963333/130191619-f1f0c342-ab8f-499d-b8f8-52309c13d2cb.png"/>
10-
1113
## Features
1214

1315
[ibet](https://ibet.jp/) is a consortium blockchain built and operated mainly by [BOOSTRY Co., Ltd.](https://boostry.co.jp/).
@@ -58,7 +60,7 @@ The repository of ibet-Network will be version controlled by the following polic
5860

5961
## Quorum Version
6062

61-
Currently, the ibet Network is built using a node client based on [v23.4.0](https://github.com/ConsenSys/quorum/releases/tag/v23.4.0) of Quorum.
63+
Currently, the ibet Network is built using a node client based on [v24.4.0](https://github.com/ConsenSys/quorum/releases/tag/v24.4.0) of Quorum.
6264
The node application has been optimized for ibet Network and partially differs from that of Quorum itself.
6365
For more information, please refer to the following project.
6466

‎README_JA.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1+
<p align="center">
2+
<img width="33%" src="https://user-images.githubusercontent.com/963333/130191619-f1f0c342-ab8f-499d-b8f8-52309c13d2cb.png"/>
3+
</p>
4+
15
# ibet-Network
26

37
<p>
4-
<img alt="Version" src="https://img.shields.io/badge/version-2.3-blue.svg?cacheSeconds=2592000" />
8+
<img alt="Version" src="https://img.shields.io/badge/version-2.4-blue.svg?cacheSeconds=2592000" />
59
</p>
610

711
[English](./README.md) | 日本語
812

9-
<img width="33%" align="right" src="https://user-images.githubusercontent.com/963333/130191619-f1f0c342-ab8f-499d-b8f8-52309c13d2cb.png"/>
10-
1113
## 特徴
1214

1315
[ibet](https://ibet.jp/) は [株式会社BOOSTRY](https://boostry.co.jp/) が開発・運用を主導するコンソーシアムブロックチェーンです。
@@ -59,7 +61,7 @@ ibet-Networkのリポジトリは、以下の方針でバージョン管理さ
5961

6062
## Quorum バージョン
6163

62-
現在、ibet Network は Quorum の v23.4.0 をベースにしたノードクライアントを利用して構築されています。
64+
現在、ibet Network は Quorum の v24.4.0 をベースにしたノードクライアントを利用して構築されています。
6365
ノードアプリケーションは ibet Network 向けに最適化されて、Quorum 本体のものとは部分的に異なります。
6466
詳細は以下のプロジェクトをご参照ください。
6567

‎ibet-for-fin-network/general/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Build Geth in a stock Go builder container
2-
FROM golang:1.22-alpine as builder
2+
FROM golang:1.23-alpine as builder
33

44
WORKDIR /work
55

66
RUN apk add --no-cache make gcc musl-dev linux-headers git
77

88
RUN git clone https://github.com/BoostryJP/quorum.git && \
99
cd quorum/ && \
10-
git checkout v2.3.0
10+
git checkout v2.4.0
1111
RUN cd quorum/ && \
1212
make geth bootnode && \
1313
mv build/bin/geth /usr/local/bin && \

‎ibet-for-fin-network/general/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ${VHOST_OPT} \
2020
--networkid 1010032 \
2121
--nat any \
2222
--miner.gasprice 0 \
23-
--verbosity 2 \
23+
--verbosity ${verbosity:-2} \
2424
--nodiscover \
2525
--allow-insecure-unlock \
2626
--miner.gastarget 800000000 \

‎ibet-for-fin-network/validator/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Build Geth in a stock Go builder container
2-
FROM golang:1.22-alpine as builder
2+
FROM golang:1.23-alpine as builder
33

44
WORKDIR /work
55

66
RUN apk add --no-cache make gcc musl-dev linux-headers git
77

88
RUN git clone https://github.com/BoostryJP/quorum.git && \
99
cd quorum/ && \
10-
git checkout v2.3.0
10+
git checkout v2.4.0
1111
RUN cd quorum/ && \
1212
make geth bootnode && \
1313
mv build/bin/geth /usr/local/bin && \

‎ibet-for-fin-network/validator/genesis.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616
"policy": 0,
1717
"testQBFTBlock": 77792450
1818
},
19+
"transitions": [
20+
{
21+
"block": 999999999,
22+
"emptyBlockPeriodSeconds": 10
23+
}
24+
],
1925
"isQuorum": true
2026
},
2127
"nonce": "0x0",

‎ibet-for-fin-network/validator/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ${VHOST_OPT} \
2222
--mine \
2323
--syncmode full \
2424
--miner.gasprice 0 \
25-
--verbosity 2 \
25+
--verbosity ${verbosity:-2} \
2626
--nodiscover \
2727
--miner.gastarget 800000000 \
2828
${PEERS_OPT} \

‎ibet-network/general/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Build Geth in a stock Go builder container
2-
FROM golang:1.22-alpine as builder
2+
FROM golang:1.23-alpine as builder
33

44
WORKDIR /work
55

66
RUN apk add --no-cache make gcc musl-dev linux-headers git
77

88
RUN git clone https://github.com/BoostryJP/quorum.git && \
99
cd quorum/ && \
10-
git checkout v2.3.0
10+
git checkout v2.4.0
1111
RUN cd quorum/ && \
1212
make geth bootnode && \
1313
mv build/bin/geth /usr/local/bin && \

‎ibet-network/general/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ${VHOST_OPT} \
2020
--networkid 1500002 \
2121
--nat any \
2222
--miner.gasprice 0 \
23-
--verbosity 2 \
23+
--verbosity ${verbosity:-2} \
2424
--nodiscover \
2525
--allow-insecure-unlock \
2626
--miner.gastarget 800000000 \

‎ibet-network/validator/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Build Geth in a stock Go builder container
2-
FROM golang:1.22-alpine as builder
2+
FROM golang:1.23-alpine as builder
33

44
WORKDIR /work
55

66
RUN apk add --no-cache make gcc musl-dev linux-headers git
77

88
RUN git clone https://github.com/BoostryJP/quorum.git && \
99
cd quorum/ && \
10-
git checkout v2.3.0
10+
git checkout v2.4.0
1111
RUN cd quorum/ && \
1212
make geth bootnode && \
1313
mv build/bin/geth /usr/local/bin && \

‎ibet-network/validator/genesis.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616
"policy": 0,
1717
"testQBFTBlock": 100000000
1818
},
19+
"transitions": [
20+
{
21+
"block": 999999999,
22+
"emptyBlockPeriodSeconds": 10
23+
}
24+
],
1925
"isQuorum": true
2026
},
2127
"nonce": "0x0",

‎ibet-network/validator/genesis.json_init

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616
"policy": 0,
1717
"testQBFTBlock": 100000000
1818
},
19+
"transitions": [
20+
{
21+
"block": 999999999,
22+
"emptyBlockPeriodSeconds": 10
23+
}
24+
],
1925
"isQuorum": true
2026
},
2127
"nonce": "0x0",

‎ibet-network/validator/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ${VHOST_OPT} \
2222
--mine \
2323
--syncmode full \
2424
--miner.gasprice 0 \
25-
--verbosity 2 \
25+
--verbosity ${verbosity:-2} \
2626
--nodiscover \
2727
--miner.gastarget 800000000 \
2828
${PEERS_OPT} \

‎local-network/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,11 @@ You can migrate an existing network to a Berlin hardfork network with the follow
3232
2. Update the docker-compose file with a non-zero `berlinBlock`.
3333
Set a future block number rather than the current block number.
3434
3. Restart the network.
35+
36+
## Introducing Empty Block Period Seconds
37+
You can introduce empty block period to an existing network with the following steps:
38+
39+
1. Stop the network.
40+
2. Update the docker-compose file with a non-zero `emptyBlockPeriodIntroduceBlock`.
41+
Set a future block number rather than the current block number.
42+
3. Restart the network.

‎local-network/docker-compose.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@ services:
1414
- identity='validator-0'
1515
- testQBFTBlock=4
1616
- berlinBlock=4
17+
- emptyBlockPeriodIntroduceBlock=5
1718
- cache=1024
19+
- verbosity=3
20+
- metrics=1
1821
ports:
1922
- '30303:30303'
2023
- '8545:8545'
24+
- '6060:6060'
2125
networks:
2226
app_net:
2327
ipv4_address: 172.16.239.10
@@ -36,10 +40,14 @@ services:
3640
- identity='validator-1'
3741
- testQBFTBlock=4
3842
- berlinBlock=4
43+
- emptyBlockPeriodIntroduceBlock=5
3944
- cache=1024
45+
- verbosity=3
46+
- metrics=1
4047
ports:
4148
- '30304:30303'
4249
- '8546:8545'
50+
- '6061:6060'
4351
networks:
4452
app_net:
4553
ipv4_address: 172.16.239.11
@@ -58,10 +66,14 @@ services:
5866
- identity='validator-2'
5967
- testQBFTBlock=4
6068
- berlinBlock=4
69+
- emptyBlockPeriodIntroduceBlock=5
6170
- cache=1024
71+
- verbosity=3
72+
- metrics=1
6273
ports:
6374
- '30305:30303'
6475
- '8547:8545'
76+
- '6062:6060'
6577
networks:
6678
app_net:
6779
ipv4_address: 172.16.239.12
@@ -80,10 +92,14 @@ services:
8092
- identity='validator-3'
8193
- testQBFTBlock=4
8294
- berlinBlock=4
95+
- emptyBlockPeriodIntroduceBlock=5
8396
- cache=1024
97+
- verbosity=3
98+
- metrics=1
8499
ports:
85100
- '30306:30303'
86101
- '8548:8545'
102+
- '6063:6060'
87103
networks:
88104
app_net:
89105
ipv4_address: 172.16.239.13
@@ -103,9 +119,12 @@ services:
103119
- berlinBlock=4
104120
- syncmode=snap
105121
- cache=2048
122+
- verbosity=3
123+
- metrics=1
106124
ports:
107125
- '30307:30303'
108126
- '8549:8545'
127+
- '6064:6060'
109128
networks:
110129
app_net:
111130
ipv4_address: 172.16.239.14

‎local-network/general/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Build Geth in a stock Go builder container
2-
FROM golang:1.22-alpine as builder
2+
FROM golang:1.23-alpine as builder
33

44
WORKDIR /work
55

66
RUN apk add --no-cache make gcc musl-dev linux-headers git
77

88
RUN git clone https://github.com/BoostryJP/quorum.git && \
99
cd quorum/ && \
10-
git checkout v2.3.0
10+
git checkout v2.4.0
1111
RUN cd quorum/ && \
1212
make geth bootnode && \
1313
mv build/bin/geth /usr/local/bin && \

‎local-network/general/run.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ echo '["enode://6204d2b6d844adf9dd23f47027b29b1e39b08c70b8ec05f82a8037f1676c058f
66
geth --datadir "/eth" init "/eth/genesis.json"
77

88
test ! -z "${syncmode}" && SYNCMODE_OPT="--syncmode ${syncmode}"
9+
test ! -z "${metrics}" && METRICS_OPT="--metrics --metrics.addr 0.0.0.0 --metrics.port 6060"
910

1011
GETH_CMD="geth \
1112
--datadir /eth \
@@ -19,8 +20,9 @@ GETH_CMD="geth \
1920
--http.api admin,eth,net,web3,istanbul,personal,txpool,debug \
2021
--http.corsdomain ${rpccorsdomain} \
2122
--http.vhosts ${rpcvhosts} \
23+
${METRICS_OPT} \
2224
--allow-insecure-unlock \
23-
--verbosity 3 \
25+
--verbosity ${verbosity:-3} \
2426
--nodiscover \
2527
--miner.gasprice 0 \
2628
--miner.gastarget 800000000 \

‎local-network/validator/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Build Geth in a stock Go builder container
2-
FROM golang:1.22-alpine as builder
2+
FROM golang:1.23-alpine as builder
33

44
WORKDIR /work
55

66
RUN apk add --no-cache make gcc musl-dev linux-headers git
77

88
RUN git clone https://github.com/BoostryJP/quorum.git && \
99
cd quorum/ && \
10-
git checkout v2.3.0
10+
git checkout v2.4.0
1111
RUN cd quorum/ && \
1212
make geth bootnode && \
1313
mv build/bin/geth /usr/local/bin && \

‎local-network/validator/run.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#!/bin/ash
22
mkdir -p /eth/geth
33

4-
echo '{"config":{"chainId":2017,"homesteadBlock":1,"eip150Block":2,"eip150Hash":"0x0000000000000000000000000000000000000000000000000000000000000000","eip155Block":3,"eip158Block":3,"byzantiumBlock":3,"constantinopleBlock":'${berlinBlock}',"petersburgBlock":'${berlinBlock}',"istanbulBlock":'${berlinBlock}',"berlinBlock":'${berlinBlock}',"istanbul":{"epoch":30000,"policy":0,"testQBFTBlock":'${testQBFTBlock}'}},"nonce":"0x0","timestamp":"0x5ad86387","extraData":"0x0000000000000000000000000000000000000000000000000000000000000000f89af8549447a847fbdf801154253593851ac9a2e7753235349403ee8c85944b16dfa517cb0ddefe123c7341a5349435d56a7515e824be4122f033d60063d035573a0c94c25d04978fd86ee604feb88f3c635d555eb6d42db8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0","gasLimit":"0x2faf0800","difficulty":"0x1","mixHash":"0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365","coinbase":"0x0000000000000000000000000000000000000000","alloc":{"03ee8c85944b16dfa517cb0ddefe123c7341a534":{"balance":"0x446c3b15f9926687d2c40534fdb564000000000000"},"35d56a7515e824be4122f033d60063d035573a0c":{"balance":"0x446c3b15f9926687d2c40534fdb564000000000000"},"47a847fbdf801154253593851ac9a2e775323534":{"balance":"0x446c3b15f9926687d2c40534fdb564000000000000"},"c25d04978fd86ee604feb88f3c635d555eb6d42d":{"balance":"0x446c3b15f9926687d2c40534fdb564000000000000"}},"number":"0x0","gasUsed":"0x0","parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000"}' > /eth/genesis.json
4+
echo '{"config":{"chainId":2017,"homesteadBlock":1,"eip150Block":2,"eip150Hash":"0x0000000000000000000000000000000000000000000000000000000000000000","eip155Block":3,"eip158Block":3,"byzantiumBlock":3,"constantinopleBlock":'${berlinBlock}',"petersburgBlock":'${berlinBlock}',"istanbulBlock":'${berlinBlock}',"berlinBlock":'${berlinBlock}',"istanbul":{"epoch":30000,"policy":0,"testQBFTBlock":'${testQBFTBlock}'},"transitions":[{"block":'${emptyBlockPeriodIntroduceBlock}',"emptyBlockPeriodSeconds":10}]},"nonce":"0x0","timestamp":"0x5ad86387","extraData":"0x0000000000000000000000000000000000000000000000000000000000000000f89af8549447a847fbdf801154253593851ac9a2e7753235349403ee8c85944b16dfa517cb0ddefe123c7341a5349435d56a7515e824be4122f033d60063d035573a0c94c25d04978fd86ee604feb88f3c635d555eb6d42db8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0","gasLimit":"0x2faf0800","difficulty":"0x1","mixHash":"0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365","coinbase":"0x0000000000000000000000000000000000000000","alloc":{"03ee8c85944b16dfa517cb0ddefe123c7341a534":{"balance":"0x446c3b15f9926687d2c40534fdb564000000000000"},"35d56a7515e824be4122f033d60063d035573a0c":{"balance":"0x446c3b15f9926687d2c40534fdb564000000000000"},"47a847fbdf801154253593851ac9a2e775323534":{"balance":"0x446c3b15f9926687d2c40534fdb564000000000000"},"c25d04978fd86ee604feb88f3c635d555eb6d42d":{"balance":"0x446c3b15f9926687d2c40534fdb564000000000000"}},"number":"0x0","gasUsed":"0x0","parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000"}' > /eth/genesis.json
55
echo '["enode://6204d2b6d844adf9dd23f47027b29b1e39b08c70b8ec05f82a8037f1676c058fe80035b42f32c649cc47347889abfe7732139b9f3f243ea91f990d2d72bb87bd@172.16.239.10:30303?discport=0","enode://a573feff0859205b566385aaf85f4c858dfe4ebb07ec862a2d03e117b3e39d8220aaf1d58750440ad844ddcb623f6becc9ba07fc27db4d30cdf689f15a9b1462@172.16.239.11:30303?discport=0","enode://76b750a2a0c92d2411e4793c714a85cf01e527c7a77f70548e7f363feaf8320039cd0f2eb48235c022d39df44ec06c96060f5c25caeec8a1960a356ebd5473a1@172.16.239.12:30303?discport=0","enode://f53fff2c7ed693b627d4389b92b6d94a11b91f167193a5d31320a2b35fb752f79b3aed7dcc61961bc00b397fdf8729eb797a0b28d6c538d51232164432b67f80@172.16.239.13:30303?discport=0"]' > /eth/geth/static-nodes.json
66
geth --datadir "/eth" init "/eth/genesis.json"
77

8+
test ! -z "${metrics}" && METRICS_OPT="--metrics --metrics.addr 0.0.0.0 --metrics.port 6060"
9+
810
GETH_CMD="geth \
911
--datadir /eth \
1012
--identity ${identity} \
@@ -18,8 +20,10 @@ GETH_CMD="geth \
1820
--http.api admin,eth,net,web3,istanbul,personal,txpool,debug \
1921
--http.corsdomain ${rpccorsdomain} \
2022
--http.vhosts ${rpcvhosts} \
23+
${METRICS_OPT} \
2124
--nodiscover \
2225
--allow-insecure-unlock \
26+
--verbosity ${verbosity:-3} \
2327
--metrics \
2428
--mine \
2529
--syncmode full \

‎test-network/general/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Build Geth in a stock Go builder container
2-
FROM golang:1.22-alpine as builder
2+
FROM golang:1.23-alpine as builder
33

44
WORKDIR /work
55

66
RUN apk add --no-cache make gcc musl-dev linux-headers git
77

88
RUN git clone https://github.com/BoostryJP/quorum.git && \
99
cd quorum/ && \
10-
git checkout v2.3.0
10+
git checkout v2.4.0
1111
RUN cd quorum/ && \
1212
make geth bootnode && \
1313
mv build/bin/geth /usr/local/bin && \

‎test-network/general/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ${VHOST_OPT} \
2020
--networkid 1500002 \
2121
--nat any \
2222
--miner.gasprice 0 \
23-
--verbosity 2 \
23+
--verbosity ${verbosity:-2} \
2424
--nodiscover \
2525
--allow-insecure-unlock \
2626
--miner.gastarget 800000000 \

‎test-network/validator/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Build Geth in a stock Go builder container
2-
FROM golang:1.22-alpine as builder
2+
FROM golang:1.23-alpine as builder
33

44
WORKDIR /work
55

66
RUN apk add --no-cache make gcc musl-dev linux-headers git
77

88
RUN git clone https://github.com/BoostryJP/quorum.git && \
99
cd quorum/ && \
10-
git checkout v2.3.0
10+
git checkout v2.4.0
1111
RUN cd quorum/ && \
1212
make geth bootnode && \
1313
mv build/bin/geth /usr/local/bin && \

0 commit comments

Comments
 (0)