Skip to content

Commit 6567013

Browse files
committed
bump bsc
Signed-off-by: yoshidan <naohiro.y@gmail.com>
1 parent bbb3c22 commit 6567013

File tree

8 files changed

+18
-21
lines changed

8 files changed

+18
-21
lines changed

tests/e2e/chains/bsc/Dockerfile.bootstrap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ RUN apk add --d --no-cache npm nodejs bash alpine-sdk expect jq curl bash python
44
RUN curl -sSL https://install.python-poetry.org | python3 -
55

66
RUN git clone https://github.com/bnb-chain/bsc-genesis-contract -b develop /root/genesis \
7-
&& cd /root/genesis && git checkout bf3ac733f8aaf93ed88ca0ad2dcddd051166e4e1 && npm ci
7+
&& cd /root/genesis && git checkout 34618f607f8356cf147dde6a69fae150bd53d5bf && npm ci
88

99
RUN cd /root/genesis && /root/.local/bin/poetry install
1010
RUN cd /root/genesis && forge install --no-git --no-commit foundry-rs/forge-std@v1.7.3

tests/e2e/chains/bsc/Dockerfile.bsc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
FROM golang:1.23-alpine
1+
FROM golang:1.24-bookworm
22

33
ARG GIT_SOURCE
44
ARG GIT_CHECKOUT_BRANCH
55

6-
RUN apk add --no-cache make cmake gcc musl-dev linux-headers git bash build-base libc-dev jq
6+
RUN apt-get update && apt-get install --no-install-recommends -y \
7+
netcat-openbsd \
8+
&& rm -rf /var/cache/apt/*
79

810
ENV CGO_CFLAGS="-O -D__BLST_PORTABLE__"
911
ENV CGO_CFLAGS_ALLOW="-O -D__BLST_PORTABLE__"

tests/e2e/chains/bsc/docker-compose.bsc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ services:
55
dockerfile: Dockerfile.bsc
66
args:
77
GIT_SOURCE: https://github.com/bnb-chain/bsc
8-
GIT_CHECKOUT_BRANCH: v1.5.13
8+
GIT_CHECKOUT_BRANCH: v1.6.2
99
image: bsc-geth:docker-local

tests/e2e/chains/bsc/genesis/genesis-template.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"pragueTime": 0,
3838
"lorentzTime": 0,
3939
"maxwellTime": 0,
40+
"fermiTime": 0,
4041
"blobSchedule": {
4142
"cancun": {
4243
"target": 3,

tests/e2e/chains/bsc/scripts/bootstrap.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ function init_validator() {
2525
echo ${validatorAddr} >${workspace}/storage/${node_id}/address
2626

2727
# create new BLS vote address
28-
expect ${workspace}/scripts/create_bls_key.sh ${workspace}/storage/${node_id}
29-
voteAddr=0x$(cat ${workspace}/storage/${node_id}/bls/keystore/*json| jq .pubkey | sed 's/"//g')
28+
${workspace}/scripts/create_bls_key.sh ${workspace}/storage/${node_id} ${workspace}/scripts/wallet_password.txt
29+
voteAddr=0x$(jq -r .pubkey ${workspace}/storage/${node_id}/bls/keystore/*json)
3030
echo $voteAddr
3131

3232
echo "${validatorAddr},${validatorAddr},${validatorAddr},0x0000000010000000,${voteAddr}" >>scripts/validators.conf

tests/e2e/chains/bsc/scripts/bsc-rpc.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ while [ "$i" -lt ${account_cnt} ]; do
1212
i=$((i + 1))
1313
done
1414

15+
HOST_IP=$(hostname -i)
16+
1517
ETHSTATS=""
16-
geth --config ${DATA_DIR}/config.toml --datadir ${DATA_DIR} --netrestrict ${CLUSTER_CIDR} --gcmode archive \
18+
# Use exec to handle signals
19+
exec geth --config ${DATA_DIR}/config.toml --datadir ${DATA_DIR} --netrestrict ${CLUSTER_CIDR} \
1720
--state.scheme=hash --db.engine=leveldb --verbosity ${VERBOSE} --nousb ${ETHSTATS} \
18-
--unlock ${unlock_sequences} --password /dev/null --ipcpath /gethipc --override.fixedturnlength 2
21+
--unlock ${unlock_sequences} --password /dev/null --ipcpath /gethipc --override.fixedturnlength 2 -nat extip:${HOST_IP}

tests/e2e/chains/bsc/scripts/bsc-validator.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ geth --config ${DATA_DIR}/config.toml --datadir ${DATA_DIR} --netrestrict ${CLUS
1414
--verbosity ${VERBOSE} --nousb ${ETHSTATS} --state.scheme=hash --db.engine=leveldb \
1515
--bootnodes enode://${BOOTSTRAP_PUB_KEY}@${BOOTSTRAP_IP}:${BOOTSTRAP_TCP_PORT} \
1616
--mine --miner.etherbase=${VALIDATOR_ADDR} -unlock ${VALIDATOR_ADDR} --password /dev/null --blspassword /scripts/wallet_password.txt \
17-
--light.serve 50 --pprof.addr 0.0.0.0 --metrics \
17+
--pprof.addr 0.0.0.0 --metrics \
1818
--rpc.allow-unprotected-txs --history.transactions 15768000 \
19-
--pprof --ipcpath /gethipc --vote --override.fixedturnlength 2
19+
--pprof --ipcpath /gethipc --vote --override.fixedturnlength 2 --nat extip:${HOST_IP}
Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
#!/usr/bin/expect
2-
# 10 characters at least wanted
3-
set wallet_password 1234567890
1+
#!/usr/bin/bash
42

5-
set timeout 5
6-
sleep 10
7-
spawn geth bls account new --datadir [lindex $argv 0]
8-
expect "*assword:*"
9-
send "$wallet_password\r"
10-
expect "*assword:*"
11-
send "$wallet_password\r"
12-
expect EOF
3+
geth bls account new --datadir $1 --blspassword $2

0 commit comments

Comments
 (0)