@agoric/zoe 0.26.3-dev-0f94e34.0 → 0.26.3-dev-303a9f2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/zoe",
-  "version": "0.26.3-dev-0f94e34.0+0f94e34",
+  "version": "0.26.3-dev-303a9f2.0+303a9f2",
   "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-0f94e34.0+0f94e34",
-    "@agoric/base-zone": "0.1.1-dev-0f94e34.0+0f94e34",
-    "@agoric/ertp": "0.16.3-dev-0f94e34.0+0f94e34",
-    "@agoric/internal": "0.3.3-dev-0f94e34.0+0f94e34",
-    "@agoric/notifier": "0.6.3-dev-0f94e34.0+0f94e34",
-    "@agoric/store": "0.9.3-dev-0f94e34.0+0f94e34",
-    "@agoric/swingset-liveslots": "0.10.3-dev-0f94e34.0+0f94e34",
-    "@agoric/swingset-vat": "0.32.3-dev-0f94e34.0+0f94e34",
-    "@agoric/time": "0.3.3-dev-0f94e34.0+0f94e34",
-    "@agoric/vat-data": "0.5.3-dev-0f94e34.0+0f94e34",
-    "@agoric/zone": "0.2.3-dev-0f94e34.0+0f94e34",
+    "@agoric/assert": "0.6.1-dev-303a9f2.0+303a9f2",
+    "@agoric/base-zone": "0.1.1-dev-303a9f2.0+303a9f2",
+    "@agoric/ertp": "0.16.3-dev-303a9f2.0+303a9f2",
+    "@agoric/internal": "0.3.3-dev-303a9f2.0+303a9f2",
+    "@agoric/notifier": "0.6.3-dev-303a9f2.0+303a9f2",
+    "@agoric/store": "0.9.3-dev-303a9f2.0+303a9f2",
+    "@agoric/swingset-liveslots": "0.10.3-dev-303a9f2.0+303a9f2",
+    "@agoric/swingset-vat": "0.32.3-dev-303a9f2.0+303a9f2",
+    "@agoric/time": "0.3.3-dev-303a9f2.0+303a9f2",
+    "@agoric/vat-data": "0.5.3-dev-303a9f2.0+303a9f2",
+    "@agoric/zone": "0.2.3-dev-303a9f2.0+303a9f2",
     "@endo/bundle-source": "^3.2.3",
     "@endo/captp": "^4.2.0",
     "@endo/common": "^1.2.2",
@@ -68,7 +68,7 @@
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-0f94e34.0+0f94e34",
+    "@agoric/kmarshal": "0.1.1-dev-303a9f2.0+303a9f2",
     "@endo/init": "^1.1.2",
     "ava": "^5.3.0",
     "c8": "^9.1.0",
@@ -140,7 +140,7 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 84.91
+    "atLeast": 84.92
   },
-  "gitHead": "0f94e34eb539b8f91c82d0877df836738e58cc69"
+  "gitHead": "303a9f20404106fe9c09befbd728ed7a20ccf7e0"
 }

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

@@ -1,9 +1,11 @@
-type CopyRecord<T> = import('@endo/pass-style').CopyRecord<T>;
-type IssuerOptionsRecord = import('@agoric/ertp').IssuerOptionsRecord;
+/// <reference types="@agoric/ertp/exported" />
+/// <reference types="@endo/pass-style" />
+/// <reference path="../zoeService/utils.d.ts" />
+
 /**
  * Any passable non-thenable. Often an explanatory string.
  */
-type Completion = any;
+type Completion = import('@endo/pass-style').Passable;
 type ZCFMakeEmptySeatKit = (exit?: ExitRule | undefined) => ZcfSeatKit;
 
 type InvitationAmount = Amount<'set', InvitationDetails>;
@@ -62,7 +64,7 @@ type ZCF<CT extends unknown = Record<string, unknown>> = {
     proposalShape?: Pattern,
   ) => Promise<Invitation<R, A>>;
   shutdown: (completion: Completion) => void;
-  shutdownWithFailure: ShutdownWithFailure;
+  shutdownWithFailure: import('@agoric/swingset-vat').ShutdownWithFailure;
   getZoeService: () => ERef<ZoeService>;
   getInvitationIssuer: () => Issuer<'set'>;
   getTerms: () => StandardTerms & CT;
@@ -73,7 +75,7 @@ type ZCF<CT extends unknown = Record<string, unknown>> = {
     keyword: Keyword,
     assetKind?: K_2 | undefined,
     displayInfo?: AdditionalDisplayInfo,
-    options?: IssuerOptionsRecord,
+    options?: import('@agoric/ertp').IssuerOptionsRecord,
   ) => Promise<ZCFMint<K_2>>;
   registerFeeMint: ZCFRegisterFeeMint;
   makeEmptySeatKit: ZCFMakeEmptySeatKit;
@@ -216,8 +218,8 @@ type OfferHandler<OR extends unknown = unknown, OA = never> =
       handle: HandleOffer<OR, OA>;
     };
 type ContractMeta = {
-  customTermsShape?: CopyRecord<any> | undefined;
-  privateArgsShape?: CopyRecord<any> | undefined;
+  customTermsShape?: import('@endo/pass-style').CopyRecord<any> | undefined;
+  privateArgsShape?: import('@endo/pass-style').CopyRecord<any> | undefined;
   upgradability?: 'none' | 'canBeUpgraded' | 'canUpgrade' | undefined;
 };
 /**
@@ -238,8 +240,10 @@ type ContractStartFn<
 type ContractStartFnResult<PF, CF> = {
   publicFacet?: PF;
   creatorFacet?: CF;
-  creatorInvitation?: Promise<Invitation<R, A>> | undefined;
+  creatorInvitation?: Promise<Invitation<any, any>> | undefined;
 };
+
+// XXX redef, losing documentation
 type ContractOf<S> = import('../zoeService/utils').ContractOf<S>;
 type AdminFacet = import('../zoeService/utils').AdminFacet<any>;
 

package/src/contracts/oracle.d.ts

@@ -1,5 +1,27 @@
-export type OracleContract = ContractOf<typeof start>;
+export type OracleContract = {
+    terms: StandardTerms & Record<string, unknown>;
+} & {
+    creatorFacet: {
+        initialize(privateParams: any): OracleCreatorFacet;
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+        initialize(privateParams: any): OracleCreatorFacet;
+    }>;
+    publicFacet: {
+        /** @param {OracleQuery} query */
+        query(query: OracleQuery): Promise<unknown>;
+        /** @param {OracleQuery} query */
+        makeQueryInvitation(query: OracleQuery): Promise<Invitation<unknown, never>>;
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+        /** @param {OracleQuery} query */
+        query(query: OracleQuery): Promise<unknown>;
+        /** @param {OracleQuery} query */
+        makeQueryInvitation(query: OracleQuery): Promise<Invitation<unknown, never>>;
+    }>;
+};
 export type OracleStart = typeof start;
+/**
+ * @import {ContractOf} from '../zoeService/utils.js';
+ */
 /**
  * This contract provides oracle queries for a fee or for free.
  *

package/src/contracts/oracle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["oracle.js"],"names":[],"mappings":"6BAyGc,UAAU,CAAC,OAAO,KAAK,CAAC;0BACxB,OAAO,KAAK;AAlG1B;;;;GAIG;AACH,2BAFW,GAAG;;;;;;;QAkDV,iCAAiC;qBAArB,WAAW;QAgBvB,iCAAiC;mCAArB,WAAW;;QAhBvB,iCAAiC;qBAArB,WAAW;QAgBvB,iCAAiC;mCAArB,WAAW;;GAwB1B"}
+{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["oracle.js"],"names":[],"mappings":";;;;;;;;;QAiEI,iCAAiC;qBAArB,WAAW;QAgBvB,iCAAiC;mCAArB,WAAW;;QAhBvB,iCAAiC;qBAArB,WAAW;QAgBvB,iCAAiC;mCAArB,WAAW;;;0BA6Bb,OAAO,KAAK;AAtG1B;;GAEG;AAEH;;;;GAIG;AACH,2BAFW,GAAG;;;;;;;QAkDV,iCAAiC;qBAArB,WAAW;QAgBvB,iCAAiC;mCAArB,WAAW;;QAhBvB,iCAAiC;qBAArB,WAAW;QAgBvB,iCAAiC;mCAArB,WAAW;;GAwB1B"}

package/src/contracts/oracle.js

@@ -6,6 +6,10 @@ import { AmountMath } from '@agoric/ertp';
 import { E } from '@endo/eventual-send';
 import { atomicTransfer } from '../contractSupport/index.js';
 
+/**
+ * @import {ContractOf} from '../zoeService/utils.js';
+ */
+
 /**
  * This contract provides oracle queries for a fee or for free.
  *

package/src/contracts/priceAggregator.d.ts

@@ -3,7 +3,94 @@ export type OraclePriceSubmission = Readonly<ParsableNumber | {
     data: ParsableNumber;
 }>;
 export type Price = ParsableNumber | Ratio;
-export type PriceAggregatorContract = ContractOf<typeof start>;
+export type PriceAggregatorContract = {
+    terms: StandardTerms & {
+        timer: import("@agoric/time").TimerService;
+        POLL_INTERVAL: bigint;
+        brandIn: globalThis.Brand<"nat">;
+        brandOut: globalThis.Brand<"nat">;
+        unitAmountIn: import("@agoric/ertp/exported.js").NatAmount;
+    };
+    privateArgs: {
+        marshaller: {
+            toCapData: import("@endo/marshal").ToCapData<unknown>;
+            fromCapData: import("@endo/marshal").FromCapData<unknown>;
+            serialize: import("@endo/marshal").ToCapData<unknown>;
+            unserialize: import("@endo/marshal").FromCapData<unknown>;
+        };
+        quoteMint?: globalThis.ERef<globalThis.Mint<"set", PriceDescription>> | undefined;
+        storageNode: globalThis.ERef<globalThis.StorageNode>;
+    };
+} & {
+    creatorFacet: {
+        /**
+         * An "oracle invitation" is an invitation to be able to submit data to
+         * include in the priceAggregator's results.
+         *
+         * The offer result from this invitation is a OracleAdmin, which can be used
+         * directly to manage the price submissions as well as to terminate the
+         * relationship.
+         *
+         * @param {Instance | string} [oracleKey]
+         */
+        makeOracleInvitation: (oracleKey?: string | Instance | undefined) => Promise<Invitation<{
+            admin: OracleAdmin<Price>;
+            invitationMakers: {
+                PushPrice: (price: ParsableNumber) => Promise<Invitation<void, undefined>>;
+            };
+        }, {
+            notifier?: globalThis.Notifier<OraclePriceSubmission> | undefined;
+            scaleValueOut?: number | undefined;
+        } | undefined>>;
+        /** @param {OracleKey} oracleKey */
+        deleteOracle: (oracleKey: OracleKey) => Promise<void>;
+        /**
+         * @param {Instance | string} [oracleInstance]
+         * @param {OracleQuery} [query]
+         * @returns {Promise<OracleAdmin<Price>>}
+         */
+        initOracle: (oracleInstance?: string | Instance | undefined, query?: OracleQuery | undefined) => Promise<OracleAdmin<Price>>;
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+        /**
+         * An "oracle invitation" is an invitation to be able to submit data to
+         * include in the priceAggregator's results.
+         *
+         * The offer result from this invitation is a OracleAdmin, which can be used
+         * directly to manage the price submissions as well as to terminate the
+         * relationship.
+         *
+         * @param {Instance | string} [oracleKey]
+         */
+        makeOracleInvitation: (oracleKey?: string | Instance | undefined) => Promise<Invitation<{
+            admin: OracleAdmin<Price>;
+            invitationMakers: {
+                PushPrice: (price: ParsableNumber) => Promise<Invitation<void, undefined>>;
+            };
+        }, {
+            notifier?: globalThis.Notifier<OraclePriceSubmission> | undefined;
+            scaleValueOut?: number | undefined;
+        } | undefined>>;
+        /** @param {OracleKey} oracleKey */
+        deleteOracle: (oracleKey: OracleKey) => Promise<void>;
+        /**
+         * @param {Instance | string} [oracleInstance]
+         * @param {OracleQuery} [query]
+         * @returns {Promise<OracleAdmin<Price>>}
+         */
+        initOracle: (oracleInstance?: string | Instance | undefined, query?: OracleQuery | undefined) => Promise<OracleAdmin<Price>>;
+    }>;
+    publicFacet: {
+        getPriceAuthority(): import("@agoric/zoe/tools/types.js").PriceAuthority;
+        getSubscriber: () => globalThis.StoredSubscriber<unknown>;
+        /** Diagnostic tool */
+        getRoundCompleteNotifier(): Promise<globalThis.Notifier<any>>;
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+        getPriceAuthority(): import("@agoric/zoe/tools/types.js").PriceAuthority;
+        getSubscriber: () => globalThis.StoredSubscriber<unknown>;
+        /** Diagnostic tool */
+        getRoundCompleteNotifier(): Promise<globalThis.Notifier<any>>;
+    }>;
+};
 /**
  * @deprecated use fluxAggregator
  *

package/src/contracts/priceAggregator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"priceAggregator.d.ts","sourceRoot":"","sources":["priceAggregator.js"],"names":[],"mappings":"6BAoCc,MAAM,GAAG,MAAM,GAAG,MAAM;oCAEzB,QAAQ,CAAC,cAAc,GAAG;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;oBAGlD,cAAc,GAAG,KAAK;sCAglBtB,UAAU,CAAC,OAAO,KAAK,CAAC;AA3kBtC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,2BAbW,GAAG,CAAC;IACd,KAAO,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;IAC7C,aAAe,EAAE,MAAM,CAAC;IACxB,OAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACxB,QAAU,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACzB,YAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CAC3B,CAAC;gBAEU,UAAU;;iBAET,IAAI,CAAC,WAAW,CAAC;;;QA8W7B;;;;;;;;;WASG;;mBAY4B,WAAW,CAAC,KAAK,CAAC;8BAAoB;gBAAC,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;aAAC;;;;;QA0CtI,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;yGADU,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;;QA/ExC;;;;;;;;;WASG;;mBAY4B,WAAW,CAAC,KAAK,CAAC;8BAAoB;gBAAC,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;aAAC;;;;;QA0CtI,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;yGADU,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;;;;;QAmHxC,sBAAsB;;;;;QAAtB,sBAAsB;;;GAOzB;sCAplB4E,4BAA4B"}
+{"version":3,"file":"priceAggregator.d.ts","sourceRoot":"","sources":["priceAggregator.js"],"names":[],"mappings":"6BAqCc,MAAM,GAAG,MAAM,GAAG,MAAM;oCAEzB,QAAQ,CAAC,cAAc,GAAG;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;oBAGlD,cAAc,GAAG,KAAK;;;;;;;;;;;;;;;;;;;;;QAoYhC;;;;;;;;;WASG;;;;mCAYsF,cAAc;;;;;;QA0CvG,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;;;QAhFH;;;;;;;;;WASG;;;;mCAYsF,cAAc;;;;;;QA0CvG,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;;;;;;QAkHH,sBAAsB;;;;;QAAtB,sBAAsB;;;;AAjkB1B;;;;;;;;;;;;;;;;;;;GAmBG;AACH,2BAbW,GAAG,CAAC;IACd,KAAO,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;IAC7C,aAAe,EAAE,MAAM,CAAC;IACxB,OAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACxB,QAAU,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACzB,YAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CAC3B,CAAC;gBAEU,UAAU;;iBAET,IAAI,CAAC,WAAW,CAAC;;;QA8W7B;;;;;;;;;WASG;;mBAY4B,WAAW,CAAC,KAAK,CAAC;8BAAoB;gBAAC,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;aAAC;;;;;QA0CtI,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;yGADU,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;;QA/ExC;;;;;;;;;WASG;;mBAY4B,WAAW,CAAC,KAAK,CAAC;8BAAoB;gBAAC,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;aAAC;;;;;QA0CtI,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;yGADU,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;;;;;QAmHxC,sBAAsB;;;;;QAAtB,sBAAsB;;;GAOzB;sCAplB4E,4BAA4B"}

package/src/contracts/priceAggregator.js

@@ -32,6 +32,7 @@ import {
 
 /**
  * @import {LegacyMap} from '@agoric/store'
+ * @import {ContractOf} from '../zoeService/utils.js';
  * @import {PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
  */
 /** @typedef {bigint | number | string} ParsableNumber */

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

@@ -1 +1 @@
-{"version":3,"file":"internal-types.d.ts","sourceRoot":"","sources":["internal-types.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"internal-types.d.ts","sourceRoot":"","sources":["internal-types.js"],"names":[],"mappings":";cAKc,cAAc;uBACd,UAAU;gBACV,UAAU;gBACV,MAAM;;;;;qCAOT,UAAU,KACR,qBAAqB;;sBAKpB,CAAC,UAAU,EAAC,UAAU,KAAK,qBAAqB;;;sBAKhD,CAAC,YAAY,EAAE,YAAY,KAAK,IAAI;eACpC,CAAC,YAAY,EAAE,YAAY,KAAK,OAAO;;;cAKvC,QAAQ;kBACR,YAAY;;;;;+CAMf,UAAU,uBACV,mBAAmB,YACnB,cAAc,iBACd,aAAa,WACb,IAAI,CAAC,OAAO,CAAC,gBACb,IAAI,CAAC,OAAO,CAAC,WACb,OAAO,kBAAkB,EAAE,OAAO,KAChC,eAAe;sCAKjB,UAAU,KACR,IAAI;;uBAKH,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI;UAChC,gBAAgB;;;;;UAChB,OAAO,sBAAsB,EAAE,mBAAmB;uBAElD,MAAM,UAAU,CAAC,mBAAmB,CAAC;;oBAGtC,OAAO,eAAe,EAAE,eAAe,GAAG,mBAAmB;;wBAS5D,OAAO,CAAC,OAAO,eAAe,EAAE,QAAQ,CAAC;aACzC,OAAO;;;;;;;;2BASP,MAAM,IAAI;kBACV,CAAC,gBAAgB,EAAE,gBAAgB,EAChD,iBAAuB,EAAE,UAAU,EACnC,QAAc,EAAE,cAAc,EAC9B,SAAe,CAAC,EAAE,MAAM,KACjB,QAAQ;sBACF,gBAAgB;iBAChB,MAAM,QAAQ;oBACd,MAAM,MAAM;gBACZ,MAAM,mBAAmB;eACzB,MAAM,kBAAkB;cACxB,MAAM,MAAM;oBACZ,MAAM,MAAM,EAAE;qBACd,MAAM,YAAY;kBAClB,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI;kBAChC,OAAO,sBAAsB,EAAE,mBAAmB;yBAClD,MAAM,IAAI;eACV,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO;sBAC3B,CAAC,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,OAAO,KAAK,IAAI;oBAC9D,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI;;;;;;;;iBAS3B,CAAC,gBAAgB,EAAE,gBAAgB,EAChD,QAAsB,EAAE,QAAQ,KACd,iBAAiB;;yDAKzB,gBAAgB,eAChB,MAAM,mEAEN,OAAO,KACL,UAAU;;oBAKT,8BAA8B;gBAC9B,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,IAAI,CAEnB,CAAC,AAFoB,CAAC,EAChD,OAAqB,EAAE,OAAO,KACZ,OAAO,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC;iBAC7E,WAAW;qBACX,eAAe;sBACf,gBAAgB;wBAChB,kBAAkB;kBAClB,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI;kBAChC,OAAO,sBAAsB,EAAE,mBAAmB;cAClD,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,KAAK,IAAI;cACxD,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,KAAK,IAAI;yBAC/C,MAAM,IAAI;oBACV,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI;oBAChC,MAAM,KAAK,CAAC,MAAM,CAAC;uBACnB,CAAC,UAAU,EAAE,UAAU,KAAK,UAAU,CAAC,mBAAmB,CAAC;qCAC3D,MAAM,IAAI;;iCAKb,OAAO,wBACP,aAAa,KAEX,OAAO,CAAC,KAAK,CAAC;0CAKhB,OAAO,kBACP,SAAS;6BAMT,OAAO;;;mBAIL,OAAO;4CAKT,UAAU,YACV,cAAc,WACd,OAAO,cACP,UAAU,KACR,QAAQ;kDAKV,oBAAoB,EAAE;;gBAKnB,UAAU;gBACV,UAAU;;aAQW,CAAC;qBAFtB,MAAM,YAAY,CAEG,CAAC,AAFF,CAAC;mBACrB,CAAC,WAAW,EAAE,MAAM,CACC,CAAC,AADA,CAAC,KAAK,IAAI;;;;;;;qBAChC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI;;;cAShC,QAAQ;qBACR,eAAe;;;kBAKf,MAAM;;iBAEN,MAAM;oBACN,cAAc;;mCAKjB,IAAI,CAAC,gBAAgB,CAAC,yBACtB,cAAc,wBACd,aAAa,gBACb,MAAM,KACJ,OAAO,CAAC,qBAAqB,CAAC;sCAKhC,MAAM,KACJ,OAAO,kCAAkC;8BAK3C,cAAc,gBACd,OAAO,KACL,OAAO;;UAKN,MAAM,IAAI;;kBAIX,MAAM,CAAC,MAAM,CAAC;;;;;;mCAShB,KAAK,KACH,SAAS;qBAIT,KAAK,CAAC,YAAY,CAAC;8BAKrB,QAAQ,KACN,OAAO;;;;;+BAQP,IAAI;;iBAKH,WAAW;gBACX,UAAU;uBACV,iBAAiB;;;gBAKjB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,KAAK,IAAI;;;;;;wCASxD,OAAO,gBACP,YAAY,KACV,IAAI;;eAKH,sBAAsB;uBACtB,MAAM,cAAc;cACpB,MAAM,QAAQ;qBACd,MAAM,YAAY;gBAClB,MAAM,mBAAmB;eACzB,MAAM,kBAAkB;yBACxB,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI"}

package/src/internal-types.js

@@ -1,4 +1,5 @@
 // @jessie-check
+/// <reference types="@agoric/ertp/exported" />
 
 /**
  * @typedef {object} SeatData
@@ -163,7 +164,7 @@
  * @param {Keyword} keyword
  * @param {AssetKind} [assetKind]
  * @param {AdditionalDisplayInfo} [displayInfo]
- * @param {IssuerOptionsRecord} [options]
+ * @param {import('@agoric/ertp').IssuerOptionsRecord} [options]
  * @returns {ZoeMint}
  */
 

package/src/zoeService/startInstance.js

@@ -66,7 +66,7 @@ export const makeStartInstance = (
     adminNode: M.remotable('adminNode'),
   });
 
-  /** @type {import('@agoric/swingset-liveslots').PromiseWatcher<unknown, [InstanceAdmin, Handle<'adminNode'>]>} */
+  /** @type {import('@agoric/swingset-liveslots').PromiseWatcher<Completion, [InstanceAdmin, Handle<'adminNode'>]>} */
   const watcher = prepareExo(
     zoeBaggage,
     'InstanceCompletionWatcher',

package/src/zoeService/utils.d.ts

@@ -1,6 +1,9 @@
+// Ambient types
+import '../types-ambient.js';
+import '../contractFacet/types-ambient.js';
+
 import type { Issuer } from '@agoric/ertp/exported.js';
 import type { TagContainer } from '@agoric/internal/src/tagged.js';
-import type { Callable } from '@agoric/internal/src/utils.js';
 import type { Baggage } from '@agoric/swingset-liveslots';
 import type { VatUpgradeResults } from '@agoric/swingset-vat';
 import type { RemotableObject } from '@endo/marshal';
@@ -8,10 +11,6 @@ import type { RemotableObject } from '@endo/marshal';
 // XXX https://github.com/Agoric/agoric-sdk/issues/4565
 type SourceBundle = Record<string, any>;
 
-type ContractFacet<T extends {} = {}> = {
-  readonly [P in keyof T]: T[P] extends Callable ? T[P] : never;
-};
-
 /**
  * Installation of a contract, typed by its start function.
  */
@@ -48,41 +47,30 @@ export type AdminFacet<SF extends ContractStartFunction> = RemotableObject & {
     : (newPrivateArgs: Parameters<SF>[1]) => Promise<VatUpgradeResults>;
 };
 
-type StartParams<SF> = SF extends ContractStartFunction
+export type StartParams<SF> = SF extends ContractStartFunction
   ? Parameters<SF>[1] extends undefined
     ? {
-        terms: ReturnType<Parameters<SF>[0]['getTerms']>;
+        terms: ReturnType<ZcfOf<SF>['getTerms']>;
       }
     : {
-        terms: ReturnType<Parameters<SF>[0]['getTerms']>;
+        terms: ReturnType<ZcfOf<SF>['getTerms']>;
         privateArgs: Parameters<SF>[1];
       }
   : never;
 
-type StartResult<S> = S extends (...args: any) => Promise<infer U>
-  ? U
-  : ReturnType<S>;
+type StartResult<S extends (...args: any) => any> = Awaited<ReturnType<S>>;
+type ZcfOf<SF extends ContractStartFunction> = Parameters<SF>[0] extends ZCF
+  ? Parameters<SF>[0]
+  : ZCF<any>;
 
 /**
  * Convenience record for contract start function, merging its result with params.
  */
-export type ContractOf<S> = StartParams<S> & StartResult<S>;
-
-type StartContractInstance<C> = (
-  installation: Installation<C>,
-  issuerKeywordRecord?: Record<string, Issuer<any>>,
-  terms?: object,
-  privateArgs?: object,
-) => Promise<{
-  creatorFacet: C['creatorFacet'];
-  publicFacet: C['publicFacet'];
-  instance: Instance;
-  creatorInvitation: C['creatorInvitation'];
-  adminFacet: AdminFacet<any>;
-}>;
+export type ContractOf<S extends (...args: any) => any> = StartParams<S> &
+  StartResult<S>;
 
 /** The result of `startInstance` */
-export type StartedInstanceKit<SF> = {
+export type StartedInstanceKit<SF extends ContractStartFunction> = {
   instance: Instance<SF>;
   adminFacet: AdminFacet<SF>;
   // theses are empty by default. the return type will override
@@ -110,6 +98,7 @@ export type StartedInstanceKit<SF> = {
  * the creator facet, public facet, and creator invitation as defined
  * by the contract.
  */
+// XXX SF should extend ContractStartFunction but doing that triggers a bunch of tech debt type errors
 export type StartInstance = <SF>(
   installation: Installation<SF> | PromiseLike<Installation<SF>>,
   issuerKeywordRecord?: Record<Keyword, Issuer<any>>,
@@ -119,6 +108,7 @@ export type StartInstance = <SF>(
   label?: string,
 ) => Promise<StartedInstanceKit<SF>>;
 
+// XXX SF should extend ContractStartFunction but doing that triggers a bunch of tech debt type errors
 export type GetPublicFacet = <SF>(
   instance: Instance<SF> | PromiseLike<Instance<SF>>,
 ) => Promise<StartResult<SF>['publicFacet']>;

package/src/zoeService/utils.test-d.ts

@@ -3,7 +3,7 @@ import type { StartedInstanceKit } from './utils';
 const someContractStartFn = (
   zcf: ZCF,
   privateArgs: { someNumber: number; someString: string },
-) => {};
+) => ({});
 
 type PsmInstanceKit = StartedInstanceKit<typeof someContractStartFn>;
 

package/tools/scriptedOracle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scriptedOracle.d.ts","sourceRoot":"","sources":["scriptedOracle.js"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;GAeG;AACH,2CANW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,YAAY,CAAC,OAAO,4BAA4B,EAAE,WAAW,CAAC,SAC9D,OAAO,cAAc,EAAE,YAAY,OACnC,UAAU,aACV,MAAM;;qBA6B6B,WAAW;mCAS+T,WAAW;;;;;;GADlY"}
+{"version":3,"file":"scriptedOracle.d.ts","sourceRoot":"","sources":["scriptedOracle.js"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;GAeG;AACH,2CANW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,YAAY,CAAC,OAAO,4BAA4B,EAAE,WAAW,CAAC,SAC9D,OAAO,cAAc,EAAE,YAAY,OACnC,UAAU,aACV,MAAM;;qBAiCH,WACP;mCAIib,WAAW;;;;;;GADlc"}