fix: some missing Fars (#3498)

* fix: some missing Fars. Preparing for when we require Remotables to be declared. Co-authored-by: Chris Hibbert <Chris-Hibbert@users.noreply.github.com>
Agoric · Jul 21, 2021 · 8f77271 · 8f77271
1 parent 4a72860
commit 8f77271
Show file tree

Hide file tree

Showing 61 changed files with 150 additions and 78 deletions.
diff --git a/packages/ERTP/test/swingsetTests/basicFunctionality/bootstrap.js b/packages/ERTP/test/swingsetTests/basicFunctionality/bootstrap.js
@@ -1,5 +1,6 @@
 import { E } from '@agoric/eventual-send';
 import { assert, details as X } from '@agoric/assert';
+import { Far } from '@agoric/marshal';
 import { makeIssuerKit, AmountMath } from '../../../src';
 
 export function buildRootObject(vatPowers, vatParameters) {
@@ -27,5 +28,5 @@ export function buildRootObject(vatPowers, vatParameters) {
       }
     },
   };
-  return harden(obj0);
+  return Far('root', obj0);
 }
diff --git a/packages/ERTP/test/swingsetTests/basicFunctionality/vat-alice.js b/packages/ERTP/test/swingsetTests/basicFunctionality/vat-alice.js
@@ -1,10 +1,11 @@
 import { E } from '@agoric/eventual-send';
+import { Far } from '@agoric/marshal';
 import { AmountMath } from '../../../src';
 
 function makeAliceMaker(log) {
-  return harden({
+  return Far('aliceMaker', {
     make(issuer, brand, oldPaymentP) {
-      const alice = harden({
+      const alice = Far('alice', {
         async testBasicFunctionality() {
           // isLive
           const alive = await E(issuer).isLive(oldPaymentP);
@@ -62,7 +63,7 @@ function makeAliceMaker(log) {
 }
 
 export function buildRootObject(vatPowers) {
-  return harden({
+  return Far('root', {
     makeAliceMaker() {
       return harden(makeAliceMaker(vatPowers.testLog));
     },

diff --git a/packages/SwingSet/test/gc/bootstrap.js b/packages/SwingSet/test/gc/bootstrap.js
@@ -6,7 +6,7 @@ export function buildRootObject() {
   let B = Far('B', { hello() {} });
   let target;
 
-  return harden({
+  return Far('root', {
     async bootstrap(vats) {
       target = vats.target;
     },

diff --git a/packages/dapp-svelte-wallet/api/src/wallet.js b/packages/dapp-svelte-wallet/api/src/wallet.js
@@ -10,6 +10,7 @@
  */
 import { E } from '@agoric/eventual-send';
 import { makeNotifierKit, observeIteration } from '@agoric/notifier';
+import { Far } from '@agoric/marshal';
 
 import { makeWallet } from './lib-wallet';
 import pubsub from './pubsub';
@@ -594,7 +595,7 @@ export function buildRootObject(_vatPowers) {
     );
   }
 
-  return harden({
+  return Far('root', {
     startup,
     getWallet,
     setHTTPObject,

diff --git a/packages/dapp-svelte-wallet/api/test/continuingInvitationExample.js b/packages/dapp-svelte-wallet/api/test/continuingInvitationExample.js
@@ -1,6 +1,7 @@
 // @ts-check
 
 import { makeNotifierKit } from '@agoric/notifier';
+import { Far } from '@agoric/marshal';
 
 import '@agoric/zoe/exported';
 
@@ -21,9 +22,9 @@ export const start = zcf => {
     updater.updateState('first offer made');
     return harden({
       uiNotifier: notifier,
-      invitationMakers: {
+      invitationMakers: Far('second thing inviter', {
         SecondThing: makeDoSecondThingInvitation,
-      },
+      }),
     });
   };
 

diff --git a/packages/governance/src/ballotBuilder.js b/packages/governance/src/ballotBuilder.js
@@ -1,6 +1,7 @@
 // @ts-check
 
 import { assert, details as X } from '@agoric/assert';
+import { Far } from '@agoric/marshal';
 
 // CHOOSE_N: voter indicates up to N they find acceptable (N might be 1).
 // ORDER: voter lists their choices from most to least favorite.
@@ -50,11 +51,11 @@ const buildEqualWeightBallot = (
       instance,
     });
 
-  return {
+  return Far('ballot details', {
     getBallotCounter: () => instance,
     getDetails,
     choose,
-  };
+  });
 };
 
 /** @type {BuildBallot} */

diff --git a/packages/swingset-runner/demo/exchangeBenchmark/bootstrap.js b/packages/swingset-runner/demo/exchangeBenchmark/bootstrap.js
@@ -1,5 +1,6 @@
 import { makeIssuerKit, AmountMath } from '@agoric/ertp';
 import { E } from '@agoric/eventual-send';
+import { Far } from '@agoric/marshal';
 
 /* eslint-disable-next-line import/no-unresolved, import/extensions */
 import exchangeBundle from './bundle-simpleExchange';
@@ -10,7 +11,7 @@ export function buildRootObject(_vatPowers, vatParameters) {
   let round = 0;
   let quiet = false;
 
-  return harden({
+  return Far('root', {
     async bootstrap(vats, devices) {
       let primeContracts = false;
       for (const arg of vatParameters.argv) {

diff --git a/packages/swingset-runner/demo/exchangeBenchmark/exchanger.js b/packages/swingset-runner/demo/exchangeBenchmark/exchanger.js
@@ -1,6 +1,7 @@
 // @ts-check
 
 import { E } from '@agoric/eventual-send';
+import { Far } from '@agoric/marshal';
 import { showPurseBalance, setupPurses } from './helpers';
 import { makePrintLog } from './printLog';
 
@@ -106,7 +107,7 @@ async function build(name, zoe, issuers, payments, publicFacet) {
 }
 
 export function buildRootObject(_vatPowers, vatParameters) {
-  return harden({
+  return Far('root', {
     build: (zoe, issuers, payments, publicFacet) =>
       build(vatParameters.name, zoe, issuers, payments, publicFacet),
   });

diff --git a/packages/swingset-runner/demo/exchangeBenchmark/vat-zoe.js b/packages/swingset-runner/demo/exchangeBenchmark/vat-zoe.js
@@ -1,7 +1,8 @@
 import { makeZoe } from '@agoric/zoe';
+import { Far } from '@agoric/marshal';
 
 export function buildRootObject(_vatPowers, vatParameters) {
-  return harden({
+  return Far('root', {
     buildZoe: vatAdminSvc => makeZoe(vatAdminSvc, vatParameters.zcfBundleName),
   });
 }
diff --git a/packages/swingset-runner/demo/justReply/bootstrap.js b/packages/swingset-runner/demo/justReply/bootstrap.js
@@ -1,12 +1,13 @@
 import { E } from '@agoric/eventual-send';
+import { Far } from '@agoric/marshal';
 
 const log = console.log;
 
 log(`=> loading bootstrap.js`);
 
 export function buildRootObject(_vatPowers) {
   log(`=> setup called`);
-  return harden({
+  return Far('root', {
     bootstrap(vats) {
       log('=> bootstrap() called');
       E(vats.alice)

diff --git a/packages/swingset-runner/demo/justReply/vat-alice.js b/packages/swingset-runner/demo/justReply/vat-alice.js
@@ -1,9 +1,10 @@
 import { E } from '@agoric/eventual-send';
+import { Far } from '@agoric/marshal';
 
 const log = console.log;
 
 export function buildRootObject(_vatPowers) {
-  return harden({
+  return Far('root', {
     sayHelloTo(other) {
       log(`=> Alice.sayHelloTo`);
       const answer = E(other).hello();

diff --git a/packages/swingset-runner/demo/justReply/vat-bob.js b/packages/swingset-runner/demo/justReply/vat-bob.js
@@ -1,5 +1,7 @@
+import { Far } from '@agoric/marshal';
+
 export function buildRootObject(_vatPowers) {
-  return harden({
+  return Far('root', {
     hello() {
       console.log(`=> Somebody said hello to Bob`);
       return 'hi there!';

diff --git a/packages/swingset-runner/demo/megaPong/bootstrap.js b/packages/swingset-runner/demo/megaPong/bootstrap.js
@@ -1,12 +1,13 @@
 import { E } from '@agoric/eventual-send';
+import { Far } from '@agoric/marshal';
 
 const log = console.log;
 
 log(`=> loading bootstrap.js`);
 
 export function buildRootObject(_vatPowers, vatParameters) {
   log(`=> setup called`);
-  return harden({
+  return Far('root', {
     bootstrap(vats) {
       console.log('=> bootstrap() called');
       E(vats.alice).setNickname('alice');

diff --git a/packages/swingset-runner/demo/meterExhaustion/vat-boomer.js b/packages/swingset-runner/demo/meterExhaustion/vat-boomer.js
@@ -1,5 +1,7 @@
+import { Far } from '@agoric/marshal';
+
 export function buildRootObject() {
-  return harden({
+  return Far('root', {
     explode() {
       // eslint-disable-next-line no-unused-vars
       const hugantuous = Array(4e9); // arbitrarily too big

diff --git a/packages/swingset-runner/demo/resolveCase1/bootstrap.js b/packages/swingset-runner/demo/resolveCase1/bootstrap.js
@@ -1,12 +1,13 @@
 import { E } from '@agoric/eventual-send';
+import { Far } from '@agoric/marshal';
 
 const log = console.log;
 
 log(`=> loading bootstrap.js`);
 
 export function buildRootObject(_vatPowers) {
   log(`=> setup called`);
-  return harden({
+  return Far('root', {
     bootstrap(vats) {
       log('=> Alice: bootstrap() called');
 

diff --git a/packages/swingset-runner/demo/resolveCase1/vat-bob.js b/packages/swingset-runner/demo/resolveCase1/vat-bob.js
@@ -1,7 +1,9 @@
+import { Far } from '@agoric/marshal';
+
 const log = console.log;
 
 export function buildRootObject(_vatPowers) {
-  return harden({
+  return Far('root', {
     thisIsYourPromise(p) {
       log('=> Bob: thisIsYourPromise begins');
       p.then(

diff --git a/packages/swingset-runner/demo/resolveCase2/bootstrap.js b/packages/swingset-runner/demo/resolveCase2/bootstrap.js
@@ -1,12 +1,13 @@
 import { E } from '@agoric/eventual-send';
+import { Far } from '@agoric/marshal';
 
 const log = console.log;
 
 log(`=> loading bootstrap.js`);
 
 export function buildRootObject(_vatPowers) {
   log(`=> setup called`);
-  return harden({
+  return Far('root', {
     bootstrap(vats) {
       log('=> Alice: bootstrap() called');
 

diff --git a/packages/swingset-runner/demo/resolveCase2/vat-bob.js b/packages/swingset-runner/demo/resolveCase2/vat-bob.js
@@ -1,7 +1,9 @@
+import { Far } from '@agoric/marshal';
+
 const log = console.log;
 
 export function buildRootObject(_vatPowers) {
-  return harden({
+  return Far('root', {
     thisIsYourPromise(p) {
       log('=> Bob: thisIsYourPromise begins');
       p.then(

diff --git a/packages/swingset-runner/demo/resolveCase3/bootstrap.js b/packages/swingset-runner/demo/resolveCase3/bootstrap.js
@@ -1,12 +1,13 @@
 import { E } from '@agoric/eventual-send';
+import { Far } from '@agoric/marshal';
 
 const log = console.log;
 
 log(`=> loading bootstrap.js`);
 
 export function buildRootObject(_vatPowers) {
   log(`=> setup called`);
-  return harden({
+  return Far('root', {
     bootstrap(vats) {
       log('=> Alice: bootstrap() called');
 

diff --git a/packages/swingset-runner/demo/resolveCase3/vat-bob.js b/packages/swingset-runner/demo/resolveCase3/vat-bob.js
@@ -1,7 +1,9 @@
+import { Far } from '@agoric/marshal';
+
 const log = console.log;
 
 export function buildRootObject(_vatPowers) {
-  return harden({
+  return Far('root', {
     thisIsYourPromise(p) {
       log('=> Bob: thisIsYourPromise begins');
       p.then(

diff --git a/packages/swingset-runner/demo/resolveCircular/bootstrap.js b/packages/swingset-runner/demo/resolveCircular/bootstrap.js
@@ -1,9 +1,10 @@
 import { E } from '@agoric/eventual-send';
+import { Far } from '@agoric/marshal';
 
 console.log(`=> loading bootstrap.js`);
 
 export function buildRootObject(_vatPowers) {
-  return harden({
+  return Far('root', {
     bootstrap(vats) {
       const pa = E(vats.bob).genPromise1();
       const pb = E(vats.bob).genPromise2();

diff --git a/packages/swingset-runner/demo/resolveCircular2/bootstrap.js b/packages/swingset-runner/demo/resolveCircular2/bootstrap.js
@@ -1,9 +1,10 @@
 import { E } from '@agoric/eventual-send';
+import { Far } from '@agoric/marshal';
 
 console.log(`=> loading bootstrap.js`);
 
 export function buildRootObject(_vatPowers) {
-  return harden({
+  return Far('root', {
     bootstrap(vats) {
       const pa = E(vats.bob).genPromise1();
       const pb = E(vats.bob).genPromise2();

diff --git a/packages/swingset-runner/demo/resolveCircular3/bootstrap.js b/packages/swingset-runner/demo/resolveCircular3/bootstrap.js
@@ -1,7 +1,8 @@
 import { E } from '@agoric/eventual-send';
+import { Far } from '@agoric/marshal';
 
 export function buildRootObject(_vatPowers) {
-  return harden({
+  return Far('root', {
     async bootstrap(vats) {
       const pa = E(vats.bob).genPromise1();
       const pb = E(vats.bob).genPromise2();

diff --git a/packages/swingset-runner/demo/resolveCircular3/vat-alice.js b/packages/swingset-runner/demo/resolveCircular3/vat-alice.js
@@ -1,5 +1,7 @@
+import { Far } from '@agoric/marshal';
+
 export function buildRootObject(_vatPowers) {
-  return harden({
+  return Far('root', {
     acceptPromise(_p) {
       console.log('Alice got p');
     },

diff --git a/packages/swingset-runner/demo/resolveCircularMultiCrank/bootstrap.js b/packages/swingset-runner/demo/resolveCircularMultiCrank/bootstrap.js
@@ -1,9 +1,10 @@
 import { E } from '@agoric/eventual-send';
+import { Far } from '@agoric/marshal';
 
 console.log(`=> loading bootstrap.js`);
 
 export function buildRootObject(_vatPowers) {
-  return harden({
+  return Far('root', {
     bootstrap(vats) {
       const pX = E(vats.bob).genPromiseX();
       const pY = E(vats.bob).genPromiseY();

diff --git a/packages/swingset-runner/demo/resolveCrosswise/bootstrap.js b/packages/swingset-runner/demo/resolveCrosswise/bootstrap.js
@@ -1,7 +1,8 @@
 import { E } from '@agoric/eventual-send';
+import { Far } from '@agoric/marshal';
 
 export function buildRootObject(_vatPowers) {
-  return harden({
+  return Far('root', {
     bootstrap(vats) {
       const pa = E(vats.alice).genPromise();
       const pb = E(vats.bob).genPromise();

diff --git a/packages/swingset-runner/demo/resolveDelayedPipeline/bootstrap.js b/packages/swingset-runner/demo/resolveDelayedPipeline/bootstrap.js
@@ -1,12 +1,13 @@
 import { E } from '@agoric/eventual-send';
+import { Far } from '@agoric/marshal';
 
 const log = console.log;
 
 log(`=> loading bootstrap.js`);
 
 export function buildRootObject(_vatPowers) {
   log(`=> setup called`);
-  return harden({
+  return Far('root', {
     bootstrap(vats) {
       log('=> Alice: bootstrap() called');
       const thingP = E(vats.bob).getThing();

diff --git a/packages/swingset-runner/demo/resolveInArrayCase1/bootstrap.js b/packages/swingset-runner/demo/resolveInArrayCase1/bootstrap.js
@@ -1,12 +1,13 @@
 import { E } from '@agoric/eventual-send';
+import { Far } from '@agoric/marshal';
 
 const log = console.log;
 
 log(`=> loading bootstrap.js`);
 
 export function buildRootObject(_vatPowers) {
   log(`=> setup called`);
-  return harden({
+  return Far('root', {
     bootstrap(vats) {
       log('=> Alice: bootstrap() called');
 

diff --git a/packages/swingset-runner/demo/resolveInArrayCase1/vat-bob.js b/packages/swingset-runner/demo/resolveInArrayCase1/vat-bob.js
@@ -1,7 +1,9 @@
+import { Far } from '@agoric/marshal';
+
 const log = console.log;
 
 export function buildRootObject(_vatPowers) {
-  return harden({
+  return Far('root', {
     thisIsYourPromise(parr) {
       const p = parr[0];
       log('=> Bob: thisIsYourPromise begins');