Merge branch 'master' into markm-async-flow after endo sync

Agoric · May 8, 2024 · 596304e · 596304e
2 parents 9af46e4 + 96c9ff5
commit 596304e
Show file tree

Hide file tree

Showing 218 changed files with 1,521 additions and 1,234 deletions.
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -264,8 +264,8 @@ From `origin/master`, begin a branch for syncing Endo.
 
 ```sh
 NOW=`date -u +%Y-%m-%d-%H-%M-%S`
-git checkout -b "$USER-sync-endo-$NOW" origin/endo-integration-master
-git rebase origin/master
+git checkout -b "$USER-sync-endo-$NOW"
+git rebase origin/integration-endo-master
 ```
 
 Use a helper script from the Endo repository to update the dependency versions
@@ -308,8 +308,6 @@ Increment the meter type in `packages/xsnap/api.js`:
 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

diff --git a/a3p-integration/README.md b/a3p-integration/README.md
@@ -88,7 +88,7 @@ access SDK code, a script can be used to generate the `submission` content.
 Until there is [native support for build scripts in the `synthetic-chain`
 tool](https://github.com/Agoric/agoric-3-proposals/issues/87),
 `a3p-integration`'s `build:submissions` step invokes
-`generate-a3p-submissions.sh` in `agoric-sdk` before starting the upgrade test.
+`build-all-submissions.sh` in `agoric-sdk` before starting the upgrade test.
 
 For core eval proposals executing before the chain software upgrade, the `submission` should be checked in, since bundles built from newer software may not be compatible with older chains.
 
@@ -127,7 +127,7 @@ make -C ../packages/deployment docker-build-sdk
 
 In a3p-integration, many core-eval proposals' `submission` content has to be
 generated from the local `agoric-sdk`, and must be rebuilt every time there is a
-change. The `scripts/generate-a3p-submissions.sh` script contains commands to
+change. The `scripts/build-all-submissions.sh` script contains commands to
 generate the core-eval content and move it to the expected proposal package's
 submission directory. The generation is executed as part of `a3p-integration`'s
 `build:submissions` step. Each proposal that requires such a build step should
@@ -145,7 +145,7 @@ If the submission does require bundle references or other options to be
 provided, it should be written as two parts: a core eval (in
 `.../vats/proposals`) and a builder for it (in `.../builders/scripts/vats`).
 
-The `generate-a3p-submissions.sh` script reads instructions from
+The `build-all-submissions.sh` script reads instructions from
 `agoricProposal.sdk-generate` in `package.json`. That field contains a list of
 strings, each of which describes a single submission. If there is only one
 submission, it can use the default directory name `submission` by specifying

diff --git a/a3p-integration/package.json b/a3p-integration/package.json
@@ -6,13 +6,13 @@
     "scripts": {
         "build": "yarn run build:sdk && yarn run build:submissions && yarn run build:synthetic-chain",
         "build:sdk": "make -C ../packages/deployment docker-build-sdk",
-        "build:submissions": "scripts/generate-a3p-submissions.sh",
+        "build:submissions": "scripts/build-all-submissions.sh",
         "build:synthetic-chain": "yarn synthetic-chain build",
         "test": "yarn synthetic-chain test",
         "doctor": "yarn synthetic-chain doctor"
     },
     "dependencies": {
-        "@agoric/synthetic-chain": "^0.0.10",
+        "@agoric/synthetic-chain": "^0.1.0",
         "@types/better-sqlite3": "^7.6.9"
     },
     "packageManager": "[email protected]",

diff --git a/a3p-integration/proposals/a:upgrade-next/package.json b/a3p-integration/proposals/a:upgrade-next/package.json
@@ -14,7 +14,7 @@
   "type": "module",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/synthetic-chain": "^0.0.10",
+    "@agoric/synthetic-chain": "^0.1.0",
     "ava": "^5.3.1"
   },
   "ava": {

diff --git a/a3p-integration/proposals/a:upgrade-next/yarn.lock b/a3p-integration/proposals/a:upgrade-next/yarn.lock
@@ -5,17 +5,17 @@ __metadata:
   version: 8
   cacheKey: 10c0
 
-"@agoric/synthetic-chain@npm:^0.0.10":
-  version: 0.0.10
-  resolution: "@agoric/synthetic-chain@npm:0.0.10"
+"@agoric/synthetic-chain@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@agoric/synthetic-chain@npm:0.1.0"
   dependencies:
     "@endo/zip": "npm:^1.0.1"
     better-sqlite3: "npm:^9.4.0"
     chalk: "npm:^5.3.0"
     execa: "npm:^8.0.1"
   bin:
     synthetic-chain: dist/cli/cli.js
-  checksum: 10c0/c75308830cbe879ba865e285a20529ac82da1434c778046b27c790e426a8139369c3ef904939905ad73109202a336925733448109a85bc19aa2d350ebdb2a520
+  checksum: 10c0/8305293d085cde9cbf94670134216e06337c5624c45faf5dfebb86762042abe7b4340cf3205e671dfce54e888bd4e9b3428400756833fa06f2bbb21b44668c44
   languageName: node
   linkType: hard
 
@@ -1820,7 +1820,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "root-workspace-0b6124@workspace:."
   dependencies:
-    "@agoric/synthetic-chain": "npm:^0.0.10"
+    "@agoric/synthetic-chain": "npm:^0.1.0"
     ava: "npm:^5.3.1"
   languageName: unknown
   linkType: soft

diff --git a/a3p-integration/proposals/b:localchain/package.json b/a3p-integration/proposals/b:localchain/package.json
@@ -9,7 +9,7 @@
   "type": "module",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/synthetic-chain": "^0.0.10",
+    "@agoric/synthetic-chain": "^0.1.0",
     "ava": "^5.3.1"
   },
   "ava": {

diff --git a/a3p-integration/proposals/b:localchain/yarn.lock b/a3p-integration/proposals/b:localchain/yarn.lock
@@ -5,17 +5,17 @@ __metadata:
   version: 8
   cacheKey: 10c0
 
-"@agoric/synthetic-chain@npm:^0.0.10":
-  version: 0.0.10
-  resolution: "@agoric/synthetic-chain@npm:0.0.10"
+"@agoric/synthetic-chain@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@agoric/synthetic-chain@npm:0.1.0"
   dependencies:
     "@endo/zip": "npm:^1.0.1"
     better-sqlite3: "npm:^9.4.0"
     chalk: "npm:^5.3.0"
     execa: "npm:^8.0.1"
   bin:
     synthetic-chain: dist/cli/cli.js
-  checksum: 10c0/c75308830cbe879ba865e285a20529ac82da1434c778046b27c790e426a8139369c3ef904939905ad73109202a336925733448109a85bc19aa2d350ebdb2a520
+  checksum: 10c0/8305293d085cde9cbf94670134216e06337c5624c45faf5dfebb86762042abe7b4340cf3205e671dfce54e888bd4e9b3428400756833fa06f2bbb21b44668c44
   languageName: node
   linkType: hard
 
@@ -1820,7 +1820,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "root-workspace-0b6124@workspace:."
   dependencies:
-    "@agoric/synthetic-chain": "npm:^0.0.10"
+    "@agoric/synthetic-chain": "npm:^0.1.0"
     ava: "npm:^5.3.1"
   languageName: unknown
   linkType: soft

diff --git a/a3p-integration/proposals/c:stake-bld/README.md b/a3p-integration/proposals/c:stake-bld/README.md
@@ -2,4 +2,4 @@ CoreEvalProposal to install stakeBld contract
 
 The `submission` for the proposal is automatically generated during `yarn build`
 in `a3p-integration` using the code in agoric-sdk through
-`script/generate-a3p-submissions.sh`. and `script/generate-a3p-submission.sh`
+`script/build-all-submissions.sh`. and `script/build-submission.sh`
diff --git a/a3p-integration/proposals/c:stake-bld/package.json b/a3p-integration/proposals/c:stake-bld/package.json
@@ -10,7 +10,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@agoric/internal": "0.3.3-dev-5676146.0",
-    "@agoric/synthetic-chain": "^0.0.10",
+    "@agoric/synthetic-chain": "^0.1.0",
     "@cosmjs/stargate": "^0.32.3",
     "@cosmjs/tendermint-rpc": "^0.32.3",
     "@endo/errors": "^1.1.0",

diff --git a/a3p-integration/proposals/c:stake-bld/yarn.lock b/a3p-integration/proposals/c:stake-bld/yarn.lock
@@ -365,17 +365,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@agoric/synthetic-chain@npm:^0.0.10":
-  version: 0.0.10
-  resolution: "@agoric/synthetic-chain@npm:0.0.10"
+"@agoric/synthetic-chain@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@agoric/synthetic-chain@npm:0.1.0"
   dependencies:
     "@endo/zip": "npm:^1.0.1"
     better-sqlite3: "npm:^9.4.0"
     chalk: "npm:^5.3.0"
     execa: "npm:^8.0.1"
   bin:
     synthetic-chain: dist/cli/cli.js
-  checksum: 10c0/c75308830cbe879ba865e285a20529ac82da1434c778046b27c790e426a8139369c3ef904939905ad73109202a336925733448109a85bc19aa2d350ebdb2a520
+  checksum: 10c0/8305293d085cde9cbf94670134216e06337c5624c45faf5dfebb86762042abe7b4340cf3205e671dfce54e888bd4e9b3428400756833fa06f2bbb21b44668c44
   languageName: node
   linkType: hard
 
@@ -4567,7 +4567,7 @@ __metadata:
   resolution: "root-workspace-0b6124@workspace:."
   dependencies:
     "@agoric/internal": "npm:0.3.3-dev-5676146.0"
-    "@agoric/synthetic-chain": "npm:^0.0.10"
+    "@agoric/synthetic-chain": "npm:^0.1.0"
     "@cosmjs/stargate": "npm:^0.32.3"
     "@cosmjs/tendermint-rpc": "npm:^0.32.3"
     "@endo/errors": "npm:^1.1.0"

diff --git a/a3p-integration/proposals/z:acceptance/package.json b/a3p-integration/proposals/z:acceptance/package.json
@@ -5,7 +5,7 @@
   "type": "module",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/synthetic-chain": "^0.0.10",
+    "@agoric/synthetic-chain": "^0.1.0",
     "ava": "^6.1.2"
   },
   "ava": {

diff --git a/a3p-integration/proposals/z:acceptance/yarn.lock b/a3p-integration/proposals/z:acceptance/yarn.lock
@@ -5,17 +5,17 @@ __metadata:
   version: 8
   cacheKey: 10c0
 
-"@agoric/synthetic-chain@npm:^0.0.10":
-  version: 0.0.10
-  resolution: "@agoric/synthetic-chain@npm:0.0.10"
+"@agoric/synthetic-chain@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@agoric/synthetic-chain@npm:0.1.0"
   dependencies:
     "@endo/zip": "npm:^1.0.1"
     better-sqlite3: "npm:^9.4.0"
     chalk: "npm:^5.3.0"
     execa: "npm:^8.0.1"
   bin:
     synthetic-chain: dist/cli/cli.js
-  checksum: 10c0/c75308830cbe879ba865e285a20529ac82da1434c778046b27c790e426a8139369c3ef904939905ad73109202a336925733448109a85bc19aa2d350ebdb2a520
+  checksum: 10c0/8305293d085cde9cbf94670134216e06337c5624c45faf5dfebb86762042abe7b4340cf3205e671dfce54e888bd4e9b3428400756833fa06f2bbb21b44668c44
   languageName: node
   linkType: hard
 
@@ -1961,7 +1961,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "root-workspace-0b6124@workspace:."
   dependencies:
-    "@agoric/synthetic-chain": "npm:^0.0.10"
+    "@agoric/synthetic-chain": "npm:^0.1.0"
     ava: "npm:^6.1.2"
   languageName: unknown
   linkType: soft

diff --git a/a3p-integration/scripts/build-all-submissions.sh b/a3p-integration/scripts/build-all-submissions.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -ueo pipefail
+
+# cd prints its target, so without the redirect, we get two copies
+SCRIPT_DIR=$(cd ${0%/*} > /dev/null && pwd -P)
+
+IFS=$'\n'
+
+for proposal in ./proposals/?:*; do
+  cd $proposal
+  # build submission if proposal specifies an sdk-generate
+  while read -r line; do
+    IFS=' ' parts=($line)
+    $SCRIPT_DIR/build-submission.sh $proposal ${parts[@]}
+  done < <(jq -r '.agoricProposal["sdk-generate"][]?' < package.json)
+  cd -
+done
diff --git a/...ration/scripts/generate-a3p-submission.sh → a3p-integration/scripts/build-submission.sh b/...ration/scripts/generate-a3p-submission.sh → a3p-integration/scripts/build-submission.sh
@@ -18,4 +18,5 @@ for plan in $plans; do
   base=${plan%-plan.json}
   cp $(grep -oh '/.*b1-.*.json' "$base"-plan.json) "$submissionDir"
   mv "$base"* "$submissionDir"
+  ls -oS "$submissionDir"
 done
diff --git a/a3p-integration/scripts/generate-a3p-submissions.sh b/a3p-integration/scripts/generate-a3p-submissions.sh
diff --git a/a3p-integration/yarn.lock b/a3p-integration/yarn.lock
@@ -5,17 +5,17 @@ __metadata:
   version: 8
   cacheKey: 10c0
 
-"@agoric/synthetic-chain@npm:^0.0.10":
-  version: 0.0.10
-  resolution: "@agoric/synthetic-chain@npm:0.0.10"
+"@agoric/synthetic-chain@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@agoric/synthetic-chain@npm:0.1.0"
   dependencies:
     "@endo/zip": "npm:^1.0.1"
     better-sqlite3: "npm:^9.4.0"
     chalk: "npm:^5.3.0"
     execa: "npm:^8.0.1"
   bin:
     synthetic-chain: dist/cli/cli.js
-  checksum: 10c0/c75308830cbe879ba865e285a20529ac82da1434c778046b27c790e426a8139369c3ef904939905ad73109202a336925733448109a85bc19aa2d350ebdb2a520
+  checksum: 10c0/8305293d085cde9cbf94670134216e06337c5624c45faf5dfebb86762042abe7b4340cf3205e671dfce54e888bd4e9b3428400756833fa06f2bbb21b44668c44
   languageName: node
   linkType: hard
 
@@ -990,7 +990,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "root-workspace-0b6124@workspace:."
   dependencies:
-    "@agoric/synthetic-chain": "npm:^0.0.10"
+    "@agoric/synthetic-chain": "npm:^0.1.0"
     "@types/better-sqlite3": "npm:^7.6.9"
   languageName: unknown
   linkType: soft

diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
   "type": "module",
   "packageManager": "[email protected]",
   "devDependencies": {
-    "@endo/eslint-plugin": "^2.1.2",
+    "@endo/eslint-plugin": "^2.1.3",
     "@jessie.js/eslint-plugin": "^0.4.1",
     "@types/express": "^4.17.17",
     "@types/node": "^18.19.24",

diff --git a/packages/ERTP/package.json b/packages/ERTP/package.json
@@ -44,16 +44,16 @@
     "@agoric/store": "^0.9.2",
     "@agoric/vat-data": "^0.5.2",
     "@agoric/zone": "^0.2.2",
-    "@endo/eventual-send": "^1.2.1",
-    "@endo/far": "^1.1.1",
-    "@endo/marshal": "^1.4.1",
-    "@endo/nat": "^5.0.6",
-    "@endo/patterns": "^1.3.1",
-    "@endo/promise-kit": "^1.1.1"
+    "@endo/eventual-send": "^1.2.2",
+    "@endo/far": "^1.1.2",
+    "@endo/marshal": "^1.5.0",
+    "@endo/nat": "^5.0.7",
+    "@endo/patterns": "^1.4.0",
+    "@endo/promise-kit": "^1.1.2"
   },
   "devDependencies": {
     "@agoric/swingset-vat": "^0.32.2",
-    "@endo/bundle-source": "^3.2.2",
+    "@endo/bundle-source": "^3.2.3",
     "@fast-check/ava": "^1.1.5",
     "ava": "^5.3.0",
     "tsd": "^0.30.7"
@@ -86,6 +86,6 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 90.62
+    "atLeast": 91.21
   }
 }