fix: gas=auto for all submit-proposal

Agoric · Mar 18, 2024 · 8185903 · 8185903
1 parent fc9cdf8
commit 8185903
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/packages/synthetic-chain/public/upgrade-test-scripts/env_setup.sh b/packages/synthetic-chain/public/upgrade-test-scripts/env_setup.sh
@@ -189,6 +189,13 @@ test_not_val() {
   fi
 }
 
+# gas=200000 is the default but gas used may be higher or lower. Setting it
+# to "auto" makes the proposal executions less brittle.
+GAS_ADJUSTMENT=1.2
+export SUBMIT_PROPOSAL_OPTS="--keyring-backend=test --chain-id=$CHAINID \
+		--gas=auto --gas-adjustment=$GAS_ADJUSTMENT \
+		--yes --broadcast-mode block --from validator"
+
 voteLatestProposalAndWait() {
   waitForBlock
   proposal=$($binary q gov proposals -o json | jq -r '.proposals | last | if .proposal_id == null then .id else .proposal_id end')

diff --git a/packages/synthetic-chain/public/upgrade-test-scripts/run_prepare.sh b/packages/synthetic-chain/public/upgrade-test-scripts/run_prepare.sh
@@ -54,11 +54,11 @@ else
   echo "Upgrade info is not valid JSON: $info"
   exit $status
 fi
-agd tx -bblock gov submit-proposal software-upgrade "$UPGRADE_TO" \
+# shellcheck disable=SC2086
+agd tx gov submit-proposal software-upgrade "$UPGRADE_TO" \
   --upgrade-height="$height" --upgrade-info="$info" \
   --title="Upgrade to ${UPGRADE_TO}" --description="upgrades" \
-  --from=validator --chain-id="$CHAINID" \
-  --yes --keyring-backend=test
+  ${SUBMIT_PROPOSAL_OPTS="--missing-env-setup"}
 waitForBlock
 
 voteLatestProposalAndWait

diff --git a/packages/synthetic-chain/public/upgrade-test-scripts/start_to_to.sh b/packages/synthetic-chain/public/upgrade-test-scripts/start_to_to.sh
@@ -28,11 +28,11 @@ else
   echo "Upgrade info is not valid JSON: $info"
   exit $status
 fi
+# shellcheck disable=SC2086
 agd tx gov submit-proposal software-upgrade "$UPGRADE_TO" \
   --upgrade-height="$height" --upgrade-info="$info" \
   --title="Upgrade to ${UPGRADE_TO}" --description="upgrades" \
-  --from=validator --chain-id="$CHAINID" \
-  --yes --keyring-backend=test
+  ${SUBMIT_PROPOSAL_OPTS="--missing-env-setup"}
 waitForBlock
 
 voteLatestProposalAndWait

diff --git a/proposals/61:lo-bundle-cost/eval.sh b/proposals/61:lo-bundle-cost/eval.sh
@@ -5,13 +5,8 @@ set -e
 
 source /usr/src/upgrade-test-scripts/env_setup.sh
 
-GAS_ADJUSTMENT=1.2
-SIGN_BROADCAST_OPTS="--keyring-backend=test --chain-id=$CHAINID \
-		--gas=auto --gas-adjustment=$GAS_ADJUSTMENT \
-		--yes -b block"
-
+# shellcheck disable=SC2086
 agd tx gov submit-proposal param-change lower-bundle-cost.json \
-    $SIGN_BROADCAST_OPTS --from validator
+	${SUBMIT_PROPOSAL_OPTS="--missing-env-setup"}
 
 voteLatestProposalAndWait
-