Skip to content

Commit

Permalink
Merge pull request #4365 from Agoric/kris-sync-endo-2022-01
Browse files Browse the repository at this point in the history
chore: Sync Endo versions
  • Loading branch information
mergify[bot] authored Jan 24, 2022
2 parents c4833b9 + 54588b7 commit 32554df
Show file tree
Hide file tree
Showing 23 changed files with 119 additions and 66 deletions.
4 changes: 2 additions & 2 deletions packages/SwingSet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"lint:eslint": "eslint '**/*.js'"
},
"devDependencies": {
"@endo/ses-ava": "^0.2.13",
"@endo/ses-ava": "^0.2.14",
"@types/tmp": "^0.2.0",
"ava": "^3.12.1",
"tmp": "^0.2.1"
Expand All @@ -41,7 +41,7 @@
"@agoric/store": "^0.6.8",
"@agoric/swing-store": "^0.6.3",
"@agoric/xsnap": "^0.11.0",
"@endo/base64": "^0.2.13",
"@endo/base64": "^0.2.14",
"anylogger": "^0.21.0",
"import-meta-resolve": "^1.1.1",
"node-lmdb": "^0.9.5",
Expand Down
4 changes: 2 additions & 2 deletions packages/SwingSet/test/test-xsnap-store.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,15 +164,15 @@ test('XS + SES snapshots are long-term deterministic', async t => {
const h2 = await store.save(vat.snapshot);
t.is(
h2,
'f32b2b4a91a597cbfcf3bc1a535b1e294f43e0cad01082aa6d933637c2a7c129',
'9e11a482f0d4bd25c988a4e102d24c0d239afe332981787a674f84149a63f0a0',
'after SES boot - sensitive to SES-shim, XS, and supervisor',
);

await vat.evaluate('globalThis.x = harden({a: 1})');
const h3 = await store.save(vat.snapshot);
t.is(
h3,
'885b63a688e32e4cdb7ba97e6b6fdffc325330c9db1d432242e7901a3caa8965',
'556ebf0c07a99517e86ddd2fc0b0fadb8c39731de1c14ceaca5741ca246f13d3',
'after use of harden() - sensitive to SES-shim, XS, and supervisor',
);
});
Expand Down
2 changes: 1 addition & 1 deletion packages/agoric-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@agoric/install-ses": "^0.5.29",
"@agoric/nat": "^4.1.0",
"@agoric/promise-kit": "^0.2.29",
"@endo/compartment-mapper": "^0.6.1",
"@endo/compartment-mapper": "^0.6.2",
"@iarna/toml": "^2.2.3",
"anylogger": "^0.21.0",
"chalk": "^2.4.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/bundle-source/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
},
"devDependencies": {
"@agoric/lockdown": "^0.1.1",
"@endo/ses-ava": "^0.2.13",
"@endo/ses-ava": "^0.2.14",
"ava": "^3.12.1"
},
"dependencies": {
"@babel/generator": "^7.14.2",
"@babel/parser": "^7.14.2",
"@babel/traverse": "^7.14.2",
"@endo/base64": "^0.2.13",
"@endo/compartment-mapper": "^0.6.1",
"@endo/base64": "^0.2.14",
"@endo/compartment-mapper": "^0.6.2",
"@rollup/plugin-commonjs": "^19.0.0",
"@rollup/plugin-node-resolve": "^13.0.0",
"acorn": "^8.2.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/captp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"devDependencies": {
"@agoric/install-ses": "^0.5.29",
"@endo/ses-ava": "^0.2.13",
"@endo/ses-ava": "^0.2.14",
"ava": "^3.12.1",
"c8": "^7.7.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/eventual-send/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"homepage": "https://github.com/Agoric/agoric-sdk#readme",
"devDependencies": {
"@agoric/lockdown": "^0.1.1",
"@endo/ses-ava": "^0.2.13",
"@endo/ses-ava": "^0.2.14",
"ava": "^3.12.1",
"c8": "^7.7.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/far/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"devDependencies": {
"@agoric/install-ses": "^0.5.29",
"@endo/ses-ava": "^0.2.13",
"@endo/ses-ava": "^0.2.14",
"ava": "^3.12.1",
"c8": "^7.7.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/governance/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"ava": "^3.12.1",
"c8": "^7.7.2",
"import-meta-resolve": "^1.1.1",
"ses": "^0.15.3"
"ses": "^0.15.4"
},
"files": [
"src/",
Expand Down
6 changes: 3 additions & 3 deletions packages/import-bundle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
"lint": "eslint '**/*.js'"
},
"dependencies": {
"@endo/base64": "^0.2.13",
"@endo/compartment-mapper": "^0.6.1"
"@endo/base64": "^0.2.14",
"@endo/compartment-mapper": "^0.6.2"
},
"devDependencies": {
"@agoric/bundle-source": "^2.0.1",
"@agoric/install-ses": "^0.5.29",
"@endo/ses-ava": "^0.2.13",
"@endo/ses-ava": "^0.2.14",
"ava": "^3.12.1",
"c8": "^7.7.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/lockdown/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"ava": "^3.12.1"
},
"dependencies": {
"ses": "^0.15.3"
"ses": "^0.15.4"
},
"files": [
"*.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/marshal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"devDependencies": {
"@agoric/lockdown": "^0.1.1",
"@endo/ses-ava": "^0.2.13",
"@endo/ses-ava": "^0.2.14",
"ava": "^3.12.1",
"c8": "^7.7.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/notifier/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"devDependencies": {
"@agoric/install-ses": "^0.5.29",
"@agoric/swingset-vat": "^0.24.1",
"@endo/ses-ava": "^0.2.13",
"@endo/ses-ava": "^0.2.14",
"ava": "^3.12.1",
"c8": "^7.7.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/telemetry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"devDependencies": {
"@agoric/lockdown": "^0.1.1",
"@endo/ses-ava": "^0.2.13",
"@endo/ses-ava": "^0.2.14",
"ava": "^3.12.1",
"c8": "^7.7.2"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/xsnap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
"@agoric/bundle-source": "^2.0.1",
"@agoric/eventual-send": "^0.14.0",
"@agoric/install-ses": "^0.5.29",
"@endo/netstring": "^0.2.13",
"@endo/netstring": "^0.3.0",
"glob": "^7.1.6"
},
"devDependencies": {
"@endo/base64": "^0.2.13",
"@endo/base64": "^0.2.14",
"@rollup/plugin-commonjs": "^21.0.1",
"@rollup/plugin-node-resolve": "^6.1.0",
"ava": "^3.12.1",
Expand Down
2 changes: 2 additions & 0 deletions packages/xsnap/test/test-boot-lockdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// eslint-disable-next-line import/no-extraneous-dependencies
import test from 'ava';

import '@agoric/install-ses';

import * as proc from 'child_process';
import * as os from 'os';
import * as fs from 'fs';
Expand Down
2 changes: 2 additions & 0 deletions packages/xsnap/test/test-err-stack.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// JavaScript correctness tests

import '@agoric/install-ses';

// @ts-check
// eslint-disable-next-line import/no-extraneous-dependencies
import test from 'ava';
Expand Down
3 changes: 3 additions & 0 deletions packages/xsnap/test/test-gc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
/* global FinalizationRegistry WeakRef */
// @ts-check

import '@agoric/install-ses';

// eslint-disable-next-line import/no-extraneous-dependencies
import test from 'ava';

Expand Down
3 changes: 3 additions & 0 deletions packages/xsnap/test/test-replay.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// @ts-check
/* global Buffer */

import '@agoric/install-ses';

// eslint-disable-next-line import/no-extraneous-dependencies
import test from 'ava';

Expand Down
2 changes: 2 additions & 0 deletions packages/xsnap/test/test-xs-js.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// JavaScript correctness tests

import '@agoric/install-ses';

// @ts-check
// eslint-disable-next-line import/no-extraneous-dependencies
import test from 'ava';
Expand Down
2 changes: 2 additions & 0 deletions packages/xsnap/test/test-xs-limits.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// XS resource exhaustion tests

import '@agoric/install-ses';

// @ts-check
// eslint-disable-next-line import/no-extraneous-dependencies
import test from 'ava';
Expand Down
3 changes: 3 additions & 0 deletions packages/xsnap/test/test-xs-perf.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
/* global performance */
// @ts-check

import '@agoric/install-ses';

// eslint-disable-next-line import/no-extraneous-dependencies
import test from 'ava';

Expand Down
3 changes: 3 additions & 0 deletions packages/xsnap/test/test-xsnap.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
/* global setTimeout, WeakRef, setImmediate, process */
// @ts-check

import '@agoric/install-ses';

// eslint-disable-next-line import/no-extraneous-dependencies
import test from 'ava';

Expand Down
123 changes: 78 additions & 45 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2270,32 +2270,32 @@
resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==

"@endo/base64@^0.2.13":
version "0.2.13"
resolved "https://registry.yarnpkg.com/@endo/base64/-/base64-0.2.13.tgz#37958e4444698482788f6e2cfc42f6e23281f79c"
integrity sha512-GkKmUtRvtlZIdsn505dem5895UTJ5jIJbNmpF3zj3RTZNIoVTS4CrrA/esAB+HcvgjN6lAagux0CcCrTsQVkww==
"@endo/base64@^0.2.14":
version "0.2.14"
resolved "https://registry.yarnpkg.com/@endo/base64/-/base64-0.2.14.tgz#df08952d86d0d9f1f970fbae9c91b65d1864bb9f"
integrity sha512-6Zw3xwFsvQs659eokz4wkdQhyBK78eQbHR/CyP4LX7sX8M8F02c6ChQGOg+DhSSauo1HdO0L/OQORsAEzdHIkw==

"@endo/cjs-module-analyzer@^0.2.13":
version "0.2.13"
resolved "https://registry.yarnpkg.com/@endo/cjs-module-analyzer/-/cjs-module-analyzer-0.2.13.tgz#25652b0d6efc047def78f6da08497424a3dc9b10"
integrity sha512-OQtj+M/CAcFtXpWNPyjQy/0oNE55TMUAIr2gYSdvflE50r9Jn6wWNYRKP1++oQO0/bjTfT2q7zAwwonwBkqe6Q==
"@endo/cjs-module-analyzer@^0.2.14":
version "0.2.14"
resolved "https://registry.yarnpkg.com/@endo/cjs-module-analyzer/-/cjs-module-analyzer-0.2.14.tgz#19b6f4ef86301b07d3c61eed86d371b9c319584c"
integrity sha512-rF3rYjA1ooONQdrbp/syIlv3rSpHz0P+N8npWs3PUlIpAJuDW8nh8Z8yeGtQ7qWkdhRrExryvGFd7DOpvuj4vQ==

"@endo/compartment-mapper@^0.6.1":
version "0.6.1"
resolved "https://registry.yarnpkg.com/@endo/compartment-mapper/-/compartment-mapper-0.6.1.tgz#7fda2d4ab1b4a629318e20538165be1535c41046"
integrity sha512-jKoO3PsxNgJcYLBYvPTLW5xEolJ0y0zTgjEI/tNYgipCU80KgLcBhFF7CCnMqwBil+qsfm2iCPfhZWj/Vd5biw==
"@endo/compartment-mapper@^0.6.2":
version "0.6.2"
resolved "https://registry.yarnpkg.com/@endo/compartment-mapper/-/compartment-mapper-0.6.2.tgz#35416598df302d3e570913ffe28f8337140a9715"
integrity sha512-NXjNHie3Be2vaGOKsgUWKIa+EQwEljwbITgc0RUcQ/5ilfa8XqX+uQg3RJOb7PzDdDTrqTqp/H96yI1mRGQb0g==
dependencies:
"@endo/cjs-module-analyzer" "^0.2.13"
"@endo/static-module-record" "^0.6.8"
"@endo/zip" "^0.2.13"
ses "^0.15.3"
"@endo/cjs-module-analyzer" "^0.2.14"
"@endo/static-module-record" "^0.6.9"
"@endo/zip" "^0.2.14"
ses "^0.15.4"

"@endo/eslint-config@^0.3.20":
version "0.3.20"
resolved "https://registry.yarnpkg.com/@endo/eslint-config/-/eslint-config-0.3.20.tgz#2f54e98d2cf2841b21bb5b8d10b6fcca6df4b9a3"
integrity sha512-sHZgESYViLnie8VgBmzYQIGuxRX1pFJiNUGdsvR+d3IEZb1l0Dz+CSsUyrpVMqWcLh9G9Nf0lOcUI3Ew2heMkA==
version "0.3.21"
resolved "https://registry.yarnpkg.com/@endo/eslint-config/-/eslint-config-0.3.21.tgz#e68bb5821e38a054da6885f035f29390b09287e5"
integrity sha512-yxPyzNMgVJNMppIiDXok92/aPhwiyGeBkJ16O968VH/RVJXOjLpnIPG0m5NCCh+SubZKLAneg3dFhjidbz2hAA==
dependencies:
"@endo/eslint-plugin" "^0.3.16"
"@endo/eslint-plugin" "^0.3.17"
"@jessie.js/eslint-plugin" "^0.1.1"

"@endo/eslint-config@^0.3.9":
Expand All @@ -2305,10 +2305,10 @@
dependencies:
"@endo/eslint-plugin" "^0.3.8"

"@endo/eslint-plugin@^0.3.16":
version "0.3.16"
resolved "https://registry.yarnpkg.com/@endo/eslint-plugin/-/eslint-plugin-0.3.16.tgz#8f3ae4bc98872f17788e71dd9c897c981f9e87a2"
integrity sha512-3KZWbWyVZkGD56LubAxrG7Z8AfiWkIIwOR/f09p1Vh5KejmUeqTAyywCNYFTebqE7vywq96Xng30jbd1VpRiLA==
"@endo/eslint-plugin@^0.3.17":
version "0.3.17"
resolved "https://registry.yarnpkg.com/@endo/eslint-plugin/-/eslint-plugin-0.3.17.tgz#8657202b8d987d01394e69e08662685924475e93"
integrity sha512-0WykXbQgksxm4BrzLMzt3XJWCf9ZGfg4QjDGG+wjZqem1bXyJDQLvw6gL2ZSb0ORJadtL1F9Ty2rBLczPQToMA==
dependencies:
requireindex "~1.1.0"

Expand All @@ -2319,29 +2319,62 @@
dependencies:
requireindex "~1.1.0"

"@endo/netstring@^0.2.13":
version "0.2.13"
resolved "https://registry.yarnpkg.com/@endo/netstring/-/netstring-0.2.13.tgz#de0742010998eb373a4ab0a011f1c7a769838075"
integrity sha512-+Q0pAg+3oA2ZlKth3k7BD+bhKMmVHfcHSWcBiCVg7LFVzrOIiltI9bEk7TJaGSWHTarUoR+vAPZwL/GULan15g==
"@endo/eventual-send@^0.14.1":
version "0.14.1"
resolved "https://registry.yarnpkg.com/@endo/eventual-send/-/eventual-send-0.14.1.tgz#8e031447ea63d797dac8cdfc104980b1109cbacb"
integrity sha512-1wTlRFA5+Sf/PPJRbZUi8i/KutvKF2tZBjO+SVhWGhH8X7e+g6sRrCIyyi9yNsbp1Aqv72QS98wJ+u6/9AYO9A==

"@endo/ses-ava@^0.2.13":
version "0.2.13"
resolved "https://registry.yarnpkg.com/@endo/ses-ava/-/ses-ava-0.2.13.tgz#c88b0e2d514010e6f02f99c75b92409028b2e05f"
integrity sha512-DJzMPN6HDgyd/pgvPf4McMnS26iDKQjBMVJFH2c7OZ1BIuTjaYTaYCY2g4bSpgixnyV85Ua9xWpfZdloSUwQ3g==
"@endo/init@^0.5.30":
version "0.5.30"
resolved "https://registry.yarnpkg.com/@endo/init/-/init-0.5.30.tgz#28b635cadcf22ce0bcf9a171dd8836a3d92dc710"
integrity sha512-E5Y2KYL6ZrpP8xYDe0RzX4ZrAMcdoNZwYXx6Nl/nQssCWqcWKrKVd+I0ia32xCVtu2leZPjQcrzsl2NejkJxRA==
dependencies:
ses "^0.15.3"
"@agoric/babel-standalone" "^7.14.3"
"@endo/eventual-send" "^0.14.1"
"@endo/lockdown" "^0.1.2"

"@endo/static-module-record@^0.6.8":
version "0.6.8"
resolved "https://registry.yarnpkg.com/@endo/static-module-record/-/static-module-record-0.6.8.tgz#1f329d2d850eae40ab5bfa0cfcad12c64c63f166"
integrity sha512-55Yt4Z2OcsJTdGzpCBNcnuie7r1WMqpMfQaSf5VjKHBe0dFj4JRDglzmBEqHirKy9c72758zkNymmWN5jvAswg==
"@endo/lockdown@^0.1.2":
version "0.1.2"
resolved "https://registry.yarnpkg.com/@endo/lockdown/-/lockdown-0.1.2.tgz#69adbf0abbda3ea43b18fcd27755ac325c1ad91f"
integrity sha512-Qi7MGtCvwFzOKI6TsaNosYRHTn7PvQ5kV2iYMTV7f2bTfhvG96isThozxBBgQi3R3l5bDzTan9mDsGWxvjAE8A==
dependencies:
ses "^0.15.4"

"@endo/netstring@^0.3.0":
version "0.3.0"
resolved "https://registry.yarnpkg.com/@endo/netstring/-/netstring-0.3.0.tgz#8a31964c1f5939d2f8d45a37bd0e6713ea7e82e2"
integrity sha512-5ccAUReic6p3cIJs+K+V7XAsh1hZbm+MCGhC6LoiyT/PAo+lPvkgyV/Urg5T4L53GsgpZxhDrYT0pN7e/jDx9g==
dependencies:
"@endo/init" "^0.5.30"
"@endo/stream" "^0.2.0"
ses "^0.15.4"

"@endo/ses-ava@^0.2.14":
version "0.2.14"
resolved "https://registry.yarnpkg.com/@endo/ses-ava/-/ses-ava-0.2.14.tgz#7f9a3be8e7bf6a3eb0a2e480a3e3715b60d670ed"
integrity sha512-b8i5htakZiueBXUT/DoMjif8qLd1WIuYR2eUr3KIy+lGx/UouMKTXhJ+PEnIGOGUNT95icAOwnDs9AkaU02liw==
dependencies:
ses "^0.15.4"

"@endo/static-module-record@^0.6.9":
version "0.6.9"
resolved "https://registry.yarnpkg.com/@endo/static-module-record/-/static-module-record-0.6.9.tgz#f906892d72a7bd4b2f853b6f3229ceec389f23a7"
integrity sha512-DfJ1CQJJpoqy8XNN8YL+HpznjnNPGxCzu4o6poLN3l1labjExlFQ+FiMTel9QZet/kHWemh75jVxuu+I0jbbJA==
dependencies:
"@agoric/babel-standalone" "^7.14.3"

"@endo/zip@^0.2.13":
version "0.2.13"
resolved "https://registry.yarnpkg.com/@endo/zip/-/zip-0.2.13.tgz#62e465858e3563eb6f3114a3903d2644ed6c0a83"
integrity sha512-T+GUOYgW19bZ4snuF9JpThiis027TWqKRvb4Qk1wFAdAIV89/7ItOUJXdzc20UpwleuuvyiT1+02sn4pccJCDA==
"@endo/stream@^0.2.0":
version "0.2.0"
resolved "https://registry.yarnpkg.com/@endo/stream/-/stream-0.2.0.tgz#b79fc810b7189551d307d24e703cbe351a07ebb8"
integrity sha512-ERtn0bWibRBruyZFJw+sK6udX+RCVUoiUDFBlFB/SOJzeb9d5nBG5cXhqnFJuVhQ9HOdGX+57ViqjXLU1PXavQ==
dependencies:
"@endo/eventual-send" "^0.14.1"
ses "^0.15.4"

"@endo/zip@^0.2.14":
version "0.2.14"
resolved "https://registry.yarnpkg.com/@endo/zip/-/zip-0.2.14.tgz#e354ba8b85fa4c4a303ee4ec643c3b11000d0f44"
integrity sha512-ooe8RZjKBkPUlUG+LkQJMLIo1RTdwWI872gdffWU5/YoyCl9qYFa+rmoIAXUmwSiZcNjhzpBbw2DV1WHaA/h6Q==

"@es-joy/jsdoccomment@0.12.0":
version "0.12.0"
Expand Down Expand Up @@ -18067,10 +18100,10 @@ serve-static@1.14.1:
parseurl "~1.3.3"
send "0.17.1"

ses@^0.15.3:
version "0.15.3"
resolved "https://registry.yarnpkg.com/ses/-/ses-0.15.3.tgz#f9dcc640394787e17b7c66dc550133b2ec45df3e"
integrity sha512-DTESfYMwSYtIuwCGmOYwxrOngCvLmInu/UHeMRen1tx23bKAe7rFjQAvbkdGKQDBezdwnybFD3JUCPDxVeiVPA==
ses@^0.15.4:
version "0.15.4"
resolved "https://registry.yarnpkg.com/ses/-/ses-0.15.4.tgz#4f236c285e4f056f55089d7ee3ef437e53ca976e"
integrity sha512-WFCH2gvGyhO7u9PY2OLcqZLMELmJeWqNRvJTTb6/nbZRqlTiEvsj3iez7zKCSxqpX1wVE8RJW6+FvygEI9t/bQ==

set-blocking@^2.0.0, set-blocking@~2.0.0:
version "2.0.0"
Expand Down

0 comments on commit 32554df

Please sign in to comment.