@agoric/inter-protocol 0.16.2-dev-40e0e4e.0 → 0.16.2-dev-ff9b882.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.16.2-dev-40e0e4e.0+40e0e4e",
+  "version": "0.16.2-dev-ff9b882.0+ff9b882",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -31,15 +31,15 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-dev-40e0e4e.0+40e0e4e",
-    "@agoric/governance": "0.10.4-dev-40e0e4e.0+40e0e4e",
-    "@agoric/internal": "0.3.3-dev-40e0e4e.0+40e0e4e",
-    "@agoric/notifier": "0.6.3-dev-40e0e4e.0+40e0e4e",
-    "@agoric/store": "0.9.3-dev-40e0e4e.0+40e0e4e",
-    "@agoric/time": "0.3.3-dev-40e0e4e.0+40e0e4e",
-    "@agoric/vat-data": "0.5.3-dev-40e0e4e.0+40e0e4e",
-    "@agoric/vats": "0.15.2-dev-40e0e4e.0+40e0e4e",
-    "@agoric/zoe": "0.26.3-dev-40e0e4e.0+40e0e4e",
+    "@agoric/ertp": "0.16.3-dev-ff9b882.0+ff9b882",
+    "@agoric/governance": "0.10.4-dev-ff9b882.0+ff9b882",
+    "@agoric/internal": "0.3.3-dev-ff9b882.0+ff9b882",
+    "@agoric/notifier": "0.6.3-dev-ff9b882.0+ff9b882",
+    "@agoric/store": "0.9.3-dev-ff9b882.0+ff9b882",
+    "@agoric/time": "0.3.3-dev-ff9b882.0+ff9b882",
+    "@agoric/vat-data": "0.5.3-dev-ff9b882.0+ff9b882",
+    "@agoric/vats": "0.15.2-dev-ff9b882.0+ff9b882",
+    "@agoric/zoe": "0.26.3-dev-ff9b882.0+ff9b882",
     "@endo/captp": "^4.4.2",
     "@endo/errors": "^1.2.7",
     "@endo/eventual-send": "^1.2.7",
@@ -50,10 +50,10 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/smart-wallet": "0.5.4-dev-40e0e4e.0+40e0e4e",
-    "@agoric/swingset-liveslots": "0.10.3-dev-40e0e4e.0+40e0e4e",
-    "@agoric/swingset-vat": "0.32.3-dev-40e0e4e.0+40e0e4e",
-    "@agoric/zone": "0.2.3-dev-40e0e4e.0+40e0e4e",
+    "@agoric/smart-wallet": "0.5.4-dev-ff9b882.0+ff9b882",
+    "@agoric/swingset-liveslots": "0.10.3-dev-ff9b882.0+ff9b882",
+    "@agoric/swingset-vat": "0.32.3-dev-ff9b882.0+ff9b882",
+    "@agoric/zone": "0.2.3-dev-ff9b882.0+ff9b882",
     "@endo/bundle-source": "^3.4.2",
     "@endo/init": "^1.1.6",
     "@endo/promise-kit": "^1.1.7",
@@ -84,5 +84,5 @@
   "typeCoverage": {
     "atLeast": 95.71
   },
-  "gitHead": "40e0e4e37503b611609d1752389477d8f14f1a8e"
+  "gitHead": "ff9b882dd93e3f8d3b7e9d305bbafda6bfb17fac"
 }

package/src/proposals/replace-fee-distributor.d.ts

@@ -0,0 +1,48 @@
+export function replaceFeeDistributor({ consume: { chainTimerService, bankManager, vaultFactoryKit, periodicFeeCollectors, reserveKit, zoe, contractKits: contractKitsP, }, produce: { feeDistributorKit, periodicFeeCollectors: periodicFeeCollectorsP, }, instance: { produce: { feeDistributor: feeDistributorP }, }, installation: { consume: { feeDistributor }, }, issuer: { consume: { [Stable.symbol]: centralIssuerP }, }, brand: { consume: { [Stable.symbol]: centralBrandP }, }, }: import("./econ-behaviors").EconomyBootstrapPowers, { options }: {
+    options: {
+        keywordShares: Record<string, bigint>;
+        collectionInterval: bigint;
+    };
+}): Promise<void>;
+export function getManifestForReplaceFeeDistributor(_: any, feeDistributorOptions: any): Promise<{
+    manifest: {
+        [x: string]: {
+            consume: {
+                chainTimerService: string;
+                bankManager: string;
+                vaultFactoryKit: string;
+                periodicFeeCollectors: string;
+                reserveKit: string;
+                zoe: string;
+                contractKits: string;
+            };
+            produce: {
+                feeDistributorKit: string;
+                periodicFeeCollectors: string;
+            };
+            instance: {
+                produce: {
+                    feeDistributor: string;
+                };
+            };
+            installation: {
+                consume: {
+                    feeDistributor: string;
+                };
+            };
+            issuer: {
+                consume: {
+                    IST: string;
+                };
+            };
+            brand: {
+                consume: {
+                    IST: string;
+                };
+            };
+        };
+    };
+    options: any;
+}>;
+import { Stable } from '@agoric/internal/src/tokens.js';
+//# sourceMappingURL=replace-fee-distributor.d.ts.map

package/src/proposals/replace-fee-distributor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"replace-fee-distributor.d.ts","sourceRoot":"","sources":["replace-fee-distributor.js"],"names":[],"mappings":"AAkBO,geARI,OAAO,kBAAkB,EAAE,sBAAsB,eACjD;IACN,OAAO,EAAE;QACP,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACtC,kBAAkB,EAAE,MAAM,CAAC;KAC5B,CAAC;CACH,iBA4IH;AAIM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCL;uBAjMqB,gCAAgC"}

package/src/proposals/replace-fee-distributor.js

@@ -0,0 +1,195 @@
+import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
+import { Stable } from '@agoric/internal/src/tokens.js';
+import { makeScalarBigMapStore } from '@agoric/vat-data';
+import { getInterfaceOf, E } from '@endo/far';
+
+const trace = makeTracer('ReplaceFeeDistributer', true);
+
+/**
+ * Start the reward distributor.
+ *
+ * @param {import('./econ-behaviors').EconomyBootstrapPowers} powers
+ * @param {{
+ *   options: {
+ *     keywordShares: Record<string, bigint>;
+ *     collectionInterval: bigint;
+ *   };
+ * }} options
+ */
+export const replaceFeeDistributor = async (
+  {
+    consume: {
+      chainTimerService,
+      bankManager,
+      vaultFactoryKit,
+      periodicFeeCollectors,
+      reserveKit,
+      zoe,
+      contractKits: contractKitsP,
+    },
+    produce: {
+      feeDistributorKit,
+      periodicFeeCollectors: periodicFeeCollectorsP,
+    },
+    instance: {
+      produce: { feeDistributor: feeDistributorP },
+    },
+    installation: {
+      consume: { feeDistributor },
+    },
+    issuer: {
+      consume: { [Stable.symbol]: centralIssuerP },
+    },
+    brand: {
+      consume: { [Stable.symbol]: centralBrandP },
+    },
+  },
+  { options },
+) => {
+  trace('replaceFeeDistributer', options);
+
+  const { keywordShares, collectionInterval } = options;
+
+  const feeDistributorTerms = await deeplyFulfilledObject(
+    harden({
+      timerService: chainTimerService,
+      collectionInterval,
+      keywordShares,
+    }),
+  );
+  trace('feeDistributorTerms', feeDistributorTerms);
+
+  const [centralIssuer, centralBrand, contractKits] = await Promise.all([
+    centralIssuerP,
+    centralBrandP,
+    contractKitsP,
+  ]);
+
+  const rewardDistributorDepositFacet = await E(bankManager)
+    .getRewardDistributorDepositFacet(Stable.denom, {
+      issuer: centralIssuer,
+      brand: centralBrand,
+    })
+    .catch(e => {
+      console.error('Cannot create fee collector deposit facet', e);
+      return undefined;
+    });
+
+  /**
+   * @type {StartedInstanceKit<
+   *   typeof import('@agoric/inter-protocol/src/feeDistributor.js').start
+   * >}
+   */
+  const instanceKit = await E(zoe).startInstance(
+    feeDistributor,
+    { Fee: centralIssuer },
+    feeDistributorTerms,
+    undefined,
+    'feeDistributor',
+  );
+  await E(instanceKit.creatorFacet).setDestinations({
+    ...(rewardDistributorDepositFacet && {
+      RewardDistributor: E(
+        instanceKit.creatorFacet,
+      ).makeDepositFacetDestination(rewardDistributorDepositFacet),
+    }),
+    Reserve: E(instanceKit.creatorFacet).makeOfferDestination(
+      zoe,
+      'Collateral',
+      E.get(reserveKit).publicFacet,
+      'makeAddCollateralInvitation',
+    ),
+  });
+
+  trace('Clearing the old instance from bootstrap powers...');
+  feeDistributorKit.reset();
+  feeDistributorP.reset();
+
+  trace('Now introduce the new instance');
+  feeDistributorKit.resolve(
+    harden({ ...instanceKit, label: 'feeDistributor' }),
+  );
+  feeDistributorP.resolve(instanceKit.instance);
+
+  const periodicCollectors = await periodicFeeCollectors;
+  trace(
+    `Stop periodicCollectors of the old instance. Number of collectors: ${periodicCollectors.getSize()}`,
+  );
+  for await (const [key, collector] of periodicCollectors.entries()) {
+    trace('Getting debugName', key);
+    // @ts-expect-error incomplete PeriodicFeeCollector type
+    const debugName = await E(collector).getDebugName();
+    trace(`Stopping ${debugName}...`);
+    await E(collector).stop();
+  }
+  periodicFeeCollectorsP.reset();
+
+  trace('Old collectors cleared. Start creating and setting new ones.');
+
+  const collectorKit = {
+    vaultFactory: E.get(vaultFactoryKit).creatorFacet,
+  };
+  const newCollectorStore = makeScalarBigMapStore('periodicCollectors', {
+    durable: true,
+  });
+  await Promise.all(
+    Object.entries(collectorKit).map(async ([debugName, collectorFacet]) => {
+      const collector = E(instanceKit.creatorFacet).makeContractFeeCollector(
+        zoe,
+        collectorFacet,
+      );
+      const periodicCollector = await E(
+        instanceKit.creatorFacet,
+      ).startPeriodicCollection(debugName, collector);
+      newCollectorStore.init(periodicCollectors.getSize(), periodicCollector);
+    }),
+  );
+
+  trace('Write newCollectorStore in periodicFeeCollectors');
+  periodicFeeCollectorsP.resolve(newCollectorStore);
+
+  trace('Write to contractKits');
+  const label = getInterfaceOf(instanceKit.instance);
+  const kit = harden({ ...instanceKit, label });
+  contractKits.init(kit.instance, kit);
+
+  trace('Done.');
+};
+harden(replaceFeeDistributor);
+
+const t = 'replaceFeeDistributor';
+export const getManifestForReplaceFeeDistributor = async (
+  _,
+  feeDistributorOptions,
+) => ({
+  manifest: {
+    [replaceFeeDistributor.name]: {
+      consume: {
+        chainTimerService: t,
+        bankManager: t,
+        vaultFactoryKit: t,
+        periodicFeeCollectors: t,
+        reserveKit: t,
+        zoe: t,
+        contractKits: t,
+      },
+      produce: {
+        feeDistributorKit: t,
+        periodicFeeCollectors: t,
+      },
+      instance: {
+        produce: { feeDistributor: t },
+      },
+      installation: {
+        consume: { feeDistributor: t },
+      },
+      issuer: {
+        consume: { [Stable.symbol]: t },
+      },
+      brand: {
+        consume: { [Stable.symbol]: t },
+      },
+    },
+  },
+  options: { ...feeDistributorOptions },
+});