Skip to content

Commit 4f96b2c

Browse files
committed
fix: use agoric set-defaults --bootstrap-address
1 parent f37adcf commit 4f96b2c

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

packages/cosmic-swingset/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ scenario2-setup-nobuild:
6666
$(AGCH) --home=t1/n0 --keyring-dir=t1/bootstrap gentx --keyring-backend=test bootstrap 73000000ubld --chain-id=$(CHAIN_ID)
6767
$(AGCH) --home=t1/n0 collect-gentxs
6868
$(AGCH) --home=t1/n0 validate-genesis
69-
../agoric-cli/bin/agoric set-defaults --export-metrics ag-chain-cosmos t1/n0/config
69+
../agoric-cli/bin/agoric set-defaults --export-metrics --bootstrap-address=`cat t1/bootstrap-address` ag-chain-cosmos t1/n0/config
7070
# Set the chain address in all the ag-solos.
7171
jq '. + { genesis_time: "$(GENESIS_TIME)", initial_height: "$(INITIAL_HEIGHT)" }' t1/n0/config/genesis.json > t1/n0/config/genesis2.json
7272
mv t1/n0/config/genesis2.json t1/n0/config/genesis.json

packages/cosmic-swingset/bin/ag-nchainz

+3-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ testnet)
5555
portstart=$(( $BASE_PORT + $i * $NUM_SOLOS ))
5656
portend=$(( $portstart + $NUM_SOLOS - 1 ))
5757
SOLO_ADDRS=()
58-
SOLO_NAMES=()
5958
POWER_FLAGS='[\"agoric.vattp\"]'
6059
egresses=
6160
sep=''
@@ -64,6 +63,7 @@ testnet)
6463
echo "Initializing ag-solo in $solo"
6564
$SOLO init $solo --webport=$port
6665
addr=$(cat $solo/ag-cosmos-helper-address)
66+
SOLO_ADDRS+=( "$addr" )
6767
$DAEMON add-genesis-account --home=$n0d \
6868
$($CLI --home=$solo/$CLI-statedir --keyring-backend=test keys show -a ag-solo) \
6969
1000urun,1provisionpass
@@ -73,7 +73,8 @@ testnet)
7373
done
7474
for node in `ls -d $chainid/n* 2>/dev/null || true`; do
7575
[[ "$node/$DAEMON" == $n0d ]] || cp $n0d/config/genesis.json $node/$DAEMON/config/genesis.json
76-
"$thisdir/../../agoric-cli/bin/agoric" set-defaults ag-chain-cosmos $node/$DAEMON/config
76+
"$thisdir/../../agoric-cli/bin/agoric" set-defaults --bootstrap-address=${SOLO_ADDRS[0]} \
77+
ag-chain-cosmos $node/$DAEMON/config
7778
cp "$node/$DAEMON/config/genesis.json" "$node/$DAEMON/config/genesis-orig.json"
7879
# Append the egresses to the genesis and reset bond_denom.
7980
jq ".*{app_state:{staking:{params:{bond_denom:\"stake\"}},swingset:{storage:{$egresses}}}}" \

packages/cosmic-swingset/scripts/single-node.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ case $DAEMON in
4444
ag-chain-cosmos)
4545
# For Agoric
4646
DIR=$(dirname -- "${BASH_SOURCE[0]}")
47-
"$DIR/../../agoric-cli/bin/agoric" set-defaults ag-chain-cosmos ~/.$DAEMON/config
47+
"$DIR/../../agoric-cli/bin/agoric" set-defaults --bootstrap-address=$GENACCT ag-chain-cosmos ~/.$DAEMON/config
4848
;;
4949
esac
5050

0 commit comments

Comments
 (0)