Merge pull request #3407 from Agoric/release-20210624T191327

chore(release): publish 5.1.1
Agoric · Jun 25, 2021 · c6612ea · c6612ea
2 parents a061a3e + e46cd88
commit c6612ea
Show file tree

Hide file tree

Showing 97 changed files with 888 additions and 305 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [5.1.1](https://github.com/Agoric/agoric-sdk/compare/@agoric/sdk@5.1.0...@agoric/sdk@5.1.1) (2021-06-24)
+
+
+### Bug Fixes
+
+* maybe the best of both worlds: xs-worker but no explicit gc() ([8d38e9a](https://github.com/Agoric/agoric-sdk/commit/8d38e9a3d50987cd21e642e330d482e6e733cd3c))
+
+
+
+## [5.1.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/sdk@5.0.0...@agoric/sdk@5.1.0) (2021-06-24)
+
+
+### Features
+
+* sqlite-based transcript store ([#3402](https://github.com/Agoric/agoric-sdk/issues/3402)) ([960b013](https://github.com/Agoric/agoric-sdk/commit/960b0139ff415a4d3ac0784c2a68e3c513a8efe4)), closes [#3405](https://github.com/Agoric/agoric-sdk/issues/3405)
+
+
+### Bug Fixes
+
+* upgrade to allow `gentx --keyring-dir=...` ([225e900](https://github.com/Agoric/agoric-sdk/commit/225e900b87fef8a01294402689aea93870ddf89c))
+* use 'local' worker, not xsnap, on both solo and chain ([a061a3e](https://github.com/Agoric/agoric-sdk/commit/a061a3e92f4ab90d293dfb5bff0223a24ed12d87)), closes [#3403](https://github.com/Agoric/agoric-sdk/issues/3403)
+
+
+
 ## [5.0.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/sdk@4.0.0...@agoric/sdk@5.0.0) (2021-06-23)
 
 

diff --git a/go.sum b/go.sum
@@ -77,6 +77,8 @@ github.com/agoric-labs/cosmos-sdk v0.34.4-0.20210504041254-7cead73a2b33 h1:ED86o
 github.com/agoric-labs/cosmos-sdk v0.34.4-0.20210504041254-7cead73a2b33/go.mod h1:I1Zw1zmU4rA/NITaakTb71pXQnQrWyFBhqo3WSeg0vA=
 github.com/agoric-labs/cosmos-sdk v0.43.0-beta1.0.20210607203003-f9d4f60682f2 h1:JCY8PcScl5AUbj2XVqVjWWikTyw8l84lW0GZiEfoBAk=
 github.com/agoric-labs/cosmos-sdk v0.43.0-beta1.0.20210607203003-f9d4f60682f2/go.mod h1:R2Rl4vquyMn0d88HFmyeEoY2W7Tvyze0yiaFGqYnleE=
+github.com/agoric-labs/cosmos-sdk v0.43.0-beta1.0.20210623214818-65f9554e0ddf h1:XmjeZzil9xL6PXp0Ud9pNCm1zLIBT2b2VzI7nzNT4Yc=
+github.com/agoric-labs/cosmos-sdk v0.43.0-beta1.0.20210623214818-65f9554e0ddf/go.mod h1:R2Rl4vquyMn0d88HFmyeEoY2W7Tvyze0yiaFGqYnleE=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=

diff --git a/golang/cosmos/CHANGELOG.md b/golang/cosmos/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [0.26.6](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmos@0.26.5...@agoric/cosmos@0.26.6) (2021-06-24)
+
+**Note:** Version bump only for package @agoric/cosmos
+
+
+
+
+
 ### [0.26.5](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmos@0.26.4...@agoric/cosmos@0.26.5) (2021-06-23)
 
 

diff --git a/golang/cosmos/package.json b/golang/cosmos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmos",
-  "version": "0.26.5",
+  "version": "0.26.6",
   "description": "Connect JS to the Cosmos blockchain SDK",
   "parsers": {
     "js": "mjs"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@agoric/sdk",
-  "version": "5.0.0",
+  "version": "5.1.1",
   "private": true,
   "useWorkspaces": true,
   "workspaces": [

diff --git a/packages/ERTP/CHANGELOG.md b/packages/ERTP/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [0.11.7](https://github.com/Agoric/agoric-sdk/compare/@agoric/ertp@0.11.6...@agoric/ertp@0.11.7) (2021-06-24)
+
+**Note:** Version bump only for package @agoric/ertp
+
+
+
+
+
+### [0.11.6](https://github.com/Agoric/agoric-sdk/compare/@agoric/ertp@0.11.5...@agoric/ertp@0.11.6) (2021-06-24)
+
+**Note:** Version bump only for package @agoric/ertp
+
+
+
+
+
 ### [0.11.5](https://github.com/Agoric/agoric-sdk/compare/@agoric/ertp@0.11.4...@agoric/ertp@0.11.5) (2021-06-23)
 
 **Note:** Version bump only for package @agoric/ertp

diff --git a/packages/ERTP/package.json b/packages/ERTP/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@agoric/ertp",
-  "version": "0.11.5",
+  "version": "0.11.7",
   "description": "Electronic Rights Transfer Protocol (ERTP). A smart contract framework for exchanging electronic rights",
   "parsers": {
     "js": "mjs"
@@ -41,19 +41,19 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "^0.3.2",
-    "@agoric/eventual-send": "^0.13.17",
-    "@agoric/marshal": "^0.4.14",
+    "@agoric/assert": "^0.3.3",
+    "@agoric/eventual-send": "^0.13.19",
+    "@agoric/marshal": "^0.4.16",
     "@agoric/nat": "^4.1.0",
-    "@agoric/notifier": "^0.3.17",
-    "@agoric/promise-kit": "^0.2.16",
-    "@agoric/same-structure": "^0.1.16",
-    "@agoric/store": "^0.4.17"
+    "@agoric/notifier": "^0.3.19",
+    "@agoric/promise-kit": "^0.2.17",
+    "@agoric/same-structure": "^0.1.17",
+    "@agoric/store": "^0.4.19"
   },
   "devDependencies": {
-    "@agoric/bundle-source": "^1.4.0",
-    "@agoric/install-ses": "^0.5.16",
-    "@agoric/swingset-vat": "^0.18.1",
+    "@agoric/bundle-source": "^1.4.1",
+    "@agoric/install-ses": "^0.5.17",
+    "@agoric/swingset-vat": "^0.18.3",
     "ava": "^3.12.1",
     "esm": "agoric-labs/esm#Agoric-built"
   },

diff --git a/packages/SwingSet/CHANGELOG.md b/packages/SwingSet/CHANGELOG.md
@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [0.18.3](https://github.com/Agoric/agoric-sdk/compare/@agoric/swingset-vat@0.18.2...@agoric/swingset-vat@0.18.3) (2021-06-24)
+
+
+### Bug Fixes
+
+* maybe the best of both worlds: xs-worker but no explicit gc() ([8d38e9a](https://github.com/Agoric/agoric-sdk/commit/8d38e9a3d50987cd21e642e330d482e6e733cd3c))
+
+
+
+### [0.18.2](https://github.com/Agoric/agoric-sdk/compare/@agoric/swingset-vat@0.18.1...@agoric/swingset-vat@0.18.2) (2021-06-24)
+
+**Note:** Version bump only for package @agoric/swingset-vat
+
+
+
+
+
 ### [0.18.1](https://github.com/Agoric/agoric-sdk/compare/@agoric/swingset-vat@0.18.0...@agoric/swingset-vat@0.18.1) (2021-06-23)
 
 

diff --git a/packages/SwingSet/package.json b/packages/SwingSet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.18.1",
+  "version": "0.18.3",
   "description": "Vat/Container Launcher",
   "parsers": {
     "js": "mjs"
@@ -27,29 +27,29 @@
     "lint:eslint": "eslint '**/*.js'"
   },
   "devDependencies": {
-    "@agoric/install-metering-and-ses": "^0.2.16",
+    "@agoric/install-metering-and-ses": "^0.2.17",
     "@endo/ses-ava": "^0.2.4",
     "ava": "^3.12.1"
   },
   "dependencies": {
-    "@agoric/assert": "^0.3.2",
+    "@agoric/assert": "^0.3.3",
     "@agoric/babel-parser": "^7.6.4",
     "@agoric/babel-standalone": "^7.14.3",
-    "@agoric/bundle-source": "^1.4.0",
-    "@agoric/captp": "^1.7.16",
-    "@agoric/eventual-send": "^0.13.17",
-    "@agoric/import-bundle": "^0.2.17",
-    "@agoric/install-ses": "^0.5.16",
-    "@agoric/marshal": "^0.4.14",
+    "@agoric/bundle-source": "^1.4.1",
+    "@agoric/captp": "^1.7.17",
+    "@agoric/eventual-send": "^0.13.19",
+    "@agoric/import-bundle": "^0.2.19",
+    "@agoric/install-ses": "^0.5.17",
+    "@agoric/marshal": "^0.4.16",
     "@agoric/nat": "^4.1.0",
-    "@agoric/notifier": "^0.3.17",
-    "@agoric/promise-kit": "^0.2.16",
-    "@agoric/store": "^0.4.17",
-    "@agoric/swing-store-lmdb": "^0.5.2",
-    "@agoric/swing-store-simple": "^0.4.2",
-    "@agoric/tame-metering": "^2.0.2",
-    "@agoric/transform-metering": "^1.4.15",
-    "@agoric/xsnap": "^0.6.5",
+    "@agoric/notifier": "^0.3.19",
+    "@agoric/promise-kit": "^0.2.17",
+    "@agoric/store": "^0.4.19",
+    "@agoric/swing-store-lmdb": "^0.5.3",
+    "@agoric/swing-store-simple": "^0.4.3",
+    "@agoric/tame-metering": "^2.0.3",
+    "@agoric/transform-metering": "^1.4.16",
+    "@agoric/xsnap": "^0.6.6",
     "@endo/base64": "^0.2.4",
     "@types/tmp": "^0.2.0",
     "anylogger": "^0.21.0",

diff --git a/packages/SwingSet/src/gc-and-finalize.js b/packages/SwingSet/src/gc-and-finalize.js
@@ -66,9 +66,12 @@
 
 export function makeGcAndFinalize(gcPower) {
   if (typeof gcPower !== 'function') {
-    console.warn(
-      Error(`no gcPower() function; skipping finalizer provocation`),
-    );
+    if (gcPower !== false) {
+      // We weren't explicitly disabled, so warn.
+      console.warn(
+        Error(`no gcPower() function; skipping finalizer provocation`),
+      );
+    }
   }
   return async function gcAndFinalize() {
     if (typeof gcPower !== 'function') {

diff --git a/packages/SwingSet/src/initializeSwingset.js b/packages/SwingSet/src/initializeSwingset.js
@@ -256,6 +256,7 @@ export async function initializeSwingset(
     case 'nodeWorker':
     case 'node-subprocess':
     case 'xs-worker':
+    case 'xs-worker-no-gc':
       config.defaultManagerType = defaultManagerType;
       break;
     case undefined:

diff --git a/packages/SwingSet/src/kernel/vatManager/factory.js b/packages/SwingSet/src/kernel/vatManager/factory.js
@@ -54,6 +54,7 @@ export function makeVatManagerFactory({
     assertKnownOptions(managerOptions, [
       'enablePipelining',
       'managerType',
+      'gcEveryCrank',
       'setup',
       'bundle',
       'metered',
@@ -89,15 +90,16 @@ export function makeVatManagerFactory({
       enableSetup,
     } = managerOptions;
 
-    if (metered && managerType !== 'local' && managerType !== 'xs-worker') {
-      console.warn(
-        `TODO: support metered with ${managerType}; using local as work-around`,
-      );
+    if (
+      metered &&
+      managerType !== 'local' &&
+      managerType !== 'xs-worker' &&
+      managerType !== 'xs-worker-no-gc'
+    ) {
+      console.warn(`TODO: support metered with ${managerType}`);
     }
     if (setup && managerType !== 'local') {
-      console.warn(
-        `TODO: stop using setup() with ${managerType}; using local as work-around`,
-      );
+      console.warn(`TODO: stop using setup() with ${managerType}`);
     }
     if (managerType === 'local' || enableSetup) {
       if (setup) {
@@ -134,11 +136,19 @@ export function makeVatManagerFactory({
       );
     }
 
-    if (managerType === 'xs-worker') {
+    if (managerType === 'xs-worker' || managerType === 'xs-worker-no-gc') {
+      const transformedOptions = {
+        ...managerOptions,
+        managerType: 'xs-worker',
+      };
+      if (managerOptions.gcEveryCrank === undefined) {
+        // Explicitly enable/disable gcEveryCrank.
+        transformedOptions.gcEveryCrank = managerType !== 'xs-worker-no-gc';
+      }
       return xsWorkerFactory.createFromBundle(
         vatID,
         bundle,
-        managerOptions,
+        transformedOptions,
         vatSyscallHandler,
       );
     }

diff --git a/packages/SwingSet/src/kernel/vatManager/manager-subprocess-xsnap.js b/packages/SwingSet/src/kernel/vatManager/manager-subprocess-xsnap.js
@@ -55,6 +55,7 @@ export function makeXsSubprocessFactory({
       virtualObjectCacheSize,
       enableDisavow,
       enableVatstore,
+      gcEveryCrank = true,
       name,
       metered,
       compareSyscalls,
@@ -130,6 +131,7 @@ export function makeXsSubprocessFactory({
       virtualObjectCacheSize,
       enableDisavow,
       enableVatstore,
+      gcEveryCrank,
     ]);
     if (bundleReply[0] === 'dispatchReady') {
       parentLog(vatID, `bundle loaded. dispatch ready.`);

diff --git a/packages/SwingSet/src/kernel/vatManager/supervisor-subprocess-xsnap.js b/packages/SwingSet/src/kernel/vatManager/supervisor-subprocess-xsnap.js
@@ -147,6 +147,7 @@ function makeWorker(port) {
    * @param {unknown} virtualObjectCacheSize
    * @param {boolean} enableDisavow
    * @param {boolean} enableVatstore
+   * @param {boolean} [gcEveryCrank]
    * @returns { Promise<Tagged> }
    */
   async function setBundle(
@@ -156,6 +157,7 @@ function makeWorker(port) {
     virtualObjectCacheSize,
     enableDisavow,
     enableVatstore,
+    gcEveryCrank,
   ) {
     /** @type { (vso: VatSyscallObject) => VatSyscallResult } */
     function syscallToManager(vatSyscallObject) {
@@ -190,7 +192,9 @@ function makeWorker(port) {
       WeakRef,
       FinalizationRegistry,
       waitUntilQuiescent,
-      gcAndFinalize: makeGcAndFinalize(globalThis.gc),
+      // FIXME(mfig): Here is where GC-per-crank is silently disabled.
+      // We need to do a better analysis of the tradeoffs.
+      gcAndFinalize: makeGcAndFinalize(gcEveryCrank && globalThis.gc),
     });
 
     const ls = makeLiveSlots(
@@ -234,13 +238,15 @@ function makeWorker(port) {
         assert(!dispatch, 'cannot setBundle again');
         const enableDisavow = !!args[4];
         const enableVatstore = !!args[5];
+        const gcEveryCrank = args[6] === undefined ? true : !!args[6];
         return setBundle(
           args[0],
           args[1],
           args[2],
           args[3],
           enableDisavow,
           enableVatstore,
+          gcEveryCrank,
         );
       }
       case 'deliver': {

diff --git a/packages/SwingSet/src/types.js b/packages/SwingSet/src/types.js
@@ -21,10 +21,11 @@
  * TODO: liveSlotsConsole...
  * See validateManagerOptions() in factory.js
  *
- * @typedef { 'local' | 'nodeWorker' | 'node-subprocess' | 'xs-worker' } ManagerType
+ * @typedef { 'local' | 'nodeWorker' | 'node-subprocess' | 'xs-worker' | 'xs-worker-no-gc' } ManagerType
  * @typedef {{
  *   enablePipelining?: boolean,
  *   managerType: ManagerType,
+ *   gcEveryCrank?: boolean,
  *   metered?: boolean,
  *   enableDisavow?: boolean,
  *   useTranscript?: boolean,

diff --git a/packages/access-token/CHANGELOG.md b/packages/access-token/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [0.4.4](https://github.com/Agoric/agoric-sdk/compare/@agoric/access-token@0.4.3...@agoric/access-token@0.4.4) (2021-06-24)
+
+**Note:** Version bump only for package @agoric/access-token
+
+
+
+
+
 ### [0.4.3](https://github.com/Agoric/agoric-sdk/compare/@agoric/access-token@0.4.2...@agoric/access-token@0.4.3) (2021-06-23)
 
 **Note:** Version bump only for package @agoric/access-token

diff --git a/packages/access-token/package.json b/packages/access-token/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@agoric/access-token",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "Persistent credentials for Agoric users, backed by a simple JSON file",
   "main": "src/access-token.js",
   "repository": "https://github.com/Agoric/agoric-sdk",
@@ -15,11 +15,11 @@
     "lint": "eslint '**/*.js'"
   },
   "dependencies": {
-    "@agoric/assert": "^0.3.2",
+    "@agoric/assert": "^0.3.3",
     "n-readlines": "^1.0.0"
   },
   "devDependencies": {
-    "@agoric/install-ses": "^0.5.16",
+    "@agoric/install-ses": "^0.5.17",
     "ava": "^3.12.1",
     "esm": "agoric-labs/esm#Agoric-built"
   },