Skip to content

Commit

Permalink
Merge pull request #6493 from Agoric/turadg-sync-endo-2022-10-24-21-5…
Browse files Browse the repository at this point in the history
…7-11

sync Endo versions
  • Loading branch information
mergify[bot] committed Oct 25, 2022
2 parents 8948ecc + fb205c6 commit eeab44a
Show file tree
Hide file tree
Showing 43 changed files with 293 additions and 395 deletions.
9 changes: 7 additions & 2 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ git commit -m 'chore: Update yarn.lock'
```

It is safe to assume that any change to Endo will invalidate assumptions about
guest application meters.
Increment the meter type in `packages/xsnap/api.js`.
guest application meters.

Increment the meter type in `packages/xsnap/api.js`:
```js
export const METER_TYPE = 'xs-meter-0';
```
Expand All @@ -143,6 +143,11 @@ Endo changes nothing, bumping the meter version certainly will, and so
predictably frustrates the kernel hash golden test.
Update the test snapshots.

```sh
# at the repo root
yarn build
```

```sh
cd packages/SwingSet
yarn test test/test-xsnap-store.js --update-snapshots
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"type": "module",
"devDependencies": {
"@endo/eslint-config": "^0.5.1",
"@jessie.js/eslint-plugin": "^0.2.0",
"@jessie.js/eslint-plugin": "^0.2.1",
"@types/node": "^16.7.10",
"@typescript-eslint/parser": "^5.33.0",
"ava": "^4.3.1",
Expand Down
10 changes: 5 additions & 5 deletions packages/ERTP/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@
"@agoric/store": "^0.8.3",
"@agoric/swingset-vat": "^0.30.2",
"@agoric/vat-data": "^0.4.3",
"@endo/eventual-send": "^0.16.5",
"@endo/far": "^0.2.11",
"@endo/marshal": "^0.7.5",
"@endo/promise-kit": "^0.2.49"
"@endo/eventual-send": "^0.16.7",
"@endo/far": "^0.2.13",
"@endo/marshal": "^0.8.0",
"@endo/promise-kit": "^0.2.51"
},
"devDependencies": {
"@endo/bundle-source": "^2.3.1",
"@endo/bundle-source": "^2.4.1",
"@fast-check/ava": "^1.0.1",
"ava": "^4.3.1"
},
Expand Down
22 changes: 11 additions & 11 deletions packages/SwingSet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@
"@agoric/vat-data": "^0.4.3",
"@agoric/xsnap": "^0.13.2",
"@endo/base64": "^0.2.27",
"@endo/bundle-source": "^2.3.1",
"@endo/captp": "^2.0.15",
"@endo/check-bundle": "^0.2.11",
"@endo/compartment-mapper": "^0.7.13",
"@endo/eventual-send": "^0.16.5",
"@endo/import-bundle": "^0.2.53",
"@endo/init": "^0.5.49",
"@endo/marshal": "^0.7.5",
"@endo/nat": "^4.1.20",
"@endo/promise-kit": "^0.2.49",
"@endo/bundle-source": "^2.4.1",
"@endo/captp": "^2.0.17",
"@endo/check-bundle": "^0.2.13",
"@endo/compartment-mapper": "^0.7.15",
"@endo/eventual-send": "^0.16.7",
"@endo/import-bundle": "^0.2.55",
"@endo/init": "^0.5.51",
"@endo/marshal": "^0.8.0",
"@endo/nat": "^4.1.22",
"@endo/promise-kit": "^0.2.51",
"@endo/zip": "^0.2.27",
"anylogger": "^0.21.0",
"import-meta-resolve": "^1.1.1",
Expand All @@ -52,7 +52,7 @@
"semver": "^6.3.0"
},
"peerDependencies": {
"@endo/ses-ava": "^0.2.33",
"@endo/ses-ava": "^0.2.35",
"ava": "^4.3.1"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/SwingSet/src/controller/initializeSwingset.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ function byName(a, b) {
* @param {string} basedir The directory to scan
* @param {object} [options]
* @param {boolean} [options.includeDevDependencies] whether to include devDependencies
* @param {ModuleFormat} [options.bundleFormat] the bundle format to use
* @param {BundleFormat} [options.bundleFormat] the bundle format to use
* @returns {SwingSetConfig} a swingset config object: {
* bootstrap: "bootstrap",
* vats: {
Expand Down
8 changes: 4 additions & 4 deletions packages/SwingSet/test/snapshots/test-xsnap-store.js.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ Generated by [AVA](https://avajs.dev).
{
compressSeconds: 0,
hash: '875291d3231ae6661d86de4c123120819fccbf1c8d4f7ac73531e79a8882e7ec',
hash: '29278a07d019b09317376597a2bc9d942551f988863a8f34789757205c38b662',
newFile: true,
rawByteCount: 775991,
rawByteCount: 777279,
rawSaveSeconds: 0,
}

> after use of harden() - sensitive to SES-shim, XS, and supervisor
{
compressSeconds: 0,
hash: 'c07085adf13f76f1652c181184cf37107819b28cbf3a738fe3fe69c0a1bb13db',
hash: 'b8adfd0323ad5a27695ca59ea71faebd66fea4ce91856c780db088da548b149e',
newFile: true,
rawByteCount: 777895,
rawByteCount: 779431,
rawSaveSeconds: 0,
}
Binary file modified packages/SwingSet/test/snapshots/test-xsnap-store.js.snap
Binary file not shown.
14 changes: 7 additions & 7 deletions packages/agoric-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
"@cosmjs/proto-signing": "0.29.0",
"@cosmjs/stargate": "0.29.0",
"@cosmjs/tendermint-rpc": "0.29.0",
"@endo/bundle-source": "^2.3.1",
"@endo/captp": "^2.0.15",
"@endo/compartment-mapper": "^0.7.13",
"@endo/far": "^0.2.11",
"@endo/init": "^0.5.49",
"@endo/marshal": "^0.7.5",
"@endo/promise-kit": "^0.2.49",
"@endo/bundle-source": "^2.4.1",
"@endo/captp": "^2.0.17",
"@endo/compartment-mapper": "^0.7.15",
"@endo/far": "^0.2.13",
"@endo/init": "^0.5.51",
"@endo/marshal": "^0.8.0",
"@endo/promise-kit": "^0.2.51",
"@iarna/toml": "^2.2.3",
"anylogger": "^0.21.0",
"chalk": "^2.4.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/assert/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"lint:types": "tsc -p jsconfig.json"
},
"devDependencies": {
"@endo/init": "^0.5.49",
"@endo/init": "^0.5.51",
"ava": "^4.3.1"
},
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions packages/cache/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"@agoric/store": "^0.8.3",
"@agoric/vat-data": "^0.4.3",
"@agoric/vats": "^0.13.0",
"@endo/far": "^0.2.11",
"@endo/marshal": "^0.7.5"
"@endo/far": "^0.2.13",
"@endo/marshal": "^0.8.0"
},
"devDependencies": {
"@agoric/zoe": "^0.25.3",
Expand Down
12 changes: 6 additions & 6 deletions packages/casting/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
"@cosmjs/proto-signing": "0.29.0",
"@cosmjs/stargate": "0.29.0",
"@cosmjs/tendermint-rpc": "0.29.0",
"@endo/far": "^0.2.11",
"@endo/init": "^0.5.49",
"@endo/lockdown": "^0.1.21",
"@endo/marshal": "^0.7.5",
"@endo/promise-kit": "^0.2.49",
"@endo/far": "^0.2.13",
"@endo/init": "^0.5.51",
"@endo/lockdown": "^0.1.23",
"@endo/marshal": "^0.8.0",
"@endo/promise-kit": "^0.2.51",
"node-fetch": "^2.6.0"
},
"devDependencies": {
"@endo/ses-ava": "^0.2.33",
"@endo/ses-ava": "^0.2.35",
"ava": "^4.3.1",
"c8": "^7.7.2",
"express": "^4.17.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/cosmic-swingset/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
"@agoric/telemetry": "^0.4.0",
"@agoric/vats": "^0.13.0",
"@agoric/xsnap": "^0.13.2",
"@endo/far": "^0.2.11",
"@endo/import-bundle": "^0.2.53",
"@endo/init": "^0.5.49",
"@endo/marshal": "^0.7.5",
"@endo/far": "^0.2.13",
"@endo/import-bundle": "^0.2.55",
"@endo/init": "^0.5.51",
"@endo/marshal": "^0.8.0",
"@iarna/toml": "^2.2.3",
"@opentelemetry/sdk-metrics-base": "^0.27.0",
"agoric": "^0.18.2",
Expand Down
8 changes: 4 additions & 4 deletions packages/deploy-script-support/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
"@agoric/vats": "^0.13.0",
"@agoric/zoe": "^0.25.3",
"@endo/base64": "^0.2.27",
"@endo/bundle-source": "^2.3.1",
"@endo/far": "^0.2.11",
"@endo/marshal": "^0.7.5",
"@endo/promise-kit": "^0.2.49",
"@endo/bundle-source": "^2.4.1",
"@endo/far": "^0.2.13",
"@endo/marshal": "^0.8.0",
"@endo/promise-kit": "^0.2.51",
"@endo/zip": "^0.2.27"
},
"devDependencies": {
Expand Down
9 changes: 9 additions & 0 deletions packages/deploy-script-support/src/install.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ import './externalTypes.js';

import { E } from '@endo/far';

/**
* @callback BundleSource
* @param {string} startFilename - the filepath to start the bundling from
* @param {(ModuleFormat | BundleOptions)=} moduleFormat
* @param {object=} powers
* @param {ReadFn=} powers.read
* @param {CanonicalFn=} powers.canonical
*/

// XXX board is Board but specifying that leads to type errors with imports which aren't worth fixing right now
/**
* @param {BundleSource} bundleSource
Expand Down
4 changes: 2 additions & 2 deletions packages/deployment/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"license": "Apache-2.0",
"dependencies": {
"@agoric/assert": "^0.5.1",
"@endo/init": "^0.5.49",
"@endo/marshal": "^0.7.5",
"@endo/init": "^0.5.51",
"@endo/marshal": "^0.8.0",
"chalk": "^2.4.2",
"deterministic-json": "^1.0.5",
"inquirer": "^8.2.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
],
"peerDependencies": {
"@endo/eslint-config": "^0.5.1",
"@jessie.js/eslint-plugin": "^0.2.0",
"@jessie.js/eslint-plugin": "^0.2.1",
"@typescript-eslint/parser": "^5.33.0",
"eslint": "^7.32.0",
"eslint-config-airbnb-base": "^14.0.0",
Expand Down
16 changes: 8 additions & 8 deletions packages/governance/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,20 @@
"@agoric/vat-data": "^0.4.3",
"@agoric/vats": "^0.13.0",
"@agoric/zoe": "^0.25.3",
"@endo/captp": "^2.0.15",
"@endo/eventual-send": "^0.16.5",
"@endo/far": "^0.2.11",
"@endo/marshal": "^0.7.5",
"@endo/promise-kit": "^0.2.49"
"@endo/captp": "^2.0.17",
"@endo/eventual-send": "^0.16.7",
"@endo/far": "^0.2.13",
"@endo/marshal": "^0.8.0",
"@endo/promise-kit": "^0.2.51"
},
"devDependencies": {
"@agoric/deploy-script-support": "^0.9.4",
"@endo/bundle-source": "^2.3.1",
"@endo/init": "^0.5.49",
"@endo/bundle-source": "^2.4.1",
"@endo/init": "^0.5.51",
"ava": "^4.3.1",
"c8": "^7.11.0",
"import-meta-resolve": "^1.1.1",
"ses": "^0.15.23"
"ses": "^0.17.0"
},
"files": [
"README.md",
Expand Down
16 changes: 8 additions & 8 deletions packages/inter-protocol/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@
"@agoric/vat-data": "^0.4.3",
"@agoric/vats": "^0.13.0",
"@agoric/zoe": "^0.25.3",
"@endo/bundle-source": "^2.3.1",
"@endo/captp": "^2.0.15",
"@endo/eventual-send": "^0.16.5",
"@endo/far": "^0.2.11",
"@endo/marshal": "^0.7.5",
"@endo/nat": "^4.1.20",
"@endo/promise-kit": "^0.2.49"
"@endo/bundle-source": "^2.4.1",
"@endo/captp": "^2.0.17",
"@endo/eventual-send": "^0.16.7",
"@endo/far": "^0.2.13",
"@endo/marshal": "^0.8.0",
"@endo/nat": "^4.1.22",
"@endo/promise-kit": "^0.2.51"
},
"devDependencies": {
"@agoric/deploy-script-support": "^0.9.4",
"@endo/init": "^0.5.49",
"@endo/init": "^0.5.51",
"@fast-check/ava": "^1.0.1",
"ava": "^4.3.1",
"c8": "^7.11.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/internal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
"lint:types": "tsc -p jsconfig.json"
},
"dependencies": {
"@endo/eventual-send": "^0.16.5",
"@endo/marshal": "^0.7.5",
"@endo/promise-kit": "^0.2.49"
"@endo/eventual-send": "^0.16.7",
"@endo/marshal": "^0.8.0",
"@endo/promise-kit": "^0.2.51"
},
"devDependencies": {
"@endo/init": "^0.5.49",
"@endo/init": "^0.5.51",
"ava": "^4.3.1"
},
"author": "Agoric",
Expand Down
1 change: 1 addition & 0 deletions packages/internal/src/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// @ts-check
/// <reference types="ses"/>

export * from './utils.js';
export * from './config.js';
10 changes: 5 additions & 5 deletions packages/notifier/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
"homepage": "https://github.com/Agoric/agoric-sdk#readme",
"dependencies": {
"@agoric/assert": "^0.5.1",
"@endo/eventual-send": "^0.16.5",
"@endo/marshal": "^0.7.5",
"@endo/promise-kit": "^0.2.49"
"@endo/eventual-send": "^0.16.7",
"@endo/marshal": "^0.8.0",
"@endo/promise-kit": "^0.2.51"
},
"devDependencies": {
"@endo/init": "^0.5.49",
"@endo/ses-ava": "^0.2.33",
"@endo/init": "^0.5.51",
"@endo/ses-ava": "^0.2.35",
"ava": "^4.3.1",
"c8": "^7.7.2"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/pegasus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
"@agoric/swingset-vat": "^0.30.2",
"@agoric/vats": "^0.13.0",
"@agoric/zoe": "^0.25.3",
"@endo/bundle-source": "^2.3.1",
"@endo/captp": "^2.0.15",
"@endo/far": "^0.2.11",
"@endo/init": "^0.5.49",
"@endo/promise-kit": "^0.2.49"
"@endo/bundle-source": "^2.4.1",
"@endo/captp": "^2.0.17",
"@endo/far": "^0.2.13",
"@endo/init": "^0.5.51",
"@endo/promise-kit": "^0.2.51"
},
"devDependencies": {
"@agoric/deploy-script-support": "^0.9.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/same-structure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"dependencies": {
"@agoric/assert": "^0.5.1",
"@agoric/store": "^0.8.1",
"@endo/marshal": "^0.7.5"
"@endo/marshal": "^0.8.0"
},
"files": [
"*.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/sharing-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
"homepage": "https://github.com/Agoric/agoric-sdk#readme",
"dependencies": {
"@agoric/assert": "^0.5.1",
"@endo/marshal": "^0.7.5"
"@endo/marshal": "^0.8.0"
},
"devDependencies": {
"@agoric/swingset-vat": "^0.30.2",
"@endo/eventual-send": "^0.16.5",
"@endo/eventual-send": "^0.16.7",
"ava": "^4.3.1",
"c8": "^7.7.2"
},
Expand Down
Loading

0 comments on commit eeab44a

Please sign in to comment.