From 815715de28ea0ab0af8bc247c21ac9df3be0106d Mon Sep 17 00:00:00 2001 From: Ilya Raykker Date: Fri, 13 Dec 2024 18:20:18 +0400 Subject: [PATCH] Fix ci scripts --- deployment/ci/bootstrap_init.sh | 20 ++++++++++---------- deployment/ci/node_init.sh | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/deployment/ci/bootstrap_init.sh b/deployment/ci/bootstrap_init.sh index e8dcf4f66..e2cff7cfa 100644 --- a/deployment/ci/bootstrap_init.sh +++ b/deployment/ci/bootstrap_init.sh @@ -5,8 +5,8 @@ set -euvo pipefail rm -rf ~/.secretd/* rm -rf /opt/secret/.sgx_secrets/* -secretd config chain-id secretdev-1 -secretd config keyring-backend test +secretd config set client chain-id secretdev-1 +secretd config set client keyring-backend test secretd init banana --chain-id secretdev-1 @@ -25,17 +25,17 @@ echo $b_mnemonic | secretd keys add b --recover echo $c_mnemonic | secretd keys add c --recover echo $d_mnemonic | secretd keys add d --recover -secretd add-genesis-account "$(secretd keys show -a a)" 1000000000000000000uscrt -secretd add-genesis-account "$(secretd keys show -a b)" 1000000000000000000uscrt -secretd add-genesis-account "$(secretd keys show -a c)" 1000000000000000000uscrt -secretd add-genesis-account "$(secretd keys show -a d)" 1000000000000000000uscrt +secretd genesis add-genesis-account "$(secretd keys show -a a)" 1000000000000000000uscrt +secretd genesis add-genesis-account "$(secretd keys show -a b)" 1000000000000000000uscrt +secretd genesis add-genesis-account "$(secretd keys show -a c)" 1000000000000000000uscrt +secretd genesis add-genesis-account "$(secretd keys show -a d)" 1000000000000000000uscrt -secretd gentx a 1000000uscrt --chain-id secretdev-1 +secretd genesis gentx a 1000000uscrt --chain-id secretdev-1 -secretd collect-gentxs -secretd validate-genesis +secretd genesis collect-gentxs +secretd genesis validate secretd init-bootstrap -secretd validate-genesis +secretd genesis validate source /opt/sgxsdk/environment && RUST_BACKTRACE=1 secretd start --rpc.laddr tcp://0.0.0.0:26657 --bootstrap diff --git a/deployment/ci/node_init.sh b/deployment/ci/node_init.sh index 2dc5f4f26..b6f379fb7 100644 --- a/deployment/ci/node_init.sh +++ b/deployment/ci/node_init.sh @@ -14,9 +14,9 @@ rm -rf ~/.secretd NO_TESTS="${NO_TESTS:-}" mkdir -p /root/.secretd/.node -secretd config keyring-backend test -secretd config node tcp://bootstrap:26657 -secretd config chain-id secretdev-1 +secretd config set client keyring-backend test +secretd config set client node tcp://bootstrap:26657 +secretd config set client chain-id secretdev-1 secretd init "$(hostname)" --chain-id secretdev-1 || true @@ -51,9 +51,9 @@ secretd configure-secret node-master-key.txt "$SEED" cp /tmp/.secretd/config/genesis.json /root/.secretd/config/genesis.json -secretd validate-genesis +secretd genesis validate -secretd config node tcp://localhost:26657 +secretd config set client node tcp://localhost:26657 if [ ! -z "$NO_TESTS" ] then @@ -73,7 +73,7 @@ function wait_for_tx () { done } -until (secretd status 2>&1 | jq -e '(.SyncInfo.latest_block_height | tonumber) > 0' &>/dev/null); do +until (secretd status 2>&1 | jq -e '(.sync_info.latest_block_height | tonumber) > 0' &>/dev/null); do echo "Waiting for chain to start..." sleep 1 done