@agoric/vats 0.15.2-dev-8d05faf.0 → 0.15.2-dev-d941b39.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vats",
-  "version": "0.15.2-dev-8d05faf.0+8d05faf",
+  "version": "0.15.2-dev-d941b39.0+d941b39",
   "description": "Agoric's Vat library",
   "type": "module",
   "main": "./index.js",
@@ -22,20 +22,20 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-8d05faf.0+8d05faf",
-    "@agoric/cosmic-proto": "0.4.1-dev-8d05faf.0+8d05faf",
-    "@agoric/ertp": "0.16.3-dev-8d05faf.0+8d05faf",
-    "@agoric/governance": "0.10.4-dev-8d05faf.0+8d05faf",
-    "@agoric/internal": "0.3.3-dev-8d05faf.0+8d05faf",
-    "@agoric/network": "0.1.1-dev-8d05faf.0+8d05faf",
-    "@agoric/notifier": "0.6.3-dev-8d05faf.0+8d05faf",
-    "@agoric/store": "0.9.3-dev-8d05faf.0+8d05faf",
-    "@agoric/swingset-vat": "0.32.3-dev-8d05faf.0+8d05faf",
-    "@agoric/time": "0.3.3-dev-8d05faf.0+8d05faf",
-    "@agoric/vat-data": "0.5.3-dev-8d05faf.0+8d05faf",
-    "@agoric/vow": "0.1.1-dev-8d05faf.0+8d05faf",
-    "@agoric/zoe": "0.26.3-dev-8d05faf.0+8d05faf",
-    "@agoric/zone": "0.2.3-dev-8d05faf.0+8d05faf",
+    "@agoric/assert": "0.6.1-dev-d941b39.0+d941b39",
+    "@agoric/cosmic-proto": "0.4.1-dev-d941b39.0+d941b39",
+    "@agoric/ertp": "0.16.3-dev-d941b39.0+d941b39",
+    "@agoric/governance": "0.10.4-dev-d941b39.0+d941b39",
+    "@agoric/internal": "0.3.3-dev-d941b39.0+d941b39",
+    "@agoric/network": "0.1.1-dev-d941b39.0+d941b39",
+    "@agoric/notifier": "0.6.3-dev-d941b39.0+d941b39",
+    "@agoric/store": "0.9.3-dev-d941b39.0+d941b39",
+    "@agoric/swingset-vat": "0.32.3-dev-d941b39.0+d941b39",
+    "@agoric/time": "0.3.3-dev-d941b39.0+d941b39",
+    "@agoric/vat-data": "0.5.3-dev-d941b39.0+d941b39",
+    "@agoric/vow": "0.1.1-dev-d941b39.0+d941b39",
+    "@agoric/zoe": "0.26.3-dev-d941b39.0+d941b39",
+    "@agoric/zone": "0.2.3-dev-d941b39.0+d941b39",
     "@endo/far": "^1.1.2",
     "@endo/import-bundle": "^1.1.2",
     "@endo/marshal": "^1.5.0",
@@ -46,7 +46,7 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-8d05faf.0+8d05faf",
+    "@agoric/swingset-liveslots": "0.10.3-dev-d941b39.0+d941b39",
     "@endo/bundle-source": "^3.2.3",
     "@endo/init": "^1.1.2",
     "ava": "^5.3.0",
@@ -78,5 +78,5 @@
   "typeCoverage": {
     "atLeast": 91.21
   },
-  "gitHead": "8d05faf1d82913efad4558326ab75a397ed1cc34"
+  "gitHead": "d941b39f33c41c1e0f9350f95533fcdc15edc404"
 }

package/src/bridge.d.ts

@@ -1,3 +1,4 @@
+export function makeScopedBridge<BridgeId extends import("@agoric/internal").BridgeIdValue>(bridgeManager: ERef<import("./types.js").BridgeManager>, bridgeIdValue: BridgeId, handler?: import("@agoric/internal").Remote<import("./types.js").BridgeHandler, {}> | undefined): Promise<import("./types.js").ScopedBridgeManager<BridgeId>>;
 export const BridgeHandlerI: import("@endo/patterns").InterfaceGuard<{
     fromBridge: import("@endo/patterns").MethodGuard;
 }>;

package/src/bridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["bridge.js"],"names":[],"mappings":"AAKA;;GAEG;AAEH;;;;;GAKG;AAEH;;GAIG;AAmEI,2CAHI,OAAO,cAAc,EAAE,IAAI,KAC3B,MAAM,kBAuFJ,YAAY,KACV,OAAO,YAAY,EAAE,aAAa,CA2BhD"}
+{"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["bridge.js"],"names":[],"mappings":"AAqBO,iCARiD,QAAQ,SAAnD,OAAQ,kBAAkB,EAAE,aAAc,iBAC5C,IAAI,CAAC,OAAO,YAAY,EAAE,aAAa,CAAC,iBACxC,QAAQ,oGAIN,OAAO,CAAC,OAAO,YAAY,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAKrE;AAEH;;GAEG;AAEH;;;;;GAKG;AAEH;;GAIG;AAmEI,2CAHI,OAAO,cAAc,EAAE,IAAI,KAC3B,MAAM,kBAuFJ,YAAY,KACV,OAAO,YAAY,EAAE,aAAa,CA2BhD"}

package/src/bridge.js

@@ -3,6 +3,27 @@ import { E } from '@endo/far';
 
 const { Fail, details: X } = assert;
 
+/**
+ * Helper to type the registered scoped bridge correctly.
+ *
+ * FIXME: This is needed because `register` is not an async function, so
+ * `E(x).register` needs to reconstruct its return value as a Promise, which
+ * loses the function's genericity. If `register` was async, we could use its
+ * type directly, and it would remain generic.
+ *
+ * @template {import('@agoric/internal').BridgeIdValue} BridgeId
+ * @param {ERef<import('./types.js').BridgeManager>} bridgeManager
+ * @param {BridgeId} bridgeIdValue
+ * @param {import('@agoric/internal').Remote<
+ *   import('./types.js').BridgeHandler
+ * >} [handler]
+ * @returns {Promise<import('./types.js').ScopedBridgeManager<BridgeId>>}
+ */
+export const makeScopedBridge = (bridgeManager, bridgeIdValue, handler) =>
+  /** @type {Promise<import('./types.js').ScopedBridgeManager<BridgeId>>} */ (
+    E(bridgeManager).register(bridgeIdValue, handler)
+  );
+
 export const BridgeHandlerI = M.interface('BridgeHandler', {
   fromBridge: M.call(M.any()).returns(M.promise()),
 });

package/src/core/basic-behaviors.d.ts

@@ -1,4 +1,9 @@
-export function makeVatsFromBundles({ vats, devices, consume: { vatStore }, produce: { vatAdminSvc, loadVat, loadCriticalVat }, }: BootstrapPowers & {}): Promise<void>;
+export function makeVatsFromBundles({ vats, devices, consume: { vatStore }, produce: { vatAdminSvc, loadVat, loadCriticalVat }, }: BootstrapPowers & {
+    produce: {
+        loadVat: Producer<VatLoader>;
+        loadCriticalVat: Producer<VatLoader>;
+    };
+}): Promise<void>;
 export function produceDiagnostics({ produce }: Pick<ChainBootstrapSpace, "produce">): Promise<void>;
 export function produceStartUpgradable({ zone, consume: { diagnostics, zoe }, produce, }: BootstrapSpace & {
     zone: import("@agoric/zone").Zone;
@@ -9,23 +14,11 @@ export function produceStartGovernedUpgradable({ zone, consume: { chainTimerServ
         economicCommitteeCreatorFacet: import("@agoric/inter-protocol/src/proposals/econ-behaviors.js").EconomyBootstrapPowers["consume"]["economicCommitteeCreatorFacet"];
     };
 }): Promise<void>;
-export function buildZoe({ consume: { vatAdminSvc, loadCriticalVat, client }, produce: { zoe, feeMintAccess }, brand: { produce: { Invitation: invitationBrand }, }, issuer: { produce: { Invitation: invitationIssuer }, }, }: BootstrapPowers & {
-    consume: {
-        loadCriticalVat: ERef<VatLoader<ZoeVat>>;
-    };
-}): Promise<void>;
-export function startPriceAuthorityRegistry({ consume: { loadCriticalVat, client }, produce, }: BootstrapPowers & {
-    consume: {
-        loadCriticalVat: ERef<VatLoader<PriceAuthorityVat>>;
-    };
-}): Promise<void>;
+export function buildZoe({ consume: { vatAdminSvc, loadCriticalVat, client }, produce: { zoe, feeMintAccess }, brand: { produce: { Invitation: invitationBrand }, }, issuer: { produce: { Invitation: invitationIssuer }, }, }: BootstrapPowers): Promise<void>;
+export function startPriceAuthorityRegistry({ consume: { loadCriticalVat, client }, produce, }: BootstrapPowers): Promise<void>;
 export function makeOracleBrands({ namedVat: { consume: { agoricNames }, }, oracleBrand: { produce: { USD }, }, }: BootstrapPowers & NamedVatPowers): Promise<void>;
 export function produceBoard({ consume: { client }, produce: { board: pBoard }, namedVat: { consume: { board: vatBoard }, }, }: BootstrapPowers & NamedVatPowers): Promise<void>;
-export function makeBoard({ consume: { loadCriticalVat, client }, produce: { board: { resolve: resolveBoard }, }, }: BootstrapPowers & {
-    consume: {
-        loadCriticalVat: ERef<VatLoader<BoardVat>>;
-    };
-}): Promise<void>;
+export function makeBoard({ consume: { loadCriticalVat, client }, produce: { board: { resolve: resolveBoard }, }, }: BootstrapPowers): Promise<void>;
 export function produceNamesByAddress({ consume: { agoricNames, provisioning: provisioningOptP, client }, produce: { namesByAddress, namesByAddressAdmin }, }: BootstrapPowers): Promise<void>;
 export function makeAddressNameHubs({ consume: { agoricNames: agoricNamesP, client }, produce, }: BootstrapSpace): Promise<void>;
 export function makeClientBanks({ consume: { namesByAddressAdmin, client, bankManager, walletFactoryStartResult, }, }: BootstrapSpace): Promise<void>;
@@ -37,15 +30,10 @@ export function mintInitialSupply({ vatParameters: { argv: { bootMsg }, }, consu
         };
     };
 }): Promise<void>;
-export function addBankAssets({ consume: { agoricNamesAdmin, initialSupply, bridgeManager: bridgeManagerP, loadCriticalVat, startUpgradable, zoe, }, produce: { bankManager, bldIssuerKit }, installation: { consume: { mintHolder }, }, issuer: { produce: produceIssuer }, brand: { produce: produceBrand }, }: BootstrapSpace & {
-    consume: {
-        loadCriticalVat: ERef<VatLoader<BankVat>>;
-    };
-}): Promise<void>;
+export function addBankAssets({ consume: { agoricNamesAdmin, initialSupply, bridgeManager: bridgeManagerP, loadCriticalVat, startUpgradable, zoe, }, produce: { bankManager, bldIssuerKit }, installation: { consume: { mintHolder }, }, issuer: { produce: produceIssuer }, brand: { produce: produceBrand }, }: BootstrapSpace): Promise<void>;
 /** @type {import('./lib-boot.js').BootstrapManifest} */
 export const BASIC_BOOTSTRAP_PERMITS: import("./lib-boot.js").BootstrapManifest;
 export type VatStore = MapStore<string, CreateVatResults>;
-export type ZoeVat = ERef<ReturnType<typeof import("../vat-zoe.js").buildRootObject>>;
 declare namespace bootMsgEx {
     let type: string;
     let chainID: string;

package/src/core/basic-behaviors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basic-behaviors.d.ts","sourceRoot":"","sources":["basic-behaviors.js"],"names":[],"mappings":"AA2DO,mIAJI,eAAe,GAAG,EAAE,iBA+D9B;AAIM,gDADK,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,iBAW/C;AAGM,0FADK,cAAc,GAAG;IAAE,IAAI,EAAE,OAAO,cAAc,EAAE,IAAI,CAAA;CAAE,iBAiCjE;AAqGM,uMAPI,cAAc,GAAG;IAC3B,IAAQ,EAAE,OAAO,cAAc,EAAE,IAAI,CAAC;IACtC,OAAW,EAAE;QACb,6BAAmC,EAAE,OAAO,wDAAwD,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC,+BAA+B,CAAC,CAAC;KACpK,CAAC;CACH,iBA6DH;AAQM,gOAJI,eAAe,GAAG;IAC5B,OAAW,EAAE;QAAE,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;KAAE,CAAC;CACvD,iBAyBH;AAQM,gGAJI,eAAe,GAAG;IAC5B,OAAW,EAAE;QAAE,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAA;KAAE,CAAC;CAClE,iBAgBH;AAQM,mHAFI,eAAe,GAAG,cAAc,iBAe1C;AAIM,gIADK,eAAe,GAAG,cAAc,iBAW3C;AASM,qHAJI,eAAe,GAAG;IAC5B,OAAW,EAAE;QAAE,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAA;KAAE,CAAC;CACzD,iBAWH;AAcM,+JAFI,eAAe,iBAwBzB;AAQM,kGAFI,cAAc,iBA6BxB;AAIM,uHADK,cAAc,iBAkCzB;AAIM,oIADK,cAAc,iBAiBzB;AASM,0MAJI,eAAe,GAAG;IAC5B,aAAiB,EAAE;QAAE,IAAI,EAAE;YAAE,OAAO,CAAC,EAAE,OAAO,SAAS,CAAA;SAAE,CAAA;KAAE,CAAC;CACzD,iBAmCH;AAUM,kTAJI,cAAc,GAAG;IAC3B,OAAW,EAAE;QAAE,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;KAAE,CAAC;CACxD,iBAwFH;AAGD,wDAAwD;AACxD,sCADW,OAAO,eAAe,EAAE,iBAAiB,CA0IlD;uBArxBY,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;qBAClC,IAAI,CAAC,UAAU,CAAC,8CAAuC,CAAC,CAAC;;;;;;;;;;;;;sCAIpC,sBAAsB"}
+{"version":3,"file":"basic-behaviors.d.ts","sourceRoot":"","sources":["basic-behaviors.js"],"names":[],"mappings":"AAgEO,mIATI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,OAAa,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;QACnC,eAAqB,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;KACtC,CAAC;CACH,iBA4DH;AAIM,gDADK,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,iBAW/C;AAGM,0FADK,cAAc,GAAG;IAAE,IAAI,EAAE,OAAO,cAAc,EAAE,IAAI,CAAA;CAAE,iBAiCjE;AAqGM,uMAPI,cAAc,GAAG;IAC3B,IAAQ,EAAE,OAAO,cAAc,EAAE,IAAI,CAAC;IACtC,OAAW,EAAE;QACb,6BAAmC,EAAE,OAAO,wDAAwD,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC,+BAA+B,CAAC,CAAC;KACpK,CAAC;CACH,iBA6DH;AAMM,gOAFI,eAAe,iBAyBzB;AAMM,gGAFI,eAAe,iBAgBzB;AAQM,mHAFI,eAAe,GAAG,cAAc,iBAe1C;AAIM,gIADK,eAAe,GAAG,cAAc,iBAW3C;AAOM,qHAFI,eAAe,iBAWzB;AAcM,+JAFI,eAAe,iBAwBzB;AAQM,kGAFI,cAAc,iBA6BxB;AAIM,uHADK,cAAc,iBAkCzB;AAIM,oIADK,cAAc,iBAiBzB;AASM,0MAJI,eAAe,GAAG;IAC5B,aAAiB,EAAE;QAAE,IAAI,EAAE;YAAE,OAAO,CAAC,EAAE,OAAO,SAAS,CAAA;SAAE,CAAA;KAAE,CAAC;CACzD,iBAmCH;AAQM,kTAFI,cAAc,iBAsFxB;AAGD,wDAAwD;AACxD,sCADW,OAAO,eAAe,EAAE,iBAAiB,CA0IlD;uBA5wBY,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;;;;;;;;;;;;;sCASb,sBAAsB"}

package/src/core/basic-behaviors.js

@@ -16,6 +16,7 @@ import { Fail, NonNullish } from '@agoric/assert';
 import { makeNameHubKit } from '../nameHub.js';
 import { PowerFlags } from '../walletFlags.js';
 import { feeIssuerConfig, makeMyAddressNameAdminKit } from './utils.js';
+import { makeScopedBridge } from '../bridge.js';
 
 /** @import {GovernableStartFn, GovernanceFacetKit} from '@agoric/governance/src/types.js'; */
 
@@ -50,10 +51,14 @@ const bootMsgEx = {
  */
 
 /** @typedef {MapStore<string, CreateVatResults>} VatStore */
-/** @typedef {ERef<ReturnType<import('../vat-zoe.js').buildRootObject>>} ZoeVat */
 
 /**
- * @param {BootstrapPowers & {}} powers
+ * @param {BootstrapPowers & {
+ *   produce: {
+ *     loadVat: Producer<VatLoader>;
+ *     loadCriticalVat: Producer<VatLoader>;
+ *   };
+ * }} powers
  * @import {CreateVatResults} from '@agoric/swingset-vat'
  *   as from createVatByName
  */
@@ -66,7 +71,6 @@ export const makeVatsFromBundles = async ({
   // NOTE: we rely on multiple createVatAdminService calls
   // to return cooperating services.
   const svc = E(vats.vatAdmin).createVatAdminService(devices.vatAdmin);
-  // @ts-expect-error XXX
   vatAdminSvc.resolve(svc);
 
   const durableStore = await vatStore;
@@ -81,7 +85,6 @@ export const makeVatsFromBundles = async ({
         if (bundleName) {
           console.info(`createVatByName(${bundleName})`);
           /** @type {Promise<CreateVatResults>} */
-          // @ts-expect-error XXX
           const vatInfo = E(svc).createVatByName(bundleName, {
             ...defaultVatCreationOptions,
             name: vatName,
@@ -92,7 +95,6 @@ export const makeVatsFromBundles = async ({
         assert(bundleID);
         const bcap = await E(svc).getBundleCap(bundleID);
         /** @type {Promise<CreateVatResults>} */
-        // @ts-expect-error XXX
         const vatInfo = E(svc).createVat(bcap, {
           ...defaultVatCreationOptions,
           name: vatName,
@@ -329,9 +331,7 @@ export const produceStartGovernedUpgradable = async ({
 harden(produceStartGovernedUpgradable);
 
 /**
- * @param {BootstrapPowers & {
- *   consume: { loadCriticalVat: ERef<VatLoader<ZoeVat>> };
- * }} powers
+ * @param {BootstrapPowers} powers
  */
 export const buildZoe = async ({
   consume: { vatAdminSvc, loadCriticalVat, client },
@@ -360,9 +360,7 @@ export const buildZoe = async ({
 harden(buildZoe);
 
 /**
- * @param {BootstrapPowers & {
- *   consume: { loadCriticalVat: ERef<VatLoader<PriceAuthorityVat>> };
- * }} powers
+ * @param {BootstrapPowers} powers
  */
 export const startPriceAuthorityRegistry = async ({
   consume: { loadCriticalVat, client },
@@ -418,9 +416,7 @@ harden(produceBoard);
 
 /**
  * @deprecated use produceBoard
- * @param {BootstrapPowers & {
- *   consume: { loadCriticalVat: ERef<VatLoader<BoardVat>> };
- * }} powers
+ * @param {BootstrapPowers} powers
  */
 export const makeBoard = async ({
   consume: { loadCriticalVat, client },
@@ -607,9 +603,7 @@ harden(mintInitialSupply);
 /**
  * Add IST (with initialSupply payment), BLD (with mint) to BankManager.
  *
- * @param {BootstrapSpace & {
- *   consume: { loadCriticalVat: ERef<VatLoader<BankVat>> };
- * }} powers
+ * @param {BootstrapSpace} powers
  */
 export const addBankAssets = async ({
   consume: {
@@ -656,10 +650,8 @@ export const addBankAssets = async ({
   const assetAdmin = E(agoricNamesAdmin).lookupAdmin('vbankAsset');
 
   const bridgeManager = await bridgeManagerP;
-  /** @type {import('../types.js').ScopedBridgeManager<'bank'> | undefined} */
-  // @ts-expect-error XXX EProxy
   const bankBridgeManager =
-    bridgeManager && E(bridgeManager).register(BridgeId.BANK);
+    bridgeManager && makeScopedBridge(bridgeManager, BridgeId.BANK);
   const bankMgr = await E(E(loadCriticalVat)('bank')).makeBankManager(
     bankBridgeManager,
     assetAdmin,

package/src/core/boot-chain.d.ts

@@ -1,32 +1,16 @@
 export namespace modules {
     let behaviors: {
         bridgeCoreEval: (allPowers: BootstrapPowers) => Promise<void>;
-        makeProvisioner: ({ consume: { clientCreator, loadCriticalVat }, vats: { comms, vattp }, produce: { provisioning }, }: BootstrapPowers & {
-            consume: {
-                loadCriticalVat: ERef<VatLoader<ProvisioningVat>>;
-            };
-        }) => Promise<void>;
+        makeProvisioner: ({ consume: { clientCreator, loadCriticalVat }, vats: { comms, vattp }, produce: { provisioning }, }: BootstrapPowers) => Promise<void>;
         noProvisioner: ({ produce: { provisioning } }: BootstrapPowers) => Promise<void>;
         bridgeProvisioner: ({ consume: { provisioning: provisioningP, provisionBridgeManager: provisionBridgeManagerP, provisionWalletBridgeManager: provisionWalletBridgeManagerP, }, }: BootstrapPowers) => Promise<void>;
         setupClientManager: ({ produce: { client, clientCreator: clientCreatorP } }: BootstrapSpace, { template, }?: {
             template?: Record<string, unknown>;
         }) => Promise<void>;
         startTimerService: ({ devices: { timer: timerDevice }, vats: { timer: timerVat }, consume: { client }, produce: { chainTimerService: produceTimer }, brand: { produce: { timer }, }, }: BootstrapPowers) => Promise<void>;
-        makeBridgeManager: ({ consume: { loadCriticalVat }, devices: { bridge }, produce: { bridgeManager: bridgeManagerP, provisionBridgeManager, provisionWalletBridgeManager, walletBridgeManager, }, }: BootDevices<ChainDevices> & BootstrapSpace & {
-            consume: {
-                loadCriticalVat: ERef<VatLoader<ChainStorageVat>>;
-            };
-        }) => Promise<void>;
-        makeChainStorage: ({ consume: { loadCriticalVat, bridgeManager: bridgeManagerP }, produce: { chainStorage: chainStorageP, storageBridgeManager: storageBridgeManagerP, }, }: BootstrapSpace & {
-            consume: {
-                loadCriticalVat: ERef<VatLoader<ChainStorageVat>>;
-            };
-        }) => Promise<void>;
-        produceHighPrioritySendersManager: ({ consume: { loadCriticalVat, storageBridgeManager: storageBridgeManagerP }, produce: { highPrioritySendersManager: managerP }, }: BootstrapSpace & {
-            consume: {
-                loadCriticalVat: ERef<VatLoader<ChainStorageVat>>;
-            };
-        }) => Promise<void>;
+        makeBridgeManager: ({ consume: { loadCriticalVat }, devices: { bridge }, produce: { bridgeManager: bridgeManagerP, provisionBridgeManager, provisionWalletBridgeManager, walletBridgeManager, }, }: BootDevices<ChainDevices> & BootstrapSpace) => Promise<void>;
+        makeChainStorage: ({ consume: { loadCriticalVat, bridgeManager: bridgeManagerP }, produce: { chainStorage: chainStorageP, storageBridgeManager: storageBridgeManagerP, }, }: BootstrapSpace) => Promise<void>;
+        produceHighPrioritySendersManager: ({ consume: { loadCriticalVat, storageBridgeManager: storageBridgeManagerP }, produce: { highPrioritySendersManager: managerP }, }: BootstrapSpace) => Promise<void>;
         publishAgoricNamesToChainStorage: ({ consume: { chainStorage: rootP }, namedVat: { consume: { agoricNames, board: vatBoard }, }, }: BootstrapPowers & NamedVatPowers) => Promise<void>;
         publishAgoricNames: ({ consume: { agoricNamesAdmin, board, chainStorage: rootP } }: BootstrapPowers, { options: { agoricNamesOptions } }?: {
             options?: {
@@ -36,7 +20,12 @@ export namespace modules {
             };
         }) => Promise<void>;
         connectChainFaucet: ({ consume: { client } }: BootstrapPowers) => Promise<void>;
-        makeVatsFromBundles: ({ vats, devices, consume: { vatStore }, produce: { vatAdminSvc, loadVat, loadCriticalVat }, }: BootstrapPowers & {}) => Promise<void>;
+        makeVatsFromBundles: ({ vats, devices, consume: { vatStore }, produce: { vatAdminSvc, loadVat, loadCriticalVat }, }: BootstrapPowers & {
+            produce: {
+                loadVat: Producer<VatLoader>;
+                loadCriticalVat: Producer<VatLoader>;
+            };
+        }) => Promise<void>;
         produceDiagnostics: ({ produce }: Pick<ChainBootstrapSpace, "produce">) => Promise<void>;
         produceStartUpgradable: ({ zone, consume: { diagnostics, zoe }, produce, }: BootstrapSpace & {
             zone: import("@agoric/base-zone").Zone;
@@ -47,23 +36,11 @@ export namespace modules {
                 economicCommitteeCreatorFacet: import("@agoric/inter-protocol/src/proposals/econ-behaviors.js").EconomyBootstrapPowers["consume"]["economicCommitteeCreatorFacet"];
             };
         }) => Promise<void>;
-        buildZoe: ({ consume: { vatAdminSvc, loadCriticalVat, client }, produce: { zoe, feeMintAccess }, brand: { produce: { Invitation: invitationBrand }, }, issuer: { produce: { Invitation: invitationIssuer }, }, }: BootstrapPowers & {
-            consume: {
-                loadCriticalVat: ERef<VatLoader<ZoeVat>>;
-            };
-        }) => Promise<void>;
-        startPriceAuthorityRegistry: ({ consume: { loadCriticalVat, client }, produce, }: BootstrapPowers & {
-            consume: {
-                loadCriticalVat: ERef<VatLoader<PriceAuthorityVat>>;
-            };
-        }) => Promise<void>;
+        buildZoe: ({ consume: { vatAdminSvc, loadCriticalVat, client }, produce: { zoe, feeMintAccess }, brand: { produce: { Invitation: invitationBrand }, }, issuer: { produce: { Invitation: invitationIssuer }, }, }: BootstrapPowers) => Promise<void>;
+        startPriceAuthorityRegistry: ({ consume: { loadCriticalVat, client }, produce, }: BootstrapPowers) => Promise<void>;
         makeOracleBrands: ({ namedVat: { consume: { agoricNames }, }, oracleBrand: { produce: { USD }, }, }: BootstrapPowers & NamedVatPowers) => Promise<void>;
         produceBoard: ({ consume: { client }, produce: { board: pBoard }, namedVat: { consume: { board: vatBoard }, }, }: BootstrapPowers & NamedVatPowers) => Promise<void>;
-        makeBoard: ({ consume: { loadCriticalVat, client }, produce: { board: { resolve: resolveBoard }, }, }: BootstrapPowers & {
-            consume: {
-                loadCriticalVat: ERef<VatLoader<BoardVat>>;
-            };
-        }) => Promise<void>;
+        makeBoard: ({ consume: { loadCriticalVat, client }, produce: { board: { resolve: resolveBoard }, }, }: BootstrapPowers) => Promise<void>;
         produceNamesByAddress: ({ consume: { agoricNames, provisioning: provisioningOptP, client }, produce: { namesByAddress, namesByAddressAdmin }, }: BootstrapPowers) => Promise<void>;
         makeAddressNameHubs: ({ consume: { agoricNames: agoricNamesP, client }, produce, }: BootstrapSpace) => Promise<void>;
         makeClientBanks: ({ consume: { namesByAddressAdmin, client, bankManager, walletFactoryStartResult, }, }: BootstrapSpace) => Promise<void>;
@@ -86,11 +63,7 @@ export namespace modules {
                 };
             };
         }) => Promise<void>;
-        addBankAssets: ({ consume: { agoricNamesAdmin, initialSupply, bridgeManager: bridgeManagerP, loadCriticalVat, startUpgradable, zoe, }, produce: { bankManager, bldIssuerKit }, installation: { consume: { mintHolder }, }, issuer: { produce: produceIssuer }, brand: { produce: produceBrand }, }: BootstrapSpace & {
-            consume: {
-                loadCriticalVat: ERef<VatLoader<BankVat>>;
-            };
-        }) => Promise<void>;
+        addBankAssets: ({ consume: { agoricNamesAdmin, initialSupply, bridgeManager: bridgeManagerP, loadCriticalVat, startUpgradable, zoe, }, produce: { bankManager, bldIssuerKit }, installation: { consume: { mintHolder }, }, issuer: { produce: produceIssuer }, brand: { produce: produceBrand }, }: BootstrapSpace) => Promise<void>;
     };
     let utils: {
         agoricNamesReserved: { [P in keyof WellKnownName]: { [P2 in WellKnownName[P]]: string; }; };
@@ -218,5 +191,4 @@ export function buildRootObject(vatPowers: VatPowers & {
     snapshotStore: <K, V>(store: MapStore<K, V>) => [K, V][];
 }>;
 export type BootstrapModules = typeof modules;
-import * as basicBehaviorsPlus from './basic-behaviors.js';
 //# sourceMappingURL=boot-chain.d.ts.map

package/src/core/boot-chain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"boot-chain.d.ts","sourceRoot":"","sources":["boot-chain.js"],"names":[],"mappings":";;;;;;;;;;;oBAkDkwK,CAAC;;;;;;;;;;;;;;;;;;;;mBAA23O,CAAC;kCAA6B,CAAC;4BAAqB,CAAC;;;;;;;;yBAAzjT,mBAAc;;;yBAA0/G,mBAAc;;+CAA6D,OAAQ,wDAAwD,mCAAmC;;;;;;;;;;;;;;;;;;;;;;;;;;;2BAA47Q,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qCAAxsa,GAAG;;;;;;;;;4DAAilG,aAAa;;;;uDAAkpB,aAAa;;;;;;;;gCAA2xC,aAAa;qCAAyC,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iGAApoH,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA/B1gH,iDAAiD;AAEjD,iEAAiD;AAc1C,2CATI,SAAS,GAAG;IACtB,CAAK,EAAE,MAAM,CAAC;IACd,MAAU,EAAE,CAAC,GAAG,KAAA,KAAK,IAAI,CAAC;CACvB,iBACO;IACV,qBAAyB,CAAC,EAAE,MAAM,EAAE,CAAC;CAClC,WACO,OAAO,kBAAkB,EAAE,OAAO;;;;;;;;;;;;;;GAc5C;+BA5Ba,OAAO,OAAO;oCAhBQ,sBAAsB"}
+{"version":3,"file":"boot-chain.d.ts","sourceRoot":"","sources":["boot-chain.js"],"names":[],"mappings":";;;;;;;oBAkD2uK,CAAC;;;;;;;;mBAA07N,CAAC;kCAA6B,CAAC;4BAAqB,CAAC;;;;;;;;;;;;;yBAAjnS,mBAAc;;;yBAA0/G,mBAAc;;+CAA6D,OAAQ,wDAAwD,mCAAmC;;;;;;;;;;;;;;;2BAAguQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;qCAA59Z,GAAG;;;;;;;;;4DAAilG,aAAa;;;;uDAAkpB,aAAa;;;;;;;;gCAA2xC,aAAa;qCAAyC,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iGAApoH,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA/B1gH,iDAAiD;AAEjD,iEAAiD;AAc1C,2CATI,SAAS,GAAG;IACtB,CAAK,EAAE,MAAM,CAAC;IACd,MAAU,EAAE,CAAC,GAAG,KAAA,KAAK,IAAI,CAAC;CACvB,iBACO;IACV,qBAAyB,CAAC,EAAE,MAAM,EAAE,CAAC;CAClC,WACO,OAAO,kBAAkB,EAAE,OAAO;;;;;;;;;;;;;;GAc5C;+BA5Ba,OAAO,OAAO"}

package/src/core/chain-behaviors.d.ts

@@ -1,30 +1,14 @@
 export function bridgeCoreEval(allPowers: BootstrapPowers): Promise<void>;
-export function makeProvisioner({ consume: { clientCreator, loadCriticalVat }, vats: { comms, vattp }, produce: { provisioning }, }: BootstrapPowers & {
-    consume: {
-        loadCriticalVat: ERef<VatLoader<ProvisioningVat>>;
-    };
-}): Promise<void>;
+export function makeProvisioner({ consume: { clientCreator, loadCriticalVat }, vats: { comms, vattp }, produce: { provisioning }, }: BootstrapPowers): Promise<void>;
 export function noProvisioner({ produce: { provisioning } }: BootstrapPowers): Promise<void>;
 export function bridgeProvisioner({ consume: { provisioning: provisioningP, provisionBridgeManager: provisionBridgeManagerP, provisionWalletBridgeManager: provisionWalletBridgeManagerP, }, }: BootstrapPowers): Promise<void>;
 export function setupClientManager({ produce: { client, clientCreator: clientCreatorP } }: BootstrapSpace, { template, }?: {
     template?: Record<string, unknown>;
 }): Promise<void>;
 export function startTimerService({ devices: { timer: timerDevice }, vats: { timer: timerVat }, consume: { client }, produce: { chainTimerService: produceTimer }, brand: { produce: { timer }, }, }: BootstrapPowers): Promise<void>;
-export function makeBridgeManager({ consume: { loadCriticalVat }, devices: { bridge }, produce: { bridgeManager: bridgeManagerP, provisionBridgeManager, provisionWalletBridgeManager, walletBridgeManager, }, }: BootDevices<ChainDevices> & BootstrapSpace & {
-    consume: {
-        loadCriticalVat: ERef<VatLoader<ChainStorageVat>>;
-    };
-}): Promise<void>;
-export function makeChainStorage({ consume: { loadCriticalVat, bridgeManager: bridgeManagerP }, produce: { chainStorage: chainStorageP, storageBridgeManager: storageBridgeManagerP, }, }: BootstrapSpace & {
-    consume: {
-        loadCriticalVat: ERef<VatLoader<ChainStorageVat>>;
-    };
-}): Promise<void>;
-export function produceHighPrioritySendersManager({ consume: { loadCriticalVat, storageBridgeManager: storageBridgeManagerP }, produce: { highPrioritySendersManager: managerP }, }: BootstrapSpace & {
-    consume: {
-        loadCriticalVat: ERef<VatLoader<ChainStorageVat>>;
-    };
-}): Promise<void>;
+export function makeBridgeManager({ consume: { loadCriticalVat }, devices: { bridge }, produce: { bridgeManager: bridgeManagerP, provisionBridgeManager, provisionWalletBridgeManager, walletBridgeManager, }, }: BootDevices<ChainDevices> & BootstrapSpace): Promise<void>;
+export function makeChainStorage({ consume: { loadCriticalVat, bridgeManager: bridgeManagerP }, produce: { chainStorage: chainStorageP, storageBridgeManager: storageBridgeManagerP, }, }: BootstrapSpace): Promise<void>;
+export function produceHighPrioritySendersManager({ consume: { loadCriticalVat, storageBridgeManager: storageBridgeManagerP }, produce: { highPrioritySendersManager: managerP }, }: BootstrapSpace): Promise<void>;
 export function publishAgoricNamesToChainStorage({ consume: { chainStorage: rootP }, namedVat: { consume: { agoricNames, board: vatBoard }, }, }: BootstrapPowers & NamedVatPowers): Promise<void>;
 export function publishAgoricNames({ consume: { agoricNamesAdmin, board, chainStorage: rootP } }: BootstrapPowers, { options: { agoricNamesOptions } }?: {
     options?: {

package/src/core/chain-behaviors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chain-behaviors.d.ts","sourceRoot":"","sources":["chain-behaviors.js"],"names":[],"mappings":"AA6BO,0CAFI,eAAe,iBAgFzB;AAQM,qIAJI,eAAe,GAAG;IAC5B,OAAW,EAAE;QAAE,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAA;KAAE,CAAC;CAChE,iBAUH;AAIM,6DADK,eAAe,iBAG1B;AAIM,gMADK,eAAe,iBAuD1B;AAcM,2FAHI,cAAc,kBACd;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,iBAqFhD;AAIM,sMADK,eAAe,iBAc1B;AASM,kNALI,WAAW,CAAC,YAAY,CAAC,GACnC,cAAkB,GAAG;IACrB,OAAa,EAAE;QAAE,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAA;KAAE,CAAC;CAChE,iBAmCL;AAQM,2LAJI,cAAc,GAAG;IAC3B,OAAW,EAAE;QAAE,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAA;KAAE,CAAC;CAChE,iBA8BH;AAOM,qLAJI,cAAc,GAAG;IAC3B,OAAW,EAAE;QAAE,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAA;KAAE,CAAC;CAChE,iBAqCH;AAGM,kJADK,eAAe,GAAG,cAAc,iBAkB3C;AAaM,kGATI,eAAe,wCACf;IACV,OAAW,CAAC,EAAE;QACd,kBAAwB,CAAC,EAAE;YAC3B,QAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;SACrB,CAAC;KACH,CAAC;CACH,iBAkCH;AAOM,4DAFI,eAAe,iBAMzB;AAGD,wDAAwD;AACxD,8CADW,OAAO,eAAe,EAAE,iBAAiB,CA2ElD;AAGF,wDAAwD;AACxD,uCADW,OAAO,eAAe,EAAE,iBAAiB,CASjD"}
+{"version":3,"file":"chain-behaviors.d.ts","sourceRoot":"","sources":["chain-behaviors.js"],"names":[],"mappings":"AA8BO,0CAFI,eAAe,iBAgFzB;AAMM,qIAFI,eAAe,iBAUzB;AAIM,6DADK,eAAe,iBAG1B;AAIM,gMADK,eAAe,iBAuD1B;AAcM,2FAHI,cAAc,kBACd;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,iBAqFhD;AAIM,sMADK,eAAe,iBAc1B;AAMM,kNAFI,WAAW,CAAC,YAAY,CAAC,GAAG,cAAc,iBAkCpD;AAMM,2LAFI,cAAc,iBA8BxB;AAKM,qLAFI,cAAc,iBAqCxB;AAGM,kJADK,eAAe,GAAG,cAAc,iBAkB3C;AAaM,kGATI,eAAe,wCACf;IACV,OAAW,CAAC,EAAE;QACd,kBAAwB,CAAC,EAAE;YAC3B,QAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;SACrB,CAAC;KACH,CAAC;CACH,iBAkCH;AAOM,4DAFI,eAAe,iBAMzB;AAGD,wDAAwD;AACxD,8CADW,OAAO,eAAe,EAAE,iBAAiB,CA2ElD;AAGF,wDAAwD;AACxD,uCADW,OAAO,eAAe,EAAE,iBAAiB,CASjD"}

package/src/core/chain-behaviors.js

@@ -16,6 +16,7 @@ import { makePromiseKit } from '@endo/promise-kit';
 import { PowerFlags } from '../walletFlags.js';
 import { BASIC_BOOTSTRAP_PERMITS } from './basic-behaviors.js';
 import { agoricNamesReserved, callProperties, extractPowers } from './utils.js';
+import { makeScopedBridge } from '../bridge.js';
 
 const { Fail } = assert;
 const { keys } = Object;
@@ -104,14 +105,12 @@ export const bridgeCoreEval = async allPowers => {
     // Not running with a bridge.
     return;
   }
-  await E(bridgeManager).register(BRIDGE_ID.CORE, handler);
+  await makeScopedBridge(bridgeManager, BRIDGE_ID.CORE, handler);
 };
 harden(bridgeCoreEval);
 
 /**
- * @param {BootstrapPowers & {
- *   consume: { loadCriticalVat: ERef<VatLoader<ProvisioningVat>> };
- * }} powers
+ * @param {BootstrapPowers} powers
  */
 export const makeProvisioner = async ({
   consume: { clientCreator, loadCriticalVat },
@@ -303,10 +302,7 @@ export const startTimerService = async ({
 harden(startTimerService);
 
 /**
- * @param {BootDevices<ChainDevices> &
- *   BootstrapSpace & {
- *     consume: { loadCriticalVat: ERef<VatLoader<ChainStorageVat>> };
- *   }} powers
+ * @param {BootDevices<ChainDevices> & BootstrapSpace} powers
  */
 export const makeBridgeManager = async ({
   consume: { loadCriticalVat },
@@ -332,22 +328,19 @@ export const makeBridgeManager = async ({
   const bridgeManager = E(vat).provideManagerForBridge(bridge);
   bridgeManagerP.resolve(bridgeManager);
   provisionBridgeManager.resolve(
-    // @ts-expect-error XXX EProxy
-    E(bridgeManager).register(BRIDGE_ID.PROVISION),
+    makeScopedBridge(bridgeManager, BRIDGE_ID.PROVISION),
   );
   provisionWalletBridgeManager.resolve(
-    // @ts-expect-error XXX EProxy
-    E(bridgeManager).register(BRIDGE_ID.PROVISION_SMART_WALLET),
+    makeScopedBridge(bridgeManager, BRIDGE_ID.PROVISION_SMART_WALLET),
+  );
+  walletBridgeManager.resolve(
+    makeScopedBridge(bridgeManager, BRIDGE_ID.WALLET),
   );
-  // @ts-expect-error XXX EProxy
-  walletBridgeManager.resolve(E(bridgeManager).register(BRIDGE_ID.WALLET));
 };
 harden(makeBridgeManager);
 
 /**
- * @param {BootstrapSpace & {
- *   consume: { loadCriticalVat: ERef<VatLoader<ChainStorageVat>> };
- * }} powers
+ * @param {BootstrapSpace} powers
  */
 export const makeChainStorage = async ({
   consume: { loadCriticalVat, bridgeManager: bridgeManagerP },
@@ -360,14 +353,14 @@ export const makeChainStorage = async ({
   if (!bridgeManager) {
     console.warn('Cannot support chainStorage without an actual chain.');
     chainStorageP.resolve(null);
-    // @ts-expect-error expects value or undefined
-    storageBridgeManagerP.resolve(null);
+    storageBridgeManagerP.resolve(undefined);
     return;
   }
 
-  /** @type {import('../types.js').ScopedBridgeManager<'storage'>} */
-  // @ts-expect-error XXX EProxy
-  const storageBridgeManager = E(bridgeManager).register(BRIDGE_ID.STORAGE);
+  const storageBridgeManager = makeScopedBridge(
+    bridgeManager,
+    BRIDGE_ID.STORAGE,
+  );
   storageBridgeManagerP.resolve(storageBridgeManager);
 
   const vat = E(loadCriticalVat)('bridge');
@@ -380,9 +373,7 @@ export const makeChainStorage = async ({
 };
 
 /**
- * @param {BootstrapSpace & {
- *   consume: { loadCriticalVat: ERef<VatLoader<ChainStorageVat>> };
- * }} powers
+ * @param {BootstrapSpace} powers
  */
 export const produceHighPrioritySendersManager = async ({
   consume: { loadCriticalVat, storageBridgeManager: storageBridgeManagerP },

package/src/core/demoIssuers.d.ts

@@ -39,11 +39,7 @@ export const AMMDemoState: Record<string, {
         collateral: bigint;
     }[];
 }>;
-export function connectFaucet({ consume: { bankManager, bldIssuerKit: bldP, client, feeMintAccess, loadVat, zoe, }, installation: { consume: { centralSupply: centralSupplyInstall }, }, produce: { mints }, }: BootstrapSpace & {
-    consume: {
-        loadVat: VatLoader<MintsVat>;
-    };
-}): Promise<void>;
+export function connectFaucet({ consume: { bankManager, bldIssuerKit: bldP, client, feeMintAccess, loadVat, zoe, }, installation: { consume: { centralSupply: centralSupplyInstall }, }, produce: { mints }, }: BootstrapSpace): Promise<void>;
 export function ammPoolRunDeposits(issuers: typeof AMMDemoState): {
     ammTotal: bigint;
     balances: {

package/src/core/demoIssuers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"demoIssuers.d.ts","sourceRoot":"","sources":["demoIssuers.js"],"names":[],"mappings":"AAeA,qCAAqC;AACrC,4BADW,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAU/B;AA0CK,2BAHI,MAAM,OACN,MAAM,UAQhB;AAEM,0CAC+C;AAC/C;;;WAIN;AAWD;;;;;;;;;;;;;;;;;GAiBG;AACH,2BAhBU,MAAM,CACf,MAAU,EACV;IACA,MAAY,CAAC,EAAE;QACf,eAAuB,EAAE,MAAM,CAAC;QAChC,aAAqB,EAAE,QAAQ,CAAC;QAChC,iBAAyB,EAAE,QAAQ,CAAC;QACpC,kBAA0B,EAAE,QAAQ,CAAC;QACrC,YAAoB,EAAE,QAAQ,CAAC;QAC/B,OAAe,EAAE,QAAQ,CAAC;QAC1B,kBAA0B,CAAC,EAAE,QAAQ,CAAC;KAC/B,CAAC;IACR,MAAY,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACnD,CACF,CAqEF;AAsDK,gNAXI,cAAc,GAAG;IAAE,OAAO,EAAE;QAAE,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAA;KAAE,CAAA;CAAE,iBAiIxE;AAQM,4CAFI,OAAO,YAAY;;;;;EAgC7B;AAOM,0DAJI,OAAO,YACP,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WACtB;IAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE;;;;;GA4BhD;AAQM,sCALI,MAAM,UACN,CAAC,OAAO,YAAY,EAAE,MAAM,CAAC,QAC7B,MAAM,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC,WACtD;IAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;CAAE;;;;;;;;;;;;EAoC9D;uBAjXY,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;gCAkIzB;IACZ,MAAU,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACzB,aAAiB,EAAE,MAAM,CAAC;IAC1B,OAAW,EAAE,OAAO,CAAC;IACrB,KAAS,EAAE,KAAK,CAAC;IACjB,YAAgB,EAAE,MAAM,CAAC;CACtB"}
+{"version":3,"file":"demoIssuers.d.ts","sourceRoot":"","sources":["demoIssuers.js"],"names":[],"mappings":"AAeA,qCAAqC;AACrC,4BADW,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAU/B;AA0CK,2BAHI,MAAM,OACN,MAAM,UAQhB;AAEM,0CAC+C;AAC/C;;;WAIN;AAWD;;;;;;;;;;;;;;;;;GAiBG;AACH,2BAhBU,MAAM,CACf,MAAU,EACV;IACA,MAAY,CAAC,EAAE;QACf,eAAuB,EAAE,MAAM,CAAC;QAChC,aAAqB,EAAE,QAAQ,CAAC;QAChC,iBAAyB,EAAE,QAAQ,CAAC;QACpC,kBAA0B,EAAE,QAAQ,CAAC;QACrC,YAAoB,EAAE,QAAQ,CAAC;QAC/B,OAAe,EAAE,QAAQ,CAAC;QAC1B,kBAA0B,CAAC,EAAE,QAAQ,CAAC;KAC/B,CAAC;IACR,MAAY,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACnD,CACF,CAqEF;AAqDK,gNAVI,cAAc,iBAgIxB;AAQM,4CAFI,OAAO,YAAY;;;;;EAgC7B;AAOM,0DAJI,OAAO,YACP,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WACtB;IAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE;;;;;GA4BhD;AAQM,sCALI,MAAM,UACN,CAAC,OAAO,YAAY,EAAE,MAAM,CAAC,QAC7B,MAAM,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC,WACtD;IAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;CAAE;;;;;;;;;;;;EAoC9D;uBAhXY,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;gCAiIzB;IACZ,MAAU,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACzB,aAAiB,EAAE,MAAM,CAAC;IAC1B,OAAW,EAAE,OAAO,CAAC;IACrB,KAAS,EAAE,KAAK,CAAC;IACjB,YAAgB,EAAE,MAAM,CAAC;CACtB"}

package/src/core/demoIssuers.js

@@ -209,7 +209,7 @@ const mintRunPayment = async (
 
 /**
  * @param {string} name
- * @param {MintsVat} mints
+ * @param {ERef<MintsVat>} mints
  */
 const provideCoin = async (name, mints) => {
   return E(mints).provideIssuerKit(name, AssetKind.NAT, {
@@ -218,8 +218,7 @@ const provideCoin = async (name, mints) => {
 };
 
 /**
- * @param {BootstrapSpace & { consume: { loadVat: VatLoader<MintsVat> } }} powers
- *   TODO: sync this type with end-user docs?
+ * @param {BootstrapSpace} powers TODO: sync this type with end-user docs?
  *
  * @typedef {{
  *   issuer: ERef<Issuer>;

package/src/core/types-ambient.d.ts

@@ -109,7 +109,10 @@ type Producer<T> = {
 };
 
 type VatSourceRef = { bundleName?: string; bundleID?: string };
-type VatLoader<T> = (name: string, sourceRef?: VatSourceRef) => T;
+type VatLoader<Names extends string = keyof WellKnownVats> = <N extends Names>(
+  name: N,
+  sourceRef?: VatSourceRef,
+) => Promise<Awaited<WellKnownVats[N]>>;
 
 /** callback to assign a property onto the `home` object of the client */
 type PropertyMaker = (addr: string, flags: string[]) => Record<string, unknown>;
@@ -435,13 +438,21 @@ type BootstrapSpace = WellKnownSpaces &
     ChainBootstrapSpaceT & {
       vatAdminSvc: VatAdminSvc;
     },
-    {},
     {
-      loadVat: VatLoader<unknown>;
-      loadCriticalVat: VatLoader<unknown>;
-    }
+      loadVat: VatLoader;
+      loadCriticalVat: VatLoader;
+    },
+    {}
   >;
 
+type LocalChainVat = ERef<
+  ReturnType<typeof import('../vat-localchain.js').buildRootObject>
+>;
+
+type TransferVat = ERef<
+  ReturnType<typeof import('../vat-transfer.js').buildRootObject>
+>;
+
 type ProvisioningVat = ERef<
   ReturnType<typeof import('../vat-provisioning.js').buildRootObject>
 >;
@@ -465,6 +476,9 @@ type NamedVatPowers = {
   }>;
 };
 
+type OrchestrationVat = ERef<import('@agoric/orchestration').OrchestrationVat>;
+type ZoeVat = ERef<import('../vat-zoe.js').ZoeVat>;
+
 type RemoteIssuerKit = {
   mint: ERef<Mint>;
   issuer: ERef<Issuer>;
@@ -507,3 +521,18 @@ type HttpVat = ERef<
 type UploadsVat = ERef<
   ReturnType<typeof import('@agoric/solo/src/vat-uploads.js').buildRootObject>
 >;
+
+type WellKnownVats = SwingsetVats & {
+  bank: BankVat;
+  board: BoardVat;
+  bridge: ChainStorageVat;
+  ibc: IBCVat;
+  localchain: LocalChainVat;
+  mints: MintsVat;
+  network: NetworkVat;
+  orchestration: OrchestrationVat;
+  priceAuthority: PriceAuthorityVat;
+  provisioning: ProvisioningVat;
+  transfer: TransferVat;
+  zoe: ZoeVat;
+};

package/src/core/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAcA;;;;;;;GAOG;AACH,kCAJU,GACJ,CAAwB,IAAnB,MAAM,aAAa,GAAG,GAAG,EAAsB,IAAhB,aAAa,CAAC,CAAC,CAAC,GAAG,MAAM,GAAE,GACjE,CA+DD;AAEH,8BAA8B;AAC9B,8BADW,eAAe,CAKxB;AAQK,gCAHI,MAAM,8BACN;IAAE,IAAI,EAAE;QAAE,KAAK,EAAE,QAAQ,CAAC;QAAC,KAAK,EAAE,YAAY,CAAA;KAAE,CAAA;CAAE,iBAK5D;AAQM,yCAJI,CAAC,CAAC,GAAG,IAAI,KAAA,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,WACrC,OAAO,EAAA,GACR,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAG0B;AAWvD,kCALI,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,YAEnC,OAAO,oCAkCjB;AAQM,sCAJI,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,aAEnC,OAAO,OAYjB;AAUM,oFALJ;IAAsB,SAAS,EAAvB,OAAO;IACuB,SAAS,EAAvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACuB,QAAQ,EAAtD,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC0B,UAAU,EAA3E,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO;CACpE,kBAuBA;AASM,sDAHI,IAAI,CAAC,OAAO,aAAa,EAAE,SAAS,CAAC;;;4CAyB/C;AAOM,iDAJI,IAAI,CAAC,OAAO,aAAa,EAAE,SAAS,CAAC;;;uEAsB/C;AAoBM;;;0BAXI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAKrC,OAAO,CAAC;IACpB,WAAe,EAAE,OAAO,aAAa,EAAE,OAAO,CAAC;IAC/C,gBAAoB,EAAE,OAAO,aAAa,EAAE,SAAS,CAAC;IACtD,MAAU,EAAE,eAAe,CAAC;CACzB,CAAC,CAsBJ;AAMM,mDAFI,MAAM;;;EAgBhB;AAYM,kCAPI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,kBAC/D,OAAO,mBACG,GAAG,KAAK,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yFA5KtB,WAGX;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8NC;uBA1Da,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;sCAOb,sBAAsB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAcA;;;;;;;GAOG;AACH,kCAJU,GACJ,CAAwB,IAAnB,MAAM,aAAa,GAAG,GAAG,EAAsB,IAAhB,aAAa,CAAC,CAAC,CAAC,GAAG,MAAM,GAAE,GACjE,CA+DD;AAEH,8BAA8B;AAC9B,8BADW,eAAe,CAKxB;AAQK,gCAHI,MAAM,8BACN;IAAE,IAAI,EAAE;QAAE,KAAK,EAAE,QAAQ,CAAC;QAAC,KAAK,EAAE,YAAY,CAAA;KAAE,CAAA;CAAE,iBAK5D;AAQM,yCAJI,CAAC,CAAC,GAAG,IAAI,KAAA,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,WACrC,OAAO,EAAA,GACR,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAG0B;AAWvD,kCALI,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,YAEnC,OAAO,oCAkCjB;AAQM,sCAJI,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,aAEnC,OAAO,OAYjB;AAUM,oFALJ;IAAsB,SAAS,EAAvB,OAAO;IACuB,SAAS,EAAvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACuB,QAAQ,EAAtD,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC0B,UAAU,EAA3E,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO;CACpE,kBAuBA;AASM,sDAHI,IAAI,CAAC,OAAO,aAAa,EAAE,SAAS,CAAC;;;4CAyB/C;AAOM,iDAJI,IAAI,CAAC,OAAO,aAAa,EAAE,SAAS,CAAC;;;uEAsB/C;AAoBM;;;0BAXI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAKrC,OAAO,CAAC;IACpB,WAAe,EAAE,OAAO,aAAa,EAAE,OAAO,CAAC;IAC/C,gBAAoB,EAAE,OAAO,aAAa,EAAE,SAAS,CAAC;IACtD,MAAU,EAAE,eAAe,CAAC;CACzB,CAAC,CAsBJ;AAMM,mDAFI,MAAM;;;EAgBhB;AAYM,kCAPI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,kBAC/D,OAAO,mBACG,GAAG,KAAK,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yFA5KtB,WAGX;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6NC;uBAzDa,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;sCAOb,sBAAsB"}

package/src/core/utils.js

@@ -363,7 +363,6 @@ export const makeVatSpace = (
     {
       get: (_target, name, _rx) => {
         assert.typeof(name, 'string');
-        // @ts-expect-error XXX
         return provideAsync(name, createVatByName).then(vat => {
           if (!durableStore.has(name)) {
             durableStore.init(name, vat);

package/src/proposals/localchain-proposal.d.ts

@@ -1,6 +1,5 @@
 export function setupLocalChainVat({ consume: { loadCriticalVat, bridgeManager: bridgeManagerP, localchainBridgeManager: localchainBridgeManagerP, bankManager, transferMiddleware, }, produce: { localchainVat, localchain, localchainBridgeManager }, }: BootstrapPowers & {
     consume: {
-        loadCriticalVat: VatLoader<any>;
         bridgeManager: import("../types").BridgeManager;
         localchainBridgeManager: import("../types").ScopedBridgeManager<"vlocalchain">;
         bankManager: Promise<import("../vat-bank.js").BankManager>;

package/src/proposals/localchain-proposal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"localchain-proposal.d.ts","sourceRoot":"","sources":["localchain-proposal.js"],"names":[],"mappings":"AA0BO,2PArBI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,eAAqB,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;QACtC,aAAmB,EAAE,OAAO,UAAU,EAAE,aAAa,CAAC;QACtD,uBAA6B,EAAE,OAAO,UAAU,EAAE,mBAAmB,CAAC,aAAa,CAAC,CAAC;QACrF,WAAiB,EAAE,OAAO,CAAC,OAAO,gBAAgB,EAAE,WAAW,CAAC,CAAC;QACjE,kBAAwB,EAAE,OAAO,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;KAC1E,CAAC;IACN,OAAW,EAAE;QACb,UAAgB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QAChC,aAAmB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,uBAA6B,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;KACxC,CAAC;CACH,WAED;IAAiD,OAAO,EAAhD;QAAE,aAAa,EAAE,YAAY,CAAA;KAAE;CAEvC,iBA4DF;AAUM,2EAPI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,UAAgB,EAAE,OAAO,kBAAkB,EAAE,UAAU,CAAC;KACnD,CAAC;CACH,YACO,MAAM,iBAOhB;AAEM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2BL;6BAxGW;IACZ,UAAc,EAAE,IAAI,CAAC,OAAO,sBAAsB,EAAE,aAAa,CAAC,CAAC;CAChE"}
+{"version":3,"file":"localchain-proposal.d.ts","sourceRoot":"","sources":["localchain-proposal.js"],"names":[],"mappings":"AA0BO,2PApBI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,aAAmB,EAAE,OAAO,UAAU,EAAE,aAAa,CAAC;QACtD,uBAA6B,EAAE,OAAO,UAAU,EAAE,mBAAmB,CAAC,aAAa,CAAC,CAAC;QACrF,WAAiB,EAAE,OAAO,CAAC,OAAO,gBAAgB,EAAE,WAAW,CAAC,CAAC;QACjE,kBAAwB,EAAE,OAAO,CAAC,OAAO,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;KAC1E,CAAC;IACN,OAAW,EAAE;QACb,UAAgB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QAChC,aAAmB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,uBAA6B,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;KACxC,CAAC;CACH,WAED;IAAiD,OAAO,EAAhD;QAAE,aAAa,EAAE,YAAY,CAAA;KAAE;CAEvC,iBA6DF;AAUM,2EAPI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,UAAgB,EAAE,OAAO,kBAAkB,EAAE,UAAU,CAAC;KACnD,CAAC;CACH,YACO,MAAM,iBAOhB;AAEM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2BL;6BAzGW;IACZ,UAAc,EAAE,IAAI,CAAC,OAAO,sBAAsB,EAAE,aAAa,CAAC,CAAC;CAChE"}

package/src/proposals/localchain-proposal.js

@@ -1,11 +1,11 @@
 // @ts-check
 import { E } from '@endo/far';
 import { BridgeId as BRIDGE_ID } from '@agoric/internal';
+import { makeScopedBridge } from '../bridge.js';
 
 /**
  * @param {BootstrapPowers & {
  *   consume: {
- *     loadCriticalVat: VatLoader<any>;
  *     bridgeManager: import('../types').BridgeManager;
  *     localchainBridgeManager: import('../types').ScopedBridgeManager<'vlocalchain'>;
  *     bankManager: Promise<import('../vat-bank.js').BankManager>;
@@ -58,9 +58,10 @@ export const setupLocalChainVat = async (
   /** @type {import('../types').ScopedBridgeManager<'vlocalchain'>} */
   let scopedManager;
   try {
-    /** @type {import('../types.js').ScopedBridgeManager<'vlocalchain'>} */
-    // @ts-expect-error XXX EProxy
-    scopedManager = await E(bridgeManager).register(BRIDGE_ID.VLOCALCHAIN);
+    scopedManager = await makeScopedBridge(
+      bridgeManager,
+      BRIDGE_ID.VLOCALCHAIN,
+    );
     localchainBridgeManager.reset();
     localchainBridgeManager.resolve(scopedManager);
   } catch (e) {

package/src/proposals/network-proposal.d.ts

@@ -1,8 +1,5 @@
 export function registerNetworkProtocols(vats: SoloVats | NetVats, dibcBridgeManager?: globalThis.ERef<import("../types.js").ScopedBridgeManager<"dibc">> | undefined): Promise<void>;
 export function setupNetworkProtocols({ consume: { client, loadCriticalVat, bridgeManager: bridgeManagerP, provisioning, vatUpgradeInfo: vatUpgradeInfoP, }, produce: { portAllocator, vatUpgradeInfo: produceVatUpgradeInfo }, }: BootstrapPowers & {
-    consume: {
-        loadCriticalVat: VatLoader<any>;
-    };
     produce: {
         portAllocator: Producer<any>;
     };
@@ -38,23 +35,6 @@ export function getManifestForNetwork(_powers: any, { networkRef, ibcRef }: {
         ibcRef: any;
     };
 };
-/**
- * Create the network and IBC vats; produce `portAllocator` in the core /
- * bootstrap space.
- *
- * The `portAllocator` is CLOSELY HELD in the core space, where later, we claim
- * ports using `E(portAllocator).allocateCustomIBCPort`, for example.
- *
- * Contracts are expected to use the services of the network and IBC vats by way
- * of such ports.
- *
- * Testing facilities include:
- *
- * - loopback ports: `E(portAllocator).allocateCustomLocalPort()`
- * - an echo port: `E(portAllocator).allocateCustomIBCPort("echo")`
- * - echo port addrees: /ibc-port/custom-echo
- */
-export type VatLoader2 = ((name: "network") => NetworkVat) & ((name: "ibc") => IBCVat);
 /**
  * Create the network and IBC vats; produce `portAllocator` in the core /
  * bootstrap space.

package/src/proposals/network-proposal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network-proposal.d.ts","sourceRoot":"","sources":["network-proposal.js"],"names":[],"mappings":"AA0BO,+CAHI,QAAQ,GAAG,OAAO,qHAuC5B;AAmCM,mOAjBI,eAAe,GAAG;IAC5B,OAAW,EAAE;QAAE,eAAe,EAAE,SAAS,CAAC,GAAG,CAAC,CAAA;KAAE,CAAC;IACjD,OAAW,EAAE;QAAE,aAAa,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAA;KAAE,CAAC;CAC3C,WAED;IAAoE,OAAO,EAAnE;QAAE,UAAU,EAAE,YAAY,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE;CAG1D,iBAgFF;AAEM;;;;;;;;;;;;;;;;;;;;;;;;;EAsBL;;;;;;;;;;;;;;;;;yBAxGW,CAAC,CAAC,IAAI,EAAE,SAAS,KAAK,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK,MAAM,CAAC;;;;;;;;;;;;;;;;;sBAG7D;IACZ,OAAW,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC9B,GAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACtB,YAAgB,EAAE,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC;CACjD"}
+{"version":3,"file":"network-proposal.d.ts","sourceRoot":"","sources":["network-proposal.js"],"names":[],"mappings":"AA2BO,+CAHI,QAAQ,GAAG,OAAO,qHAuC5B;AA8BM,mOAZI,eAAe,GAAG;IAC5B,OAAW,EAAE;QAAE,aAAa,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAA;KAAE,CAAC;CAC3C,WAED;IAAoE,OAAO,EAAnE;QAAE,UAAU,EAAE,YAAY,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE;CAE1D,iBA2EF;AAEM;;;;;;;;;;;;;;;;;;;;;;;;;EAsBL;;;;;;;;;;;;;;;;;sBAnGW;IACZ,OAAW,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC9B,GAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACtB,YAAgB,EAAE,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC;CACjD"}

package/src/proposals/network-proposal.js

@@ -10,6 +10,7 @@ import { makeScalarBigMapStore } from '@agoric/vat-data';
 // Heap-based vow resolution is used for this module because the
 // bootstrap vat can't yet be upgraded.
 import { heapVowTools } from '@agoric/vow/vat.js';
+import { makeScopedBridge } from '../bridge.js';
 
 const { when } = heapVowTools;
 
@@ -79,15 +80,10 @@ export const registerNetworkProtocols = async (vats, dibcBridgeManager) => {
  * - echo port addrees: /ibc-port/custom-echo
  *
  * @param {BootstrapPowers & {
- *   consume: { loadCriticalVat: VatLoader<any> };
  *   produce: { portAllocator: Producer<any> };
  * }} powers
  * @param {object} options
  * @param {{ networkRef: VatSourceRef; ibcRef: VatSourceRef }} options.options
- *   // TODO: why doesn't overloading VatLoader work???
- *
- * @typedef {((name: 'network') => NetworkVat) & ((name: 'ibc') => IBCVat)} VatLoader2
- *
  *
  * @typedef {{
  *   network: ERef<NetworkVat>;
@@ -133,10 +129,8 @@ export const setupNetworkProtocols = async (
   const allocator = await portAllocatorP;
 
   const bridgeManager = await bridgeManagerP;
-  /** @type {import('../types.js').ScopedBridgeManager<'dibc'> | undefined} */
-  // @ts-expect-error XXX EProxy
   const dibcBridgeManager =
-    bridgeManager && E(bridgeManager).register(BRIDGE_ID.DIBC);
+    bridgeManager && makeScopedBridge(bridgeManager, BRIDGE_ID.DIBC);
 
   // The Interchain Account (ICA) Controller must be bound to a port that starts
   // with 'icacontroller', so we provide one such port to each client.

package/src/proposals/transfer-proposal.d.ts

@@ -1,6 +1,5 @@
 export function setupTransferMiddleware({ consume: { loadCriticalVat, bridgeManager: bridgeManagerP, vtransferBridgeManager: vtransferBridgeManagerP, }, produce: { transferMiddleware: produceTransferMiddleware, transferVat: produceTransferVat, vtransferBridgeManager: produceVtransferBridgeManager, }, }: BootstrapPowers & {
     consume: {
-        loadCriticalVat: VatLoader<any>;
         bridgeManager: import("../types").BridgeManager;
         vtransferBridgeManager: import("../types").ScopedBridgeManager<"vtransfer">;
     };
@@ -35,7 +34,4 @@ export function getManifestForTransfer(_powers: any, { transferRef }: {
         transferRef: any;
     };
 };
-export type TransferVats = {
-    transfer: ERef<import("../vat-transfer.js").TransferVat>;
-};
 //# sourceMappingURL=transfer-proposal.d.ts.map

package/src/proposals/transfer-proposal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transfer-proposal.d.ts","sourceRoot":"","sources":["transfer-proposal.js"],"names":[],"mappings":"AAwBO,iTAnBI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,eAAqB,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;QACtC,aAAmB,EAAE,OAAO,UAAU,EAAE,aAAa,CAAC;QACtD,sBAA4B,EAAE,OAAO,UAAU,EAAE,mBAAmB,CAAC,WAAW,CAAC,CAAC;KAC7E,CAAC;IACN,OAAW,EAAE;QACb,kBAAwB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACxC,WAAiB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACjC,sBAA4B,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;KACvC,CAAC;CACH,WAED;IAA+C,OAAO,EAA9C;QAAE,WAAW,EAAE,YAAY,CAAA;KAAE;CAErC,iBA+EF;AAEM;;;;;;;;;;;;;;;;;;;;EAkBL;2BAnGW;IACZ,QAAY,EAAE,IAAI,CAAC,OAAO,oBAAoB,EAAE,WAAW,CAAC,CAAC;CAC1D"}
+{"version":3,"file":"transfer-proposal.d.ts","sourceRoot":"","sources":["transfer-proposal.js"],"names":[],"mappings":"AAoBO,iTAdI,eAAe,GAAG;IAC5B,OAAW,EAAE;QACb,aAAmB,EAAE,OAAO,UAAU,EAAE,aAAa,CAAC;QACtD,sBAA4B,EAAE,OAAO,UAAU,EAAE,mBAAmB,CAAC,WAAW,CAAC,CAAC;KAC7E,CAAC;IACN,OAAW,EAAE;QACb,kBAAwB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACxC,WAAiB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACjC,sBAA4B,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;KACvC,CAAC;CACH,WAED;IAA+C,OAAO,EAA9C;QAAE,WAAW,EAAE,YAAY,CAAA;KAAE;CACvC,iBA2EA;AAEM;;;;;;;;;;;;;;;;;;;;EAkBL"}

package/src/proposals/transfer-proposal.js

@@ -1,11 +1,11 @@
 // @ts-check
 import { E } from '@endo/far';
 import { BridgeId as BRIDGE_ID, VTRANSFER_IBC_EVENT } from '@agoric/internal';
+import { makeScopedBridge } from '../bridge.js';
 
 /**
  * @param {BootstrapPowers & {
  *   consume: {
- *     loadCriticalVat: VatLoader<any>;
  *     bridgeManager: import('../types').BridgeManager;
  *     vtransferBridgeManager: import('../types').ScopedBridgeManager<'vtransfer'>;
  *   };
@@ -17,10 +17,6 @@ import { BridgeId as BRIDGE_ID, VTRANSFER_IBC_EVENT } from '@agoric/internal';
  * }} powers
  * @param {object} options
  * @param {{ transferRef: VatSourceRef }} options.options
- *
- * @typedef {{
- *   transfer: ERef<import('../vat-transfer.js').TransferVat>;
- * }} TransferVats
  */
 export const setupTransferMiddleware = async (
   {
@@ -44,7 +40,6 @@ export const setupTransferMiddleware = async (
   }
 
   const { transferRef } = options.options;
-  /** @type {TransferVats} */
   const vats = {
     transfer: E(loadCriticalVat)('transfer', transferRef),
   };
@@ -73,7 +68,7 @@ export const setupTransferMiddleware = async (
   /** @type {Awaited<ReturnType<typeof provideBridgeTargetKit>>} */
   let bridgeTargetKit;
   try {
-    const vtransferBridge = await E(bridgeManager).register(vtransferID);
+    const vtransferBridge = await makeScopedBridge(bridgeManager, vtransferID);
     produceVtransferBridgeManager.reset();
     produceVtransferBridgeManager.resolve(vtransferBridge);
     bridgeTargetKit = await provideBridgeTargetKit(vtransferBridge);

package/src/types.d.ts

@@ -114,7 +114,7 @@ export type ScopedBridgeManager<BridgeId extends BridgeIdValue> = Guarded<{
 export type BridgeManager = {
   register: <BridgeId extends BridgeIdValue>(
     bridgeId: BridgeId,
-    handler?: Remote<BridgeHandler | undefined>,
+    handler?: Remote<BridgeHandler>,
   ) => ScopedBridgeManager<BridgeId>;
 };
 

package/src/vat-bridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vat-bridge.d.ts","sourceRoot":"","sources":["vat-bridge.js"],"names":[],"mappings":"AAOA;yDAea,IAAI,CAAC,OAAO,YAAY,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC,YACzD,MAAM,YACN,MAAM;;;;oBA0BwwJ,CAAC;;;;oEAA5wB,YAAY;;yDA5B/gI,IAAI,CAAC,OAAO,YAAY,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC,YACzD,MAAM,YACN,MAAM;;;;oBA0BwwJ,CAAC;;;;;GAD3xJ"}
+{"version":3,"file":"vat-bridge.d.ts","sourceRoot":"","sources":["vat-bridge.js"],"names":[],"mappings":"AAOA;yDAea,IAAI,CAAC,OAAO,YAAY,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC,YACzD,MAAM,YACN,MAAM;;;;oBA0BwwJ,CAAC;;;;oEAA4H,YAAY;;yDA5Bv5J,IAAI,CAAC,OAAO,YAAY,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC,YACzD,MAAM,YACN,MAAM;;;;oBA0BwwJ,CAAC;;;;;GAD3xJ"}

package/src/vat-zoe.d.ts

@@ -11,4 +11,5 @@ export function buildRootObject(vatPowers: any, _vatParams: any, zoeBaggage: any
     }>;
     getZoeConfigFacet: () => any;
 }>;
+export type ZoeVat = ReturnType<typeof buildRootObject>;
 //# sourceMappingURL=vat-zoe.d.ts.map

package/src/vat-zoe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vat-zoe.d.ts","sourceRoot":"","sources":["vat-zoe.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;;GAgDC"}
+{"version":3,"file":"vat-zoe.d.ts","sourceRoot":"","sources":["vat-zoe.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;;GAgDC;qBAEa,UAAU,CAAC,OAAO,eAAe,CAAC"}

package/src/vat-zoe.js

@@ -52,3 +52,5 @@ export function buildRootObject(vatPowers, _vatParams, zoeBaggage) {
     getZoeConfigFacet: () => zoeConfigFacet,
   });
 }
+
+/** @typedef {ReturnType<typeof buildRootObject>} ZoeVat */