From a3bc7966e2579477256993eb8f3b76f68d261864 Mon Sep 17 00:00:00 2001 From: Dan Connolly Date: Tue, 12 Dec 2023 15:15:05 -0600 Subject: [PATCH 1/3] docs: proposal type is in package.json, not config.json --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9ef1263a..8ab0cc46 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ If the proposal is _pending_ and does not yet have a number, use a letter. The p ### Files -- `config.json` specifies what kind of proposal it is. If it's a "Software Upgrade Proposal" it also includes additional parameters. +- `package.json` specifies what kind of proposal it is in a `agoricProposal` field. If it's a "Software Upgrade Proposal" it also includes additional parameters. - `use.sh` is the script that will be run in the USE stage of the build - `test.sh` is the script that will be _included_ in the TEST stage of the build, and run in CI From 8fe84e56e791b97248cfb30f36d93d0d99341833 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 12 Dec 2023 15:13:33 -0800 Subject: [PATCH 2/3] feat: set minimum-gas-prices explicitly to zero --- proposals/29:upgrade-9/use.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/proposals/29:upgrade-9/use.sh b/proposals/29:upgrade-9/use.sh index bdce71d0..3e7956fb 100644 --- a/proposals/29:upgrade-9/use.sh +++ b/proposals/29:upgrade-9/use.sh @@ -5,6 +5,9 @@ set -e source /usr/src/upgrade-test-scripts/env_setup.sh +# Set to zero so tests don't have to pay gas (we're not testing that) +sed --in-place=.bak s/'minimum-gas-prices = ""'/'minimum-gas-prices = "0ubld,0uist"'/ ~/.agoric/config/app.toml + # NOTE: agoric follow doesn't have the `--first-value-only` parameter in this version # so we use a hack From 8a220b42404e4d8e51e827afe93abc44b594a0cd Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 12 Dec 2023 15:14:02 -0800 Subject: [PATCH 3/3] test: consolidate upgrade-9 tests --- proposals/29:upgrade-9/test.sh | 3 +++ proposals/29:upgrade-9/use.sh | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proposals/29:upgrade-9/test.sh b/proposals/29:upgrade-9/test.sh index 5d8fae10..f324c066 100644 --- a/proposals/29:upgrade-9/test.sh +++ b/proposals/29:upgrade-9/test.sh @@ -1,6 +1,9 @@ #!/bin/bash source /usr/src/upgrade-test-scripts/env_setup.sh +test_not_val "$(cat /root/.agoric/psm_metrics.json | wc -l)" "0" "psm metrics shouldnt be empty" +test_not_val "$(cat /root/.agoric/psm_governance.json | wc -l)" "0" "psm gov params shouldnt be empty" + # provision pool has right balance test_val $(agd query bank balances agoric1megzytg65cyrgzs6fvzxgrcqvwwl7ugpt62346 -o json | jq -r '.balances | first | .amount') "19000000" diff --git a/proposals/29:upgrade-9/use.sh b/proposals/29:upgrade-9/use.sh index 3e7956fb..7546338e 100644 --- a/proposals/29:upgrade-9/use.sh +++ b/proposals/29:upgrade-9/use.sh @@ -15,6 +15,3 @@ sed --in-place=.bak s/'minimum-gas-prices = ""'/'minimum-gas-prices = "0ubld,0ui echo "Dumping PSM gov params..." timeout 3 agoric follow -l :published.psm.${PSM_PAIR}.metrics -o jsonlines | tee /root/.agoric/psm_metrics.json timeout 3 agoric follow -l :published.psm.${PSM_PAIR}.governance -o jsonlines | tee /root/.agoric/psm_governance.json - -test_not_val "$(cat /root/.agoric/psm_metrics.json | wc -l)" "0" "psm metrics shouldnt be empty" -test_not_val "$(cat /root/.agoric/psm_governance.json | wc -l)" "0" "psm gov params shouldnt be empty"