Merge pull request #8821 from Agoric/8113-provision-names

fix(provisioning): export useful namesByAddress

packages/boot/test/bootstrapTests/test-demo-config.ts

@@ -3,6 +3,8 @@ import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 import { PowerFlags } from '@agoric/vats/src/walletFlags.js';
 
 import type { TestFn } from 'ava';
+import type { NameAdmin, NameHub } from '@agoric/vats';
+
 import { makeSwingsetTestKit, keyArrayEqual } from '../../tools/supports.ts';
 
 const { keys } = Object;
@@ -69,6 +71,15 @@ test('sim/demo config provides home with .myAddressNameAdmin', async t => {
   keyArrayEqual(t, keys(home).sort(), homeKeys);
 });
 
+test('namesByAddress contains provisioned account', async t => {
+  const { EV } = t.context.runUtils;
+  const addr = 'agoric1234new';
+  const home = await makeHomeFor(addr, EV);
+  const namesByAddress =
+    await EV.vat('bootstrap').consumeItem('namesByAddress');
+  await t.notThrowsAsync(EV(namesByAddress).lookup(addr));
+});
+
 test('sim/demo config launches Vaults as expected by loadgen', async t => {
   const { EV } = t.context.runUtils;
   const agoricNames = await EV.vat('bootstrap').consumeItem('agoricNames');

packages/builders/scripts/vats/replace-provisioning.js

@@ -0,0 +1,23 @@
+// @ts-check
+
+import { makeHelpers } from '@agoric/deploy-script-support';
+import { getManifestForProvisioning } from '@agoric/vats/src/proposals/namesByAddress-fix-proposal.js';
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
+export const defaultProposalBuilder = async ({ publishRef, install }) =>
+  harden({
+    sourceSpec: '@agoric/vats/src/proposals/namesByAddress-fix-proposal.js',
+    getManifestCall: [
+      getManifestForProvisioning.name,
+      {
+        provisioningRef: publishRef(
+          install('@agoric/vats/src/vat-provisioning.js'),
+        ),
+      },
+    ],
+  });
+
+export default async (homeP, endowments) => {
+  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
+  await writeCoreProposal('gov-provisioning', defaultProposalBuilder);
+};

packages/vats/src/proposals/namesByAddress-fix-proposal.js

@@ -0,0 +1,55 @@
+/** @file core eval proposal to fix namesByAddress by upgrading vat-provisioning */
+import { E } from '@endo/far';
+
+const vatUpgrade = /** @type {const} */ ({
+  name: 'provisioning',
+  opts: {
+    // vatParameters not used by provisioning vat
+    upgradeMessage: 'fix namesByAddress',
+  },
+});
+
+/**
+ * Upgrade provisioning vat and replace namesByAddress in bootstrap promise
+ * space
+ *
+ * @param {BootstrapPowers} powers
+ * @param {object} options
+ * @param {{ provisioningRef: { bundleID: string } }} options.options
+ *
+ * @typedef {string} BundleID
+ */
+export const upgradeProvisioningVat = async (powers, options) => {
+  console.log('upgradeProvisioningVat...');
+  const { vatStore, vatAdminSvc } = powers.consume;
+  const { namesByAddress: resolver } = powers.produce;
+
+  const { name, opts } = vatUpgrade;
+  const { bundleID } = options.options.provisioningRef;
+  const vatInfo = await E(vatStore).get(name);
+  console.log(vatUpgrade.name, vatInfo, bundleID);
+  const { root, adminNode } = vatInfo;
+  const bundleCap = await E(vatAdminSvc).getBundleCap(bundleID);
+  const incarnation = await E(adminNode).upgrade(bundleCap, opts);
+  console.log({ ...vatUpgrade, incarnation });
+
+  const { namesByAddress } = await E(root).getNamesByAddressKit();
+  resolver.reset();
+  resolver.resolve(namesByAddress);
+};
+
+export const getManifestForProvisioning = (_powers, { provisioningRef }) => ({
+  /** @type {import('../core/lib-boot').BootstrapManifest} */
+  manifest: {
+    [upgradeProvisioningVat.name]: {
+      consume: {
+        vatStore: true,
+        vatAdminSvc: true,
+      },
+      produce: {
+        namesByAddress: true,
+      },
+    },
+  },
+  options: { provisioningRef },
+});

packages/vats/src/vat-provisioning.js

@@ -91,7 +91,6 @@ export function buildRootObject(_vatPowers, _vatParameters, baggage) {
   const makeNamesByAddressAdmin = prepareSpecializedNameAdmin(zone);
 
   const nameHubKit = provide(baggage, 'nameHubKit', () => makeNameHubKit());
-  const { nameHub: namesByAddress } = makeNameHubKit();
   const namesByAddressAdmin = makeNamesByAddressAdmin(nameHubKit.nameAdmin);
 
   // xxx end-user ag-solo provisioning stuff (devnet only)
@@ -168,6 +167,7 @@ export function buildRootObject(_vatPowers, _vatParameters, baggage) {
   return Far('root', {
     register,
     pleaseProvision,
-    getNamesByAddressKit: () => harden({ namesByAddress, namesByAddressAdmin }),
+    getNamesByAddressKit: () =>
+      harden({ namesByAddress: nameHubKit.nameHub, namesByAddressAdmin }),
   });
 }