@agoric/cosmic-swingset 0.42.0-upgrade-14-dev-c8f9e7b.0 → 0.42.0-upgrade-16-dev-07b0130.0

package/CHANGELOG.md

@@ -3,38 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.42.0-u13.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmic-swingset@0.42.0-u12.0...@agoric/cosmic-swingset@0.42.0-u13.0) (2023-12-07)
-
-
-### Features
-
-* add exporter.getHostKV() API ([16435d2](https://github.com/Agoric/agoric-sdk/commit/16435d20e9ede86916a54c7bae54ecfc59e4c950)), closes [#8523](https://github.com/Agoric/agoric-sdk/issues/8523)
-
-
-### Bug Fixes
-
-* export state-sync snapshot without a DB write-lock ([2d388c2](https://github.com/Agoric/agoric-sdk/commit/2d388c2d51425b9d98b79d54ea6a2de96da67042)), closes [#8523](https://github.com/Agoric/agoric-sdk/issues/8523)
-
-
-
-## [0.42.0-u12.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmic-swingset@0.42.0-u11wf.0...@agoric/cosmic-swingset@0.42.0-u12.0) (2023-11-10)
-
-
-### Features
-
-* **cosmic-swingset:** add begin block check and transaction ([#8432](https://github.com/Agoric/agoric-sdk/issues/8432)) ([06302a2](https://github.com/Agoric/agoric-sdk/commit/06302a2d28271e1a962545e2952703af77a28f53))
-
-
-
-## [0.42.0-u11wf.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmic-swingset@0.42.0-u11.0...@agoric/cosmic-swingset@0.42.0-u11wf.0) (2023-09-23)
-
-**Note:** Version bump only for package @agoric/cosmic-swingset
-
-
-
-
-
-## [0.42.0-u11.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmic-swingset@0.41.3...@agoric/cosmic-swingset@0.42.0-u11.0) (2023-08-24)
+## [0.42.0-u16.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmic-swingset@0.41.3...@agoric/cosmic-swingset@0.42.0-u16.0) (2024-07-02)
 
 
 ### ⚠ BREAKING CHANGES
@@ -44,25 +13,45 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Features
 
-* **agd:** try harder to find cosmic-swingset ([a1d1666](https://github.com/Agoric/agoric-sdk/commit/a1d1666997c2f5b9c7bf14748f6d9603c0b3c5f9))
-* **cosmic-swingset:** add JS upgrade plan handler stub ([7803d3d](https://github.com/Agoric/agoric-sdk/commit/7803d3de8e0cba681dfd27dacfc3577eed0bf2f8))
-* **cosmic-swingset:** add repair-metadata snapshot restore option ([ebbb982](https://github.com/Agoric/agoric-sdk/commit/ebbb9829f1f845c0932ae92b23d0d43be9a0e196))
-* **cosmic-swingset:** replace import/export options ([393b91b](https://github.com/Agoric/agoric-sdk/commit/393b91baaa25c61364955102e8cfcdcaec90870d))
-* **cosmic-swingset:** use x/swingset for swing-store export data ([3336b62](https://github.com/Agoric/agoric-sdk/commit/3336b62fbb10bd2293a832f8c30e590530d14213))
-* **cosmos:** add required export-dir export cmd option ([8d2571c](https://github.com/Agoric/agoric-sdk/commit/8d2571c51c2fe08d630dd2897d7e5e1b45ab45c9))
-* **cosmos:** wire new swingset port handler ([3361b25](https://github.com/Agoric/agoric-sdk/commit/3361b25ddaa00116476d3de1107e800499ab5c21))
+* add exporter.getHostKV() API ([eb564f9](https://github.com/Agoric/agoric-sdk/commit/eb564f9635397c0706e1f8255b3e125681e2d031)), closes [#8523](https://github.com/Agoric/agoric-sdk/issues/8523)
+* Add tooling for standalone performance benchmarks ([058e54a](https://github.com/Agoric/agoric-sdk/commit/058e54aad93c04b57dfb3a411bff85c223ab5dd7))
+* **agd:** try harder to find cosmic-swingset ([dd547f0](https://github.com/Agoric/agoric-sdk/commit/dd547f0a8057109a0bbe27a814fb3fc403ad3fd1))
+* **cosmic-swingset:** add begin block check and transaction ([#8432](https://github.com/Agoric/agoric-sdk/issues/8432)) ([a9d113a](https://github.com/Agoric/agoric-sdk/commit/a9d113a09dfd93889ae985533535df53fdc771e7))
+* **cosmic-swingset:** add JS upgrade plan handler stub ([655133e](https://github.com/Agoric/agoric-sdk/commit/655133ed909b5d632dc033e992214a7b6a1b5ab1))
+* **cosmic-swingset:** add repair-metadata snapshot restore option ([4fc0113](https://github.com/Agoric/agoric-sdk/commit/4fc01134fab9402d5916f0593728acce4697da9e))
+* **cosmic-swingset:** implement `ENACTED_UPGRADE` blocking send ([3825c17](https://github.com/Agoric/agoric-sdk/commit/3825c171f3528cd3c4e63e8aeb3363a3e88b75fc))
+* **cosmic-swingset:** replace import/export options ([0f01712](https://github.com/Agoric/agoric-sdk/commit/0f01712cadef12784afa547d568a6e77b9a83344))
+* **cosmic-swingset:** run upgrade actions to completion ([140712a](https://github.com/Agoric/agoric-sdk/commit/140712a25fbadbe513158f5a706793d1bde12c17))
+* **cosmic-swingset:** use x/swingset for swing-store export data ([1534add](https://github.com/Agoric/agoric-sdk/commit/1534adde558df456e3225b8384e2a7033d5a5d18))
+* **cosmos:** add required export-dir export cmd option ([3be2986](https://github.com/Agoric/agoric-sdk/commit/3be2986059c9f007d34518deef68e31956e9b45e))
+* **cosmos:** support core proposals set by upgrade handler ([605eb4b](https://github.com/Agoric/agoric-sdk/commit/605eb4b8f33d7646c3a9084d43ecd51029e12b80))
+* **cosmos:** wire new swingset port handler ([ea582bf](https://github.com/Agoric/agoric-sdk/commit/ea582bf7738f82d0abe5529ee1ac9f2e117c957a))
+* new 'boot' package with bootstrap configs ([8e3173b](https://github.com/Agoric/agoric-sdk/commit/8e3173b0b86a3dc90b31164bc4272c54e46a6641))
+* Simple removal of lien primarilly through code search ([#8988](https://github.com/Agoric/agoric-sdk/issues/8988)) ([695c440](https://github.com/Agoric/agoric-sdk/commit/695c440c0f48a3591b15a43665682c5f1ebbad9d))
+* support `coreProposals.steps` ([80fa3d1](https://github.com/Agoric/agoric-sdk/commit/80fa3d14494706d825f51ac22e1bbf4ec68ce404))
+* **vat-transfer:** first cut at working proposal ([2864bd5](https://github.com/Agoric/agoric-sdk/commit/2864bd5c12300c3595df9676bcfde894dbe59b29))
+* vm-config package ([8b1ecad](https://github.com/Agoric/agoric-sdk/commit/8b1ecad8ab50db777bc11c3ee6fcdb37d6cb38b6))
 
 
 ### Bug Fixes
 
-* **cosmic-swingset:** backwards param compat in import/export ([dd8cdf0](https://github.com/Agoric/agoric-sdk/commit/dd8cdf047df05d3c6bca5d1e55e119a33bc0cbf7))
-* **cosmic-swingset:** log level for swing-store export ([c530fdc](https://github.com/Agoric/agoric-sdk/commit/c530fdc72f33d24befb3bff5fe4c94adb0722554))
-* **x/swingset:** switch export/import to replay artifact level ([c037ea3](https://github.com/Agoric/agoric-sdk/commit/c037ea3931877fe4d56df5b82cc7c3eb77a84a53))
+* **cosmic-swingset:** backwards param compat in import/export ([bd49484](https://github.com/Agoric/agoric-sdk/commit/bd49484e5777b8675ed3be5e78e46f6a5d89b7db))
+* **cosmic-swingset:** log level for swing-store export ([33c4a51](https://github.com/Agoric/agoric-sdk/commit/33c4a517f079c4ad17c30f9d1d13f181b06f112f))
+* **cosmic-swingset:** merge `coreProposals` from bootstrap and upgrade plan ([2b38ebc](https://github.com/Agoric/agoric-sdk/commit/2b38ebc378847a878725419db37580405df0a28e))
+* **cosmic-swingset:** only require vatconfig if uninitialized ([cfb72f3](https://github.com/Agoric/agoric-sdk/commit/cfb72f337cf650f303adfebaeffb1ee9ad0c0a92))
+* **cosmic-swingset:** only search for the `vatconfig` on init ([b14ca40](https://github.com/Agoric/agoric-sdk/commit/b14ca404ea5bc314f99372a3eba878926f94f679))
+* **cosmic-swingset:** send started event before beginning actual export ([3c94159](https://github.com/Agoric/agoric-sdk/commit/3c94159bbe4b27a14eeb27612c4a73afa556c472))
+* DEBUG harmony ([#8136](https://github.com/Agoric/agoric-sdk/issues/8136)) ([d2ea4b4](https://github.com/Agoric/agoric-sdk/commit/d2ea4b46b9efa61e97eec8711830d9fdd741ca55))
+* endow with original unstructured `assert` ([#9514](https://github.com/Agoric/agoric-sdk/issues/9514)) ([ce64840](https://github.com/Agoric/agoric-sdk/commit/ce64840f599ee7b73cbe455cc41eecec3464430a)), closes [#9515](https://github.com/Agoric/agoric-sdk/issues/9515) [#5672](https://github.com/Agoric/agoric-sdk/issues/5672) [#8332](https://github.com/Agoric/agoric-sdk/issues/8332) [#9513](https://github.com/Agoric/agoric-sdk/issues/9513) [#5672](https://github.com/Agoric/agoric-sdk/issues/5672) [#8332](https://github.com/Agoric/agoric-sdk/issues/8332) [#9513](https://github.com/Agoric/agoric-sdk/issues/9513) [#9515](https://github.com/Agoric/agoric-sdk/issues/9515) [#5672](https://github.com/Agoric/agoric-sdk/issues/5672) [#5672](https://github.com/Agoric/agoric-sdk/issues/5672) [#9513](https://github.com/Agoric/agoric-sdk/issues/9513) [#9513](https://github.com/Agoric/agoric-sdk/issues/9513)
+* export state-sync snapshot without a DB write-lock ([3bc3799](https://github.com/Agoric/agoric-sdk/commit/3bc37990fd813136dab33dd93a1dcec073b187f9)), closes [#8523](https://github.com/Agoric/agoric-sdk/issues/8523)
+* **sim-params:** power_flag casing ([66955c1](https://github.com/Agoric/agoric-sdk/commit/66955c1e70b63e6525ea10bc946f7c1a84e1e869))
+* update for `[@jessie](https://github.com/jessie).js/safe-await-separator` ([94c6b3c](https://github.com/Agoric/agoric-sdk/commit/94c6b3c83a5326594f1e2886ae01d6a703a7a68f))
+* **x/swingset:** switch export/import to replay artifact level ([6ab24b2](https://github.com/Agoric/agoric-sdk/commit/6ab24b299f31affc0a638cc6352678a2c167044c))
 
 
 ### Build System
 
-* remove deprecated `ag-cosmos-helper` ([ee43112](https://github.com/Agoric/agoric-sdk/commit/ee431121e3f93406896f8a9e7d949fbf1427c44e))
+* remove deprecated `ag-cosmos-helper` ([6866ebe](https://github.com/Agoric/agoric-sdk/commit/6866ebe670c257b60dfb6951c295e21ce0fe2fcc))
 
 
 

package/Makefile

@@ -141,18 +141,18 @@ scenario2-setup:
 
 t1/decentral-economy-config.json: $(ECONOMY_PROPOSALS)
 	jq -s '.[0] * { coreProposals: .[1] }' \
-		../vats/decentral-core-config.json \
+		../vm-config/decentral-core-config.json \
 		'$(ECONOMY_PROPOSALS)' > t1/decentral-economy-config.json
 
 scenario2-run-chain-economy: t1/decentral-economy-config.json
-	echo "DEPRECATED use: CHAIN_BOOTSTRAP_VAT_CONFIG=@agoric/vats/decentral-itest-vaults-config.json scenario2-run-chain"
+	echo "DEPRECATED use: CHAIN_BOOTSTRAP_VAT_CONFIG=@agoric/vm-config/decentral-itest-vaults-config.json scenario2-run-chain"
 	CHAIN_BOOTSTRAP_VAT_CONFIG="$$PWD/t1/decentral-economy-config.json" \
 		$(MAKE) scenario2-run-chain
 
 # We want to use the same configuration that will be deployed to the next
 # devnet.agoric.net so that developers can test their code against it locally.
-scenario2-run-chain: ../vats/decentral-devnet-config.json
-	CHAIN_BOOTSTRAP_VAT_CONFIG="$${CHAIN_BOOTSTRAP_VAT_CONFIG-$$PWD/../vats/decentral-devnet-config.json}" \
+scenario2-run-chain: ../vm-config/decentral-devnet-config.json
+	CHAIN_BOOTSTRAP_VAT_CONFIG="$${CHAIN_BOOTSTRAP_VAT_CONFIG-$$PWD/../vm-config/decentral-devnet-config.json}" \
 		OTEL_EXPORTER_PROMETHEUS_PORT=$(OTEL_EXPORTER_PROMETHEUS_PORT) \
 		$(AGC) --home=t1/n0 start --log_level=warn $(AGC_START_ARGS)
 

package/README.md

@@ -52,7 +52,7 @@ agd --help
 
 #### Scenario 3 : no testnet (develop off-chain demo)
 
-In this scenario, you run: 
+In this scenario, you run:
 - a **solo node** with the server-side Pixel Demo running and exposing an HTTP server in localhost
 - a **web browser** connecting to the solo node and enabling user interaction with the Pixel Demo
 
@@ -76,7 +76,7 @@ The HTML frontend code is pure JS/DOM (no additional libraries yet) in the
 
 #### Scenario 2: a single local testnet node (develop on-chain demo)
 
-In this scenario, you run: 
+In this scenario, you run:
 - one or several **solo node(s)** each exposing an HTTP server in localhost (each to a different port)
 - a **single local blockchain testnet node** with the server-side Pixel Demo running
 - a **web browser** connecting to each solo node via a different port and enabling user interaction with the Pixel Demo
@@ -107,12 +107,12 @@ You can communicate with the node by opening http://localhost:8000/
 You can start other solo nodes with `make scenario2-run-client BASE_PORT=8001` and `make scenario2-run-client BASE_PORT=8002` and communicate with them respectively with on http://localhost:8001/ and http://localhost:8002/
 
 
-  
+
 #### Scenario 1: your own local testnet (develop testnet provisioner)
 
-In this scenario, you run: 
+In this scenario, you run:
 - a **solo node** exposing an HTTP server in localhost
-- a **several local blockchain testnet nodes** with the server-side Pixel Demo running on top. 
+- a **several local blockchain testnet nodes** with the server-side Pixel Demo running on top.
 - a **web browser** connecting to the solo node and enabling user interaction with the Pixel Demo
 
 This scenario is only useful for moving toward deploying the local source code as a new testnet. Before using this scenario, you should test your on-chain code under Scenario 2.
@@ -132,7 +132,7 @@ See [Testnet Tutorial](#testnet-tutorial) for more guidance.
 
 #### Scenario 0: a public testnet (kick the tires)
 
-In this scenario, you run: 
+In this scenario, you run:
 - a **solo node** exposing an HTTP server in localhost
 - a **web browser** connecting to the solo node and enabling user interaction with the Pixel Demo
 
@@ -148,7 +148,7 @@ Alternatively, running the solo node from a Docker image and no local source cod
 
 Now go to http://localhost:8000/ to interact with your new solo node.
 
-Learn more about ERTP [here](https://agoric.com/documentation/ertp/guide/). 
+Learn more about ERTP [here](https://agoric.com/documentation/ertp/guide/).
 
 ### Initial Endowments
 
@@ -194,7 +194,7 @@ If you are not running on Linux, you will need to use Docker to provide the setu
 
 If you want to install the Docker image scripts on this machine, run:
 
-```
+```sh
 $ sudo make docker-install
 ```
 

package/calc-rpcport.js

@@ -11,6 +11,7 @@ import toml from '@iarna/toml';
 
 const configString = fs.readFileSync(process.argv[2]).toString();
 const config = toml.parse(configString);
+// @ts-expect-error Property 'laddr' does not exist on type 'AnyJson'
 const { laddr } = config.rpc; // like tcp://0.0.0.0:26657
 // eslint-disable-next-line no-useless-escape
 const m = laddr.match(/^tcp:\/\/([\d\.]+):(\d+)$/);

package/economy-template.json

@@ -1,15 +1,16 @@
 {
   "steps": [
     [
-      "@agoric/vats/scripts/init-core.js"
+      "@agoric/builders/scripts/vats/init-core.js"
     ],
     [
-      "@agoric/vats/scripts/init-network.js",
-      "@agoric/pegasus/scripts/init-core.js"
+      "@agoric/builders/scripts/vats/init-network.js",
+      "@agoric/builders/scripts/pegasus/init-core.js",
+      "@agoric/builders/scripts/vats/init-transfer.js"
     ],
     [
       {
-        "module": "@agoric/inter-protocol/scripts/init-core.js",
+        "module": "@agoric/builders/scripts/inter-protocol/init-core.js",
         "entrypoint": "defaultProposalBuilder",
         "args": [
           {
@@ -21,7 +22,7 @@
         ]
       },
       {
-        "module": "@agoric/inter-protocol/scripts/add-collateral-core.js",
+        "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js",
         "entrypoint": "defaultProposalBuilder",
         "args": [
           {
@@ -36,7 +37,7 @@
         ]
       },
       {
-        "module": "@agoric/inter-protocol/scripts/add-collateral-core.js",
+        "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js",
         "entrypoint": "psmProposalBuilder",
         "args": [
           {
@@ -50,7 +51,7 @@
         ]
       },
       {
-        "module": "@agoric/inter-protocol/scripts/add-collateral-core.js",
+        "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js",
         "entrypoint": "psmProposalBuilder",
         "args": [
           {
@@ -64,7 +65,7 @@
         ]
       },
       {
-        "module": "@agoric/inter-protocol/scripts/add-collateral-core.js",
+        "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js",
         "entrypoint": "psmProposalBuilder",
         "args": [
           {
@@ -78,7 +79,7 @@
         ]
       },
       {
-        "module": "@agoric/inter-protocol/scripts/add-collateral-core.js",
+        "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js",
         "entrypoint": "psmProposalBuilder",
         "args": [
           {
@@ -92,7 +93,7 @@
         ]
       },
       {
-        "module": "@agoric/inter-protocol/scripts/add-collateral-core.js",
+        "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js",
         "entrypoint": "psmProposalBuilder",
         "args": [
           {
@@ -106,7 +107,7 @@
         ]
       },
       {
-        "module": "@agoric/inter-protocol/scripts/price-feed-core.js",
+        "module": "@agoric/builders/scripts/inter-protocol/price-feed-core.js",
         "entrypoint": "defaultProposalBuilder",
         "args": [
           {
@@ -131,7 +132,7 @@
         ]
       },
       {
-        "module": "@agoric/inter-protocol/scripts/invite-committee-core.js",
+        "module": "@agoric/builders/scripts/inter-protocol/invite-committee-core.js",
         "entrypoint": "defaultProposalBuilder",
         "args": [
           {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.42.0-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
+  "version": "0.42.0-upgrade-16-dev-07b0130.0+07b0130",
   "description": "Agoric's Cosmos blockchain integration",
   "type": "module",
   "bin": {
@@ -15,28 +15,31 @@
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
-    "lint:types": "tsc -p jsconfig.json",
+    "lint:types": "tsc",
     "lint:eslint": "eslint ."
   },
   "keywords": [],
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/cosmos": "0.35.0-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/deploy-script-support": "0.10.4-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/internal": "0.4.0-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/store": "0.9.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/swing-store": "0.9.2-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/swingset-vat": "0.32.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/telemetry": "0.6.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@endo/bundle-source": "2.5.2-upstream-rollup",
-    "@endo/far": "0.2.18",
-    "@endo/import-bundle": "0.3.4",
-    "@endo/init": "0.5.56",
-    "@endo/marshal": "0.8.5",
-    "@endo/nat": "4.1.27",
-    "@endo/promise-kit": "0.2.56",
+    "@agoric/assert": "0.6.1-upgrade-16-dev-07b0130.0+07b0130",
+    "@agoric/builders": "0.2.0-upgrade-16-dev-07b0130.0+07b0130",
+    "@agoric/cosmos": "0.35.0-upgrade-16-dev-07b0130.0+07b0130",
+    "@agoric/deploy-script-support": "0.10.4-upgrade-16-dev-07b0130.0+07b0130",
+    "@agoric/internal": "0.4.0-upgrade-16-dev-07b0130.0+07b0130",
+    "@agoric/store": "0.9.3-upgrade-16-dev-07b0130.0+07b0130",
+    "@agoric/swing-store": "0.9.2-upgrade-16-dev-07b0130.0+07b0130",
+    "@agoric/swingset-vat": "0.33.0-upgrade-16-dev-07b0130.0+07b0130",
+    "@agoric/telemetry": "0.6.3-upgrade-16-dev-07b0130.0+07b0130",
+    "@agoric/vm-config": "0.1.1-upgrade-16-dev-07b0130.0+07b0130",
+    "@endo/bundle-source": "^3.2.3",
+    "@endo/env-options": "^1.1.4",
+    "@endo/far": "^1.1.2",
+    "@endo/import-bundle": "^1.1.2",
+    "@endo/init": "^1.1.2",
+    "@endo/marshal": "^1.5.0",
+    "@endo/nat": "^5.0.7",
+    "@endo/promise-kit": "^1.1.2",
     "@iarna/toml": "^2.2.3",
     "@opentelemetry/api": "~1.3.0",
     "@opentelemetry/sdk-metrics": "~1.9.0",
@@ -46,20 +49,26 @@
     "tmp": "^0.2.1"
   },
   "devDependencies": {
-    "ava": "^5.2.0",
-    "c8": "^7.13.0"
+    "ava": "^5.3.0",
+    "c8": "^9.1.0"
   },
   "publishConfig": {
     "access": "public"
   },
   "engines": {
-    "node": ">=14.15.0"
+    "node": "^18.12 || ^20.9"
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/*.test.*"
+    ],
+    "require": [
+      "@endo/init/debug.js"
     ],
     "timeout": "20m"
   },
-  "gitHead": "c8f9e7be1645e0be23f47de197409a7d4874add5"
+  "typeCoverage": {
+    "atLeast": 80.49
+  },
+  "gitHead": "07b01308eaccca903919d495aded620c9849efc7"
 }

package/perf.sh

@@ -21,7 +21,10 @@ curl "$url"
 # Run the Apache Benchmark:
 ab -n 16000 -c 5 "$url"
 
-{ sleep 1; : NOTE: This will time out because of rate limiting; } &
+{
+  sleep 1
+  : NOTE: This will time out because of rate limiting
+} &
 # This one hangs (because of rate limiting at around 16350 requests since the
 # last one started):
 ab -n 3000 -c 5 "$url"

package/src/anylogger-agoric.js

@@ -1,45 +1,55 @@
-/* global process */
+import {
+  getEnvironmentOptionsList,
+  getEnvironmentOption,
+} from '@endo/env-options';
 import anylogger from 'anylogger';
 
 // Turn on debugging output with DEBUG=agoric
 
-const { DEBUG: debugEnv = '' } = process.env;
-let debugging;
+const DEBUG_LIST = getEnvironmentOptionsList('DEBUG');
 
-const filterOutPrefixes = [];
-// Mute vat logging unless requested, for determinism.
-if (!debugEnv.includes('SwingSet:vat')) {
-  filterOutPrefixes.push('SwingSet:vat:');
-}
-// Mute liveSlots logging unless requested, for determinism.
-if (!debugEnv.includes('SwingSet:ls')) {
-  filterOutPrefixes.push('SwingSet:ls:');
-}
+const isVatLogNameColon = nameColon =>
+  ['SwingSet:ls:', 'SwingSet:vat:'].some(sel => nameColon.startsWith(sel));
 
-if (process.env.DEBUG === undefined) {
-  // DEBUG wasn't set, default to info level; quieter than normal.
-  debugging = 'info';
-} else if (debugEnv.includes('agoric')) {
-  // $DEBUG set and we're enabled; loudly verbose.
-  debugging = 'debug';
-} else {
-  // $DEBUG set but we're not enabled; slightly louder than normal.
-  debugging = 'log';
+// Turn on debugging output with DEBUG=agoric or DEBUG=agoric:${level}
+let selectedLevel =
+  DEBUG_LIST.length || getEnvironmentOption('DEBUG', 'unset') === 'unset'
+    ? 'log'
+    : 'info';
+for (const selector of DEBUG_LIST) {
+  const parts = selector.split(':');
+  if (parts[0] !== 'agoric') {
+    continue;
+  }
+  if (parts.length > 1) {
+    selectedLevel = parts[1];
+  } else {
+    selectedLevel = 'debug';
+  }
 }
-const defaultLevel = anylogger.levels[debugging];
+const selectedCode = anylogger.levels[selectedLevel];
+const globalCode = selectedCode === undefined ? -Infinity : selectedCode;
 
 const oldExt = anylogger.ext;
 anylogger.ext = (l, o) => {
   l = oldExt(l, o);
-  l.enabledFor = lvl => defaultLevel >= anylogger.levels[lvl];
+  l.enabledFor = lvl => globalCode >= anylogger.levels[lvl];
 
   const prefix = l.name.replace(/:/g, ': ');
-  const filteredOut = filterOutPrefixes.find(pfx => l.name.startsWith(pfx));
+
+  const nameColon = `${l.name}:`;
+  const logBelongsToVat = isVatLogNameColon(nameColon);
+
+  // If this is a vat log, then it is enabled by a selector in DEBUG_LIST.
+  const logMatchesSelector =
+    !logBelongsToVat ||
+    DEBUG_LIST.some(selector => {
+      const selectorColon = `${selector}:`;
+      return nameColon.startsWith(selectorColon);
+    });
+
   for (const [level, code] of Object.entries(anylogger.levels)) {
-    if (filteredOut || code > defaultLevel) {
-      // Disable printing.
-      l[level] = () => {};
-    } else {
+    if (logMatchesSelector && globalCode >= code) {
       // Enable the printing with a prefix.
       const doLog = l[level];
       if (doLog) {
@@ -51,6 +61,9 @@ anylogger.ext = (l, o) => {
       } else {
         l[level] = () => {};
       }
+    } else {
+      // Disable printing.
+      l[level] = () => {};
     }
   }
   return l;

package/src/chain-main.js

@@ -11,8 +11,8 @@ import tmpfs from 'tmp';
 import { fork } from 'node:child_process';
 
 import { E } from '@endo/far';
-import engineGC from '@agoric/swingset-vat/src/lib-nodejs/engine-gc.js';
-import { waitUntilQuiescent } from '@agoric/swingset-vat/src/lib-nodejs/waitUntilQuiescent.js';
+import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
+import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
 import {
   importMailbox,
   exportMailbox,
@@ -30,7 +30,7 @@ import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
 
 import * as STORAGE_PATH from '@agoric/internal/src/chain-storage-paths.js';
 import * as ActionType from '@agoric/internal/src/action-types.js';
-import { BridgeId as BRIDGE_ID } from '@agoric/internal';
+import { BridgeId, CosmosInitKeyToBridgeId } from '@agoric/internal';
 import {
   makeBufferedStorage,
   makeReadCachingStorage,
@@ -53,6 +53,8 @@ let whenHellFreezesOver = null;
 
 const TELEMETRY_SERVICE_NAME = 'agd-cosmos';
 
+const PORT_SUFFIX = 'Port';
+
 const toNumber = specimen => {
   const number = parseInt(specimen, 10);
   String(number) === String(specimen) ||
@@ -67,7 +69,7 @@ const toNumber = specimen => {
  * @param {"set" | "legacySet" | "setWithoutNotify"} setterMethod
  * @param {(value: string) => T} fromBridgeStringValue
  * @param {(value: T) => string} toBridgeStringValue
- * @returns {import("./helpers/bufferedStorage.js").KVStore<T>}
+ * @returns {import('./helpers/bufferedStorage.js').KVStore<T>}
  */
 const makePrefixedBridgeStorage = (
   call,
@@ -319,12 +321,16 @@ export default async function main(progname, args, { env, homedir, agcc }) {
     function doOutboundBridge(dstID, msg) {
       const portNum = portNums[dstID];
       if (portNum === undefined) {
+        const portKey =
+          Object.keys(CosmosInitKeyToBridgeId).find(
+            key => CosmosInitKeyToBridgeId[key] === dstID,
+          ) || `${dstID}${PORT_SUFFIX}`;
         console.error(
-          `warning: doOutboundBridge called before AG_COSMOS_INIT gave us ${dstID}`,
+          `warning: doOutboundBridge called before AG_COSMOS_INIT gave us ${portKey}`,
         );
         // it is dark, and your exception is likely to be eaten by a vat
         throw Error(
-          `warning: doOutboundBridge called before AG_COSMOS_INIT gave us ${dstID}`,
+          `warning: doOutboundBridge called before AG_COSMOS_INIT gave us ${portKey}`,
         );
       }
       const respStr = chainSend(portNum, stringify(msg));
@@ -336,7 +342,7 @@ export default async function main(progname, args, { env, homedir, agcc }) {
     }
 
     const toStorage = message => {
-      return doOutboundBridge(BRIDGE_ID.STORAGE, message);
+      return doOutboundBridge(BridgeId.STORAGE, message);
     };
 
     const makeInstallationPublisher = () => {
@@ -504,6 +510,7 @@ export default async function main(progname, args, { env, homedir, agcc }) {
   let blockingSend;
 
   async function handleSwingStoreExport(blockHeight, request, requestArgs) {
+    await null;
     switch (request) {
       case 'restore': {
         const requestOptions =
@@ -550,7 +557,6 @@ export default async function main(progname, args, { env, homedir, agcc }) {
           });
         stateSyncExport = exportData;
 
-        // eslint-disable-next-line @jessie.js/no-nested-await
         await new Promise((resolve, reject) => {
           tmpfs.dir(
             {
@@ -652,24 +658,17 @@ export default async function main(progname, args, { env, homedir, agcc }) {
 
         !blockingSend || Fail`Swingset already initialized`;
 
-        if (action.swingsetPort) {
-          portNums.swingset = action.swingsetPort;
-        }
-
-        if (action.vibcPort) {
-          portNums.dibc = action.vibcPort;
-        }
-
-        if (action.storagePort) {
-          portNums.storage = action.storagePort;
-        }
-
-        if (action.vbankPort) {
-          portNums.bank = action.vbankPort;
-        }
-
-        if (action.lienPort) {
-          portNums.lien = action.lienPort;
+        for (const [key, value] of Object.entries(action)) {
+          const portAlias = CosmosInitKeyToBridgeId[key];
+          if (portAlias) {
+            // Use the alias if it exists.
+            portNums[portAlias] = value;
+          } else if (key.endsWith(PORT_SUFFIX)) {
+            // Anything else that ends in the suffix is assumed to be a port
+            // number, as described in app.go/cosmosInitAction.
+            const portName = key.slice(0, key.length - PORT_SUFFIX.length);
+            portNums[portName] = value;
+          }
         }
         harden(portNums);
 

package/src/export-kernel-db.js

@@ -12,8 +12,8 @@ import { fileURLToPath } from 'url';
 
 import { makePromiseKit } from '@endo/promise-kit';
 import { Fail, q } from '@agoric/assert';
-import { makeAggregateError } from '@agoric/internal';
 import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
+import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
 import { makeSwingStoreExporter } from '@agoric/swing-store';
 
 import { isEntrypoint } from './helpers/is-entrypoint.js';
@@ -38,14 +38,14 @@ export const ExportManifestFileName = 'export-manifest.json';
 
 /**
  * @param {SwingStoreArtifactMode | undefined} artifactMode
- * @returns {import("@agoric/swing-store").ArtifactMode}
+ * @returns {import('@agoric/swing-store').ArtifactMode}
  */
 export const getEffectiveArtifactMode = artifactMode => {
   switch (artifactMode) {
+    case undefined:
     case 'none':
     case 'operational':
       return 'operational';
-    case undefined:
     case 'replay':
       return 'replay';
     case 'archival':
@@ -193,6 +193,9 @@ export const initiateSwingStoreExport = (
     abortIfStopped();
     startedKit.resolve();
     log?.(`Starting DB export at block height ${savedBlockHeight}`);
+    // Let the `started` event be sent before proceeding with blocking processing:
+    // `getArtifactNames` may block the agent for a while.
+    await waitUntilQuiescent();
 
     /** @type {StateSyncManifest} */
     const manifest = {
@@ -204,11 +207,9 @@ export const initiateSwingStoreExport = (
     if (exportDataMode === 'all') {
       log?.(`Writing Export Data`);
       const fileName = `export-data.jsonl`;
-      // eslint-disable-next-line @jessie.js/no-nested-await
       const exportDataFile = await open(pathResolve(exportDir, fileName), 'wx');
       cleanup.push(async () => exportDataFile.close());
 
-      // eslint-disable-next-line @jessie.js/no-nested-await
       for await (const entry of swingStoreExporter.getExportData()) {
         await exportDataFile.write(`${JSON.stringify(entry)}\n`);
       }
@@ -241,7 +242,7 @@ export const initiateSwingStoreExport = (
         .catch(err => errors.push(err));
     }
     if (errors.length) {
-      const error = makeAggregateError(errors, 'Errors while cleaning up');
+      const error = AggregateError(errors, 'Errors while cleaning up');
       if (opErr) {
         Object.defineProperty(error, 'cause', { value: opErr });
       }
@@ -295,11 +296,8 @@ export const main = async (
 
   const stateDir =
     processValue.getFlag('state-dir') ||
-    // We try to find the actual cosmos state directory (default=~/.ag-chain-cosmos)
-    `${processValue.getFlag(
-      'home',
-      `${homedir}/.ag-chain-cosmos`,
-    )}/data/agoric`;
+    // We try to find the actual cosmos state directory (default=~/.agoric)
+    `${processValue.getFlag('home', `${homedir}/.agoric`)}/data/agoric`;
 
   const stateDirStat = await fs.stat(stateDir);
   if (!stateDirStat.isDirectory()) {

package/src/import-kernel-db.js

@@ -62,7 +62,7 @@ const checkAndGetImportSwingStoreOptions = (options, manifest) => {
 
   manifest.data || Fail`State-sync manifest missing export data`;
 
-  const { artifactMode = manifest.artifactMode || 'replay' } = options;
+  const { artifactMode = manifest.artifactMode || 'operational' } = options;
 
   if (artifactMode === 'none') {
     throw Fail`Cannot import "export data" without at least "operational" artifacts`;
@@ -247,11 +247,8 @@ export const main = async (
 
   const stateDir =
     processValue.getFlag('state-dir') ||
-    // We try to find the actual cosmos state directory (default=~/.ag-chain-cosmos)
-    `${processValue.getFlag(
-      'home',
-      `${homedir}/.ag-chain-cosmos`,
-    )}/data/agoric`;
+    // We try to find the actual cosmos state directory (default=~/.agoric)
+    `${processValue.getFlag('home', `${homedir}/.agoric`)}/data/agoric`;
 
   const stateDirStat = await fs.stat(stateDir);
   if (!stateDirStat.isDirectory()) {

package/src/kernel-stats.js

@@ -16,8 +16,8 @@ import {
 
 // diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.VERBOSE);
 
-/** @typedef {import('@opentelemetry/api').MetricAttributes} Attributes */
-/** @typedef {import('@opentelemetry/api').Histogram} Histogram */
+/** @import {MetricAttributes as Attributes} from '@opentelemetry/api' */
+/** @import {Histogram} from '@opentelemetry/api' */
 
 import { getTelemetryProviders as getTelemetryProvidersOriginal } from '@agoric/telemetry';
 

package/src/launch-chain.js

@@ -1,11 +1,17 @@
 // @ts-check
 /* global process */
-/* eslint-disable @jessie.js/no-nested-await */
+
+// XXX the JSON configs specify that launching the chain requires @agoric/builders,
+// so let the JS tooling know about it by importing it here.
+import '@agoric/builders';
+
 import anylogger from 'anylogger';
 
 import { E } from '@endo/far';
 import bundleSource from '@endo/bundle-source';
 
+/** @import {RunPolicy} from '@agoric/swingset-vat' */
+
 import {
   buildMailbox,
   buildMailboxStateMap,
@@ -17,7 +23,7 @@ import {
   loadBasedir,
   loadSwingsetConfigFile,
 } from '@agoric/swingset-vat';
-import { waitUntilQuiescent } from '@agoric/swingset-vat/src/lib-nodejs/waitUntilQuiescent.js';
+import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
 import { assert, Fail } from '@agoric/assert';
 import { openSwingStore } from '@agoric/swing-store';
 import { BridgeId as BRIDGE_ID } from '@agoric/internal';
@@ -67,7 +73,7 @@ const parseUpgradePlanInfo = (upgradePlan, prefix = '') => {
   return harden(upgradePlanInfo || {});
 };
 
-/** @typedef {import('@agoric/swingset-vat').SwingSetConfig} SwingSetConfig */
+/** @import {SwingSetConfig} from '@agoric/swingset-vat' */
 
 /**
  * @typedef {object} CosmicSwingsetConfig
@@ -109,6 +115,9 @@ export async function buildSwingset(
     debugName = undefined,
     slogCallbacks,
     slogSender,
+    verbose,
+    profileVats,
+    debugVats,
   },
 ) {
   const debugPrefix = debugName === undefined ? '' : `${debugName}:`;
@@ -216,6 +225,9 @@ export async function buildSwingset(
       env,
       slogCallbacks,
       slogSender,
+      verbose,
+      profileVats,
+      debugVats,
     },
   );
 
@@ -232,7 +244,7 @@ export async function buildSwingset(
 }
 
 /**
- * @typedef {import('@agoric/swingset-vat').RunPolicy & {
+ * @typedef {RunPolicy & {
  *   shouldRun(): boolean;
  *   remainingBeans(): bigint | undefined;
  *   totalBeans(): bigint;
@@ -614,9 +626,7 @@ export async function launch({
     for await (const { action, context } of inboundQueue.consumeAll()) {
       const inboundNum = `${context.blockHeight}-${context.txHash}-${context.msgIdx}`;
       inboundQueueMetrics.decStat();
-      // eslint-disable-next-line no-await-in-loop
       await performAction(action, inboundNum);
-      // eslint-disable-next-line no-await-in-loop
       keepGoing = await runSwingset();
       if (!keepGoing) {
         // any leftover actions will remain on the inbound queue for possible
@@ -827,7 +837,6 @@ export async function launch({
         });
 
       for (const [meta, bundle] of Object.entries(bundles)) {
-        // eslint-disable-next-line no-await-in-loop
         await controller
           .validateAndInstallBundle(bundle)
           .catch(e => Fail`Cannot validate and install ${meta}: ${e}`);
@@ -1076,6 +1085,8 @@ export async function launch({
     controller.writeSlogObject(obj);
   }
 
+  console.info('Launched SwingSet kernel');
+
   return {
     blockingSend,
     shutdown,

package/src/params.js

@@ -29,7 +29,10 @@ export const encodeQueueSizes = queueSizes =>
     return { key, size };
   });
 
-// Map the SwingSet parameters to a deterministic data structure.
+/**
+ * Map the SwingSet parameters to a deterministic data structure.
+ * @param {import('@agoric/cosmic-proto/swingset/swingset.js').ParamsSDKType} params
+ */
 export const parseParams = params => {
   const {
     beans_per_unit: rawBeansPerUnit,

package/src/sim-chain.js

@@ -1,5 +1,4 @@
 /* global process setTimeout clearTimeout */
-/* eslint-disable no-await-in-loop */
 import path from 'path';
 import fs from 'fs';
 import {

package/src/sim-params.js

@@ -1,9 +1,9 @@
 // @jessie-check
+// @ts-check
 
 import { Nat } from '@endo/nat';
 
 const makeStringBeans = (key, beans) => ({ key, beans: `${Nat(beans)}` });
-const makePowerFlagFee = (powerFlag, fee) => ({ powerFlag, fee });
 const makeCoin = (denom, amount) => ({ denom, amount: `${Nat(amount)}` });
 /**
  * @param {string} key
@@ -60,10 +60,12 @@ export const defaultBeansPerUnit = [
   makeStringBeans(BeansPerXsnapComputron, defaultBeansPerXsnapComputron),
 ];
 
-const defaultBootstrapVatConfig = '@agoric/vats/decentral-demo-config.json';
+const defaultBootstrapVatConfig =
+  '@agoric/vm-config/decentral-demo-config.json';
 
+/** @type {import('@agoric/cosmic-proto/swingset/swingset.js').PowerFlagFeeSDKType[]} */
 export const defaultPowerFlagFees = [
-  makePowerFlagFee('SMART_WALLET', [makeCoin('ubld', 10_000_000n)]),
+  { power_flag: 'SMART_WALLET', fee: [makeCoin('ubld', 10_000_000n)] },
 ];
 
 export const QueueInbound = 'inbound';
@@ -74,6 +76,9 @@ export const defaultQueueMax = [
   makeQueueSize(QueueInbound, defaultInboundQueueMax),
 ];
 
+/**
+ * @type {import('@agoric/cosmic-proto/swingset/swingset.js').ParamsSDKType}
+ */
 export const DEFAULT_SIM_SWINGSET_PARAMS = {
   beans_per_unit: defaultBeansPerUnit,
   fee_unit_price: defaultFeeUnitPrice,