@agoric/inter-protocol 0.16.2-dev-a0c5f45.0 → 0.16.2-dev-3e909dc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.16.2-dev-a0c5f45.0+a0c5f45",
+  "version": "0.16.2-dev-3e909dc.0+3e909dc",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -31,28 +31,29 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-a0c5f45.0+a0c5f45",
-    "@agoric/ertp": "0.16.3-dev-a0c5f45.0+a0c5f45",
-    "@agoric/governance": "0.10.4-dev-a0c5f45.0+a0c5f45",
-    "@agoric/internal": "0.3.3-dev-a0c5f45.0+a0c5f45",
-    "@agoric/notifier": "0.6.3-dev-a0c5f45.0+a0c5f45",
-    "@agoric/store": "0.9.3-dev-a0c5f45.0+a0c5f45",
-    "@agoric/time": "0.3.3-dev-a0c5f45.0+a0c5f45",
-    "@agoric/vat-data": "0.5.3-dev-a0c5f45.0+a0c5f45",
-    "@agoric/vats": "0.15.2-dev-a0c5f45.0+a0c5f45",
-    "@agoric/zoe": "0.26.3-dev-a0c5f45.0+a0c5f45",
+    "@agoric/assert": "0.6.1-dev-3e909dc.0+3e909dc",
+    "@agoric/ertp": "0.16.3-dev-3e909dc.0+3e909dc",
+    "@agoric/governance": "0.10.4-dev-3e909dc.0+3e909dc",
+    "@agoric/internal": "0.3.3-dev-3e909dc.0+3e909dc",
+    "@agoric/notifier": "0.6.3-dev-3e909dc.0+3e909dc",
+    "@agoric/store": "0.9.3-dev-3e909dc.0+3e909dc",
+    "@agoric/time": "0.3.3-dev-3e909dc.0+3e909dc",
+    "@agoric/vat-data": "0.5.3-dev-3e909dc.0+3e909dc",
+    "@agoric/vats": "0.15.2-dev-3e909dc.0+3e909dc",
+    "@agoric/zoe": "0.26.3-dev-3e909dc.0+3e909dc",
     "@endo/captp": "^3.1.4",
     "@endo/eventual-send": "^0.17.5",
     "@endo/far": "^0.2.21",
     "@endo/marshal": "^0.8.8",
     "@endo/nat": "^4.1.30",
+    "@endo/promise-kit": "^0.2.59",
     "jessie.js": "^0.3.2"
   },
   "devDependencies": {
-    "@agoric/smart-wallet": "0.5.4-dev-a0c5f45.0+a0c5f45",
-    "@agoric/swingset-liveslots": "0.10.3-dev-a0c5f45.0+a0c5f45",
-    "@agoric/swingset-vat": "0.32.3-dev-a0c5f45.0+a0c5f45",
-    "@agoric/zone": "0.2.3-dev-a0c5f45.0+a0c5f45",
+    "@agoric/smart-wallet": "0.5.4-dev-3e909dc.0+3e909dc",
+    "@agoric/swingset-liveslots": "0.10.3-dev-3e909dc.0+3e909dc",
+    "@agoric/swingset-vat": "0.32.3-dev-3e909dc.0+3e909dc",
+    "@agoric/zone": "0.2.3-dev-3e909dc.0+3e909dc",
     "@endo/bundle-source": "^2.7.0",
     "@endo/init": "^0.5.59",
     "@endo/promise-kit": "^0.2.59",
@@ -84,5 +85,5 @@
   "typeCoverage": {
     "atLeast": 93.45
   },
-  "gitHead": "a0c5f45598785cdb60fb472649eecdcd13f05108"
+  "gitHead": "3e909dcf51841f5c062c6f31bc89cacae18394ff"
 }

package/src/proposals/addAssetToVault.d.ts

@@ -1,5 +1,5 @@
 export * from "./startPSM.js";
-export function publishInterchainAssetFromBoardId({ consume: { board, agoricNamesAdmin } }: EconomyBootstrapPowers, { options: { interchainAssetOptions } }: {
+export function publishInterchainAssetFromBoardId({ consume: { board, agoricNamesAdmin } }: BootstrapPowers, { options: { interchainAssetOptions } }: {
     options: {
         interchainAssetOptions: InterchainAssetOptions;
     };
@@ -14,7 +14,7 @@ export function registerScaledPriceAuthority({ consume: { agoricNamesAdmin, star
         interchainAssetOptions: InterchainAssetOptions;
     };
 }): Promise<void>;
-export function addAssetToVault({ consume: { vaultFactoryKit, agoricNamesAdmin, auctioneerKit }, brand: { consume: { [Stable.symbol]: stableP }, }, instance: { consume: consumeInstance }, }: EconomyBootstrapPowers, { options: { debtLimitValue, interestRateValue, interchainAssetOptions, }, }: {
+export function addAssetToVault({ consume: { vaultFactoryKit, agoricNamesAdmin, auctioneerKit, chainTimerService, }, brand: { consume: { [Stable.symbol]: stableP }, }, instance: { consume: consumeInstance }, }: EconomyBootstrapPowers, { options: { debtLimitValue, interestRateValue, interchainAssetOptions, }, }: {
     options: {
         interchainAssetOptions: InterchainAssetOptions;
         debtLimitValue: bigint | number | string;
@@ -41,6 +41,7 @@ export function getManifestForAddAssetToVault({ restoreRef }: {
                 priceAuthority?: undefined;
                 auctioneerKit?: undefined;
                 vaultFactoryKit?: undefined;
+                chainTimerService?: undefined;
             };
             produce?: undefined;
             installation?: undefined;
@@ -57,6 +58,7 @@ export function getManifestForAddAssetToVault({ restoreRef }: {
                 priceAuthority?: undefined;
                 auctioneerKit?: undefined;
                 vaultFactoryKit?: undefined;
+                chainTimerService?: undefined;
             };
             produce: {
                 bankMints: boolean;
@@ -82,6 +84,7 @@ export function getManifestForAddAssetToVault({ restoreRef }: {
                 reserveKit?: undefined;
                 auctioneerKit?: undefined;
                 vaultFactoryKit?: undefined;
+                chainTimerService?: undefined;
             };
             produce: {
                 scaledPriceAuthorityKits: boolean;
@@ -101,6 +104,7 @@ export function getManifestForAddAssetToVault({ restoreRef }: {
                 auctioneerKit: string;
                 vaultFactoryKit: string;
                 agoricNamesAdmin: boolean;
+                chainTimerService: boolean;
                 board?: undefined;
                 bankManager?: undefined;
                 reserveKit?: undefined;

package/src/proposals/addAssetToVault.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addAssetToVault.d.ts","sourceRoot":"","sources":["addAssetToVault.js"],"names":[],"mappings":";AAgCO,4FALI,sBAAsB;IAEP,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;;0BAuBhC;AAQM,yKALI,sBAAsB;IAEP,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;;kBAoDhC;AAQM,wIALI,eAAe;IAEA,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;;kBAmGhC;AAYM,+LAPI,sBAAsB;IAEP,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;QACmB,cAAc,EAAvD,MAAM,GAAG,MAAM,GAAG,MAAM;QACD,iBAAiB,EAAxC,MAAM;;kBAuDhB;AAEM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6EN;;;;;;;;aAtVa,MAAM;;;;;;;;;;;;;;;;qCAwMN,OAAO,qBAAqB,EAAE,sBAAsB;uBAnN3C,gCAAgC"}
+{"version":3,"file":"addAssetToVault.d.ts","sourceRoot":"","sources":["addAssetToVault.js"],"names":[],"mappings":";AA0CO,4FALI,eAAe;IAEA,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;;0BAuBhC;AAQM,yKALI,sBAAsB;IAEP,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;;kBAoDhC;AAQM,wIALI,eAAe;IAEA,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;;kBAmGhC;AA+EM,mNAPI,sBAAsB;IAEP,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;QACmB,cAAc,EAAvD,MAAM,GAAG,MAAM,GAAG,MAAM;QACD,iBAAiB,EAAxC,MAAM;;kBAwEhB;AAEM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8EN;;;;;;;;aA7aa,MAAM;;;;;;;;;;;;;;;;qCAQN,OAAO,qBAAqB,EAAE,sBAAsB;uBAxB3C,gCAAgC"}

package/src/proposals/addAssetToVault.js

@@ -1,16 +1,24 @@
 // @jessie-check
+// @ts-check
 
+import { ToFarFunction } from '@endo/captp';
+import { Far } from '@endo/marshal';
 import { AmountMath, AssetKind } from '@agoric/ertp';
 import { deeplyFulfilledObject } from '@agoric/internal';
 import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
 import { parseRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
 import { E } from '@endo/far';
 import { Stable } from '@agoric/internal/src/tokens.js';
+import { TimeMath } from '@agoric/time/src/timeMath.js';
+import { makePromiseKit } from '@endo/promise-kit';
+
 import { instanceNameFor } from './price-feed-proposal.js';
 import { reserveThenGetNames } from './utils.js';
 
 export * from './startPSM.js';
 
+const { quote: q } = assert;
+
 /**
  * @typedef {object} InterchainAssetOptions
  * @property {string} [issuerBoardId]
@@ -24,8 +32,10 @@ export * from './startPSM.js';
  * @property {number} [initialPrice]
  */
 
+/** @typedef {import('./econ-behaviors.js').EconomyBootstrapPowers} EconomyBootstrapPowers */
+
 /**
- * @param {EconomyBootstrapPowers} powers
+ * @param {BootstrapPowers} powers
  * @param {object} config
  * @param {object} config.options
  * @param {InterchainAssetOptions} config.options.interchainAssetOptions
@@ -216,7 +226,74 @@ export const registerScaledPriceAuthority = async (
   );
 };
 
-/** @typedef {import('./econ-behaviors.js').EconomyBootstrapPowers} EconomyBootstrapPowers */
+// wait a short while after end to allow things to settle
+const BUFFER = 5n * 60n;
+// let's insist on 20 minutes leeway for running the scripts
+const COMPLETION = 20n * 60n;
+
+/**
+ * This function works around an issue identified in #8307 and #8296, and fixed
+ * in #8301. The fix is needed until #8301 makes it into production.
+ *
+ * If there is a liveSchedule, 1) run now if start is far enough away,
+ * otherwise, 2) run after endTime. If neither liveSchedule nor nextSchedule is
+ * defined, 3) run now. If there is only a nextSchedule, 4) run now if startTime
+ * is far enough away, else 5) run after endTime
+ *
+ * @param {import('../auction/scheduler.js').FullSchedule} schedules
+ * @param {ERef<import('@agoric/time/src/types').TimerService>} timer
+ * @param {() => void} thunk
+ */
+const whenQuiescent = async (schedules, timer, thunk) => {
+  const { nextAuctionSchedule, liveAuctionSchedule } = schedules;
+  const now = await E(timer).getCurrentTimestamp();
+
+  const waker = Far('addAssetWaker', { wake: () => thunk() });
+
+  if (liveAuctionSchedule) {
+    const safeStart = TimeMath.subtractAbsRel(
+      liveAuctionSchedule.startTime,
+      COMPLETION,
+    );
+
+    if (TimeMath.compareAbs(safeStart, now) < 0) {
+      // case 2
+      console.warn(
+        `Add Asset after live schedule's endtime: ${q(
+          liveAuctionSchedule.endTime,
+        )}`,
+      );
+
+      return E(timer).setWakeup(
+        TimeMath.addAbsRel(liveAuctionSchedule.endTime, BUFFER),
+        waker,
+      );
+    }
+  }
+
+  if (!liveAuctionSchedule && nextAuctionSchedule) {
+    const safeStart = TimeMath.subtractAbsRel(
+      nextAuctionSchedule.startTime,
+      COMPLETION,
+    );
+    if (TimeMath.compareAbs(safeStart, now) < 0) {
+      // case 5
+      console.warn(
+        `Add Asset after next schedule's endtime: ${q(
+          nextAuctionSchedule.endTime,
+        )}`,
+      );
+      return E(timer).setWakeup(
+        TimeMath.addAbsRel(nextAuctionSchedule.endTime, BUFFER),
+        waker,
+      );
+    }
+  }
+
+  // cases 1, 3, and 4 fall through to here.
+  console.warn(`Add Asset immediately`, thunk);
+  return thunk();
+};
 
 /**
  * @param {EconomyBootstrapPowers} powers
@@ -228,7 +305,12 @@ export const registerScaledPriceAuthority = async (
  */
 export const addAssetToVault = async (
   {
-    consume: { vaultFactoryKit, agoricNamesAdmin, auctioneerKit },
+    consume: {
+      vaultFactoryKit,
+      agoricNamesAdmin,
+      auctioneerKit,
+      chainTimerService,
+    },
     brand: {
       consume: { [Stable.symbol]: stableP },
     },
@@ -263,6 +345,20 @@ export const addAssetToVault = async (
   // eslint-disable-next-line no-restricted-syntax -- allow this computed property
   await consumeInstance[oracleInstanceName];
 
+  const auctioneerCreator = E.get(auctioneerKit).creatorFacet;
+  const schedules = await E(auctioneerCreator).getSchedule();
+
+  const finishPromiseKit = makePromiseKit();
+  const addBrandThenResolve = ToFarFunction('addBrandThenResolve', async () => {
+    await E(auctioneerCreator).addBrand(interchainIssuer, keyword);
+    finishPromiseKit.resolve(undefined);
+  });
+
+  // schedules actions on a timer (or does it immediately).
+  // finishPromiseKit signals completion.
+  void whenQuiescent(schedules, chainTimerService, addBrandThenResolve);
+  await finishPromiseKit.promise;
+
   const stable = await stableP;
   const vaultFactoryCreator = E.get(vaultFactoryKit).creatorFacet;
   await E(vaultFactoryCreator).addVaultType(interchainIssuer, keyword, {
@@ -277,8 +373,6 @@ export const addAssetToVault = async (
     mintFee: makeRatio(50n, stable, 10_000n),
     liquidationPenalty: makeRatio(1n, stable),
   });
-  const auctioneerCreator = E.get(auctioneerKit).creatorFacet;
-  await E(auctioneerCreator).addBrand(interchainIssuer, keyword);
 };
 
 export const getManifestForAddAssetToVault = (
@@ -338,6 +432,7 @@ export const getManifestForAddAssetToVault = (
           auctioneerKit: 'auctioneer',
           vaultFactoryKit: 'vaultFactory',
           agoricNamesAdmin: true,
+          chainTimerService: true,
         },
         brand: {
           consume: { [Stable.symbol]: true },