Merge branch 'master' into 6678-intrinsicAtomicTransfer

.dockerignore

@@ -3,14 +3,15 @@
 docker
 packages/cosmic-swingset/t[0-9]
 packages/cosmic-swingset/t[0-9].*
-packages/cosmic-swingset/lib/lib*.h
-packages/cosmic-swingset/lib/lib*.so
+golang/cosmos/build
+packages/deployment
 packages/swingset-runner
 packages/stat-logger
 **/deployment.json
 **/vars.tf
 **/*.log
 **/build
+**/bundles
 **/__pycache__
 **/*.egg-info
 **/swingset-kernel-state

.eslintrc.cjs

@@ -36,6 +36,8 @@ module.exports = {
   parser: '@typescript-eslint/parser',
   parserOptions: lintTypes
     ? {
+        // this is not yet compatible with eslint lsp so it's conditioned on AGORIC_ESLINT_TYPES
+        EXPERIMENTAL_useProjectService: true,
         sourceType: 'module',
         project: [
           './packages/*/jsconfig.json',

.github/ISSUE_TEMPLATE/work_item.md

@@ -17,3 +17,4 @@ assignees: ''
 
 ## Test Plan
 
+## Upgrade Considerations

.github/PULL_REQUEST_TEMPLATE.md

@@ -34,3 +34,7 @@ Backwards compatibility: what happens to existing data or deployments when this
 
 <!-- Every PR should of course come with tests of its own functionality. What additional tests are still needed beyond those unit tests? How does this affect CI, other test automation, or the testnet?
 -->
+
+### Upgrade Considerations
+
+<!-- What aspects of this PR are relevant to upgrading live production systems, and how should they be addressed? -->

.github/actions/restore-golang/action.yml

@@ -5,6 +5,10 @@ inputs:
   go-version:
     description: 'The version of Go to use'
     required: true
+  path:
+    description: 'The relative path to the agoric-sdk directory'
+    required: false
+    default: '.'
 
 runs:
   using: composite
@@ -14,13 +18,14 @@ runs:
       shell: bash
     - uses: actions/checkout@v3
       with:
+        path: ${{ inputs.path }}
         clean: 'false'
         submodules: 'true'
     - uses: actions/setup-go@v4
       with:
-        cache-dependency-path: golang/cosmos/go.sum
+        cache-dependency-path: ${{ inputs.path }}/golang/cosmos/go.sum
         go-version: ${{ inputs.go-version }}
     - name: go mod download
-      working-directory: ./golang/cosmos
+      working-directory: ${{ inputs.path }}/golang/cosmos
       run: go mod download
       shell: bash

.github/workflows/after-merge.yml

@@ -61,7 +61,8 @@ jobs:
             # Just a dev release.
             TAG=dev
           fi
-          yarn lerna publish --conventional-prerelease --canary --exact \
+          # without concurrency until https://github.com/Agoric/agoric-sdk/issues/8091
+          yarn lerna publish --concurrency 1 --conventional-prerelease --canary --exact \
             --dist-tag=$TAG --preid=$TAG-$(git rev-parse --short=7 HEAD) \
             --no-push --no-verify-access --yes
       - name: notify on failure

.github/workflows/deployment-test.yml

@@ -27,13 +27,17 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: 'true'
+          path: ./agoric-sdk
       - run: sudo packages/deployment/scripts/install-deps.sh
-      - uses: ./.github/actions/restore-golang
+        working-directory: ./agoric-sdk
+      - uses: ./agoric-sdk/.github/actions/restore-golang
         with:
           go-version: '1.20'
-      - uses: ./.github/actions/restore-node
+          path: ./agoric-sdk
+      - uses: ./agoric-sdk/.github/actions/restore-node
         with:
           node-version: 18.x
+          path: ./agoric-sdk
           # Forces xsnap to initialize all memory to random data, which increases
           # the chances the content of snapshots may deviate between validators
           xsnap-random-init: '1'
@@ -63,54 +67,55 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: Agoric/testnet-load-generator
-          path: testnet-load-generator
+          path: ./testnet-load-generator
           ref: ${{steps.get-loadgen-branch.outputs.result}}
 
-      - name: Put repos under /usr/src where scripts expect them
-        run: |
-          set -e
-          sudo mv "$GITHUB_WORKSPACE/testnet-load-generator" /usr/src/testnet-load-generator
-          sudo cp -a "$GITHUB_WORKSPACE" /usr/src/agoric-sdk
-          ln -s /usr/src/agoric-sdk/packages/deployment/bin/ag-setup-cosmos /usr/local/bin/ag-setup-cosmos
-        working-directory: /
-
       - name: Build cosmic-swingset dependencies
+        working-directory: ./agoric-sdk
         run: |
           set -e
           cd packages/cosmic-swingset
           make install
-        working-directory: /usr/src/agoric-sdk
-      - run: /usr/src/agoric-sdk/packages/deployment/scripts/integration-test.sh
+      - name: Make networks directory
+        run: |
+          set -e
+          mkdir networks
+      - name: Run integration test
+        working-directory: ./networks
+        run: |
+          set -xe
+          DOCKER_VOLUMES="$PWD/../agoric-sdk:/usr/src/agoric-sdk" \
+          LOADGEN=1 \
+          ../agoric-sdk/packages/deployment/scripts/integration-test.sh
         timeout-minutes: 90
-        working-directory: /usr/src/agoric-sdk
         env:
           NETWORK_NAME: chaintest
       - name: capture results
         if: always()
+        working-directory: ./networks
         run: |
           NOW=$(date -u +%Y%m%dT%H%M%S)
           echo "NOW=$NOW" >> "$GITHUB_ENV"
 
           # Stop the chain from running.
-          packages/deployment/scripts/setup.sh play stop || true
+          ../agoric-sdk/packages/deployment/scripts/setup.sh play stop || true
 
           # Get the results.
-          packages/deployment/scripts/capture-integration-results.sh "${{ job.status == 'failure' }}"
+          ../agoric-sdk/packages/deployment/scripts/capture-integration-results.sh "${{ job.status == 'failure' }}"
 
           # Tear down the nodes.
-          echo yes | packages/deployment/scripts/setup.sh destroy || true
-        working-directory: /usr/src/agoric-sdk
+          echo yes | ../agoric-sdk/packages/deployment/scripts/setup.sh destroy || true
         env:
           NETWORK_NAME: chaintest
       - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: deployment-test-results-${{ env.NOW }}
-          path: /usr/src/agoric-sdk/chaintest/results
+          path: ./networks/chaintest/results
 
       - name: notify on failure
         if: failure() && github.event_name != 'pull_request'
-        uses: ./.github/actions/notify-status
+        uses: ./agoric-sdk/.github/actions/notify-status
         with:
           webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
           from: ${{ secrets.NOTIFY_EMAIL_FROM }}

.github/workflows/integration.yml

@@ -104,7 +104,8 @@ jobs:
           npm whoami
 
           # Publish the packages to our local service.
-          yarn lerna publish --conventional-prerelease --canary --exact \
+          # without concurrency until https://github.com/Agoric/agoric-sdk/issues/8091
+          yarn lerna publish --concurrency 1 --conventional-prerelease --canary --exact \
             --dist-tag=$dist_tag --preid=dev-$(git rev-parse --short=7 HEAD) \
             --no-push --no-verify-access --yes
 

MAINTAINERS.md

@@ -158,7 +158,8 @@ to pass.
 
 ```sh
 # Publish to NPM. NOTE: You may have to repeat this several times if there are failures.
-yarn lerna publish from-package
+# without concurrency until https://github.com/Agoric/agoric-sdk/issues/8091
+yarn lerna publish --concurrency 1 from-package
 ```
 
 - [ ] Merge the release PR into the base branch.  DO NOT REBASE OR SQUASH OR YOU WILL LOSE
@@ -299,6 +300,13 @@ export const METER_TYPE = 'xs-meter-0';
 
 Be sure to also update `test/test-xs-perf.js` with the new meter version.
 
+```sh
+cd packages/xsnap
+git add api.js
+git commit -am 'chore: Bump xsnap meter type'
+cd ../..
+```
+
 Changing anything in Endo usually frustrates the SwingSet kernel hashes, and if
 Endo changes nothing, bumping the meter version certainly will, and so
 predictably frustrates the kernel hash golden test.
@@ -317,13 +325,6 @@ git commit -m 'chore(swingset-vat): Update xsnap store test snapshots'
 cd ../..
 ```
 
-```sh
-cd packages/xsnap
-git add api.js
-git commit -am 'chore: Bump xsnap meter type'
-cd ../..
-```
-
 Push this branch and create a pull request.
 
 ```sh