@agoric/inter-protocol 0.16.2-dev-ef82fbf.0 → 0.16.2-dev-dcf2772.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.16.2-dev-ef82fbf.0+ef82fbf",
+  "version": "0.16.2-dev-dcf2772.0+dcf2772",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -31,15 +31,16 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-dev-ef82fbf.0+ef82fbf",
-    "@agoric/governance": "0.10.4-dev-ef82fbf.0+ef82fbf",
-    "@agoric/internal": "0.3.3-dev-ef82fbf.0+ef82fbf",
-    "@agoric/notifier": "0.6.3-dev-ef82fbf.0+ef82fbf",
-    "@agoric/store": "0.9.3-dev-ef82fbf.0+ef82fbf",
-    "@agoric/time": "0.3.3-dev-ef82fbf.0+ef82fbf",
-    "@agoric/vat-data": "0.5.3-dev-ef82fbf.0+ef82fbf",
-    "@agoric/vats": "0.15.2-dev-ef82fbf.0+ef82fbf",
-    "@agoric/zoe": "0.26.3-dev-ef82fbf.0+ef82fbf",
+    "@agoric/ertp": "0.16.3-dev-dcf2772.0+dcf2772",
+    "@agoric/governance": "0.10.4-dev-dcf2772.0+dcf2772",
+    "@agoric/internal": "0.3.3-dev-dcf2772.0+dcf2772",
+    "@agoric/notifier": "0.6.3-dev-dcf2772.0+dcf2772",
+    "@agoric/store": "0.9.3-dev-dcf2772.0+dcf2772",
+    "@agoric/time": "0.3.3-dev-dcf2772.0+dcf2772",
+    "@agoric/vat-data": "0.5.3-dev-dcf2772.0+dcf2772",
+    "@agoric/vats": "0.15.2-dev-dcf2772.0+dcf2772",
+    "@agoric/zoe": "0.26.3-dev-dcf2772.0+dcf2772",
+    "@agoric/zone": "0.2.3-dev-dcf2772.0+dcf2772",
     "@endo/captp": "^4.4.3",
     "@endo/errors": "^1.2.8",
     "@endo/eventual-send": "^1.2.8",
@@ -50,10 +51,9 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/smart-wallet": "0.5.4-dev-ef82fbf.0+ef82fbf",
-    "@agoric/swingset-liveslots": "0.10.3-dev-ef82fbf.0+ef82fbf",
-    "@agoric/swingset-vat": "0.32.3-dev-ef82fbf.0+ef82fbf",
-    "@agoric/zone": "0.2.3-dev-ef82fbf.0+ef82fbf",
+    "@agoric/smart-wallet": "0.5.4-dev-dcf2772.0+dcf2772",
+    "@agoric/swingset-liveslots": "0.10.3-dev-dcf2772.0+dcf2772",
+    "@agoric/swingset-vat": "0.32.3-dev-dcf2772.0+dcf2772",
     "@endo/bundle-source": "^3.5.0",
     "@endo/init": "^1.1.7",
     "@endo/promise-kit": "^1.1.8",
@@ -84,5 +84,5 @@
   "typeCoverage": {
     "atLeast": 95.71
   },
-  "gitHead": "ef82fbf7466ea1b57c321f735d73fcee2c66fd11"
+  "gitHead": "dcf27725dd4b6b0bc0c5d6a476b6416899a5aad3"
 }

package/src/provisionPool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provisionPool.d.ts","sourceRoot":"","sources":["provisionPool.js"],"names":[],"mappings":"AAgBA,8CAA8C;AAE9C,2BAA2B;AAC3B,mBADW,YAAY,CAerB;AAqBK,2BAZI,GAAG,CAAC,cAAc,CAAC,eACnB;IACN,QAAQ,EAAE,OAAO,WAAW,EAAE,IAAI,CACtC,OAAa,8BAA8B,EAAE,IAAI,CAC5C,CAAC;IACF,sBAAsB,EAAE,UAAU,CAAC;IACnC,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,QAAQ,GAAG,CAAC,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,uBAAuB,EAAE,mBAAmB,CAAC;CACvE,WACO,OAAO,kBAAkB,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAsEkiU,cAAc;kDAAuE,cAAc;;;;;;;GAHjrU;;;;6BAlFY,aAAa,GACrB,eAAe,CAAC;IACd,uBAAuB,EAAE,QAAQ,CAAC;CACnC,CAAC;6BAxBoB,eAAe"}
+{"version":3,"file":"provisionPool.d.ts","sourceRoot":"","sources":["provisionPool.js"],"names":[],"mappings":"AAoBA,8CAA8C;AAE9C,2BAA2B;AAC3B,mBADW,YAAY,CAerB;AAqBK,2BAZI,GAAG,CAAC,cAAc,CAAC,eACnB;IACN,QAAQ,EAAE,OAAO,WAAW,EAAE,IAAI,CACtC,OAAa,8BAA8B,EAAE,IAAI,CAC5C,CAAC;IACF,sBAAsB,EAAE,UAAU,CAAC;IACnC,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,QAAQ,GAAG,CAAC,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,uBAAuB,EAAE,mBAAmB,CAAC;CACvE,WACO,OAAO,kBAAkB,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CA0E8zT,cAAc;kDAAuE,cAAc;;;;;;;GAH78T;;;;6BAtFY,aAAa,GACrB,eAAe,CAAC;IACd,uBAAuB,EAAE,QAAQ,CAAC;CACnC,CAAC;6BAxBoB,eAAe"}

package/src/provisionPool.js

@@ -12,7 +12,11 @@ import { prepareExo } from '@agoric/vat-data';
 import { provideSingleton } from '@agoric/zoe/src/contractSupport/durability.js';
 import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
 import { TopicsRecordShape } from '@agoric/zoe/src/contractSupport/topics.js';
-import { prepareProvisionPoolKit } from './provisionPoolKit.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
+import {
+  prepareBridgeProvisionTool,
+  prepareProvisionPoolKit,
+} from './provisionPoolKit.js';
 
 /** @import {Marshal} from '@endo/marshal'; */
 
@@ -72,11 +76,15 @@ export const start = async (zcf, privateArgs, baggage) => {
       privateArgs.marshaller,
     );
 
-  const makeProvisionPoolKit = prepareProvisionPoolKit(baggage, {
+  const zone = makeDurableZone(baggage);
+
+  const makeBridgeProvisionTool = prepareBridgeProvisionTool(zone);
+  const makeProvisionPoolKit = prepareProvisionPoolKit(zone, {
     makeRecorderKit,
     params,
     poolBank,
     zcf,
+    makeBridgeProvisionTool,
   });
 
   const provisionPoolKit = await provideSingleton(

package/src/provisionPoolKit.d.ts

@@ -1,13 +1,12 @@
-export function makeBridgeProvisionTool(sendInitialPayment: (depositBank: ERef<Bank>) => Promise<void>, onProvisioned: () => void): ({ bankManager, namesByAddressAdmin, walletFactory, }: ProvisionPoolKitReferences) => {
-    fromBridge: (obj: any) => Promise<void>;
-} & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
-    fromBridge: (obj: any) => Promise<void>;
+export function prepareBridgeProvisionTool(zone: import("@agoric/zone").Zone): (bankManager?: any, walletFactory?: any, namesByAddressAdmin?: any, forHandler?: any) => import("@endo/exo").Guarded<{
+    fromBridge(obj: any): Promise<void>;
 }>;
-export function prepareProvisionPoolKit(baggage: import("@agoric/vat-data").Baggage, { makeRecorderKit, params, poolBank, zcf }: {
+export function prepareProvisionPoolKit(zone: import("@agoric/zone").Zone, { makeRecorderKit, params, poolBank, zcf, makeBridgeProvisionTool }: {
     makeRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeRecorderKit;
     params: any;
     poolBank: import("@endo/far").ERef<Bank>;
     zcf: ZCF;
+    makeBridgeProvisionTool: ReturnType<typeof prepareBridgeProvisionTool>;
 }): ({ poolBrand, storageNode }: {
     poolBrand: Brand<"nat">;
     storageNode: ERef<StorageNode>;

package/src/provisionPoolKit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provisionPoolKit.d.ts","sourceRoot":"","sources":["provisionPoolKit.js"],"names":[],"mappings":"AAgFO,4DAHI,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,iBAC1C,MAAM,IAAI,0DAGP,0BAA0B;;;;GA+BvC;AAWM,iDARI,OAAO,kBAAkB,EAAE,OAAO,8CAClC;IACN,eAAe,EAAE,OAAO,6CAA6C,EAAE,eAAe,CAAC;IACvF,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,OAAO,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,GAAG,EAAE,GAAG,CAAC;CACV,gCA0YC;IAA2B,SAAS,EAA5B,KAAK,CAAC,KAAK,CAAC;IACY,WAAW,EAAnC,KAAK,WAAW,CAAC;CACzB,KAAU,OAAO,CAAC,gBAAgB,CAAC,CAcvC;+BA1eY;IACR,OAAO,EAAE,GAAG,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;CACb;0BAIS,OAAO,qCAAqC,EAAE,QAAQ,CAClE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAsW6B,cACrB;kDAEK,cAAG;;;;;;;;;;;;EAzWyC,CACtD;;iBAKU,KAAK,WAAW,CAAC;yBACjB,KAAK,OAAO,cAAc,EAAE,SAAS,CAAC;mBACtC,KACb,OAAW,6CAA6C,EAAE,wBAAwB,CAAC,cAAc,CAAC,CAC/F;;;;;;;;;;wBAMU,MAAM;;;;;yBACN,OAAO,KAAK,CAAC;;;;;0BAEb,OAAO,KAAK,CAAC;;0BAjCS,8BAA8B;0BAF3C,WAAW;4BACT,2BAA2B;iCAChB,8BAA8B"}
+{"version":3,"file":"provisionPoolKit.d.ts","sourceRoot":"","sources":["provisionPoolKit.js"],"names":[],"mappings":"AA6EO,iDAFI,OAAO,cAAc,EAAE,IAAI;;GAyCnC;AAYI,8CATI,OAAO,cAAc,EAAE,IAAI,uEAC3B;IACN,eAAe,EAAE,OAAO,6CAA6C,EAAE,eAAe,CAAC;IACvF,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,OAAO,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,GAAG,EAAE,GAAG,CAAC;IACT,uBAAuB,EAAE,UAAU,CAAC,OAAO,0BAA0B,CAAC,CAAC;CACxE,gCA6YC;IAA2B,SAAS,EAA5B,KAAK,CAAC,KAAK,CAAC;IACY,WAAW,EAAnC,KAAK,WAAW,CAAC;CACzB,KAAU,OAAO,CAAC,gBAAgB,CAAC,CAcvC;+BApfY;IACR,OAAO,EAAE,GAAG,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;CACb;0BAIS,OAAO,qCAAqC,EAAE,QAAQ,CAClE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAsWa,cAAW;kDAEX,cACR;;;;;;;;;;;;EAzWoD,CACtD;;iBAKU,KAAK,WAAW,CAAC;yBACjB,KAAK,OAAO,cAAc,EAAE,SAAS,CAAC;mBACtC,KACb,OAAW,6CAA6C,EAAE,wBAAwB,CAAC,cAAc,CAAC,CAC/F;;;;;;;;;;wBAMU,MAAM;;;;;yBACN,OAAO,KAAK,CAAC;;;;;0BAEb,OAAO,KAAK,CAAC;;0BAjCS,8BAA8B;0BAF3C,WAAW;4BACT,2BAA2B;iCAChB,8BAA8B"}

package/src/provisionPoolKit.js

@@ -1,7 +1,6 @@
 // @ts-check
 import { X, q, Fail } from '@endo/errors';
 import { E } from '@endo/far';
-import { Far } from '@endo/marshal';
 
 import { AmountMath, BrandShape } from '@agoric/ertp';
 import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
@@ -15,7 +14,6 @@ import {
   M,
   makeScalarBigMapStore,
   makeScalarBigSetStore,
-  prepareExoClassKit,
 } from '@agoric/vat-data';
 import { PowerFlags } from '@agoric/vats/src/walletFlags.js';
 import {
@@ -75,18 +73,22 @@ const FIRST_LOWER_NEAR_KEYWORD = /^[a-z][a-zA-Z0-9_$]*$/;
  * Given attenuated access to the funding purse, handle requests to provision
  * smart wallets.
  *
- * @param {(depositBank: ERef<Bank>) => Promise<void>} sendInitialPayment
- * @param {() => void} onProvisioned
+ * @param {import('@agoric/zone').Zone} zone
  */
-export const makeBridgeProvisionTool = (sendInitialPayment, onProvisioned) => {
-  /** @param {ProvisionPoolKitReferences} refs */
-  const makeBridgeHandler = ({
-    bankManager,
-    namesByAddressAdmin,
-    walletFactory,
-  }) =>
-    Far('provisioningHandler', {
-      fromBridge: async obj => {
+export const prepareBridgeProvisionTool = zone =>
+  zone.exoClass(
+    'smartWalletProvisioningHandler',
+    M.interface('ProvisionBridgeHandlerMaker', {
+      fromBridge: M.callWhen(M.record()).returns(),
+    }),
+    (bankManager, walletFactory, namesByAddressAdmin, forHandler) => ({
+      bankManager,
+      walletFactory,
+      namesByAddressAdmin,
+      forHandler,
+    }),
+    {
+      async fromBridge(obj) {
         obj.type === 'PLEASE_PROVISION' ||
           Fail`Unrecognized request ${obj.type}`;
         trace('PLEASE_PROVISION', obj);
@@ -94,9 +96,12 @@ export const makeBridgeProvisionTool = (sendInitialPayment, onProvisioned) => {
         powerFlags.includes(PowerFlags.SMART_WALLET) ||
           Fail`missing SMART_WALLET in powerFlags`;
 
+        const { bankManager, walletFactory, namesByAddressAdmin, forHandler } =
+          this.state;
+
         const bank = E(bankManager).getBankForAddress(address);
         // only proceed if we can provide funds
-        await sendInitialPayment(bank);
+        await forHandler.sendInitialPayment(bank);
 
         const [_, created] = await E(walletFactory).provideSmartWallet(
           address,
@@ -104,31 +109,30 @@ export const makeBridgeProvisionTool = (sendInitialPayment, onProvisioned) => {
           namesByAddressAdmin,
         );
         if (created) {
-          onProvisioned();
+          forHandler.onProvisioned();
         }
         trace(created ? 'provisioned' : 're-provisioned', address);
       },
-    });
-  return makeBridgeHandler;
-};
+    },
+  );
 
 /**
- * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {import('@agoric/zone').Zone} zone
  * @param {{
  *   makeRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit;
  *   params: any;
  *   poolBank: import('@endo/far').ERef<Bank>;
  *   zcf: ZCF;
+ *   makeBridgeProvisionTool: ReturnType<typeof prepareBridgeProvisionTool>;
  * }} powers
  */
 export const prepareProvisionPoolKit = (
-  baggage,
-  { makeRecorderKit, params, poolBank, zcf },
+  zone,
+  { makeRecorderKit, params, poolBank, zcf, makeBridgeProvisionTool },
 ) => {
   const zoe = zcf.getZoeService();
 
-  const makeProvisionPoolKitInternal = prepareExoClassKit(
-    baggage,
+  const makeProvisionPoolKitInternal = zone.exoClassKit(
     'ProvisionPoolKit',
     {
       machine: M.interface('ProvisionPoolKit machine', {
@@ -151,6 +155,7 @@ export const prepareProvisionPoolKit = (
         ackWallet: M.call(M.string()).returns(M.boolean()),
       }),
       helper: UnguardedHelperI,
+      forHandler: UnguardedHelperI,
       public: M.interface('ProvisionPoolKit public', {
         getPublicTopics: M.call().returns({ metrics: PublicTopicShape }),
       }),
@@ -217,23 +222,24 @@ export const prepareProvisionPoolKit = (
           const refs = await deeplyFulfilledObject(obj);
           Object.assign(this.state, refs);
         },
+        /** @returns {import('@agoric/vats').BridgeHandler} */
         makeHandler() {
           const { bankManager, namesByAddressAdmin, walletFactory } =
             this.state;
           if (!bankManager || !namesByAddressAdmin || !walletFactory) {
             throw Fail`must set references before handling requests`;
           }
-          const { helper } = this.facets;
-          // a bit obtuse but leave for backwards compatibility with tests
-          const innerMaker = makeBridgeProvisionTool(
-            bank => helper.sendInitialPayment(bank),
-            () => helper.onProvisioned(),
-          );
-          return innerMaker({
+
+          const { forHandler } = this.facets;
+
+          const provisionHandler = makeBridgeProvisionTool(
             bankManager,
-            namesByAddressAdmin,
             walletFactory,
-          });
+            namesByAddressAdmin,
+            forHandler,
+          );
+
+          return provisionHandler;
         },
         /**
          * @param {Brand} brand
@@ -311,37 +317,6 @@ export const prepareProvisionPoolKit = (
           );
           facets.helper.publishMetrics();
         },
-        onProvisioned() {
-          const { state, facets } = this;
-          state.walletsProvisioned += 1n;
-          facets.helper.publishMetrics();
-        },
-        /** @param {ERef<Bank>} destBank */
-        async sendInitialPayment(destBank) {
-          const {
-            facets: { helper },
-            state: { fundPurse, poolBrand },
-          } = this;
-          const perAccountInitialAmount = /** @type {Amount<'nat'>} */ (
-            params.getPerAccountInitialAmount()
-          );
-          const initialPmt = await E(fundPurse).withdraw(
-            perAccountInitialAmount,
-          );
-
-          const destPurse = E(destBank).getPurse(poolBrand);
-          return E(destPurse)
-            .deposit(initialPmt)
-            .then(amt => {
-              helper.onSendFunds(perAccountInitialAmount);
-              trace('provisionPool sent', amt);
-            })
-            .catch(reason => {
-              console.error(X`initial deposit failed: ${q(reason)}`);
-              void E(fundPurse).deposit(initialPmt);
-              throw reason;
-            });
-        },
         /**
          * @param {ERef<Purse>} exchangePurse
          * @param {ERef<Brand>} brand
@@ -491,6 +466,39 @@ export const prepareProvisionPoolKit = (
           return rxd;
         },
       },
+      forHandler: {
+        onProvisioned() {
+          const { state, facets } = this;
+          state.walletsProvisioned += 1n;
+          facets.helper.publishMetrics();
+        },
+        /** @param {ERef<Bank>} destBank */
+        async sendInitialPayment(destBank) {
+          const {
+            facets: { helper },
+            state: { fundPurse, poolBrand },
+          } = this;
+          const perAccountInitialAmount = /** @type {Amount<'nat'>} */ (
+            params.getPerAccountInitialAmount()
+          );
+          const initialPmt = await E(fundPurse).withdraw(
+            perAccountInitialAmount,
+          );
+
+          const destPurse = E(destBank).getPurse(poolBrand);
+          return E(destPurse)
+            .deposit(initialPmt)
+            .then(amt => {
+              helper.onSendFunds(perAccountInitialAmount);
+              trace('provisionPool sent', amt);
+            })
+            .catch(reason => {
+              console.error(X`initial deposit failed: ${q(reason)}`);
+              void E(fundPurse).deposit(initialPmt);
+              throw reason;
+            });
+        },
+      },
       public: {
         getPublicTopics() {
           return {