feat(runUtils): add EV.whenVow() to unwrap a vow

Co-authored-by: Dan Connolly <[email protected]>
Agoric · Jun 24, 2024 · 7f5f1af · 7f5f1af
1 parent 7e83a07
commit 7f5f1af
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 21 deletions.
diff --git a/packages/SwingSet/tools/run-utils.js b/packages/SwingSet/tools/run-utils.js
@@ -2,7 +2,10 @@ import { Fail, q } from '@agoric/assert';
 import { kunser } from '@agoric/kmarshal';
 import { makeQueue } from '@endo/stream';
 
-/** @import { ERef } from '@endo/far' */
+/**
+ * @import { ERef } from '@endo/far';
+ * @import {Vow} from '@agoric/vow';
+ */
 
 /**
  * @param {import('../src/controller/controller.js').SwingsetController} controller
@@ -49,6 +52,7 @@ export const makeRunUtils = controller => {
    * @typedef {import('@endo/eventual-send').EProxy & {
    *  sendOnly: (presence: unknown) => Record<string, (...args: any) => void>;
    *  vat: (name: string) => Record<string, (...args: any) => Promise<any>>;
+   *  whenVow: (vow: Vow) => Promise<any>;
    * }} EVProxy
    */
 
@@ -141,6 +145,10 @@ export const makeRunUtils = controller => {
               ]),
             ),
         }),
+      whenVow: vow =>
+        queueAndRun(() =>
+          controller.queueToVatRoot('bootstrap', 'whenVow', [vow]),
+        ),
     },
   );
   return harden({ queueAndRun, EV });

diff --git a/packages/boot/test/bootstrapTests/vat-orchestration.test.ts b/packages/boot/test/bootstrapTests/vat-orchestration.test.ts
@@ -215,17 +215,18 @@ test.skip('Query connection can be created', async t => {
 });
 
 // skipping until EV supports Vows, or this functionality is tested elsewhere #9572
-test.skip('Query connection can send a query', async t => {
+test('Query connection can send a query', async t => {
   const {
     runUtils: { EV },
   } = t.context;
 
   type Powers = { orchestration: OrchestrationService };
   const contract = async ({ orchestration }: Powers) => {
-    const queryConnection: ICQConnection =
+    const queryConnection =
       await EV(orchestration).provideICQConnection('connection-0');
 
-    const [result] = await EV(queryConnection).query([balanceQuery]);
+    const unwrappedQc: ICQConnection = await EV.whenVow(queryConnection);
+    const [result] = await EV(unwrappedQc).query([balanceQuery]);
     t.is(result.code, 0);
     t.is(result.height, '0'); // bigint
     t.deepEqual(QueryBalanceResponse.decode(decodeBase64(result.key)), {
@@ -235,10 +236,7 @@ test.skip('Query connection can send a query', async t => {
       },
     });
 
-    const results = await EV(queryConnection).query([
-      balanceQuery,
-      balanceQuery,
-    ]);
+    const results = await EV(unwrappedQc).query([balanceQuery, balanceQuery]);
     t.is(results.length, 2);
     for (const { key } of results) {
       t.deepEqual(QueryBalanceResponse.decode(decodeBase64(key)), {
@@ -250,7 +248,7 @@ test.skip('Query connection can send a query', async t => {
     }
 
     await t.throwsAsync(
-      EV(queryConnection).query([
+      EV(unwrappedQc).query([
         { ...balanceQuery, path: '/cosmos.bank.v1beta1.QueryBalanceRequest' },
       ]),
       {

diff --git a/packages/orchestration/src/service.js b/packages/orchestration/src/service.js
@@ -97,7 +97,8 @@ const prepareOrchestrationKit = (
           M.remotable('ChainAccountKit'),
         ),
         provideICQConnection: M.callWhen(M.string()).returns(
-          M.remotable('ICQConnection'),
+          // M.remotable('ICQConnection'),
+          M.any(),
         ),
       }),
     },
@@ -224,17 +225,15 @@ const prepareOrchestrationKit = (
           }
           const remoteConnAddr = makeICQChannelAddress(controllerConnectionId);
           const portAllocator = getPower(this.state.powers, 'portAllocator');
-          return when(
-            watch(
-              // allocate a new Port for every Connection
-              // TODO #9317 optimize ICQ port allocation
-              E(portAllocator).allocateICQControllerPort(),
-              this.facets.requestICQChannelWatcher,
-              {
-                remoteConnAddr,
-                controllerConnectionId,
-              },
-            ),
+          return watch(
+            // allocate a new Port for every Connection
+            // TODO #9317 optimize ICQ port allocation
+            E(portAllocator).allocateICQControllerPort(),
+            this.facets.requestICQChannelWatcher,
+            {
+              remoteConnAddr,
+              controllerConnectionId,
+            },
           );
         },
       },

diff --git a/packages/vats/src/core/lib-boot.js b/packages/vats/src/core/lib-boot.js
@@ -1,5 +1,6 @@
 import { E, Far } from '@endo/far';
 import { makeHeapZone } from '@agoric/zone';
+import { prepareVowTools } from '@agoric/vow/vat.js';
 import {
   makeVatSpace,
   makeWellKnownSpaces,
@@ -73,6 +74,9 @@ export const makeBootstrap = (
   const { produce, consume } = makePromiseSpace({ log, store: powerStore });
   produce.powerStore.resolve(powerStore);
 
+  const vowZone = zone.subZone('vow');
+  const vowTools = prepareVowTools(vowZone);
+
   /**
    * Bootstrap vats and devices.
    *
@@ -209,6 +213,9 @@ export const makeBootstrap = (
       }
       return value;
     },
+    whenVow: async vow => {
+      return vowTools.when(vow);
+    },
     /**
      * @template K, V
      * @param {MapStore<K, V>} store