@agoric/vats 0.14.1-dev-bf4b59f.0 → 0.14.1-dev-fb2c249.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vats",
-  "version": "0.14.1-dev-bf4b59f.0+bf4b59f",
+  "version": "0.14.1-dev-fb2c249.0+fb2c249",
   "description": "Agoric's Vat library",
   "type": "module",
   "main": "./index.js",
@@ -28,19 +28,19 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-bf4b59f.0+bf4b59f",
-    "@agoric/ertp": "0.16.1-dev-bf4b59f.0+bf4b59f",
-    "@agoric/governance": "0.10.1-dev-bf4b59f.0+bf4b59f",
-    "@agoric/inter-protocol": "0.14.1-dev-bf4b59f.0+bf4b59f",
-    "@agoric/internal": "0.3.1-dev-bf4b59f.0+bf4b59f",
-    "@agoric/notifier": "0.6.1-dev-bf4b59f.0+bf4b59f",
-    "@agoric/sharing-service": "0.2.10-dev-bf4b59f.0+bf4b59f",
-    "@agoric/store": "0.9.1-dev-bf4b59f.0+bf4b59f",
-    "@agoric/swingset-vat": "0.32.1-dev-bf4b59f.0+bf4b59f",
-    "@agoric/time": "0.3.1-dev-bf4b59f.0+bf4b59f",
-    "@agoric/vat-data": "0.5.1-dev-bf4b59f.0+bf4b59f",
-    "@agoric/zoe": "0.26.1-dev-bf4b59f.0+bf4b59f",
-    "@agoric/zone": "0.2.1-dev-bf4b59f.0+bf4b59f",
+    "@agoric/assert": "0.6.1-dev-fb2c249.0+fb2c249",
+    "@agoric/ertp": "0.16.1-dev-fb2c249.0+fb2c249",
+    "@agoric/governance": "0.10.1-dev-fb2c249.0+fb2c249",
+    "@agoric/inter-protocol": "0.14.1-dev-fb2c249.0+fb2c249",
+    "@agoric/internal": "0.3.1-dev-fb2c249.0+fb2c249",
+    "@agoric/notifier": "0.6.1-dev-fb2c249.0+fb2c249",
+    "@agoric/sharing-service": "0.2.10-dev-fb2c249.0+fb2c249",
+    "@agoric/store": "0.9.1-dev-fb2c249.0+fb2c249",
+    "@agoric/swingset-vat": "0.32.1-dev-fb2c249.0+fb2c249",
+    "@agoric/time": "0.3.1-dev-fb2c249.0+fb2c249",
+    "@agoric/vat-data": "0.5.1-dev-fb2c249.0+fb2c249",
+    "@agoric/zoe": "0.26.1-dev-fb2c249.0+fb2c249",
+    "@agoric/zone": "0.2.1-dev-fb2c249.0+fb2c249",
     "@endo/far": "^0.2.18",
     "@endo/import-bundle": "^0.3.4",
     "@endo/init": "^0.5.56",
@@ -50,11 +50,11 @@
     "jessie.js": "^0.3.2"
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.1-dev-bf4b59f.0+bf4b59f",
-    "@agoric/deploy-script-support": "0.10.1-dev-bf4b59f.0+bf4b59f",
-    "@agoric/smart-wallet": "0.5.1-dev-bf4b59f.0+bf4b59f",
-    "@agoric/swing-store": "0.9.1-dev-bf4b59f.0+bf4b59f",
-    "@agoric/swingset-liveslots": "0.10.1-dev-bf4b59f.0+bf4b59f",
+    "@agoric/cosmic-swingset": "0.41.1-dev-fb2c249.0+fb2c249",
+    "@agoric/deploy-script-support": "0.10.1-dev-fb2c249.0+fb2c249",
+    "@agoric/smart-wallet": "0.5.1-dev-fb2c249.0+fb2c249",
+    "@agoric/swing-store": "0.9.1-dev-fb2c249.0+fb2c249",
+    "@agoric/swingset-liveslots": "0.10.1-dev-fb2c249.0+fb2c249",
     "@endo/bundle-source": "^2.5.1",
     "@endo/captp": "^3.1.1",
     "@endo/stream": "^0.3.25",
@@ -83,5 +83,5 @@
     "timeout": "20m",
     "workerThreads": false
   },
-  "gitHead": "bf4b59f2128aca73d786429c6ef4a7c9cdfb6700"
+  "gitHead": "fb2c24900340da870b85f4bb1dd132d8bf97e139"
 }

package/src/vat-bank.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vat-bank.d.ts","sourceRoot":"","sources":["vat-bank.js"],"names":[],"mappings":"AAozBA;IASI;;;;;;OAMG;yCALQ,KAAK,OAAO,YAAY,EAAE,mBAAmB,GAAG,SAAS,CAAC;gBAG3C,OAAO,YAAY,EAAE,SAAS,CAAC,QAAQ,CAAC;;QAnPhE;;;;WAIG;gCADU,kBAAkB,eAAe,CAAC;QAS/C;;;;WAIG;gDAHQ,MAAM,UACN,cAAc,GACZ,OAAO,WAAW,EAAE,KAAK,CAAC,YAAY,CAAC;QAkBpD;;;;;;WAMG;4CAHQ,MAAM,GACJ,QAAQ,MAAM,GAAG,IAAI,CAAC;QAenC;;;;;;;;;;;WAWG;wBAJQ,MAAM,cACN,MAAM,gBACN,MAAM;;;QA2EjB;;;;;WAKG;mCAFQ,MAAM,GACJ,QAAQ,IAAI,CAAC;;QA5I1B;;;;WAIG;gCADU,kBAAkB,eAAe,CAAC;QAS/C;;;;WAIG;gDAHQ,MAAM,UACN,cAAc,GACZ,OAAO,WAAW,EAAE,KAAK,CAAC,YAAY,CAAC;QAkBpD;;;;;;WAMG;4CAHQ,MAAM,GACJ,QAAQ,MAAM,GAAG,IAAI,CAAC;QAenC;;;;;;;;;;;WAWG;wBAJQ,MAAM,cACN,MAAM,gBACN,MAAM;;;QA2EjB;;;;;WAKG;mCAFQ,MAAM,GACJ,QAAQ,IAAI,CAAC;;;IAmG5B;;;;;;OAMG;yCALQ,KAAK,OAAO,YAAY,EAAE,mBAAmB,GAAG,SAAS,CAAC;gBAG3C,OAAO,YAAY,EAAE,SAAS,CAAC,QAAQ,CAAC;;QAnPhE;;;;WAIG;gCADU,kBAAkB,eAAe,CAAC;QAS/C;;;;WAIG;gDAHQ,MAAM,UACN,cAAc,GACZ,OAAO,WAAW,EAAE,KAAK,CAAC,YAAY,CAAC;QAkBpD;;;;;;WAMG;4CAHQ,MAAM,GACJ,QAAQ,MAAM,GAAG,IAAI,CAAC;QAenC;;;;;;;;;;;WAWG;wBAJQ,MAAM,cACN,MAAM,gBACN,MAAM;;;QA2EjB;;;;;WAKG;mCAFQ,MAAM,GACJ,QAAQ,IAAI,CAAC;;QA5I1B;;;;WAIG;gCADU,kBAAkB,eAAe,CAAC;QAS/C;;;;WAIG;gDAHQ,MAAM,UACN,cAAc,GACZ,OAAO,WAAW,EAAE,KAAK,CAAC,YAAY,CAAC;QAkBpD;;;;;;WAMG;4CAHQ,MAAM,GACJ,QAAQ,MAAM,GAAG,IAAI,CAAC;QAenC;;;;;;;;;;;WAWG;wBAJQ,MAAM,cACN,MAAM,gBACN,MAAM;;;QA2EjB;;;;;WAKG;mCAFQ,MAAM,GACJ,QAAQ,IAAI,CAAC;;GAmJ/B;AAtgBD;;GAEG;AAEH;;;;;;;GAOG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG;AAEH,4DAGG;qCAtWU,OAAO,iBAAiB,EAAE,sBAAsB;2BAChD,QAAQ,WAAW,WAAW,0BAA0B,CAAC,CAAC,CAAC;;oBAKlD,MAAM,UAAU,MAAM,KAAK,IAAI;;4BAOvC,KAAK,OAAO,YAAY,EAAE,mBAAmB,EAAE,YAAY,GAAG,UAAU,CAAC;;;YA6SzE,KAAK,OAAO,CAAC,CAAC,CAAC;WACf,MAAM,CAAC,CAAC;;0BAaT,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,KAAK,KAAK,CAAC,CAAA;CAAE;;WAK5D,KAAK;YACL,KAAK,MAAM,CAAC;gBACZ,MAAM;WACN,MAAM;kBACN,MAAM;;wBAIN,eAAe,GAAG;IAC/B,MAAU,EAAE,OAAO,KAAK,CAAC,CAAC;IAC1B,WAAe,EAAE,WAAW,CAAC;CAC1B;;;;;;0BAKU,MAAM,kBAAkB,eAAe,CAAC;;;;;sBAEhC,KAAK,KAAK,QAAQ,YAAY,CAAC"}
+{"version":3,"file":"vat-bank.d.ts","sourceRoot":"","sources":["vat-bank.js"],"names":[],"mappings":"AA+zBA;IASI;;;;;;OAMG;yCALQ,KAAK,OAAO,YAAY,EAAE,mBAAmB,GAAG,SAAS,CAAC;gBAG3C,OAAO,YAAY,EAAE,SAAS,CAAC,QAAQ,CAAC;;QAnPhE;;;;WAIG;gCADU,kBAAkB,eAAe,CAAC;QAS/C;;;;WAIG;gDAHQ,MAAM,UACN,cAAc,GACZ,OAAO,WAAW,EAAE,KAAK,CAAC,YAAY,CAAC;QAkBpD;;;;;;WAMG;4CAHQ,MAAM,GACJ,QAAQ,MAAM,GAAG,IAAI,CAAC;QAenC;;;;;;;;;;;WAWG;wBAJQ,MAAM,cACN,MAAM,gBACN,MAAM;;;QA2EjB;;;;;WAKG;mCAFQ,MAAM,GACJ,QAAQ,IAAI,CAAC;;QA5I1B;;;;WAIG;gCADU,kBAAkB,eAAe,CAAC;QAS/C;;;;WAIG;gDAHQ,MAAM,UACN,cAAc,GACZ,OAAO,WAAW,EAAE,KAAK,CAAC,YAAY,CAAC;QAkBpD;;;;;;WAMG;4CAHQ,MAAM,GACJ,QAAQ,MAAM,GAAG,IAAI,CAAC;QAenC;;;;;;;;;;;WAWG;wBAJQ,MAAM,cACN,MAAM,gBACN,MAAM;;;QA2EjB;;;;;WAKG;mCAFQ,MAAM,GACJ,QAAQ,IAAI,CAAC;;;IAmG5B;;;;;;OAMG;yCALQ,KAAK,OAAO,YAAY,EAAE,mBAAmB,GAAG,SAAS,CAAC;gBAG3C,OAAO,YAAY,EAAE,SAAS,CAAC,QAAQ,CAAC;;QAnPhE;;;;WAIG;gCADU,kBAAkB,eAAe,CAAC;QAS/C;;;;WAIG;gDAHQ,MAAM,UACN,cAAc,GACZ,OAAO,WAAW,EAAE,KAAK,CAAC,YAAY,CAAC;QAkBpD;;;;;;WAMG;4CAHQ,MAAM,GACJ,QAAQ,MAAM,GAAG,IAAI,CAAC;QAenC;;;;;;;;;;;WAWG;wBAJQ,MAAM,cACN,MAAM,gBACN,MAAM;;;QA2EjB;;;;;WAKG;mCAFQ,MAAM,GACJ,QAAQ,IAAI,CAAC;;QA5I1B;;;;WAIG;gCADU,kBAAkB,eAAe,CAAC;QAS/C;;;;WAIG;gDAHQ,MAAM,UACN,cAAc,GACZ,OAAO,WAAW,EAAE,KAAK,CAAC,YAAY,CAAC;QAkBpD;;;;;;WAMG;4CAHQ,MAAM,GACJ,QAAQ,MAAM,GAAG,IAAI,CAAC;QAenC;;;;;;;;;;;WAWG;wBAJQ,MAAM,cACN,MAAM,gBACN,MAAM;;;QA2EjB;;;;;WAKG;mCAFQ,MAAM,GACJ,QAAQ,IAAI,CAAC;;GAmJ/B;AAhhBD;;GAEG;AAEH;;;;;;;GAOG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG;AAEH,4DAGG;qCAtWU,OAAO,iBAAiB,EAAE,sBAAsB;2BAChD,QAAQ,WAAW,WAAW,0BAA0B,CAAC,CAAC,CAAC;;oBAKlD,MAAM,UAAU,MAAM,KAAK,IAAI;;4BAOvC,KAAK,OAAO,YAAY,EAAE,mBAAmB,EAAE,YAAY,GAAG,UAAU,CAAC;;;YA6SzE,KAAK,OAAO,CAAC,CAAC,CAAC;WACf,MAAM,CAAC,CAAC;;0BAaT,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,KAAK,KAAK,CAAC,CAAA;CAAE;;WAK5D,KAAK;YACL,KAAK,MAAM,CAAC;gBACZ,MAAM;WACN,MAAM;kBACN,MAAM;;wBAIN,eAAe,GAAG;IAC/B,MAAU,EAAE,OAAO,KAAK,CAAC,CAAC;IAC1B,WAAe,EAAE,WAAW,CAAC;CAC1B;;;;;;0BAKU,MAAM,kBAAkB,eAAe,CAAC;;;;;sBAEhC,KAAK,KAAK,QAAQ,YAAY,CAAC"}

package/src/vat-bank.js

@@ -1,6 +1,7 @@
 // @ts-check
 import { AmountMath, AssetKind, BrandShape } from '@agoric/ertp';
-import { E, Far } from '@endo/far';
+import { deeplyFulfilledObject } from '@agoric/internal';
+import { prepareGuardedAttenuator } from '@agoric/internal/src/callback.js';
 import {
   IterableEachTopicI,
   makeNotifierKit,
@@ -10,8 +11,8 @@ import {
 } from '@agoric/notifier';
 import { M, provideLazy } from '@agoric/store';
 import { makeDurableZone } from '@agoric/zone/durable.js';
-import { prepareGuardedAttenuator } from '@agoric/internal/src/callback.js';
-import { deeplyFulfilledObject } from '@agoric/internal';
+import { E, Far } from '@endo/far';
+import { makeAtomicProvider } from '@agoric/store/src/stores/store-utils.js';
 import { BridgeHandlerI, BridgeScopedManagerI } from './bridge.js';
 import {
   makeVirtualPurseKitIKit,
@@ -404,6 +405,14 @@ const prepareBank = (
   const makeBalanceUpdater = prepareBalanceUpdater(zone);
   const makeBankPurseController = prepareBankPurseController(zone);
 
+  // Using a `purseProvider` singleton requires a single map with composite keys
+  // (which we emulate, since we know both address and denom are JSONable).  If
+  // we decide to partition the provider and use `brandToVPurse` directly, we'd
+  // need ephemera for each `makeBank` call.
+  const addressDenomToPurse = zone.mapStore('addressDenomToPurse');
+  /** @type {import('@agoric/store/src/stores/store-utils.js').AtomicProvider<string, VirtualPurse>} */
+  const purseProvider = makeAtomicProvider(addressDenomToPurse);
+
   const makeBank = zone.exoClass(
     'Bank',
     BankI,
@@ -443,6 +452,7 @@ const prepareBank = (
           this.state.assetSubscriber,
         );
       },
+      /** @param {Brand} brand */
       async getPurse(brand) {
         const {
           bankChannel,
@@ -451,54 +461,55 @@ const prepareBank = (
           brandToAssetRecord,
           denomToAddressUpdater,
         } = this.state;
-
         if (brandToVPurse.has(brand)) {
           return brandToVPurse.get(brand);
         }
 
-        /** @param {ERef<VirtualPurse>} purseP */
-        const keepPurse = async purseP => {
-          const purse = await purseP;
-          // Need to recheck as we may have raced with another call.
-          if (brandToVPurse.has(brand)) {
-            return brandToVPurse.get(brand);
+        const assetRecord = brandToAssetRecord.get(brand);
+        // Create a composite key that doesn't rely on the contents of the
+        // address and denom, only that they are strings.
+        const providerKey = JSON.stringify([address, assetRecord.denom]);
+
+        /** @type {() => Promise<VirtualPurse>} */
+        const makePurse = async () => {
+          if (!bankChannel) {
+            // Just emulate with a real purse.
+            return E(assetRecord.issuer).makeEmptyPurse();
           }
-          brandToVPurse.init(brand, purse);
-          return purse;
+          const addressToUpdater = denomToAddressUpdater.get(assetRecord.denom);
+
+          /** @type {PublishKit<Amount>} */
+          const { publisher, subscriber } = makePublishKit();
+          const balanceUpdater = makeBalanceUpdater(brand, publisher);
+          addressToUpdater.init(address, balanceUpdater);
+          // Get the initial balance.
+          const balanceString = await bankChannel.toBridge({
+            type: 'VBANK_GET_BALANCE',
+            address,
+            denom: assetRecord.denom,
+          });
+          balanceUpdater.update(balanceString);
+
+          // Create and return the virtual purse.
+          const vpc = makeBankPurseController(
+            bankChannel,
+            assetRecord.denom,
+            brand,
+            address,
+            subscriber,
+          );
+          return makeVirtualPurse(vpc, assetRecord);
         };
 
-        const assetRecord = brandToAssetRecord.get(brand);
-        if (!bankChannel) {
-          // Just emulate with a real purse.
-          return keepPurse(E(assetRecord.issuer).makeEmptyPurse());
-        }
-
-        const addressToUpdater = denomToAddressUpdater.get(assetRecord.denom);
-
-        /** @type {PublishKit<Amount>} */
-        const { publisher, subscriber } = makePublishKit();
-        const balanceUpdater = makeBalanceUpdater(brand, publisher);
-
-        // Abort if we lost the race to another call.
-        addressToUpdater.init(address, balanceUpdater);
-
-        // Get the initial balance.
-        const balanceString = await bankChannel.toBridge({
-          type: 'VBANK_GET_BALANCE',
-          address,
-          denom: assetRecord.denom,
-        });
-        balanceUpdater.update(balanceString);
-
-        // Create and return the virtual purse.
-        const vpc = makeBankPurseController(
-          bankChannel,
-          assetRecord.denom,
-          brand,
-          address,
-          subscriber,
+        return purseProvider.provideAsync(
+          providerKey,
+          makePurse,
+          async (_key, purse) => {
+            // Move it from the provider to this Exo's storage
+            brandToVPurse.init(brand, purse);
+            addressDenomToPurse.delete(providerKey);
+          },
         );
-        return keepPurse(makeVirtualPurse(vpc, assetRecord));
       },
     },
   );