chore(types): misc fix for TS 5.4

Agoric · Mar 11, 2024 · 37efb5a · 37efb5a
1 parent 4a01c97
commit 37efb5a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/packages/pegasus/src/contract.js b/packages/pegasus/src/contract.js
@@ -7,10 +7,10 @@ import '@agoric/zoe/exported.js';
 import '../exported.js';
 
 /**
- * @type {ContractStartFn<Pegasus, never, {}, {
+ * @type {ContractStartFn<import('./pegasus.js').Pegasus, never, {}, {
  *   board: ERef<BoardDepositFacet>,
  *   namesByAddress: ERef<import('@agoric/vats').NameHub>
- * }}
+ * }>}
  */
 export const start = (zcf, privateArgs, baggage) => {
   const zone = makeDurableZone(baggage);

diff --git a/packages/vats/src/core/types-ambient.d.ts b/packages/vats/src/core/types-ambient.d.ts
@@ -283,7 +283,7 @@ type StartUpgradableOpts<
     import('@agoric/zoe/src/zoeService/utils').StartParams<SF>['terms'],
     'brands' | 'issuers'
   >;
-  privateArgs?: import('@agoric/zoe/src/zoeService/utils').StartParams<SF>['privateArgs'];
+  privateArgs?: Parameters<SF>[1];
   label: string;
 };
 

diff --git a/packages/wallet/api/src/lib-wallet.js b/packages/wallet/api/src/lib-wallet.js
@@ -1408,11 +1408,13 @@ export function makeWalletRoot({
     boardId,
     dappOrigin = undefined,
   ) {
+    /** @type {Petname} */
     let petname;
     if (dappOrigin === undefined) {
       petname = suggestedPetname;
     } else {
       const edgename = edgeMapping.valToPetname.get(dappOrigin);
+      // @ts-expect-error if suggestedPetname is itself an array, this nests
       petname = [edgename, suggestedPetname];
     }
 

diff --git a/packages/zoe/src/contractFacet/types-ambient.d.ts b/packages/zoe/src/contractFacet/types-ambient.d.ts
@@ -237,11 +237,11 @@ type ContractStartFn<
 > = (
   zcf: ZCF<CT>,
   privateArgs: PA,
-  baggage?: MapStore<any, any> | undefined,
+  baggage: import('@agoric/vat-data').Baggage,
 ) => ContractStartFnResult<PF, CF>;
 type ContractStartFnResult<PF, CF> = {
-  publicFacet: PF;
-  creatorFacet: CF;
+  publicFacet?: PF;
+  creatorFacet?: CF;
   creatorInvitation?: Promise<Invitation<R, A>> | undefined;
 };
 type ContractOf<S> = import('../zoeService/utils').ContractOf<S>;

diff --git a/packages/zoe/test/privateArgsUsageContract.js b/packages/zoe/test/privateArgsUsageContract.js
@@ -6,7 +6,6 @@ const start = (_zcf, privateArgs) => {
   const creatorFacet = Far('creatorFacet', {
     usePrivateArgs: () => E(privateArgs.myArg).doTest(),
   });
-  // @ts-expect-error missing publicFacet for ContractStartFn
   return harden({ creatorFacet });
 };
 harden(start);

diff --git a/packages/zoe/test/swingsetTests/brokenContracts/crashingAutoRefund.js b/packages/zoe/test/swingsetTests/brokenContracts/crashingAutoRefund.js
@@ -83,7 +83,6 @@ const start = zcf => {
 
   const creatorInvitation = makeSafeInvitation();
 
-  // @ts-expect-error missing creatorFacet of ContractStartFn
   return harden({ creatorInvitation, publicFacet });
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,7 +83,6 @@ const start = zcf => { @@
       const creatorInvitation = makeSafeInvitation();
-      // @ts-expect-error missing creatorFacet of ContractStartFn
       return harden({ creatorInvitation, publicFacet });
     };
@@ Expand Down @@