@agoric/vats 0.15.2-dev-3d98aac.0 → 0.15.2-dev-b0669ee.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vats",
-  "version": "0.15.2-dev-3d98aac.0+3d98aac",
+  "version": "0.15.2-dev-b0669ee.0+b0669ee",
   "description": "Agoric's Vat library",
   "type": "module",
   "main": "./index.js",
@@ -22,19 +22,19 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/cosmic-proto": "0.4.1-dev-3d98aac.0+3d98aac",
-    "@agoric/ertp": "0.16.3-dev-3d98aac.0+3d98aac",
-    "@agoric/governance": "0.10.4-dev-3d98aac.0+3d98aac",
-    "@agoric/internal": "0.3.3-dev-3d98aac.0+3d98aac",
-    "@agoric/network": "0.1.1-dev-3d98aac.0+3d98aac",
-    "@agoric/notifier": "0.6.3-dev-3d98aac.0+3d98aac",
-    "@agoric/store": "0.9.3-dev-3d98aac.0+3d98aac",
-    "@agoric/swingset-vat": "0.32.3-dev-3d98aac.0+3d98aac",
-    "@agoric/time": "0.3.3-dev-3d98aac.0+3d98aac",
-    "@agoric/vat-data": "0.5.3-dev-3d98aac.0+3d98aac",
-    "@agoric/vow": "0.1.1-dev-3d98aac.0+3d98aac",
-    "@agoric/zoe": "0.26.3-dev-3d98aac.0+3d98aac",
-    "@agoric/zone": "0.2.3-dev-3d98aac.0+3d98aac",
+    "@agoric/cosmic-proto": "0.4.1-dev-b0669ee.0+b0669ee",
+    "@agoric/ertp": "0.16.3-dev-b0669ee.0+b0669ee",
+    "@agoric/governance": "0.10.4-dev-b0669ee.0+b0669ee",
+    "@agoric/internal": "0.3.3-dev-b0669ee.0+b0669ee",
+    "@agoric/network": "0.1.1-dev-b0669ee.0+b0669ee",
+    "@agoric/notifier": "0.6.3-dev-b0669ee.0+b0669ee",
+    "@agoric/store": "0.9.3-dev-b0669ee.0+b0669ee",
+    "@agoric/swingset-vat": "0.32.3-dev-b0669ee.0+b0669ee",
+    "@agoric/time": "0.3.3-dev-b0669ee.0+b0669ee",
+    "@agoric/vat-data": "0.5.3-dev-b0669ee.0+b0669ee",
+    "@agoric/vow": "0.1.1-dev-b0669ee.0+b0669ee",
+    "@agoric/zoe": "0.26.3-dev-b0669ee.0+b0669ee",
+    "@agoric/zone": "0.2.3-dev-b0669ee.0+b0669ee",
     "@endo/errors": "^1.2.9",
     "@endo/far": "^1.1.10",
     "@endo/import-bundle": "^1.3.3",
@@ -47,7 +47,7 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-3d98aac.0+3d98aac",
+    "@agoric/swingset-liveslots": "0.10.3-dev-b0669ee.0+b0669ee",
     "@endo/bundle-source": "^3.5.1",
     "@endo/init": "^1.1.8",
     "ava": "^5.3.0",
@@ -79,5 +79,5 @@
   "typeCoverage": {
     "atLeast": 90.39
   },
-  "gitHead": "3d98aacc1e35f9e3cc96378fb266f59ae9486997"
+  "gitHead": "b0669eeff623a06ee120736a17d5cfe828d42ef4"
 }

package/src/core/promise-space.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"promise-space.d.ts","sourceRoot":"","sources":["promise-space.js"],"names":[],"mappings":"AAoBO,kCAHI,OAAO,OAAO,CAAC,GAAG,GAChB,iBAAiB,CAS1B;AAUG,sCAJI,QAAQ,CAAC,MAAM,EAAE,OAAO,eAAe,EAAE,QAAQ,CAAC,QAClD,OAAO,OAAO,CAAC,GAAG,GAChB,iBAAiB,CAkC7B;AAgBM,iCARiC,CAAC,SAA3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAE,wCAC3B,CAAC;IAAE,GAAG,CAAC,EAAE,OAAO,OAAO,CAAC,GAAG,CAAA;CAAE,GAAG,CAChC;IAAE,KAAK,CAAC,EAAE,iBAAiB,CAAA;CAAE,GAC7B;IAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAE,CACnC,CAAC,GACF,OAAO,OAAO,CAAC,GAAG,GACZ,cAAc,CAAC,CAAC,CAAC,CAuG7B;gCApLY;IACR,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;IACvD,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;IACzD,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAChC"}
+{"version":3,"file":"promise-space.d.ts","sourceRoot":"","sources":["promise-space.js"],"names":[],"mappings":"AAoBO,kCAHI,OAAO,OAAO,CAAC,GAAG,GAChB,iBAAiB,CAS1B;AAUG,sCAJI,QAAQ,CAAC,MAAM,EAAE,OAAO,eAAe,EAAE,QAAQ,CAAC,QAClD,OAAO,OAAO,CAAC,GAAG,GAChB,iBAAiB,CAkC7B;AAgBM,iCARiC,CAAC,SAA3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAE,wCAC3B,CAAC;IAAE,GAAG,CAAC,EAAE,OAAO,OAAO,CAAC,GAAG,CAAA;CAAE,GAAG,CAChC;IAAE,KAAK,CAAC,EAAE,iBAAiB,CAAA;CAAE,GAC7B;IAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAE,CACnC,CAAC,GACF,OAAO,OAAO,CAAC,GAAG,GACZ,cAAc,CAAC,CAAC,CAAC,CA2G7B;gCAxLY;IACR,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;IACvD,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;IACzD,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAChC"}

package/src/core/promise-space.js

@@ -50,10 +50,10 @@ export const makeStoreHooks = (store, log = noop) => {
       return;
     }
     if (store.has(name)) {
-      console.warn('cannot save duplicate:', name);
-      return;
+      store.set(name, value);
+    } else {
+      store.init(name, value);
     }
-    store.init(name, value);
   };
 
   return harden({
@@ -143,7 +143,9 @@ export const makePromiseSpace = (optsOrLog = {}) => {
       old.pk.reject(reason);
     };
     const reset = (reason = undefined) => {
-      onReset(name);
+      if (!nameToState.has(name)) {
+        return;
+      }
       const old = provideState(name);
       if (!old.isSettling) {
         // we haven't produced a value yet, and there might be
@@ -157,7 +159,9 @@ export const makePromiseSpace = (optsOrLog = {}) => {
         // value through the replacement promise
         reject(reason);
       }
+
       // delete the state, so new callers will get a new promise kit
+      onReset(name);
       nameToState.delete(name);
       remaining.delete(name);
     };

package/src/core/startWalletFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startWalletFactory.d.ts","sourceRoot":"","sources":["startWalletFactory.js"],"names":[],"mappings":"AAuFO,qnBArBI,eAAe,GACrB,qBAAqB,GACrB,cAAc,CAAC;IACb,6BAA6B,EAAE,OAAO,qCAAqC,EAAE,+BAA+B,CAAC;IAC7G,cAAc,EAAE;QACd,YAAY,EAAE,OAAO,CACnB,UAAU,CACpB,mEAAwE,CAAC,OAAO,CAAC,CACtE,CACF,CAAC,cAAc,CAAC,CAAC;QAClB,UAAU,EAAE,UAAU,CAAC;KACxB,CAAC;IACF,mBAAmB,EAAE,OAAO,aAAa,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IACzE,4BAA4B,EAAE,OAAO,aAAa,EAAE,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;CAC5F,CAAC,4CACI;IACN,OAAO,CAAC,EAAE;QACR,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH,iBAoLH;AAED;IACE,CAAC,kBAAkB,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAqCxB;EACD;AAEK;;;;;;QAxCL,CAAC,kBAAkB,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAqCxB;;;;;;EAcF;uCAnSY,QAAQ,OAAO,oBAAoB,CAAC;gCAZmB,aAAa;uBAT1D,gCAAgC;AAcvD;;;;;;;;GAQG;AAEH,2CATW,IAAI,CAAC,UAAU,CAAC,QAChB,YAAY,CACtB,OAAW,2CAA2C,EAAE,KAAK,CAC1D;;uBA0G6D,CAAC,cAC9D,aACK;iBAGC,CAAC;mBAE6B,kBAAkB;;8DAiJ7B,gBAC5B,0CACK,aAA2B,uCAKvB,yCAAkB;;KAnQ0C;6BAhB5C,WAAW"}
+{"version":3,"file":"startWalletFactory.d.ts","sourceRoot":"","sources":["startWalletFactory.js"],"names":[],"mappings":"AAuFO,qnBArBI,eAAe,GACrB,qBAAqB,GACrB,cAAc,CAAC;IACb,6BAA6B,EAAE,OAAO,qCAAqC,EAAE,+BAA+B,CAAC;IAC7G,cAAc,EAAE;QACd,YAAY,EAAE,OAAO,CACnB,UAAU,CACpB,mEAAwE,CAAC,OAAO,CAAC,CACtE,CACF,CAAC,cAAc,CAAC,CAAC;QAClB,UAAU,EAAE,UAAU,CAAC;KACxB,CAAC;IACF,mBAAmB,EAAE,OAAO,aAAa,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IACzE,4BAA4B,EAAE,OAAO,aAAa,EAAE,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;CAC5F,CAAC,4CACI;IACN,OAAO,CAAC,EAAE;QACR,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH,iBAkNH;AAED;IACE,CAAC,kBAAkB,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAqCxB;EACD;AAEK;;;;;;QAxCL,CAAC,kBAAkB,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAqCxB;;;;;;EAcF;uCAjUY,QAAQ,OAAO,oBAAoB,CAAC;gCAZmB,aAAa;uBAT1D,gCAAgC;AAcvD;;;;;;;;GAQG;AAEH,2CATW,IAAI,CAAC,UAAU,CAAC,QAChB,YAAY,CACtB,OAAW,2CAA2C,EAAE,KAAK,CAC1D;;uBA0GkD,CAAC,cAAsB,aACxE;iBAIH,CAAF;mBAE6B,kBAAkB;;8DA2IpB,gBAA8B,0CAErC,aAInB,uCAEG,yCAAkB;;KA9PgD;6BAhB5C,WAAW"}

package/src/core/startWalletFactory.js

@@ -17,7 +17,7 @@ import {
  * @import {AdminFacet, ContractOf, InvitationAmount, ZCFMint} from '@agoric/zoe';
  */
 
-const trace = makeTracer('StartWF');
+const trace = makeTracer('StartWF', 'verbose');
 
 /**
  * @param {ERef<ZoeService>} zoe
@@ -185,7 +185,11 @@ export const startWalletFactory = async (
 
   const marshaller = await E(board).getPublishingMarshaller();
   const poolBank = E(bankManager).getBankForAddress(poolAddr);
-  const ppFacets = await E(startGovernedUpgradable)({
+
+  // We cannot await the start of the provisionPool, since
+  // startGovernedUpgradable may potentially only fulfil after the
+  // inter-protocol init-core.js is settled.
+  const ppFacetsP = E(startGovernedUpgradable)({
     installation: provisionPool,
     terms: {},
     privateArgs: harden({
@@ -202,8 +206,6 @@ export const startWalletFactory = async (
       },
     },
   });
-  provisionPoolStartResult.resolve(ppFacets);
-  instanceProduce.provisionPool.resolve(ppFacets.instance);
 
   const terms = await deeplyFulfilled(
     harden({
@@ -224,32 +226,60 @@ export const startWalletFactory = async (
     privateArgs: {
       storageNode: walletStorageNode,
       walletBridgeManager,
-      walletReviver: E(ppFacets.creatorFacet).getWalletReviver(),
+      walletReviver: E(E.get(ppFacetsP).creatorFacet).getWalletReviver(),
     },
     label: 'walletFactory',
   });
   walletFactoryStartResult.resolve(wfFacets);
   instanceProduce.walletFactory.resolve(wfFacets.instance);
 
-  await Promise.all([
-    E(ppFacets.creatorFacet).addRevivableAddresses(oldAddresses),
-    E(ppFacets.creatorFacet).setReferences({
-      bankManager,
-      namesByAddressAdmin,
-      walletFactory: wfFacets.creatorFacet,
-    }),
-    publishRevivableWalletState(oldAddresses, marshaller, walletStorageNode),
-  ]);
-  const bridgeHandler = await E(ppFacets.creatorFacet).makeHandler();
+  await publishRevivableWalletState(
+    oldAddresses,
+    marshaller,
+    walletStorageNode,
+  );
 
-  await Promise.all([
-    E(provisionWalletBridgeManager).initHandler(bridgeHandler),
-    E(E.get(econCharterKit).creatorFacet).addInstance(
-      ppFacets.instance,
-      ppFacets.governorCreatorFacet,
-      'provisionPool',
-    ),
-  ]);
+  // The following initialization can only be done after the provisionPool
+  // settles, and that requires the economicCommittee
+  const initAfterProvisionPool = async () => {
+    trace('initAfterProvisionPool awaiting provisionPoolFacets');
+    const ppFacets = await ppFacetsP;
+    trace('initAfterProvisionPool settled provisionPoolFacets');
+
+    provisionPoolStartResult.resolve(ppFacets);
+    instanceProduce.provisionPool.resolve(ppFacets.instance);
+
+    await Promise.all([
+      E(ppFacets.creatorFacet).addRevivableAddresses(oldAddresses),
+      E(ppFacets.creatorFacet).setReferences({
+        bankManager,
+        namesByAddressAdmin,
+        walletFactory: wfFacets.creatorFacet,
+      }),
+    ]);
+
+    const bridgeHandler = await E(ppFacets.creatorFacet).makeHandler();
+
+    await Promise.all([
+      E(provisionWalletBridgeManager).initHandler(bridgeHandler),
+      E(E.get(econCharterKit).creatorFacet).addInstance(
+        ppFacets.instance,
+        ppFacets.governorCreatorFacet,
+        'provisionPool',
+      ),
+    ]);
+    trace('initAfterProvisionPool done');
+  };
+
+  // Don't block until ppFacetsP settles, but if rejected, report and leave
+  // unhandled.
+  initAfterProvisionPool().catch(e => {
+    const err = assert.error(
+      assert.details`initAfterProvisionPool rejected with reason: ${e}`,
+    );
+    console.error(err);
+    throw err;
+  });
 
   // TODO: move to its own producer, omitted in some configurations
   client.resolve(

package/src/nameHub.js

@@ -335,7 +335,7 @@ export const prepareNameHubKit = zone => {
             if (pmap.has(key)) {
               // Reject only if already exists.
               const old = NonNullish(pmap.get(key));
-              old.reject(Error(`Value has been deleted`));
+              old.reject(Error(`Value for ${key} has been deleted`));
               // Silence unhandled rejections.
               void old.promise.catch(_ => {});
             }