fixup! refactor(time-helper): optionally durable

Agoric · Jun 25, 2024 · 4c68b4e · 4c68b4e
1 parent 509a9c4
commit 4c68b4e
Show file tree

Hide file tree

Showing 5 changed files with 116 additions and 75 deletions.
diff --git a/packages/orchestration/src/examples/stakeBld.contract.js b/packages/orchestration/src/examples/stakeBld.contract.js
@@ -12,7 +12,7 @@ import { deeplyFulfilled } from '@endo/marshal';
 import { M } from '@endo/patterns';
 import { prepareLocalOrchestrationAccountKit } from '../exos/local-orchestration-account.js';
 import { makeChainHub } from '../exos/chain-hub.js';
-import { makeTimeHelper } from '../exos/time-helper.js';
+import { prepareTimeHelper } from '../exos/time-helper.js';
 
 /**
  * @import {NameHub} from '@agoric/vats';
@@ -40,7 +40,7 @@ export const start = async (zcf, privateArgs, baggage) => {
 
   const { makeRecorderKit } = prepareRecorderKitMakers(baggage, marshaller);
   const vowTools = prepareVowTools(zone.subZone('vows'));
-  const timeHelper = makeTimeHelper(makeHeapZone(), {
+  const timeHelper = prepareTimeHelper(makeHeapZone(), {
     timerService,
     vowTools,
   });

diff --git a/packages/orchestration/src/exos/time-helper.js b/packages/orchestration/src/exos/time-helper.js
@@ -1,6 +1,12 @@
-import { RelativeTimeRecordShape, TimeMath } from '@agoric/time';
+import { BrandShape } from '@agoric/ertp';
+import {
+  RelativeTimeRecordShape,
+  TimeMath,
+  TimestampRecordShape,
+} from '@agoric/time';
+import { pickFacet } from '@agoric/vat-data';
 import { VowShape } from '@agoric/vow';
-import { E, Far } from '@endo/far';
+import { E } from '@endo/far';
 import { M } from '@endo/patterns';
 
 /**
@@ -13,78 +19,112 @@ import { M } from '@endo/patterns';
 export const SECONDS_PER_MINUTE = 60n;
 export const NANOSECONDS_PER_SECOND = 1_000_000_000n;
 
+/** @typedef {{ timerService: Remote<TimerService>; vowTools: VowTools }} TimeHelperPowers */
+
 /**
  * @param {Zone} zone
- * @param {{ timerService: Remote<TimerService>; vowTools: VowTools }} powers
+ * @param {TimeHelperPowers} powers
  */
-export const makeTimeHelper = (
+const prepareTimeHelperKit = (
   zone,
   { timerService, vowTools: { watch, allVows } },
-) => {
-  const timeHelper = zone.exoClass(
+) =>
+  zone.exoClassKit(
     'Time Helper',
-    M.interface('TimeHelperI', {
-      getTimeoutTimestampNS: M.call()
-        .optional(RelativeTimeRecordShape)
-        .returns(VowShape),
-      getBrand: M.call().returns(VowShape),
-    }),
+    {
+      getBrandWatcher: M.interface('GetBrandWatcherI', {
+        onFulfilled: M.call(BrandShape)
+          .optional(M.arrayOf(M.undefined())) // does not need watcherContext
+          .returns(BrandShape),
+      }),
+      getTimestampWatcher: M.interface('GetBrandWatcherI', {
+        onFulfilled: M.call([TimestampRecordShape, BrandShape])
+          .optional({
+            relativeTime: M.or(RelativeTimeRecordShape, M.undefined()),
+          })
+          .returns(M.bigint()),
+      }),
+      public: M.interface('TimeHelperI', {
+        getTimeoutTimestampNS: M.call()
+          .optional(RelativeTimeRecordShape)
+          .returns(VowShape),
+        getBrand: M.call().returns(VowShape),
+      }),
+    },
     () =>
       /** @type {{ brandCache: TimerBrand | undefined }} */ ({
         brandCache: undefined,
       }),
     {
-      /** @returns {Vow<TimerBrand>} */
-      getBrand() {
-        // XXX this is a common use case that should have a helper like `provideSingleton`
-        if (this.state.brandCache) return watch(this.state.brandCache);
-        return watch(
-          E(timerService).getTimerBrand(),
-          Far('BrandWatcher', {
-            /** @param {TimerBrand} timerBrand */
-            onFulfilled: timerBrand => {
-              this.state.brandCache = timerBrand;
-              return timerBrand;
-            },
-          }),
-        );
+      getBrandWatcher: {
+        /** @param {TimerBrand} timerBrand */
+        onFulfilled(timerBrand) {
+          this.state.brandCache = timerBrand;
+          return timerBrand;
+        },
       },
-      /**
-       * Takes the current time from ChainTimerService and adds a relative time
-       * to determine a timeout timestamp in nanoseconds. Useful for
-       * {@link MsgTransfer.timeoutTimestamp}.
-       *
-       * @param {RelativeTimeRecord} [relativeTime] defaults to 5 minutes
-       * @returns {Vow<bigint>} Timeout timestamp in absolute nanoseconds since
-       *   unix epoch
-       */
-      getTimeoutTimestampNS(relativeTime) {
-        return watch(
-          allVows([
-            E(timerService).getCurrentTimestamp(),
-            this.self.getBrand(),
-          ]),
-          Far('TimestampWatcher', {
-            /** @param {[TimestampRecord, TimerBrand]} results */
-            onFulfilled([currentTime, timerBrand]) {
-              const timeout =
-                relativeTime ||
-                TimeMath.coerceRelativeTimeRecord(
-                  SECONDS_PER_MINUTE * 5n,
-                  timerBrand,
-                );
-              return (
-                TimeMath.addAbsRel(currentTime, timeout).absValue *
-                NANOSECONDS_PER_SECOND
-              );
-            },
-          }),
-        );
+      getTimestampWatcher: {
+        /**
+         * @param {[TimestampRecord, TimerBrand]} results
+         * @param {{ relativeTime: RelativeTimeRecord }} ctx
+         */
+        onFulfilled([currentTime, timerBrand], { relativeTime }) {
+          const timeout =
+            relativeTime ||
+            TimeMath.coerceRelativeTimeRecord(
+              SECONDS_PER_MINUTE * 5n,
+              timerBrand,
+            );
+          return (
+            TimeMath.addAbsRel(currentTime, timeout).absValue *
+            NANOSECONDS_PER_SECOND
+          );
+        },
+      },
+      public: {
+        /** @returns {Vow<TimerBrand>} */
+        getBrand() {
+          // XXX this is a common use case that should have a helper like `provideSingleton`
+          if (this.state.brandCache) return watch(this.state.brandCache);
+          return watch(
+            E(timerService).getTimerBrand(),
+            this.facets.getBrandWatcher,
+          );
+        },
+        /**
+         * Takes the current time from ChainTimerService and adds a relative
+         * time to determine a timeout timestamp in nanoseconds. Useful for
+         * {@link MsgTransfer.timeoutTimestamp}.
+         *
+         * @param {RelativeTimeRecord} [relativeTime] defaults to 5 minutes
+         * @returns {Vow<bigint>} Timeout timestamp in absolute nanoseconds
+         *   since unix epoch
+         */
+        getTimeoutTimestampNS(relativeTime) {
+          return watch(
+            allVows([
+              E(timerService).getCurrentTimestamp(),
+              this.facets.public.getBrand(),
+            ]),
+            this.facets.getTimestampWatcher,
+            { relativeTime },
+          );
+        },
       },
     },
   );
-  return timeHelper();
+harden(prepareTimeHelperKit);
+
+/**
+ * @param {Zone} zone
+ * @param {TimeHelperPowers} powers
+ */
+export const prepareTimeHelper = (zone, powers) => {
+  const makeTimeHelperKit = prepareTimeHelperKit(zone, powers);
+  const makeTimeHelper = pickFacet(makeTimeHelperKit, 'public');
+  const timeHelper = makeTimeHelper();
+  return harden(timeHelper);
 };
-harden(makeTimeHelper);
+harden(prepareTimeHelper);
 
-/** @typedef {ReturnType<typeof makeTimeHelper>} TimeHelper */
+/** @typedef {ReturnType<typeof prepareTimeHelper>} TimeHelper */
diff --git a/packages/orchestration/src/utils/start-helper.js b/packages/orchestration/src/utils/start-helper.js
@@ -9,7 +9,7 @@ import { makeChainHub } from '../exos/chain-hub.js';
 import { prepareRemoteChainFacade } from '../exos/remote-chain-facade.js';
 import { prepareCosmosOrchestrationAccount } from '../exos/cosmos-orchestration-account.js';
 import { prepareLocalChainFacade } from '../exos/local-chain-facade.js';
-import { makeTimeHelper } from '../exos/time-helper.js';
+import { prepareTimeHelper } from '../exos/time-helper.js';
 
 /**
  * @import {PromiseKit} from '@endo/promise-kit'
@@ -50,7 +50,7 @@ export const provideOrchestration = (
   const vowTools = prepareVowTools(zone.subZone('vows'));
   const { agoricNames, timerService } = remotePowers;
   const chainHub = makeChainHub(agoricNames);
-  const timeHelper = makeTimeHelper(makeHeapZone(), {
+  const timeHelper = prepareTimeHelper(makeHeapZone(), {
     timerService,
     vowTools,
   });

diff --git a/packages/orchestration/test/exos/local-orchestration-account-kit.test.ts b/packages/orchestration/test/exos/local-orchestration-account-kit.test.ts
@@ -10,7 +10,7 @@ import { prepareLocalOrchestrationAccountKit } from '../../src/exos/local-orches
 import { ChainAddress } from '../../src/orchestration-api.js';
 import { makeChainHub } from '../../src/exos/chain-hub.js';
 import {
-  makeTimeHelper,
+  prepareTimeHelper,
   NANOSECONDS_PER_SECOND,
 } from '../../src/exos/time-helper.js';
 import { commonSetup } from '../supports.js';
@@ -38,7 +38,7 @@ test('deposit, withdraw', async t => {
     timer,
     vowTools,
     makeChainHub(bootstrap.agoricNames),
-    makeTimeHelper(makeHeapZone(), { timerService: timer, vowTools }),
+    prepareTimeHelper(makeHeapZone(), { timerService: timer, vowTools }),
   );
 
   t.log('request account from vat-localchain');
@@ -110,7 +110,7 @@ test('delegate, undelegate', async t => {
     timer,
     vowTools,
     makeChainHub(bootstrap.agoricNames),
-    makeTimeHelper(makeHeapZone(), { timerService: timer, vowTools }),
+    prepareTimeHelper(makeHeapZone(), { timerService: timer, vowTools }),
   );
 
   t.log('request account from vat-localchain');
@@ -163,7 +163,7 @@ test('transfer', async t => {
     timer,
     vowTools,
     makeChainHub(bootstrap.agoricNames),
-    makeTimeHelper(makeHeapZone(), { timerService: timer, vowTools }),
+    prepareTimeHelper(makeHeapZone(), { timerService: timer, vowTools }),
   );
 
   t.log('request account from vat-localchain');

diff --git a/packages/orchestration/test/exos/time-helper.test.ts b/packages/orchestration/test/exos/time-helper.test.ts
@@ -1,11 +1,11 @@
 /* eslint-disable @jessie.js/safe-await-separator */
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { prepareVowTools, V } from '@agoric/vow/vat.js';
+import { prepareVowTools, heapVowE } from '@agoric/vow/vat.js';
 import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
 import { TimeMath } from '@agoric/time';
 import { makeHeapZone } from '@agoric/zone';
 import {
-  makeTimeHelper,
+  prepareTimeHelper,
   NANOSECONDS_PER_SECOND,
   SECONDS_PER_MINUTE,
 } from '../../src/exos/time-helper.js';
@@ -16,23 +16,24 @@ test('makeTimeHelper - getCurrentTimestamp', async t => {
   const timerBrand = timer.getTimerBrand();
   t.is(timer.getCurrentTimestamp().absValue, 0n, 'current time is 0n');
 
-  const timeHelper = makeTimeHelper(makeHeapZone(), {
+  const timeHelper = prepareTimeHelper(makeHeapZone(), {
     timerService: timer,
     vowTools,
   });
+
   t.is(
-    await V.when(timeHelper.getTimeoutTimestampNS()),
+    await heapVowE.when(timeHelper.getTimeoutTimestampNS()),
     5n * SECONDS_PER_MINUTE * NANOSECONDS_PER_SECOND,
     'default timestamp is 5 minutes from current time, in nanoseconds',
   );
   t.is(
-    await V.when(timeHelper.getBrand()),
+    await heapVowE.when(timeHelper.getBrand()),
     timerBrand,
     'brand retrieved cache equals timerBrand',
   );
 
   t.is(
-    await V.when(
+    await heapVowE.when(
       timeHelper.getTimeoutTimestampNS(
         TimeMath.coerceRelativeTimeRecord(1n, timerBrand),
       ),
@@ -44,7 +45,7 @@ test('makeTimeHelper - getCurrentTimestamp', async t => {
   // advance timer by 3 seconds
   await timer.tickN(3);
   t.is(
-    await V.when(
+    await heapVowE.when(
       timeHelper.getTimeoutTimestampNS(
         TimeMath.coerceRelativeTimeRecord(1n, timerBrand),
       ),