Skip to content

Commit

Permalink
Merge pull request #5576 from Agoric/kris-sync-endo
Browse files Browse the repository at this point in the history
chore: Sync Endo versions
  • Loading branch information
mergify[bot] authored Jun 29, 2022
2 parents 86d58b9 + cd7b880 commit a3c06c1
Show file tree
Hide file tree
Showing 45 changed files with 324 additions and 335 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
],
"type": "module",
"devDependencies": {
"@endo/eslint-config": "^0.4.10",
"@jessie.js/eslint-plugin": "^0.1.3",
"@endo/eslint-config": "^0.5.1",
"@jessie.js/eslint-plugin": "^0.2.0",
"@types/node": "^16.7.10",
"@typescript-eslint/parser": "^5.27.0",
"ava": "^3.15.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/ERTP/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
"@agoric/store": "^0.7.2",
"@agoric/swingset-vat": "^0.28.0",
"@agoric/vat-data": "^0.3.1",
"@endo/eventual-send": "^0.15.3",
"@endo/marshal": "^0.6.7",
"@endo/promise-kit": "^0.2.41"
"@endo/eventual-send": "^0.15.5",
"@endo/marshal": "^0.6.9",
"@endo/promise-kit": "^0.2.43"
},
"devDependencies": {
"@endo/bundle-source": "^2.2.0",
"@endo/bundle-source": "^2.2.2",
"ava": "^3.12.1",
"fast-check": "^2.21.0"
},
Expand Down
24 changes: 12 additions & 12 deletions packages/SwingSet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,25 @@
"@agoric/store": "^0.7.2",
"@agoric/swing-store": "^0.7.0",
"@agoric/xsnap": "^0.13.0",
"@endo/base64": "^0.2.25",
"@endo/bundle-source": "^2.2.0",
"@endo/captp": "^2.0.7",
"@endo/check-bundle": "^0.2.3",
"@endo/compartment-mapper": "^0.7.5",
"@endo/eventual-send": "^0.15.3",
"@endo/import-bundle": "^0.2.45",
"@endo/init": "^0.5.41",
"@endo/marshal": "^0.6.7",
"@endo/promise-kit": "^0.2.41",
"@endo/zip": "^0.2.25",
"@endo/base64": "^0.2.27",
"@endo/bundle-source": "^2.2.2",
"@endo/captp": "^2.0.9",
"@endo/check-bundle": "^0.2.5",
"@endo/compartment-mapper": "^0.7.7",
"@endo/eventual-send": "^0.15.5",
"@endo/import-bundle": "^0.2.47",
"@endo/init": "^0.5.43",
"@endo/marshal": "^0.6.9",
"@endo/promise-kit": "^0.2.43",
"@endo/zip": "^0.2.27",
"anylogger": "^0.21.0",
"import-meta-resolve": "^1.1.1",
"lmdb": "^2.4.5",
"microtime": "^3.1.0",
"semver": "^6.3.0"
},
"peerDependencies": {
"@endo/ses-ava": "^0.2.25",
"@endo/ses-ava": "^0.2.27",
"ava": "^3.12.1"
},
"files": [
Expand Down
4 changes: 2 additions & 2 deletions packages/SwingSet/test/snapshots/test-xsnap-store.js.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Generated by [AVA](https://avajs.dev).

> after SES boot - sensitive to SES-shim, XS, and supervisor
'9822130fa3ff880d5a45ae4bfb3416d33a804ec764693bbad0eac510bd7d9154'
'c76779e7c4869243c4ec29f2727d7cc31966e976b421e75557e272651f923054'

> after use of harden() - sensitive to SES-shim, XS, and supervisor
'e6025c6d5c9f994636d94b684e65819166eb5a9864750ef0e6fa44b3d81c9a43'
'beeb0ca67e1939a76bfd8b84e51978dd148ddbb65df30498758e77217e6d5f25'
Binary file modified packages/SwingSet/test/snapshots/test-xsnap-store.js.snap
Binary file not shown.
5 changes: 4 additions & 1 deletion packages/SwingSet/test/test-liveslots.js
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,10 @@ test('liveslots vs symbols', async t => {
t.deepEqual(log.shift(), {
type: 'send',
targetSlot: target,
methargs: capargs([{ '@qclass': '@@asyncIterator' }, ['arg']]),
methargs: capargs([
{ '@qclass': 'symbol', name: '@@asyncIterator' },
['arg'],
]),
resultSlot: 'p+5',
});
t.deepEqual(log.shift(), { type: 'subscribe', target: 'p+5' });
Expand Down
12 changes: 6 additions & 6 deletions packages/agoric-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
"@agoric/cache": "^0.1.0",
"@agoric/casting": "^0.1.0",
"@agoric/nat": "^4.1.0",
"@endo/bundle-source": "^2.2.0",
"@endo/captp": "^2.0.7",
"@endo/compartment-mapper": "^0.7.5",
"@endo/init": "^0.5.41",
"@endo/marshal": "^0.6.7",
"@endo/promise-kit": "^0.2.41",
"@endo/bundle-source": "^2.2.2",
"@endo/captp": "^2.0.9",
"@endo/compartment-mapper": "^0.7.7",
"@endo/init": "^0.5.43",
"@endo/marshal": "^0.6.9",
"@endo/promise-kit": "^0.2.43",
"@iarna/toml": "^2.2.3",
"anylogger": "^0.21.0",
"chalk": "^2.4.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/cache/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"license": "Apache-2.0",
"dependencies": {
"@agoric/store": "^0.7.2",
"@endo/far": "^0.2.3",
"@endo/marshal": "^0.6.7"
"@endo/far": "^0.2.5",
"@endo/marshal": "^0.6.9"
},
"devDependencies": {
"ava": "^3.12.1",
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,19 +26,19 @@
"@cosmjs/proto-signing": "0.28.4",
"@cosmjs/stargate": "0.28.4",
"@cosmjs/tendermint-rpc": "0.28.4",
"@endo/far": "^0.2.3",
"@endo/init": "^0.5.41",
"@endo/lockdown": "^0.1.13",
"@endo/marshal": "^0.6.7",
"@endo/promise-kit": "^0.2.41",
"@endo/far": "^0.2.5",
"@endo/init": "^0.5.43",
"@endo/lockdown": "^0.1.15",
"@endo/marshal": "^0.6.9",
"@endo/promise-kit": "^0.2.43",
"node-fetch": "^2.6.0"
},
"devDependencies": {
"ava": "^3.12.1",
"c8": "^7.7.2",
"express": "^4.17.1",
"ws": "^7.2.0",
"@endo/ses-ava": "^0.2.25"
"@endo/ses-ava": "^0.2.27"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 3 additions & 3 deletions packages/cosmic-swingset/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"@agoric/telemetry": "^0.2.1",
"@agoric/vats": "^0.10.0",
"@agoric/xsnap": "^0.13.0",
"@endo/far": "^0.2.3",
"@endo/import-bundle": "^0.2.45",
"@endo/init": "^0.5.41",
"@endo/far": "^0.2.5",
"@endo/import-bundle": "^0.2.47",
"@endo/init": "^0.5.43",
"@iarna/toml": "^2.2.3",
"@opentelemetry/sdk-metrics-base": "^0.27.0",
"agoric": "^0.16.0",
Expand Down
12 changes: 6 additions & 6 deletions packages/deploy-script-support/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
"@agoric/store": "^0.7.2",
"@agoric/vats": "^0.10.0",
"@agoric/zoe": "^0.24.0",
"@endo/base64": "^0.2.25",
"@endo/bundle-source": "^2.2.0",
"@endo/far": "^0.2.3",
"@endo/marshal": "^0.6.7",
"@endo/promise-kit": "^0.2.41",
"@endo/zip": "^0.2.25"
"@endo/base64": "^0.2.27",
"@endo/bundle-source": "^2.2.2",
"@endo/far": "^0.2.5",
"@endo/marshal": "^0.6.9",
"@endo/promise-kit": "^0.2.43",
"@endo/zip": "^0.2.27"
},
"devDependencies": {
"@agoric/swingset-vat": "^0.28.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';

import { E } from '@endo/far';
import '@agoric/vats/src/core/types.js';
import { runModuleBehaviors } from '@agoric/vats/src/core/utils.js';
import {
makeAgoricNamesAccess,
runModuleBehaviors,
} from '@agoric/vats/src/core/utils.js';
import { makeCoreProposalBehavior } from '../../src/coreProposalBehavior.js';

test('coreProposalBehavior', async t => {
Expand All @@ -14,8 +17,14 @@ test('coreProposalBehavior', async t => {
getManifestCall,
log: t.log,
});
const { agoricNamesAdmin } = makeAgoricNamesAccess(t.log);
const result = await behavior({
consume: { board: { getValue: id => `boardValue:${id}` } },
consume: {
board: {
getValue: id => `boardValue:${id}`,
},
agoricNamesAdmin,
},
aParams: 'aparms',
bParams: 'bparms',
cParams: 'cparms',
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.4.0",
"@endo/init": "^0.5.41",
"@endo/marshal": "^0.6.7",
"@endo/init": "^0.5.43",
"@endo/marshal": "^0.6.9",
"chalk": "^2.4.2",
"deterministic-json": "^1.0.5",
"inquirer": "^8.2.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"eslint-config.json"
],
"peerDependencies": {
"@endo/eslint-config": "^0.4.10",
"@jessie.js/eslint-plugin": "^0.1.3",
"@endo/eslint-config": "^0.5.1",
"@jessie.js/eslint-plugin": "^0.2.0",
"@typescript-eslint/parser": "^5.27.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 @@ -35,21 +35,21 @@
"@agoric/notifier": "^0.4.0",
"@agoric/store": "^0.7.2",
"@agoric/zoe": "^0.24.0",
"@endo/captp": "^2.0.7",
"@endo/eventual-send": "^0.15.3",
"@endo/far": "^0.2.3",
"@endo/marshal": "^0.6.7",
"@endo/promise-kit": "^0.2.41"
"@endo/captp": "^2.0.9",
"@endo/eventual-send": "^0.15.5",
"@endo/far": "^0.2.5",
"@endo/marshal": "^0.6.9",
"@endo/promise-kit": "^0.2.43"
},
"devDependencies": {
"@agoric/deploy-script-support": "^0.9.0",
"@agoric/swingset-vat": "^0.28.0",
"@endo/bundle-source": "^2.2.0",
"@endo/init": "^0.5.41",
"@endo/bundle-source": "^2.2.2",
"@endo/init": "^0.5.43",
"ava": "^3.12.1",
"c8": "^7.11.0",
"import-meta-resolve": "^1.1.1",
"ses": "^0.15.15"
"ses": "^0.15.17"
},
"files": [
"README.md",
Expand Down
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.4.0",
"@endo/eventual-send": "^0.15.3",
"@endo/marshal": "^0.6.7",
"@endo/promise-kit": "^0.2.41"
"@endo/eventual-send": "^0.15.5",
"@endo/marshal": "^0.6.9",
"@endo/promise-kit": "^0.2.43"
},
"devDependencies": {
"@endo/init": "^0.5.41",
"@endo/ses-ava": "^0.2.25",
"@endo/init": "^0.5.43",
"@endo/ses-ava": "^0.2.27",
"ava": "^3.12.1",
"c8": "^7.7.2"
},
Expand Down
8 changes: 8 additions & 0 deletions packages/notifier/src/publish-kit.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import { Far } from '@endo/marshal';

import './types.js';

const sink = () => {};

/**
* Asyncronously iterates over the contents of a PublicationList as it appears.
* As it proceeds, it must drop the parts of the list it no longer needs.
Expand All @@ -23,6 +25,12 @@ const makeEachIterator = pubList => {
next: () => {
const resultP = E.get(pubList).head;
pubList = E.get(pubList).tail;
// We expect the tail to be the "cannot read past end" error at the end
// of the happy path.
// Since we are wrapping that error with eventual send, we sink the
// rejection here too so it doesn't become an invalid unhandled rejection
// later.
E.when(pubList, sink, sink);
return resultP;
},
});
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.28.0",
"@agoric/vats": "^0.10.0",
"@agoric/zoe": "^0.24.0",
"@endo/bundle-source": "^2.2.0",
"@endo/captp": "^2.0.7",
"@endo/far": "^0.2.3",
"@endo/init": "^0.5.41",
"@endo/promise-kit": "^0.2.41"
"@endo/bundle-source": "^2.2.2",
"@endo/captp": "^2.0.9",
"@endo/far": "^0.2.5",
"@endo/init": "^0.5.43",
"@endo/promise-kit": "^0.2.43"
},
"devDependencies": {
"@agoric/deploy-script-support": "^0.9.0",
Expand Down
16 changes: 8 additions & 8 deletions packages/run-protocol/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@
"@agoric/vat-data": "^0.3.1",
"@agoric/vats": "^0.10.0",
"@agoric/zoe": "^0.24.0",
"@endo/bundle-source": "^2.2.0",
"@endo/captp": "^2.0.7",
"@endo/eventual-send": "^0.15.3",
"@endo/far": "^0.2.3",
"@endo/marshal": "^0.6.7",
"@endo/nat": "^4.1.12",
"@endo/promise-kit": "^0.2.41"
"@endo/bundle-source": "^2.2.2",
"@endo/captp": "^2.0.9",
"@endo/eventual-send": "^0.15.5",
"@endo/far": "^0.2.5",
"@endo/marshal": "^0.6.9",
"@endo/nat": "^4.1.14",
"@endo/promise-kit": "^0.2.43"
},
"devDependencies": {
"@agoric/deploy-script-support": "^0.9.0",
"@endo/init": "^0.5.41",
"@endo/init": "^0.5.43",
"ava": "^3.12.1",
"c8": "^7.11.0",
"deep-object-diff": "^1.1.7",
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.4.0",
"@agoric/store": "^0.7.2",
"@endo/marshal": "^0.6.7"
"@endo/marshal": "^0.6.9"
},
"devDependencies": {
"ava": "^3.12.1"
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.4.0",
"@endo/marshal": "^0.6.7"
"@endo/marshal": "^0.6.9"
},
"devDependencies": {
"@agoric/swingset-vat": "^0.28.0",
"@endo/eventual-send": "^0.15.3",
"@endo/eventual-send": "^0.15.5",
"ava": "^3.12.1",
"c8": "^7.7.2"
},
Expand Down
14 changes: 7 additions & 7 deletions packages/solo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
"@agoric/telemetry": "^0.2.1",
"@agoric/vats": "^0.10.0",
"@agoric/wallet": "^0.13.1",
"@endo/captp": "^2.0.7",
"@endo/eventual-send": "^0.15.3",
"@endo/import-bundle": "^0.2.45",
"@endo/init": "^0.5.41",
"@endo/marshal": "^0.6.7",
"@endo/promise-kit": "^0.2.41",
"@endo/captp": "^2.0.9",
"@endo/eventual-send": "^0.15.5",
"@endo/import-bundle": "^0.2.47",
"@endo/init": "^0.5.43",
"@endo/marshal": "^0.6.9",
"@endo/promise-kit": "^0.2.43",
"agoric": "^0.16.0",
"anylogger": "^0.21.0",
"deterministic-json": "^1.0.5",
Expand All @@ -56,7 +56,7 @@
},
"devDependencies": {
"@agoric/ertp": "^0.14.2",
"@endo/bundle-source": "^2.2.0",
"@endo/bundle-source": "^2.2.2",
"ava": "^3.12.1",
"c8": "^7.7.2"
},
Expand Down
Loading

0 comments on commit a3c06c1

Please sign in to comment.