diff --git a/kintsugi/gethdocker/common-setup.sh b/kintsugi/gethdocker/common-setup.sh index ba60a0cdca51..dcfd60420de3 100755 --- a/kintsugi/gethdocker/common-setup.sh +++ b/kintsugi/gethdocker/common-setup.sh @@ -2,9 +2,11 @@ echo $TTD echo $DATA_DIR -echo $scriptDir echo $EL_BINARY_DIR +echo $scriptDir +echo $currentDir + env TTD=$TTD envsubst < $scriptDir/genesisPre.tmpl > $DATA_DIR/genesis.json echo "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8" > $DATA_DIR/sk.json @@ -12,5 +14,5 @@ echo "12345678" > $DATA_DIR/password.txt pubKey="0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" -docker run --rm -u $(id -u ${USER}):$(id -g ${USER}) -v /mnt/code/lodestar/mergetest/packages/lodestar/$DATA_DIR:/data $EL_BINARY_DIR geth --catalyst --datadir /data init /data/genesis.json -docker run --rm -u $(id -u ${USER}):$(id -g ${USER}) -v /mnt/code/lodestar/mergetest/packages/lodestar/$DATA_DIR:/data $EL_BINARY_DIR geth --catalyst --datadir /data account import /data/sk.json --password /data/password.txt +docker run --rm -u $(id -u ${USER}):$(id -g ${USER}) -v $currentDir/$DATA_DIR:/data $EL_BINARY_DIR geth --catalyst --datadir /data init /data/genesis.json +docker run --rm -u $(id -u ${USER}):$(id -g ${USER}) -v $currentDir/$DATA_DIR:/data $EL_BINARY_DIR geth --catalyst --datadir /data account import /data/sk.json --password /data/password.txt diff --git a/kintsugi/gethdocker/post-merge.sh b/kintsugi/gethdocker/post-merge.sh index fce3105cac49..93b0e297b204 100755 --- a/kintsugi/gethdocker/post-merge.sh +++ b/kintsugi/gethdocker/post-merge.sh @@ -1,6 +1,8 @@ #!/bin/bash -x scriptDir=$(dirname $0) +currentDir=$(pwd) + . $scriptDir/common-setup.sh -docker run --rm -u $(id -u ${USER}):$(id -g ${USER}) --network host -v /mnt/code/lodestar/mergetest/packages/lodestar/$DATA_DIR:/data $EL_BINARY_DIR geth --catalyst --http --ws -http.api "engine,net,eth" --allow-insecure-unlock --unlock $pubKey --password /data/password.txt --datadir /data +docker run --rm -u $(id -u ${USER}):$(id -g ${USER}) --network host -v $currentDir/$DATA_DIR:/data $EL_BINARY_DIR geth --catalyst --http --ws -http.api "engine,net,eth" --allow-insecure-unlock --unlock $pubKey --password /data/password.txt --datadir /data diff --git a/kintsugi/gethdocker/pre-merge.sh b/kintsugi/gethdocker/pre-merge.sh index 69a763be406a..beb7ef82870d 100755 --- a/kintsugi/gethdocker/pre-merge.sh +++ b/kintsugi/gethdocker/pre-merge.sh @@ -1,7 +1,9 @@ #!/bin/bash -x scriptDir=$(dirname $0) +currentDir=$(pwd) + . $scriptDir/common-setup.sh # EL_BINARY_DIR refers to the local docker image build from kintsugi/gethdocker folder -docker run --rm -u $(id -u ${USER}):$(id -g ${USER}) --network host -v /mnt/code/lodestar/mergetest/packages/lodestar/$DATA_DIR:/data $EL_BINARY_DIR geth --catalyst --http --ws -http.api "engine,net,eth,miner" --allow-insecure-unlock --unlock $pubKey --password /data/password.txt --datadir /data --nodiscover --mine +docker run --rm -u $(id -u ${USER}):$(id -g ${USER}) --network host -v $currentDir/$DATA_DIR:/data $EL_BINARY_DIR geth --catalyst --http --ws -http.api "engine,net,eth,miner" --allow-insecure-unlock --unlock $pubKey --password /data/password.txt --datadir /data --nodiscover --mine