@agoric/zoe 0.26.3-dev-b95c1c8.0.b95c1c8 → 0.26.3-dev-a0b2d38.0.a0b2d38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/zoe",
-  "version": "0.26.3-dev-b95c1c8.0.b95c1c8",
+  "version": "0.26.3-dev-a0b2d38.0.a0b2d38",
   "description": "Zoe: the Smart Contract Framework for Offer Enforcement",
   "type": "module",
   "main": "./src/zoeService/zoe.js",
@@ -43,17 +43,17 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-b95c1c8.0.b95c1c8",
-    "@agoric/ertp": "0.16.3-dev-b95c1c8.0.b95c1c8",
-    "@agoric/internal": "0.3.3-dev-b95c1c8.0.b95c1c8",
-    "@agoric/notifier": "0.6.3-dev-b95c1c8.0.b95c1c8",
-    "@agoric/store": "0.9.3-dev-b95c1c8.0.b95c1c8",
-    "@agoric/swingset-liveslots": "0.10.3-dev-b95c1c8.0.b95c1c8",
-    "@agoric/swingset-vat": "0.32.3-dev-b95c1c8.0.b95c1c8",
-    "@agoric/time": "0.3.3-dev-b95c1c8.0.b95c1c8",
-    "@agoric/vat-data": "0.5.3-dev-b95c1c8.0.b95c1c8",
-    "@agoric/vow": "0.1.1-dev-b95c1c8.0.b95c1c8",
-    "@agoric/zone": "0.2.3-dev-b95c1c8.0.b95c1c8",
+    "@agoric/base-zone": "0.1.1-dev-a0b2d38.0.a0b2d38",
+    "@agoric/ertp": "0.16.3-dev-a0b2d38.0.a0b2d38",
+    "@agoric/internal": "0.3.3-dev-a0b2d38.0.a0b2d38",
+    "@agoric/notifier": "0.6.3-dev-a0b2d38.0.a0b2d38",
+    "@agoric/store": "0.9.3-dev-a0b2d38.0.a0b2d38",
+    "@agoric/swingset-liveslots": "0.10.3-dev-a0b2d38.0.a0b2d38",
+    "@agoric/swingset-vat": "0.32.3-dev-a0b2d38.0.a0b2d38",
+    "@agoric/time": "0.3.3-dev-a0b2d38.0.a0b2d38",
+    "@agoric/vat-data": "0.5.3-dev-a0b2d38.0.a0b2d38",
+    "@agoric/vow": "0.1.1-dev-a0b2d38.0.a0b2d38",
+    "@agoric/zone": "0.2.3-dev-a0b2d38.0.a0b2d38",
     "@endo/bundle-source": "^4.1.2",
     "@endo/captp": "^4.4.8",
     "@endo/common": "^1.2.13",
@@ -70,7 +70,7 @@
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-b95c1c8.0.b95c1c8",
+    "@agoric/kmarshal": "0.1.1-dev-a0b2d38.0.a0b2d38",
     "@endo/init": "^1.1.12",
     "ava": "^5.3.0",
     "c8": "^10.1.3",
@@ -100,5 +100,5 @@
   "typeCoverage": {
     "atLeast": 84.74
   },
-  "gitHead": "b95c1c8ea955b25f16fa2582bd9878d99f73fed1"
+  "gitHead": "a0b2d383831a6afc602a2215892ecacc8b106a20"
 }

package/tools/fakeVatAdmin.d.ts

@@ -87,6 +87,16 @@ export function makeFakeVatAdmin(testContextSetter?: (...args: any) => unknown,
         getExitMessage: () => any;
         getHasExited: () => boolean;
         getExitWithFailure: () => any;
+        /**
+         * @param {string} base
+         * @param {EndoZipBase64Bundle | TestBundle} bundle
+         */
+        getBundleID: (base: string, bundle: EndoZipBase64Bundle | TestBundle) => string;
+        /**
+         * @param {string} base
+         * @param {EndoZipBase64Bundle | TestBundle} bundle
+         */
+        registerBundle: (base: string, bundle: EndoZipBase64Bundle | TestBundle) => string;
         /**
          * @param {string} id
          * @param {EndoZipBase64Bundle | TestBundle} bundle

package/tools/fakeVatAdmin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fakeVatAdmin.d.ts","sourceRoot":"","sources":["fakeVatAdmin.js"],"names":[],"mappings":"AAwBA,+BAA4C;;AAwJ5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAA8C;AAtJ9C;;;GAGG;AACH,qDAHW,CAAC,GAAG,IAAI,KAAA,KAAK,OAAO,eACpB,CAAC,CAAC,EAAE,OAAO,KAAK,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAgH9B;;;WAGG;4BAFQ,MAAM,UACN,mBAAmB,GAAG,UAAU;;;;;;kCAxGkB,MAAM;;;;;EAmItE;yCAxJsE,sBAAsB;gCAAtB,sBAAsB"}
+{"version":3,"file":"fakeVatAdmin.d.ts","sourceRoot":"","sources":["fakeVatAdmin.js"],"names":[],"mappings":"AAwBA,+BAA4C;;AAqL5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAA8C;AAnL9C;;;GAGG;AACH,qDAHW,CAAC,GAAG,IAAI,KAAA,KAAK,OAAO,eACpB,CAAC,CAAC,EAAE,OAAO,KAAK,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAgH9B;;;WAGG;4BAFQ,MAAM,UACN,mBAAmB,GAAG,UAAU;QAW3C;;;WAGG;+BAFQ,MAAM,UACN,mBAAmB,GAAG,UAAU;QAO3C;;;WAGG;4BAFQ,MAAM,UACN,mBAAmB,GAAG,UAAU;;;;;;kCA9HkB,MAAM;;;;;EAgKtE;yCArLsE,sBAAsB;gCAAtB,sBAAsB"}

package/tools/fakeVatAdmin.js

@@ -138,6 +138,28 @@ function makeFakeVatAdmin(testContextSetter = undefined, makeRemote = x => x) {
     getExitMessage: () => exitMessage,
     getHasExited: () => hasExited,
     getExitWithFailure: () => exitWithFailure,
+    /**
+     * @param {string} base
+     * @param {EndoZipBase64Bundle | TestBundle} bundle
+     */
+    getBundleID: (base, bundle) => {
+      if (bundle.moduleFormat !== 'endoZipBase64') {
+        return base;
+      }
+      if (base === `b1-${bundle.endoZipBase64Sha512}`) {
+        return base;
+      }
+      return `${base}-${bundle.endoZipBase64Sha512}`;
+    },
+    /**
+     * @param {string} base
+     * @param {EndoZipBase64Bundle | TestBundle} bundle
+     */
+    registerBundle: (base, bundle) => {
+      const bid = vatAdminState.getBundleID(base, bundle);
+      vatAdminState.installBundle(bid, bundle);
+      return bid;
+    },
     /**
      * @param {string} id
      * @param {EndoZipBase64Bundle | TestBundle} bundle
@@ -150,7 +172,14 @@ function makeFakeVatAdmin(testContextSetter = undefined, makeRemote = x => x) {
         if (extant.moduleFormat === 'endoZipBase64') {
           // Narrow bundle.moduleFormat now that extant.moduleFormat is narrowed
           assert.equal(bundle.moduleFormat, extant.moduleFormat);
-          assert.equal(bundle.endoZipBase64, extant.endoZipBase64);
+          // Make the error message managable by only showing the length,
+          // beginning and end of the huge base64 strings.
+          const summarize = s =>
+            `${s.length} chars (${s.slice(0, 10)}...${s.slice(-10)})`;
+          assert(
+            bundle.endoZipBase64 === extant.endoZipBase64,
+            `bundle ${id} ${summarize(bundle.endoZipBase64)} differs from extant ${summarize(extant.endoZipBase64)}`,
+          );
         }
         return idToBundleCap.get(id);
       }

package/tools/setup-zoe.d.ts

@@ -21,6 +21,8 @@ export function setUpZoeForTest<T extends unknown = any>({ setJig, feeIssuerConf
         getExitMessage: () => any;
         getHasExited: () => boolean;
         getExitWithFailure: () => any;
+        getBundleID: (base: string, bundle: EndoZipBase64Bundle | TestBundle) => string;
+        registerBundle: (base: string, bundle: EndoZipBase64Bundle | TestBundle) => string;
         installBundle: (id: string, bundle: EndoZipBase64Bundle | TestBundle) => any;
         installNamedBundle: (name: any, id: any, bundle: any) => any;
         getCriticalVatKey: () => {};

package/tools/setup-zoe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-zoe.d.ts","sourceRoot":"","sources":["setup-zoe.js"],"names":[],"mappings":"AAgBO,gDAFI,WAAW;;;;;;;EAOrB;AAKM,6CAFI,WAAW,sDAGqB;AAapC,gCAPgB,CAAC,mFAErB;IAAmC,MAAM,UAA3B,CAAC,KAAK,IAAI;IACU,eAAe;IACnB,WAAW;IACf,aAAa;CAAC;;;sCAoD9B,MAAM,aACN,MAAM,KACJ,OAAO,CAAC,YAAY,CAAC;;;;;;;;;;;;;;;;;GAoBnC;iCAvG8D,sBAAsB;qCACrC,uBAAuB;kCAAvB,uBAAuB;yCADR,sBAAsB;gCAAtB,sBAAsB"}
+{"version":3,"file":"setup-zoe.d.ts","sourceRoot":"","sources":["setup-zoe.js"],"names":[],"mappings":"AAgBO,gDAFI,WAAW;;;;;;;EAOrB;AAKM,6CAFI,WAAW,sDAGqB;AAapC,gCAPgB,CAAC,mFAErB;IAAmC,MAAM,UAA3B,CAAC,KAAK,IAAI;IACU,eAAe;IACnB,WAAW;IACf,aAAa;CAAC;;;sCAoD9B,MAAM,aACN,MAAM,KACJ,OAAO,CAAC,YAAY,CAAC;;;;;;;;;;;;;;;;;;;GAoBnC;iCAvG8D,sBAAsB;qCACrC,uBAAuB;kCAAvB,uBAAuB;yCADR,sBAAsB;gCAAtB,sBAAsB"}