diff --git a/contract/Makefile b/contract/Makefile index ab99344..bcbd4a9 100644 --- a/contract/Makefile +++ b/contract/Makefile @@ -21,6 +21,48 @@ SIGN_BROADCAST_OPTS=--keyring-backend=test --chain-id=$(CHAINID) \ --gas=auto --gas-adjustment=$(GAS_ADJUSTMENT) \ --yes -b block +mint100: + make FUNDS=1000$(ATOM) fund-acct + cd /usr/src/agoric-sdk && \ + yarn --silent agops vaults open --wantMinted 100 --giveCollateral 100 >/tmp/want-ist.json && \ + yarn --silent agops perf satisfaction --executeOffer /tmp/want-ist.json --from user1 --keyring-backend=test + +# https://agoric.explorers.guru/proposal/61 +lower-bundle-cost: bundles/lower-bundle-cost.json ./scripts/voteLatestProposalAndWait.sh + agd tx gov submit-proposal param-change bundles/lower-bundle-cost.json \ + $(SIGN_BROADCAST_OPTS) \ + --from user1 + ./scripts/voteLatestProposalAndWait.sh + # agd query swingset params + + +bundles/swingset-params.json: + mkdir -p bundles/ + agd query swingset params -o json >$@ + +.ONESHELL: +bundles/lower-bundle-cost.json: bundles/swingset-params.json + @read PARAMS < bundles/swingset-params.json; export PARAMS + node - <<- EOF >$@ + const storageByte = '20000000'; + const paramChange = { + title: 'Lower Bundle Cost to 0.02 IST/Kb (a la mainnet 61)', + description: '0.02 IST/Kb', + deposit: '10000000ubld', + changes: [{ + subspace: 'swingset', + key: 'beans_per_unit', + value: '...', + }], + }; + const params = JSON.parse(process.env.PARAMS); + const ix = params.beans_per_unit.findIndex(({key}) => key === 'storageByte'); + params.beans_per_unit[ix].beans = storageByte; + paramChange.changes[0].value = params.beans_per_unit; + console.log(JSON.stringify(paramChange, null, 2)); + EOF + +# Keep mint4k around a while for compatibility mint4k: make FUNDS=1000$(ATOM) fund-acct cd /usr/src/agoric-sdk && \ diff --git a/contract/scripts/install-bundles.sh b/contract/scripts/install-bundles.sh index 4c74c07..717257b 100755 --- a/contract/scripts/install-bundles.sh +++ b/contract/scripts/install-bundles.sh @@ -16,10 +16,6 @@ install_bundle() { # exit fail if bundle-list is emtpy [ -s bundles/bundle-list ] || exit 1 -# TODO: avoid needing so much IST -# https://github.com/agoric-labs/dapp-game-places/issues/3 -make mint4k -make mint4k make balance-q # do we have enough IST? for b in $(cat bundles/bundle-list); do diff --git a/contract/scripts/run-chain.sh b/contract/scripts/run-chain.sh index b0a14b1..6534eae 100755 --- a/contract/scripts/run-chain.sh +++ b/contract/scripts/run-chain.sh @@ -63,7 +63,8 @@ waitForBlock 2 # Approve any proposals forever in the background. approveProposals & -make -C /workspace/contract mint4k +make -C /workspace/contract mint100 +make -C /workspace/contract lower-bundle-cost # bring back chain process to foreground wait diff --git a/contract/scripts/voteLatestProposalAndWait.sh b/contract/scripts/voteLatestProposalAndWait.sh new file mode 100755 index 0000000..dd303f4 --- /dev/null +++ b/contract/scripts/voteLatestProposalAndWait.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -ueo pipefail + +. /usr/src/upgrade-test-scripts/env_setup.sh +voteLatestProposalAndWait