From 75b00b2a1596bbd4a43f3e103344079698a7da7a Mon Sep 17 00:00:00 2001 From: Luqi Pan Date: Wed, 20 Dec 2023 08:57:24 -0800 Subject: [PATCH 01/21] Update links to docs (#8673) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1aab3c7b9e8..11805405cf6 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ layers of the Agoric platform, with providing the lower layers. If you want to build on top of this platform, you don't need these repositories: instead you should -[follow our instructions for getting started](https://agoric.com/documentation/getting-started/) +[follow our instructions for getting started](https://docs.agoric.com/guides/getting-started/) with the Agoric SDK. But if you are improving the platform itself, these are the repositories @@ -89,7 +89,7 @@ To run the unit tests of just a single package (e.g. `eventual-send`): ## Run the larger demo -Visit [https://agoric.com/documentation/](https://agoric.com/documentation/getting-started/before-using-agoric.html) for getting started instructions. +Visit [https://docs.agoric.com](https://docs.agoric.com/guides/getting-started/) for getting started instructions. TL;DR: From ec6fad973bbf69b620d69498a28c0548dfaad178 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Tue, 21 Nov 2023 17:18:39 -0800 Subject: [PATCH 02/21] fix(ci): Generate types when syncing Endo --- scripts/get-packed-versions.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/get-packed-versions.sh b/scripts/get-packed-versions.sh index e5f0c856a73..ffa4f0f1709 100755 --- a/scripts/get-packed-versions.sh +++ b/scripts/get-packed-versions.sh @@ -18,6 +18,9 @@ cd -- "$WORKDIR" 1>&2 # Install and build the source directory. yarn install 1>&2 yarn build 1>&2 + +yarn lerna run build:types 1>&2 + yarn --silent workspaces info | jq -r '.[].location' | while read -r dir; do # Skip private packages. echo "dir=$dir" 1>&2 From 59ab3c556c5d423cbc7c3a9be8a67d1e5b51ebf4 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Tue, 28 Nov 2023 15:39:09 -0800 Subject: [PATCH 03/21] fix(zoe): Accommodate exo-stensibility by relaxing method name enumeration tests --- .../test/unitTests/test-zoe-startInstance.js | 59 ++++++++++++------- packages/zoe/test/unitTests/zcf/test-zcf.js | 5 +- 2 files changed, 42 insertions(+), 22 deletions(-) diff --git a/packages/zoe/test/unitTests/test-zoe-startInstance.js b/packages/zoe/test/unitTests/test-zoe-startInstance.js index 55d17a534dc..318e237e48c 100644 --- a/packages/zoe/test/unitTests/test-zoe-startInstance.js +++ b/packages/zoe/test/unitTests/test-zoe-startInstance.js @@ -23,24 +23,35 @@ test('bad installation', async t => { function isEmptyFacet(t, facet) { t.is(passStyleOf(facet), 'remotable'); - t.deepEqual(Object.getOwnPropertyNames(facet), []); + t.deepEqual( + Object.getOwnPropertyNames(facet).filter(name => !name.startsWith('__')), + [], + ); } function facetHasMethods(t, facet, names) { t.is(passStyleOf(facet), 'remotable'); - t.deepEqual(Object.getOwnPropertyNames(facet), names); + t.deepEqual( + Object.getOwnPropertyNames(facet).filter(name => !name.startsWith('__')), + names, + ); } test('no issuerKeywordRecord, no terms', async t => { const result = await setupZCFTest(); // Note that deepEqual treats all empty objects (handles) as interchangeable. - t.deepEqual(Object.getOwnPropertyNames(result.startInstanceResult).sort(), [ - 'adminFacet', - 'creatorFacet', - 'creatorInvitation', - 'instance', - 'publicFacet', - ]); + t.deepEqual( + Object.getOwnPropertyNames(result.startInstanceResult) + .filter(name => !name.startsWith('__')) + .sort(), + [ + 'adminFacet', + 'creatorFacet', + 'creatorInvitation', + 'instance', + 'publicFacet', + ], + ); isEmptyFacet(t, result.creatorFacet); t.deepEqual(result.creatorInvitation, undefined); facetHasMethods(t, result.startInstanceResult.publicFacet, [ @@ -54,21 +65,27 @@ test('promise for installation', async t => { const result = await startInstanceResult; // Note that deepEqual treats all empty objects (handles) as interchangeable. - t.deepEqual(Object.getOwnPropertyNames(result).sort(), [ - 'adminFacet', - 'creatorFacet', - 'creatorInvitation', - 'instance', - 'publicFacet', - ]); + t.deepEqual( + Object.getOwnPropertyNames(result) + .filter(name => !name.startsWith('__')) + .sort(), + [ + 'adminFacet', + 'creatorFacet', + 'creatorInvitation', + 'instance', + 'publicFacet', + ], + ); isEmptyFacet(t, result.creatorFacet); t.deepEqual(result.creatorInvitation, undefined); facetHasMethods(t, result.publicFacet, ['makeInvitation']); - t.deepEqual(getStringMethodNames(result.adminFacet), [ - 'getVatShutdownPromise', - 'restartContract', - 'upgradeContract', - ]); + t.deepEqual( + getStringMethodNames(result.adminFacet).filter( + name => !name.startsWith('__'), + ), + ['getVatShutdownPromise', 'restartContract', 'upgradeContract'], + ); }); test('terms, issuerKeywordRecord switched', async t => { diff --git a/packages/zoe/test/unitTests/zcf/test-zcf.js b/packages/zoe/test/unitTests/zcf/test-zcf.js index 89b32677911..ed4728fd615 100644 --- a/packages/zoe/test/unitTests/zcf/test-zcf.js +++ b/packages/zoe/test/unitTests/zcf/test-zcf.js @@ -707,7 +707,10 @@ test(`zcfSeat from zcf.makeEmptySeatKit - only these properties exist`, async t const { zcf } = await setupZCFTest(); const makeZCFSeat = () => zcf.makeEmptySeatKit().zcfSeat; const seat = makeZCFSeat(); - t.deepEqual(getStringMethodNames(seat), expectedStringMethods.sort()); + t.deepEqual( + getStringMethodNames(seat).filter(name => !name.startsWith('__')), + expectedStringMethods.sort(), + ); }); test(`zcfSeat.getProposal from zcf.makeEmptySeatKit`, async t => { From 7cc4f967d98416e41a0fdfd4392531b198a9233e Mon Sep 17 00:00:00 2001 From: "Mark S. Miller" Date: Tue, 28 Nov 2023 21:31:24 -0800 Subject: [PATCH 04/21] fix(zoe): Golden error regexp tolerant across endo versions --- packages/zoe/test/unitTests/test-zoe.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/packages/zoe/test/unitTests/test-zoe.js b/packages/zoe/test/unitTests/test-zoe.js index 65b31efae82..ab704870417 100644 --- a/packages/zoe/test/unitTests/test-zoe.js +++ b/packages/zoe/test/unitTests/test-zoe.js @@ -143,7 +143,10 @@ test(`E(zoe).getPublicFacet - no instance`, async t => { // @ts-expect-error deliberate invalid arguments for testing await t.throwsAsync(() => E(zoe).getPublicFacet(), { message: - /In "getPublicFacet" method of \(ZoeService\): arg 0: .*"\[undefined\]" - Must be a remotable/, + // Golden test uses RegExp "Or" pattern to tolerate earlier versions of + // Endo. + // TODO: Remove first disjunct once no longer needed + /In "getPublicFacet" method of \(ZoeService\): (?:arg 0: .*"\[undefined\]" - Must be a remotable|Expected at least 1 arguments: \[\])/, }); }); @@ -174,7 +177,10 @@ test(`zoe.getIssuers - no instance`, async t => { // @ts-expect-error invalid arguments for testing await t.throwsAsync(() => E(zoe).getIssuers(), { message: - /In "getIssuers" method of \(ZoeService\): arg 0: .*"\[undefined\]" - Must be a remotable/, + // Golden test uses RegExp "Or" pattern to tolerate earlier versions of + // Endo. + // TODO: Remove first disjunct once no longer needed + /In "getIssuers" method of \(ZoeService\): (?:arg 0: .*"\[undefined\]" - Must be a remotable|Expected at least 1 arguments: \[\])/, }); }); @@ -205,7 +211,9 @@ test(`zoe.getBrands - no instance`, async t => { // @ts-expect-error invalid arguments for testing await t.throwsAsync(() => E(zoe).getBrands(), { message: - /In "getBrands" method of \(ZoeService\): arg 0: .*"\[undefined\]" - Must be a remotable/, + // Or pattern of golden error tolerant across versions of endo. + // TODO: Remove first disjunct once no longer needed + /In "getBrands" method of \(ZoeService\): (?:arg 0: .*"\[undefined\]" - Must be a remotable|Expected at least 1 arguments: \[\])/, }); }); @@ -261,7 +269,9 @@ test(`zoe.getTerms - no instance`, async t => { // @ts-expect-error invalid arguments for testing await t.throwsAsync(() => E(zoe).getTerms(), { message: - /In "getTerms" method of \(ZoeService\): arg 0: .*"\[undefined\]" - Must be a remotable/, + // Or pattern of golden error tolerant across versions of endo. + // TODO: Remove first disjunct once no longer needed + /In "getTerms" method of \(ZoeService\): (?:arg 0: .*"\[undefined\]" - Must be a remotable|Expected at least 1 arguments: \[\])/, }); }); From ad575b0f32c5fea30f73c28e729663a660a53f02 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Wed, 6 Dec 2023 15:01:18 -0800 Subject: [PATCH 05/21] fix(vats): Shape of NameHub lookupAdmin rest args --- packages/vats/src/nameHub.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vats/src/nameHub.js b/packages/vats/src/nameHub.js index f5e9acc1236..505998fbd6d 100644 --- a/packages/vats/src/nameHub.js +++ b/packages/vats/src/nameHub.js @@ -37,7 +37,7 @@ export const NameHubIKit = harden({ update: M.call(KeyShape, M.any()) .optional(M.remotable('newAdminValue')) .returns(M.any()), - lookupAdmin: M.call(KeyShape).returns(M.promise()), + lookupAdmin: M.call().rest(M.arrayOf(KeyShape)).returns(M.promise()), delete: M.call(KeyShape).returns(M.any()), readonly: M.call().returns(M.remotable()), }), From ce4cc4788b04956994d594af9cf46ad4a7f0604f Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Wed, 6 Dec 2023 16:36:25 -0800 Subject: [PATCH 06/21] fix(inter-protocol): Relax rounds manager interface guards --- packages/inter-protocol/src/price/roundsManager.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/inter-protocol/src/price/roundsManager.js b/packages/inter-protocol/src/price/roundsManager.js index 30fed5827d8..8d80b8017ef 100644 --- a/packages/inter-protocol/src/price/roundsManager.js +++ b/packages/inter-protocol/src/price/roundsManager.js @@ -101,12 +101,14 @@ export const prepareRoundsManagerKit = baggage => contract: M.interface( 'contract', { - authenticateQuote: M.call(M.any()).returns(M.any()), - makeCreateQuote: M.call().optional(M.any()).returns(M.any()), - eligibleForSpecificRound: M.call(M.any()).returns(M.boolean()), - getRoundData: M.call(M.any()).returns(M.promise()), - getRoundStatus: M.call(M.any()).returns(M.record()), - oracleRoundStateSuggestRound: M.call(M.any()).returns(M.record()), + authenticateQuote: M.call().rest(M.any()).returns(M.any()), + makeCreateQuote: M.call().rest(M.any()).returns(M.any()), + eligibleForSpecificRound: M.call().rest(M.any()).returns(M.boolean()), + getRoundData: M.call().rest(M.any()).returns(M.promise()), + getRoundStatus: M.call().rest(M.any()).returns(M.record()), + oracleRoundStateSuggestRound: M.call() + .rest(M.any()) + .returns(M.record()), }, // TODO(6571) stop sloppy { sloppy: true }, From fe8ff260f83bc4f2668f3dd24c3ff922b2532e8a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Wed, 6 Dec 2023 17:56:56 -0800 Subject: [PATCH 07/21] fix(inter-protocol): Satisfy interface guard in mock --- packages/inter-protocol/test/psm/test-psm.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/inter-protocol/test/psm/test-psm.js b/packages/inter-protocol/test/psm/test-psm.js index e53eee771c9..f5f4ad373e7 100644 --- a/packages/inter-protocol/test/psm/test-psm.js +++ b/packages/inter-protocol/test/psm/test-psm.js @@ -734,6 +734,7 @@ test('extra give wantMintedInvitation', async t => { const makeMockBankManager = t => { /** @type {BankManager} */ const bankManager = Far('mock BankManager', { + __getInterfaceGuard__: () => undefined, getAssetSubscription: () => assert.fail('not impl'), getModuleAccountAddress: () => assert.fail('not impl'), getRewardDistributorDepositFacet: () => From c6c69447b285bca85db27dd4cedaca5f8c34fb83 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Thu, 7 Dec 2023 16:50:51 -0800 Subject: [PATCH 08/21] refactor(base-zone): Complete Endo migration --- packages/base-zone/tools/greeter.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/base-zone/tools/greeter.js b/packages/base-zone/tools/greeter.js index 9426b196f17..7379ecb8e69 100644 --- a/packages/base-zone/tools/greeter.js +++ b/packages/base-zone/tools/greeter.js @@ -44,7 +44,6 @@ export const GreeterWithAdminI = M.interface('GreeterWithAdmin', { */ export const prepareGreeterSingleton = (zone, label, nick) => { const myThis = Object.freeze({ state: { nick } }); - // @ts-expect-error Until https://github.com/endojs/endo/pull/1771 return zone.exo(label, GreeterWithAdminI, { ...bindAllMethodsTo(greetFacet, myThis), ...bindAllMethodsTo(adminFacet, myThis), @@ -55,7 +54,6 @@ export const prepareGreeterSingleton = (zone, label, nick) => { * @param {import('../src/types.js').Zone} zone */ export const prepareGreeter = zone => - // @ts-expect-error Until https://github.com/endojs/endo/pull/1771 zone.exoClass('Greeter', GreeterWithAdminI, nick => ({ nick }), { ...greetFacet, ...adminFacet, From 9aa58683e594f714c9ea0ff04934b26c7df2ca13 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 10 Nov 2023 17:09:03 -0800 Subject: [PATCH 09/21] refactor: Make all TS import extensions explicit --- .../SwingSet/src/controller/controller.js | 2 +- .../SwingSet/src/controller/startXSnap.js | 2 +- packages/SwingSet/src/kernel/vat-warehouse.js | 2 +- packages/SwingSet/src/types-external.js | 4 ++-- packages/agoric-cli/src/commands/gov.js | 2 +- packages/agoric-cli/src/commands/inter.js | 2 +- packages/agoric-cli/src/lib/chain.js | 6 ++--- packages/agoric-cli/src/lib/format.js | 4 ++-- packages/agoric-cli/src/lib/wallet.js | 18 +++++++------- packages/base-zone/tools/testers.js | 4 ++-- packages/cache/src/cache.js | 2 +- packages/cache/src/state.js | 2 +- packages/cache/src/store.js | 20 ++++++++-------- packages/casting/src/casting-spec.js | 14 +++++------ packages/casting/src/change-follower.js | 4 ++-- packages/casting/src/defaults.js | 2 +- packages/casting/src/follower-cosmjs.js | 4 ++-- packages/casting/src/follower.js | 12 +++++----- packages/casting/src/iterable.js | 2 +- packages/deploy-script-support/src/install.js | 2 +- packages/deploy-script-support/src/offer.js | 2 +- .../deploy-script-support/src/saveIssuer.js | 4 ++-- .../src/startInstance.js | 2 +- .../test/unitTests/test-startInstance.js | 2 +- packages/governance/src/contractHelper.js | 6 ++--- packages/governance/tools/puppetGovernance.js | 2 +- packages/inter-protocol/src/clientSupport.js | 2 +- .../src/price/fluxAggregatorKit.js | 4 ++-- .../src/proposals/committee-proposal.js | 10 ++++---- .../src/proposals/econ-behaviors.js | 2 +- .../src/proposals/price-feed-proposal.js | 2 +- .../src/proposals/startEconCommittee.js | 2 +- packages/inter-protocol/src/provisionPool.js | 2 +- .../inter-protocol/src/provisionPoolKit.js | 4 ++-- packages/inter-protocol/src/psm/types.js | 2 +- .../src/vaultFactory/orderedVaultStore.js | 4 ++-- .../inter-protocol/src/vaultFactory/params.js | 2 +- .../src/vaultFactory/prioritizedVaults.js | 2 +- .../inter-protocol/src/vaultFactory/types.js | 10 ++++---- .../inter-protocol/src/vaultFactory/vault.js | 2 +- .../src/vaultFactory/vaultDirector.js | 2 +- .../src/vaultFactory/vaultFactory.js | 2 +- packages/inter-protocol/test/auction/tools.js | 4 ++-- packages/inter-protocol/test/metrics.js | 4 ++-- packages/inter-protocol/test/psm/test-psm.js | 2 +- packages/inter-protocol/test/reserve/setup.js | 4 ++-- .../test/smartWallet/contexts.js | 4 ++-- .../smartWallet/test-oracle-integration.js | 8 +++---- .../test/smartWallet/test-psm-integration.js | 12 +++++----- packages/inter-protocol/test/supports.js | 4 ++-- ...ootstrap-fluxAggregator-service-upgrade.js | 4 ++-- .../psmUpgrade/bootstrap-psm-upgrade.js | 10 ++++---- .../reserve/bootstrap-assetReserve-upgrade.js | 8 +++---- .../inter-protocol/test/test-provisionPool.js | 4 ++-- .../test/vaultFactory/driver.js | 2 +- .../test/vaultFactory/test-vaultFactory.js | 2 +- .../vaultFactory/test-vaultLiquidation.js | 2 +- packages/internal/src/callback.js | 4 ++-- packages/internal/src/lib-chainStorage.js | 4 ++-- packages/internal/test/test-callback.js | 22 ++++++++--------- packages/network/test/test-network-misc.js | 8 +++---- packages/pegasus/test/test-peg.js | 4 ++-- packages/smart-wallet/src/invitations.js | 2 +- packages/smart-wallet/src/offers.js | 6 ++--- packages/smart-wallet/src/smartWallet.js | 8 +++---- packages/smart-wallet/src/utils.js | 10 ++++---- packages/smart-wallet/src/walletFactory.js | 14 +++++------ packages/smart-wallet/test/supports.js | 2 +- .../upgradeWalletFactory/walletFactory-V2.js | 8 +++---- packages/swing-store/src/bundleStore.js | 2 +- packages/swing-store/src/importer.js | 4 ++-- packages/swing-store/src/internal.js | 6 ++--- packages/swing-store/src/repairMetadata.js | 2 +- packages/swing-store/src/snapStore.js | 4 ++-- packages/swing-store/src/swingStore.js | 18 +++++++------- packages/swing-store/src/util.js | 2 +- packages/swingset-liveslots/src/liveslots.js | 10 ++++---- packages/swingset-liveslots/src/message.js | 2 +- .../src/virtualObjectManager.js | 2 +- packages/telemetry/src/slog-sender-pipe.js | 4 ++-- packages/time/test/test-timeMath.js | 10 ++++---- packages/vats/src/bridge.js | 2 +- packages/vats/src/core/basic-behaviors.js | 2 +- packages/vats/src/core/chain-behaviors.js | 2 +- packages/vats/src/core/sim-behaviors.js | 2 +- packages/vats/src/core/startWalletFactory.js | 2 +- packages/vats/src/core/utils.js | 6 ++--- packages/vats/src/nameHub.js | 4 ++-- packages/vats/src/vat-bank.js | 2 +- packages/vats/src/vat-provisioning.js | 2 +- packages/vats/test/test-bootstrapPayment.js | 2 +- packages/vats/test/test-vpurse.js | 2 +- packages/wallet/api/src/internal-types.js | 4 ++-- packages/xsnap/src/avaAssertXS.js | 2 +- packages/xsnap/src/avaXS.js | 2 +- packages/xsnap/src/xsnap.js | 2 +- packages/xsnap/src/xsrepl.js | 2 +- packages/zoe/src/zoeService/internal-types.js | 2 +- packages/zoe/src/zoeService/startInstance.js | 2 +- packages/zoe/src/zoeService/types.js | 24 +++++++++---------- packages/zoe/test/unitTests/test-zoe.js | 4 ++-- 101 files changed, 244 insertions(+), 242 deletions(-) diff --git a/packages/SwingSet/src/controller/controller.js b/packages/SwingSet/src/controller/controller.js index 249036e9c87..c4544a98234 100644 --- a/packages/SwingSet/src/controller/controller.js +++ b/packages/SwingSet/src/controller/controller.js @@ -246,7 +246,7 @@ export async function makeSwingsetController( warehousePolicy, overrideVatManagerOptions, }; - /** @type { ReturnType } */ + /** @type { ReturnType } */ const kernel = buildKernel( kernelEndowments, deviceEndowments, diff --git a/packages/SwingSet/src/controller/startXSnap.js b/packages/SwingSet/src/controller/startXSnap.js index ff5e70a40ad..b68145ccf1d 100644 --- a/packages/SwingSet/src/controller/startXSnap.js +++ b/packages/SwingSet/src/controller/startXSnap.js @@ -81,7 +81,7 @@ export function makeStartXSnap(options) { }; } - /** @type { import('@agoric/xsnap/src/xsnap').XSnapOptions } */ + /** @type { import('@agoric/xsnap/src/xsnap.js').XSnapOptions } */ const xsnapOpts = { os: osType(), fs: { ...fs, ...fs.promises, tmpName }, diff --git a/packages/SwingSet/src/kernel/vat-warehouse.js b/packages/SwingSet/src/kernel/vat-warehouse.js index f1047a23560..6c3688363d8 100644 --- a/packages/SwingSet/src/kernel/vat-warehouse.js +++ b/packages/SwingSet/src/kernel/vat-warehouse.js @@ -255,7 +255,7 @@ export function makeVatWarehouse({ // console.debug('makeVatWarehouse', { warehousePolicy }); /** - * @typedef { ReturnType } VatTranslators + * @typedef { ReturnType } VatTranslators * @typedef {{ * manager: VatManager, * translators: VatTranslators, diff --git a/packages/SwingSet/src/types-external.js b/packages/SwingSet/src/types-external.js index 72179e46ce9..c539baa04d1 100644 --- a/packages/SwingSet/src/types-external.js +++ b/packages/SwingSet/src/types-external.js @@ -117,8 +117,8 @@ export {}; * @typedef { DeviceInvocationResultOk | DeviceInvocationResultError } DeviceInvocationResult * * @typedef { { transcriptCount: number } } VatStats - * @typedef { ReturnType } VatKeeper - * @typedef { ReturnType } KernelKeeper + * @typedef { ReturnType } VatKeeper + * @typedef { ReturnType } KernelKeeper * @typedef { Awaited> } XSnap * @typedef { (dr: VatDeliveryResult) => void } SlogFinishDelivery * @typedef { (ksr: KernelSyscallResult, vsr: VatSyscallResult) => void } SlogFinishSyscall diff --git a/packages/agoric-cli/src/commands/gov.js b/packages/agoric-cli/src/commands/gov.js index 12ec24da538..216bb471623 100644 --- a/packages/agoric-cli/src/commands/gov.js +++ b/packages/agoric-cli/src/commands/gov.js @@ -79,7 +79,7 @@ export const makeGovCommand = (_logger, io = {}) => { * given a sendFrom address; else print it. * * @param {{ - * toOffer: (agoricNames: *, current: import('@agoric/smart-wallet/src/smartWallet').CurrentWalletRecord | undefined) => OfferSpec, + * toOffer: (agoricNames: *, current: import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord | undefined) => OfferSpec, * sendFrom?: string | undefined, * keyringBackend: string, * instanceName?: string, diff --git a/packages/agoric-cli/src/commands/inter.js b/packages/agoric-cli/src/commands/inter.js index 56cc40d0ae6..ccc092c9bcb 100644 --- a/packages/agoric-cli/src/commands/inter.js +++ b/packages/agoric-cli/src/commands/inter.js @@ -34,7 +34,7 @@ const bidInvitationShape = harden({ }); /** @typedef {import('@agoric/vats/tools/board-utils.js').VBankAssetDetail } AssetDescriptor */ -/** @typedef {import('@agoric/smart-wallet/src/smartWallet').TryExitOfferAction } TryExitOfferAction */ +/** @typedef {import('@agoric/smart-wallet/src/smartWallet.js').TryExitOfferAction } TryExitOfferAction */ /** @typedef {import('@agoric/inter-protocol/src/auction/auctionBook.js').OfferSpec} BidSpec */ /** @typedef {import('@agoric/inter-protocol/src/auction/scheduler.js').ScheduleNotification} ScheduleNotification */ /** @typedef {import('@agoric/inter-protocol/src/auction/auctionBook.js').BookDataNotification} BookDataNotification */ diff --git a/packages/agoric-cli/src/lib/chain.js b/packages/agoric-cli/src/lib/chain.js index 2870ca5b895..667cba70009 100644 --- a/packages/agoric-cli/src/lib/chain.js +++ b/packages/agoric-cli/src/lib/chain.js @@ -36,7 +36,7 @@ harden(normalizeAddressWithOptions); /** * @param {ReadonlyArray} swingsetArgs - * @param {import('./rpc').MinimalNetworkConfig & { + * @param {import('./rpc.js').MinimalNetworkConfig & { * from: string, * fees?: string, * dryRun?: boolean, @@ -110,7 +110,7 @@ export const fetchSwingsetParams = net => { harden(fetchSwingsetParams); /** - * @param {import('./rpc').MinimalNetworkConfig & { + * @param {import('./rpc.js').MinimalNetworkConfig & { * execFileSync: typeof import('child_process').execFileSync, * delay: (ms: number) => Promise, * period?: number, @@ -150,7 +150,7 @@ export const pollBlocks = opts => async lookup => { /** * @param {string} txhash - * @param {import('./rpc').MinimalNetworkConfig & { + * @param {import('./rpc.js').MinimalNetworkConfig & { * execFileSync: typeof import('child_process').execFileSync, * delay: (ms: number) => Promise, * period?: number, diff --git a/packages/agoric-cli/src/lib/format.js b/packages/agoric-cli/src/lib/format.js index 5c3a922a79e..3083b21c69b 100644 --- a/packages/agoric-cli/src/lib/format.js +++ b/packages/agoric-cli/src/lib/format.js @@ -89,7 +89,7 @@ export const asBoardRemote = x => { /** * Summarize the balances array as user-facing informative tuples * - * @param {import('@agoric/smart-wallet/src/smartWallet').CurrentWalletRecord['purses']} purses + * @param {import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord['purses']} purses * @param {AssetDescriptor[]} assets */ export const purseBalanceTuples = (purses, assets) => { @@ -172,7 +172,7 @@ export const offerStatusTuples = (state, agoricNames) => { }; /** - * @param {import('@agoric/smart-wallet/src/smartWallet').CurrentWalletRecord} current + * @param {import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord} current * @param {ReturnType['state']} coalesced * @param {import('./wallet.js').AgoricNamesRemotes} agoricNames */ diff --git a/packages/agoric-cli/src/lib/wallet.js b/packages/agoric-cli/src/lib/wallet.js index a386bba6dca..0549fa7ec3a 100644 --- a/packages/agoric-cli/src/lib/wallet.js +++ b/packages/agoric-cli/src/lib/wallet.js @@ -23,13 +23,13 @@ const emptyCurrentRecord = { /** * @param {string} addr * @param {Pick} io - * @returns {Promise} + * @returns {Promise} */ export const getCurrent = async (addr, { readLatestHead }) => { // Partial because older writes may not have had all properties // NB: assumes changes are only additions let current = - /** @type {Partial | undefined} */ ( + /** @type {Partial | undefined} */ ( await readLatestHead(`published.wallet.${addr}.current`) ); if (current === undefined) { @@ -58,7 +58,7 @@ export const getCurrent = async (addr, { readLatestHead }) => { /** * @param {string} addr * @param {Pick} io - * @returns {Promise} + * @returns {Promise} */ export const getLastUpdate = (addr, { readLatestHead }) => { // @ts-expect-error cast @@ -66,7 +66,7 @@ export const getLastUpdate = (addr, { readLatestHead }) => { }; /** - * @param {import('@agoric/smart-wallet/src/smartWallet').BridgeAction} bridgeAction + * @param {import('@agoric/smart-wallet/src/smartWallet.js').BridgeAction} bridgeAction * @param {Pick} [stdout] */ export const outputAction = (bridgeAction, stdout = process.stdout) => { @@ -79,7 +79,7 @@ export const sendHint = 'Now use `agoric wallet send ...` to sign and broadcast the offer.\n'; /** - * @param {import('@agoric/smart-wallet/src/smartWallet').BridgeAction} bridgeAction + * @param {import('@agoric/smart-wallet/src/smartWallet.js').BridgeAction} bridgeAction * @param {{ * stdout: Pick, * stderr: Pick, @@ -100,7 +100,7 @@ export const outputExecuteOfferAction = ( stdout = process.stdout, stderr = process.stderr, ) => { - /** @type {import('@agoric/smart-wallet/src/smartWallet').BridgeAction} */ + /** @type {import('@agoric/smart-wallet/src/smartWallet.js').BridgeAction} */ const spendAction = { method: 'executeOffer', offer, @@ -111,7 +111,7 @@ export const outputExecuteOfferAction = ( /** * @deprecated use `.current` node for current state - * @param {import('@agoric/casting').Follower>} follower + * @param {import('@agoric/casting').Follower>} follower * @param {Brand<'set'>} [invitationBrand] */ export const coalesceWalletState = async (follower, invitationBrand) => { @@ -141,8 +141,8 @@ export const coalesceWalletState = async (follower, invitationBrand) => { * Sign and broadcast a wallet-action. * * @throws { Error & { code: number } } if transaction fails - * @param {import('@agoric/smart-wallet/src/smartWallet').BridgeAction} bridgeAction - * @param {import('./rpc').MinimalNetworkConfig & { + * @param {import('@agoric/smart-wallet/src/smartWallet.js').BridgeAction} bridgeAction + * @param {import('./rpc.js').MinimalNetworkConfig & { * from: string, * fees?: string, * verbose?: boolean, diff --git a/packages/base-zone/tools/testers.js b/packages/base-zone/tools/testers.js index 86d51c919ba..c9d0be11af6 100644 --- a/packages/base-zone/tools/testers.js +++ b/packages/base-zone/tools/testers.js @@ -65,7 +65,7 @@ const secondThrows = (t, fn, spec = alreadyExceptionSpec) => { /** * @param {import('ava').Assertions} t - * @param {import('../src/index').Zone} rootZone + * @param {import('../src/index.js').Zone} rootZone */ export const testFirstZoneIncarnation = (t, rootZone) => { const subZone = secondThrows(t, () => rootZone.subZone('sub')); @@ -94,7 +94,7 @@ export const testFirstZoneIncarnation = (t, rootZone) => { /** * @param {import('ava').Assertions} t - * @param {import('../src/index').Zone} rootZone + * @param {import('../src/index.js').Zone} rootZone */ export const testSecondZoneIncarnation = (t, rootZone) => { const subZone = secondThrows(t, () => rootZone.subZone('sub')); diff --git a/packages/cache/src/cache.js b/packages/cache/src/cache.js index 2d2efb0e123..1788745a74f 100644 --- a/packages/cache/src/cache.js +++ b/packages/cache/src/cache.js @@ -12,7 +12,7 @@ import { makeScalarStoreCoordinator } from './store.js'; */ /** - * @param {ERef} [coordinator] + * @param {ERef} [coordinator] */ export const makeCache = (coordinator = makeScalarStoreCoordinator()) => { /** diff --git a/packages/cache/src/state.js b/packages/cache/src/state.js index 683922af6dd..67507ac79af 100644 --- a/packages/cache/src/state.js +++ b/packages/cache/src/state.js @@ -30,7 +30,7 @@ export const makeState = (value, priorState = GROUND_STATE) => /** * Wrap a state store to have a default value using the GROUND_STATE * - * @param {MapStore} stateStore + * @param {MapStore} stateStore */ export const withGroundState = stateStore => ({ ...stateStore, diff --git a/packages/cache/src/store.js b/packages/cache/src/store.js index a766af6eee0..01670024e8f 100644 --- a/packages/cache/src/store.js +++ b/packages/cache/src/store.js @@ -40,9 +40,9 @@ const makeKeyToString = (sanitize = obj => obj) => { * @param {(obj: unknown) => unknown} sanitize Process keys and values with * this function before storing them * @param {{ - * get(key: string): import('./state').State; - * set(key: string, value: import('./state').State): void; - * init(key: string, value: import('./state').State): void; + * get(key: string): import('./state.js').State; + * set(key: string, value: import('./state.js').State): void; + * init(key: string, value: import('./state.js').State): void; * }} stateStore * @returns {Promise} the value of the updated state */ @@ -56,8 +56,8 @@ const applyCacheTransaction = async ( /** * Retrieve a potential updated state from the transaction. * - * @param {import('./state').State} basisState - * @returns {Promise} the updated state, or null if no longer applicable + * @param {import('./state.js').State} basisState + * @returns {Promise} the updated state, or null if no longer applicable */ const getUpdatedState = async basisState => { const { value } = basisState; @@ -106,7 +106,7 @@ const applyCacheTransaction = async ( }; /** - * @param {MapStore} stateStore + * @param {MapStore} stateStore * @param {ERef} marshaller * @returns {Promise} */ @@ -124,7 +124,7 @@ const stringifyStateStore = async (stateStore, marshaller) => { * Make a cache coordinator backed by a MapStore. This coordinator doesn't * currently enforce any cache eviction, but that would be a useful feature. * - * @param {MapStore} [stateStore] + * @param {MapStore} [stateStore] * @param {(obj: unknown) => unknown} [sanitize] Process keys and values with * this function before storing them. Defaults to deeplyFulfilled. */ @@ -136,7 +136,7 @@ export const makeScalarStoreCoordinator = ( const defaultStateStore = withGroundState(stateStore); - /** @type {import('./types').Coordinator} */ + /** @type {import('./types.js').Coordinator} */ const coord = Far('store cache coordinator', { getRecentValue: async key => { const keyStr = await serializePassable(key); @@ -169,7 +169,7 @@ export const makeScalarStoreCoordinator = ( /** * Don't write any marshalled value that's older than what's already pushed * - * @param {MapStore} stateStore + * @param {MapStore} stateStore * @param {ERef} marshaller * @param {ERef} storageNode * @returns {(storedValue: T) => Promise} @@ -216,7 +216,7 @@ export const makeChainStorageCoordinator = (storageNode, marshaller) => { storageNode, ); - /** @type {import('./types').Coordinator} */ + /** @type {import('./types.js').Coordinator} */ const coord = Far('store cache coordinator', { getRecentValue: async key => { const keyStr = await serializePassable(key); diff --git a/packages/casting/src/casting-spec.js b/packages/casting/src/casting-spec.js index 65358aba947..fb776c20f3c 100644 --- a/packages/casting/src/casting-spec.js +++ b/packages/casting/src/casting-spec.js @@ -5,7 +5,7 @@ const { toAscii } = encodingStar; /** * @param {string} storagePath - * @returns {import('./types').CastingSpec} + * @returns {import('./types.js').CastingSpec} */ const swingsetPathToCastingSpec = storagePath => harden({ @@ -22,7 +22,7 @@ const NO_DATA_VALUE = new Uint8Array([255]); /** * @param {string} storagePath * @param {string} [storeName] - * @returns {import('./types').CastingSpec} + * @returns {import('./types.js').CastingSpec} */ const vstoragePathToCastingSpec = (storagePath, storeName = 'vstorage') => { const elems = storagePath ? storagePath.split('.') : []; @@ -58,7 +58,7 @@ export const vstorageKeySpecToPath = ({ storeName, storeSubkey }) => { export const DEFAULT_PATH_CONVERTER = vstoragePathToCastingSpec; /** - * @type {Record import('./types').CastingSpec>} + * @type {Record import('./types.js').CastingSpec>} */ export const pathPrefixToConverters = harden({ 'swingset:': swingsetPathToCastingSpec, @@ -68,7 +68,7 @@ export const pathPrefixToConverters = harden({ /** * @param {string} specString - * @returns {import('./types').CastingSpec} + * @returns {import('./types.js').CastingSpec} */ export const makeCastingSpecFromString = specString => { assert.typeof(specString, 'string'); @@ -88,7 +88,7 @@ const te = new TextEncoder(); /** * @param {any} specObj - * @returns {import('./types').CastingSpec} + * @returns {import('./types.js').CastingSpec} */ export const makeCastingSpecFromObject = specObj => { const { @@ -127,7 +127,7 @@ export const makeCastingSpecFromObject = specObj => { /** * @param {ERef} specCap - * @returns {Promise} + * @returns {Promise} */ export const makeCastingSpecFromRef = async specCap => { const specObj = await E(specCap).getStoreKey(); @@ -138,7 +138,7 @@ export const makeCastingSpecFromRef = async specCap => { * Create an abstract type from a given source representation * * @param {ERef} sourceP - * @returns {Promise} + * @returns {Promise} */ export const makeCastingSpec = async sourceP => { const spec = await sourceP; diff --git a/packages/casting/src/change-follower.js b/packages/casting/src/change-follower.js index d1b670ef807..e5d8cf38ef0 100644 --- a/packages/casting/src/change-follower.js +++ b/packages/casting/src/change-follower.js @@ -4,8 +4,8 @@ import { DEFAULT_KEEP_POLLING } from './defaults.js'; /** * Just return an unspecified allegedValue every poll period. * - * @param {import('./types').Leader} leader - * @returns {Promise>} + * @param {import('./types.js').Leader} leader + * @returns {Promise>} */ export const makePollingChangeFollower = async leader => { const { keepPolling = DEFAULT_KEEP_POLLING } = await E(leader).getOptions(); diff --git a/packages/casting/src/defaults.js b/packages/casting/src/defaults.js index 5d0923da3be..321e9eec29a 100644 --- a/packages/casting/src/defaults.js +++ b/packages/casting/src/defaults.js @@ -95,7 +95,7 @@ export const MAKE_DEFAULT_DECODER = () => { /** * Unserialize the JSONable data. * - * @type {() => import('./types').Unserializer} + * @type {() => import('./types.js').Unserializer} */ export const MAKE_DEFAULT_UNSERIALIZER = () => { const ifaceAllegedPrefix = 'Alleged: '; diff --git a/packages/casting/src/follower-cosmjs.js b/packages/casting/src/follower-cosmjs.js index 206d6c2c494..ffe7b26e372 100644 --- a/packages/casting/src/follower-cosmjs.js +++ b/packages/casting/src/follower-cosmjs.js @@ -90,8 +90,8 @@ const proofs = ['strict', 'none', 'optimistic']; /** * @template T * @param {any} sourceP - * @param {import('./types').LeaderOrMaker} [leaderOrMaker] - * @param {import('./types').FollowerOptions} [options] + * @param {import('./types.js').LeaderOrMaker} [leaderOrMaker] + * @param {import('./types.js').FollowerOptions} [options] * @returns {ValueFollower} */ export const makeCosmjsFollower = ( diff --git a/packages/casting/src/follower.js b/packages/casting/src/follower.js index 0eb0018460e..bc49801acab 100644 --- a/packages/casting/src/follower.js +++ b/packages/casting/src/follower.js @@ -11,12 +11,12 @@ import { makeCastingSpec } from './casting-spec.js'; /** * @template T - * @param {ERef} spec + * @param {ERef} spec */ const makeSubscriptionFollower = spec => { const transform = value => harden({ value, blockHeight: NaN, currentBlockHeight: NaN }); - /** @type {import('./types').Follower>} */ + /** @type {import('./types.js').Follower>} */ const follower = Far('subscription/notifier follower', { getLatestIterable: async () => { const { notifier, subscription } = await spec; @@ -53,10 +53,10 @@ const makeSubscriptionFollower = spec => { /** * @template T - * @param {ERef | string} specP - * @param {import('./types').LeaderOrMaker} [leaderOrMaker] - * @param {import('./types').FollowerOptions} [options] - * @returns {Promise>} + * @param {ERef | string} specP + * @param {import('./types.js').LeaderOrMaker} [leaderOrMaker] + * @param {import('./types.js').FollowerOptions} [options] + * @returns {Promise>} */ export const makeFollower = async (specP, leaderOrMaker, options) => { const spec = await makeCastingSpec(specP); diff --git a/packages/casting/src/iterable.js b/packages/casting/src/iterable.js index 7e9316cd79b..392a0c48227 100644 --- a/packages/casting/src/iterable.js +++ b/packages/casting/src/iterable.js @@ -22,7 +22,7 @@ export const mapAsyncIterable = (iterable, transform) => { * TODO: Remove this function when we have an @endo/publish-kit that suppports pull topics * * @template T - * @param {ERef>} follower + * @param {ERef>} follower */ export const iterateLatest = follower => // For now, just pass through the iterable. diff --git a/packages/deploy-script-support/src/install.js b/packages/deploy-script-support/src/install.js index c73410db2a3..9b236c4ddcf 100644 --- a/packages/deploy-script-support/src/install.js +++ b/packages/deploy-script-support/src/install.js @@ -3,7 +3,7 @@ import './externalTypes.js'; import { E } from '@endo/far'; -/** @typedef {import('@agoric/deploy-script-support/src/externalTypes').Petname} Petname */ +/** @typedef {import('@agoric/deploy-script-support/src/externalTypes.js').Petname} Petname */ // XXX board is Board but specifying that leads to type errors with imports which aren't worth fixing right now /** diff --git a/packages/deploy-script-support/src/offer.js b/packages/deploy-script-support/src/offer.js index f26151fe3a7..8ba945f20e4 100644 --- a/packages/deploy-script-support/src/offer.js +++ b/packages/deploy-script-support/src/offer.js @@ -4,7 +4,7 @@ import { assert } from '@agoric/assert'; // Avoid pulling in too many dependencies like notifiers import { AmountMath } from '@agoric/ertp/src/amountMath.js'; -/** @typedef {import('@agoric/deploy-script-support/src/externalTypes').Petname} Petname */ +/** @typedef {import('@agoric/deploy-script-support/src/externalTypes.js').Petname} Petname */ /** * @typedef {object} OfferHelperConfig diff --git a/packages/deploy-script-support/src/saveIssuer.js b/packages/deploy-script-support/src/saveIssuer.js index 6610a2ed06e..e21315032c2 100644 --- a/packages/deploy-script-support/src/saveIssuer.js +++ b/packages/deploy-script-support/src/saveIssuer.js @@ -1,12 +1,12 @@ // @ts-check import { E } from '@endo/far'; -/** @typedef {import('@agoric/deploy-script-support/src/externalTypes').Petname} Petname */ +/** @typedef {import('@agoric/deploy-script-support/src/externalTypes.js').Petname} Petname */ /** * @param {ERef} walletAdmin - an internal type of the * wallet, not defined here - * @param {ERef} issuerManager + * @param {ERef} issuerManager */ export const makeSaveIssuer = (walletAdmin, issuerManager) => { /** diff --git a/packages/deploy-script-support/src/startInstance.js b/packages/deploy-script-support/src/startInstance.js index c4ebc004253..0a1e17996de 100644 --- a/packages/deploy-script-support/src/startInstance.js +++ b/packages/deploy-script-support/src/startInstance.js @@ -2,7 +2,7 @@ import { assert } from '@agoric/assert'; import { E, passStyleOf } from '@endo/far'; -/** @typedef {import('@agoric/deploy-script-support/src/externalTypes').Petname} Petname */ +/** @typedef {import('@agoric/deploy-script-support/src/externalTypes.js').Petname} Petname */ /** * @template T diff --git a/packages/deploy-script-support/test/unitTests/test-startInstance.js b/packages/deploy-script-support/test/unitTests/test-startInstance.js index f356fff7dd0..1f191f42614 100644 --- a/packages/deploy-script-support/test/unitTests/test-startInstance.js +++ b/packages/deploy-script-support/test/unitTests/test-startInstance.js @@ -9,7 +9,7 @@ import { E } from '@endo/far'; import { makeStartInstance } from '../../src/startInstance.js'; -/** @typedef {import('@agoric/deploy-script-support/src/externalTypes').Petname} Petname */ +/** @typedef {import('@agoric/deploy-script-support/src/externalTypes.js').Petname} Petname */ test('startInstance', async t => { const MOOLA_BRAND_PETNAME = 'moola'; diff --git a/packages/governance/src/contractHelper.js b/packages/governance/src/contractHelper.js index 7410bf7ae67..894f6f041d0 100644 --- a/packages/governance/src/contractHelper.js +++ b/packages/governance/src/contractHelper.js @@ -32,7 +32,7 @@ const publicMixinAPI = harden({ /** * @param {ZCF & {}>} zcf - * @param {import('./contractGovernance/typedParamManager').TypedParamManager} paramManager + * @param {import('./contractGovernance/typedParamManager.js').TypedParamManager} paramManager */ export const validateElectorate = (zcf, paramManager) => { const { governedParams } = zcf.getTerms(); @@ -55,7 +55,7 @@ harden(validateElectorate); * * @template {import('./contractGovernance/typedParamManager.js').ParamTypesMap} T * @param {ZCF & {}>} zcf - * @param {import('./contractGovernance/typedParamManager').TypedParamManager} paramManager + * @param {import('./contractGovernance/typedParamManager.js').TypedParamManager} paramManager */ const facetHelpers = (zcf, paramManager) => { // validate async to wait for params to be finished @@ -245,7 +245,7 @@ const facetHelpers = (zcf, paramManager) => { * parameter values, and the governance guarantees only hold if they're not used * directly by the governed contract. * - * @template {import('./contractGovernance/typedParamManager').ParamTypesMap} M + * @template {import('./contractGovernance/typedParamManager.js').ParamTypesMap} M * Map of types of custom governed terms * @param {ZCF>} zcf * @param {Invitation} initialPoserInvitation diff --git a/packages/governance/tools/puppetGovernance.js b/packages/governance/tools/puppetGovernance.js index 10ce1dd5a24..6e6624f02ba 100644 --- a/packages/governance/tools/puppetGovernance.js +++ b/packages/governance/tools/puppetGovernance.js @@ -43,7 +43,7 @@ export const setUpGovernedContract = async ( /** * @type {[ - * Installation, + * Installation, * Installation, * Installation, * ]} diff --git a/packages/inter-protocol/src/clientSupport.js b/packages/inter-protocol/src/clientSupport.js index 56e0b283498..a4526ff624c 100644 --- a/packages/inter-protocol/src/clientSupport.js +++ b/packages/inter-protocol/src/clientSupport.js @@ -160,7 +160,7 @@ const makeCloseOffer = ({ brand }, opts, previousOffer) => { /** * @param {string} vaultId * @param {Promise< - * import('@agoric/smart-wallet/src/smartWallet').CurrentWalletRecord + * import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord * >} currentP * @returns {Promise} offer id in which the vault was made */ diff --git a/packages/inter-protocol/src/price/fluxAggregatorKit.js b/packages/inter-protocol/src/price/fluxAggregatorKit.js index 39601167799..910f060d489 100644 --- a/packages/inter-protocol/src/price/fluxAggregatorKit.js +++ b/packages/inter-protocol/src/price/fluxAggregatorKit.js @@ -27,8 +27,8 @@ export const INVITATION_MAKERS_DESC = 'oracle invitation'; * * @typedef {import('@agoric/time').Timestamp} Timestamp * - * @typedef {import('@agoric/time').RelativeTime} RelativeTime // TODO: use - * RelativeTime, not RelativeTimeValue + * @typedef {import('@agoric/time').RelativeTime} RelativeTime // + * TODO: use RelativeTime, not RelativeTimeValue * * @typedef {import('@agoric/time').RelativeTimeValue} RelativeTimeValue * diff --git a/packages/inter-protocol/src/proposals/committee-proposal.js b/packages/inter-protocol/src/proposals/committee-proposal.js index 8ebe07367f9..5f86fb31443 100644 --- a/packages/inter-protocol/src/proposals/committee-proposal.js +++ b/packages/inter-protocol/src/proposals/committee-proposal.js @@ -10,7 +10,7 @@ const zip = (xs, ys) => xs.map((x, i) => [x, ys[i]]); const EC_HIGH_PRIORITY_SENDERS_NAMESPACE = 'economicCommittee'; /** - * @param {import('./econ-behaviors').EconomyBootstrapPowers} powers + * @param {import('./econ-behaviors.js').EconomyBootstrapPowers} powers * @param {{ options: { voterAddresses: Record } }} param1 */ export const inviteCommitteeMembers = async ( @@ -51,7 +51,7 @@ export const inviteCommitteeMembers = async ( harden(inviteCommitteeMembers); -/** @param {import('./econ-behaviors').EconomyBootstrapPowers} powers */ +/** @param {import('./econ-behaviors.js').EconomyBootstrapPowers} powers */ export const startEconCharter = async ({ consume: { zoe }, produce: { econCharterKit }, @@ -72,7 +72,7 @@ export const startEconCharter = async ({ }), ); - /** @type {Promise} */ + /** @type {Promise} */ const startResult = E(zoe).startInstance( charterInstall, undefined, @@ -88,7 +88,7 @@ harden(startEconCharter); /** * Introduce charter to governed creator facets. * - * @param {import('./econ-behaviors').EconomyBootstrapPowers} powers + * @param {import('./econ-behaviors.js').EconomyBootstrapPowers} powers */ export const addGovernorsToEconCharter = async ({ consume: { reserveKit, vaultFactoryKit, econCharterKit, auctioneerKit }, @@ -126,7 +126,7 @@ export const addGovernorsToEconCharter = async ({ harden(addGovernorsToEconCharter); /** - * @param {import('./econ-behaviors').EconomyBootstrapPowers} powers + * @param {import('./econ-behaviors.js').EconomyBootstrapPowers} powers * @param {{ options: { voterAddresses: Record } }} param1 */ export const inviteToEconCharter = async ( diff --git a/packages/inter-protocol/src/proposals/econ-behaviors.js b/packages/inter-protocol/src/proposals/econ-behaviors.js index e553f78776d..2a9f363934a 100644 --- a/packages/inter-protocol/src/proposals/econ-behaviors.js +++ b/packages/inter-protocol/src/proposals/econ-behaviors.js @@ -75,7 +75,7 @@ export const SECONDS_PER_WEEK = 7n * SECONDS_PER_DAY; /** * @typedef {import('@agoric/zoe/src/zoeService/utils.js').StartedInstanceKit< - * import('../econCommitteeCharter')['start'] + * import('../econCommitteeCharter.js')['start'] * >} EconCharterStartResult */ /** diff --git a/packages/inter-protocol/src/proposals/price-feed-proposal.js b/packages/inter-protocol/src/proposals/price-feed-proposal.js index b0a55b67470..a5dd1fa8c0b 100644 --- a/packages/inter-protocol/src/proposals/price-feed-proposal.js +++ b/packages/inter-protocol/src/proposals/price-feed-proposal.js @@ -293,7 +293,7 @@ export const getManifestForPriceFeed = async ( }); /** - * @param {import('./econ-behaviors').EconomyBootstrapPowers} powers + * @param {import('./econ-behaviors.js').EconomyBootstrapPowers} powers * @param {object} [config] * @param {object} [config.options] * @param {string[]} [config.options.demoOracleAddresses] diff --git a/packages/inter-protocol/src/proposals/startEconCommittee.js b/packages/inter-protocol/src/proposals/startEconCommittee.js index 72bbc90b577..f4e40fc0ef8 100644 --- a/packages/inter-protocol/src/proposals/startEconCommittee.js +++ b/packages/inter-protocol/src/proposals/startEconCommittee.js @@ -21,7 +21,7 @@ const sanitizePathSegment = name => { */ /** - * @param {import('./econ-behaviors').EconomyBootstrapPowers} powers + * @param {import('./econ-behaviors.js').EconomyBootstrapPowers} powers * @param {object} config * @param {object} [config.options] * @param {EconCommitteeOptions} [config.options.econCommitteeOptions] diff --git a/packages/inter-protocol/src/provisionPool.js b/packages/inter-protocol/src/provisionPool.js index b192b2fcb54..27a7622cf64 100644 --- a/packages/inter-protocol/src/provisionPool.js +++ b/packages/inter-protocol/src/provisionPool.js @@ -46,7 +46,7 @@ harden(meta); * initialPoserInvitation: Invitation; * storageNode: StorageNode; * marshaller: Marshaller; - * metricsOverride?: import('./provisionPoolKit').MetricsNotification; + * metricsOverride?: import('./provisionPoolKit.js').MetricsNotification; * }} privateArgs * @param {import('@agoric/vat-data').Baggage} baggage */ diff --git a/packages/inter-protocol/src/provisionPoolKit.js b/packages/inter-protocol/src/provisionPoolKit.js index b2a416ccda0..d5626a522f0 100644 --- a/packages/inter-protocol/src/provisionPoolKit.js +++ b/packages/inter-protocol/src/provisionPoolKit.js @@ -24,7 +24,7 @@ import { Far, deeplyFulfilled } from '@endo/marshal'; const { details: X, quote: q, Fail } = assert; /** - * @typedef {import('@agoric/zoe/src/zoeService/utils').Instance< + * @typedef {import('@agoric/zoe/src/zoeService/utils.js').Instance< * import('@agoric/inter-protocol/src/psm/psm.js').start * >} PsmInstance */ @@ -34,7 +34,7 @@ const { details: X, quote: q, Fail } = assert; * @property {ERef} bankManager * @property {ERef} namesByAddressAdmin * @property {ERef< - * import('@agoric/vats/src/core/startWalletFactory').WalletFactoryStartResult['creatorFacet'] + * import('@agoric/vats/src/core/startWalletFactory.js').WalletFactoryStartResult['creatorFacet'] * >} walletFactory */ diff --git a/packages/inter-protocol/src/psm/types.js b/packages/inter-protocol/src/psm/types.js index 8790cb8b40d..622fffa556d 100644 --- a/packages/inter-protocol/src/psm/types.js +++ b/packages/inter-protocol/src/psm/types.js @@ -1,3 +1,3 @@ // @jessie-check -/** @typedef {import('./psm').PsmPublicFacet} PsmPublicFacet */ +/** @typedef {import('./psm.js').PsmPublicFacet} PsmPublicFacet */ diff --git a/packages/inter-protocol/src/vaultFactory/orderedVaultStore.js b/packages/inter-protocol/src/vaultFactory/orderedVaultStore.js index d4423b2b7cf..6826c423f8d 100644 --- a/packages/inter-protocol/src/vaultFactory/orderedVaultStore.js +++ b/packages/inter-protocol/src/vaultFactory/orderedVaultStore.js @@ -11,8 +11,8 @@ import { fromVaultKey, toVaultKey } from './storeUtils.js'; * debt-to-collateral come first.) */ -/** @typedef {import('./vault').Vault} Vault */ -/** @typedef {import('./storeUtils').CompositeKey} CompositeKey */ +/** @typedef {import('./vault.js').Vault} Vault */ +/** @typedef {import('./storeUtils.js').CompositeKey} CompositeKey */ /** @param {MapStore} store */ export const makeOrderedVaultStore = store => { diff --git a/packages/inter-protocol/src/vaultFactory/params.js b/packages/inter-protocol/src/vaultFactory/params.js index 39387f98c2d..239a33ce53f 100644 --- a/packages/inter-protocol/src/vaultFactory/params.js +++ b/packages/inter-protocol/src/vaultFactory/params.js @@ -76,7 +76,7 @@ const makeVaultDirectorParams = ( harden(makeVaultDirectorParams); /** - * @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager').ParamTypesMapFromRecord< + * @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager.js').ParamTypesMapFromRecord< * ReturnType * >} VaultDirectorParams */ diff --git a/packages/inter-protocol/src/vaultFactory/prioritizedVaults.js b/packages/inter-protocol/src/vaultFactory/prioritizedVaults.js index 0402e8ffa4e..9e56855ba91 100644 --- a/packages/inter-protocol/src/vaultFactory/prioritizedVaults.js +++ b/packages/inter-protocol/src/vaultFactory/prioritizedVaults.js @@ -13,7 +13,7 @@ import { normalizedCollRatio, } from './storeUtils.js'; -/** @typedef {import('./vault').Vault} Vault */ +/** @typedef {import('./vault.js').Vault} Vault */ /** @typedef {import('./storeUtils.js').NormalizedDebt} NormalizedDebt */ const trace = makeTracer('PVaults', true); diff --git a/packages/inter-protocol/src/vaultFactory/types.js b/packages/inter-protocol/src/vaultFactory/types.js index 2dd51b986c8..01c3750b9ad 100644 --- a/packages/inter-protocol/src/vaultFactory/types.js +++ b/packages/inter-protocol/src/vaultFactory/types.js @@ -1,15 +1,15 @@ // @jessie-check /** - * @typedef {import('./vault').VaultNotification} VaultNotification + * @typedef {import('./vault.js').VaultNotification} VaultNotification * - * @typedef {import('./vault').Vault} Vault + * @typedef {import('./vault.js').Vault} Vault * - * @typedef {import('./vaultKit').VaultKit} VaultKit + * @typedef {import('./vaultKit.js').VaultKit} VaultKit * - * @typedef {import('./vaultManager').VaultManager} VaultManager + * @typedef {import('./vaultManager.js').VaultManager} VaultManager * - * @typedef {import('./vaultManager').CollateralManager} CollateralManager + * @typedef {import('./vaultManager.js').CollateralManager} CollateralManager * * @typedef {import('../reserve/assetReserve.js').AssetReserveLimitedCreatorFacet} AssetReserveCreatorFacet * diff --git a/packages/inter-protocol/src/vaultFactory/vault.js b/packages/inter-protocol/src/vaultFactory/vault.js index 951e5ccde97..15fb0a1fc80 100644 --- a/packages/inter-protocol/src/vaultFactory/vault.js +++ b/packages/inter-protocol/src/vaultFactory/vault.js @@ -85,7 +85,7 @@ const validTransitions = { // XXX masks typedef from types.js, but using that causes circular def problems /** * @typedef {object} VaultManager - * @property {() => Subscriber} getAssetSubscriber + * @property {() => Subscriber} getAssetSubscriber * @property {(collateralAmount: Amount) => Amount<'nat'>} maxDebtFor * @property {() => Brand} getCollateralBrand * @property {(base: string) => string} scopeDescription diff --git a/packages/inter-protocol/src/vaultFactory/vaultDirector.js b/packages/inter-protocol/src/vaultFactory/vaultDirector.js index 2dfcbf5a9d8..1d3d0aeac30 100644 --- a/packages/inter-protocol/src/vaultFactory/vaultDirector.js +++ b/packages/inter-protocol/src/vaultFactory/vaultDirector.js @@ -69,7 +69,7 @@ const trace = makeTracer('VD', true); * state: State; * }>} MethodContext * - * @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager').TypedParamManager< + * @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager.js').TypedParamManager< * import('./params.js').VaultDirectorParams * >} VaultDirectorParamManager */ diff --git a/packages/inter-protocol/src/vaultFactory/vaultFactory.js b/packages/inter-protocol/src/vaultFactory/vaultFactory.js index 9852c781e19..18a6c3e7f50 100644 --- a/packages/inter-protocol/src/vaultFactory/vaultFactory.js +++ b/packages/inter-protocol/src/vaultFactory/vaultFactory.js @@ -35,7 +35,7 @@ const trace = makeTracer('VF', true); /** * @typedef {ZCF< - * GovernanceTerms & { + * GovernanceTerms & { * auctioneerPublicFacet: import('../auction/auctioneer.js').AuctioneerPublicFacet; * priceAuthority: ERef; * reservePublicFacet: AssetReservePublicFacet; diff --git a/packages/inter-protocol/test/auction/tools.js b/packages/inter-protocol/test/auction/tools.js index 04405e5cfb5..0c78bfe8c97 100644 --- a/packages/inter-protocol/test/auction/tools.js +++ b/packages/inter-protocol/test/auction/tools.js @@ -13,9 +13,9 @@ import { resolve as importMetaResolve } from 'import-meta-resolve'; /** * @typedef {{ * autoRefund: Installation< - * import('@agoric/zoe/src/contracts/automaticRefund').start + * import('@agoric/zoe/src/contracts/automaticRefund.js').start * >; - * auctioneer: Installation; + * auctioneer: Installation; * governor: Installation< * import('@agoric/governance/src/contractGovernor.js')['start'] * >; diff --git a/packages/inter-protocol/test/metrics.js b/packages/inter-protocol/test/metrics.js index 8f9d8520357..8ccd4a50d2d 100644 --- a/packages/inter-protocol/test/metrics.js +++ b/packages/inter-protocol/test/metrics.js @@ -89,7 +89,7 @@ export const metricsTracker = async (t, publicFacet) => { /** * @param {import('ava').ExecutionContext} t - * @param {import('../src/vaultFactory/vaultManager').CollateralManager} publicFacet + * @param {import('../src/vaultFactory/vaultManager.js').CollateralManager} publicFacet */ export const vaultManagerMetricsTracker = async (t, publicFacet) => { let totalDebtEver = 0n; @@ -97,7 +97,7 @@ export const vaultManagerMetricsTracker = async (t, publicFacet) => { * @type {Awaited< * ReturnType< * typeof subscriptionTracker< - * import('../src/vaultFactory/vaultManager').MetricsNotification + * import('../src/vaultFactory/vaultManager.js').MetricsNotification * > * > * >} diff --git a/packages/inter-protocol/test/psm/test-psm.js b/packages/inter-protocol/test/psm/test-psm.js index f5f4ad373e7..38066486922 100644 --- a/packages/inter-protocol/test/psm/test-psm.js +++ b/packages/inter-protocol/test/psm/test-psm.js @@ -751,7 +751,7 @@ const makeMockBankManager = t => { }; test('restore PSM: startPSM with previous metrics, params', async t => { - /** @type {import('../../src/proposals/econ-behaviors').EconomyBootstrapPowers} */ + /** @type {import('../../src/proposals/econ-behaviors.js').EconomyBootstrapPowers} */ // @ts-expect-error mock const { produce, consume } = makePromiseSpace(); const { agoricNames, agoricNamesAdmin, spaces } = diff --git a/packages/inter-protocol/test/reserve/setup.js b/packages/inter-protocol/test/reserve/setup.js index b74b9637f86..a76b0080e41 100644 --- a/packages/inter-protocol/test/reserve/setup.js +++ b/packages/inter-protocol/test/reserve/setup.js @@ -54,8 +54,8 @@ const setupReserveBootstrap = async (t, timer, farZoeKit) => { /** * @typedef {{ - * reserveCreatorFacet: import('../../src/reserve/assetReserve').AssetReserveLimitedCreatorFacet; - * reservePublicFacet: import('../../src/reserve/assetReserve').AssetReservePublicFacet; + * reserveCreatorFacet: import('../../src/reserve/assetReserve.js').AssetReserveLimitedCreatorFacet; + * reservePublicFacet: import('../../src/reserve/assetReserve.js').AssetReservePublicFacet; * instance: Instance; * }} ReserveKit */ diff --git a/packages/inter-protocol/test/smartWallet/contexts.js b/packages/inter-protocol/test/smartWallet/contexts.js index 91cf8f017b0..a2cb53e6919 100644 --- a/packages/inter-protocol/test/smartWallet/contexts.js +++ b/packages/inter-protocol/test/smartWallet/contexts.js @@ -244,7 +244,7 @@ export const currentPurseBalance = (record, brand) => { * @param {ERef} committeePublic * @param {string} voterAcceptanceOID * @returns {Promise< - * import('@agoric/smart-wallet/src/invitations').ContinuingInvitationSpec + * import('@agoric/smart-wallet/src/invitations.js').ContinuingInvitationSpec * >} */ export const voteForOpenQuestion = async ( @@ -257,7 +257,7 @@ export const voteForOpenQuestion = async ( const { positions, questionHandle } = await E(question).getDetails(); const yesPosition = harden([positions[0]]); - /** @type {import('@agoric/smart-wallet/src/invitations').ContinuingInvitationSpec} */ + /** @type {import('@agoric/smart-wallet/src/invitations.js').ContinuingInvitationSpec} */ const getVoteSpec = { source: 'continuing', previousOffer: voterAcceptanceOID, diff --git a/packages/inter-protocol/test/smartWallet/test-oracle-integration.js b/packages/inter-protocol/test/smartWallet/test-oracle-integration.js index a11846e0c86..f9a290bdad6 100644 --- a/packages/inter-protocol/test/smartWallet/test-oracle-integration.js +++ b/packages/inter-protocol/test/smartWallet/test-oracle-integration.js @@ -374,7 +374,7 @@ test.serial('govern oracles list', async t => { 'econCommitteeCharter', ); /** - * @type {import('@agoric/zoe/src/zoeService/utils').Instance< + * @type {import('@agoric/zoe/src/zoeService/utils.js').Instance< * import('@agoric/governance/src/committee.js')['start'] * >} */ @@ -419,7 +419,7 @@ test.serial('govern oracles list', async t => { // Accept the EC invitation makers /////////// { - /** @type {import('@agoric/smart-wallet/src/invitations').PurseInvitationSpec} */ + /** @type {import('@agoric/smart-wallet/src/invitations.js').PurseInvitationSpec} */ const getInvMakersSpec = { source: 'purse', instance: econCharter, @@ -482,7 +482,7 @@ test.serial('govern oracles list', async t => { // Call for a vote to addOracles //////////////////////////////// { - /** @type {import('@agoric/smart-wallet/src/invitations').ContinuingInvitationSpec} */ + /** @type {import('@agoric/smart-wallet/src/invitations.js').ContinuingInvitationSpec} */ const proposeInvitationSpec = { source: 'continuing', previousOffer: 'acceptEcInvitationOID', @@ -538,7 +538,7 @@ test.serial('govern oracles list', async t => { // Call for a vote to removeOracles //////////////////////////////// { - /** @type {import('@agoric/smart-wallet/src/invitations').ContinuingInvitationSpec} */ + /** @type {import('@agoric/smart-wallet/src/invitations.js').ContinuingInvitationSpec} */ const proposeInvitationSpec = { source: 'continuing', previousOffer: 'acceptEcInvitationOID', diff --git a/packages/inter-protocol/test/smartWallet/test-psm-integration.js b/packages/inter-protocol/test/smartWallet/test-psm-integration.js index f3cc6448c4c..1b0f0bddb80 100644 --- a/packages/inter-protocol/test/smartWallet/test-psm-integration.js +++ b/packages/inter-protocol/test/smartWallet/test-psm-integration.js @@ -67,7 +67,7 @@ test('null swap', async t => { const computedState = coalesceUpdates(E(wallet).getUpdatesSubscriber()); const currents = sequenceCurrents(E(wallet).getCurrentSubscriber()); - /** @type {import('@agoric/smart-wallet/src/invitations').AgoricContractInvitationSpec} */ + /** @type {import('@agoric/smart-wallet/src/invitations.js').AgoricContractInvitationSpec} */ const invitationSpec = { source: 'agoricContract', instancePath: ['psm-IST-AUSD'], @@ -124,7 +124,7 @@ test('want stable', async t => { await wallet.getDepositFacet().receive(payment); t.log('Execute the swap'); - /** @type {import('@agoric/smart-wallet/src/invitations').AgoricContractInvitationSpec} */ + /** @type {import('@agoric/smart-wallet/src/invitations.js').AgoricContractInvitationSpec} */ const invitationSpec = { source: 'agoricContract', instancePath: ['psm-IST-AUSD'], @@ -169,7 +169,7 @@ test('want stable (insufficient funds)', async t => { await wallet.getDepositFacet().receive(payment); t.log('Execute the swap'); - /** @type {import('@agoric/smart-wallet/src/invitations').AgoricContractInvitationSpec} */ + /** @type {import('@agoric/smart-wallet/src/invitations.js').AgoricContractInvitationSpec} */ const invitationSpec = { source: 'agoricContract', instancePath: ['psm-IST-AUSD'], @@ -266,7 +266,7 @@ test('govern offerFilter', async t => { // The purse has the invitation to get the makers /////////// - /** @type {import('@agoric/smart-wallet/src/invitations').PurseInvitationSpec} */ + /** @type {import('@agoric/smart-wallet/src/invitations.js').PurseInvitationSpec} */ const getInvMakersSpec = { source: 'purse', instance: econCharter, @@ -307,7 +307,7 @@ test('govern offerFilter', async t => { t.is(voteInvitationDetail.description, 'Voter0'); t.is(voteInvitationDetail.instance, economicCommittee); - /** @type {import('@agoric/smart-wallet/src/invitations').PurseInvitationSpec} */ + /** @type {import('@agoric/smart-wallet/src/invitations.js').PurseInvitationSpec} */ const getCommitteeInvMakersSpec = { source: 'purse', instance: economicCommittee, @@ -336,7 +336,7 @@ test('govern offerFilter', async t => { // Call for a vote //////////////////////////////// - /** @type {import('@agoric/smart-wallet/src/invitations').ContinuingInvitationSpec} */ + /** @type {import('@agoric/smart-wallet/src/invitations.js').ContinuingInvitationSpec} */ const proposeInvitationSpec = { source: 'continuing', previousOffer: 'acceptEcInvitationOID', diff --git a/packages/inter-protocol/test/supports.js b/packages/inter-protocol/test/supports.js index dc6e707ece7..45771750b53 100644 --- a/packages/inter-protocol/test/supports.js +++ b/packages/inter-protocol/test/supports.js @@ -187,7 +187,7 @@ export const subscriptionKey = subscription => { /** * @param {ERef<{ - * getPublicTopics: () => import('@agoric/zoe/src/contractSupport').TopicsRecord; + * getPublicTopics: () => import('@agoric/zoe/src/contractSupport/index.js').TopicsRecord; * }>} hasTopics * @param {string} subscriberName */ @@ -222,7 +222,7 @@ export const headValueLegacy = async subscription => { /** * @param {import('ava').ExecutionContext} t * @param {ERef<{ - * getPublicTopics: () => import('@agoric/zoe/src/contractSupport').TopicsRecord; + * getPublicTopics: () => import('@agoric/zoe/src/contractSupport/index.js').TopicsRecord; * }>} hasTopics * @param {string} topicName * @param {string} path diff --git a/packages/inter-protocol/test/swingsetTests/fluxAggregator/bootstrap-fluxAggregator-service-upgrade.js b/packages/inter-protocol/test/swingsetTests/fluxAggregator/bootstrap-fluxAggregator-service-upgrade.js index 4a1aa61fcfc..f7ee468d911 100644 --- a/packages/inter-protocol/test/swingsetTests/fluxAggregator/bootstrap-fluxAggregator-service-upgrade.js +++ b/packages/inter-protocol/test/swingsetTests/fluxAggregator/bootstrap-fluxAggregator-service-upgrade.js @@ -43,10 +43,10 @@ export const buildRootObject = async () => { * import('@agoric/governance/src/committee.js')['start'] * >; * fluxAggregatorV1?: Installation< - * import('../../../src/price/fluxAggregatorContract').start + * import('../../../src/price/fluxAggregatorContract.js').start * >; * puppetContractGovernor?: Installation< - * import('@agoric/governance/tools/puppetContractGovernor').start + * import('@agoric/governance/tools/puppetContractGovernor.js').start * >; * }} */ diff --git a/packages/inter-protocol/test/swingsetTests/psmUpgrade/bootstrap-psm-upgrade.js b/packages/inter-protocol/test/swingsetTests/psmUpgrade/bootstrap-psm-upgrade.js index d4fa3a05a2f..64982243d48 100644 --- a/packages/inter-protocol/test/swingsetTests/psmUpgrade/bootstrap-psm-upgrade.js +++ b/packages/inter-protocol/test/swingsetTests/psmUpgrade/bootstrap-psm-upgrade.js @@ -71,13 +71,13 @@ export const buildRootObject = async () => { * >; * psmV1?: Installation; * puppetContractGovernor?: Installation< - * import('@agoric/governance/tools/puppetContractGovernor').start + * import('@agoric/governance/tools/puppetContractGovernor.js').start * >; * }} */ const installations = {}; - /** @type {import('@agoric/governance/tools/puppetContractGovernor').PuppetContractGovernorKit} */ + /** @type {import('@agoric/governance/tools/puppetContractGovernor.js').PuppetContractGovernorKit} */ let governorFacets; /** @@ -122,9 +122,11 @@ export const buildRootObject = async () => { /** * @param {{ * vatAdmin: ReturnType< - * import('@agoric/swingset-vat/src/vats/vat-admin/vat-vat-admin')['buildRootObject'] + * import('@agoric/swingset-vat/src/vats/vat-admin/vat-vat-admin.js')['buildRootObject'] + * >; + * zoe: ReturnType< + * import('@agoric/vats/src/vat-zoe.js')['buildRootObject'] * >; - * zoe: ReturnType; * }} vats * @param {any} devices */ diff --git a/packages/inter-protocol/test/swingsetTests/reserve/bootstrap-assetReserve-upgrade.js b/packages/inter-protocol/test/swingsetTests/reserve/bootstrap-assetReserve-upgrade.js index 8fbf978e11a..c6f00c8655a 100644 --- a/packages/inter-protocol/test/swingsetTests/reserve/bootstrap-assetReserve-upgrade.js +++ b/packages/inter-protocol/test/swingsetTests/reserve/bootstrap-assetReserve-upgrade.js @@ -56,20 +56,20 @@ export const buildRootObject = async () => { /** * @type {{ * committee?: Installation< - * import('@agoric/governance/src/committee')['start'] + * import('@agoric/governance/src/committee.js')['start'] * >; * assetReserveV1?: Installation< - * import('../../../src/reserve/assetReserve')['start'] + * import('../../../src/reserve/assetReserve.js')['start'] * >; * puppetContractGovernor?: Installation< - * import('@agoric/governance/tools/puppetContractGovernor')['start'] + * import('@agoric/governance/tools/puppetContractGovernor.js')['start'] * >; * }} */ const installations = {}; /** - * @type {import('@agoric/governance/tools/puppetContractGovernor').PuppetContractGovernorKit< + * @type {import('@agoric/governance/tools/puppetContractGovernor.js').PuppetContractGovernorKit< * import('../../../src/reserve/assetReserve.js').start * >} */ diff --git a/packages/inter-protocol/test/test-provisionPool.js b/packages/inter-protocol/test/test-provisionPool.js index 60ac910bb73..ef53965c3fc 100644 --- a/packages/inter-protocol/test/test-provisionPool.js +++ b/packages/inter-protocol/test/test-provisionPool.js @@ -63,7 +63,7 @@ const makeTestContext = async () => { const committeeInstall = await E(zoe).install(committeeBundle); const psmInstall = await E(zoe).install(psmBundle); const centralSupply = await E(zoe).install(centralSupplyBundle); - /** @type {Installation} */ + /** @type {Installation} */ const policyInstall = await E(zoe).install(policyBundle); const mintLimit = AmountMath.make(mintedBrand, MINT_LIMIT); @@ -328,7 +328,7 @@ const makeWalletFactoryKitForAddresses = async addresses => { }; const done = new Set(); - /** @type {import('@agoric/vats/src/core/startWalletFactory').WalletFactoryStartResult['creatorFacet']} */ + /** @type {import('@agoric/vats/src/core/startWalletFactory.js').WalletFactoryStartResult['creatorFacet']} */ const walletFactory = Far('mock walletFactory', { provideSmartWallet: async (addr, _b, nameAdmin) => { const wallet = wallets.get(addr); diff --git a/packages/inter-protocol/test/vaultFactory/driver.js b/packages/inter-protocol/test/vaultFactory/driver.js index d35a87e2bf8..b0fdb36c2fd 100644 --- a/packages/inter-protocol/test/vaultFactory/driver.js +++ b/packages/inter-protocol/test/vaultFactory/driver.js @@ -29,7 +29,7 @@ import { withAmountUtils, } from '../supports.js'; -/** @typedef {import('../../src/vaultFactory/vaultFactory').VaultFactoryContract} VFC */ +/** @typedef {import('../../src/vaultFactory/vaultFactory.js').VaultFactoryContract} VFC */ const trace = makeTracer('VFDriver'); diff --git a/packages/inter-protocol/test/vaultFactory/test-vaultFactory.js b/packages/inter-protocol/test/vaultFactory/test-vaultFactory.js index 62da14d5e70..f8e134481ef 100644 --- a/packages/inter-protocol/test/vaultFactory/test-vaultFactory.js +++ b/packages/inter-protocol/test/vaultFactory/test-vaultFactory.js @@ -61,7 +61,7 @@ const contractRoots = { auctioneer: './src/auction/auctioneer.js', }; -/** @typedef {import('../../src/vaultFactory/vaultFactory').VaultFactoryContract} VFC */ +/** @typedef {import('../../src/vaultFactory/vaultFactory.js').VaultFactoryContract} VFC */ const trace = makeTracer('TestVF', false); diff --git a/packages/inter-protocol/test/vaultFactory/test-vaultLiquidation.js b/packages/inter-protocol/test/vaultFactory/test-vaultLiquidation.js index 325fb356178..2240f539d3f 100644 --- a/packages/inter-protocol/test/vaultFactory/test-vaultLiquidation.js +++ b/packages/inter-protocol/test/vaultFactory/test-vaultLiquidation.js @@ -62,7 +62,7 @@ const contractRoots = { auctioneer: './src/auction/auctioneer.js', }; -/** @typedef {import('../../src/vaultFactory/vaultFactory').VaultFactoryContract} VFC */ +/** @typedef {import('../../src/vaultFactory/vaultFactory.js').VaultFactoryContract} VFC */ const trace = makeTracer('TestST', false); diff --git a/packages/internal/src/callback.js b/packages/internal/src/callback.js index 14a7ba38138..20668739d79 100644 --- a/packages/internal/src/callback.js +++ b/packages/internal/src/callback.js @@ -20,12 +20,12 @@ const ownKeys = /** * @template {(...args: unknown[]) => any} I - * @typedef {import('./types').Callback} Callback + * @typedef {import('./types.js').Callback} Callback */ /** * @template {(...args: unknown[]) => any} I - * @typedef {import('./types').SyncCallback} SyncCallback + * @typedef {import('./types.js').SyncCallback} SyncCallback */ /** @template T @typedef {import('@endo/eventual-send').RemotableBrand<{}, T> & T} Farable */ diff --git a/packages/internal/src/lib-chainStorage.js b/packages/internal/src/lib-chainStorage.js index 385fc886abe..1b79339e523 100644 --- a/packages/internal/src/lib-chainStorage.js +++ b/packages/internal/src/lib-chainStorage.js @@ -130,7 +130,7 @@ export const prepareChainStorageNode = zone => { /** * Create a storage node for a given backing storage interface and path. * - * @param {import('./callback').Callback<(message: StorageMessage) => any>} messenger a callback + * @param {import('./callback.js').Callback<(message: StorageMessage) => any>} messenger a callback * for sending a storageMessage object to the storage implementation * (cf. golang/cosmos/x/vstorage/vstorage.go) * @param {string} path @@ -145,7 +145,7 @@ export const prepareChainStorageNode = zone => { 'ChainStorageNode', ChainStorageNodeI, /** - * @param {import('./callback').Callback<(message: StorageMessage) => any>} messenger + * @param {import('./callback.js').Callback<(message: StorageMessage) => any>} messenger * @param {string} path * @param {object} [options] * @param {boolean} [options.sequence] diff --git a/packages/internal/test/test-callback.js b/packages/internal/test/test-callback.js index 2b16494de54..ca23cec186c 100644 --- a/packages/internal/test/test-callback.js +++ b/packages/internal/test/test-callback.js @@ -14,15 +14,15 @@ test('near function callbacks', t => { */ const f = (a, b, c) => `${a + b}${c}`; - /** @type {import('../src/callback').SyncCallback} */ + /** @type {import('../src/callback.js').SyncCallback} */ const cb0 = cb.makeSyncFunctionCallback(f); t.deepEqual(cb0, { target: f, bound: [], isSync: true }); - /** @type {import('../src/callback').SyncCallback<(b: number, c: string) => string>} */ + /** @type {import('../src/callback.js').SyncCallback<(b: number, c: string) => string>} */ const cb1 = cb.makeSyncFunctionCallback(f, 9); t.deepEqual(cb1, { target: f, bound: [9], isSync: true }); - /** @type {import('../src/callback').SyncCallback<(c: string) => string>} */ + /** @type {import('../src/callback.js').SyncCallback<(c: string) => string>} */ const cb2 = cb.makeSyncFunctionCallback(f, 9, 10); t.deepEqual(cb2, { target: f, bound: [9, 10], isSync: true }); @@ -40,7 +40,7 @@ test('near function callbacks', t => { t.is(cb.callSync(cb2, 'go'), '19go'); const cbp2 = - /** @type {import('../src/callback').SyncCallback<(...args: unknown[]) => any>} */ ({ + /** @type {import('../src/callback.js').SyncCallback<(...args: unknown[]) => any>} */ ({ target: Promise.resolve(f), methodName: undefined, bound: [9, 10], @@ -72,15 +72,15 @@ test('near method callbacks', t => { }, }; - /** @type {import('../src/callback').SyncCallback} */ + /** @type {import('../src/callback.js').SyncCallback} */ const cb0 = cb.makeSyncMethodCallback(o, 'm1'); t.deepEqual(cb0, { target: o, methodName: 'm1', bound: [], isSync: true }); - /** @type {import('../src/callback').SyncCallback<(b: number, c: string) => string>} */ + /** @type {import('../src/callback.js').SyncCallback<(b: number, c: string) => string>} */ const cb1 = cb.makeSyncMethodCallback(o, 'm1', 9); t.deepEqual(cb1, { target: o, methodName: 'm1', bound: [9], isSync: true }); - /** @type {import('../src/callback').SyncCallback<(c: string) => string>} */ + /** @type {import('../src/callback.js').SyncCallback<(c: string) => string>} */ const cb2 = cb.makeSyncMethodCallback(o, 'm1', 9, 10); t.deepEqual(cb2, { target: o, @@ -98,7 +98,7 @@ test('near method callbacks', t => { isSync: true, }); - /** @type {import('../src/callback').SyncCallback<(c: string) => string>} */ + /** @type {import('../src/callback.js').SyncCallback<(c: string) => string>} */ const cb4 = cb.makeSyncMethodCallback(o, m2, 9, 10); t.deepEqual(cb4, { target: o, methodName: m2, bound: [9, 10], isSync: true }); @@ -145,7 +145,7 @@ test('far method callbacks', async t => { }, }); - /** @type {import('../src/callback').Callback<(c: string) => Promise>} */ + /** @type {import('../src/callback.js').Callback<(c: string) => Promise>} */ const cbp2 = cb.makeMethodCallback(Promise.resolve(o), 'm1', 9, 10); t.like(cbp2, { methodName: 'm1', bound: [9, 10] }); t.assert(cbp2.target instanceof Promise); @@ -153,7 +153,7 @@ test('far method callbacks', async t => { t.assert(p2r instanceof Promise); t.is(await p2r, '19go'); - /** @type {import('../src/callback').Callback<(c: string) => Promise>} */ + /** @type {import('../src/callback.js').Callback<(c: string) => Promise>} */ const cbp3 = cb.makeMethodCallback(Promise.resolve(o), m2, 9, 10); t.like(cbp3, { methodName: m2, bound: [9, 10] }); t.assert(cbp3.target instanceof Promise); @@ -175,7 +175,7 @@ test('far function callbacks', async t => { */ const f = async (a, b, c) => `${a + b}${c}`; - /** @type {import('../src/callback').Callback<(c: string) => Promise>} */ + /** @type {import('../src/callback.js').Callback<(c: string) => Promise>} */ const cbp2 = cb.makeFunctionCallback(Promise.resolve(f), 9, 10); t.like(cbp2, { bound: [9, 10] }); t.assert(cbp2.target instanceof Promise); diff --git a/packages/network/test/test-network-misc.js b/packages/network/test/test-network-misc.js index 410b70d3769..b10714a0dd8 100644 --- a/packages/network/test/test-network-misc.js +++ b/packages/network/test/test-network-misc.js @@ -18,10 +18,10 @@ const log = false ? console.log : () => {}; /** * @param {any} t - * @returns {import('../src').ProtocolHandler} A testing handler + * @returns {import('../src.js').ProtocolHandler} A testing handler */ const makeProtocolHandler = t => { - /** @type {import('../src').ListenHandler} */ + /** @type {import('../src.js').ListenHandler} */ let l; let lp; let nonce = 0; @@ -109,7 +109,7 @@ test('protocol connection listen', async t => { const port = await protocol.bind('/net/ordered/ordered/some-portname'); - /** @type {import('../src').ListenHandler} */ + /** @type {import('../src.js').ListenHandler} */ const listener = Far('listener', { async onListen(p, listenHandler) { t.is(p, port, `port is tracked in onListen`); @@ -193,7 +193,7 @@ test('loopback protocol', async t => { const port = await protocol.bind('/loopback/foo'); - /** @type {import('../src').ListenHandler} */ + /** @type {import('../src.js').ListenHandler} */ const listener = Far('listener', { async onAccept(_p, _localAddr, _remoteAddr, _listenHandler) { return harden({ diff --git a/packages/pegasus/test/test-peg.js b/packages/pegasus/test/test-peg.js index dfb86e70fbd..cbd574d7c09 100644 --- a/packages/pegasus/test/test-peg.js +++ b/packages/pegasus/test/test-peg.js @@ -73,7 +73,7 @@ async function testRemotePeg(t) { ); /** - * @type {import('../src/pegasus').Pegasus} + * @type {import('../src/pegasus.js').Pegasus} */ const pegasus = publicAPI; const network = makeNetworkProtocol(makeLoopbackProtocolHandler()); @@ -84,7 +84,7 @@ async function testRemotePeg(t) { /** * Pretend we're Gaia. * - * @type {import('@agoric/network/src').Connection?} + * @type {import('@agoric/network/src.js').Connection?} */ let gaiaConnection; E(portP).addListener( diff --git a/packages/smart-wallet/src/invitations.js b/packages/smart-wallet/src/invitations.js index 12d7fccf4c9..a5fcc32557d 100644 --- a/packages/smart-wallet/src/invitations.js +++ b/packages/smart-wallet/src/invitations.js @@ -62,7 +62,7 @@ const MAX_PIPE_LENGTH = 2; * @param {ERef} agoricNames * @param {Brand<'set'>} invitationBrand * @param {Purse<'set'>} invitationsPurse - * @param {(fromOfferId: string) => import('./types').InvitationMakers} getInvitationContinuation + * @param {(fromOfferId: string) => import('./types.js').InvitationMakers} getInvitationContinuation */ export const makeInvitationsHelper = ( zoe, diff --git a/packages/smart-wallet/src/offers.js b/packages/smart-wallet/src/offers.js index 10b4848fa68..72c74a1d2d6 100644 --- a/packages/smart-wallet/src/offers.js +++ b/packages/smart-wallet/src/offers.js @@ -9,7 +9,7 @@ import { makePaymentsHelper } from './payments.js'; /** * @typedef {{ * id: OfferId, - * invitationSpec: import('./invitations').InvitationSpec, + * invitationSpec: import('./invitations.js').InvitationSpec, * proposal: Proposal, * offerArgs?: unknown * }} OfferSpec @@ -35,10 +35,10 @@ export const UNPUBLISHED_RESULT = 'UNPUBLISHED'; * @param {ERef>} opts.invitationIssuer * @param {object} opts.powers * @param {Pick} opts.powers.logger - * @param {(spec: import('./invitations').InvitationSpec) => ERef} opts.powers.invitationFromSpec + * @param {(spec: import('./invitations.js').InvitationSpec) => ERef} opts.powers.invitationFromSpec * @param {(brand: Brand) => Promise} opts.powers.purseForBrand * @param {(status: OfferStatus) => void} opts.onStatusChange - * @param {(offerId: string, invitationAmount: Amount<'set'>, invitationMakers: import('./types').InvitationMakers, publicSubscribers: import('./types').PublicSubscribers | import('@agoric/zoe/src/contractSupport').TopicsRecord ) => Promise} opts.onNewContinuingOffer + * @param {(offerId: string, invitationAmount: Amount<'set'>, invitationMakers: import('./types.js').InvitationMakers, publicSubscribers: import('./types.js').PublicSubscribers | import('@agoric/zoe/src/contractSupport/index.js').TopicsRecord ) => Promise} opts.onNewContinuingOffer */ export const makeOfferExecutor = ({ zoe, diff --git a/packages/smart-wallet/src/smartWallet.js b/packages/smart-wallet/src/smartWallet.js index d7a1f94a145..1c08267c3db 100644 --- a/packages/smart-wallet/src/smartWallet.js +++ b/packages/smart-wallet/src/smartWallet.js @@ -106,7 +106,7 @@ const trace = makeTracer('SmrtWlt'); * brand: Brand, * displayInfo: DisplayInfo, * issuer: Issuer, - * petname: import('./types').Petname + * petname: import('./types.js').Petname * }} BrandDescriptor * For use by clients to describe brands to users. Includes `displayInfo` to save a remote call. */ @@ -114,7 +114,7 @@ const trace = makeTracer('SmrtWlt'); /** * @typedef {{ * address: string, - * bank: ERef, + * bank: ERef, * currentStorageNode: StorageNode, * invitationPurse: Purse<'set'>, * walletStorageNode: StorageNode, @@ -139,7 +139,7 @@ const trace = makeTracer('SmrtWlt'); * * @typedef {Readonly>, - * offerToInvitationMakers: MapStore, + * offerToInvitationMakers: MapStore, * offerToPublicSubscriberPaths: MapStore>, * offerToUsedInvitation: MapStore, * purseBalances: MapStore, @@ -621,7 +621,7 @@ export const prepareSmartWallet = (baggage, shared) => { } } }, - /** @type {(offerId: string, invitationAmount: Amount<'set'>, invitationMakers: import('./types').InvitationMakers, publicSubscribers?: import('./types').PublicSubscribers | import('@agoric/zoe/src/contractSupport').TopicsRecord) => Promise} */ + /** @type {(offerId: string, invitationAmount: Amount<'set'>, invitationMakers: import('./types.js').InvitationMakers, publicSubscribers?: import('./types.js').PublicSubscribers | import('@agoric/zoe/src/contractSupport/index.js').TopicsRecord) => Promise} */ onNewContinuingOffer: async ( offerId, invitationAmount, diff --git a/packages/smart-wallet/src/utils.js b/packages/smart-wallet/src/utils.js index de4758f5bd9..d89155ea8a5 100644 --- a/packages/smart-wallet/src/utils.js +++ b/packages/smart-wallet/src/utils.js @@ -9,7 +9,7 @@ const trace = makeTracer('WUTIL', false); /** @param {Brand<'set'>} [invitationBrand] */ export const makeWalletStateCoalescer = (invitationBrand = undefined) => { - /** @type {Map} */ + /** @type {Map} */ const offerStatuses = new Map(); /** @type {Map} */ const balances = new Map(); @@ -17,11 +17,11 @@ export const makeWalletStateCoalescer = (invitationBrand = undefined) => { /** * keyed by description; xxx assumes unique * - * @type {Map} + * @type {Map} */ const invitationsReceived = new Map(); - /** @param {import('./smartWallet').UpdateRecord | {}} updateRecord newer than previous */ + /** @param {import('./smartWallet.js').UpdateRecord | {}} updateRecord newer than previous */ const update = updateRecord => { if (!('updated' in updateRecord)) { return; @@ -93,7 +93,7 @@ export const makeWalletStateCoalescer = (invitationBrand = undefined) => { * If this proves to be a problem we can add an option to this or a related * utility to reset state from RPC. * - * @param {ERef>} updates + * @param {ERef>} updates * @param {Brand<'set'>} [invitationBrand] */ export const coalesceUpdates = (updates, invitationBrand) => { @@ -125,7 +125,7 @@ export const assertHasData = async follower => { /** * Handles the case of falsy argument so the caller can consistently await. * - * @param {import('./types.js').PublicSubscribers | import('@agoric/zoe/src/contractSupport').TopicsRecord} [subscribers] + * @param {import('./types.js').PublicSubscribers | import('@agoric/zoe/src/contractSupport/index.js').TopicsRecord} [subscribers] * @returns {ERef> | null} */ export const objectMapStoragePath = subscribers => { diff --git a/packages/smart-wallet/src/walletFactory.js b/packages/smart-wallet/src/walletFactory.js index bc9cb0c8c48..2751631f37a 100644 --- a/packages/smart-wallet/src/walletFactory.js +++ b/packages/smart-wallet/src/walletFactory.js @@ -68,7 +68,7 @@ export const makeAssetRegistry = assetPublisher => { * brand: Brand, * displayInfo: DisplayInfo, * issuer: Issuer, - * petname: import('./types').Petname + * petname: import('./types.js').Petname * }} BrandDescriptor * For use by clients to describe brands to users. Includes `displayInfo` to save a remote call. */ @@ -119,12 +119,12 @@ export const makeAssetRegistry = assetPublisher => { * * @typedef {{ * getAssetSubscription: () => ERef< - * IterableEachTopic> + * IterableEachTopic> * }} AssetPublisher * * @typedef {boolean} isRevive * @typedef {{ - * reviveWallet: (address: string) => Promise, + * reviveWallet: (address: string) => Promise, * ackWallet: (address: string) => isRevive, * }} WalletReviver */ @@ -250,16 +250,16 @@ export const prepare = async (zcf, privateArgs, baggage) => { { /** * @param {string} address - * @param {ERef} bank - * @param {ERef} namesByAddressAdmin - * @returns {Promise<[wallet: import('./smartWallet').SmartWallet, isNew: boolean]>} wallet + * @param {ERef} bank + * @param {ERef} namesByAddressAdmin + * @returns {Promise<[wallet: import('./smartWallet.js').SmartWallet, isNew: boolean]>} wallet * along with a flag to distinguish between looking up an existing wallet * and creating a new one. */ provideSmartWallet(address, bank, namesByAddressAdmin) { let isNew = false; - /** @type {(address: string) => Promise} */ + /** @type {(address: string) => Promise} */ const maker = async _address => { const invitationPurse = await E(invitationIssuer).makeEmptyPurse(); const walletStorageNode = E(storageNode).makeChildNode(address); diff --git a/packages/smart-wallet/test/supports.js b/packages/smart-wallet/test/supports.js index 05421bf9b60..2d1546880f4 100644 --- a/packages/smart-wallet/test/supports.js +++ b/packages/smart-wallet/test/supports.js @@ -154,7 +154,7 @@ export const makeMockTestSpace = async log => { }; /** - * @param {ERef<{getPublicTopics: () => import('@agoric/zoe/src/contractSupport').TopicsRecord}>} hasTopics + * @param {ERef<{getPublicTopics: () => import('@agoric/zoe/src/contractSupport/index.js').TopicsRecord}>} hasTopics * @param {string} subscriberName */ export const topicPath = (hasTopics, subscriberName) => { diff --git a/packages/smart-wallet/test/swingsetTests/upgradeWalletFactory/walletFactory-V2.js b/packages/smart-wallet/test/swingsetTests/upgradeWalletFactory/walletFactory-V2.js index dba7ecc5369..f774ea76fa1 100644 --- a/packages/smart-wallet/test/swingsetTests/upgradeWalletFactory/walletFactory-V2.js +++ b/packages/smart-wallet/test/swingsetTests/upgradeWalletFactory/walletFactory-V2.js @@ -110,15 +110,15 @@ export const prepare = async (zcf, privateArgs, baggage) => { { /** * @param {string} address - * @param {ERef} bank - * @param {ERef} namesByAddressAdmin - * @returns {Promise<[import('../../../src/smartWallet').SmartWallet, boolean]>} wallet + * @param {ERef} bank + * @param {ERef} namesByAddressAdmin + * @returns {Promise<[import('../../../src/smartWallet.js').SmartWallet, boolean]>} wallet * along with a flag to distinguish between looking up an existing wallet * and creating a new one. */ provideSmartWallet(address, bank, namesByAddressAdmin) { let makerCalled = false; - /** @type {() => Promise} */ + /** @type {() => Promise} */ const maker = async () => { const invitationPurse = await E(invitationIssuer).makeEmptyPurse(); const walletStorageNode = E(storageNode).makeChildNode(address); diff --git a/packages/swing-store/src/bundleStore.js b/packages/swing-store/src/bundleStore.js index 95f76957ece..fe74b9d53ad 100644 --- a/packages/swing-store/src/bundleStore.js +++ b/packages/swing-store/src/bundleStore.js @@ -15,7 +15,7 @@ import { createSHA256 } from './hasher.js'; * @typedef { EndoZipBase64Bundle | GetExportBundle | NestedEvaluateBundle } Bundle */ /** - * @typedef { import('./exporter').SwingStoreExporter } SwingStoreExporter + * @typedef { import('./exporter.js').SwingStoreExporter } SwingStoreExporter * @typedef { import('./internal.js').ArtifactMode } ArtifactMode * * @typedef {{ diff --git a/packages/swing-store/src/importer.js b/packages/swing-store/src/importer.js index 6bbf8a48ad8..8b13bfbaddb 100644 --- a/packages/swing-store/src/importer.js +++ b/packages/swing-store/src/importer.js @@ -17,10 +17,10 @@ import { assertComplete } from './assertComplete.js'; * returned swingStore is not suitable for execution, and thus only contains * the host facet for committing the populated swingStore. * - * @param {import('./exporter').SwingStoreExporter} exporter + * @param {import('./exporter.js').SwingStoreExporter} exporter * @param {string | null} [dirPath] * @param {ImportSwingStoreOptions} [options] - * @returns {Promise>} + * @returns {Promise>} */ export async function importSwingStore(exporter, dirPath = null, options = {}) { if (dirPath && typeof dirPath !== 'string') { diff --git a/packages/swing-store/src/internal.js b/packages/swing-store/src/internal.js index 18ece829261..890c04b02d3 100644 --- a/packages/swing-store/src/internal.js +++ b/packages/swing-store/src/internal.js @@ -1,9 +1,9 @@ import { Fail, q } from '@agoric/assert'; /** - * @typedef { import('./snapStore').SnapStoreInternal } SnapStoreInternal - * @typedef { import('./transcriptStore').TranscriptStoreInternal } TranscriptStoreInternal - * @typedef { import('./bundleStore').BundleStoreInternal } BundleStoreInternal + * @typedef { import('./snapStore.js').SnapStoreInternal } SnapStoreInternal + * @typedef { import('./transcriptStore.js').TranscriptStoreInternal } TranscriptStoreInternal + * @typedef { import('./bundleStore.js').BundleStoreInternal } BundleStoreInternal * * @typedef {{ * transcriptStore: TranscriptStoreInternal, diff --git a/packages/swing-store/src/repairMetadata.js b/packages/swing-store/src/repairMetadata.js index 8ebc53fc4d7..1e40498c30c 100644 --- a/packages/swing-store/src/repairMetadata.js +++ b/packages/swing-store/src/repairMetadata.js @@ -25,7 +25,7 @@ import { assertComplete } from './assertComplete.js'; * `hostStorage.commit()` when they are ready. * * @param {import('./internal.js').SwingStoreInternal} internal - * @param {import('./exporter').SwingStoreExporter} exporter + * @param {import('./exporter.js').SwingStoreExporter} exporter * @returns {Promise} */ export async function doRepairMetadata(internal, exporter) { diff --git a/packages/swing-store/src/snapStore.js b/packages/swing-store/src/snapStore.js index 4953359bdea..9df9a4a20bb 100644 --- a/packages/swing-store/src/snapStore.js +++ b/packages/swing-store/src/snapStore.js @@ -26,11 +26,11 @@ import { buffer } from './util.js'; /** * @template T - * @typedef { import('./exporter').AnyIterableIterator } AnyIterableIterator + * @typedef { import('./exporter.js').AnyIterableIterator } AnyIterableIterator */ /** - * @typedef { import('./exporter').SwingStoreExporter } SwingStoreExporter + * @typedef { import('./exporter.js').SwingStoreExporter } SwingStoreExporter * @typedef { import('./internal.js').ArtifactMode } ArtifactMode * * @typedef {{ diff --git a/packages/swing-store/src/swingStore.js b/packages/swing-store/src/swingStore.js index 1b488273f22..5fc7c1a4cfe 100644 --- a/packages/swing-store/src/swingStore.js +++ b/packages/swing-store/src/swingStore.js @@ -17,18 +17,18 @@ import { makeSnapStoreIO } from './snapStoreIO.js'; import { doRepairMetadata } from './repairMetadata.js'; /** - * @typedef { import('./kvStore').KVStore } KVStore + * @typedef { import('./kvStore.js').KVStore } KVStore * - * @typedef { import('./snapStore').SnapStore } SnapStore - * @typedef { import('./snapStore').SnapshotResult } SnapshotResult + * @typedef { import('./snapStore.js').SnapStore } SnapStore + * @typedef { import('./snapStore.js').SnapshotResult } SnapshotResult * - * @typedef { import('./transcriptStore').TranscriptStore } TranscriptStore - * @typedef { import('./transcriptStore').TranscriptStoreDebug } TranscriptStoreDebug + * @typedef { import('./transcriptStore.js').TranscriptStore } TranscriptStore + * @typedef { import('./transcriptStore.js').TranscriptStoreDebug } TranscriptStoreDebug * - * @typedef { import('./bundleStore').BundleStore } BundleStore - * @typedef { import('./bundleStore').BundleStoreDebug } BundleStoreDebug + * @typedef { import('./bundleStore.js').BundleStore } BundleStore + * @typedef { import('./bundleStore.js').BundleStoreDebug } BundleStoreDebug * - * @typedef { import('./exporter').KVPair } KVPair + * @typedef { import('./exporter.js').KVPair } KVPair * * @typedef {{ * kvStore: KVStore, // a key-value API object to load and store data on behalf of the kernel @@ -49,7 +49,7 @@ import { doRepairMetadata } from './repairMetadata.js'; * close: () => Promise, // shutdown the store, abandoning any uncommitted changes * diskUsage?: () => number, // optional stats method * setExportCallback: (cb: (updates: KVPair[]) => void) => void, // Set a callback invoked by swingStore when new serializable data is available for export - * repairMetadata: (exporter: import('./exporter').SwingStoreExporter) => Promise, + * repairMetadata: (exporter: import('./exporter.js').SwingStoreExporter) => Promise, * }} SwingStoreHostStorage */ diff --git a/packages/swing-store/src/util.js b/packages/swing-store/src/util.js index f22f974d325..60c224a9693 100644 --- a/packages/swing-store/src/util.js +++ b/packages/swing-store/src/util.js @@ -6,7 +6,7 @@ import { Buffer } from 'buffer'; * 'stream/consumers' package, which unfortunately only exists in newer versions * of Node. * - * @param {import('./exporter').AnyIterable} inStream + * @param {import('./exporter.js').AnyIterable} inStream */ export const buffer = async inStream => { const chunks = []; diff --git a/packages/swingset-liveslots/src/liveslots.js b/packages/swingset-liveslots/src/liveslots.js index 63ea6dd0d50..1474a5d0dd5 100644 --- a/packages/swingset-liveslots/src/liveslots.js +++ b/packages/swingset-liveslots/src/liveslots.js @@ -34,7 +34,7 @@ const { details: X } = assert; * @param {*} syscall Kernel syscall interface that the vat will have access to * @param {*} forVatID Vat ID label, for use in debug diagnostics * @param {*} vatPowers - * @param {import('./types').LiveSlotsOptions} liveSlotsOptions + * @param {import('./types.js').LiveSlotsOptions} liveSlotsOptions * @param {*} gcTools { WeakRef, FinalizationRegistry, waitUntilQuiescent, gcAndFinalize, * meterControl } * @param {Pick} console @@ -1469,7 +1469,7 @@ function build( } /** - * @param {import('./types').VatDeliveryObject} delivery + * @param {import('./types.js').VatDeliveryObject} delivery * @returns {void | Promise} */ function dispatchToUserspace(delivery) { @@ -1534,7 +1534,7 @@ function build( } /** - * @param { import('./types').SwingSetCapData } _disconnectObjectCapData + * @param { import('./types.js').SwingSetCapData } _disconnectObjectCapData * @returns {Promise} */ async function stopVat(_disconnectObjectCapData) { @@ -1586,7 +1586,7 @@ function build( * terminate the vat). Userspace should not be able to cause the delivery * to fail: only a bug in liveslots should trigger a failure. * - * @param {import('./types').VatDeliveryObject} delivery + * @param {import('./types.js').VatDeliveryObject} delivery * @returns {Promise} */ async function dispatch(delivery) { @@ -1637,7 +1637,7 @@ function build( * @param {*} syscall Kernel syscall interface that the vat will have access to * @param {*} forVatID Vat ID label, for use in debug diagostics * @param {*} vatPowers - * @param {import('./types').LiveSlotsOptions} liveSlotsOptions + * @param {import('./types.js').LiveSlotsOptions} liveSlotsOptions * @param {*} gcTools { WeakRef, FinalizationRegistry, waitUntilQuiescent } * @param {Pick} [liveSlotsConsole] * @param {*} [buildVatNamespace] diff --git a/packages/swingset-liveslots/src/message.js b/packages/swingset-liveslots/src/message.js index fabc0e3120f..3da9e83e63f 100644 --- a/packages/swingset-liveslots/src/message.js +++ b/packages/swingset-liveslots/src/message.js @@ -3,7 +3,7 @@ import { insistCapData } from './capdata.js'; /** * @typedef {{ - * methargs: import('./types').SwingSetCapData, // of [method, args] + * methargs: import('./types.js').SwingSetCapData, // of [method, args] * result: string | undefined | null, * }} Message */ diff --git a/packages/swingset-liveslots/src/virtualObjectManager.js b/packages/swingset-liveslots/src/virtualObjectManager.js index 3fc056e0ae9..8a7fa0eabf9 100644 --- a/packages/swingset-liveslots/src/virtualObjectManager.js +++ b/packages/swingset-liveslots/src/virtualObjectManager.js @@ -314,7 +314,7 @@ const insistSameCapData = (oldCD, newCD) => { * @param {import('@endo/marshal').FromCapData} unserialize Unserializer for this vat * @param {*} assertAcceptableSyscallCapdataSize Function to check for oversized * syscall params - * @param {import('./types').LiveSlotsOptions} [liveSlotsOptions] + * @param {import('./types.js').LiveSlotsOptions} [liveSlotsOptions] * @param {{ WeakMap: typeof WeakMap, WeakSet: typeof WeakSet }} [powers] * Specifying the underlying WeakMap/WeakSet objects to wrap with * VirtualObjectAwareWeakMap/Set. By default, capture the ones currently diff --git a/packages/telemetry/src/slog-sender-pipe.js b/packages/telemetry/src/slog-sender-pipe.js index 9c378c75e20..f17b8c859b9 100644 --- a/packages/telemetry/src/slog-sender-pipe.js +++ b/packages/telemetry/src/slog-sender-pipe.js @@ -78,11 +78,11 @@ export const makeSlogSender = async opts => { /** * @typedef {{ * init: { - * message: import('./slog-sender-pipe-entrypoint').InitMessage; + * message: import('./slog-sender-pipe-entrypoint.js').InitMessage; * reply: SlogSenderInitReply; * }; * flush: { - * message: import('./slog-sender-pipe-entrypoint').FlushMessage; + * message: import('./slog-sender-pipe-entrypoint.js').FlushMessage; * reply: SlogSenderFlushReply; * }; * }} SlogSenderWaitMessagesAndReplies diff --git a/packages/time/test/test-timeMath.js b/packages/time/test/test-timeMath.js index 14fc4a12f3e..5b17c835933 100644 --- a/packages/time/test/test-timeMath.js +++ b/packages/time/test/test-timeMath.js @@ -3,11 +3,11 @@ import { Far } from '@endo/far'; import { TimeMath } from '../src/timeMath.js'; /** - * @typedef {import('../src/types').TimerBrand} TimerBrand - * @typedef {import('../src/types').Timestamp} Timestamp - * @typedef {import('../src/types').RelativeTime} RelativeTime - * @typedef {import('../src/types').TimestampValue} TimestampValue - * @typedef {import('../src/types').TimeMathType} TimeMathType + * @typedef {import('../src/types.js').TimerBrand} TimerBrand + * @typedef {import('../src/types.js').Timestamp} Timestamp + * @typedef {import('../src/types.js').RelativeTime} RelativeTime + * @typedef {import('../src/types.js').TimestampValue} TimestampValue + * @typedef {import('../src/types.js').TimeMathType} TimeMathType * */ diff --git a/packages/vats/src/bridge.js b/packages/vats/src/bridge.js index 2bc642c38c5..9de5e59cf09 100644 --- a/packages/vats/src/bridge.js +++ b/packages/vats/src/bridge.js @@ -42,7 +42,7 @@ const prepareScopedManager = zone => { * @param {{ * outbound: (bridgeId: string, obj: unknown) => Promise; * }} toBridge - * @param {import('./types').BridgeHandler} [inboundHandler] + * @param {import('./types.js').BridgeHandler} [inboundHandler] */ (bridgeId, toBridge, inboundHandler) => ({ bridgeId, diff --git a/packages/vats/src/core/basic-behaviors.js b/packages/vats/src/core/basic-behaviors.js index ec0abbc0c7c..ef9812a7cc6 100644 --- a/packages/vats/src/core/basic-behaviors.js +++ b/packages/vats/src/core/basic-behaviors.js @@ -697,7 +697,7 @@ export const addBankAssets = async ({ }; harden(addBankAssets); -/** @type {import('./lib-boot').BootstrapManifest} */ +/** @type {import('./lib-boot.js').BootstrapManifest} */ export const BASIC_BOOTSTRAP_PERMITS = { bridgeCoreEval: true, // Needs all the powers. [makeOracleBrands.name]: { diff --git a/packages/vats/src/core/chain-behaviors.js b/packages/vats/src/core/chain-behaviors.js index f7fd36b92f4..6ed04ee409d 100644 --- a/packages/vats/src/core/chain-behaviors.js +++ b/packages/vats/src/core/chain-behaviors.js @@ -498,7 +498,7 @@ export const connectChainFaucet = async ({ consume: { client } }) => { }; harden(connectChainFaucet); -/** @type {import('./lib-boot').BootstrapManifest} */ +/** @type {import('./lib-boot.js').BootstrapManifest} */ export const SHARED_CHAIN_BOOTSTRAP_MANIFEST = { ...BASIC_BOOTSTRAP_PERMITS, diff --git a/packages/vats/src/core/sim-behaviors.js b/packages/vats/src/core/sim-behaviors.js index bfafac62be6..fd8a1a61d24 100644 --- a/packages/vats/src/core/sim-behaviors.js +++ b/packages/vats/src/core/sim-behaviors.js @@ -39,7 +39,7 @@ export const grantRunBehaviors = async ({ }; harden(grantRunBehaviors); -/** @type {import('./lib-boot').BootstrapManifest} */ +/** @type {import('./lib-boot.js').BootstrapManifest} */ export const SIM_CHAIN_BOOTSTRAP_PERMITS = { [installSimEgress.name]: { vatParameters: { argv: { hardcodedClientAddresses: true } }, diff --git a/packages/vats/src/core/startWalletFactory.js b/packages/vats/src/core/startWalletFactory.js index 2db46c90028..9b04c34227d 100644 --- a/packages/vats/src/core/startWalletFactory.js +++ b/packages/vats/src/core/startWalletFactory.js @@ -17,7 +17,7 @@ const trace = makeTracer('StartWF'); /** * @param {ERef} zoe * @param {Installation< - * import('@agoric/smart-wallet/src/walletFactory').start + * import('@agoric/smart-wallet/src/walletFactory.js').start * >} inst * * @typedef {Awaited>} WalletFactoryStartResult diff --git a/packages/vats/src/core/utils.js b/packages/vats/src/core/utils.js index 31cc6e4f8a9..1150cca0fd6 100644 --- a/packages/vats/src/core/utils.js +++ b/packages/vats/src/core/utils.js @@ -199,7 +199,7 @@ harden(runModuleBehaviors); const noop = harden(() => {}); /** - * @param {ERef} nameAdmin + * @param {ERef} nameAdmin * @param {typeof console.log} [log] */ export const makePromiseSpaceForNameHub = (nameAdmin, log = noop) => { @@ -227,7 +227,7 @@ export const makePromiseSpaceForNameHub = (nameAdmin, log = noop) => { }; /** - * @param {ERef} parentAdmin + * @param {ERef} parentAdmin * @param {typeof console.log} [log] * @param {string[]} [kinds] */ @@ -299,7 +299,7 @@ export const makeMyAddressNameAdminKit = address => { // Create a name hub for this address. const { nameHub, nameAdmin: rawMyAddressNameAdmin } = makeNameHubKit(); - /** @type {import('../types').MyAddressNameAdmin} */ + /** @type {import('../types.js').MyAddressNameAdmin} */ const myAddressNameAdmin = Far('myAddressNameAdmin', { ...rawMyAddressNameAdmin, getMyAddress: () => address, diff --git a/packages/vats/src/nameHub.js b/packages/vats/src/nameHub.js index 505998fbd6d..d06821e2924 100644 --- a/packages/vats/src/nameHub.js +++ b/packages/vats/src/nameHub.js @@ -141,7 +141,7 @@ export const prepareNameHubKit = zone => { /** @param {{}} me */ const my = me => provideWeak(ephemera, me, init1); - /** @type {() => import('./types').NameHubKit} */ + /** @type {() => import('./types.js').NameHubKit} */ const makeNameHubKit = zone.exoClassKit( 'NameHubKit', NameHubIKit, @@ -150,7 +150,7 @@ export const prepareNameHubKit = zone => { /** @type {MapStore} */ keyToValue: zone.detached().mapStore('nameKey'), - /** @type {MapStore} */ + /** @type {MapStore} */ keyToAdmin: zone.detached().mapStore('nameKey'), /** @type {undefined | { write: (item: unknown) => void }} */ diff --git a/packages/vats/src/vat-bank.js b/packages/vats/src/vat-bank.js index 31385e3e658..d0d0ffa0a9a 100644 --- a/packages/vats/src/vat-bank.js +++ b/packages/vats/src/vat-bank.js @@ -33,7 +33,7 @@ const BridgeChannelI = M.interface('BridgeChannel', { }); /** - * @typedef {import('./virtual-purse').VirtualPurseController} VirtualPurseController + * @typedef {import('./virtual-purse.js').VirtualPurseController} VirtualPurseController * * @typedef {Awaited>>} VirtualPurse */ diff --git a/packages/vats/src/vat-provisioning.js b/packages/vats/src/vat-provisioning.js index 3caa07b915d..8db80b8e59a 100644 --- a/packages/vats/src/vat-provisioning.js +++ b/packages/vats/src/vat-provisioning.js @@ -56,7 +56,7 @@ const prepareSpecializedNameAdmin = zone => { // XXX relies on callers not to provide other admins via update() // TODO: enforce? - /** @type {import('./types').MyAddressNameAdmin} */ + /** @type {import('./types.js').MyAddressNameAdmin} */ // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error // @ts-ignore cast const myAdmin = nameAdmin.lookupAdmin(address); diff --git a/packages/vats/test/test-bootstrapPayment.js b/packages/vats/test/test-bootstrapPayment.js index 933841611ca..e3555282816 100644 --- a/packages/vats/test/test-bootstrapPayment.js +++ b/packages/vats/test/test-bootstrapPayment.js @@ -12,7 +12,7 @@ import { feeIssuerConfig } from '../src/core/utils.js'; /** * @template T @typedef - * {import('@agoric/zoe/src/zoeService/utils').Installation} + * {import('@agoric/zoe/src/zoeService/utils.js').Installation} * Installation */ /** diff --git a/packages/vats/test/test-vpurse.js b/packages/vats/test/test-vpurse.js index c7a71782564..053e65e06cc 100644 --- a/packages/vats/test/test-vpurse.js +++ b/packages/vats/test/test-vpurse.js @@ -54,7 +54,7 @@ const setup = (t, zone, escrowValue = 0n) => { }, }); - /** @type {import('../src/virtual-purse').VirtualPurseController} */ + /** @type {import('../src/virtual-purse.js').VirtualPurseController} */ const vpcontroller = zone.exo('TestController', undefined, { getBalances(b) { t.is(b, brand); diff --git a/packages/wallet/api/src/internal-types.js b/packages/wallet/api/src/internal-types.js index 8d52b33a1b4..5a65ad08e07 100644 --- a/packages/wallet/api/src/internal-types.js +++ b/packages/wallet/api/src/internal-types.js @@ -7,7 +7,7 @@ * @property {PurseActions} actions */ -/** @typedef {import('@agoric/deploy-script-support/src/externalTypes').Petname} Petname */ +/** @typedef {import('@agoric/deploy-script-support/src/externalTypes.js').Petname} Petname */ /** * @typedef {PursesJSONState & PursesAddedState} PursesFullState @@ -93,6 +93,6 @@ * would make them part of the WalletUser available as `home.wallet` in the * REPL. Then, the Wallet UI could use that instead. * - * @typedef {import('./lib-wallet').WalletRoot['admin']} + * @typedef {import('./lib-wallet.js').WalletRoot['admin']} * WalletAdminFacet */ diff --git a/packages/xsnap/src/avaAssertXS.js b/packages/xsnap/src/avaAssertXS.js index beff7c15c64..dcb11614fcc 100644 --- a/packages/xsnap/src/avaAssertXS.js +++ b/packages/xsnap/src/avaAssertXS.js @@ -66,7 +66,7 @@ function deepDifference(x, y) { * @param {(msg: TapMessage) => void} send * * @typedef { ReturnType } TapFormat - * @typedef {import('./avaXS').TapMessage} TapMessage + * @typedef {import('./avaXS.js').TapMessage} TapMessage */ function tapFormat(send) { return freeze({ diff --git a/packages/xsnap/src/avaXS.js b/packages/xsnap/src/avaXS.js index dd6cdd9db91..e3962fcd311 100644 --- a/packages/xsnap/src/avaXS.js +++ b/packages/xsnap/src/avaXS.js @@ -91,7 +91,7 @@ function isMatch(specimen, pattern) { * * @typedef {{ total: number, pass: number, fail: { filename: string, name: string }[] }} TestResults * @typedef { 'ok' | 'not ok' | 'SKIP' } Status - * @typedef {ReturnType} XSnap + * @typedef {ReturnType} XSnap */ async function runTestScript( filename, diff --git a/packages/xsnap/src/xsnap.js b/packages/xsnap/src/xsnap.js index 4cccd30b6dc..d2b46e95755 100644 --- a/packages/xsnap/src/xsnap.js +++ b/packages/xsnap/src/xsnap.js @@ -9,7 +9,7 @@ /** * @template T - * @typedef {import('./defer').Deferred} Deferred + * @typedef {import('./defer.js').Deferred} Deferred */ import { finished } from 'stream/promises'; diff --git a/packages/xsnap/src/xsrepl.js b/packages/xsnap/src/xsrepl.js index 45369109a1b..abfa02c8baa 100755 --- a/packages/xsnap/src/xsrepl.js +++ b/packages/xsnap/src/xsrepl.js @@ -7,7 +7,7 @@ import '@endo/init'; /** * @template T - * @typedef {import('./defer').Deferred} Deferred + * @typedef {import('./defer.js').Deferred} Deferred */ import * as childProcess from 'child_process'; import fs from 'fs'; diff --git a/packages/zoe/src/zoeService/internal-types.js b/packages/zoe/src/zoeService/internal-types.js index b661dfde644..fbf1938a2e4 100644 --- a/packages/zoe/src/zoeService/internal-types.js +++ b/packages/zoe/src/zoeService/internal-types.js @@ -133,7 +133,7 @@ * @property {import('./utils.js').GetPublicFacet} getPublicFacet * @property {GetBrands} getBrands * @property {GetIssuers} getIssuers - * @property {import('./utils').GetTerms} getTerms + * @property {import('./utils.js').GetTerms} getTerms * @property {GetOfferFilter} getOfferFilter * @property {SetOfferFilter} setOfferFilter * @property {GetInstallationForInstance} getInstallationForInstance diff --git a/packages/zoe/src/zoeService/startInstance.js b/packages/zoe/src/zoeService/startInstance.js index 518e134d8f8..03b0a2a7c2c 100644 --- a/packages/zoe/src/zoeService/startInstance.js +++ b/packages/zoe/src/zoeService/startInstance.js @@ -23,7 +23,7 @@ const { Fail, quote: q } = assert; * @param {() => ERef} getZcfBundleCapP * @param {(id: string) => BundleCap} getBundleCapByIdNow * @param {Baggage} zoeBaggage - * @returns {import('./utils').StartInstance} + * @returns {import('./utils.js').StartInstance} */ export const makeStartInstance = ( startInstanceAccess, diff --git a/packages/zoe/src/zoeService/types.js b/packages/zoe/src/zoeService/types.js index 7ca1c8d5d63..0f61ae80fad 100644 --- a/packages/zoe/src/zoeService/types.js +++ b/packages/zoe/src/zoeService/types.js @@ -28,12 +28,12 @@ * * @property {InstallBundle} install * @property {InstallBundleID} installBundleID - * @property {import('./utils').StartInstance} startInstance + * @property {import('./utils.js').StartInstance} startInstance * @property {Offer} offer - * @property {import('./utils').GetPublicFacet} getPublicFacet + * @property {import('./utils.js').GetPublicFacet} getPublicFacet * @property {GetIssuers} getIssuers * @property {GetBrands} getBrands - * @property {import('./utils').GetTerms} getTerms + * @property {import('./utils.js').GetTerms} getTerms * @property {GetOfferFilter} getOfferFilter * @property {GetInstallationForInstance} getInstallationForInstance * @property {GetInstance} getInstance @@ -66,19 +66,19 @@ /** * @callback GetIssuers - * @param {import('./utils').Instance} instance + * @param {import('./utils.js').Instance} instance * @returns {Promise} */ /** * @callback GetBrands - * @param {import('./utils').Instance} instance + * @param {import('./utils.js').Instance} instance * @returns {Promise} */ /** * @callback GetOfferFilter - * @param {import('./utils').Instance} instance + * @param {import('./utils.js').Instance} instance * @returns {string[]} */ @@ -90,14 +90,14 @@ /** * @callback GetInstallationForInstance - * @param {import('./utils').Instance} instance + * @param {import('./utils.js').Instance} instance * @returns {Promise} */ /** * @callback GetInstance * @param {ERef} invitation - * @returns {Promise>} + * @returns {Promise>} */ /** @@ -271,7 +271,7 @@ */ /** - * @typedef {import('./utils').Instance} Instance + * @typedef {import('./utils.js').Instance} Instance */ /** @@ -295,7 +295,7 @@ /** * @typedef {object} InvitationDetails * @property {Installation} installation - * @property {import('./utils').Instance} instance + * @property {import('./utils.js').Instance} instance * @property {InvitationHandle} handle * @property {string} description * @property {Record} [customDetails] @@ -303,12 +303,12 @@ /** * @template [SF=any] contract start function - * @typedef {import('./utils').Installation} Installation + * @typedef {import('./utils.js').Installation} Installation */ /** * @template {Installation} I - * @typedef {import('./utils').InstallationStart} InstallationStart + * @typedef {import('./utils.js').InstallationStart} InstallationStart */ /** diff --git a/packages/zoe/test/unitTests/test-zoe.js b/packages/zoe/test/unitTests/test-zoe.js index ab704870417..2ceaaf2fe1c 100644 --- a/packages/zoe/test/unitTests/test-zoe.js +++ b/packages/zoe/test/unitTests/test-zoe.js @@ -105,7 +105,7 @@ test(`E(zoe).getPublicFacet`, async t => { const contractPath = `${dirname}/../../src/contracts/automaticRefund`; const bundle = await bundleSource(contractPath); vatAdminState.installBundle('b1-refund', bundle); - /** @type {Installation} */ + /** @type {Installation} */ const installation = await E(zoe).installBundleID('b1-refund'); const { publicFacet, instance } = await E(zoe).startInstance(installation); await t.throwsAsync(() => @@ -235,7 +235,7 @@ test(`zoe.getTerms`, async t => { const contractPath = `${dirname}/../../src/contracts/automaticRefund`; const bundle = await bundleSource(contractPath); vatAdminState.installBundle('b1-refund', bundle); - /** @type {Installation} */ + /** @type {Installation} */ const installation = await E(zoe).installBundleID('b1-refund'); const { instance } = await E(zoe).startInstance( installation, From cffa8c0a23726dc3a99802812a461df4e131cfef Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 8 Dec 2023 13:01:26 -0800 Subject: [PATCH 10/21] fix(time): Export top-level types --- packages/inter-protocol/src/price/fluxAggregatorKit.js | 4 ++-- packages/time/package.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/inter-protocol/src/price/fluxAggregatorKit.js b/packages/inter-protocol/src/price/fluxAggregatorKit.js index 910f060d489..39601167799 100644 --- a/packages/inter-protocol/src/price/fluxAggregatorKit.js +++ b/packages/inter-protocol/src/price/fluxAggregatorKit.js @@ -27,8 +27,8 @@ export const INVITATION_MAKERS_DESC = 'oracle invitation'; * * @typedef {import('@agoric/time').Timestamp} Timestamp * - * @typedef {import('@agoric/time').RelativeTime} RelativeTime // - * TODO: use RelativeTime, not RelativeTimeValue + * @typedef {import('@agoric/time').RelativeTime} RelativeTime // TODO: use + * RelativeTime, not RelativeTimeValue * * @typedef {import('@agoric/time').RelativeTimeValue} RelativeTimeValue * diff --git a/packages/time/package.json b/packages/time/package.json index 2ae3dd423db..c44b6b2879d 100644 --- a/packages/time/package.json +++ b/packages/time/package.json @@ -4,6 +4,7 @@ "description": "Timestamps, time math, timer service API definition", "type": "module", "main": "index.js", + "types": "index.js", "engines": { "node": ">=14.15.0" }, From 014fb5ba6fb997bb408eaa31a87fc95f2fac16fe Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 8 Dec 2023 16:08:41 -0800 Subject: [PATCH 11/21] fix(zone): Ignore type error that occurrs only integration with vats --- packages/zone/src/durable.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/zone/src/durable.js b/packages/zone/src/durable.js index 22cfe4b733a..a8460f43935 100644 --- a/packages/zone/src/durable.js +++ b/packages/zone/src/durable.js @@ -89,6 +89,10 @@ export const makeDurableZone = (baggage, baseLabel = 'durableZone') => { /** @type {import('.').Zone['exoClass']} */ const exoClass = (...args) => prepareExoClass(baggage, ...args); /** @type {import('.').Zone['exoClassKit']} */ + // @ts-ignore This type check regressed inexplicably with the release + // following after @endo/exo@0.2.6. + // The lint error does not occur in local lint, but does in integration with + // @agoric/vats, so can not be suppressed with ts-expect-error. const exoClassKit = (...args) => prepareExoClassKit(baggage, ...args); /** @type {import('.').Zone['exo']} */ const exo = (...args) => prepareExo(baggage, ...args); From 3844fcc9dc6eb386c75f6f20d0a4c562af6342b8 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Wed, 20 Dec 2023 13:33:52 -0800 Subject: [PATCH 12/21] chore: Sync Endo versions --- package.json | 2 +- packages/ERTP/package.json | 14 ++++---- packages/SwingSet/package.json | 32 +++++++++---------- packages/agoric-cli/package.json | 18 +++++------ packages/assert/package.json | 2 +- packages/base-zone/package.json | 10 +++--- packages/benchmark/package.json | 2 +- packages/boot/package.json | 16 +++++----- packages/builders/package.json | 16 +++++----- packages/cache/package.json | 4 +-- packages/casting/package.json | 12 +++---- packages/cosmic-swingset/package.json | 14 ++++---- packages/deploy-script-support/package.json | 16 +++++----- packages/deployment/package.json | 4 +-- packages/eslint-config/package.json | 2 +- packages/governance/package.json | 18 +++++------ packages/inter-protocol/package.json | 18 +++++------ packages/internal/package.json | 14 ++++---- packages/kmarshal/package.json | 4 +-- packages/network/package.json | 8 ++--- packages/notifier/package.json | 12 +++---- packages/pegasus/package.json | 12 +++---- packages/same-structure/package.json | 2 +- packages/smart-wallet/package.json | 16 +++++----- packages/solo/package.json | 14 ++++---- packages/spawner/package.json | 10 +++--- packages/store/package.json | 12 +++---- packages/swing-store/package.json | 10 +++--- packages/swingset-liveslots/package.json | 18 +++++------ packages/swingset-runner/package.json | 10 +++--- .../swingset-xsnap-supervisor/package.json | 8 ++--- packages/telemetry/package.json | 10 +++--- packages/time/package.json | 8 ++--- packages/vat-data/package.json | 4 +-- packages/vats/package.json | 16 +++++----- packages/wallet/api/package.json | 14 ++++---- packages/xsnap-lockdown/package.json | 4 +-- packages/xsnap/package.json | 16 +++++----- packages/zoe/package.json | 20 ++++++------ packages/zone/package.json | 6 ++-- 40 files changed, 224 insertions(+), 224 deletions(-) diff --git a/package.json b/package.json index 89316fbd9f5..1dd9e06b3d9 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "type": "module", "packageManager": "yarn@1.22.19", "devDependencies": { - "@endo/eslint-plugin": "^0.5.1", + "@endo/eslint-plugin": "^2.0.0", "@jessie.js/eslint-plugin": "^0.4.0", "@types/express": "^4.17.17", "@types/node": "^16.13.0", diff --git a/packages/ERTP/package.json b/packages/ERTP/package.json index 0fb9f53e104..301dfb70ad2 100644 --- a/packages/ERTP/package.json +++ b/packages/ERTP/package.json @@ -43,16 +43,16 @@ "@agoric/notifier": "^0.6.2", "@agoric/store": "^0.9.2", "@agoric/vat-data": "^0.5.2", - "@endo/eventual-send": "^0.17.5", - "@endo/far": "^0.2.21", - "@endo/marshal": "^0.8.8", - "@endo/nat": "^4.1.30", - "@endo/patterns": "^0.2.5", - "@endo/promise-kit": "^0.2.59" + "@endo/eventual-send": "^1.0.1", + "@endo/far": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/nat": "^5.0.1", + "@endo/patterns": "^1.0.1", + "@endo/promise-kit": "^1.0.1" }, "devDependencies": { "@agoric/swingset-vat": "^0.32.2", - "@endo/bundle-source": "^2.7.0", + "@endo/bundle-source": "^3.0.1", "@fast-check/ava": "^1.1.5", "ava": "^5.3.0", "tsd": "^0.28.1" diff --git a/packages/SwingSet/package.json b/packages/SwingSet/package.json index cb9a7ab6688..a54b1fb7191 100644 --- a/packages/SwingSet/package.json +++ b/packages/SwingSet/package.json @@ -38,22 +38,22 @@ "@agoric/vat-data": "^0.5.2", "@agoric/xsnap": "^0.14.2", "@agoric/xsnap-lockdown": "^0.14.0", - "@endo/base64": "^0.2.34", - "@endo/bundle-source": "^2.7.0", - "@endo/captp": "^3.1.4", - "@endo/check-bundle": "^0.2.21", - "@endo/compartment-mapper": "^0.9.1", - "@endo/eventual-send": "^0.17.5", - "@endo/far": "^0.2.21", - "@endo/import-bundle": "^0.4.1", - "@endo/init": "^0.5.59", - "@endo/marshal": "^0.8.8", - "@endo/nat": "^4.1.30", - "@endo/patterns": "^0.2.5", - "@endo/promise-kit": "^0.2.59", - "@endo/ses-ava": "^0.2.43", - "@endo/stream": "^0.3.28", - "@endo/zip": "^0.2.34", + "@endo/base64": "^1.0.0", + "@endo/bundle-source": "^3.0.1", + "@endo/captp": "^4.0.1", + "@endo/check-bundle": "^1.0.1", + "@endo/compartment-mapper": "^1.0.1", + "@endo/eventual-send": "^1.0.1", + "@endo/far": "^1.0.1", + "@endo/import-bundle": "^1.0.1", + "@endo/init": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/nat": "^5.0.1", + "@endo/patterns": "^1.0.1", + "@endo/promise-kit": "^1.0.1", + "@endo/ses-ava": "^1.0.1", + "@endo/stream": "^1.0.1", + "@endo/zip": "^1.0.0", "ansi-styles": "^6.2.1", "anylogger": "^0.21.0", "better-sqlite3": "^9.1.1", diff --git a/packages/agoric-cli/package.json b/packages/agoric-cli/package.json index 1b1d2eeccff..07051578283 100644 --- a/packages/agoric-cli/package.json +++ b/packages/agoric-cli/package.json @@ -57,15 +57,15 @@ "@cosmjs/math": "^0.30.1", "@cosmjs/proto-signing": "^0.30.1", "@cosmjs/stargate": "^0.30.1", - "@endo/bundle-source": "^2.7.0", - "@endo/captp": "^3.1.4", - "@endo/compartment-mapper": "^0.9.1", - "@endo/far": "^0.2.21", - "@endo/init": "^0.5.59", - "@endo/marshal": "^0.8.8", - "@endo/nat": "^4.1.30", - "@endo/patterns": "^0.2.6", - "@endo/promise-kit": "^0.2.59", + "@endo/bundle-source": "^3.0.1", + "@endo/captp": "^4.0.1", + "@endo/compartment-mapper": "^1.0.1", + "@endo/far": "^1.0.1", + "@endo/init": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/nat": "^5.0.1", + "@endo/patterns": "^1.0.1", + "@endo/promise-kit": "^1.0.1", "@iarna/toml": "^2.2.3", "anylogger": "^0.21.0", "chalk": "^5.2.0", diff --git a/packages/assert/package.json b/packages/assert/package.json index f95a9635516..9879e5d6c33 100755 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -18,7 +18,7 @@ "lint:types": "tsc" }, "devDependencies": { - "@endo/init": "^0.5.59", + "@endo/init": "^1.0.1", "ava": "^5.3.0" }, "ava": { diff --git a/packages/base-zone/package.json b/packages/base-zone/package.json index 5173dd415d6..58238e29e43 100644 --- a/packages/base-zone/package.json +++ b/packages/base-zone/package.json @@ -27,13 +27,13 @@ "license": "Apache-2.0", "dependencies": { "@agoric/store": "^0.9.2", - "@endo/exo": "^0.2.5", - "@endo/far": "^0.2.21", - "@endo/pass-style": "^0.1.6", - "@endo/patterns": "^0.2.5" + "@endo/exo": "^1.0.1", + "@endo/far": "^1.0.1", + "@endo/pass-style": "^1.0.1", + "@endo/patterns": "^1.0.1" }, "devDependencies": { - "@endo/init": "^0.5.59", + "@endo/init": "^1.0.1", "ava": "^5.3.0" }, "publishConfig": { diff --git a/packages/benchmark/package.json b/packages/benchmark/package.json index d0ac7f9484d..f50276be471 100644 --- a/packages/benchmark/package.json +++ b/packages/benchmark/package.json @@ -29,7 +29,7 @@ "@agoric/inter-protocol": "^0.16.1", "@agoric/vats": "^0.15.1", "@agoric/zoe": "^0.26.2", - "@endo/init": "^0.5.59" + "@endo/init": "^1.0.1" }, "devDependencies": {}, "files": [ diff --git a/packages/boot/package.json b/packages/boot/package.json index 8c0e269bf9a..04057d845e7 100644 --- a/packages/boot/package.json +++ b/packages/boot/package.json @@ -33,14 +33,14 @@ "@agoric/vats": "^0.15.1", "@agoric/vm-config": "^0.1.0", "@agoric/zoe": "^0.26.2", - "@endo/marshal": "^0.8.8", - "@endo/bundle-source": "^2.7.0", - "@endo/captp": "^3.1.4", - "@endo/eventual-send": "^0.17.5", - "@endo/init": "^0.5.59", - "@endo/far": "^0.2.21", - "@endo/promise-kit": "^0.2.59", - "@endo/stream": "^0.3.28", + "@endo/marshal": "^1.0.1", + "@endo/bundle-source": "^3.0.1", + "@endo/captp": "^4.0.1", + "@endo/eventual-send": "^1.0.1", + "@endo/init": "^1.0.1", + "@endo/far": "^1.0.1", + "@endo/promise-kit": "^1.0.1", + "@endo/stream": "^1.0.1", "import-meta-resolve": "^2.2.1" }, "devDependencies": { diff --git a/packages/builders/package.json b/packages/builders/package.json index c4960efe864..8c125767897 100644 --- a/packages/builders/package.json +++ b/packages/builders/package.json @@ -32,14 +32,14 @@ "@agoric/vat-data": "^0.5.2", "@agoric/vats": "^0.15.1", "@agoric/zoe": "^0.26.2", - "@endo/bundle-source": "^2.7.0", - "@endo/captp": "^3.1.4", - "@endo/eventual-send": "^0.17.5", - "@endo/far": "^0.2.21", - "@endo/init": "^0.5.59", - "@endo/marshal": "^0.8.8", - "@endo/promise-kit": "^0.2.59", - "@endo/stream": "^0.3.28", + "@endo/bundle-source": "^3.0.1", + "@endo/captp": "^4.0.1", + "@endo/eventual-send": "^1.0.1", + "@endo/far": "^1.0.1", + "@endo/init": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/promise-kit": "^1.0.1", + "@endo/stream": "^1.0.1", "import-meta-resolve": "^2.2.1" }, "devDependencies": { diff --git a/packages/cache/package.json b/packages/cache/package.json index d17b2632aff..284520d970b 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -23,8 +23,8 @@ "@agoric/notifier": "^0.6.2", "@agoric/store": "^0.9.2", "@agoric/vat-data": "^0.5.2", - "@endo/far": "^0.2.21", - "@endo/marshal": "^0.8.8" + "@endo/far": "^1.0.1", + "@endo/marshal": "^1.0.1" }, "devDependencies": { "@agoric/zoe": "^0.26.2", diff --git a/packages/casting/package.json b/packages/casting/package.json index f62939568ce..49b4d639518 100644 --- a/packages/casting/package.json +++ b/packages/casting/package.json @@ -30,16 +30,16 @@ "@cosmjs/proto-signing": "^0.30.1", "@cosmjs/stargate": "^0.30.1", "@cosmjs/tendermint-rpc": "^0.30.1", - "@endo/far": "^0.2.21", - "@endo/init": "^0.5.59", - "@endo/lockdown": "^0.1.31", - "@endo/marshal": "^0.8.8", - "@endo/promise-kit": "^0.2.59", + "@endo/far": "^1.0.1", + "@endo/init": "^1.0.1", + "@endo/lockdown": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/promise-kit": "^1.0.1", "node-fetch": "^2.6.0" }, "devDependencies": { "@agoric/cosmic-proto": "^0.3.0", - "@endo/ses-ava": "^0.2.43", + "@endo/ses-ava": "^1.0.1", "@types/node-fetch": "^2.6.2", "ava": "^5.3.0", "c8": "^7.13.0", diff --git a/packages/cosmic-swingset/package.json b/packages/cosmic-swingset/package.json index 627156322c2..ae8f557f1d5 100644 --- a/packages/cosmic-swingset/package.json +++ b/packages/cosmic-swingset/package.json @@ -32,13 +32,13 @@ "@agoric/swingset-vat": "^0.32.2", "@agoric/telemetry": "^0.6.2", "@agoric/vm-config": "^0.1.0", - "@endo/bundle-source": "^2.7.0", - "@endo/far": "^0.2.21", - "@endo/import-bundle": "^0.4.1", - "@endo/init": "^0.5.59", - "@endo/marshal": "^0.8.8", - "@endo/nat": "^4.1.30", - "@endo/promise-kit": "^0.2.59", + "@endo/bundle-source": "^3.0.1", + "@endo/far": "^1.0.1", + "@endo/import-bundle": "^1.0.1", + "@endo/init": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/nat": "^5.0.1", + "@endo/promise-kit": "^1.0.1", "@iarna/toml": "^2.2.3", "@opentelemetry/sdk-metrics": "~1.9.0", "@opentelemetry/api": "~1.3.0", diff --git a/packages/deploy-script-support/package.json b/packages/deploy-script-support/package.json index 5dcd55eafb3..5cb257d78d4 100644 --- a/packages/deploy-script-support/package.json +++ b/packages/deploy-script-support/package.json @@ -42,17 +42,17 @@ "@agoric/store": "^0.9.2", "@agoric/time": "^0.3.2", "@agoric/zoe": "^0.26.2", - "@endo/base64": "^0.2.34", - "@endo/bundle-source": "^2.7.0", - "@endo/far": "^0.2.21", - "@endo/marshal": "^0.8.8", - "@endo/nat": "^4.1.30", - "@endo/promise-kit": "^0.2.59", - "@endo/zip": "^0.2.34" + "@endo/base64": "^1.0.0", + "@endo/bundle-source": "^3.0.1", + "@endo/far": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/nat": "^5.0.1", + "@endo/promise-kit": "^1.0.1", + "@endo/zip": "^1.0.0" }, "devDependencies": { "@agoric/vats": "^0.15.1", - "@endo/init": "^0.5.59", + "@endo/init": "^1.0.1", "ava": "^5.3.0", "import-meta-resolve": "^2.2.1" }, diff --git a/packages/deployment/package.json b/packages/deployment/package.json index 002bc92c6a6..abd4f5eaebd 100644 --- a/packages/deployment/package.json +++ b/packages/deployment/package.json @@ -20,8 +20,8 @@ "license": "Apache-2.0", "dependencies": { "@agoric/assert": "^0.6.0", - "@endo/init": "^0.5.59", - "@endo/marshal": "^0.8.8", + "@endo/init": "^1.0.1", + "@endo/marshal": "^1.0.1", "better-sqlite3": "^9.1.1", "chalk": "^5.2.0", "deterministic-json": "^1.0.5", diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index 2e735eb6f8a..a45c8368f6b 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -25,7 +25,7 @@ "eslint-config.*" ], "peerDependencies": { - "@endo/eslint-plugin": "^0.5.1", + "@endo/eslint-plugin": "^2.0.0", "@jessie.js/eslint-plugin": "^0.4.0", "@typescript-eslint/eslint-plugin": "^6.13.2", "@typescript-eslint/parser": "^6.13.2", diff --git a/packages/governance/package.json b/packages/governance/package.json index 0da53fc5ab0..f45e3d6bd57 100644 --- a/packages/governance/package.json +++ b/packages/governance/package.json @@ -40,19 +40,19 @@ "@agoric/time": "^0.3.2", "@agoric/vat-data": "^0.5.2", "@agoric/zoe": "^0.26.2", - "@endo/bundle-source": "^2.7.0", - "@endo/captp": "^3.1.4", - "@endo/eventual-send": "^0.17.5", - "@endo/far": "^0.2.21", - "@endo/marshal": "^0.8.8", - "@endo/nat": "^4.1.30", - "@endo/promise-kit": "^0.2.59", + "@endo/bundle-source": "^3.0.1", + "@endo/captp": "^4.0.1", + "@endo/eventual-send": "^1.0.1", + "@endo/far": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/nat": "^5.0.1", + "@endo/promise-kit": "^1.0.1", "import-meta-resolve": "^2.2.1" }, "devDependencies": { "@agoric/swingset-vat": "^0.32.2", - "@endo/bundle-source": "^2.7.0", - "@endo/init": "^0.5.59", + "@endo/bundle-source": "^3.0.1", + "@endo/init": "^1.0.1", "ava": "^5.3.0", "c8": "^7.13.0" }, diff --git a/packages/inter-protocol/package.json b/packages/inter-protocol/package.json index 5d88e536104..722259a384c 100644 --- a/packages/inter-protocol/package.json +++ b/packages/inter-protocol/package.json @@ -41,12 +41,12 @@ "@agoric/vat-data": "^0.5.2", "@agoric/vats": "^0.15.1", "@agoric/zoe": "^0.26.2", - "@endo/captp": "^3.1.4", - "@endo/eventual-send": "^0.17.5", - "@endo/far": "^0.2.21", - "@endo/marshal": "^0.8.8", - "@endo/nat": "^4.1.30", - "@endo/promise-kit": "^0.2.59", + "@endo/captp": "^4.0.1", + "@endo/eventual-send": "^1.0.1", + "@endo/far": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/nat": "^5.0.1", + "@endo/promise-kit": "^1.0.1", "jessie.js": "^0.3.2" }, "devDependencies": { @@ -54,9 +54,9 @@ "@agoric/swingset-liveslots": "^0.10.2", "@agoric/swingset-vat": "^0.32.2", "@agoric/zone": "^0.2.2", - "@endo/bundle-source": "^2.7.0", - "@endo/init": "^0.5.59", - "@endo/promise-kit": "^0.2.59", + "@endo/bundle-source": "^3.0.1", + "@endo/init": "^1.0.1", + "@endo/promise-kit": "^1.0.1", "@fast-check/ava": "^1.1.5", "ava": "^5.3.0", "c8": "^7.13.0", diff --git a/packages/internal/package.json b/packages/internal/package.json index c4cef0a9aa5..96cfe7c9344 100755 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -22,17 +22,17 @@ "dependencies": { "@agoric/assert": "^0.6.0", "@agoric/base-zone": "^0.1.0", - "@endo/far": "^0.2.21", - "@endo/init": "^0.5.59", - "@endo/marshal": "^0.8.8", - "@endo/patterns": "^0.2.5", - "@endo/promise-kit": "^0.2.59", - "@endo/stream": "^0.3.28", + "@endo/far": "^1.0.1", + "@endo/init": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/patterns": "^1.0.1", + "@endo/promise-kit": "^1.0.1", + "@endo/stream": "^1.0.1", "anylogger": "^0.21.0", "jessie.js": "^0.3.2" }, "devDependencies": { - "@endo/init": "^0.5.59", + "@endo/init": "^1.0.1", "ava": "^5.3.0", "tsd": "^0.28.1" }, diff --git a/packages/kmarshal/package.json b/packages/kmarshal/package.json index 493c73f7443..d6b6df75c9d 100644 --- a/packages/kmarshal/package.json +++ b/packages/kmarshal/package.json @@ -21,8 +21,8 @@ "lint:eslint": "eslint ." }, "dependencies": { - "@endo/far": "^0.2.21", - "@endo/marshal": "^0.8.8", + "@endo/far": "^1.0.1", + "@endo/marshal": "^1.0.1", "@agoric/assert": "^0.6.0" }, "devDependencies": { diff --git a/packages/network/package.json b/packages/network/package.json index 5c19fcd9a29..77ba45d0d4a 100644 --- a/packages/network/package.json +++ b/packages/network/package.json @@ -24,13 +24,13 @@ "@agoric/assert": "^0.6.0", "@agoric/internal": "^0.3.2", "@agoric/store": "^0.9.2", - "@endo/base64": "^0.2.34", - "@endo/far": "^0.2.21", - "@endo/promise-kit": "^0.2.59" + "@endo/base64": "^1.0.0", + "@endo/far": "^1.0.1", + "@endo/promise-kit": "^1.0.1" }, "devDependencies": { "@agoric/swingset-vat": "^0.32.2", - "@endo/bundle-source": "^2.7.0", + "@endo/bundle-source": "^3.0.1", "ava": "^5.3.0", "c8": "^7.13.0" }, diff --git a/packages/notifier/package.json b/packages/notifier/package.json index 29fd48e5533..cd3b0afa617 100644 --- a/packages/notifier/package.json +++ b/packages/notifier/package.json @@ -36,18 +36,18 @@ "@agoric/assert": "^0.6.0", "@agoric/internal": "^0.3.2", "@agoric/vat-data": "^0.5.2", - "@endo/far": "^0.2.21", - "@endo/marshal": "^0.8.8", - "@endo/patterns": "^0.2.5", - "@endo/promise-kit": "^0.2.59" + "@endo/far": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/patterns": "^1.0.1", + "@endo/promise-kit": "^1.0.1" }, "devDependencies": { "@agoric/kmarshal": "^0.1.0", "@agoric/swingset-liveslots": "^0.10.2", "@agoric/swing-store": "^0.9.1", "@agoric/swingset-vat": "^0.32.2", - "@endo/init": "^0.5.59", - "@endo/ses-ava": "^0.2.43", + "@endo/init": "^1.0.1", + "@endo/ses-ava": "^1.0.1", "ava": "^5.3.0", "c8": "^7.13.0" }, diff --git a/packages/pegasus/package.json b/packages/pegasus/package.json index 4d8d6be1ef3..04dd7bcf4b1 100644 --- a/packages/pegasus/package.json +++ b/packages/pegasus/package.json @@ -37,12 +37,12 @@ "@agoric/swingset-vat": "^0.32.2", "@agoric/vats": "^0.15.1", "@agoric/zoe": "^0.26.2", - "@endo/bundle-source": "^2.7.0", - "@endo/captp": "^3.1.4", - "@endo/far": "^0.2.21", - "@endo/init": "^0.5.59", - "@endo/nat": "^4.1.30", - "@endo/promise-kit": "^0.2.59" + "@endo/bundle-source": "^3.0.1", + "@endo/captp": "^4.0.1", + "@endo/far": "^1.0.1", + "@endo/init": "^1.0.1", + "@endo/nat": "^5.0.1", + "@endo/promise-kit": "^1.0.1" }, "devDependencies": { "ava": "^5.3.0", diff --git a/packages/same-structure/package.json b/packages/same-structure/package.json index ed9f85b2692..ce1a9c640cb 100644 --- a/packages/same-structure/package.json +++ b/packages/same-structure/package.json @@ -32,7 +32,7 @@ "dependencies": { "@agoric/assert": "^0.6.0", "@agoric/store": "^0.9.2", - "@endo/marshal": "^0.8.8" + "@endo/marshal": "^1.0.1" }, "files": [ "*.js", diff --git a/packages/smart-wallet/package.json b/packages/smart-wallet/package.json index daf497575d3..35a30427ac9 100644 --- a/packages/smart-wallet/package.json +++ b/packages/smart-wallet/package.json @@ -18,9 +18,9 @@ "devDependencies": { "@agoric/cosmic-proto": "^0.3.0", "@agoric/swingset-vat": "^0.32.2", - "@endo/bundle-source": "^2.7.0", - "@endo/captp": "^3.1.4", - "@endo/init": "^0.5.59", + "@endo/bundle-source": "^3.0.1", + "@endo/captp": "^4.0.1", + "@endo/init": "^1.0.1", "ava": "^5.3.0", "import-meta-resolve": "^2.2.1" }, @@ -34,11 +34,11 @@ "@agoric/vat-data": "^0.5.2", "@agoric/vats": "^0.15.1", "@agoric/zoe": "^0.26.2", - "@endo/eventual-send": "^0.17.5", - "@endo/far": "^0.2.21", - "@endo/marshal": "^0.8.8", - "@endo/nat": "^4.1.30", - "@endo/promise-kit": "^0.2.59" + "@endo/eventual-send": "^1.0.1", + "@endo/far": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/nat": "^5.0.1", + "@endo/promise-kit": "^1.0.1" }, "files": [ "src/" diff --git a/packages/solo/package.json b/packages/solo/package.json index 5ae8cdfcbd3..549cdb0222d 100644 --- a/packages/solo/package.json +++ b/packages/solo/package.json @@ -36,12 +36,12 @@ "@agoric/time": "^0.3.2", "@agoric/vats": "^0.15.1", "@agoric/wallet": "^0.18.3", - "@endo/captp": "^3.1.4", - "@endo/eventual-send": "^0.17.5", - "@endo/import-bundle": "^0.4.1", - "@endo/init": "^0.5.59", - "@endo/marshal": "^0.8.8", - "@endo/promise-kit": "^0.2.59", + "@endo/captp": "^4.0.1", + "@endo/eventual-send": "^1.0.1", + "@endo/import-bundle": "^1.0.1", + "@endo/init": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/promise-kit": "^1.0.1", "anylogger": "^0.21.0", "deterministic-json": "^1.0.5", "esm": "agoric-labs/esm#Agoric-built", @@ -57,7 +57,7 @@ }, "devDependencies": { "@agoric/ertp": "^0.16.2", - "@endo/bundle-source": "^2.7.0", + "@endo/bundle-source": "^3.0.1", "ava": "^5.3.0", "c8": "^7.13.0" }, diff --git a/packages/spawner/package.json b/packages/spawner/package.json index 5cbf00cfe7a..debb0bda259 100644 --- a/packages/spawner/package.json +++ b/packages/spawner/package.json @@ -32,15 +32,15 @@ "homepage": "https://github.com/Agoric/agoric-sdk#readme", "dependencies": { "@agoric/assert": "^0.6.0", - "@endo/eventual-send": "^0.17.5", - "@endo/import-bundle": "^0.4.1", - "@endo/marshal": "^0.8.8" + "@endo/eventual-send": "^1.0.1", + "@endo/import-bundle": "^1.0.1", + "@endo/marshal": "^1.0.1" }, "devDependencies": { "@agoric/internal": "^0.3.2", "@agoric/swingset-vat": "^0.32.2", - "@endo/bundle-source": "^2.7.0", - "@endo/init": "^0.5.59", + "@endo/bundle-source": "^3.0.1", + "@endo/init": "^1.0.1", "ava": "^5.3.0", "c8": "^7.13.0" }, diff --git a/packages/store/package.json b/packages/store/package.json index 70bb4e127b7..325429b7683 100644 --- a/packages/store/package.json +++ b/packages/store/package.json @@ -31,15 +31,15 @@ "homepage": "https://github.com/Agoric/agoric-sdk#readme", "dependencies": { "@agoric/assert": "^0.6.0", - "@endo/exo": "^0.2.5", - "@endo/marshal": "^0.8.8", - "@endo/pass-style": "^0.1.6", - "@endo/patterns": "^0.2.5" + "@endo/exo": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/pass-style": "^1.0.1", + "@endo/patterns": "^1.0.1" }, "devDependencies": { "@agoric/time": "^0.3.2", - "@endo/init": "^0.5.59", - "@endo/ses-ava": "^0.2.43", + "@endo/init": "^1.0.1", + "@endo/ses-ava": "^1.0.1", "ava": "^5.3.0" }, "files": [ diff --git a/packages/swing-store/package.json b/packages/swing-store/package.json index a31d11ed1a4..62b8a415c22 100644 --- a/packages/swing-store/package.json +++ b/packages/swing-store/package.json @@ -23,14 +23,14 @@ "dependencies": { "@agoric/assert": "^0.6.0", "@agoric/internal": "^0.3.2", - "@endo/base64": "^0.2.34", - "@endo/bundle-source": "^2.7.0", - "@endo/check-bundle": "^0.2.21", - "@endo/nat": "^4.1.30", + "@endo/base64": "^1.0.0", + "@endo/bundle-source": "^3.0.1", + "@endo/check-bundle": "^1.0.1", + "@endo/nat": "^5.0.1", "better-sqlite3": "^9.1.1" }, "devDependencies": { - "@endo/init": "^0.5.59", + "@endo/init": "^1.0.1", "@types/better-sqlite3": "^7.5.0", "ava": "^5.3.0", "c8": "^7.13.0", diff --git a/packages/swingset-liveslots/package.json b/packages/swingset-liveslots/package.json index 732f6413c68..95b92fcac99 100644 --- a/packages/swingset-liveslots/package.json +++ b/packages/swingset-liveslots/package.json @@ -20,15 +20,15 @@ "@agoric/assert": "^0.6.0", "@agoric/internal": "^0.3.2", "@agoric/store": "^0.9.2", - "@endo/eventual-send": "^0.17.5", - "@endo/exo": "^0.2.5", - "@endo/far": "^0.2.21", - "@endo/init": "^0.5.59", - "@endo/marshal": "^0.8.8", - "@endo/nat": "^4.1.30", - "@endo/pass-style": "^0.1.6", - "@endo/patterns": "^0.2.5", - "@endo/promise-kit": "^0.2.59" + "@endo/eventual-send": "^1.0.1", + "@endo/exo": "^1.0.1", + "@endo/far": "^1.0.1", + "@endo/init": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/nat": "^5.0.1", + "@endo/pass-style": "^1.0.1", + "@endo/patterns": "^1.0.1", + "@endo/promise-kit": "^1.0.1" }, "devDependencies": { "ava": "^5.3.0", diff --git a/packages/swingset-runner/package.json b/packages/swingset-runner/package.json index 304eb4b9631..539677ea037 100644 --- a/packages/swingset-runner/package.json +++ b/packages/swingset-runner/package.json @@ -32,11 +32,11 @@ "@agoric/telemetry": "^0.6.2", "@agoric/vat-data": "^0.5.2", "@agoric/zoe": "^0.26.2", - "@endo/bundle-source": "^2.7.0", - "@endo/eventual-send": "^0.17.5", - "@endo/init": "^0.5.59", - "@endo/marshal": "^0.8.8", - "@endo/nat": "^4.1.30", + "@endo/bundle-source": "^3.0.1", + "@endo/eventual-send": "^1.0.1", + "@endo/init": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/nat": "^5.0.1", "expose-gc": "^1.0.0", "n-readlines": "^1.0.1", "yargs": "^16.1.0" diff --git a/packages/swingset-xsnap-supervisor/package.json b/packages/swingset-xsnap-supervisor/package.json index e6079c68005..52844c5d14c 100644 --- a/packages/swingset-xsnap-supervisor/package.json +++ b/packages/swingset-xsnap-supervisor/package.json @@ -25,10 +25,10 @@ "devDependencies": { "@agoric/assert": "^0.6.0", "@agoric/swingset-liveslots": "^0.10.2", - "@endo/bundle-source": "^2.7.0", - "@endo/import-bundle": "^0.4.1", - "@endo/init": "^0.5.59", - "@endo/marshal": "^0.8.8", + "@endo/bundle-source": "^3.0.1", + "@endo/import-bundle": "^1.0.1", + "@endo/init": "^1.0.1", + "@endo/marshal": "^1.0.1", "ava": "^5.3.0", "c8": "^7.13.0" }, diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 84f7421c3ea..d3167cd771e 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -25,9 +25,9 @@ "@agoric/assert": "^0.6.0", "@agoric/internal": "^0.3.2", "@agoric/store": "^0.9.2", - "@endo/init": "^0.5.59", - "@endo/marshal": "^0.8.8", - "@endo/stream": "^0.3.28", + "@endo/init": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/stream": "^1.0.1", "@opentelemetry/api": "~1.3.0", "@opentelemetry/exporter-prometheus": "~0.35.0", "@opentelemetry/exporter-trace-otlp-http": "~0.35.0", @@ -41,8 +41,8 @@ "tmp": "^0.2.1" }, "devDependencies": { - "@endo/lockdown": "^0.1.31", - "@endo/ses-ava": "^0.2.43", + "@endo/lockdown": "^1.0.1", + "@endo/ses-ava": "^1.0.1", "ava": "^5.3.0", "c8": "^7.13.0", "tmp": "^0.2.1" diff --git a/packages/time/package.json b/packages/time/package.json index c44b6b2879d..f178de72213 100644 --- a/packages/time/package.json +++ b/packages/time/package.json @@ -32,12 +32,12 @@ "homepage": "https://github.com/Agoric/agoric-sdk#readme", "dependencies": { "@agoric/assert": "^0.6.0", - "@endo/nat": "^4.1.30", - "@endo/patterns": "^0.2.5" + "@endo/nat": "^5.0.1", + "@endo/patterns": "^1.0.1" }, "devDependencies": { - "@endo/far": "^0.2.21", - "@endo/init": "^0.5.59", + "@endo/far": "^1.0.1", + "@endo/init": "^1.0.1", "ava": "^5.3.0" }, "ava": { diff --git a/packages/vat-data/package.json b/packages/vat-data/package.json index b159e6c535f..790241a64e7 100644 --- a/packages/vat-data/package.json +++ b/packages/vat-data/package.json @@ -25,8 +25,8 @@ "@agoric/swingset-liveslots": "^0.10.2" }, "devDependencies": { - "@endo/init": "^0.5.59", - "@endo/ses-ava": "^0.2.43", + "@endo/init": "^1.0.1", + "@endo/ses-ava": "^1.0.1", "ava": "^5.3.0", "tsd": "^0.28.1" }, diff --git a/packages/vats/package.json b/packages/vats/package.json index 856e4d2af3f..7559949ca84 100644 --- a/packages/vats/package.json +++ b/packages/vats/package.json @@ -34,19 +34,19 @@ "@agoric/vat-data": "^0.5.2", "@agoric/zoe": "^0.26.2", "@agoric/zone": "^0.2.2", - "@endo/far": "^0.2.21", - "@endo/import-bundle": "^0.4.1", - "@endo/marshal": "^0.8.8", - "@endo/nat": "^4.1.30", - "@endo/patterns": "^0.2.5", - "@endo/promise-kit": "^0.2.59", + "@endo/far": "^1.0.1", + "@endo/import-bundle": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/nat": "^5.0.1", + "@endo/patterns": "^1.0.1", + "@endo/promise-kit": "^1.0.1", "import-meta-resolve": "^2.2.1", "jessie.js": "^0.3.2" }, "devDependencies": { "@agoric/swingset-liveslots": "^0.10.2", - "@endo/bundle-source": "^2.7.0", - "@endo/init": "^0.5.59", + "@endo/bundle-source": "^3.0.1", + "@endo/init": "^1.0.1", "ava": "^5.3.0", "c8": "^7.13.0" }, diff --git a/packages/wallet/api/package.json b/packages/wallet/api/package.json index dd26dd1f304..ef6bf4dc4d3 100644 --- a/packages/wallet/api/package.json +++ b/packages/wallet/api/package.json @@ -15,9 +15,9 @@ }, "devDependencies": { "@agoric/vats": "^0.15.1", - "@endo/bundle-source": "^2.7.0", - "@endo/far": "^0.2.21", - "@endo/init": "^0.5.59", + "@endo/bundle-source": "^3.0.1", + "@endo/far": "^1.0.1", + "@endo/init": "^1.0.1", "ava": "^5.3.0" }, "dependencies": { @@ -32,10 +32,10 @@ "@agoric/vat-data": "^0.5.2", "@agoric/zoe": "^0.26.2", "@agoric/zone": "^0.2.2", - "@endo/eventual-send": "^0.17.5", - "@endo/marshal": "^0.8.8", - "@endo/nat": "^4.1.30", - "@endo/promise-kit": "^0.2.59", + "@endo/eventual-send": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/nat": "^5.0.1", + "@endo/promise-kit": "^1.0.1", "import-meta-resolve": "^2.2.1" }, "keywords": [], diff --git a/packages/xsnap-lockdown/package.json b/packages/xsnap-lockdown/package.json index 64363050569..82fcd39759a 100644 --- a/packages/xsnap-lockdown/package.json +++ b/packages/xsnap-lockdown/package.json @@ -20,8 +20,8 @@ "test:xs": "exit 0" }, "devDependencies": { - "@endo/bundle-source": "^2.7.0", - "@endo/init": "^0.5.59", + "@endo/bundle-source": "^3.0.1", + "@endo/init": "^1.0.1", "ava": "^5.3.0", "c8": "^7.13.0", "rollup": "^2.58.0", diff --git a/packages/xsnap/package.json b/packages/xsnap/package.json index 7ddf446a626..1f40ca56231 100644 --- a/packages/xsnap/package.json +++ b/packages/xsnap/package.json @@ -30,18 +30,18 @@ "@agoric/assert": "^0.6.0", "@agoric/internal": "^0.3.2", "@agoric/xsnap-lockdown": "^0.14.0", - "@endo/bundle-source": "^2.7.0", - "@endo/eventual-send": "^0.17.5", - "@endo/init": "^0.5.59", - "@endo/netstring": "^0.3.29", - "@endo/promise-kit": "^0.2.59", - "@endo/stream": "^0.3.28", - "@endo/stream-node": "^0.2.29", + "@endo/bundle-source": "^3.0.1", + "@endo/eventual-send": "^1.0.1", + "@endo/init": "^1.0.1", + "@endo/netstring": "^1.0.1", + "@endo/promise-kit": "^1.0.1", + "@endo/stream": "^1.0.1", + "@endo/stream-node": "^1.0.1", "glob": "^7.1.6", "tmp": "^0.2.1" }, "devDependencies": { - "@endo/base64": "^0.2.34", + "@endo/base64": "^1.0.0", "@types/glob": "^8.1.0", "ava": "^5.3.0", "c8": "^7.13.0" diff --git a/packages/zoe/package.json b/packages/zoe/package.json index 343581b73ef..f9a488bf0f8 100644 --- a/packages/zoe/package.json +++ b/packages/zoe/package.json @@ -52,19 +52,19 @@ "@agoric/swingset-vat": "^0.32.2", "@agoric/time": "^0.3.2", "@agoric/vat-data": "^0.5.2", - "@endo/bundle-source": "^2.7.0", - "@endo/captp": "^3.1.4", - "@endo/eventual-send": "^0.17.5", - "@endo/far": "^0.2.21", - "@endo/import-bundle": "^0.4.1", - "@endo/marshal": "^0.8.8", - "@endo/nat": "^4.1.30", - "@endo/patterns": "^0.2.5", - "@endo/promise-kit": "^0.2.59", + "@endo/bundle-source": "^3.0.1", + "@endo/captp": "^4.0.1", + "@endo/eventual-send": "^1.0.1", + "@endo/far": "^1.0.1", + "@endo/import-bundle": "^1.0.1", + "@endo/marshal": "^1.0.1", + "@endo/nat": "^5.0.1", + "@endo/patterns": "^1.0.1", + "@endo/promise-kit": "^1.0.1", "yargs-parser": "^21.1.1" }, "devDependencies": { - "@endo/init": "^0.5.59", + "@endo/init": "^1.0.1", "@agoric/kmarshal": "^0.1.0", "ava": "^5.3.0", "c8": "^7.13.0", diff --git a/packages/zone/package.json b/packages/zone/package.json index 8d5d53bc4d1..6dcbbebff19 100644 --- a/packages/zone/package.json +++ b/packages/zone/package.json @@ -29,12 +29,12 @@ "dependencies": { "@agoric/base-zone": "^0.1.0", "@agoric/vat-data": "^0.5.2", - "@endo/far": "^0.2.21", - "@endo/pass-style": "^0.1.6" + "@endo/far": "^1.0.1", + "@endo/pass-style": "^1.0.1" }, "devDependencies": { "@agoric/swingset-liveslots": "^0.10.2", - "@endo/patterns": "^0.2.5", + "@endo/patterns": "^1.0.1", "ava": "^5.3.0" }, "publishConfig": { From 055f68e691453d39fc6e5b395b971dff4694f00b Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Wed, 20 Dec 2023 13:34:37 -0800 Subject: [PATCH 13/21] chore: Update yarn.lock --- yarn.lock | 458 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 306 insertions(+), 152 deletions(-) diff --git a/yarn.lock b/yarn.lock index cac53b9aa08..4caa3acbe1a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,7 +7,7 @@ resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== -"@agoric/babel-generator@^7.17.4", "@agoric/babel-generator@^7.17.6": +"@agoric/babel-generator@^7.17.6": version "7.17.6" resolved "https://registry.yarnpkg.com/@agoric/babel-generator/-/babel-generator-7.17.6.tgz#75ff4629468a481d670b4154bcfade11af6de674" integrity sha512-D2wnk5fGajxMN5SCRSaA/triQGEaEX2Du0EzrRqobuD4wRXjvtF1e7jC1PPOk/RC2bZ8/0fzp0CHOiB7YLwb5w== @@ -28,6 +28,14 @@ dependencies: "@babel/highlight" "^7.18.6" +"@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" + integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== + dependencies: + "@babel/highlight" "^7.23.4" + chalk "^2.4.2" + "@babel/generator@^7.17.3": version "7.21.5" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.5.tgz#c0c0e5449504c7b7de8236d99338c3e2a340745f" @@ -38,11 +46,26 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" +"@babel/generator@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" + integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== + dependencies: + "@babel/types" "^7.23.6" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + jsesc "^2.5.1" + "@babel/helper-environment-visitor@^7.16.7": version "7.21.5" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz#c769afefd41d171836f7cb63e295bedf689d48ba" integrity sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ== +"@babel/helper-environment-visitor@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" + integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== + "@babel/helper-function-name@^7.16.7": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4" @@ -51,6 +74,14 @@ "@babel/template" "^7.20.7" "@babel/types" "^7.21.0" +"@babel/helper-function-name@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" + integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== + dependencies: + "@babel/template" "^7.22.15" + "@babel/types" "^7.23.0" + "@babel/helper-hoist-variables@^7.16.7": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" @@ -58,6 +89,13 @@ dependencies: "@babel/types" "^7.18.6" +"@babel/helper-hoist-variables@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" + integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== + dependencies: + "@babel/types" "^7.22.5" + "@babel/helper-split-export-declaration@^7.16.7": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" @@ -65,16 +103,33 @@ dependencies: "@babel/types" "^7.18.6" +"@babel/helper-split-export-declaration@^7.22.6": + version "7.22.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" + integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== + dependencies: + "@babel/types" "^7.22.5" + "@babel/helper-string-parser@^7.21.5": version "7.21.5" resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz#2b3eea65443c6bdc31c22d037c65f6d323b6b2bd" integrity sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w== +"@babel/helper-string-parser@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" + integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== + "@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== +"@babel/helper-validator-identifier@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" + integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== + "@babel/highlight@^7.18.6": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031" @@ -84,11 +139,25 @@ chalk "^2.0.0" js-tokens "^4.0.0" +"@babel/highlight@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b" + integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A== + dependencies: + "@babel/helper-validator-identifier" "^7.22.20" + chalk "^2.4.2" + js-tokens "^4.0.0" + "@babel/parser@^7.17.3", "@babel/parser@^7.20.7", "@babel/parser@^7.7.0": version "7.21.8" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.8.tgz#642af7d0333eab9c0ad70b14ac5e76dbde7bfdf8" integrity sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA== +"@babel/parser@^7.22.15", "@babel/parser@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b" + integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ== + "@babel/runtime@^7.20.7": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec" @@ -105,7 +174,32 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" -"@babel/traverse@^7.17.3", "@babel/traverse@^7.7.0": +"@babel/template@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" + integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== + dependencies: + "@babel/code-frame" "^7.22.13" + "@babel/parser" "^7.22.15" + "@babel/types" "^7.22.15" + +"@babel/traverse@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.6.tgz#b53526a2367a0dd6edc423637f3d2d0f2521abc5" + integrity sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ== + dependencies: + "@babel/code-frame" "^7.23.5" + "@babel/generator" "^7.23.6" + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-function-name" "^7.23.0" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/parser" "^7.23.6" + "@babel/types" "^7.23.6" + debug "^4.3.1" + globals "^11.1.0" + +"@babel/traverse@^7.7.0": version "7.17.3" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw== @@ -130,6 +224,15 @@ "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" +"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd" + integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg== + dependencies: + "@babel/helper-string-parser" "^7.23.4" + "@babel/helper-validator-identifier" "^7.22.20" + to-fast-properties "^2.0.0" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" @@ -370,97 +473,116 @@ resolved "https://registry.yarnpkg.com/@datadog/sketches-js/-/sketches-js-2.1.0.tgz#8c7e8028a5fc22ad102fa542b0a446c956830455" integrity sha512-smLocSfrt3s53H/XSVP3/1kP42oqvrkjUPtyaFd1F79ux24oE31BKt+q0c6lsa6hOYrFzsIwyc5GXAI5JmfOew== -"@endo/base64@^0.2.34", "@endo/base64@^0.2.35": - version "0.2.35" - resolved "https://registry.yarnpkg.com/@endo/base64/-/base64-0.2.35.tgz#7d18203d5807748388c935df7eb79c7672a0b64e" - integrity sha512-rsAicKvgNq/ar+9b3ElXRXglMiJcg1IErz3lx1HFYZUzfWp8r/Dibi3TEjYpSBmtOeYN9CeWH8CBluN0uFqdag== +"@endo/base64@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@endo/base64/-/base64-1.0.0.tgz#f44f0378fc960ab4e986b0452935f27d93726ca1" + integrity sha512-rd46CY2jk3oblrxpH7gC+xvnUIbCrN1geEb+IgKSx17WKcT0fPgrwFqnWnSzXCyJqIJ7xkeAUvEbilPQoZMxmg== -"@endo/bundle-source@^2.7.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@endo/bundle-source/-/bundle-source-2.8.0.tgz#56f25b3d9c74d3d0bede5c526647aaf02c0a8f94" - integrity sha512-nDiM3u/LKWq5xAnJ+zm35HC6kMKF3IG6Y5V0385slFHZVT8mXzRJ5ztEqRsVzvVeITfz3ZRFOaFer6v4V8Lkjg== - dependencies: - "@agoric/babel-generator" "^7.17.4" - "@babel/parser" "^7.17.3" - "@babel/traverse" "^7.17.3" - "@endo/base64" "^0.2.35" - "@endo/compartment-mapper" "^0.9.2" - "@endo/init" "^0.5.60" - "@endo/promise-kit" "^0.2.60" - "@endo/where" "^0.3.5" +"@endo/bundle-source@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@endo/bundle-source/-/bundle-source-3.0.1.tgz#416d3407aecbffcbbad442fcc75b9a5d69cde067" + integrity sha512-ff83avkRB+OHn2axJLu4JAM3EDp6KpMwBRM37u8ul6G9oeyf+Crmt1a7nvhREXXZtBiSNkFKrU8byi318LxYtQ== + dependencies: + "@endo/base64" "^1.0.0" + "@endo/compartment-mapper" "^1.0.1" + "@endo/evasive-transform" "^1.0.1" + "@endo/init" "^1.0.1" + "@endo/promise-kit" "^1.0.1" + "@endo/where" "^1.0.0" "@rollup/plugin-commonjs" "^19.0.0" "@rollup/plugin-node-resolve" "^13.0.0" acorn "^8.2.4" - jessie.js "^0.3.2" rollup "^2.79.1" - source-map "^0.7.3" -"@endo/captp@^3.1.4": - version "3.1.5" - resolved "https://registry.yarnpkg.com/@endo/captp/-/captp-3.1.5.tgz#4cf0eeedc4728e856bd3e71cfc42cba3ab02449c" - integrity sha512-uyhECyTQqZcxt31YzCQ+n2nKu1+YE1qCuH00FFmK2qKGdF92gkluTvmDHcgxJ6lsKl/QBkQcuch51GZqXDs+xQ== +"@endo/captp@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@endo/captp/-/captp-4.0.1.tgz#49274b7f59ef14fded61746f45a1c12484736f32" + integrity sha512-Hb5FaIOMJFJ+QAzcn0/2jPED+z6AQx0gmWGhDmg+M8ecjSrbe/8agV1sB+s80aytFrYGqRMS4T1vSdmUaiY5gQ== dependencies: - "@endo/eventual-send" "^0.17.6" - "@endo/marshal" "^0.8.9" - "@endo/nat" "^4.1.31" - "@endo/promise-kit" "^0.2.60" + "@endo/eventual-send" "^1.0.1" + "@endo/marshal" "^1.0.1" + "@endo/nat" "^5.0.1" + "@endo/promise-kit" "^1.0.1" -"@endo/check-bundle@^0.2.21": - version "0.2.22" - resolved "https://registry.yarnpkg.com/@endo/check-bundle/-/check-bundle-0.2.22.tgz#1a978e71401b61ce9e091ac6c6bfd037140263b8" - integrity sha512-xAIcx8PCnvpSRmaSqo0iA7AeIhHrx9er5fEoz/lnXxHNngYcGaPnzux5B57kLdcJs3lBNCIzaUuh4HRhCNpIJA== +"@endo/check-bundle@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/check-bundle/-/check-bundle-1.0.1.tgz#52c38896ee8b28377ab6e1070e60cada17e4214f" + integrity sha512-NgzFpLL4qUMRCVPVVrDn5PnwhQHk+TddVSIwchCEVG/pzFJa4iJNj1BvRxhjD38NUGsLI4/LFWIvJBydlGLvoA== dependencies: - "@endo/base64" "^0.2.35" - "@endo/compartment-mapper" "^0.9.2" + "@endo/base64" "^1.0.0" + "@endo/compartment-mapper" "^1.0.1" -"@endo/cjs-module-analyzer@^0.2.35": - version "0.2.35" - resolved "https://registry.yarnpkg.com/@endo/cjs-module-analyzer/-/cjs-module-analyzer-0.2.35.tgz#0de39d2306bba5671e121efa091bf6cb9990f11e" - integrity sha512-Ldr1auybH9AzrR/WV6bzP4aLRpv8CCl98mv0IAui4uQmmFOPOGchshyBfpiDF5XMKM6wh7z0VgmvmydQ5/7AHQ== +"@endo/cjs-module-analyzer@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@endo/cjs-module-analyzer/-/cjs-module-analyzer-1.0.0.tgz#69c3c415442931db04871ed0dedbc6246b2b540c" + integrity sha512-1D+GpkV7NPkgKKd1k7G3uRTn481loFLJfTxmouXedKza2VnB8QeZTODm5pYBIbr4y0hqYBxZ1DxWbb86wAR6IA== -"@endo/compartment-mapper@^0.9.1", "@endo/compartment-mapper@^0.9.2": - version "0.9.2" - resolved "https://registry.yarnpkg.com/@endo/compartment-mapper/-/compartment-mapper-0.9.2.tgz#48bfa610179cc5521c745c7b2d1eb5fab52ed29a" - integrity sha512-zsAyTf87zBsE1yZ2CBzEGhcGZGGv5m93/CXZHQhut53o4DWwhuS/WTQ4cBoVFSGKWz63JbbA/7qa4fcOnv5dDw== +"@endo/compartment-mapper@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/compartment-mapper/-/compartment-mapper-1.0.1.tgz#9241f09ed63827964d2000fdaf696412ec3d4d18" + integrity sha512-QpbyM9L2KiBm4MIQWkxfqNT17Vi9en+CXVJuFa0HIHfnCExug+oBZyvwfxXIsPBHKLMb37NYoaSLycrNcFzJYQ== dependencies: - "@endo/cjs-module-analyzer" "^0.2.35" - "@endo/static-module-record" "^0.8.2" - "@endo/zip" "^0.2.35" - ses "^0.18.8" + "@endo/cjs-module-analyzer" "^1.0.0" + "@endo/static-module-record" "^1.0.1" + "@endo/zip" "^1.0.0" + ses "^1.0.1" "@endo/env-options@^0.1.4": version "0.1.4" resolved "https://registry.yarnpkg.com/@endo/env-options/-/env-options-0.1.4.tgz#e516bc3864f00b154944e444fb8996a9a0c23a45" integrity sha512-Ol8ct0aW8VK1ZaqntnUJfrYT59P6Xn36XPbHzkqQhsYkpudKDn5ILYEwGmSO/Ff+XJjv/pReNI0lhOyyrDa9mg== -"@endo/eslint-plugin@^0.5.1": - version "0.5.2" - resolved "https://registry.yarnpkg.com/@endo/eslint-plugin/-/eslint-plugin-0.5.2.tgz#835d22e9ff17d9935f7f565e50a21ef07aa92ca2" - integrity sha512-WzQmzBXoGGm5vb2mX/Ho9dS5wSaajmeE2PnFqiBUwPQ5ml7B0T7/QwzV5MSAv1ClyzDt3t5j36ENWxeibb2C9Q== +"@endo/env-options@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/env-options/-/env-options-1.0.1.tgz#a6ad1951f3303426cd15956aa7b95ea06cb34ad0" + integrity sha512-5hieu6ow9Kgf2wKKchE1xQEN7VlKVLL3O0eEjxN9d52XodHMbEFu0gGoFA6NeQJq9SHNrbgJhZDfMkPaHvoFxg== + +"@endo/eslint-plugin@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@endo/eslint-plugin/-/eslint-plugin-2.0.0.tgz#53ce930b758016c62e187cf45e3f69563cd1a480" + integrity sha512-IyF42cjjy/SxBILpAXigvzDTA7PviOU4OzMKx4GLCdis2V3977mJ14td0U7yej2MqeQXDoUYtpBvbFpXtQQSGA== dependencies: "@typescript-eslint/utils" "^6.6.0" requireindex "~1.1.0" tsutils "~3.21.0" typescript "~5.2.2" -"@endo/eventual-send@^0.17.5", "@endo/eventual-send@^0.17.6": +"@endo/evasive-transform@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/evasive-transform/-/evasive-transform-1.0.1.tgz#4ce0e6ff58a8689c02f9ddb8d6be91c0b030df9c" + integrity sha512-MlXqLsMyBo+xBPKChEaq14sEraVM5eG8eRdkctSr+Cc+xFjcI6pr3IrG/lBLQgK8LbcmUjIFzmn64IUmtNYBBQ== + dependencies: + "@agoric/babel-generator" "^7.17.6" + "@babel/parser" "^7.23.6" + "@babel/traverse" "^7.23.6" + source-map "0.7.4" + +"@endo/eventual-send@^0.17.6": version "0.17.6" resolved "https://registry.yarnpkg.com/@endo/eventual-send/-/eventual-send-0.17.6.tgz#86719e4e3ff76991c49f6680309dc77dff65fe55" integrity sha512-73cKY2uiWdzMJn7i284NJyD3K0UKjpksBg/EA2GT8YJa0TgeBczFQIm81vC08itK5gHuDDH2vC5COSGR6hxKIg== dependencies: "@endo/env-options" "^0.1.4" -"@endo/exo@^0.2.5": - version "0.2.6" - resolved "https://registry.yarnpkg.com/@endo/exo/-/exo-0.2.6.tgz#09721063377981d4376b3cf8aa534dd0d49939dc" - integrity sha512-fk4EYdHRZectyLt0cn0aT8PIlb8BgE5ji6DD4AHJ9Q6TFrGr6RRV0aXs8xW9LAs7MIduz+j7vtpeURxugN8KvQ== +"@endo/eventual-send@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/eventual-send/-/eventual-send-1.0.1.tgz#a75b7529c926f648ae9ce5e4037146c27974c5f9" + integrity sha512-PLyNBvGNqZOKGluurj6ZzpdbHOf/MLJjWnnt/YB6h7hyJq0w7arXwb56ha4ywILCsxQO12Cc+ananyQUddHLBA== dependencies: - "@endo/env-options" "^0.1.4" - "@endo/far" "^0.2.22" - "@endo/pass-style" "^0.1.7" - "@endo/patterns" "^0.2.6" + "@endo/env-options" "^1.0.1" + +"@endo/exo@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/exo/-/exo-1.0.1.tgz#17a71221043d5b901c9ec20a56f8ca6f25c5def4" + integrity sha512-jLJGG/WGsdcYz5LVmh+Tu6uSrrYq3d2zfLQXcmepvE0MCTaVxQROTOE3s2G6QmZE2D5nKSJb/uHeSHVziPR0kw== + dependencies: + "@endo/env-options" "^1.0.1" + "@endo/eventual-send" "^1.0.1" + "@endo/far" "^1.0.1" + "@endo/pass-style" "^1.0.1" + "@endo/patterns" "^1.0.1" -"@endo/far@^0.2.21", "@endo/far@^0.2.22", "@endo/far@^0.2.3": +"@endo/far@^0.2.3": version "0.2.22" resolved "https://registry.yarnpkg.com/@endo/far/-/far-0.2.22.tgz#fda187289a903ee3f9d6dcc5664ee7fef1994b1f" integrity sha512-LFOicqyHslKOSk/H5EfGOcw347ftDSwYHARPasnrG4UJOEkcU1ZG5bN/BmfONtcidB776gWZKrV/tNl4WLIlyw== @@ -468,58 +590,67 @@ "@endo/eventual-send" "^0.17.6" "@endo/pass-style" "^0.1.7" -"@endo/import-bundle@^0.4.1": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@endo/import-bundle/-/import-bundle-0.4.2.tgz#de047f83aa22a7a3d94b0bbef4bcc5dff8b369cf" - integrity sha512-SF08JSa6qO6NEueFVeKW0+w9sfjPvXrJ9L2XrgAHIvvLy9H4qLJxk92G2lfaZSL/dyvovhERhb+An1c0j3rdRw== +"@endo/far@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/far/-/far-1.0.1.tgz#a709846f8f98b44c43cd1cdde3d4efc6b69ac22b" + integrity sha512-lem82jl2BU9YHbKhEYzJEKR+tRVthDXpAGF/WyXHCRYNkqN/kDuM2hMQTBflVeCxEw5e6MeZxiI8QReco3sTFA== dependencies: - "@endo/base64" "^0.2.35" - "@endo/compartment-mapper" "^0.9.2" - "@endo/where" "^0.3.5" - ses "^0.18.8" + "@endo/eventual-send" "^1.0.1" + "@endo/pass-style" "^1.0.1" -"@endo/init@^0.5.59", "@endo/init@^0.5.60": - version "0.5.60" - resolved "https://registry.yarnpkg.com/@endo/init/-/init-0.5.60.tgz#e78051b13cd4a04c72d5ec1d2a6011b7f987f7ff" - integrity sha512-AbAvs6Nk01fyJ+PaW0RzwemIWyomjzDf8ZEhVa3jCOhr8kBBsTnJdX0v7XkbZ/Y8NQxlrFaW0fPqlJK6aMWTlQ== +"@endo/import-bundle@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/import-bundle/-/import-bundle-1.0.1.tgz#b3e9035f84f82461956d675b2243181c7f1becb0" + integrity sha512-NwkzAj3AcZiXVeiwrGLiDuqJ0UbxFwm3/SNWTY0joSX9Sj0Wq+okour2vCMvKu3dIoyG1ujGa29S6npWI7JtJA== dependencies: - "@endo/base64" "^0.2.35" - "@endo/eventual-send" "^0.17.6" - "@endo/lockdown" "^0.1.32" - "@endo/promise-kit" "^0.2.60" + "@endo/base64" "^1.0.0" + "@endo/compartment-mapper" "^1.0.1" + "@endo/where" "^1.0.0" + ses "^1.0.1" -"@endo/lockdown@^0.1.31", "@endo/lockdown@^0.1.32": - version "0.1.32" - resolved "https://registry.yarnpkg.com/@endo/lockdown/-/lockdown-0.1.32.tgz#2d13a9ca336d5dce243a3cf919c543b55973153c" - integrity sha512-AN696XS3robsopxVg7gc/6c9TXPGosGmKfcM0g9SNnD1rqgo1EakS4wf7f3AbICU9iJdo0e4V5JjzWPnjqoR0g== +"@endo/init@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/init/-/init-1.0.1.tgz#e83d52f384089cdb3119d47cd778fe0d80e92a97" + integrity sha512-9JPCwiQU6wc5SC2jc10VLOV95FxqBUU+94SR2hghPDrJQQdQ6+Kic8d2DFzEH8vSIGpR9ibBTnAzFjmPfVuAxA== dependencies: - ses "^0.18.8" + "@endo/base64" "^1.0.0" + "@endo/eventual-send" "^1.0.1" + "@endo/lockdown" "^1.0.1" + "@endo/promise-kit" "^1.0.1" -"@endo/marshal@^0.8.8", "@endo/marshal@^0.8.9": - version "0.8.9" - resolved "https://registry.yarnpkg.com/@endo/marshal/-/marshal-0.8.9.tgz#f6fcaf23ecad828f6d086657f1d1590ea8ef3840" - integrity sha512-wzYlY5/JFzY/wAVxZ6h0BxlRaAS/9KKnhircKO/tGw5bZYHFvLeSeMCBZ4VCSZg5aNgDlhuvB0S6iCwS5MYqcg== +"@endo/lockdown@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/lockdown/-/lockdown-1.0.1.tgz#65809eb308902a97538155e4165e2f6da2285152" + integrity sha512-k3ZGZ3umUdlquqPFdEl5UbLLrl4nCcFuSpzJRG1J2zbUJVfYMFYzzc25b9Sq/PDO6trrOzQKWMBMp3dg83+KvA== dependencies: - "@endo/eventual-send" "^0.17.6" - "@endo/nat" "^4.1.31" - "@endo/pass-style" "^0.1.7" - "@endo/promise-kit" "^0.2.60" + ses "^1.0.1" -"@endo/nat@^4.1.30", "@endo/nat@^4.1.31": - version "4.1.31" - resolved "https://registry.yarnpkg.com/@endo/nat/-/nat-4.1.31.tgz#ca738f472481a572f47749b41529b3261ebb4c1e" - integrity sha512-tz0PnEmzX9BAtKEawYndsx+XC6f+2CKErtrpbpOuX3uct5VNLdw6q6cArSYtnHbxRHR0YaHUdeG0W6okmup4bg== +"@endo/marshal@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/marshal/-/marshal-1.0.1.tgz#5ed44fd7711aad71571a796d1945b66c7c222cd6" + integrity sha512-Yx0ErVKJmTsLrMUQF8RXu3Y0uYu778G9EA75uOBkzmeldlvEYJryKH9qOhMzKq2/ecoiiksZS/6wjCHOVCixxg== + dependencies: + "@endo/eventual-send" "^1.0.1" + "@endo/nat" "^5.0.1" + "@endo/pass-style" "^1.0.1" + "@endo/promise-kit" "^1.0.1" -"@endo/netstring@^0.3.29": - version "0.3.30" - resolved "https://registry.yarnpkg.com/@endo/netstring/-/netstring-0.3.30.tgz#ee0f29c4fc33674733833610129136435b56b044" - integrity sha512-Z3e2duj7Qumt+xm1RVQq/O74ORfM87WBXgBQyxIgTAxBT1o0qjR+BnPBWSyzWg4+JBtax0qgge8KiKpfoECa4g== +"@endo/nat@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@endo/nat/-/nat-5.0.1.tgz#ab21329764a32edbc492a51eb29443866ac26a39" + integrity sha512-L2ZY7om+mHS/a+DLCezanbIXUtLW//tnVPfbKa7m4UAgo+JsDRGF9WyyS8P77cYcP3aWVelbntiTt0rCd/grzQ== + +"@endo/netstring@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/netstring/-/netstring-1.0.1.tgz#75fd20bc777b0676e528a777d77fcbd8789760b7" + integrity sha512-aH5JuAlFWNDVUkKv9GsBcdeeu6ueCpqtHDZ/rkr9LEa4LK0OyAMizXnfu+HGTyQcH+NiqIwX98wxf4qpdKWV3w== dependencies: - "@endo/init" "^0.5.60" - "@endo/stream" "^0.3.29" - ses "^0.18.8" + "@endo/init" "^1.0.1" + "@endo/promise-kit" "^1.0.1" + "@endo/stream" "^1.0.1" + ses "^1.0.1" -"@endo/pass-style@^0.1.6", "@endo/pass-style@^0.1.7": +"@endo/pass-style@^0.1.7": version "0.1.7" resolved "https://registry.yarnpkg.com/@endo/pass-style/-/pass-style-0.1.7.tgz#ea22568e8b86fb2d1a14a5fc042374cc0d8e310b" integrity sha512-dlB62Ptjcy/+iachy7qzAdgIwaU60rE+XLummLRpE2tDSJF2jSFJlVwa/QuGw1KKO7Rt4vog/51sKev3EbJZQg== @@ -527,67 +658,83 @@ "@endo/promise-kit" "^0.2.60" "@fast-check/ava" "^1.1.5" -"@endo/patterns@^0.2.5", "@endo/patterns@^0.2.6": - version "0.2.6" - resolved "https://registry.yarnpkg.com/@endo/patterns/-/patterns-0.2.6.tgz#abbbc3743ee313ffc6167d783d5fc78de74125fe" - integrity sha512-FbayXMv9sY4qP5vSaPhq9RSJmsTykImbCy0FN1YmZzaChGwOfSPOJw4898xVLDK5Xi6f+6zV02uXjuMTuZt6UA== +"@endo/pass-style@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/pass-style/-/pass-style-1.0.1.tgz#2050c0754d6f0f8786f2e090712a82ad2c244011" + integrity sha512-oYu7A53eUcPGQ3aOJATMBQAUcn1eSwqsZVwnRP1InAKfgoOKrDY7zKM7j1xmbQWssmG6H7nJZaV6HiegFxm2cA== dependencies: - "@endo/eventual-send" "^0.17.6" - "@endo/marshal" "^0.8.9" - "@endo/promise-kit" "^0.2.60" + "@endo/eventual-send" "^1.0.1" + "@endo/promise-kit" "^1.0.1" + "@fast-check/ava" "^1.1.5" + +"@endo/patterns@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/patterns/-/patterns-1.0.1.tgz#fdf9acae5dd1528c28a90fba30841b6958e4d595" + integrity sha512-0DsLqtwdyJMYTM7nNP5Y6xqNvBs5i2TLzzF477dXR9EHW4wZOnq0ZdsxaWu0YodYkfroopMimBNQ3qSJ39Gu6g== + dependencies: + "@endo/eventual-send" "^1.0.1" + "@endo/marshal" "^1.0.1" + "@endo/promise-kit" "^1.0.1" -"@endo/promise-kit@^0.2.59", "@endo/promise-kit@^0.2.60": +"@endo/promise-kit@^0.2.60": version "0.2.60" resolved "https://registry.yarnpkg.com/@endo/promise-kit/-/promise-kit-0.2.60.tgz#8012ada06970c7eaf965cd856563b34a1790e163" integrity sha512-6Zp9BqBbc3ywaG+iLRrQRmO/VLKrMnvsbgOKKPMpjEC3sUlksYA09uaH3GrKZgoGChF8m9bXK8eFW39z7wJNUw== dependencies: ses "^0.18.8" -"@endo/ses-ava@^0.2.43": - version "0.2.44" - resolved "https://registry.yarnpkg.com/@endo/ses-ava/-/ses-ava-0.2.44.tgz#b97b0d5a457b30b73c74b19091d67840984cf47e" - integrity sha512-Pp0os/ZN7r0L94eCxWFYhSWt+DIdIASIVlY4oYCwMLxLa28cuswCjRQvPKLINBpZezogCKKptEWJTyHhGWpVQw== +"@endo/promise-kit@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/promise-kit/-/promise-kit-1.0.1.tgz#056c8cd59e52260fc4cea2a83422450333a04e26" + integrity sha512-JLhfkuQaERVvf+G+kXpDjyzyik3kxkX1FHbiDQfK2ge9Ltz7vRk/OD+yZma0UE2Rn91F2B/mvelxz1MxlYibwA== dependencies: - ses "^0.18.8" + ses "^1.0.1" -"@endo/static-module-record@^0.8.2": - version "0.8.2" - resolved "https://registry.yarnpkg.com/@endo/static-module-record/-/static-module-record-0.8.2.tgz#25f66d555d1a075e5258520405410fd01fc2d1f7" - integrity sha512-wHJLX/hU/MoSFvnFN9sZ/49DYPlbASHlVQrJszeKH3xIpBtl3SG4JdRswO6RQgLREQJD/HV/ZN5V8x2bCpMu4Q== +"@endo/ses-ava@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/ses-ava/-/ses-ava-1.0.1.tgz#b29ce458ab5e84894a8febc604e3473a86c5fc13" + integrity sha512-+oH+q99bOscoPBgN/c4SBCl2Ei1HMSfAGT7BgMCIdg+Ak8Sh/vOhzOWyHzaTIaX4aEI129kjdgZcbDssYgZj9A== + dependencies: + ses "^1.0.1" + +"@endo/static-module-record@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/static-module-record/-/static-module-record-1.0.1.tgz#fcb18cb840856ff55bd3b201bd412f8428532abb" + integrity sha512-5ZXGzzFVXBjT6z5OFsQvdYJC25iPPDFrjL8Wl4sLa9BXrbFBhbXo4olUe/wZ/iRBZMCQBDztqdX0S0G+WSGJlg== dependencies: "@agoric/babel-generator" "^7.17.6" - "@babel/parser" "^7.17.3" - "@babel/traverse" "^7.17.3" - "@babel/types" "^7.17.0" - ses "^0.18.8" + "@babel/parser" "^7.23.6" + "@babel/traverse" "^7.23.6" + "@babel/types" "^7.23.6" + ses "^1.0.1" -"@endo/stream-node@^0.2.29": - version "0.2.30" - resolved "https://registry.yarnpkg.com/@endo/stream-node/-/stream-node-0.2.30.tgz#4af1989976eaad385663cd2a3342072cf9dbea7c" - integrity sha512-KZZJ6MWeTxFYScuuIj5BwGVX6Y5F9+RzW8RhVZy7Najr/irgdGnF/oGk8QeUIHuVzTgL4HLJP+XATnHaLKOcGw== +"@endo/stream-node@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/stream-node/-/stream-node-1.0.1.tgz#d28d89bfd0a476a006d531e13e41c0f989c7cf4e" + integrity sha512-SYnYqYtjJpKokyupBkzVhFAkJUQrvm9uVJTJQs2drj0zDc/bQuLUafjLcAURQZ82B7yFvXL/9QXjMNU+hWiTVQ== dependencies: - "@endo/init" "^0.5.60" - "@endo/stream" "^0.3.29" - ses "^0.18.8" + "@endo/init" "^1.0.1" + "@endo/stream" "^1.0.1" + ses "^1.0.1" -"@endo/stream@^0.3.28", "@endo/stream@^0.3.29": - version "0.3.29" - resolved "https://registry.yarnpkg.com/@endo/stream/-/stream-0.3.29.tgz#f49c24629429a3650ddd0e5e9fb90e36ef44ed0a" - integrity sha512-C850JqDGYsObE0fAC2uUw/IrN3kUpECddiARIGDpe/y3wnWu5fsau52FkGOKY4lno5kyAhfyvZ9MxhigYnXxEg== +"@endo/stream@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@endo/stream/-/stream-1.0.1.tgz#ee3248647a9372ed4d45e42c040eb6ce921393f9" + integrity sha512-Bx4Gbn2wtJXqQbMC6oDdxRaRUhXaxDTHnbIaBB2Op5Klm8j/ekAbQXTvwMBmb85UQ67raXQs1iypVRaFwQ1qJw== dependencies: - "@endo/eventual-send" "^0.17.6" - "@endo/promise-kit" "^0.2.60" - ses "^0.18.8" + "@endo/eventual-send" "^1.0.1" + "@endo/promise-kit" "^1.0.1" + ses "^1.0.1" -"@endo/where@^0.3.5": - version "0.3.5" - resolved "https://registry.yarnpkg.com/@endo/where/-/where-0.3.5.tgz#df7661ec38ab6a327ef050aa88b50555876c39ef" - integrity sha512-y9agS7UWpSY9YSAAYwtn6sAE7zfU2BmYGOUJpw859WcmRt5ufCRi2XAXDcvIugAUPTsSVPqJj6FO3uZNVRmXPw== +"@endo/where@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@endo/where/-/where-1.0.0.tgz#2f3c160623979fce6029a4a7582522ff78f8e5d8" + integrity sha512-l70ByG2Epf66X3dKET8KO9pQc8K4F9YVxvUkoLTGoSYDxvGjDjujNR20qudGGiNpIcjqcLkH3Havaqwv22Q2EA== -"@endo/zip@^0.2.34", "@endo/zip@^0.2.35": - version "0.2.35" - resolved "https://registry.yarnpkg.com/@endo/zip/-/zip-0.2.35.tgz#37a7f9266ca9c9167de5e42b55b0d9c979598d87" - integrity sha512-UM+mMZjBtJf33lXj38xXIEIe1B5wrgg/nT9CHrC8s+Pj/h63eMpQmcJzjL2vMKrvq3Tsj+TDzmQhtYcbrFACqQ== +"@endo/zip@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@endo/zip/-/zip-1.0.0.tgz#af721ae46c9480ee56110c9e88d6d34404b44a77" + integrity sha512-wsw1Jnia9nz9e/UBFSR4Dn5eb7wU6qrMR8HBZ3tQGzzDCtLea0q+b/Ae1H4d9EG1kqnOibKTJvTibX3yex57KA== "@es-joy/jsdoccomment@~0.39.4": version "0.39.4" @@ -3332,7 +3479,7 @@ cbor@^8.1.0: dependencies: nofilter "^3.1.0" -chalk@^2.0.0, chalk@^2.4.1: +chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -3912,7 +4059,7 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: +debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -8752,6 +8899,13 @@ ses@^0.18.8: dependencies: "@endo/env-options" "^0.1.4" +ses@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ses/-/ses-1.0.1.tgz#ede4c688b150ffa4d368679d8c1f8ee57d9e4836" + integrity sha512-iuqGQ1dsktipGgmC/FLL2agq88WcarXxbFDKMEPVyRUxhAhReKpBIO63uDK4IvYYofFJ6FpfhNn/mVTNZpPOCg== + dependencies: + "@endo/env-options" "^1.0.1" + set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -8924,6 +9078,11 @@ source-map-support@^0.5.21: buffer-from "^1.0.0" source-map "^0.6.0" +source-map@0.7.4, source-map@^0.7.4: + version "0.7.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" + integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== + source-map@^0.5.0: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -8934,11 +9093,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.7.3, source-map@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" - integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== - sourcemap-codec@^1.4.4: version "1.4.6" resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz#e30a74f0402bad09807640d39e971090a08ce1e9" From 2b28332ec050dad05b50519bf4388b3cf779b9b5 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Wed, 20 Dec 2023 13:38:28 -0800 Subject: [PATCH 14/21] chore: Deduplicate yarn.lock --- yarn.lock | 164 ++++++------------------------------------------------ 1 file changed, 17 insertions(+), 147 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4caa3acbe1a..6f59ebde83c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -21,14 +21,7 @@ resolved "https://registry.yarnpkg.com/@agoric/wallet-ui/-/wallet-ui-0.1.3-solo.0.tgz#5f05c3dd2820d4f1efcbccbd2dc1292847ecbd2b" integrity sha512-NbhCrTH9u2af+6ituM99M8Mo10VOP1nQRTZoYEXW+esBwJId/7cRniMmAC7qmkbXs8POA31S8EQ5gAhkWq08WA== -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" - integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== - dependencies: - "@babel/highlight" "^7.18.6" - -"@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5": version "7.23.5" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== @@ -36,17 +29,7 @@ "@babel/highlight" "^7.23.4" chalk "^2.4.2" -"@babel/generator@^7.17.3": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.5.tgz#c0c0e5449504c7b7de8236d99338c3e2a340745f" - integrity sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w== - dependencies: - "@babel/types" "^7.21.5" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" - jsesc "^2.5.1" - -"@babel/generator@^7.23.6": +"@babel/generator@^7.17.3", "@babel/generator@^7.23.6": version "7.23.6" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== @@ -56,25 +39,12 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" -"@babel/helper-environment-visitor@^7.16.7": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz#c769afefd41d171836f7cb63e295bedf689d48ba" - integrity sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ== - -"@babel/helper-environment-visitor@^7.22.20": +"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.22.20": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== -"@babel/helper-function-name@^7.16.7": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4" - integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg== - dependencies: - "@babel/template" "^7.20.7" - "@babel/types" "^7.21.0" - -"@babel/helper-function-name@^7.23.0": +"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.23.0": version "7.23.0" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== @@ -82,64 +52,31 @@ "@babel/template" "^7.22.15" "@babel/types" "^7.23.0" -"@babel/helper-hoist-variables@^7.16.7": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" - integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-hoist-variables@^7.22.5": +"@babel/helper-hoist-variables@^7.16.7", "@babel/helper-hoist-variables@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== dependencies: "@babel/types" "^7.22.5" -"@babel/helper-split-export-declaration@^7.16.7": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" - integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-split-export-declaration@^7.22.6": +"@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.22.6": version "7.22.6" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== dependencies: "@babel/types" "^7.22.5" -"@babel/helper-string-parser@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz#2b3eea65443c6bdc31c22d037c65f6d323b6b2bd" - integrity sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w== - -"@babel/helper-string-parser@^7.23.4": +"@babel/helper-string-parser@^7.21.5", "@babel/helper-string-parser@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== -"@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" - integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== - -"@babel/helper-validator-identifier@^7.22.20": +"@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.22.5": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== -"@babel/highlight@^7.18.6": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031" - integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw== - dependencies: - "@babel/helper-validator-identifier" "^7.22.5" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/highlight@^7.23.4": +"@babel/highlight@^7.18.6", "@babel/highlight@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b" integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A== @@ -148,12 +85,7 @@ chalk "^2.4.2" js-tokens "^4.0.0" -"@babel/parser@^7.17.3", "@babel/parser@^7.20.7", "@babel/parser@^7.7.0": - version "7.21.8" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.8.tgz#642af7d0333eab9c0ad70b14ac5e76dbde7bfdf8" - integrity sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA== - -"@babel/parser@^7.22.15", "@babel/parser@^7.23.6": +"@babel/parser@^7.17.3", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.23.6", "@babel/parser@^7.7.0": version "7.23.6" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b" integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ== @@ -165,16 +97,7 @@ dependencies: regenerator-runtime "^0.13.11" -"@babel/template@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" - integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.20.7" - "@babel/types" "^7.20.7" - -"@babel/template@^7.22.15": +"@babel/template@^7.20.7", "@babel/template@^7.22.15": version "7.22.15" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== @@ -183,7 +106,7 @@ "@babel/parser" "^7.22.15" "@babel/types" "^7.22.15" -"@babel/traverse@^7.23.6": +"@babel/traverse@^7.23.6", "@babel/traverse@^7.7.0": version "7.23.6" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.6.tgz#b53526a2367a0dd6edc423637f3d2d0f2521abc5" integrity sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ== @@ -199,32 +122,7 @@ debug "^4.3.1" globals "^11.1.0" -"@babel/traverse@^7.7.0": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" - integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw== - dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.3" - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" - "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.3" - "@babel/types" "^7.17.0" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/types@^7.17.0", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.5", "@babel/types@^7.7.0": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6" - integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q== - dependencies: - "@babel/helper-string-parser" "^7.21.5" - "@babel/helper-validator-identifier" "^7.19.1" - to-fast-properties "^2.0.0" - -"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6": +"@babel/types@^7.17.0", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.5", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.7.0": version "7.23.6" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd" integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg== @@ -2545,24 +2443,7 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== -"@typescript-eslint/eslint-plugin@^6.0.0": - version "6.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.0.tgz#ed2a38867190f8a688af85ad7c8a74670b8b3675" - integrity sha512-gUqtknHm0TDs1LhY12K2NA3Rmlmp88jK9Tx8vGZMfHeNMLE3GH2e9TRub+y+SOjuYgtOmok+wt1AyDPZqxbNag== - dependencies: - "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "6.7.0" - "@typescript-eslint/type-utils" "6.7.0" - "@typescript-eslint/utils" "6.7.0" - "@typescript-eslint/visitor-keys" "6.7.0" - debug "^4.3.4" - graphemer "^1.4.0" - ignore "^5.2.4" - natural-compare "^1.4.0" - semver "^7.5.4" - ts-api-utils "^1.0.1" - -"@typescript-eslint/eslint-plugin@^6.13.2": +"@typescript-eslint/eslint-plugin@^6.0.0", "@typescript-eslint/eslint-plugin@^6.13.2": version "6.13.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.13.2.tgz#2e03506c5362a65e43cb132c37c9ce2d3cb51470" integrity sha512-3+9OGAWHhk4O1LlcwLBONbdXsAhLjyCFogJY/cWy2lxdVJ2JrcTF2pTGMaLl2AE7U1l31n8Py4a8bx5DLf/0dQ== @@ -2579,18 +2460,7 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/parser@^6.0.0": - version "6.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.7.0.tgz#332fe9c7ecf6783d3250b4c8a960bd4af0995807" - integrity sha512-jZKYwqNpNm5kzPVP5z1JXAuxjtl2uG+5NpaMocFPTNC2EdYIgbXIPImObOkhbONxtFTTdoZstLZefbaK+wXZng== - dependencies: - "@typescript-eslint/scope-manager" "6.7.0" - "@typescript-eslint/types" "6.7.0" - "@typescript-eslint/typescript-estree" "6.7.0" - "@typescript-eslint/visitor-keys" "6.7.0" - debug "^4.3.4" - -"@typescript-eslint/parser@^6.13.2": +"@typescript-eslint/parser@^6.0.0", "@typescript-eslint/parser@^6.13.2": version "6.13.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.13.2.tgz#390b79cc9a57a5f904d197a201cc4b6bc4f9afb9" integrity sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg== @@ -2673,7 +2543,7 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/utils@6.13.2": +"@typescript-eslint/utils@6.13.2", "@typescript-eslint/utils@^6.6.0": version "6.13.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.13.2.tgz#8eb89e53adc6d703a879b131e528807245486f89" integrity sha512-b9Ptq4eAZUym4idijCRzl61oPCwwREcfDI8xGk751Vhzig5fFZR9CyzDz4Sp/nxSLBYxUPyh4QdIDqWykFhNmQ== @@ -2686,7 +2556,7 @@ "@typescript-eslint/typescript-estree" "6.13.2" semver "^7.5.4" -"@typescript-eslint/utils@6.7.0", "@typescript-eslint/utils@^6.6.0": +"@typescript-eslint/utils@6.7.0": version "6.7.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.7.0.tgz#61b6f1f1b82ad529abfcee074d21764e880886fb" integrity sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA== From b48ccf2d78c3fdbfd12878f681c27ba596e87f41 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Wed, 20 Dec 2023 13:39:20 -0800 Subject: [PATCH 15/21] chore: Reupdate yarn.lock --- yarn.lock | 83 +++++++++---------------------------------------------- 1 file changed, 13 insertions(+), 70 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6f59ebde83c..824093215f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -21,7 +21,7 @@ resolved "https://registry.yarnpkg.com/@agoric/wallet-ui/-/wallet-ui-0.1.3-solo.0.tgz#5f05c3dd2820d4f1efcbccbd2dc1292847ecbd2b" integrity sha512-NbhCrTH9u2af+6ituM99M8Mo10VOP1nQRTZoYEXW+esBwJId/7cRniMmAC7qmkbXs8POA31S8EQ5gAhkWq08WA== -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5": version "7.23.5" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== @@ -29,7 +29,7 @@ "@babel/highlight" "^7.23.4" chalk "^2.4.2" -"@babel/generator@^7.17.3", "@babel/generator@^7.23.6": +"@babel/generator@^7.23.6": version "7.23.6" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== @@ -39,12 +39,12 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" -"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.22.20": +"@babel/helper-environment-visitor@^7.22.20": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== -"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.23.0": +"@babel/helper-function-name@^7.23.0": version "7.23.0" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== @@ -52,31 +52,31 @@ "@babel/template" "^7.22.15" "@babel/types" "^7.23.0" -"@babel/helper-hoist-variables@^7.16.7", "@babel/helper-hoist-variables@^7.22.5": +"@babel/helper-hoist-variables@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== dependencies: "@babel/types" "^7.22.5" -"@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.22.6": +"@babel/helper-split-export-declaration@^7.22.6": version "7.22.6" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== dependencies: "@babel/types" "^7.22.5" -"@babel/helper-string-parser@^7.21.5", "@babel/helper-string-parser@^7.23.4": +"@babel/helper-string-parser@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== -"@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.22.5": +"@babel/helper-validator-identifier@^7.22.20": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== -"@babel/highlight@^7.18.6", "@babel/highlight@^7.23.4": +"@babel/highlight@^7.23.4": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b" integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A== @@ -85,7 +85,7 @@ chalk "^2.4.2" js-tokens "^4.0.0" -"@babel/parser@^7.17.3", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.23.6", "@babel/parser@^7.7.0": +"@babel/parser@^7.22.15", "@babel/parser@^7.23.6", "@babel/parser@^7.7.0": version "7.23.6" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b" integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ== @@ -97,7 +97,7 @@ dependencies: regenerator-runtime "^0.13.11" -"@babel/template@^7.20.7", "@babel/template@^7.22.15": +"@babel/template@^7.22.15": version "7.22.15" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== @@ -122,7 +122,7 @@ debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.17.0", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.5", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.7.0": +"@babel/types@^7.17.0", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.7.0": version "7.23.6" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd" integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg== @@ -2479,14 +2479,6 @@ "@typescript-eslint/types" "6.13.2" "@typescript-eslint/visitor-keys" "6.13.2" -"@typescript-eslint/scope-manager@6.7.0": - version "6.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz#6b3c22187976e2bf5ed0dc0d9095f1f2cbd1d106" - integrity sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA== - dependencies: - "@typescript-eslint/types" "6.7.0" - "@typescript-eslint/visitor-keys" "6.7.0" - "@typescript-eslint/type-utils@6.13.2": version "6.13.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.13.2.tgz#ebec2da14a6bb7122e0fd31eea72a382c39c6102" @@ -2497,26 +2489,11 @@ debug "^4.3.4" ts-api-utils "^1.0.1" -"@typescript-eslint/type-utils@6.7.0": - version "6.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.7.0.tgz#21a013d4c7f96255f5e64ac59fb41301d1e052ba" - integrity sha512-f/QabJgDAlpSz3qduCyQT0Fw7hHpmhOzY/Rv6zO3yO+HVIdPfIWhrQoAyG+uZVtWAIS85zAyzgAFfyEr+MgBpg== - dependencies: - "@typescript-eslint/typescript-estree" "6.7.0" - "@typescript-eslint/utils" "6.7.0" - debug "^4.3.4" - ts-api-utils "^1.0.1" - "@typescript-eslint/types@6.13.2": version "6.13.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.13.2.tgz#c044aac24c2f6cefb8e921e397acad5417dd0ae6" integrity sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg== -"@typescript-eslint/types@6.7.0": - version "6.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.7.0.tgz#8de8ba9cafadc38e89003fe303e219c9250089ae" - integrity sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q== - "@typescript-eslint/typescript-estree@6.13.2": version "6.13.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz#ae556ee154c1acf025b48d37c3ef95a1d55da258" @@ -2530,19 +2507,6 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/typescript-estree@6.7.0": - version "6.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz#20ce2801733bd46f02cc0f141f5b63fbbf2afb63" - integrity sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ== - dependencies: - "@typescript-eslint/types" "6.7.0" - "@typescript-eslint/visitor-keys" "6.7.0" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - semver "^7.5.4" - ts-api-utils "^1.0.1" - "@typescript-eslint/utils@6.13.2", "@typescript-eslint/utils@^6.6.0": version "6.13.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.13.2.tgz#8eb89e53adc6d703a879b131e528807245486f89" @@ -2556,19 +2520,6 @@ "@typescript-eslint/typescript-estree" "6.13.2" semver "^7.5.4" -"@typescript-eslint/utils@6.7.0": - version "6.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.7.0.tgz#61b6f1f1b82ad529abfcee074d21764e880886fb" - integrity sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA== - dependencies: - "@eslint-community/eslint-utils" "^4.4.0" - "@types/json-schema" "^7.0.12" - "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.7.0" - "@typescript-eslint/types" "6.7.0" - "@typescript-eslint/typescript-estree" "6.7.0" - semver "^7.5.4" - "@typescript-eslint/visitor-keys@6.13.2": version "6.13.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz#e0a4a80cf842bb08e6127b903284166ac4a5594c" @@ -2577,14 +2528,6 @@ "@typescript-eslint/types" "6.13.2" eslint-visitor-keys "^3.4.1" -"@typescript-eslint/visitor-keys@6.7.0": - version "6.7.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz#34140ac76dfb6316d17012e4469acf3366ad3f44" - integrity sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ== - dependencies: - "@typescript-eslint/types" "6.7.0" - eslint-visitor-keys "^3.4.1" - "@yarnpkg/lockfile@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" @@ -3349,7 +3292,7 @@ cbor@^8.1.0: dependencies: nofilter "^3.1.0" -chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== From 552cdda7d6e376483334a5429fdf80b6711624ee Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Wed, 20 Dec 2023 13:40:14 -0800 Subject: [PATCH 16/21] chore: Bump xsnap meter type --- packages/xsnap/api.js | 2 +- packages/xsnap/test/test-xs-perf.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/xsnap/api.js b/packages/xsnap/api.js index 04ce1386053..94434428a5b 100644 --- a/packages/xsnap/api.js +++ b/packages/xsnap/api.js @@ -7,7 +7,7 @@ * Also, update golden master test/test-xs-perf.js to reflect new meter * version. */ -export const METER_TYPE = 'xs-meter-22'; +export const METER_TYPE = 'xs-meter-23'; export const ExitCode = { E_UNKNOWN_ERROR: -1, diff --git a/packages/xsnap/test/test-xs-perf.js b/packages/xsnap/test/test-xs-perf.js index faca9de7609..40188e7f77c 100644 --- a/packages/xsnap/test/test-xs-perf.js +++ b/packages/xsnap/test/test-xs-perf.js @@ -61,7 +61,7 @@ test('meter details', async t => { }, 'evaluate returns meter details', ); - t.is(meterType, 'xs-meter-22'); + t.is(meterType, 'xs-meter-23'); }); // test disabled until rewritten to tolerate fast CI hosts getting From 157e0e5d838f9f02bff3f565fb4ae05bb5bfec27 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Wed, 20 Dec 2023 13:41:29 -0800 Subject: [PATCH 17/21] chore(swingset-vat): Update xsnap store test snapshots --- .../test/snapshots/test-xsnap-store.js.md | 8 ++++---- .../test/snapshots/test-xsnap-store.js.snap | Bin 504 -> 503 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/SwingSet/test/snapshots/test-xsnap-store.js.md b/packages/SwingSet/test/snapshots/test-xsnap-store.js.md index 93e1312c60e..d2df2fce6f7 100644 --- a/packages/SwingSet/test/snapshots/test-xsnap-store.js.md +++ b/packages/SwingSet/test/snapshots/test-xsnap-store.js.md @@ -20,8 +20,8 @@ Generated by [AVA](https://avajs.dev). { compressSeconds: 0, dbSaveSeconds: 0, - hash: 'f44205908c32d4013e8f72ecf61d14d6e4a3799c7684562b14542c3a172cb2da', - uncompressedSize: 780707, + hash: 'ca5dca976b5691999e936f3c6fbfb16e85c45b6fc15471106390b245ed8db5f9', + uncompressedSize: 781363, } > after use of harden() - sensitive to SES-shim, XS, and supervisor @@ -29,6 +29,6 @@ Generated by [AVA](https://avajs.dev). { compressSeconds: 0, dbSaveSeconds: 0, - hash: '0389ff81a632fe0e37e2319a1152e2799fe1c2e45fcacccedec38a772d92747e', - uncompressedSize: 780867, + hash: 'cd60cb92856ec37ee649f2b5fe234a2adf6e132bcbb143304bf0ceb965623388', + uncompressedSize: 781523, } diff --git a/packages/SwingSet/test/snapshots/test-xsnap-store.js.snap b/packages/SwingSet/test/snapshots/test-xsnap-store.js.snap index c376de1c8f2d0af25b5995f524de46b16c97dc3b..154757f44b8952eb0e321a61dfc1c4aa3b392bae 100644 GIT binary patch literal 503 zcmV9NP0 zVQ=@e_C*mLqNC#x$gA)OJOm97fi9<9kphJ>ZpI${H5&co9|60;eM(<$D97B<_3O)) zzvAuNmZ#pX({jj(+mU!T^dA}nprPPuedY^9l zQ@EEp_So7h`e$akv}t+wxIiL-O+|#>lXS|7x|RWr!kPj#jcBS+dnawMXbO~6kZP>= zN_ve=>Fy1mZTh=K$+z({?RJ>_{C+^4Me5eEk2%_I5Bu1_oK@agQ)^V(l*Sk`LI>e= zz<{NuMmeca2UjXtmt~=aDX@}?eB)6C^FT21=h+VI`rL+0FJAr+@n7`2LSj1v006ds_mBVp literal 504 zcmVD!!yyDl0AzsY$e4tpubu{~xN zHoMW zU(@P+MMDS6Q1>xV7?8Go_h}Y!SWt(X)^tsXjcxX>Z@11tgpXu8%ARDKB2UTTS?cFW zKIwbXucYVXXiAPgn9pb#fh{9-&Xq-c73oDe8-jsz==uvB-xmV6g@L8}POrZ9PqxEy< zSb~BQgeps`=2{kWZkQ}2w*r{r)^G<81oq?ivn{a8Gw>;DcVRSrAL)z+>_URLMjHFg zeirIxaY`?$Qwp7 Date: Wed, 20 Dec 2023 17:34:12 -0800 Subject: [PATCH 18/21] refactor(zoe): Remove accommodation for old interface guard error messages --- packages/zoe/test/unitTests/test-zoe.js | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/packages/zoe/test/unitTests/test-zoe.js b/packages/zoe/test/unitTests/test-zoe.js index 2ceaaf2fe1c..c2937823ea2 100644 --- a/packages/zoe/test/unitTests/test-zoe.js +++ b/packages/zoe/test/unitTests/test-zoe.js @@ -143,10 +143,7 @@ test(`E(zoe).getPublicFacet - no instance`, async t => { // @ts-expect-error deliberate invalid arguments for testing await t.throwsAsync(() => E(zoe).getPublicFacet(), { message: - // Golden test uses RegExp "Or" pattern to tolerate earlier versions of - // Endo. - // TODO: Remove first disjunct once no longer needed - /In "getPublicFacet" method of \(ZoeService\): (?:arg 0: .*"\[undefined\]" - Must be a remotable|Expected at least 1 arguments: \[\])/, + /In "getPublicFacet" method of \(ZoeService\): Expected at least 1 arguments: \[\]/, }); }); @@ -177,10 +174,7 @@ test(`zoe.getIssuers - no instance`, async t => { // @ts-expect-error invalid arguments for testing await t.throwsAsync(() => E(zoe).getIssuers(), { message: - // Golden test uses RegExp "Or" pattern to tolerate earlier versions of - // Endo. - // TODO: Remove first disjunct once no longer needed - /In "getIssuers" method of \(ZoeService\): (?:arg 0: .*"\[undefined\]" - Must be a remotable|Expected at least 1 arguments: \[\])/, + /In "getIssuers" method of \(ZoeService\): Expected at least 1 arguments: \[\]/, }); }); @@ -211,9 +205,7 @@ test(`zoe.getBrands - no instance`, async t => { // @ts-expect-error invalid arguments for testing await t.throwsAsync(() => E(zoe).getBrands(), { message: - // Or pattern of golden error tolerant across versions of endo. - // TODO: Remove first disjunct once no longer needed - /In "getBrands" method of \(ZoeService\): (?:arg 0: .*"\[undefined\]" - Must be a remotable|Expected at least 1 arguments: \[\])/, + /In "getBrands" method of \(ZoeService\): Expected at least 1 arguments: \[\]/, }); }); @@ -269,9 +261,7 @@ test(`zoe.getTerms - no instance`, async t => { // @ts-expect-error invalid arguments for testing await t.throwsAsync(() => E(zoe).getTerms(), { message: - // Or pattern of golden error tolerant across versions of endo. - // TODO: Remove first disjunct once no longer needed - /In "getTerms" method of \(ZoeService\): (?:arg 0: .*"\[undefined\]" - Must be a remotable|Expected at least 1 arguments: \[\])/, + /In "getTerms" method of \(ZoeService\): Expected at least 1 arguments: \[\]/, }); }); From d2914ff11b2c8e0c4c5825fbc8575576eaed68ad Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 12 Dec 2023 14:42:49 -0800 Subject: [PATCH 19/21] chore(types): import Far, Guarded, GuardedKit --- packages/internal/src/callback.js | 6 ++---- packages/vat-data/src/exo-utils.js | 30 ++++++++++++++++++------------ packages/zone/src/durable.js | 4 ---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/internal/src/callback.js b/packages/internal/src/callback.js index 20668739d79..e2ef9e1b806 100644 --- a/packages/internal/src/callback.js +++ b/packages/internal/src/callback.js @@ -14,8 +14,8 @@ const ownKeys = ); /** - * @template T - * @typedef {(...args: Parameters>) => Farable} MakeAttenuator + * @template {import('@endo/exo/src/exo-makers.js').Methods} T + * @typedef {(...args: Parameters>) => import('@endo/exo/src/exo-makers.js').Farable} MakeAttenuator */ /** @@ -28,8 +28,6 @@ const ownKeys = * @typedef {import('./types.js').SyncCallback} SyncCallback */ -/** @template T @typedef {import('@endo/eventual-send').RemotableBrand<{}, T> & T} Farable */ - /** * @param {unknown} key * @returns {key is PropertyKey} FIXME: should be just `PropertyKey` but TS diff --git a/packages/vat-data/src/exo-utils.js b/packages/vat-data/src/exo-utils.js index bde60c8f56a..96c6827950d 100644 --- a/packages/vat-data/src/exo-utils.js +++ b/packages/vat-data/src/exo-utils.js @@ -1,5 +1,5 @@ // @jessie-check - +/* eslint-disable @typescript-eslint/prefer-ts-expect-error -- for casting from deprecated types that aren't worth fixing */ import { initEmpty } from '@agoric/store'; import { provide, VatData as globalVatData } from './vat-data-bindings.js'; @@ -31,6 +31,7 @@ export const ignoreContext = harden(ignoreContext); // TODO: Find a good home for this function used by @agoric/vat-data and testing code +/** @param {import('@agoric/swingset-liveslots').VatData} VatData */ export const makeExoUtils = VatData => { const { defineKind, @@ -101,9 +102,11 @@ export const makeExoUtils = VatData => { * self: T, * state: ReturnType * }>} [options] - * @returns {(...args: Parameters) => (T & RemotableBrand<{}, T>)} + * @returns {(...args: Parameters) => import('@endo/exo/src/exo-makers.js').Guarded} */ const defineVirtualExoClass = (tag, interfaceGuard, init, methods, options) => + // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error + // @ts-ignore cast defineKind(tag, init, methods, { ...options, thisfulMethods: true, @@ -118,14 +121,14 @@ export const makeExoUtils = VatData => { * @param {InterfaceGuardKit | undefined} interfaceGuardKit * @param {I} init * @param {T & ThisType<{ - * facets: T, + * facets: import('@endo/exo/src/exo-makers.js').GuardedKit, * state: ReturnType * }> } facets * @param {DefineKindOptions<{ * facets: T, * state: ReturnType * }>} [options] - * @returns {(...args: Parameters) => (T & RemotableBrand<{}, T>)} + * @returns {(...args: Parameters) => import('@endo/exo/src/exo-makers.js').GuardedKit} */ const defineVirtualExoClassKit = ( tag, @@ -134,6 +137,7 @@ export const makeExoUtils = VatData => { facets, options, ) => + // @ts-ignore cast defineKindMulti(tag, init, facets, { ...options, thisfulMethods: true, @@ -155,7 +159,7 @@ export const makeExoUtils = VatData => { * self: T, * state: ReturnType * }>} [options] - * @returns {(...args: Parameters) => (T & RemotableBrand<{}, T>)} + * @returns {(...args: Parameters) => import('@endo/exo/src/exo-makers.js').Guarded} */ const defineDurableExoClass = ( kindHandle, @@ -164,6 +168,7 @@ export const makeExoUtils = VatData => { methods, options, ) => + // @ts-ignore cast defineDurableKind(kindHandle, init, methods, { ...options, thisfulMethods: true, @@ -178,14 +183,14 @@ export const makeExoUtils = VatData => { * @param {InterfaceGuardKit | undefined} interfaceGuardKit * @param {I} init * @param {T & ThisType<{ - * facets: T, + * facets: import('@endo/exo/src/exo-makers.js').GuardedKit, * state: ReturnType * }> } facets * @param {DefineKindOptions<{ * facets: T, * state: ReturnType * }>} [options] - * @returns {(...args: Parameters) => (T & RemotableBrand<{}, T>)} + * @returns {(...args: Parameters) => import('@endo/exo/src/exo-makers.js').GuardedKit} */ const defineDurableExoClassKit = ( kindHandle, @@ -194,6 +199,7 @@ export const makeExoUtils = VatData => { facets, options, ) => + // @ts-ignore cast defineDurableKindMulti(kindHandle, init, facets, { ...options, thisfulMethods: true, @@ -216,7 +222,7 @@ export const makeExoUtils = VatData => { * self: T, * state: ReturnType * }>} [options] - * @returns {(...args: Parameters) => (T & RemotableBrand<{}, T>)} + * @returns {(...args: Parameters) => import('@endo/exo/src/exo-makers.js').Guarded} */ const prepareExoClass = ( baggage, @@ -243,14 +249,14 @@ export const makeExoUtils = VatData => { * @param {InterfaceGuardKit | undefined} interfaceGuardKit * @param {I} init * @param {T & ThisType<{ - * facets: T, + * facets: import('@endo/exo/src/exo-makers.js').GuardedKit, * state: ReturnType * }> } facets * @param {DefineKindOptions<{ * facets: T, * state: ReturnType * }>} [options] - * @returns {(...args: Parameters) => (T & RemotableBrand<{}, T>)} + * @returns {(...args: Parameters) => import('@endo/exo/src/exo-makers.js').GuardedKit} */ const prepareExoClassKit = ( baggage, @@ -276,7 +282,7 @@ export const makeExoUtils = VatData => { * @param {InterfaceGuard | undefined} interfaceGuard * @param {M} methods * @param {DefineKindOptions<{ self: M }>} [options] - * @returns {M & RemotableBrand<{}, M>} + * @returns {import('@endo/exo/src/exo-makers.js').Guarded} */ const prepareExo = ( baggage, @@ -305,7 +311,7 @@ export const makeExoUtils = VatData => { * @param {string} kindName * @param {M} methods * @param {DefineKindOptions<{ self: M }>} [options] - * @returns {M & RemotableBrand<{}, M>} + * @returns {import('@endo/exo/src/exo-makers.js').Guarded} */ const prepareSingleton = (baggage, kindName, methods, options = undefined) => prepareExo(baggage, kindName, undefined, methods, options); diff --git a/packages/zone/src/durable.js b/packages/zone/src/durable.js index a8460f43935..22cfe4b733a 100644 --- a/packages/zone/src/durable.js +++ b/packages/zone/src/durable.js @@ -89,10 +89,6 @@ export const makeDurableZone = (baggage, baseLabel = 'durableZone') => { /** @type {import('.').Zone['exoClass']} */ const exoClass = (...args) => prepareExoClass(baggage, ...args); /** @type {import('.').Zone['exoClassKit']} */ - // @ts-ignore This type check regressed inexplicably with the release - // following after @endo/exo@0.2.6. - // The lint error does not occur in local lint, but does in integration with - // @agoric/vats, so can not be suppressed with ts-expect-error. const exoClassKit = (...args) => prepareExoClassKit(baggage, ...args); /** @type {import('.').Zone['exo']} */ const exo = (...args) => prepareExo(baggage, ...args); From 41aeba3d65f3bfff574889abb47fe821414d7ee8 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Thu, 21 Dec 2023 14:40:19 -0500 Subject: [PATCH 20/21] chore(types): deprecate provideKindHandle Used only for the defineKind* methods, which are already deprecated --- packages/vat-data/src/exo-utils.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/vat-data/src/exo-utils.js b/packages/vat-data/src/exo-utils.js index 96c6827950d..f175f05fe21 100644 --- a/packages/vat-data/src/exo-utils.js +++ b/packages/vat-data/src/exo-utils.js @@ -42,6 +42,7 @@ export const makeExoUtils = VatData => { } = VatData; /** + * @deprecated Use Exos/ExoClasses instead of Kinds * @param {Baggage} baggage * @param {string} kindName * @returns {DurableKindHandle} @@ -325,8 +326,8 @@ export const makeExoUtils = VatData => { prepareExoClass, prepareExoClassKit, prepareExo, - prepareSingleton, + prepareSingleton, provideKindHandle, prepareKind, prepareKindMulti, From 990a79deaeaf956ea0076dba1c19305677ec8124 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 12 Dec 2023 14:59:25 -0800 Subject: [PATCH 21/21] feat(guard): tighten roundsManager --- .../inter-protocol/src/price/roundsManager.js | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/packages/inter-protocol/src/price/roundsManager.js b/packages/inter-protocol/src/price/roundsManager.js index 8d80b8017ef..32e58536b3b 100644 --- a/packages/inter-protocol/src/price/roundsManager.js +++ b/packages/inter-protocol/src/price/roundsManager.js @@ -1,7 +1,7 @@ import { Fail, q } from '@agoric/assert'; import { AmountMath } from '@agoric/ertp'; import { makeTracer } from '@agoric/internal'; -import { TimeMath } from '@agoric/time'; +import { TimeMath, TimestampShape } from '@agoric/time'; import { M, makeScalarBigMapStore, prepareExoClassKit } from '@agoric/vat-data'; import { calculateMedian, @@ -98,21 +98,25 @@ export const prepareRoundsManagerKit = baggage => 'RoundsManager', { helper: UnguardedHelperI, - contract: M.interface( - 'contract', - { - authenticateQuote: M.call().rest(M.any()).returns(M.any()), - makeCreateQuote: M.call().rest(M.any()).returns(M.any()), - eligibleForSpecificRound: M.call().rest(M.any()).returns(M.boolean()), - getRoundData: M.call().rest(M.any()).returns(M.promise()), - getRoundStatus: M.call().rest(M.any()).returns(M.record()), - oracleRoundStateSuggestRound: M.call() - .rest(M.any()) - .returns(M.record()), - }, - // TODO(6571) stop sloppy - { sloppy: true }, - ), + contract: M.interface('contract', { + authenticateQuote: M.call([M.record()]).returns(M.any()), + makeCreateQuote: M.call() + .optional({ + overrideValueOut: M.number(), + timestamp: TimestampShape, + }) + .returns(M.any()), + eligibleForSpecificRound: M.call( + M.any(), + M.bigint(), + TimestampShape, + ).returns(M.boolean()), + getRoundData: M.call(M.any()).returns(M.promise()), + getRoundStatus: M.call(M.bigint()).returns(M.record()), + oracleRoundStateSuggestRound: M.call(M.any(), TimestampShape).returns( + M.record(), + ), + }), oracle: M.interface('oracle', { handlePush: M.call(M.record(), M.record()).returns(M.promise()), }),