Skip to content

Release v2.5.0 #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
YoshihitoAso merged 7 commits into from
Mar 19, 2025
Merged

Release v2.5.0 #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4b68ca4
v2.5 doc
YoshihitoAso Feb 17, 2025
f8229da
Delete unnecessary startup options
YoshihitoAso Feb 21, 2025
bd0861a
Merge pull request #186 from BoostryJP/feature/#184
YoshihitoAso Feb 21, 2025
7ef2bbc
Upgrade quorum to v2.5.0_beta2
YoshihitoAso Mar 6, 2025
14cf0a7
Merge pull request #187 from BoostryJP/upgrade-quorum-beta2
YoshihitoAso Mar 6, 2025
14aa02b
Upgrade quorum to v2.5.0
YoshihitoAso Mar 18, 2025
abf03bd
Merge pull request #188 from BoostryJP/update-quorum
YoshihitoAso Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# ibet-Network

<p>
<img alt="Version" src="https://img.shields.io/badge/version-2.4-blue.svg?cacheSeconds=2592000" />
<img alt="Version" src="https://img.shields.io/badge/version-2.5-blue.svg?cacheSeconds=2592000" />
</p>

English | [日本語](./README_JA.md)
Expand Down
2 changes: 1 addition & 1 deletion README_JA.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# ibet-Network

<p>
<img alt="Version" src="https://img.shields.io/badge/version-2.4-blue.svg?cacheSeconds=2592000" />
<img alt="Version" src="https://img.shields.io/badge/version-2.5-blue.svg?cacheSeconds=2592000" />
</p>

[English](./README.md) | 日本語
Expand Down
4 changes: 2 additions & 2 deletions ibet-for-fin-network/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Initialize the node. You need to run only the first time.
```
$ docker run --rm --name validatorInit -e PRIVATE_CONFIG=ignore -v {mount_directory}:/eth \
ghcr.io/boostryjp/ibet-fin-network/validator:{version} \
geth --datadir /eth --nousb init /eth/genesis.json
geth --datadir /eth init /eth/genesis.json
```

Finally, start the node as follows.
Expand Down Expand Up @@ -99,7 +99,7 @@ Initialize the node. You need to run only the first time.
```
$ docker run --rm --name generalInit -e PRIVATE_CONFIG=ignore -v {mount_directory}:/eth \
ghcr.io/boostryjp/ibet-fin-network/general:{version} \
geth --datadir /eth --nousb init /eth/genesis.json
geth --datadir /eth init /eth/genesis.json
```

Finally, start the node as follows.
Expand Down
4 changes: 2 additions & 2 deletions ibet-for-fin-network/general/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Build Geth in a stock Go builder container
FROM golang:1.23-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.4.0
git checkout v2.5.0
RUN cd quorum/ && \
make geth bootnode && \
mv build/bin/geth /usr/local/bin && \
Expand Down
4 changes: 1 addition & 3 deletions ibet-for-fin-network/general/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@ ${IDENTITY_OPT} \
${VHOST_OPT} \
--networkid 1010032 \
--nat any \
--miner.gasprice 0 \
--verbosity ${verbosity:-2} \
--nodiscover \
--allow-insecure-unlock \
--miner.gastarget 800000000 \
${PEERS_OPT} \
${SYNCMODE_OPT} \
--nousb"
${SYNCMODE_OPT}"

if [ -z "${BLOCK_SYNC_MONITORING_DISABLED}" ] || [ "${BLOCK_SYNC_MONITORING_DISABLED}" -ne 1 ]; then
ash -c "nohup python monitoring/monitor_block_sync.py > /dev/stdout 2>&1 &"
Expand Down
4 changes: 2 additions & 2 deletions ibet-for-fin-network/validator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Build Geth in a stock Go builder container
FROM golang:1.23-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.4.0
git checkout v2.5.0
RUN cd quorum/ && \
make geth bootnode && \
mv build/bin/geth /usr/local/bin && \
Expand Down
4 changes: 1 addition & 3 deletions ibet-for-fin-network/validator/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@ ${VHOST_OPT} \
--nodekeyhex $nodekeyhex \
--mine \
--syncmode full \
--miner.gasprice 0 \
--verbosity ${verbosity:-2} \
--nodiscover \
--miner.gastarget 800000000 \
${PEERS_OPT} \
--nousb"
${PEERS_OPT}"

ash -c "nohup ${GETH_CMD//\*/\\\*} > /dev/stdout 2>&1 &"

Expand Down
4 changes: 2 additions & 2 deletions ibet-network/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Initialize the node. You need to run only the first time.
```
$ docker run --rm --name validatorInit -e PRIVATE_CONFIG=ignore -v {mount_directory}:/eth \
ghcr.io/boostryjp/ibet-network/validator:{version} \
geth --datadir /eth --nousb init /eth/genesis.json_init
geth --datadir /eth init /eth/genesis.json_init
```

Finally, start the node as follows.
Expand Down Expand Up @@ -102,7 +102,7 @@ Initialize the node. You need to run only the first time.
```
$ docker run --rm --name generalInit -e PRIVATE_CONFIG=ignore -v {mount_directory}:/eth \
ghcr.io/boostryjp/ibet-network/general:{version} \
geth --datadir /eth --nousb init /eth/genesis.json_init
geth --datadir /eth init /eth/genesis.json_init
```

Finally, start the node as follows.
Expand Down
4 changes: 2 additions & 2 deletions ibet-network/general/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Build Geth in a stock Go builder container
FROM golang:1.23-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.4.0
git checkout v2.5.0
RUN cd quorum/ && \
make geth bootnode && \
mv build/bin/geth /usr/local/bin && \
Expand Down
4 changes: 1 addition & 3 deletions ibet-network/general/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@ ${IDENTITY_OPT} \
${VHOST_OPT} \
--networkid 1500002 \
--nat any \
--miner.gasprice 0 \
--verbosity ${verbosity:-2} \
--nodiscover \
--allow-insecure-unlock \
--miner.gastarget 800000000 \
${PEERS_OPT} \
${SYNCMODE_OPT} \
--nousb"
${SYNCMODE_OPT}"

if [ -z "${BLOCK_SYNC_MONITORING_DISABLED}" ] || [ "${BLOCK_SYNC_MONITORING_DISABLED}" -ne 1 ]; then
ash -c "nohup python monitoring/monitor_block_sync.py > /dev/stdout 2>&1 &"
Expand Down
4 changes: 2 additions & 2 deletions ibet-network/validator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Build Geth in a stock Go builder container
FROM golang:1.23-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.4.0
git checkout v2.5.0
RUN cd quorum/ && \
make geth bootnode && \
mv build/bin/geth /usr/local/bin && \
Expand Down
4 changes: 1 addition & 3 deletions ibet-network/validator/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@ ${VHOST_OPT} \
--nodekeyhex $nodekeyhex \
--mine \
--syncmode full \
--miner.gasprice 0 \
--verbosity ${verbosity:-2} \
--nodiscover \
--miner.gastarget 800000000 \
${PEERS_OPT} \
--nousb"
${PEERS_OPT}"

ash -c "nohup ${GETH_CMD//\*/\\\*} > /dev/stdout 2>&1 &"

Expand Down
11 changes: 5 additions & 6 deletions local-network/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
version: '3'
services:
validator-0:
hostname: validator-0
image: ghcr.io/boostryjp/ibet-localnet/validator:v2.4.0
image: ghcr.io/boostryjp/ibet-localnet/validator:v2.5.0
volumes:
- /home/ubuntu/quorum_data/v0:/eth
environment:
Expand All @@ -28,7 +27,7 @@ services:
restart: always
validator-1:
hostname: validator-1
image: ghcr.io/boostryjp/ibet-localnet/validator:v2.4.0
image: ghcr.io/boostryjp/ibet-localnet/validator:v2.5.0
volumes:
- /home/ubuntu/quorum_data/v1:/eth
environment:
Expand All @@ -54,7 +53,7 @@ services:
restart: always
validator-2:
hostname: validator-2
image: ghcr.io/boostryjp/ibet-localnet/validator:v2.4.0
image: ghcr.io/boostryjp/ibet-localnet/validator:v2.5.0
volumes:
- /home/ubuntu/quorum_data/v2:/eth
environment:
Expand All @@ -80,7 +79,7 @@ services:
restart: always
validator-3:
hostname: validator-3
image: ghcr.io/boostryjp/ibet-localnet/validator:v2.4.0
image: ghcr.io/boostryjp/ibet-localnet/validator:v2.5.0
volumes:
- /home/ubuntu/quorum_data/v3:/eth
environment:
Expand All @@ -106,7 +105,7 @@ services:
restart: always
general-0:
hostname: general-0
image: ghcr.io/boostryjp/ibet-localnet/general:v2.4.0
image: ghcr.io/boostryjp/ibet-localnet/general:v2.5.0
volumes:
- /home/ubuntu/quorum_data/g0:/eth
environment:
Expand Down
4 changes: 2 additions & 2 deletions local-network/general/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Build Geth in a stock Go builder container
FROM golang:1.23-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.4.0
git checkout v2.5.0
RUN cd quorum/ && \
make geth bootnode && \
mv build/bin/geth /usr/local/bin && \
Expand Down
4 changes: 1 addition & 3 deletions local-network/general/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@ ${METRICS_OPT} \
--allow-insecure-unlock \
--verbosity ${verbosity:-3} \
--nodiscover \
--miner.gasprice 0 \
--miner.gastarget 800000000 \
${SYNCMODE_OPT} \
--cache ${cache} \
--nousb"
--cache ${cache}"

if [ -z "${BLOCK_SYNC_MONITORING_DISABLED}" ] || [ "${BLOCK_SYNC_MONITORING_DISABLED}" -ne 1 ]; then
ash -c "nohup python monitoring/monitor_block_sync.py > /dev/stdout 2>&1 &"
Expand Down
4 changes: 2 additions & 2 deletions local-network/validator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Build Geth in a stock Go builder container
FROM golang:1.23-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.4.0
git checkout v2.5.0
RUN cd quorum/ && \
make geth bootnode && \
mv build/bin/geth /usr/local/bin && \
Expand Down
4 changes: 1 addition & 3 deletions local-network/validator/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@ ${METRICS_OPT} \
--metrics \
--mine \
--syncmode full \
--miner.gasprice 0 \
--miner.gastarget 800000000 \
--cache ${cache} \
--nousb"
--cache ${cache}"

ash -c "nohup ${GETH_CMD//\*/\\\*} > /dev/stdout 2>&1 &"

Expand Down
4 changes: 2 additions & 2 deletions test-network/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Initialize the node. You need to run only the first time.
```
$ docker run --rm --name validatorInit -e PRIVATE_CONFIG=ignore -v {mount_directory}:/eth \
ghcr.io/boostryjp/ibet-testnet/validator:{version} \
geth --datadir /eth --nousb init /eth/genesis.json_init
geth --datadir /eth init /eth/genesis.json_init
```

Finally, start the node as follows.
Expand Down Expand Up @@ -102,7 +102,7 @@ Initialize the node. You need to run only the first time.
```
$ docker run --rm --name generalInit -e PRIVATE_CONFIG=ignore -v {mount_directory}:/eth \
ghcr.io/boostryjp/ibet-testnet/general:{version} \
geth --datadir /eth --nousb init /eth/genesis.json_init
geth --datadir /eth init /eth/genesis.json_init
```

Finally, start the node as follows.
Expand Down
4 changes: 2 additions & 2 deletions test-network/general/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Build Geth in a stock Go builder container
FROM golang:1.23-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.4.0
git checkout v2.5.0
RUN cd quorum/ && \
make geth bootnode && \
mv build/bin/geth /usr/local/bin && \
Expand Down
4 changes: 1 addition & 3 deletions test-network/general/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@ ${IDENTITY_OPT} \
${VHOST_OPT} \
--networkid 1500002 \
--nat any \
--miner.gasprice 0 \
--verbosity ${verbosity:-2} \
--nodiscover \
--allow-insecure-unlock \
--miner.gastarget 800000000 \
${PEERS_OPT} \
${SYNCMODE_OPT} \
--nousb"
${SYNCMODE_OPT}"

if [ -z "${BLOCK_SYNC_MONITORING_DISABLED}" ] || [ "${BLOCK_SYNC_MONITORING_DISABLED}" -ne 1 ]; then
ash -c "nohup python monitoring/monitor_block_sync.py > /dev/stdout 2>&1 &"
Expand Down
4 changes: 2 additions & 2 deletions test-network/validator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Build Geth in a stock Go builder container
FROM golang:1.23-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.4.0
git checkout v2.5.0
RUN cd quorum/ && \
make geth bootnode && \
mv build/bin/geth /usr/local/bin && \
Expand Down
4 changes: 1 addition & 3 deletions test-network/validator/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@ ${VHOST_OPT} \
--nodekeyhex $nodekeyhex \
--mine \
--syncmode full \
--miner.gasprice 0 \
--verbosity ${verbosity:-2} \
--nodiscover \
--miner.gastarget 800000000 \
${PEERS_OPT} \
--nousb"
${PEERS_OPT}"

ash -c "nohup ${GETH_CMD//\*/\\\*} > /dev/stdout 2>&1 &"

Expand Down
6 changes: 3 additions & 3 deletions tests/e2e_testing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The contract code to be tested is `tests/contracts/E2ETest.sol`.
Compile the contract code.

````shell
$ poetry run python tests/compile.py
$ poetry run python compile.py
````

After successful completion, `E2ETest.json` will be created in tests/contracts.
Expand All @@ -40,13 +40,13 @@ After successful completion, `E2ETest.json` will be created in tests/contracts.
Deploy the contract with the following command.

```shell
$ python tests/deploy.py
$ poetry run python deploy.py
DEPLOYED_CONTRACT_ADDRESS=0x79448CB02a0F8cff71005963075187aAD9a050f3
$ export DEPLOYED_CONTRACT_ADDRESS=0x79448CB02a0F8cff71005963075187aAD9a050f3
```

### Running the e2e tests

```shell
$ poetry run pytest tests/
$ poetry run pytest . -vv
```
2 changes: 1 addition & 1 deletion tests/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "ibet-Network tests"
version = "2.3"
version = "2.5"
description = "E2E tests from python client to Quorum node containers"
authors = ["BOOSTRY Co., Ltd. <dev@boostry.co.jp>"]

Expand Down