From 37efb5a99a90d8be5f2b98279f25f4fe965a6fba Mon Sep 17 00:00:00 2001
From: Turadg Aleahmad <turadg@agoric.com>
Date: Mon, 11 Mar 2024 07:05:30 -0700
Subject: [PATCH] chore(types): misc fix for TS 5.4

---
 packages/pegasus/src/contract.js                            | 4 ++--
 packages/vats/src/core/types-ambient.d.ts                   | 2 +-
 packages/wallet/api/src/lib-wallet.js                       | 2 ++
 packages/zoe/src/contractFacet/types-ambient.d.ts           | 6 +++---
 packages/zoe/test/privateArgsUsageContract.js               | 1 -
 .../swingsetTests/brokenContracts/crashingAutoRefund.js     | 1 -
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/pegasus/src/contract.js b/packages/pegasus/src/contract.js
index 2bd951f38db..e378b30c104 100644
--- 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
index 19a29a571a7..324c184c363 100644
--- 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
index 6da348d70d4..250e411974f 100644
--- 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
index d0d0fcaaaac..5cfeedda345 100644
--- 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
index b3be8fa8d2b..8f479791373 100644
--- 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
index a6eb29bdd0e..93cae2157f4 100644
--- 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 });
 };