BREAKING CHANGE: create the RUN Mint within Zoe (#3647)

* BREAKING CHANGE: make the run mint within Zoe, and give only the treasury the ability to create a ZCFMint with it * chore: change 'makeZoe' to 'makeZoeKit' * chore: add "shutdownZoeVat" argument to Zoe, and pass it to `makeIssuerKit` for invitation issuerKit and fee issuerKit * chore: manually lint-fix install-on-chain.js See #3672 for the issue to fix the root problem
Agoric · Aug 14, 2021 · 7987834 · 7987834
1 parent d1f30b0
commit 7987834
Show file tree

Hide file tree

Showing 68 changed files with 658 additions and 228 deletions.
diff --git a/packages/dapp-svelte-wallet/api/test/test-getPursesNotifier.js b/packages/dapp-svelte-wallet/api/test/test-getPursesNotifier.js
@@ -2,7 +2,7 @@
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
 import { makeIssuerKit } from '@agoric/ertp';
-import { makeZoe } from '@agoric/zoe';
+import { makeZoeKit } from '@agoric/zoe';
 import fakeVatAdmin from '@agoric/zoe/tools/fakeVatAdmin.js';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { makeBoard } from '@agoric/vats/src/lib-board.js';
@@ -24,7 +24,7 @@ function makeFakeMyAddressNameAdmin() {
 }
 
 const setup = async () => {
-  const zoe = makeZoe(fakeVatAdmin);
+  const { zoeService: zoe } = makeZoeKit(fakeVatAdmin);
   const board = makeBoard();
 
   const pursesStateChangeHandler = _data => {};

diff --git a/packages/dapp-svelte-wallet/api/test/test-lib-wallet.js b/packages/dapp-svelte-wallet/api/test/test-lib-wallet.js
@@ -5,7 +5,7 @@ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 import bundleSource from '@agoric/bundle-source';
 import { makeIssuerKit, AmountMath, AssetKind } from '@agoric/ertp';
 
-import { makeZoe } from '@agoric/zoe';
+import { makeZoeKit } from '@agoric/zoe';
 import fakeVatAdmin from '@agoric/zoe/tools/fakeVatAdmin.js';
 
 import { assert } from '@agoric/assert';
@@ -45,7 +45,7 @@ async function setupTest() {
   const moolaBundle = makeIssuerKit('moola');
   const simoleanBundle = makeIssuerKit('simolean');
   const rpgBundle = makeIssuerKit('rpg', AssetKind.SET);
-  const zoe = makeZoe(fakeVatAdmin);
+  const { zoeService: zoe } = makeZoeKit(fakeVatAdmin);
   const board = makeBoard();
 
   // Create AutomaticRefund instance
@@ -1193,7 +1193,7 @@ test('addOffer offer.invitation', async t => {
 });
 
 test('addOffer makeContinuingInvitation', async t => {
-  const zoe = makeZoe(fakeVatAdmin);
+  const { zoeService: zoe } = makeZoeKit(fakeVatAdmin);
   const board = makeBoard();
 
   // Create ContinuingInvitationExample instance
@@ -1275,7 +1275,7 @@ test('addOffer makeContinuingInvitation', async t => {
 });
 
 test('getZoe, getBoard', async t => {
-  const zoe = makeZoe(fakeVatAdmin);
+  const { zoeService: zoe } = makeZoeKit(fakeVatAdmin);
   const board = makeBoard();
 
   const pursesStateChangeHandler = _data => {};

diff --git a/packages/deploy-script-support/test/unitTests/test-install.js b/packages/deploy-script-support/test/unitTests/test-install.js
@@ -1,7 +1,7 @@
 // @ts-check
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
-import { makeZoe } from '@agoric/zoe';
+import { makeZoeKit } from '@agoric/zoe';
 import fakeVatAdmin from '@agoric/zoe/tools/fakeVatAdmin.js';
 import { makeBoard } from '@agoric/vats/src/lib-board.js';
 import bundleSource from '@agoric/bundle-source';
@@ -12,7 +12,7 @@ import '../../exported.js';
 import { makeInstall } from '../../src/install.js';
 
 test('install', async t => {
-  const zoe = makeZoe(fakeVatAdmin);
+  const { zoeService: zoe } = makeZoeKit(fakeVatAdmin);
 
   let addedInstallation;
 

diff --git a/packages/deploy-script-support/test/unitTests/test-offer.js b/packages/deploy-script-support/test/unitTests/test-offer.js
@@ -1,7 +1,7 @@
 // @ts-check
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
-import { makeZoe } from '@agoric/zoe';
+import { makeZoeKit } from '@agoric/zoe';
 import fakeVatAdmin from '@agoric/zoe/tools/fakeVatAdmin.js';
 import bundleSource from '@agoric/bundle-source';
 import { makeIssuerKit, AmountMath } from '@agoric/ertp';
@@ -37,7 +37,7 @@ test('offer', async t => {
     },
     saveOfferResult: () => {},
   };
-  const zoe = makeZoe(fakeVatAdmin);
+  const { zoeService: zoe } = makeZoeKit(fakeVatAdmin);
 
   const bundleUrl = await importMetaResolve(
     '@agoric/zoe/src/contracts/automaticRefund.js',

diff --git a/packages/deploy-script-support/test/unitTests/test-startInstance.js b/packages/deploy-script-support/test/unitTests/test-startInstance.js
@@ -1,7 +1,7 @@
 // @ts-check
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
-import { makeZoe } from '@agoric/zoe';
+import { makeZoeKit } from '@agoric/zoe';
 import fakeVatAdmin from '@agoric/zoe/tools/fakeVatAdmin.js';
 import bundleSource from '@agoric/bundle-source';
 import { makeIssuerKit } from '@agoric/ertp';
@@ -19,7 +19,7 @@ test('startInstance', async t => {
   const moolaKit = makeIssuerKit('moola');
   const usdKit = makeIssuerKit('usd');
 
-  const zoe = makeZoe(fakeVatAdmin);
+  const { zoeService: zoe } = makeZoeKit(fakeVatAdmin);
 
   const bundleUrl = new URL(
     await importMetaResolve(

diff --git a/packages/governance/test/swingsetTests/committeeBinary/vat-zoe.js b/packages/governance/test/swingsetTests/committeeBinary/vat-zoe.js
@@ -2,10 +2,14 @@
 
 import { Far } from '@agoric/marshal';
 
-import { makeZoe } from '@agoric/zoe';
+import { makeZoeKit } from '@agoric/zoe';
 
-export function buildRootObject(_vatPowers) {
+export function buildRootObject(vatPowers) {
   return Far('root', {
-    buildZoe: vatAdminSvc => makeZoe(vatAdminSvc),
+    buildZoe: vatAdminSvc => {
+      const shutdownZoeVat = vatPowers.exitVatWithFailure;
+      const { zoeService: zoe } = makeZoeKit(vatAdminSvc, shutdownZoeVat);
+      return zoe;
+    },
   });
 }
diff --git a/packages/governance/test/unitTests/test-committee.js b/packages/governance/test/unitTests/test-committee.js
@@ -6,7 +6,7 @@ import '@agoric/zoe/exported.js';
 
 import path from 'path';
 import { E } from '@agoric/eventual-send';
-import { makeZoe } from '@agoric/zoe';
+import { makeZoeKit } from '@agoric/zoe';
 import fakeVatAdmin from '@agoric/zoe/tools/fakeVatAdmin.js';
 import bundleSource from '@agoric/bundle-source';
 import buildManualTimer from '@agoric/zoe/tools/manualTimer.js';
@@ -20,7 +20,7 @@ const registrarRoot = `${dirname}/../../src/committeeRegistrar.js`;
 const counterRoot = `${dirname}/../../src/binaryBallotCounter.js`;
 
 async function setupContract() {
-  const zoe = makeZoe(fakeVatAdmin);
+  const { zoeService: zoe } = makeZoeKit(fakeVatAdmin);
 
   // pack the contract
   const [registrarBundle, counterBundle] = await Promise.all([

diff --git a/packages/pegasus/bundles/install-on-chain.js b/packages/pegasus/bundles/install-on-chain.js
@@ -11,7 +11,13 @@ import pegasusBundle from './bundle-pegasus.js';
  * @param {NameHub} param0.namesByAddress
  * @param {ERef<ZoeService>} param0.zoe
  */
-export async function installOnChain({ agoricNames, board, nameAdmins, namesByAddress, zoe }) {
+export async function installOnChain({
+  agoricNames,
+  board,
+  nameAdmins,
+  namesByAddress,
+  zoe,
+}) {
   // Fetch the nameAdmins we need.
   const [installAdmin, instanceAdmin, uiConfigAdmin] = await Promise.all(
     ['installation', 'instance', 'uiConfig'].map(async edge => {
@@ -38,8 +44,12 @@ export async function installOnChain({ agoricNames, board, nameAdmins, namesByAd
     namesByAddress,
   });
 
-  const { instance, creatorFacet } = await E(zoe).startInstance(pegasusInstall, undefined, terms);
-
+  const { instance, creatorFacet } = await E(zoe).startInstance(
+    pegasusInstall,
+    undefined,
+    terms,
+  );
+
   const pegasusUiDefaults = {
     CONTRACT_NAME: 'Pegasus',
     BRIDGE_URL: 'http://127.0.0.1:8000',
@@ -49,14 +59,14 @@ export async function installOnChain({ agoricNames, board, nameAdmins, namesByAd
   };
 
   // Look up all the board IDs.
-  const boardIdValue = [
-    ['INSTANCE_BOARD_ID', instance],
-  ];
-  await Promise.all(boardIdValue.map(async ([key, valP]) => {
-    const val = await valP;
-    const boardId = await E(board).getId(val);
-    pegasusUiDefaults[key] = boardId;
-  }));
+  const boardIdValue = [['INSTANCE_BOARD_ID', instance]];
+  await Promise.all(
+    boardIdValue.map(async ([key, valP]) => {
+      const val = await valP;
+      const boardId = await E(board).getId(val);
+      pegasusUiDefaults[key] = boardId;
+    }),
+  );
 
   // Stash the defaults where the UI can find them.
   harden(pegasusUiDefaults);
@@ -69,7 +79,9 @@ export async function installOnChain({ agoricNames, board, nameAdmins, namesByAd
     [instanceAdmin, pegasusUiDefaults.CONTRACT_NAME, instance],
   ];
   await Promise.all(
-    nameAdminUpdates.map(([nameAdmin, name, value]) => E(nameAdmin).update(name, value)),
+    nameAdminUpdates.map(([nameAdmin, name, value]) =>
+      E(nameAdmin).update(name, value),
+    ),
   );
 
   return creatorFacet;

diff --git a/packages/pegasus/test/test-peg.js b/packages/pegasus/test/test-peg.js
@@ -9,7 +9,7 @@ import {
 
 import bundleSource from '@agoric/bundle-source';
 import { AmountMath } from '@agoric/ertp';
-import { makeZoe } from '@agoric/zoe';
+import { makeZoeKit } from '@agoric/zoe';
 
 import fakeVatAdmin from '@agoric/zoe/tools/fakeVatAdmin.js';
 import { Far } from '@agoric/marshal';
@@ -47,7 +47,7 @@ async function testRemotePeg(t) {
     },
   });
 
-  const zoe = makeZoe(fakeVatAdmin);
+  const { zoeService: zoe } = makeZoeKit(fakeVatAdmin);
 
   // Pack the contract.
   const contractBundle = await bundleSource(contractPath);

diff --git a/packages/swingset-runner/demo/exchangeBenchmark/vat-zoe.js b/packages/swingset-runner/demo/exchangeBenchmark/vat-zoe.js
@@ -1,8 +1,19 @@
-import { makeZoe } from '@agoric/zoe';
+// @ts-check
+
 import { Far } from '@agoric/marshal';
 
-export function buildRootObject(_vatPowers, vatParameters) {
+import { makeZoeKit } from '@agoric/zoe';
+
+export function buildRootObject(vatPowers, vatParameters) {
   return Far('root', {
-    buildZoe: vatAdminSvc => makeZoe(vatAdminSvc, vatParameters.zcfBundleName),
+    buildZoe: vatAdminSvc => {
+      const shutdownZoeVat = vatPowers.exitVatWithFailure;
+      const { zoeService: zoe } = makeZoeKit(
+        vatAdminSvc,
+        shutdownZoeVat,
+        vatParameters.zcfBundleName,
+      );
+      return zoe;
+    },
   });
 }
diff --git a/packages/swingset-runner/demo/swapBenchmark/vat-zoe.js b/packages/swingset-runner/demo/swapBenchmark/vat-zoe.js
@@ -1,8 +1,19 @@
-import { makeZoe } from '@agoric/zoe';
+// @ts-check
+
 import { Far } from '@agoric/marshal';
 
-export function buildRootObject(_vatPowers, vatParameters) {
+import { makeZoeKit } from '@agoric/zoe';
+
+export function buildRootObject(vatPowers, vatParameters) {
   return Far('root', {
-    buildZoe: vatAdminSvc => makeZoe(vatAdminSvc, vatParameters.zcfBundleName),
+    buildZoe: vatAdminSvc => {
+      const shutdownZoeVat = vatPowers.exitVatWithFailure;
+      const { zoeService: zoe } = makeZoeKit(
+        vatAdminSvc,
+        shutdownZoeVat,
+        vatParameters.zcfBundleName,
+      );
+      return zoe;
+    },
   });
 }
diff --git a/packages/swingset-runner/demo/zoeTests/vat-zoe.js b/packages/swingset-runner/demo/zoeTests/vat-zoe.js
@@ -1,9 +1,19 @@
-// noinspection ES6PreferShortImport
-import { makeZoe } from '@agoric/zoe';
+// @ts-check
+
 import { Far } from '@agoric/marshal';
 
-export function buildRootObject(_vatPowers, vatParameters) {
+import { makeZoeKit } from '@agoric/zoe';
+
+export function buildRootObject(vatPowers, vatParameters) {
   return Far('root', {
-    buildZoe: vatAdminSvc => makeZoe(vatAdminSvc, vatParameters.zcfBundleName),
+    buildZoe: vatAdminSvc => {
+      const shutdownZoeVat = vatPowers.exitVatWithFailure;
+      const { zoeService: zoe } = makeZoeKit(
+        vatAdminSvc,
+        shutdownZoeVat,
+        vatParameters.zcfBundleName,
+      );
+      return zoe;
+    },
   });
 }