From 1b34d77b1aa555450248899c78585300a62bd35b Mon Sep 17 00:00:00 2001 From: lesterli Date: Sat, 2 Nov 2024 01:08:26 +0800 Subject: [PATCH] fix: update the key (#33) --- scripts/babylon-integration/start-btc-staker.sh | 2 +- .../start-consumer-finality-provider.sh | 2 +- scripts/babylon-integration/utils/deploy-cw-contract.sh | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/babylon-integration/start-btc-staker.sh b/scripts/babylon-integration/start-btc-staker.sh index 6f44d39..98cb0ec 100755 --- a/scripts/babylon-integration/start-btc-staker.sh +++ b/scripts/babylon-integration/start-btc-staker.sh @@ -9,7 +9,7 @@ set +a EXAMPLE_BTC_STAKER_CONF=$(pwd)/configs/babylon-integration/stakerd.conf BTC_STAKER_DIR=$(pwd)/.btc-staker BTC_STAKER_CONF=$(pwd)/.btc-staker/stakerd.conf -PREFUNDED_KEYRING_DIR=$(pwd)/.deploy +PREFUNDED_KEYRING_DIR=$(pwd)/.deploy/babylond # Only run if the directory does not exist if [ ! -d "$BTC_STAKER_DIR" ]; then diff --git a/scripts/babylon-integration/start-consumer-finality-provider.sh b/scripts/babylon-integration/start-consumer-finality-provider.sh index 9a89e3b..e106cb0 100755 --- a/scripts/babylon-integration/start-consumer-finality-provider.sh +++ b/scripts/babylon-integration/start-consumer-finality-provider.sh @@ -9,7 +9,7 @@ set +a EXAMPLE_FINALITY_PROVIDER_CONF=$(pwd)/configs/babylon-integration/consumer-fpd.conf CONSUMER_FINALITY_PROVIDER_DIR=$(pwd)/.consumer-finality-provider FINALITY_PROVIDER_CONF=$(pwd)/.consumer-finality-provider/fpd.conf -CONSUMER_FP_KEYRING_DIR=$(pwd)/.deploy/$CONSUMER_FINALITY_PROVIDER_KEY +CONSUMER_FP_KEYRING_DIR=$(pwd)/.deploy/babylond/$CONSUMER_FINALITY_PROVIDER_KEY if [ ! -d "$CONSUMER_FINALITY_PROVIDER_DIR" ]; then echo "Creating $CONSUMER_FINALITY_PROVIDER_DIR directory..." diff --git a/scripts/babylon-integration/utils/deploy-cw-contract.sh b/scripts/babylon-integration/utils/deploy-cw-contract.sh index 3d7eece..cf41e16 100755 --- a/scripts/babylon-integration/utils/deploy-cw-contract.sh +++ b/scripts/babylon-integration/utils/deploy-cw-contract.sh @@ -85,8 +85,13 @@ else fi echo "Instantiating contract..." -# Set the contract admin address default to $DEPLOYER_ADDRESS if it is not passed in from the ENV file -CONTRACT_ADMIN_ADDRESS=${CONTRACT_ADMIN_ADDRESS:-$DEPLOYER_ADDRESS} +PREFUNDED_ADDRESS=$(babylond keys show $BABYLON_PREFUNDED_KEY \ + --keyring-dir $KEYRING_DIR \ + --keyring-backend test \ + --output json \ + | jq -r '.address') +# Set the contract admin address default to $PREFUNDED_ADDRESS if it is not passed in from the ENV file +CONTRACT_ADMIN_ADDRESS=${CONTRACT_ADMIN_ADDRESS:-$PREFUNDED_ADDRESS} echo "Contract admin address: $CONTRACT_ADMIN_ADDRESS" INSTANTIATE_MSG_JSON=$(printf '{"admin":"%s","consumer_id":"%s","is_enabled":%s}' \