@agoric/zoe 0.26.3-dev-9274bc7.0 → 0.26.3-dev-62c73f5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/zoe",
-  "version": "0.26.3-dev-9274bc7.0+9274bc7",
+  "version": "0.26.3-dev-62c73f5.0+62c73f5",
   "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/assert": "0.6.1-dev-9274bc7.0+9274bc7",
-    "@agoric/base-zone": "0.1.1-dev-9274bc7.0+9274bc7",
-    "@agoric/ertp": "0.16.3-dev-9274bc7.0+9274bc7",
-    "@agoric/internal": "0.3.3-dev-9274bc7.0+9274bc7",
-    "@agoric/notifier": "0.6.3-dev-9274bc7.0+9274bc7",
-    "@agoric/store": "0.9.3-dev-9274bc7.0+9274bc7",
-    "@agoric/swingset-liveslots": "0.10.3-dev-9274bc7.0+9274bc7",
-    "@agoric/swingset-vat": "0.32.3-dev-9274bc7.0+9274bc7",
-    "@agoric/time": "0.3.3-dev-9274bc7.0+9274bc7",
-    "@agoric/vat-data": "0.5.3-dev-9274bc7.0+9274bc7",
-    "@agoric/zone": "0.2.3-dev-9274bc7.0+9274bc7",
+    "@agoric/assert": "0.6.1-dev-62c73f5.0+62c73f5",
+    "@agoric/base-zone": "0.1.1-dev-62c73f5.0+62c73f5",
+    "@agoric/ertp": "0.16.3-dev-62c73f5.0+62c73f5",
+    "@agoric/internal": "0.3.3-dev-62c73f5.0+62c73f5",
+    "@agoric/notifier": "0.6.3-dev-62c73f5.0+62c73f5",
+    "@agoric/store": "0.9.3-dev-62c73f5.0+62c73f5",
+    "@agoric/swingset-liveslots": "0.10.3-dev-62c73f5.0+62c73f5",
+    "@agoric/swingset-vat": "0.32.3-dev-62c73f5.0+62c73f5",
+    "@agoric/time": "0.3.3-dev-62c73f5.0+62c73f5",
+    "@agoric/vat-data": "0.5.3-dev-62c73f5.0+62c73f5",
+    "@agoric/zone": "0.2.3-dev-62c73f5.0+62c73f5",
     "@endo/bundle-source": "^3.2.3",
     "@endo/captp": "^4.2.0",
     "@endo/common": "^1.2.2",
@@ -63,12 +63,13 @@
     "@endo/import-bundle": "^1.1.2",
     "@endo/marshal": "^1.5.0",
     "@endo/nat": "^5.0.7",
+    "@endo/pass-style": "^1.4.0",
     "@endo/patterns": "^1.4.0",
     "@endo/promise-kit": "^1.1.2",
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-9274bc7.0+9274bc7",
+    "@agoric/kmarshal": "0.1.1-dev-62c73f5.0+62c73f5",
     "@endo/init": "^1.1.2",
     "ava": "^5.3.0",
     "c8": "^9.1.0",
@@ -141,5 +142,5 @@
   "typeCoverage": {
     "atLeast": 84.92
   },
-  "gitHead": "9274bc7a0e566b78128be2b59b5f244c7f8414e6"
+  "gitHead": "62c73f5befa179579864c1586ec2dd5be080ba0b"
 }

package/src/contractFacet/typeGuards.d.ts

@@ -0,0 +1,8 @@
+export const ZcfSeatShape: import("@endo/patterns").Matcher;
+export const ZcfMintI: import("@endo/patterns").InterfaceGuard<{
+    getIssuerRecord: import("@endo/patterns").MethodGuard;
+    mintGains: import("@endo/patterns").MethodGuard;
+    burnLosses: import("@endo/patterns").MethodGuard;
+}>;
+export const ZcfI: import("@endo/patterns").InterfaceGuard<any>;
+//# sourceMappingURL=typeGuards.d.ts.map

package/src/contractFacet/typeGuards.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"typeGuards.d.ts","sourceRoot":"","sources":["typeGuards.js"],"names":[],"mappings":"AAGA,4DAAmD;AAEnD;;;;GAMG;AAEH,gEAWE"}

package/src/contractFacet/typeGuards.js

@@ -0,0 +1,25 @@
+import { M } from '@endo/patterns';
+import { AmountKeywordRecordShape, IssuerRecordShape } from '../typeGuards.js';
+
+export const ZcfSeatShape = M.remotable('zcfSeat');
+
+export const ZcfMintI = M.interface('ZcfMint', {
+  getIssuerRecord: M.call().returns(IssuerRecordShape),
+  mintGains: M.call(AmountKeywordRecordShape)
+    .optional(ZcfSeatShape)
+    .returns(ZcfSeatShape),
+  burnLosses: M.call(AmountKeywordRecordShape, ZcfSeatShape).returns(),
+});
+
+export const ZcfI = M.interface(
+  'ZCF',
+  {
+    makeInvitation: M.call(M.raw(), M.string())
+      .optional(M.record(), M.pattern())
+      .returns(M.promise()),
+    setTestJig: M.call().optional(M.raw()).returns(),
+  },
+  {
+    defaultGuards: 'passable',
+  },
+);

package/src/contractFacet/types-ambient.d.ts

@@ -131,12 +131,12 @@ type ZCFRegisterFeeMint = (
  * never in production; i.e., it is only called if `testJigSetter`
  * was supplied.
  *
- * If no, `testFn` is supplied, then an empty jig will be used.
+ * If no `testFn` is supplied, then an empty jig will be used.
  * An additional `zcf` property set to the current ContractFacet
  * will be appended to the returned jig object (overriding any
  * provided by the `testFn`).
  */
-type SetTestJig = (testFn: () => Record<string, unknown>) => void;
+type SetTestJig = (testFn?: () => Record<string, unknown>) => void;
 type ZCFMint<K extends AssetKind = AssetKind> = {
   getIssuerRecord: () => IssuerRecord<K>;
   /**

package/src/contractFacet/zcfMint.js

@@ -8,7 +8,7 @@ import { assertFullIssuerRecord, makeIssuerRecord } from '../issuerRecord.js';
 import { addToAllocation, subtractFromAllocation } from './allocationMath.js';
 
 import '../internal-types.js';
-import { ZcfMintI } from '../typeGuards.js';
+import { ZcfMintI } from './typeGuards.js';
 import './internal-types.js';
 import './types-ambient.js';
 

package/src/contractFacet/zcfZygote.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zcfZygote.d.ts","sourceRoot":"","sources":["zcfZygote.js"],"names":[],"mappings":"AAiDO,wEAPI,IAAI,CAAC,UAAU,CAAC,oBAChB,MAAM,CAAC,KAAK,CAAC,iBACb,aAAa,uCAEb,OAAO,kBAAkB,EAAE,OAAO,GAChC,OAAO,CAAC,SAAS,CAAC,CAkd9B"}
+{"version":3,"file":"zcfZygote.d.ts","sourceRoot":"","sources":["zcfZygote.js"],"names":[],"mappings":"AAkDO,wEAPI,IAAI,CAAC,UAAU,CAAC,oBAChB,MAAM,CAAC,KAAK,CAAC,iBACb,aAAa,uCAEb,OAAO,kBAAkB,EAAE,OAAO,GAChC,OAAO,CAAC,SAAS,CAAC,CA8c9B"}

package/src/contractFacet/zcfZygote.js

@@ -10,7 +10,7 @@ import {
   provideDurableMapStore,
 } from '@agoric/vat-data';
 import { E } from '@endo/eventual-send';
-import { passStyleOf, Remotable } from '@endo/marshal';
+import { passStyleOf } from '@endo/pass-style';
 import { makePromiseKit } from '@endo/promise-kit';
 
 import { objectMap } from '@agoric/internal';
@@ -26,6 +26,7 @@ import { createSeatManager } from './zcfSeat.js';
 
 import { HandleOfferI, InvitationHandleShape } from '../typeGuards.js';
 import { prepareZcMint } from './zcfMint.js';
+import { ZcfI } from './typeGuards.js';
 
 /// <reference path="../internal-types.js" />
 /// <reference path="./internal-types.js" />
@@ -281,11 +282,7 @@ export const makeZCFZygote = async (
     ['canBeUpgraded', 'canUpgrade'].includes(meta.upgradability);
 
   /** @type {ZCF} */
-  // Using Remotable rather than Far because there are too many complications
-  // imposing checking wrappers: makeInvitation() and setJig() want to
-  // accept raw functions. assert cannot be a valid passable! (It's a function
-  // and has members.)
-  const zcf = Remotable('Alleged: zcf', undefined, {
+  const zcf = prepareExo(zcfBaggage, 'zcf', ZcfI, {
     atomicRearrange: transfers => seatManager.atomicRearrange(transfers),
     reallocate: (...seats) => seatManager.reallocate(...seats),
     assertUniqueKeyword: kwd => getInstanceRecHolder().assertUniqueKeyword(kwd),

package/src/typeGuards.d.ts

@@ -45,11 +45,6 @@ export const ZoeMintI: import("@endo/patterns").InterfaceGuard<{
     mintAndEscrow: import("@endo/patterns").MethodGuard;
     withdrawAndBurn: import("@endo/patterns").MethodGuard;
 }>;
-export const ZcfMintI: import("@endo/patterns").InterfaceGuard<{
-    getIssuerRecord: import("@endo/patterns").MethodGuard;
-    mintGains: import("@endo/patterns").MethodGuard;
-    burnLosses: import("@endo/patterns").MethodGuard;
-}>;
 export const FeeMintAccessShape: import("@endo/patterns").Matcher;
 export const ExitObjectI: import("@endo/patterns").InterfaceGuard<{
     exit: import("@endo/patterns").MethodGuard;

package/src/typeGuards.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typeGuards.d.ts","sourceRoot":"","sources":["typeGuards.js"],"names":[],"mappings":"AAgBA,4DAAuC;AAEvC,qEAAqE;AACrE,+DAAyD;AACzD,mEAAiE;AACjE,iEAA6D;AAC7D,yDAA6C;AAE7C,wEAA8E;AAC9E,+EAGE;AACF,0EAGE;AACF,wEAA8E;AAC9E,yEAGE;AACF,uEAA4E;AAE5E,iEAOE;;;;;;;;;;AAaF,kEAAiD;AAE1C,6EAA4D;AACnE,0DAAmD;;;;;;AA0BnD,2BAA2B;AAC3B,6DAAsE;AAEtE,kEAIG;AAEI,uDAGN;AAMM,uCAHI,QAAQ,GACN,IAAI,IAAI,cAAc,CAKlC;AAMM,8CAHI,QAAQ,GACN,IAAI,IAAI,qBAAqB,CAKzC;AAED,sEAKG;AAEH;;GAEG;AAEH,0EAKE;AAEF,4DAAmD;AACnD;;;;GAIG;AAEH;;;;GASG;AAEH,kEAA+D;AAE/D;;GAEG;AAEH,+DAAsD;AACtD,kEAA+D;AAC/D;;;;;;;;;;;;;;;;;GAkCG;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiDH,8DAAuD;AACvD,2DAGE;AAEF,0EAUE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8DF;;;;;;;;;;;;;;;;;;;GA6CG;AAEH;;;;GAIG;AAEH,6DASE;AAEF;;GAKG;;;;;4BAjYI,cAAc"}
+{"version":3,"file":"typeGuards.d.ts","sourceRoot":"","sources":["typeGuards.js"],"names":[],"mappings":"AAgBA,4DAAuC;AAEvC,qEAAqE;AACrE,+DAAyD;AACzD,mEAAiE;AACjE,iEAA6D;AAC7D,yDAA6C;AAE7C,wEAA8E;AAC9E,+EAGE;AACF,0EAGE;AACF,wEAA8E;AAC9E,yEAGE;AACF,uEAA4E;AAE5E,iEAOE;;;;;;;;;;AAaF,kEAAiD;AAE1C,6EAA4D;AACnE,0DAAmD;;;;;;AA0BnD,2BAA2B;AAC3B,6DAAsE;AAEtE,kEAIG;AAEI,uDAGN;AAMM,uCAHI,QAAQ,GACN,IAAI,IAAI,cAAc,CAKlC;AAMM,8CAHI,QAAQ,GACN,IAAI,IAAI,qBAAqB,CAKzC;AAED,sEAKG;AAEH;;GAEG;AAEH,0EAKE;AAEF,4DAAmD;AACnD;;;;GAIG;AAEH,kEAA+D;AAE/D;;GAEG;AAEH,+DAAsD;AACtD,kEAA+D;AAC/D;;;;;;;;;;;;;;;;;GAkCG;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiDH,8DAAuD;AACvD,2DAGE;AAEF,0EAUE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8DF;;;;;;;;;;;;;;;;;;;GA6CG;AAEH;;;;GAIG;AAEH,6DASE;AAEF;;GAKG;;;;;4BAtXI,cAAc"}

package/src/typeGuards.js

@@ -144,17 +144,6 @@ export const ZoeMintI = M.interface('ZoeMint', {
   withdrawAndBurn: M.call(AmountShape).returns(),
 });
 
-export const ZcfMintI = M.interface('ZcfMint', {
-  getIssuerRecord: M.call().returns(IssuerRecordShape),
-  mintGains: M.call(AmountKeywordRecordShape)
-    .optional(M.remotable('zcfSeat'))
-    .returns(M.remotable('zcfSeat')),
-  burnLosses: M.call(
-    AmountKeywordRecordShape,
-    M.remotable('zcfSeat'),
-  ).returns(),
-});
-
 export const FeeMintAccessShape = M.remotable('FeeMintAccess');
 
 export const ExitObjectI = M.interface('Exit Object', {