From 8f77271b41a4589679ad95ff907126778466aba8 Mon Sep 17 00:00:00 2001 From: "Mark S. Miller" Date: Wed, 21 Jul 2021 12:01:05 -0700 Subject: [PATCH] fix: some missing Fars (#3498) * fix: some missing Fars. Preparing for when we require Remotables to be declared. Co-authored-by: Chris Hibbert --- .../swingsetTests/basicFunctionality/bootstrap.js | 3 ++- .../swingsetTests/basicFunctionality/vat-alice.js | 7 ++++--- packages/SwingSet/test/gc/bootstrap.js | 2 +- packages/dapp-svelte-wallet/api/src/wallet.js | 3 ++- .../api/test/continuingInvitationExample.js | 5 +++-- packages/governance/src/ballotBuilder.js | 5 +++-- .../demo/exchangeBenchmark/bootstrap.js | 3 ++- .../demo/exchangeBenchmark/exchanger.js | 3 ++- .../swingset-runner/demo/exchangeBenchmark/vat-zoe.js | 3 ++- packages/swingset-runner/demo/justReply/bootstrap.js | 3 ++- packages/swingset-runner/demo/justReply/vat-alice.js | 3 ++- packages/swingset-runner/demo/justReply/vat-bob.js | 4 +++- packages/swingset-runner/demo/megaPong/bootstrap.js | 3 ++- .../demo/meterExhaustion/vat-boomer.js | 4 +++- .../swingset-runner/demo/resolveCase1/bootstrap.js | 3 ++- packages/swingset-runner/demo/resolveCase1/vat-bob.js | 4 +++- .../swingset-runner/demo/resolveCase2/bootstrap.js | 3 ++- packages/swingset-runner/demo/resolveCase2/vat-bob.js | 4 +++- .../swingset-runner/demo/resolveCase3/bootstrap.js | 3 ++- packages/swingset-runner/demo/resolveCase3/vat-bob.js | 4 +++- .../swingset-runner/demo/resolveCircular/bootstrap.js | 3 ++- .../demo/resolveCircular2/bootstrap.js | 3 ++- .../demo/resolveCircular3/bootstrap.js | 3 ++- .../demo/resolveCircular3/vat-alice.js | 4 +++- .../demo/resolveCircularMultiCrank/bootstrap.js | 3 ++- .../demo/resolveCrosswise/bootstrap.js | 3 ++- .../demo/resolveDelayedPipeline/bootstrap.js | 3 ++- .../demo/resolveInArrayCase1/bootstrap.js | 3 ++- .../demo/resolveInArrayCase1/vat-bob.js | 4 +++- .../swingset-runner/demo/resolveIndirect/bootstrap.js | 3 ++- .../demo/resolveMutualCircular/bootstrap.js | 3 ++- .../demo/resolveMutualCircular/vat-bob.js | 4 +++- .../demo/resolvePassResult/bootstrap.js | 3 ++- .../swingset-runner/demo/resolvePassResult/vat-bob.js | 4 +++- .../demo/resolvePassResultPromise/bootstrap.js | 3 ++- .../demo/resolvePassResultPromise/vat-bob.js | 4 +++- .../demo/resolvePipelined/bootstrap.js | 3 ++- .../demo/resolvePromiseComplicated/bootstrap.js | 3 ++- .../demo/resolvePromiseComplicated/vat-carol.js | 4 +++- .../demo/resolveSimpleCircular/bootstrap.js | 3 ++- .../demo/resolveSimpleCircular2/bootstrap.js | 3 ++- .../demo/resolveWithEmbeddedPromise/bootstrap.js | 3 ++- .../demo/simplePromisePass/bootstrap.js | 3 ++- .../demo/simplePromisePass/vat-alice.js | 3 ++- .../swingset-runner/demo/simplePromisePass/vat-bob.js | 4 +++- .../swingset-runner/demo/swapBenchmark/exchanger.js | 3 ++- .../swingset-runner/demo/swapBenchmark/vat-zoe.js | 3 ++- .../swingset-runner/demo/terminateVat/vat-dude.js | 3 ++- packages/swingset-runner/demo/vatStore1/bootstrap.js | 3 ++- packages/swingset-runner/demo/zoeTests/vat-alice.js | 3 ++- packages/swingset-runner/demo/zoeTests/vat-bob.js | 3 ++- packages/swingset-runner/demo/zoeTests/vat-carol.js | 3 ++- packages/swingset-runner/demo/zoeTests/vat-dave.js | 3 ++- packages/swingset-runner/demo/zoeTests/vat-zoe.js | 3 ++- packages/treasury/src/liquidateMinimum.js | 5 +++-- packages/treasury/src/stablecoinMachine.js | 5 +++-- packages/treasury/src/vault.js | 3 ++- packages/treasury/src/vaultManager.js | 8 +++++--- packages/treasury/test/vault-contract-wrapper.js | 10 +++++----- packages/zoe/tools/fakePriceAuthority.js | 5 +++-- packages/zoe/tools/priceAuthorityRegistry.js | 11 ++++++----- 61 files changed, 150 insertions(+), 78 deletions(-) diff --git a/packages/ERTP/test/swingsetTests/basicFunctionality/bootstrap.js b/packages/ERTP/test/swingsetTests/basicFunctionality/bootstrap.js index b98c8aabd6c..c1864dc0c07 100644 --- 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 index 0176b848073..e4234bfc005 100644 --- 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 index 490aeaa7b64..21517092dca 100644 --- 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 index 221b895c423..107fc67defd 100644 --- 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 index 930f9292996..319ed6ffdfc 100644 --- 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 index eb9d20f9419..ab0b5c1ff4f 100644 --- 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 index 4f66281ba5e..7f78c4b28ef 100644 --- 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 index 748b7e415de..267d7374c50 100755 --- 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 index cf3f5de41c4..150a446539c 100644 --- 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 index aca81615c64..80170c7a799 100644 --- a/packages/swingset-runner/demo/justReply/bootstrap.js +++ b/packages/swingset-runner/demo/justReply/bootstrap.js @@ -1,4 +1,5 @@ import { E } from '@agoric/eventual-send'; +import { Far } from '@agoric/marshal'; const log = console.log; @@ -6,7 +7,7 @@ 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 index df9d065db9e..b4b5482e06a 100644 --- 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 index 9ae94d000d1..513ea3d8f5b 100644 --- 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 index d6465a51e7d..86df381e435 100644 --- a/packages/swingset-runner/demo/megaPong/bootstrap.js +++ b/packages/swingset-runner/demo/megaPong/bootstrap.js @@ -1,4 +1,5 @@ import { E } from '@agoric/eventual-send'; +import { Far } from '@agoric/marshal'; const log = console.log; @@ -6,7 +7,7 @@ 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 index 927a9e00ce7..691635b0d77 100644 --- 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 index c01e46d5441..0042cb532bc 100644 --- a/packages/swingset-runner/demo/resolveCase1/bootstrap.js +++ b/packages/swingset-runner/demo/resolveCase1/bootstrap.js @@ -1,4 +1,5 @@ import { E } from '@agoric/eventual-send'; +import { Far } from '@agoric/marshal'; const log = console.log; @@ -6,7 +7,7 @@ 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 index 337c965edd5..62bc5b6e43f 100644 --- 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 index 505bd12892e..72a7a57ace5 100644 --- a/packages/swingset-runner/demo/resolveCase2/bootstrap.js +++ b/packages/swingset-runner/demo/resolveCase2/bootstrap.js @@ -1,4 +1,5 @@ import { E } from '@agoric/eventual-send'; +import { Far } from '@agoric/marshal'; const log = console.log; @@ -6,7 +7,7 @@ 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 index 337c965edd5..62bc5b6e43f 100644 --- 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 index eeb2d29fffb..b1387ca8379 100644 --- a/packages/swingset-runner/demo/resolveCase3/bootstrap.js +++ b/packages/swingset-runner/demo/resolveCase3/bootstrap.js @@ -1,4 +1,5 @@ import { E } from '@agoric/eventual-send'; +import { Far } from '@agoric/marshal'; const log = console.log; @@ -6,7 +7,7 @@ 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 index 337c965edd5..62bc5b6e43f 100644 --- 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 index f6f5feb7bf5..f8695f0ed95 100644 --- 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 index 1370bcce039..bbfa6c3378a 100644 --- 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 index a3040f41588..b8f5d1f4d67 100644 --- 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 index 58d50a58e38..819f92b3705 100644 --- 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 index 30985a143c2..1cd24719533 100644 --- 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 index c1d64c0c566..7fa4ef0b75a 100644 --- 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 index 8a9b1a39c1d..5408e01fa24 100644 --- a/packages/swingset-runner/demo/resolveDelayedPipeline/bootstrap.js +++ b/packages/swingset-runner/demo/resolveDelayedPipeline/bootstrap.js @@ -1,4 +1,5 @@ import { E } from '@agoric/eventual-send'; +import { Far } from '@agoric/marshal'; const log = console.log; @@ -6,7 +7,7 @@ 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 index d0a70aeaf99..3530b888077 100644 --- a/packages/swingset-runner/demo/resolveInArrayCase1/bootstrap.js +++ b/packages/swingset-runner/demo/resolveInArrayCase1/bootstrap.js @@ -1,4 +1,5 @@ import { E } from '@agoric/eventual-send'; +import { Far } from '@agoric/marshal'; const log = console.log; @@ -6,7 +7,7 @@ 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 index 4ce76d733d9..5991dc1f0f8 100644 --- 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'); diff --git a/packages/swingset-runner/demo/resolveIndirect/bootstrap.js b/packages/swingset-runner/demo/resolveIndirect/bootstrap.js index 5636fc160bc..a66fa20299f 100644 --- a/packages/swingset-runner/demo/resolveIndirect/bootstrap.js +++ b/packages/swingset-runner/demo/resolveIndirect/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(); E(vats.bob).genPromise2(); diff --git a/packages/swingset-runner/demo/resolveMutualCircular/bootstrap.js b/packages/swingset-runner/demo/resolveMutualCircular/bootstrap.js index 6ecb6982361..a86ad6dbc7d 100644 --- a/packages/swingset-runner/demo/resolveMutualCircular/bootstrap.js +++ b/packages/swingset-runner/demo/resolveMutualCircular/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.bob).genPromise('a'); const pb = E(vats.bob).genPromise('b'); diff --git a/packages/swingset-runner/demo/resolveMutualCircular/vat-bob.js b/packages/swingset-runner/demo/resolveMutualCircular/vat-bob.js index 2bd5e7f5d12..512b608e42a 100644 --- a/packages/swingset-runner/demo/resolveMutualCircular/vat-bob.js +++ b/packages/swingset-runner/demo/resolveMutualCircular/vat-bob.js @@ -1,3 +1,5 @@ +import { Far } from '@agoric/marshal'; + function makePR() { let r; const p = new Promise((resolve, _reject) => { @@ -8,7 +10,7 @@ function makePR() { export function buildRootObject(_vatPowers) { const rs = new Map(); - return harden({ + return Far('root', { genPromise(idx) { const [p, r] = makePR(); rs.set(idx, r); diff --git a/packages/swingset-runner/demo/resolvePassResult/bootstrap.js b/packages/swingset-runner/demo/resolvePassResult/bootstrap.js index 49df6d0dc7d..c5a8a8a2721 100644 --- a/packages/swingset-runner/demo/resolvePassResult/bootstrap.js +++ b/packages/swingset-runner/demo/resolvePassResult/bootstrap.js @@ -1,4 +1,5 @@ import { E } from '@agoric/eventual-send'; +import { Far } from '@agoric/marshal'; const log = console.log; @@ -6,7 +7,7 @@ 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/resolvePassResult/vat-bob.js b/packages/swingset-runner/demo/resolvePassResult/vat-bob.js index 879c43a8e77..043750e6581 100644 --- a/packages/swingset-runner/demo/resolvePassResult/vat-bob.js +++ b/packages/swingset-runner/demo/resolvePassResult/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', { first() { log('=> Bob: in first'); return `Bob's first answer`; diff --git a/packages/swingset-runner/demo/resolvePassResultPromise/bootstrap.js b/packages/swingset-runner/demo/resolvePassResultPromise/bootstrap.js index fd32380bd8b..6d48ccfb2f6 100644 --- a/packages/swingset-runner/demo/resolvePassResultPromise/bootstrap.js +++ b/packages/swingset-runner/demo/resolvePassResultPromise/bootstrap.js @@ -1,11 +1,12 @@ import { E } from '@agoric/eventual-send'; +import { Far } from '@agoric/marshal'; const log = console.log; log(`=> loading bootstrap.js`); export function buildRootObject(_vatPowers) { - return harden({ + return Far('root', { bootstrap(vats) { log('=> Alice: bootstrap() called'); diff --git a/packages/swingset-runner/demo/resolvePassResultPromise/vat-bob.js b/packages/swingset-runner/demo/resolvePassResultPromise/vat-bob.js index 5b0b08b7939..5a88c8c245c 100644 --- a/packages/swingset-runner/demo/resolvePassResultPromise/vat-bob.js +++ b/packages/swingset-runner/demo/resolvePassResultPromise/vat-bob.js @@ -1,8 +1,10 @@ +import { Far } from '@agoric/marshal'; + const log = console.log; export function buildRootObject(_vatPowers) { let resolver; - return harden({ + return Far('root', { first() { log('=> Bob: in first'); const answer = new Promise((theResolver, _theRejector) => { diff --git a/packages/swingset-runner/demo/resolvePipelined/bootstrap.js b/packages/swingset-runner/demo/resolvePipelined/bootstrap.js index 5b9e4444dfa..427c817e624 100644 --- a/packages/swingset-runner/demo/resolvePipelined/bootstrap.js +++ b/packages/swingset-runner/demo/resolvePipelined/bootstrap.js @@ -1,4 +1,5 @@ import { E } from '@agoric/eventual-send'; +import { Far } from '@agoric/marshal'; const log = console.log; @@ -6,7 +7,7 @@ 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/resolvePromiseComplicated/bootstrap.js b/packages/swingset-runner/demo/resolvePromiseComplicated/bootstrap.js index 7cd593dcf23..454532e1430 100644 --- a/packages/swingset-runner/demo/resolvePromiseComplicated/bootstrap.js +++ b/packages/swingset-runner/demo/resolvePromiseComplicated/bootstrap.js @@ -1,4 +1,5 @@ import { E } from '@agoric/eventual-send'; +import { Far } from '@agoric/marshal'; const log = console.log; @@ -6,7 +7,7 @@ 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/resolvePromiseComplicated/vat-carol.js b/packages/swingset-runner/demo/resolvePromiseComplicated/vat-carol.js index 0e29c50cb50..7708dde0dc8 100644 --- a/packages/swingset-runner/demo/resolvePromiseComplicated/vat-carol.js +++ b/packages/swingset-runner/demo/resolvePromiseComplicated/vat-carol.js @@ -1,7 +1,9 @@ +import { Far } from '@agoric/marshal'; + const log = console.log; export function buildRootObject(_vatPowers) { - return harden({ + return Far('root', { foo(p) { log('=> Carol: in foo'); p.then( diff --git a/packages/swingset-runner/demo/resolveSimpleCircular/bootstrap.js b/packages/swingset-runner/demo/resolveSimpleCircular/bootstrap.js index 31e7f3d485d..208cfe47737 100644 --- a/packages/swingset-runner/demo/resolveSimpleCircular/bootstrap.js +++ b/packages/swingset-runner/demo/resolveSimpleCircular/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).genPromise(); E(vats.bob).usePromise([pa]); diff --git a/packages/swingset-runner/demo/resolveSimpleCircular2/bootstrap.js b/packages/swingset-runner/demo/resolveSimpleCircular2/bootstrap.js index baef1b4bdfd..53e62206991 100644 --- a/packages/swingset-runner/demo/resolveSimpleCircular2/bootstrap.js +++ b/packages/swingset-runner/demo/resolveSimpleCircular2/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).genPromise(); E(vats.bob).usePromise([pa]); diff --git a/packages/swingset-runner/demo/resolveWithEmbeddedPromise/bootstrap.js b/packages/swingset-runner/demo/resolveWithEmbeddedPromise/bootstrap.js index 150904c61e5..47fa7625552 100644 --- a/packages/swingset-runner/demo/resolveWithEmbeddedPromise/bootstrap.js +++ b/packages/swingset-runner/demo/resolveWithEmbeddedPromise/bootstrap.js @@ -1,11 +1,12 @@ import { E } from '@agoric/eventual-send'; +import { Far } from '@agoric/marshal'; const log = console.log; log(`=> loading bootstrap.js`); export function buildRootObject(_vatPowers) { - return harden({ + return Far('root', { bootstrap(vats) { log('=> Alice: bootstrap() called'); diff --git a/packages/swingset-runner/demo/simplePromisePass/bootstrap.js b/packages/swingset-runner/demo/simplePromisePass/bootstrap.js index 7d4a111bc10..1e885c28f69 100644 --- a/packages/swingset-runner/demo/simplePromisePass/bootstrap.js +++ b/packages/swingset-runner/demo/simplePromisePass/bootstrap.js @@ -1,11 +1,12 @@ import { E } from '@agoric/eventual-send'; +import { Far } from '@agoric/marshal'; const log = console.log; log(`=> loading bootstrap.js`); export function buildRootObject(_vatPowers) { - return harden({ + return Far('root', { bootstrap(vats) { log('=> Bootstrap: bootstrap() called'); // prettier-ignore diff --git a/packages/swingset-runner/demo/simplePromisePass/vat-alice.js b/packages/swingset-runner/demo/simplePromisePass/vat-alice.js index b5d61622b17..ccc67fdd201 100644 --- a/packages/swingset-runner/demo/simplePromisePass/vat-alice.js +++ b/packages/swingset-runner/demo/simplePromisePass/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', { sendPromiseTo(other) { log('=> Alice: sendPromiseTo() begins'); let resolver; diff --git a/packages/swingset-runner/demo/simplePromisePass/vat-bob.js b/packages/swingset-runner/demo/simplePromisePass/vat-bob.js index 337c965edd5..62bc5b6e43f 100644 --- a/packages/swingset-runner/demo/simplePromisePass/vat-bob.js +++ b/packages/swingset-runner/demo/simplePromisePass/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/swapBenchmark/exchanger.js b/packages/swingset-runner/demo/swapBenchmark/exchanger.js index ce66aa51a8f..22b4d8fb1cb 100755 --- a/packages/swingset-runner/demo/swapBenchmark/exchanger.js +++ b/packages/swingset-runner/demo/swapBenchmark/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'; @@ -107,7 +108,7 @@ async function build(name, zoe, issuers, payments, installations) { } export function buildRootObject(_vatPowers, vatParameters) { - return harden({ + return Far('root', { build: (zoe, issuers, payments, installations) => build(vatParameters.name, zoe, issuers, payments, installations), }); diff --git a/packages/swingset-runner/demo/swapBenchmark/vat-zoe.js b/packages/swingset-runner/demo/swapBenchmark/vat-zoe.js index cf3f5de41c4..150a446539c 100644 --- a/packages/swingset-runner/demo/swapBenchmark/vat-zoe.js +++ b/packages/swingset-runner/demo/swapBenchmark/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/terminateVat/vat-dude.js b/packages/swingset-runner/demo/terminateVat/vat-dude.js index 047de3d9dd0..3599fd630f6 100644 --- a/packages/swingset-runner/demo/terminateVat/vat-dude.js +++ b/packages/swingset-runner/demo/terminateVat/vat-dude.js @@ -1,8 +1,9 @@ import { E } from '@agoric/eventual-send'; +import { Far } from '@agoric/marshal'; export function buildRootObject(vatPowers) { let count = 0; - return harden({ + return Far('root', { async elsewhere(other) { const val = await E(other).query(); console.log(`other returns ${val}`); diff --git a/packages/swingset-runner/demo/vatStore1/bootstrap.js b/packages/swingset-runner/demo/vatStore1/bootstrap.js index fdab80cb7f0..cdbd1a9dc3b 100644 --- a/packages/swingset-runner/demo/vatStore1/bootstrap.js +++ b/packages/swingset-runner/demo/vatStore1/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) { for (let i = 0; i < 5; i += 1) { E(vats.bob).doYourStuff(i); diff --git a/packages/swingset-runner/demo/zoeTests/vat-alice.js b/packages/swingset-runner/demo/zoeTests/vat-alice.js index b3d193caf84..5e00006cbad 100644 --- a/packages/swingset-runner/demo/zoeTests/vat-alice.js +++ b/packages/swingset-runner/demo/zoeTests/vat-alice.js @@ -1,6 +1,7 @@ import { E } from '@agoric/eventual-send'; import { AmountMath } from '@agoric/ertp'; import { assert, details as X } from '@agoric/assert'; +import { Far } from '@agoric/marshal'; import { showPurseBalance, setupIssuers } from './helpers'; import { makePrintLog } from './printLog'; @@ -533,7 +534,7 @@ const build = async (log, zoe, issuers, payments, installations, timer) => { }; export function buildRootObject(_vatPowers) { - return harden({ + return Far('root', { build: (...args) => build(makePrintLog(), ...args), }); } diff --git a/packages/swingset-runner/demo/zoeTests/vat-bob.js b/packages/swingset-runner/demo/zoeTests/vat-bob.js index 3a262da5bba..26951b5a016 100644 --- a/packages/swingset-runner/demo/zoeTests/vat-bob.js +++ b/packages/swingset-runner/demo/zoeTests/vat-bob.js @@ -2,6 +2,7 @@ import { E } from '@agoric/eventual-send'; import { assert, details as X } from '@agoric/assert'; import { sameStructure } from '@agoric/same-structure'; import { AmountMath } from '@agoric/ertp'; +import { Far } from '@agoric/marshal'; import { showPurseBalance, setupIssuers } from './helpers'; import { makePrintLog } from './printLog'; @@ -558,7 +559,7 @@ const build = async (log, zoe, issuers, payments, installations, timer) => { }; export function buildRootObject(_vatPowers) { - return harden({ + return Far('root', { build: (...args) => build(makePrintLog(), ...args), }); } diff --git a/packages/swingset-runner/demo/zoeTests/vat-carol.js b/packages/swingset-runner/demo/zoeTests/vat-carol.js index 73c2b8c521e..9c988151279 100644 --- a/packages/swingset-runner/demo/zoeTests/vat-carol.js +++ b/packages/swingset-runner/demo/zoeTests/vat-carol.js @@ -1,6 +1,7 @@ import { E } from '@agoric/eventual-send'; import { assert, details as X } from '@agoric/assert'; import { sameStructure } from '@agoric/same-structure'; +import { Far } from '@agoric/marshal'; import { showPurseBalance, setupIssuers } from './helpers'; import { makePrintLog } from './printLog'; @@ -66,7 +67,7 @@ const build = async (log, zoe, issuers, payments, installations) => { }; export function buildRootObject(_vatPowers) { - return harden({ + return Far('root', { build: (...args) => build(makePrintLog(), ...args), }); } diff --git a/packages/swingset-runner/demo/zoeTests/vat-dave.js b/packages/swingset-runner/demo/zoeTests/vat-dave.js index f30d529e1f1..10d8aff8ee3 100644 --- a/packages/swingset-runner/demo/zoeTests/vat-dave.js +++ b/packages/swingset-runner/demo/zoeTests/vat-dave.js @@ -2,6 +2,7 @@ import { E } from '@agoric/eventual-send'; import { assert, details as X } from '@agoric/assert'; import { sameStructure } from '@agoric/same-structure'; import { AmountMath } from '@agoric/ertp'; +import { Far } from '@agoric/marshal'; import { showPurseBalance, setupIssuers } from './helpers'; import { makePrintLog } from './printLog'; @@ -177,7 +178,7 @@ const build = async (log, zoe, issuers, payments, installations, timer) => { }; export function buildRootObject(_vatPowers) { - return harden({ + return Far('root', { build: (...args) => build(makePrintLog(), ...args), }); } diff --git a/packages/swingset-runner/demo/zoeTests/vat-zoe.js b/packages/swingset-runner/demo/zoeTests/vat-zoe.js index 4e194ef59cb..e7f14bfdde1 100644 --- a/packages/swingset-runner/demo/zoeTests/vat-zoe.js +++ b/packages/swingset-runner/demo/zoeTests/vat-zoe.js @@ -1,8 +1,9 @@ // noinspection ES6PreferShortImport 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/treasury/src/liquidateMinimum.js b/packages/treasury/src/liquidateMinimum.js index 89dc3f9dffe..b978aeabc1d 100644 --- a/packages/treasury/src/liquidateMinimum.js +++ b/packages/treasury/src/liquidateMinimum.js @@ -4,6 +4,7 @@ import { E } from '@agoric/eventual-send'; import { offerTo } from '@agoric/zoe/src/contractSupport'; import { assert, q } from '@agoric/assert'; import { AmountMath } from '@agoric/ertp'; +import { Far } from '@agoric/marshal'; import { makeDefaultLiquidationStrategy } from './liquidation'; import { makeTracer } from './makeTracer'; @@ -88,10 +89,10 @@ export async function start(zcf) { }; } - const creatorFacet = { + const creatorFacet = Far('debtorInvitationCreator', { makeDebtorInvitation: runDebt => zcf.makeInvitation(makeDebtorHook(runDebt), 'Liquidate'), - }; + }); return harden({ creatorFacet }); } diff --git a/packages/treasury/src/stablecoinMachine.js b/packages/treasury/src/stablecoinMachine.js index f73c91b40fe..f8500a569bf 100644 --- a/packages/treasury/src/stablecoinMachine.js +++ b/packages/treasury/src/stablecoinMachine.js @@ -1,4 +1,5 @@ // @ts-check +import { Far } from '@agoric/marshal'; import '@agoric/zoe/exported'; import '@agoric/zoe/src/contracts/exported'; @@ -320,7 +321,7 @@ export async function start(zcf) { const getBootstrapPayment = mintBootstrapPayment(); - const publicFacet = harden({ + const publicFacet = Far('stablecoin public facet', { getAMM() { return autoswapInstance; }, @@ -341,7 +342,7 @@ export async function start(zcf) { ); /** @type {StablecoinMachine} */ - const stablecoinMachine = harden({ + const stablecoinMachine = Far('stablecoin machine', { makeAddTypeInvitation, getAMM() { return autoswapInstance; diff --git a/packages/treasury/src/vault.js b/packages/treasury/src/vault.js index c7446097213..a4e228f1ce4 100644 --- a/packages/treasury/src/vault.js +++ b/packages/treasury/src/vault.js @@ -14,6 +14,7 @@ import { makeNotifierKit } from '@agoric/notifier'; import { makeRatio } from '@agoric/zoe/src/contractSupport/ratio'; import { AmountMath } from '@agoric/ertp'; +import { Far } from '@agoric/marshal'; import { makeTracer } from './makeTracer'; import { makeInterestCalculator } from './interest'; @@ -443,7 +444,7 @@ export function makeVaultKit( } /** @type {Vault} */ - const vault = harden({ + const vault = Far('vault', { makeAdjustBalancesInvitation, makeCloseInvitation, diff --git a/packages/treasury/src/vaultManager.js b/packages/treasury/src/vaultManager.js index 37e0d76c58b..2c2e840f761 100644 --- a/packages/treasury/src/vaultManager.js +++ b/packages/treasury/src/vaultManager.js @@ -13,6 +13,8 @@ import { } from '@agoric/zoe/src/contractSupport'; import { observeNotifier } from '@agoric/notifier'; import { AmountMath } from '@agoric/ertp'; +import { Far } from '@agoric/marshal'; + import { makeVaultKit } from './vault'; import { makePrioritizedVaults } from './prioritizedVaults'; import { liquidate } from './liquidation'; @@ -231,17 +233,17 @@ export function makeVaultManager( // the payout object return harden({ uiNotifier: notifier, - invitationMakers: { + invitationMakers: Far('invitation makers', { AdjustBalances: vault.makeAdjustBalancesInvitation, CloseVault: vault.makeCloseInvitation, - }, + }), vault, liquidationPayout: collateralPayoutP, }); } /** @type {VaultManager} */ - return harden({ + return Far('vault manager', { ...shared, makeLoanKit, liquidateAll, diff --git a/packages/treasury/test/vault-contract-wrapper.js b/packages/treasury/test/vault-contract-wrapper.js index c1596224ee4..65c43503fb4 100644 --- a/packages/treasury/test/vault-contract-wrapper.js +++ b/packages/treasury/test/vault-contract-wrapper.js @@ -53,7 +53,7 @@ export async function start(zcf) { } /** @type {InnerVaultManager} */ - const managerMock = { + const managerMock = Far('vault manager mock', { getLiquidationMargin() { return makeRatio(105n, runBrand); }, @@ -66,9 +66,9 @@ export async function start(zcf) { getInterestRate() { return makeRatio(5n, runBrand); }, - collateralBrand, + // collateralBrand, // TODO not a method. How did this ever work? reallocateReward, - }; + }); const SECONDS_PER_HOUR = SECONDS_PER_YEAR / 365n / 24n; const timer = buildManualTimer(console.log, 0n, SECONDS_PER_HOUR * 24n); @@ -105,12 +105,12 @@ export async function start(zcf) { liquidationPayout: E(liqSeat).getPayout('Collateral'), runMint, collateralKit, - actions: { + actions: Far('vault actions', { add() { return vault.makeAdjustBalancesInvitation(); }, accrueInterestAndAddToPool, - }, + }), notifier, collateralPayoutP, }; diff --git a/packages/zoe/tools/fakePriceAuthority.js b/packages/zoe/tools/fakePriceAuthority.js index 27eddab350a..acdaa61bf51 100644 --- a/packages/zoe/tools/fakePriceAuthority.js +++ b/packages/zoe/tools/fakePriceAuthority.js @@ -7,6 +7,7 @@ import { } from '@agoric/notifier'; import { E } from '@agoric/eventual-send'; import { assert, details as X } from '@agoric/assert'; +import { Far } from '@agoric/marshal'; import { natSafeMath } from '../src/contractSupport'; @@ -240,7 +241,7 @@ export async function makeFakePriceAuthority(options) { } /** @type {PriceAuthority} */ - const priceAuthority = { + const priceAuthority = Far('fake price authority', { getQuoteIssuer: (brandIn, brandOut) => { assertBrands(brandIn, brandOut); return quoteIssuer; @@ -305,6 +306,6 @@ export async function makeFakePriceAuthority(options) { mutableQuoteWhenGTE: () => { throw Error('use ScriptedPriceAuthority'); }, - }; + }); return priceAuthority; } diff --git a/packages/zoe/tools/priceAuthorityRegistry.js b/packages/zoe/tools/priceAuthorityRegistry.js index 0a3a26a8826..3413c560437 100644 --- a/packages/zoe/tools/priceAuthorityRegistry.js +++ b/packages/zoe/tools/priceAuthorityRegistry.js @@ -3,6 +3,7 @@ import { E } from '@agoric/eventual-send'; import { makeStore } from '@agoric/store'; import { assert, details as X } from '@agoric/assert'; +import { Far } from '@agoric/marshal'; /** * @typedef {Object} Deleter @@ -96,7 +97,7 @@ export const makePriceAuthorityRegistry = () => { * * @type {PriceAuthority} */ - const priceAuthority = { + const priceAuthority = Far('fake price authority', { async getQuoteIssuer(brandIn, brandOut) { return E(paFor(brandIn, brandOut)).getQuoteIssuer(brandIn, brandOut); }, @@ -130,10 +131,10 @@ export const makePriceAuthorityRegistry = () => { mutableQuoteWhenLTE: makeMutableQuoteWhen('LTE'), mutableQuoteWhenGTE: makeMutableQuoteWhen('GTE'), mutableQuoteWhenGT: makeMutableQuoteWhen('GT'), - }; + }); /** @type {PriceAuthorityRegistryAdmin} */ - const adminFacet = { + const adminFacet = Far('price authority admin facet', { registerPriceAuthority(pa, brandIn, brandOut, force = false) { /** @type {Store} */ let priceStore; @@ -157,7 +158,7 @@ export const makePriceAuthorityRegistry = () => { priceStore.init(brandOut, harden(record)); } - return harden({ + return Far('deleter', { delete() { assert.equal( priceStore.has(brandOut) && priceStore.get(brandOut), @@ -168,7 +169,7 @@ export const makePriceAuthorityRegistry = () => { }, }); }, - }; + }); return harden({ priceAuthority,