@agoric/zoe 0.27.0-upgrade-20-dev-ef71cfd.0 → 0.27.0-upgrade-19-devnet-dev-5428c4d.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/zoe",
-  "version": "0.27.0-upgrade-20-dev-ef71cfd.0+ef71cfd",
+  "version": "0.27.0-upgrade-19-devnet-dev-5428c4d.0+5428c4d",
   "description": "Zoe: the Smart Contract Framework for Offer Enforcement",
   "type": "module",
   "main": "./src/zoeService/zoe.js",
@@ -43,35 +43,35 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/ertp": "0.16.3-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/internal": "0.4.0-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/notifier": "0.7.0-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/store": "0.9.3-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/swingset-liveslots": "0.10.3-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/swingset-vat": "0.33.0-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/time": "0.3.3-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/vat-data": "0.5.3-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/vow": "0.2.0-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@agoric/zone": "0.3.0-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@endo/bundle-source": "^4.0.0",
-    "@endo/captp": "^4.4.5",
-    "@endo/common": "^1.2.10",
-    "@endo/errors": "^1.2.10",
-    "@endo/eventual-send": "^1.3.1",
-    "@endo/exo": "^1.5.9",
-    "@endo/far": "^1.1.11",
-    "@endo/import-bundle": "^1.4.0",
-    "@endo/marshal": "^1.6.4",
-    "@endo/nat": "^5.1.0",
-    "@endo/pass-style": "^1.5.0",
-    "@endo/patterns": "^1.5.0",
-    "@endo/promise-kit": "^1.1.10",
+    "@agoric/base-zone": "0.1.1-upgrade-19-devnet-dev-5428c4d.0+5428c4d",
+    "@agoric/ertp": "0.16.3-upgrade-19-devnet-dev-5428c4d.0+5428c4d",
+    "@agoric/internal": "0.4.0-upgrade-19-devnet-dev-5428c4d.0+5428c4d",
+    "@agoric/notifier": "0.7.0-upgrade-19-devnet-dev-5428c4d.0+5428c4d",
+    "@agoric/store": "0.9.3-upgrade-19-devnet-dev-5428c4d.0+5428c4d",
+    "@agoric/swingset-liveslots": "0.10.3-upgrade-19-devnet-dev-5428c4d.0+5428c4d",
+    "@agoric/swingset-vat": "0.33.0-upgrade-19-devnet-dev-5428c4d.0+5428c4d",
+    "@agoric/time": "0.3.3-upgrade-19-devnet-dev-5428c4d.0+5428c4d",
+    "@agoric/vat-data": "0.5.3-upgrade-19-devnet-dev-5428c4d.0+5428c4d",
+    "@agoric/vow": "0.2.0-upgrade-19-devnet-dev-5428c4d.0+5428c4d",
+    "@agoric/zone": "0.3.0-upgrade-19-devnet-dev-5428c4d.0+5428c4d",
+    "@endo/bundle-source": "^3.5.1",
+    "@endo/captp": "^4.4.4",
+    "@endo/common": "^1.2.9",
+    "@endo/errors": "^1.2.9",
+    "@endo/eventual-send": "^1.3.0",
+    "@endo/exo": "^1.5.8",
+    "@endo/far": "^1.1.10",
+    "@endo/import-bundle": "^1.3.3",
+    "@endo/marshal": "^1.6.3",
+    "@endo/nat": "^5.0.14",
+    "@endo/pass-style": "^1.4.8",
+    "@endo/patterns": "^1.4.8",
+    "@endo/promise-kit": "^1.1.9",
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-upgrade-20-dev-ef71cfd.0+ef71cfd",
-    "@endo/init": "^1.1.9",
+    "@agoric/kmarshal": "0.1.1-upgrade-19-devnet-dev-5428c4d.0+5428c4d",
+    "@endo/init": "^1.1.8",
     "ava": "^5.3.0",
     "c8": "^10.1.2",
     "import-meta-resolve": "^4.1.0",
@@ -98,7 +98,7 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 85.15
+    "atLeast": 85.11
   },
-  "gitHead": "ef71cfdc9e62572cab9a3d2821dc446ce0d700c3"
+  "gitHead": "5428c4da67b53cef7ff53ba7b2a28cf6ec8f643a"
 }

package/src/cleanProposal.d.ts

@@ -6,6 +6,4 @@ export function cleanKeywords(uncleanKeywordRecord: {
 export function coerceAmountPatternKeywordRecord(allegedAmountKeywordRecord: any, getAssetKindByBrand: any): Record<string | number | symbol, any>;
 export function coerceAmountKeywordRecord(allegedAmountKeywordRecord: unknown, getAssetKindByBrand: any): AmountKeywordRecord;
 export function cleanProposal(proposal: Proposal, getAssetKindByBrand: GetAssetKindByBrand): ProposalRecord;
-import type { Proposal } from '@agoric/zoe';
-import type { ProposalRecord } from '@agoric/zoe';
 //# sourceMappingURL=cleanProposal.d.ts.map

package/src/cleanProposal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cleanProposal.d.ts","sourceRoot":"","sources":["cleanProposal.js"],"names":[],"mappings":"AASA,iCAAkC,GAAG,CAAC;AAiB/B,sDAYN;AAMM,oDAHI;IAAC,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,GACnB,MAAM,EAAE,CAcpB;AAEM,mJAsBN;AAQM,sEAJI,OAAO,uBACP,GAAC,GACC,mBAAmB,CAa/B;AA4CM,wCAJI,QAAQ,uBACR,mBAAmB,GACjB,cAAc,CA6B1B;8BA9JoD,aAAa;oCAAb,aAAa"}
+{"version":3,"file":"cleanProposal.d.ts","sourceRoot":"","sources":["cleanProposal.js"],"names":[],"mappings":"AAWA,iCAAkC,GAAG,CAAC;AAa/B,sDAYN;AAMM,oDAHI;IAAC,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,GACnB,MAAM,EAAE,CAcpB;AAEM,mJAsBN;AAQM,sEAJI,OAAO,uBACP,GAAC,GACC,mBAAmB,CAa/B;AA4CM,wCAJI,QAAQ,uBACR,mBAAmB,GACjB,cAAc,CA6B1B"}

package/src/cleanProposal.js

@@ -5,14 +5,12 @@ import { assertRecord } from '@endo/marshal';
 import { assertKey, assertPattern, mustMatch, isKey } from '@agoric/store';
 import { FullProposalShape } from './typeGuards.js';
 
+import './internal-types.js';
+
 const { ownKeys } = Reflect;
 
 export const MAX_KEYWORD_LENGTH = 100;
 
-/**
- * @import {ExitRule, Proposal, ProposalRecord} from '@agoric/zoe';
- */
-
 const firstCapASCII = /^[A-Z][a-zA-Z0-9_$]*$/;
 
 // We adopt simple requirements on keywords so that they do not accidentally

package/src/contractFacet/exit.d.ts

@@ -1,2 +1,2 @@
-export function makeMakeExiter(baggage: any): (proposal: globalThis.ProposalRecord, zcfSeat: globalThis.ZCFSeat) => ExitObj;
+export function makeMakeExiter(baggage: any): (proposal: ProposalRecord, zcfSeat: ZCFSeat) => ExitObj;
 //# sourceMappingURL=exit.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"exit.d.ts","sourceRoot":"","sources":["exit.js"],"names":[],"mappings":"AAwBO,4HAwGN"}
+{"version":3,"file":"exit.d.ts","sourceRoot":"","sources":["exit.js"],"names":[],"mappings":"AAwBO,sGAwGN"}

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

@@ -0,0 +1,8 @@
+type TestJigSetter = ({ zcf }: {
+    zcf: ZCF;
+}) => void;
+type ZCFZygote = {
+    startContract: (instanceAdminFromZoe: ERef<ZoeInstanceAdmin>, instanceRecordFromZoe: InstanceRecord, issuerStorageFromZoe: IssuerRecords, privateArgs?: object) => Promise<ExecuteContractResult>;
+    restartContract: (privateArgs?: object) => void;
+};
+//# sourceMappingURL=internal-types.d.ts.map

package/src/contractFacet/internal-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal-types.d.ts","sourceRoot":"","sources":["internal-types.js"],"names":[],"mappings":"qBAGa,CAAE,EAAC,GAAG,EAAC,EAAE;IAAC,GAAG,EAAE,GAAG,CAAA;CAAC,KAAM,IAAI;;mBAK5B,CAAC,oBAAoB,EAAE,IAAI,CAAC,gBAAgB,CAAC,EACpD,qBAAqB,EAAE,cAAc,EACrC,oBAAoB,EAAE,aAAa,EACnC,WAAW,CAAC,EAAE,MAAM,KACnB,OAAO,CAAC,qBAAqB,CAAC;qBACxB,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,IAAI"}

package/src/contractFacet/internal-types.js

@@ -0,0 +1,15 @@
+// @jessie-check
+
+/**
+ * @typedef {( {zcf}: {zcf: ZCF} ) => void} TestJigSetter
+ */
+
+/**
+ * @typedef ZCFZygote
+ * @property {(instanceAdminFromZoe: ERef<ZoeInstanceAdmin>,
+ *     instanceRecordFromZoe: InstanceRecord,
+ *     issuerStorageFromZoe: IssuerRecords,
+ *     privateArgs?: object,
+ * ) => Promise<ExecuteContractResult>} startContract
+ * @property {(privateArgs?: object) => void} restartContract
+ */

package/src/contractFacet/offerHandlerStorage.d.ts

@@ -1,5 +1,5 @@
 export function makeOfferHandlerStorage(zcfBaggage: any): {
-    storeOfferHandler: (offerHandler: any) => globalThis.Handle<"Invitation">;
+    storeOfferHandler: (offerHandler: any) => Handle<"Invitation">;
     takeOfferHandler: (invitationHandle: InvitationHandle, details?: Details) => OfferHandler;
 };
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"rightsConservation.d.ts","sourceRoot":"","sources":["rightsConservation.js"],"names":[],"mappings":"AAoFA;;;;;;;;;GASG;AACH,uDANW,MAAM,EAAE,cAER,MAAM,EAAE,GAEN,IAAI,CAMhB"}
+{"version":3,"file":"rightsConservation.d.ts","sourceRoot":"","sources":["rightsConservation.js"],"names":[],"mappings":"AAqFA;;;;;;;;;GASG;AACH,uDANW,MAAM,EAAE,cAER,MAAM,EAAE,GAEN,IAAI,CAMhB"}

package/src/contractFacet/rightsConservation.js

@@ -2,6 +2,7 @@ import { assert, Fail } from '@endo/errors';
 import { makeScalarMapStore } from '@agoric/store';
 import { AmountMath } from '@agoric/ertp';
 
+import '../internal-types.js';
 /**
  * @import {MapStore} from '@agoric/store';
  */

package/src/contractFacet/{types.ts → types-ambient.d.ts}

@@ -1,49 +1,14 @@
-import type {
-  AdditionalDisplayInfo,
-  Amount,
-  AnyAmount,
-  AssetKind,
-  Brand,
-  DisplayInfo,
-  Issuer,
-  Payment,
-} from '@agoric/ertp';
-import type { Subscriber } from '@agoric/notifier';
-import type { ERef } from '@endo/far';
-import type { Passable } from '@endo/pass-style';
-import type { Key, Pattern } from '@endo/patterns';
-import type {
-  AmountKeywordRecord,
-  ExitRule,
-  FeeMintAccess,
-  Instance,
-  InvitationDetails,
-  Keyword,
-  ProposalRecord,
-  StandardTerms,
-  UserSeat,
-  ZoeService,
-} from '../types-index.js';
-import type { ContractStartFunction } from '../zoeService/utils.js';
+/// <reference types="@agoric/ertp/exported" />
+/// <reference types="@endo/pass-style" />
+/// <reference path="../zoeService/utils.d.ts" />
 
 /**
  * Any passable non-thenable. Often an explanatory string.
  */
-export type Completion = Passable;
-export type ZCFMakeEmptySeatKit = (exit?: ExitRule | undefined) => ZcfSeatKit;
+type Completion = import('@endo/pass-style').Passable;
+type ZCFMakeEmptySeatKit = (exit?: ExitRule | undefined) => ZcfSeatKit;
 
-export type InvitationAmount = Amount<'set', InvitationDetails>;
-
-export type ZoeIssuerRecord<
-  K extends AssetKind = AssetKind,
-  M extends Key = Key,
-> = {
-  brand: Brand<K>;
-  issuer: Issuer<K, M>;
-  assetKind: K;
-  displayInfo?: DisplayInfo<K>;
-};
-export type Allocation = Record<Keyword, AnyAmount>;
+type InvitationAmount = Amount<'set', InvitationDetails>;
 
 /**
  * Zoe Contract Facet
@@ -54,7 +19,7 @@ export type Allocation = Record<Keyword, AnyAmount>;
  * synchronously from within the contract, and usually is referred to
  * in code as zcf.
  */
-export type ZCF<CT = Record<string, unknown>> = {
+type ZCF<CT = Record<string, unknown>> = {
   /**
    * - atomically reallocate amounts among seats.
    */
@@ -75,9 +40,7 @@ export type ZCF<CT = Record<string, unknown>> = {
   saveIssuer: <I extends Issuer>(
     issuerP: ERef<I>,
     keyword: Keyword,
-  ) => Promise<
-    I extends Issuer<infer K, infer M> ? ZoeIssuerRecord<K, M> : never
-  >;
+  ) => Promise<I extends Issuer<infer K, infer M> ? IssuerRecord<K, M> : never>;
 
   /**
    * Make a credible Zoe invitation for a particular smart contract
@@ -102,7 +65,7 @@ export type ZCF<CT = Record<string, unknown>> = {
   getTerms: () => StandardTerms & CT;
   getBrandForIssuer: <K extends AssetKind>(issuer: Issuer<K>) => Brand<K>;
   getIssuerForBrand: <K_1 extends AssetKind>(brand: Brand<K_1>) => Issuer<K_1>;
-  getAssetKind: (brand: Brand) => AssetKind;
+  getAssetKind: GetAssetKindByBrand;
   makeZCFMint: <K_2 extends AssetKind = 'nat'>(
     keyword: Keyword,
     assetKind?: K_2 | undefined,
@@ -118,14 +81,14 @@ export type ZCF<CT = Record<string, unknown>> = {
   getInstance: () => Instance;
 };
 
-export type TransferPart = [
+type TransferPart = [
   fromSeat?: ZCFSeat,
   toSeat?: ZCFSeat,
   fromAmounts?: AmountKeywordRecord,
   toAmounts?: AmountKeywordRecord,
 ];
 
-export type ZCFRegisterFeeMint = (
+type ZCFRegisterFeeMint = (
   keyword: Keyword,
   allegedFeeMintAccess: FeeMintAccess,
 ) => Promise<ZCFMint<'nat'>>;
@@ -143,9 +106,9 @@ export type ZCFRegisterFeeMint = (
  * will be appended to the returned jig object (overriding any
  * provided by the `testFn`).
  */
-export type SetTestJig = (testFn?: () => Record<string, unknown>) => void;
-export type ZCFMint<K extends AssetKind = AssetKind> = {
-  getIssuerRecord: () => ZoeIssuerRecord<K>;
+type SetTestJig = (testFn?: () => Record<string, unknown>) => void;
+type ZCFMint<K extends AssetKind = AssetKind> = {
+  getIssuerRecord: () => IssuerRecord<K>;
   /**
    * All the amounts in gains must be of this ZCFMint's brand.
    * The gains' keywords are in the namespace of that seat.
@@ -172,8 +135,8 @@ export type ZCFMint<K extends AssetKind = AssetKind> = {
  * fail called with the reason for this failure, where reason is
  * normally an instanceof Error.
  */
-export type ZCFSeatFail = (reason: unknown) => Error;
-export type ZCFSeat = import('@endo/pass-style').RemotableObject & {
+type ZCFSeatFail = (reason: unknown) => Error;
+type ZCFSeat = import('@endo/pass-style').RemotableObject & {
   exit: (completion?: Completion) => void;
   fail: ZCFSeatFail;
   getSubscriber: () => Promise<Subscriber<Allocation>>;
@@ -183,26 +146,26 @@ export type ZCFSeat = import('@endo/pass-style').RemotableObject & {
    * @param brand used for filling in an empty amount if the `keyword`
    * is not present in the allocation
    */
-  getAmountAllocated: <B extends Brand<any>>(
+  getAmountAllocated: <B extends Brand>(
     keyword: Keyword,
     brand?: B,
   ) => B extends Brand<infer K> ? Amount<K> : Amount;
   getCurrentAllocation: () => Allocation;
   isOfferSafe: (newAllocation: Allocation) => boolean;
 };
-export type ZcfSeatKit = {
+type ZcfSeatKit = {
   zcfSeat: ZCFSeat;
   userSeat: Promise<UserSeat>;
 };
-export type HandleOffer<OR, OA> = (seat: ZCFSeat, offerArgs: OA) => OR;
-export type OfferHandler<OR = unknown, OA = never> =
+type HandleOffer<OR, OA> = (seat: ZCFSeat, offerArgs: OA) => OR;
+type OfferHandler<OR = unknown, OA = never> =
   | HandleOffer<OR, OA>
   | {
       handle: HandleOffer<OR, OA>;
     };
-export type ContractMeta<
+type ContractMeta<
   SF extends // import inline to maintain ambient mode
-    ContractStartFunction = ContractStartFunction,
+    import('../zoeService/utils').ContractStartFunction = import('../zoeService/utils').ContractStartFunction,
 > = {
   customTermsShape?: Record<
     Parameters<SF>[0] extends ZCF<infer CT> ? keyof CT : never,
@@ -221,25 +184,25 @@ export type ContractMeta<
  *
  * CAVEAT: assumes synchronous
  */
-export type ContractStartFn<PF = any, CF = any, CT = any, PA = any> = (
+type ContractStartFn<PF = any, CF = any, CT = any, PA = any> = (
   zcf: ZCF<CT>,
   privateArgs: PA,
   baggage: import('@agoric/vat-data').Baggage,
 ) => ContractStartFnResult<PF, CF>;
-export type ContractStartFnResult<PF, CF> = {
+type ContractStartFnResult<PF, CF> = {
   publicFacet?: PF;
   creatorFacet?: CF;
   creatorInvitation?: Promise<Invitation<any, any>> | undefined;
 };
 
-/**
- * @deprecated use the parameterized version
- */
-export type AdminFacet = import('../zoeService/utils.js').AdminFacet<any>;
+// XXX redef, losing documentation
+type ContractOf<S extends (...args: any) => any> =
+  import('../zoeService/utils').ContractOf<S>;
+type AdminFacet = import('../zoeService/utils').AdminFacet<any>;
 
 declare const OfferReturn: unique symbol;
 declare const OfferArgs: unique symbol;
-export type Invitation<R = unknown, A = undefined> = Payment<
+type Invitation<R = unknown, A = undefined> = Payment<
   'set',
   InvitationDetails
 > & {

package/src/contractFacet/types-ambient.js

@@ -0,0 +1 @@
+// Dummy file for .d.ts twin to declare ambients

package/src/contractFacet/vatRoot.d.ts

@@ -1,20 +1,14 @@
 /**
- * @import {ZoeService} from '@agoric/zoe';
- */
-/**
- * @param {VatPowers & { testJigSetter: ( {zcf}: {zcf: ZCF} ) => void }} powers
+ * @param {VatPowers & { testJigSetter: TestJigSetter }} powers
  * @param {{contractBundleCap: BundleCap, zoeService: ZoeService, invitationIssuer: Issuer<'set'>, privateArgs?: any}} vatParameters
  * @param {import('@agoric/vat-data').Baggage} baggage
  */
 export function buildRootObject(powers: VatPowers & {
-    testJigSetter: ({ zcf }: {
-        zcf: ZCF;
-    }) => void;
+    testJigSetter: TestJigSetter;
 }, vatParameters: {
     contractBundleCap: BundleCap;
     zoeService: ZoeService;
     invitationIssuer: Issuer<"set">;
     privateArgs?: any;
 }, baggage: import("@agoric/vat-data").Baggage): Promise<import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {}>>;
-import type { ZoeService } from '@agoric/zoe';
 //# sourceMappingURL=vatRoot.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"vatRoot.d.ts","sourceRoot":"","sources":["vatRoot.js"],"names":[],"mappings":"AAeA;;GAEG;AAEH;;;;GAIG;AACH,wCAJW,SAAS,GAAG;IAAE,aAAa,EAAE,CAAE,EAAC,GAAG,EAAC,EAAE;QAAC,GAAG,EAAE,GAAG,CAAA;KAAC,KAAM,IAAI,CAAA;CAAE,iBAC5D;IAAC,iBAAiB,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAAC,WAAW,CAAC,EAAE,GAAG,CAAA;CAAC,WAC1G,OAAO,kBAAkB,EAAE,OAAO,oIA8D5C;gCApE4B,aAAa"}
+{"version":3,"file":"vatRoot.d.ts","sourceRoot":"","sources":["vatRoot.js"],"names":[],"mappings":"AAiBA;;;;GAIG;AACH,wCAJW,SAAS,GAAG;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,iBAC5C;IAAC,iBAAiB,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAAC,WAAW,CAAC,EAAE,GAAG,CAAA;CAAC,WAC1G,OAAO,kBAAkB,EAAE,OAAO,oIA+D5C"}

package/src/contractFacet/vatRoot.js

@@ -11,14 +11,12 @@ import { Fail } from '@endo/errors';
 import { Far } from '@endo/marshal';
 import { E } from '@endo/far';
 
-import { makeZCFZygote } from './zcfZygote.js';
+import '../internal-types.js';
 
-/**
- * @import {ZoeService} from '@agoric/zoe';
- */
+import { makeZCFZygote } from './zcfZygote.js';
 
 /**
- * @param {VatPowers & { testJigSetter: ( {zcf}: {zcf: ZCF} ) => void }} powers
+ * @param {VatPowers & { testJigSetter: TestJigSetter }} powers
  * @param {{contractBundleCap: BundleCap, zoeService: ZoeService, invitationIssuer: Issuer<'set'>, privateArgs?: any}} vatParameters
  * @param {import('@agoric/vat-data').Baggage} baggage
  */
@@ -74,6 +72,7 @@ export async function buildRootObject(powers, vatParameters, baggage) {
       issuerStorageFromZoe,
       privateArgs = undefined,
     ) => {
+      /** @type {ZCFZygote} */
       return E(zcfZygote).startContract(
         zoeInstanceAdmin,
         instanceRecordFromZoe,

package/src/contractFacet/zcfMint.d.ts

@@ -1,9 +1,8 @@
-export function sumAmountKeywordRecord(amr: AmountKeywordRecord, issuerRecord: ZoeIssuerRecord): Amount;
+export function sumAmountKeywordRecord(amr: AmountKeywordRecord, issuerRecord: IssuerRecord): Amount;
 export function prepareZcMint(zcfBaggage: import("@agoric/vat-data").Baggage, recordIssuer: {
-    (keyword: string, issuerRecord: ZoeIssuerRecord): void;
+    (keyword: string, issuerRecord: IssuerRecord): void;
 }, getAssetKindByBrand: GetAssetKindByBrand, makeEmptySeatKit: (exit?: undefined) => {
     zcfSeat: any;
     userSeat: Promise<UserSeat>;
 }, reallocator: ZcfMintReallocator): (keyword: string, zoeMintP: ERef<ZoeMint<K>>) => Promise<ZCFMint<K>>;
-import type { ZCFMint } from '@agoric/zoe';
 //# sourceMappingURL=zcfMint.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"zcfMint.d.ts","sourceRoot":"","sources":["zcfMint.js"],"names":[],"mappings":"AAmBO,4CAJI,mBAAmB,gBACnB,eAAe,GACb,MAAM,CAYlB;AASM,0CANI,OAAO,kBAAkB,EAAE,OAAO,gBAClC;IAAE,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,eAAe,GAAG,IAAI,CAAA;CAAE,uBAC1D,mBAAmB,oBACnB,CAAC,IAAI,CAAC,EAAE,SAAS,KAAK;IAAE,OAAO,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;CAAE,eACnE,kBAAkB,IA0Gb,SAJH,MAIU,EAAE,UAHZ,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAGK,KAFlB,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAWjC;6BA5IkC,aAAa"}
+{"version":3,"file":"zcfMint.d.ts","sourceRoot":"","sources":["zcfMint.js"],"names":[],"mappings":"AAmBO,4CAJI,mBAAmB,gBACnB,YAAY,GACV,MAAM,CAYlB;AASM,0CANI,OAAO,kBAAkB,EAAE,OAAO,gBAClC;IAAE,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,IAAI,CAAA;CAAE,uBACvD,mBAAmB,oBACnB,CAAC,IAAI,CAAC,EAAE,SAAS,KAAK;IAAE,OAAO,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;CAAE,eACnE,kBAAkB,IA0Gb,SAJH,MAIU,EAAE,UAHZ,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAGK,KAFlB,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAWjC"}

package/src/contractFacet/zcfMint.js

@@ -6,15 +6,15 @@ import { prepareExoClass } from '@agoric/vat-data';
 import { coerceAmountKeywordRecord } from '../cleanProposal.js';
 import { assertFullIssuerRecord, makeIssuerRecord } from '../issuerRecord.js';
 import { addToAllocation, subtractFromAllocation } from './allocationMath.js';
-import { ZcfMintI } from './typeGuards.js';
 
-/**
- * @import {ZCFMint, ZCFSeat} from '@agoric/zoe';
- */
+import '../internal-types.js';
+import { ZcfMintI } from './typeGuards.js';
+import './internal-types.js';
+import './types-ambient.js';
 
 /**
  * @param {AmountKeywordRecord} amr
- * @param {ZoeIssuerRecord} issuerRecord
+ * @param {IssuerRecord} issuerRecord
  * @returns {Amount}
  */
 export const sumAmountKeywordRecord = (amr, issuerRecord) => {
@@ -31,7 +31,7 @@ export const sumAmountKeywordRecord = (amr, issuerRecord) => {
 
 /**
  * @param {import('@agoric/vat-data').Baggage} zcfBaggage
- * @param {{ (keyword: string, issuerRecord: ZoeIssuerRecord): void }} recordIssuer
+ * @param {{ (keyword: string, issuerRecord: IssuerRecord): void }} recordIssuer
  * @param {GetAssetKindByBrand} getAssetKindByBrand
  * @param {(exit?: undefined) => { zcfSeat: any; userSeat: Promise<UserSeat> }} makeEmptySeatKit
  * @param {ZcfMintReallocator} reallocator
@@ -51,7 +51,7 @@ export const prepareZcMint = (
      * @template {AssetKind} [K=AssetKind]
      * @param {string} keyword
      * @param {ZoeMint<K>} zoeMint
-     * @param {Required<ZoeIssuerRecord<K>>} issuerRecord
+     * @param {Required<IssuerRecord<K>>} issuerRecord
      */
     (keyword, zoeMint, issuerRecord) => {
       const {

package/src/contractFacet/zcfSeat.js

@@ -21,8 +21,8 @@ import { makeAllocationMap } from './reallocate.js';
 import { TransferPartShape } from '../contractSupport/atomicTransfer.js';
 
 /**
- * @import {WeakMapStore} from '@agoric/store';
- * @import {TransferPart, ZCFSeat} from '@agoric/zoe';
+ * @import {LegacyWeakMap, WeakMapStore} from '@agoric/store';
+ * @import {MapStore} from '@agoric/swingset-liveslots';
  */
 
 /**

package/src/contractFacet/zcfZygote.d.ts

@@ -1,10 +1,2 @@
-export function makeZCFZygote(powers: VatPowers, zoeService: ERef<ZoeService>, invitationIssuer: Issuer<"set">, testJigSetter: ({ zcf }: {
-    zcf: ZCF;
-}) => void, contractBundleCap: BundleCap, zcfBaggage?: import("@agoric/vat-data").Baggage): Promise<ZCFZygote>;
-export type ZCFZygote = {
-    startContract: (instanceAdminFromZoe: ERef<ZoeInstanceAdmin>, instanceRecordFromZoe: InstanceRecord, issuerStorageFromZoe: IssuerRecords, privateArgs?: object) => Promise<ExecuteContractResult>;
-    restartContract: (privateArgs?: object) => void;
-};
-import type { ZoeService } from '@agoric/zoe';
-import type { ZCF } from '@agoric/zoe';
+export function makeZCFZygote(powers: VatPowers, zoeService: ERef<ZoeService>, invitationIssuer: Issuer<"set">, testJigSetter: TestJigSetter, contractBundleCap: BundleCap, zcfBaggage?: import("@agoric/vat-data").Baggage): Promise<ZCFZygote>;
 //# sourceMappingURL=zcfZygote.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"zcfZygote.d.ts","sourceRoot":"","sources":["zcfZygote.js"],"names":[],"mappings":"AA6DO,sCARI,SAAS,cACT,IAAI,CAAC,UAAU,CAAC,oBAChB,MAAM,CAAC,KAAK,CAAC,iBACb,CAAE,EAAC,GAAG,EAAC,EAAE;IAAC,GAAG,EAAE,GAAG,CAAA;CAAC,KAAM,IAAI,qBAC7B,SAAS,eACT,OAAO,kBAAkB,EAAE,OAAO,GAChC,OAAO,CAAC,SAAS,CAAC,CAod9B;;mBAvea,CAAC,oBAAoB,EAAE,IAAI,CAAC,gBAAgB,CAAC,EACpD,qBAAqB,EAAE,cAAc,EACrC,oBAAoB,EAAE,aAAa,EACnC,WAAW,CAAC,EAAE,MAAM,KACnB,OAAO,CAAC,qBAAqB,CAAC;qBACxB,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,IAAI;;gCAV8D,aAAa;yBAAb,aAAa"}
+{"version":3,"file":"zcfZygote.d.ts","sourceRoot":"","sources":["zcfZygote.js"],"names":[],"mappings":"AAiDO,sCARI,SAAS,cACT,IAAI,CAAC,UAAU,CAAC,oBAChB,MAAM,CAAC,KAAK,CAAC,iBACb,aAAa,qBACb,SAAS,eACT,OAAO,kBAAkB,EAAE,OAAO,GAChC,OAAO,CAAC,SAAS,CAAC,CAod9B"}

package/src/contractFacet/zcfZygote.js

@@ -30,21 +30,9 @@ import { prepareZcMint } from './zcfMint.js';
 import { ZcfI } from './typeGuards.js';
 
 /// <reference path="../internal-types.js" />
+/// <reference path="./internal-types.js" />
 
-/**
- * @import {IssuerOptionsRecord} from '@agoric/ertp';
- * @import {ContractMeta, ContractStartFn, SetTestJig, ZCF, ZCFMint, ZCFRegisterFeeMint, ZoeService} from '@agoric/zoe';
- */
-
-/**
- * @typedef ZCFZygote
- * @property {(instanceAdminFromZoe: ERef<ZoeInstanceAdmin>,
- *     instanceRecordFromZoe: InstanceRecord,
- *     issuerStorageFromZoe: IssuerRecords,
- *     privateArgs?: object,
- * ) => Promise<ExecuteContractResult>} startContract
- * @property {(privateArgs?: object) => void} restartContract
- */
+/** @import {IssuerOptionsRecord} from '@agoric/ertp' */
 
 /**
  * Make the ZCF vat in zygote-usable form. First, a generic ZCF is
@@ -54,7 +42,7 @@ import { ZcfI } from './typeGuards.js';
  * @param {VatPowers} powers
  * @param {ERef<ZoeService>} zoeService
  * @param {Issuer<'set'>} invitationIssuer
- * @param {( {zcf}: {zcf: ZCF} ) => void} testJigSetter
+ * @param {TestJigSetter} testJigSetter
  * @param {BundleCap} contractBundleCap
  * @param {import('@agoric/vat-data').Baggage} zcfBaggage
  * @returns {Promise<ZCFZygote>}
@@ -104,7 +92,7 @@ export const makeZCFZygote = async (
 
   /**
    * @param {string} keyword
-   * @param {ZoeIssuerRecord} issuerRecord
+   * @param {IssuerRecord} issuerRecord
    */
   const recordIssuer = (keyword, issuerRecord) => {
     getInstanceRecHolder().addIssuer(keyword, issuerRecord);
@@ -250,7 +238,7 @@ export const makeZCFZygote = async (
     } else {
       bundle = contractBundleCap;
     }
-    return /** @type {any} */ (evalContractBundle(bundle));
+    return evalContractBundle(bundle);
   };
   // evaluate the contract (either the first version, or an upgrade)
   const bundleResult = await evaluateContract();

package/src/contractSupport/atomicTransfer.d.ts

@@ -1,12 +1,6 @@
-/**
- * @import {TransferPart, ZCF, ZCFSeat} from '@agoric/zoe';
- */
 export const TransferPartShape: import("@endo/patterns").Matcher;
 export function atomicRearrange(zcf: ZCF, transfers: TransferPart[]): void;
 export function fromOnly(fromSeat: ZCFSeat, fromAmounts: AmountKeywordRecord): TransferPart;
 export function toOnly(toSeat: ZCFSeat, toAmounts: AmountKeywordRecord): TransferPart;
 export function atomicTransfer(zcf: ZCF, fromSeat?: ZCFSeat, toSeat?: ZCFSeat, fromAmounts?: AmountKeywordRecord, toAmounts?: AmountKeywordRecord): void;
-import type { ZCF } from '@agoric/zoe';
-import type { TransferPart } from '@agoric/zoe';
-import type { ZCFSeat } from '@agoric/zoe';
 //# sourceMappingURL=atomicTransfer.d.ts.map

package/src/contractSupport/atomicTransfer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"atomicTransfer.d.ts","sourceRoot":"","sources":["atomicTransfer.js"],"names":[],"mappings":"AAGA;;GAEG;AAEH,iEAGE;AAyCK,qCAHI,GAAG,aACH,YAAY,EAAE,QAIxB;AAcM,mCAJI,OAAO,eACP,mBAAmB,GACjB,YAAY,CAGmB;AAcrC,+BAJI,OAAO,aACP,mBAAmB,GACjB,YAAY,CAG0B;AAW5C,oCANI,GAAG,aACH,OAAO,WACP,OAAO,gBACP,mBAAmB,cACnB,mBAAmB,QAQgD;yBAhGjC,aAAa;kCAAb,aAAa;6BAAb,aAAa"}
+{"version":3,"file":"atomicTransfer.d.ts","sourceRoot":"","sources":["atomicTransfer.js"],"names":[],"mappings":"AAGA,iEAGE;AAyCK,qCAHI,GAAG,aACH,YAAY,EAAE,QAIxB;AAcM,mCAJI,OAAO,eACP,mBAAmB,GACjB,YAAY,CAGmB;AAcrC,+BAJI,OAAO,aACP,mBAAmB,GACjB,YAAY,CAG0B;AAW5C,oCANI,GAAG,aACH,OAAO,WACP,OAAO,gBACP,mBAAmB,cACnB,mBAAmB,QAQgD"}

package/src/contractSupport/atomicTransfer.js

@@ -1,10 +1,6 @@
 import { M } from '@agoric/store';
 import { AmountKeywordRecordShape, SeatShape } from '../typeGuards.js';
 
-/**
- * @import {TransferPart, ZCF, ZCFSeat} from '@agoric/zoe';
- */
-
 export const TransferPartShape = M.splitArray(
   harden([M.opt(SeatShape), M.opt(SeatShape), M.opt(AmountKeywordRecordShape)]),
   harden([M.opt(AmountKeywordRecordShape)]),

package/src/contractSupport/bondingCurves.js

@@ -2,7 +2,7 @@
 
 import { Nat } from '@endo/nat';
 import { Fail } from '@endo/errors';
-import { natSafeMath } from '@agoric/ertp/src/safeMath.js';
+import { natSafeMath } from './safeMath.js';
 
 const { subtract, add, multiply, floorDivide } = natSafeMath;
 

package/src/contractSupport/index.d.ts

@@ -1,6 +1,5 @@
-export { natSafeMath } from "@agoric/ertp/src/safeMath.js";
+export { natSafeMath } from "./safeMath.js";
 export { makeStateMachine } from "./stateMachine.js";
-export * from "@agoric/ertp/src/ratio.js";
 export * from "./durability.js";
 export * from "./prepare-ownable.js";
 export * from "./priceAuthority.js";
@@ -11,4 +10,5 @@ export * from "./topics.js";
 export { getInputPrice, getOutputPrice, calcLiqValueToMint, calcValueToRemove, calcSecondaryRequired } from "./bondingCurves.js";
 export { atomicRearrange, atomicTransfer, fromOnly, toOnly } from "./atomicTransfer.js";
 export { defaultAcceptanceMsg, swap, fitProposalShape, assertProposalShape, assertIssuerKeywords, satisfies, assertNatAssetKind, swapExact, depositToSeat, withdrawFromSeat, saveAllIssuers, offerTo } from "./zoeHelpers.js";
+export { makeRatio, makeRatioFromAmounts, floorMultiplyBy, floorDivideBy, ceilMultiplyBy, ceilDivideBy, assertIsRatio, invertRatio, oneMinus, addRatios, multiplyRatios, ratiosSame, quantize, ratioGTE, subtractRatios, ratioToNumber } from "./ratio.js";
 //# sourceMappingURL=index.d.ts.map