Merge pull request #76 from Agoric/dc-fix-race-sig

.github/workflows/pr.yml

@@ -37,9 +37,6 @@ jobs:
         run: yarn build
       - name: yarn start:contract
         run: yarn start:contract
-      - name: verify contracts started onchain
-        run: |
-          curl http://localhost:1317/agoric/vstorage/data/published.agoricNames.instance | grep offerUp
 
       - name: Install linux deps
         run: |

contract/scripts/install-bundles.sh

@@ -9,7 +9,7 @@ cd /workspace/contract
 
 # wait for blocks to start being produced
 # avoid collision with run-chain.sh who is also migrating keys
-waitForBlock 4
+waitForBlock 2
 set -x
 
 # TODO: try `agoric publish` to better track outcome

contract/scripts/propose-start-contract.sh

@@ -20,3 +20,16 @@ agd tx gov submit-proposal swingset-core-eval "$PERMIT" "$SCRIPT" \
 set +x # not so noisy for this part
 . /usr/src/upgrade-test-scripts/env_setup.sh
 voteLatestProposalAndWait
+
+# Give the core-eval script a block or two to run.
+waitForBlock 2
+
+parseInstances() {
+  # extract latest value; parse smallCaps; yield 1 line per entry
+  jq -c '.value | fromjson | .values[-1] | fromjson | .body[1:] | fromjson | .[]'
+}
+
+# check that the contract was actually started
+api=http://localhost:1317
+curl $api/agoric/vstorage/data/published.agoricNames.instance \
+  | parseInstances | grep offerUp

contract/scripts/run-chain.sh

@@ -2,29 +2,11 @@
 
 . /usr/src/upgrade-test-scripts/env_setup.sh
 
-approveProposals() {
-    while true; do
-        proposals=$(make -s -C /workspace/contract gov-voting-q 2>/dev/null)
-        exit_status=$?
-        if [ $exit_status -eq 0 ]; then
-            echo "Approving proposals: $proposals"
-            printf $proposals | xargs -I {} make -s -C /workspace/contract vote PROPOSAL={}
-        else
-            echo "No proposals to approve, continuing..."
-        fi
-
-        sleep 10
-    done
-}
-
 # Start the chain in the background
 /usr/src/upgrade-test-scripts/start_agd.sh &
 
 # wait for blocks to start being produced
-waitForBlock 2
-
-# Approve any proposals forever in the background.
-approveProposals &
+waitForBlock 1
 
 make -C /workspace/contract mint100
 make -C /workspace/contract lower-bundle-cost

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   agd:
     # cf. https://github.com/Agoric/agoric-3-proposals