Skip to content

Commit acbd6ef

Browse files
ceyonurceyonur
committed
bump avago version
1 parent 8512fc7 commit acbd6ef

File tree

4 files changed

+70
-76
lines changed

4 files changed

+70
-76
lines changed

‎build/avalanche-network-runner

62.3 MB
Binary file not shown.

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/ava-labs/avalanche-network-runner
33
go 1.19
44

55
require (
6-
github.com/ava-labs/avalanchego v1.10.9
7-
github.com/ava-labs/coreth v0.12.5-rc.3
6+
github.com/ava-labs/avalanchego v1.10.10
7+
github.com/ava-labs/coreth v0.12.5-rc.6
88
github.com/ethereum/go-ethereum v1.12.0
99
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2
1010
github.com/onsi/ginkgo/v2 v2.8.1

‎go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah
5959
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
6060
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
6161
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
62-
github.com/ava-labs/avalanchego v1.10.9 h1:qxhp3YoD2Wm/iIKP6Wb1isbkUPWmIrJxWgivDoL0obM=
63-
github.com/ava-labs/avalanchego v1.10.9/go.mod h1:C8R5uiltpc8MQ62ixxgODR+15mesWF0aAw3H+Qrl9Iw=
64-
github.com/ava-labs/coreth v0.12.5-rc.3 h1:cpmC+fSZMsO4gaFWqXHzAHrJACf05u5HPAYmwh7nmkU=
65-
github.com/ava-labs/coreth v0.12.5-rc.3/go.mod h1:HI+jTIflnDFBd0bledgkgid1Uurwr8q1h7zb3LsFsSo=
62+
github.com/ava-labs/avalanchego v1.10.10 h1:EYX4LVotcfdtIQ0nJSBTcoisubx/Bzk2tM1aP3yiYiw=
63+
github.com/ava-labs/avalanchego v1.10.10/go.mod h1:6UA0nxxTvvpyuCbP2DSzx9+7uWQfQx9DPApK8JptLiE=
64+
github.com/ava-labs/coreth v0.12.5-rc.6 h1:OajGUyKkO5Q82XSuMa8T5UD6QywtCHUiZ4Tv3RFmRBU=
65+
github.com/ava-labs/coreth v0.12.5-rc.6/go.mod h1:s5wVyy+5UCCk2m0Tq3jVmy0UqOpKBDYqRE13gInCJVs=
6666
github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
6767
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
6868
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

‎scripts/tests.e2e.sh

+64-70
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,33 @@ fi
1212

1313
ANR_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
1414

15-
DEFAULT_VERSION_1=v1.10.9
15+
DEFAULT_VERSION_1=v1.10.10
1616
DEFAULT_VERSION_2=v1.10.9
17-
DEFAULT_SUBNET_EVM_VERSION=4f24c8de30749bca33aa56533a2c32cafc1cfccc
17+
DEFAULT_SUBNET_EVM_VERSION=v0.5.5
1818

1919
if [ $# == 0 ]; then
20-
VERSION_1=$DEFAULT_VERSION_1
21-
VERSION_2=$DEFAULT_VERSION_2
22-
SUBNET_EVM_VERSION=$DEFAULT_SUBNET_EVM_VERSION
20+
VERSION_1=$DEFAULT_VERSION_1
21+
VERSION_2=$DEFAULT_VERSION_2
22+
SUBNET_EVM_VERSION=$DEFAULT_SUBNET_EVM_VERSION
2323
else
24-
VERSION_1=$1
25-
if [[ -z "${VERSION_1}" ]]; then
26-
echo "Missing version argument!"
27-
echo "Usage: ${0} [VERSION_1] [VERSION_2] [SUBNET_EVM_VERSION]" >> /dev/stderr
28-
exit 255
29-
fi
30-
VERSION_2=$2
31-
if [[ -z "${VERSION_2}" ]]; then
32-
echo "Missing version argument!"
33-
echo "Usage: ${0} [VERSION_1] [VERSION_2] [SUBNET_EVM_VERSION]" >> /dev/stderr
34-
exit 255
35-
fi
36-
SUBNET_EVM_VERSION=$3
37-
if [[ -z "${SUBNET_EVM_VERSION}" ]]; then
38-
echo "Missing version argument!"
39-
echo "Usage: ${0} [VERSION_1] [VERSION_2] [SUBNET_EVM_VERSION]" >> /dev/stderr
40-
exit 255
41-
fi
24+
VERSION_1=$1
25+
if [[ -z "${VERSION_1}" ]]; then
26+
echo "Missing version argument!"
27+
echo "Usage: ${0} [VERSION_1] [VERSION_2] [SUBNET_EVM_VERSION]" >>/dev/stderr
28+
exit 255
29+
fi
30+
VERSION_2=$2
31+
if [[ -z "${VERSION_2}" ]]; then
32+
echo "Missing version argument!"
33+
echo "Usage: ${0} [VERSION_1] [VERSION_2] [SUBNET_EVM_VERSION]" >>/dev/stderr
34+
exit 255
35+
fi
36+
SUBNET_EVM_VERSION=$3
37+
if [[ -z "${SUBNET_EVM_VERSION}" ]]; then
38+
echo "Missing version argument!"
39+
echo "Usage: ${0} [VERSION_1] [VERSION_2] [SUBNET_EVM_VERSION]" >>/dev/stderr
40+
exit 255
41+
fi
4242
fi
4343

4444
echo "Running e2e tests with:"
@@ -56,51 +56,46 @@ export CGO_CFLAGS="-O -D__BLST_PORTABLE__"
5656
############################
5757
AVALANCHEGO_REPO=/tmp/avalanchego-repo/
5858

59-
if [ ! -d $AVALANCHEGO_REPO ]
60-
then
61-
git clone https://github.com/ava-labs/avalanchego/ $AVALANCHEGO_REPO
59+
if [ ! -d $AVALANCHEGO_REPO ]; then
60+
git clone https://github.com/ava-labs/avalanchego/ $AVALANCHEGO_REPO
6261
fi
6362

6463
VERSION_1_DIR=/tmp/avalanchego-${VERSION_1}/
65-
if [ ! -f ${VERSION_1_DIR}/avalanchego ]
66-
then
67-
echo building avalanchego $VERSION_1
68-
rm -rf ${VERSION_1_DIR}
69-
mkdir -p ${VERSION_1_DIR}
70-
cd $AVALANCHEGO_REPO
71-
git checkout $VERSION_1
72-
./scripts/build.sh
73-
cp -r build/* ${VERSION_1_DIR}
64+
if [ ! -f ${VERSION_1_DIR}/avalanchego ]; then
65+
echo building avalanchego $VERSION_1
66+
rm -rf ${VERSION_1_DIR}
67+
mkdir -p ${VERSION_1_DIR}
68+
cd $AVALANCHEGO_REPO
69+
git checkout $VERSION_1
70+
./scripts/build.sh
71+
cp -r build/* ${VERSION_1_DIR}
7472
fi
7573

7674
VERSION_2_DIR=/tmp/avalanchego-${VERSION_2}/
77-
if [ ! -f ${VERSION_2_DIR}/avalanchego ]
78-
then
79-
echo building avalanchego $VERSION_2
80-
rm -rf ${VERSION_2_DIR}
81-
mkdir -p ${VERSION_2_DIR}
82-
cd $AVALANCHEGO_REPO
83-
git checkout $VERSION_2
84-
./scripts/build.sh
85-
cp -r build/* ${VERSION_2_DIR}
75+
if [ ! -f ${VERSION_2_DIR}/avalanchego ]; then
76+
echo building avalanchego $VERSION_2
77+
rm -rf ${VERSION_2_DIR}
78+
mkdir -p ${VERSION_2_DIR}
79+
cd $AVALANCHEGO_REPO
80+
git checkout $VERSION_2
81+
./scripts/build.sh
82+
cp -r build/* ${VERSION_2_DIR}
8683
fi
8784

8885
SUBNET_EVM_REPO=/tmp/subnet-evm-repo/
89-
if [ ! -d $SUBNET_EVM_REPO ]
90-
then
91-
git clone https://github.com/ava-labs/subnet-evm/ $SUBNET_EVM_REPO
86+
if [ ! -d $SUBNET_EVM_REPO ]; then
87+
git clone https://github.com/ava-labs/subnet-evm/ $SUBNET_EVM_REPO
9288
fi
9389

9490
SUBNET_EVM_VERSION_DIR=/tmp/subnet-evm-${SUBNET_EVM_VERSION}/
95-
if [ ! -f $VERSION_1_DIR/plugins/srEXiWaHuhNyGwPUi444Tu47ZEDwxTWrbQiuD7FmgSAQ6X7Dy ]
96-
then
97-
echo building subnet-evm $SUBNET_EVM_VERSION
98-
rm -rf ${SUBNET_EVM_VERSION_DIR}
99-
mkdir -p ${SUBNET_EVM_VERSION_DIR}
100-
cd $SUBNET_EVM_REPO
101-
git checkout $SUBNET_EVM_VERSION
102-
# NOTE: We are copying the subnet-evm binary here to a plugin hardcoded as srEXiWaHuhNyGwPUi444Tu47ZEDwxTWrbQiuD7FmgSAQ6X7Dy which corresponds to the VM name `subnetevm` used as such in the test
103-
./scripts/build.sh $VERSION_1_DIR/plugins/srEXiWaHuhNyGwPUi444Tu47ZEDwxTWrbQiuD7FmgSAQ6X7Dy
91+
if [ ! -f $VERSION_1_DIR/plugins/srEXiWaHuhNyGwPUi444Tu47ZEDwxTWrbQiuD7FmgSAQ6X7Dy ]; then
92+
echo building subnet-evm $SUBNET_EVM_VERSION
93+
rm -rf ${SUBNET_EVM_VERSION_DIR}
94+
mkdir -p ${SUBNET_EVM_VERSION_DIR}
95+
cd $SUBNET_EVM_REPO
96+
git checkout $SUBNET_EVM_VERSION
97+
# NOTE: We are copying the subnet-evm binary here to a plugin hardcoded as srEXiWaHuhNyGwPUi444Tu47ZEDwxTWrbQiuD7FmgSAQ6X7Dy which corresponds to the VM name `subnetevm` used as such in the test
98+
./scripts/build.sh $VERSION_1_DIR/plugins/srEXiWaHuhNyGwPUi444Tu47ZEDwxTWrbQiuD7FmgSAQ6X7Dy
10499
fi
105100

106101
############################
@@ -123,27 +118,26 @@ killall avalanche-network-runner || true
123118

124119
echo "launch local test cluster in the background"
125120
bin/avalanche-network-runner \
126-
server \
127-
--log-level debug \
128-
--port=":8080" \
129-
--snapshots-dir=$snapshots_dir \
130-
--grpc-gateway-port=":8081" &
121+
server \
122+
--log-level debug \
123+
--port=":8080" \
124+
--snapshots-dir=$snapshots_dir \
125+
--grpc-gateway-port=":8081" &
131126
#--disable-nodes-output \
132127
PID=${!}
133128

134-
function cleanup()
135-
{
129+
function cleanup() {
136130
echo "shutting down network runner"
137131
kill ${PID}
138132
}
139133
trap cleanup EXIT
140134

141135
echo "running e2e tests"
142136
./tests/e2e/e2e.test \
143-
--ginkgo.v \
144-
--ginkgo.fail-fast \
145-
--log-level debug \
146-
--grpc-endpoint="0.0.0.0:8080" \
147-
--grpc-gateway-endpoint="0.0.0.0:8081" \
148-
--avalanchego-path-1=${VERSION_1_DIR}/avalanchego \
149-
--avalanchego-path-2=${VERSION_2_DIR}/avalanchego
137+
--ginkgo.v \
138+
--ginkgo.fail-fast \
139+
--log-level debug \
140+
--grpc-endpoint="0.0.0.0:8080" \
141+
--grpc-gateway-endpoint="0.0.0.0:8081" \
142+
--avalanchego-path-1=${VERSION_1_DIR}/avalanchego \
143+
--avalanchego-path-2=${VERSION_2_DIR}/avalanchego

0 commit comments

Comments
 (0)