Merge pull request #7450 from Agoric/7046-dist-args

fix feeDistributor bootstrap
Agoric · Apr 19, 2023 · 470ca41 · 470ca41
2 parents e658480 + 7d0dd55
commit 470ca41
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/packages/inter-protocol/src/feeDistributor.js b/packages/inter-protocol/src/feeDistributor.js
@@ -316,7 +316,7 @@ export const makeFeeDistributor = (feeIssuer, terms) => {
     },
 
     /**
-     * @param {Record<Keyword, FeeDestination>} newDestinations
+     * @param {Record<Keyword, ERef<FeeDestination>>} newDestinations
      */
     setDestinations: async newDestinations => {
       destinations = newDestinations;

diff --git a/packages/inter-protocol/src/proposals/econ-behaviors.js b/packages/inter-protocol/src/proposals/econ-behaviors.js
@@ -396,7 +396,7 @@ export const startRewardDistributor = async ({
       timerService,
       collectionInterval: 60n * 60n, // 1 hour
       keywordShares: {
-        RewardDistributor: 1n,
+        RewardDistributor: 0n,
         Reserve: 1n,
       },
     }),
@@ -417,20 +417,28 @@ export const startRewardDistributor = async ({
       return undefined;
     });
 
+  /**
+   * @type {Awaited<
+   *   ReturnType<typeof import('../feeDistributor.js').makeFeeDistributor>>
+   *   & { adminFacet: AdminFacet, instance: Instance }
+   * }
+   */
   const instanceKit = await E(zoe).startInstance(
     feeDistributor,
     { Fee: centralIssuer },
     feeDistributorTerms,
     undefined,
     'feeDistributor',
   );
+  /** @type {ERef<import('../feeDistributor.js').FeeDestination>} */
   await E(instanceKit.creatorFacet).setDestinations({
-    RewardDistributor:
-      rewardDistributorDepositFacet &&
-      E(instanceKit.creatorFacet).makeDepositFacetDestination(
-        rewardDistributorDepositFacet,
-      ),
+    ...(rewardDistributorDepositFacet && {
+      RewardDistributor: E(
+        instanceKit.creatorFacet,
+      ).makeDepositFacetDestination(rewardDistributorDepositFacet),
+    }),
     Reserve: E(instanceKit.creatorFacet).makeOfferDestination(
+      zoe,
       'Collateral',
       E.get(reserveKit).publicFacet,
       'makeAddCollateralInvitation',