Release v2.4

README.md

@@ -1,13 +1,15 @@
+<p align="center">
+  <img width="33%" src="https://user-images.githubusercontent.com/963333/130191619-f1f0c342-ab8f-499d-b8f8-52309c13d2cb.png"/>
+</p>
+
 # ibet-Network
 
 <p>
-  <img alt="Version" src="https://img.shields.io/badge/version-2.3-blue.svg?cacheSeconds=2592000" />
+  <img alt="Version" src="https://img.shields.io/badge/version-2.4-blue.svg?cacheSeconds=2592000" />
 </p>
 
 English | [日本語](./README_JA.md)
 
-<img width="33%" align="right" src="https://user-images.githubusercontent.com/963333/130191619-f1f0c342-ab8f-499d-b8f8-52309c13d2cb.png"/>
-
 ## Features
 
 [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
 
 ## Quorum Version
 
-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. 
+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. 
 The node application has been optimized for ibet Network and partially differs from that of Quorum itself.
 For more information, please refer to the following project.
 

README_JA.md

@@ -1,13 +1,15 @@
+<p align="center">
+  <img width="33%" src="https://user-images.githubusercontent.com/963333/130191619-f1f0c342-ab8f-499d-b8f8-52309c13d2cb.png"/>
+</p>
+
 # ibet-Network
 
 <p>
-  <img alt="Version" src="https://img.shields.io/badge/version-2.3-blue.svg?cacheSeconds=2592000" />
+  <img alt="Version" src="https://img.shields.io/badge/version-2.4-blue.svg?cacheSeconds=2592000" />
 </p>
 
 [English](./README.md) | 日本語
 
-<img width="33%" align="right" src="https://user-images.githubusercontent.com/963333/130191619-f1f0c342-ab8f-499d-b8f8-52309c13d2cb.png"/>
-
 ## 特徴
 
 [ibet](https://ibet.jp/) は [株式会社BOOSTRY](https://boostry.co.jp/) が開発・運用を主導するコンソーシアムブロックチェーンです。
@@ -59,7 +61,7 @@ ibet-Networkのリポジトリは、以下の方針でバージョン管理さ
 
 ## Quorum バージョン
 
-現在、ibet Network は Quorum の v23.4.0 をベースにしたノードクライアントを利用して構築されています。
+現在、ibet Network は Quorum の v24.4.0 をベースにしたノードクライアントを利用して構築されています。
 ノードアプリケーションは ibet Network 向けに最適化されて、Quorum 本体のものとは部分的に異なります。
 詳細は以下のプロジェクトをご参照ください。
 

ibet-for-fin-network/general/Dockerfile

@@ -1,13 +1,13 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.22-alpine as builder
+FROM golang:1.23-alpine as builder
 
 WORKDIR /work
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 
 RUN git clone https://github.com/BoostryJP/quorum.git && \
     cd quorum/ && \
-    git checkout v2.3.0
+    git checkout v2.4.0
 RUN cd quorum/ && \
     make geth bootnode && \
     mv build/bin/geth /usr/local/bin && \

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

@@ -20,7 +20,7 @@ ${VHOST_OPT} \
 --networkid 1010032 \
 --nat any \
 --miner.gasprice 0 \
---verbosity 2 \
+--verbosity ${verbosity:-2} \
 --nodiscover \
 --allow-insecure-unlock \
 --miner.gastarget 800000000 \

ibet-for-fin-network/validator/Dockerfile

@@ -1,13 +1,13 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.22-alpine as builder
+FROM golang:1.23-alpine as builder
 
 WORKDIR /work
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 
 RUN git clone https://github.com/BoostryJP/quorum.git && \
     cd quorum/ && \
-    git checkout v2.3.0
+    git checkout v2.4.0
 RUN cd quorum/ && \
     make geth bootnode && \
     mv build/bin/geth /usr/local/bin && \

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

@@ -16,6 +16,12 @@
             "policy": 0,
             "testQBFTBlock": 77792450
         },
+        "transitions": [
+            {
+                "block": 999999999,
+                "emptyBlockPeriodSeconds": 10
+            }
+        ],
         "isQuorum": true
     },
     "nonce": "0x0",

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

@@ -22,7 +22,7 @@ ${VHOST_OPT} \
 --mine \
 --syncmode full \
 --miner.gasprice 0 \
---verbosity 2 \
+--verbosity ${verbosity:-2} \
 --nodiscover \
 --miner.gastarget 800000000 \
 ${PEERS_OPT} \

ibet-network/general/Dockerfile

@@ -1,13 +1,13 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.22-alpine as builder
+FROM golang:1.23-alpine as builder
 
 WORKDIR /work
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 
 RUN git clone https://github.com/BoostryJP/quorum.git && \
     cd quorum/ && \
-    git checkout v2.3.0
+    git checkout v2.4.0
 RUN cd quorum/ && \
     make geth bootnode && \
     mv build/bin/geth /usr/local/bin && \

ibet-network/general/run.sh

@@ -20,7 +20,7 @@ ${VHOST_OPT} \
 --networkid 1500002 \
 --nat any \
 --miner.gasprice 0 \
---verbosity 2 \
+--verbosity ${verbosity:-2} \
 --nodiscover \
 --allow-insecure-unlock \
 --miner.gastarget 800000000 \

ibet-network/validator/Dockerfile

@@ -1,13 +1,13 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.22-alpine as builder
+FROM golang:1.23-alpine as builder
 
 WORKDIR /work
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 
 RUN git clone https://github.com/BoostryJP/quorum.git && \
     cd quorum/ && \
-    git checkout v2.3.0
+    git checkout v2.4.0
 RUN cd quorum/ && \
     make geth bootnode && \
     mv build/bin/geth /usr/local/bin && \

ibet-network/validator/genesis.json

@@ -16,6 +16,12 @@
             "policy": 0,
             "testQBFTBlock": 100000000
         },
+        "transitions": [
+            {
+                "block": 999999999,
+                "emptyBlockPeriodSeconds": 10
+            }
+        ],
         "isQuorum": true
     },
     "nonce": "0x0",

ibet-network/validator/genesis.json_init

@@ -16,6 +16,12 @@
             "policy": 0,
             "testQBFTBlock": 100000000
         },
+        "transitions": [
+            {
+                "block": 999999999,
+                "emptyBlockPeriodSeconds": 10
+            }
+        ],
         "isQuorum": true
     },
     "nonce": "0x0",

ibet-network/validator/run.sh

@@ -22,7 +22,7 @@ ${VHOST_OPT} \
 --mine \
 --syncmode full \
 --miner.gasprice 0 \
---verbosity 2 \
+--verbosity ${verbosity:-2} \
 --nodiscover \
 --miner.gastarget 800000000 \
 ${PEERS_OPT} \

local-network/README.md

@@ -32,3 +32,11 @@ You can migrate an existing network to a Berlin hardfork network with the follow
 2. Update the docker-compose file with a non-zero `berlinBlock`.
  Set a future block number rather than the current block number.
 3. Restart the network.
+
+## Introducing Empty Block Period Seconds
+You can introduce empty block period to an existing network with the following steps:
+
+1. Stop the network.
+2. Update the docker-compose file with a non-zero `emptyBlockPeriodIntroduceBlock`.
+ Set a future block number rather than the current block number.
+3. Restart the network.

local-network/docker-compose.yml

@@ -14,10 +14,14 @@ services:
       - identity='validator-0'
       - testQBFTBlock=4
       - berlinBlock=4
+      - emptyBlockPeriodIntroduceBlock=5
       - cache=1024
+      - verbosity=3
+      - metrics=1
     ports:
       - '30303:30303'
       - '8545:8545'
+      - '6060:6060'
     networks:
       app_net:
         ipv4_address: 172.16.239.10
@@ -36,10 +40,14 @@ services:
       - identity='validator-1'
       - testQBFTBlock=4
       - berlinBlock=4
+      - emptyBlockPeriodIntroduceBlock=5
       - cache=1024
+      - verbosity=3
+      - metrics=1
     ports:
       - '30304:30303'
       - '8546:8545'
+      - '6061:6060'
     networks:
       app_net:
         ipv4_address: 172.16.239.11
@@ -58,10 +66,14 @@ services:
       - identity='validator-2'
       - testQBFTBlock=4
       - berlinBlock=4
+      - emptyBlockPeriodIntroduceBlock=5
       - cache=1024
+      - verbosity=3
+      - metrics=1
     ports:
       - '30305:30303'
       - '8547:8545'
+      - '6062:6060'
     networks:
       app_net:
         ipv4_address: 172.16.239.12
@@ -80,10 +92,14 @@ services:
       - identity='validator-3'
       - testQBFTBlock=4
       - berlinBlock=4
+      - emptyBlockPeriodIntroduceBlock=5
       - cache=1024
+      - verbosity=3
+      - metrics=1
     ports:
       - '30306:30303'
       - '8548:8545'
+      - '6063:6060'
     networks:
       app_net:
         ipv4_address: 172.16.239.13
@@ -103,9 +119,12 @@ services:
       - berlinBlock=4
       - syncmode=snap
       - cache=2048
+      - verbosity=3
+      - metrics=1
     ports:
       - '30307:30303'
       - '8549:8545'
+      - '6064:6060'
     networks:
       app_net:
         ipv4_address: 172.16.239.14

local-network/general/Dockerfile

@@ -1,13 +1,13 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.22-alpine as builder
+FROM golang:1.23-alpine as builder
 
 WORKDIR /work
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 
 RUN git clone https://github.com/BoostryJP/quorum.git && \
     cd quorum/ && \
-    git checkout v2.3.0
+    git checkout v2.4.0
 RUN cd quorum/ && \
     make geth bootnode && \
     mv build/bin/geth /usr/local/bin && \

local-network/general/run.sh

@@ -6,6 +6,7 @@ echo '["enode://6204d2b6d844adf9dd23f47027b29b1e39b08c70b8ec05f82a8037f1676c058f
 geth --datadir "/eth" init "/eth/genesis.json"
 
 test ! -z "${syncmode}" && SYNCMODE_OPT="--syncmode ${syncmode}"
+test ! -z "${metrics}" && METRICS_OPT="--metrics --metrics.addr 0.0.0.0 --metrics.port 6060"
 
 GETH_CMD="geth \
 --datadir /eth \
@@ -19,8 +20,9 @@ GETH_CMD="geth \
 --http.api admin,eth,net,web3,istanbul,personal,txpool,debug \
 --http.corsdomain ${rpccorsdomain} \
 --http.vhosts ${rpcvhosts} \
+${METRICS_OPT} \
 --allow-insecure-unlock \
---verbosity 3 \
+--verbosity ${verbosity:-3} \
 --nodiscover \
 --miner.gasprice 0 \
 --miner.gastarget 800000000 \

local-network/validator/Dockerfile

@@ -1,13 +1,13 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.22-alpine as builder
+FROM golang:1.23-alpine as builder
 
 WORKDIR /work
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 
 RUN git clone https://github.com/BoostryJP/quorum.git && \
     cd quorum/ && \
-    git checkout v2.3.0
+    git checkout v2.4.0
 RUN cd quorum/ && \
     make geth bootnode && \
     mv build/bin/geth /usr/local/bin && \

local-network/validator/run.sh

@@ -1,10 +1,12 @@
 #!/bin/ash
 mkdir -p /eth/geth
 
-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
+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
 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
 geth --datadir "/eth" init "/eth/genesis.json"
 
+test ! -z "${metrics}" && METRICS_OPT="--metrics --metrics.addr 0.0.0.0 --metrics.port 6060"
+
 GETH_CMD="geth \
 --datadir /eth \
 --identity ${identity} \
@@ -18,8 +20,10 @@ GETH_CMD="geth \
 --http.api admin,eth,net,web3,istanbul,personal,txpool,debug \
 --http.corsdomain ${rpccorsdomain} \
 --http.vhosts ${rpcvhosts} \
+${METRICS_OPT} \
 --nodiscover \
 --allow-insecure-unlock \
+--verbosity ${verbosity:-3} \
 --metrics \
 --mine \
 --syncmode full \

test-network/general/Dockerfile

@@ -1,13 +1,13 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.22-alpine as builder
+FROM golang:1.23-alpine as builder
 
 WORKDIR /work
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 
 RUN git clone https://github.com/BoostryJP/quorum.git && \
     cd quorum/ && \
-    git checkout v2.3.0
+    git checkout v2.4.0
 RUN cd quorum/ && \
     make geth bootnode && \
     mv build/bin/geth /usr/local/bin && \

test-network/general/run.sh

@@ -20,7 +20,7 @@ ${VHOST_OPT} \
 --networkid 1500002 \
 --nat any \
 --miner.gasprice 0 \
---verbosity 2 \
+--verbosity ${verbosity:-2} \
 --nodiscover \
 --allow-insecure-unlock \
 --miner.gastarget 800000000 \

test-network/validator/Dockerfile

@@ -1,13 +1,13 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.22-alpine as builder
+FROM golang:1.23-alpine as builder
 
 WORKDIR /work
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 
 RUN git clone https://github.com/BoostryJP/quorum.git && \
     cd quorum/ && \
-    git checkout v2.3.0
+    git checkout v2.4.0
 RUN cd quorum/ && \
     make geth bootnode && \
     mv build/bin/geth /usr/local/bin && \