@agoric/inter-protocol 0.14.1-dev-bf164a0.0 → 0.14.1-dev-4a0bf28.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.14.1-dev-bf164a0.0+bf164a0",
+  "version": "0.14.1-dev-4a0bf28.0+4a0bf28",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -29,29 +29,29 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-bf164a0.0+bf164a0",
-    "@agoric/ertp": "0.16.1-dev-bf164a0.0+bf164a0",
-    "@agoric/governance": "0.10.1-dev-bf164a0.0+bf164a0",
-    "@agoric/internal": "0.3.1-dev-bf164a0.0+bf164a0",
-    "@agoric/notifier": "0.6.1-dev-bf164a0.0+bf164a0",
-    "@agoric/store": "0.9.1-dev-bf164a0.0+bf164a0",
-    "@agoric/time": "0.3.1-dev-bf164a0.0+bf164a0",
-    "@agoric/vat-data": "0.5.1-dev-bf164a0.0+bf164a0",
-    "@agoric/vats": "0.14.1-dev-bf164a0.0+bf164a0",
-    "@agoric/zoe": "0.26.1-dev-bf164a0.0+bf164a0",
+    "@agoric/assert": "0.6.1-dev-4a0bf28.0+4a0bf28",
+    "@agoric/ertp": "0.16.1-dev-4a0bf28.0+4a0bf28",
+    "@agoric/governance": "0.10.1-dev-4a0bf28.0+4a0bf28",
+    "@agoric/internal": "0.3.1-dev-4a0bf28.0+4a0bf28",
+    "@agoric/notifier": "0.6.1-dev-4a0bf28.0+4a0bf28",
+    "@agoric/store": "0.9.1-dev-4a0bf28.0+4a0bf28",
+    "@agoric/time": "0.3.1-dev-4a0bf28.0+4a0bf28",
+    "@agoric/vat-data": "0.5.1-dev-4a0bf28.0+4a0bf28",
+    "@agoric/vats": "0.14.1-dev-4a0bf28.0+4a0bf28",
+    "@agoric/zoe": "0.26.1-dev-4a0bf28.0+4a0bf28",
     "@endo/captp": "^3.1.1",
     "@endo/eventual-send": "^0.17.2",
     "@endo/far": "^0.2.18",
     "@endo/marshal": "^0.8.5",
     "@endo/nat": "^4.1.27",
-    "agoric": "0.19.1-dev-bf164a0.0+bf164a0",
+    "agoric": "0.19.1-dev-4a0bf28.0+4a0bf28",
     "jessie.js": "^0.3.2"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.10.1-dev-bf164a0.0+bf164a0",
-    "@agoric/smart-wallet": "0.5.1-dev-bf164a0.0+bf164a0",
-    "@agoric/swingset-liveslots": "0.10.1-dev-bf164a0.0+bf164a0",
-    "@agoric/swingset-vat": "0.32.1-dev-bf164a0.0+bf164a0",
+    "@agoric/deploy-script-support": "0.10.1-dev-4a0bf28.0+4a0bf28",
+    "@agoric/smart-wallet": "0.5.1-dev-4a0bf28.0+4a0bf28",
+    "@agoric/swingset-liveslots": "0.10.1-dev-4a0bf28.0+4a0bf28",
+    "@agoric/swingset-vat": "0.32.1-dev-4a0bf28.0+4a0bf28",
     "@endo/bundle-source": "^2.5.1",
     "@endo/init": "^0.5.56",
     "@endo/promise-kit": "^0.2.56",
@@ -79,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bf164a05f425460ad357841b537b8dbc044357a2"
+  "gitHead": "4a0bf28cfbdaa4475b44332182f28ae948684f98"
 }

package/src/clientSupport.js

@@ -142,13 +142,13 @@ export const lookupOfferIdForVault = async (vaultId, currentP) => {
 
 /**
  * @param {Record<string, Brand>} brands
- * @param {({ wantMinted: number | undefined, giveMinted: number | undefined })} opts
+ * @param {({ wantMinted: number, giveMinted?: undefined } | { giveMinted: number, wantMinted?: undefined })} opts
  * @param {number} [fee=0]
  * @param {string} [anchor]
  * @returns {Proposal} XXX not a real proposal, uses BoardRemote
  */
 const makePsmProposal = (brands, opts, fee = 0, anchor = 'AUSD') => {
-  const giving = opts.giveMinted ? 'minted' : 'anchor';
+  const giving = 'giveMinted' in opts ? 'minted' : 'anchor';
   const brand =
     giving === 'anchor'
       ? { in: brands[anchor], out: brands.IST }
@@ -173,14 +173,15 @@ const makePsmProposal = (brands, opts, fee = 0, anchor = 'AUSD') => {
 /**
  * @param {Instance} instance
  * @param {Record<string, Brand>} brands
- * @param {{ offerId: number, feePct?: number } &
- *         ({ wantMinted: number | undefined, giveMinted: number | undefined, pair: [string, string] })} opts
+ * @param {{ offerId: string, feePct?: number, pair: [string, string] } &
+ *         ({ wantMinted: number } | { giveMinted: number })} opts
  * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
  */
 const makePsmSwapOffer = (instance, brands, opts) => {
-  const method = opts.wantMinted
-    ? 'makeWantMintedInvitation'
-    : 'makeGiveMintedInvitation'; // ref psm.js
+  const method =
+    'wantMinted' in opts
+      ? 'makeWantMintedInvitation'
+      : 'makeGiveMintedInvitation'; // ref psm.js
   const proposal = makePsmProposal(
     brands,
     opts,
@@ -305,10 +306,81 @@ const makeAddCollateralOffer = (brands, opts) => {
   return offerSpec;
 };
 
+/**
+ *
+ * @param {Record<string, Brand>} _brands
+ * @param {{
+ *   offerId: string,
+ *   roundId?: bigint,
+ *   unitPrice: bigint,
+ * }} opts
+ * @param {string} previousOffer
+ * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ */
+const makePushPriceOffer = (_brands, opts, previousOffer) => {
+  return {
+    id: opts.offerId,
+    invitationSpec: {
+      source: 'continuing',
+      previousOffer,
+      invitationMakerName: 'PushPrice',
+      invitationArgs: harden([
+        { unitPrice: opts.unitPrice, roundId: opts.roundId },
+      ]),
+    },
+    proposal: {},
+  };
+};
+
+// TODO DRY with CLI wallet.js
+/**
+ * @param {{
+ *   brand: Record<string, Brand>,
+ *   vbankAsset: Record<string, { brand: Brand, displayInfo: DisplayInfo }>,
+ * }} agoricNames
+ * @param {(msg: string) => Error} makeError error constructor
+ * @returns {(a: string) => Amount<'nat'>}
+ */
+export const makeParseAmount =
+  (agoricNames, makeError = msg => RangeError(msg)) =>
+  opt => {
+    assert.typeof(opt, 'string', 'parseAmount expected string');
+    const m = opt.match(/^(?<value>[\d_]+(\.[\d_]+)?)(?<brand>[A-Z]\w*?)$/);
+    if (!m || !m.groups) {
+      throw makeError(`invalid amount: ${opt}`);
+    }
+    const anyBrand = agoricNames.brand[m.groups.brand];
+    if (!anyBrand) {
+      throw makeError(`unknown brand: ${m.groups.brand}`);
+    }
+    const assetDesc = Object.values(agoricNames.vbankAsset).find(
+      d => d.brand === anyBrand,
+    );
+    if (!assetDesc) {
+      throw makeError(`unknown brand: ${m.groups.brand}`);
+    }
+    const { displayInfo } = assetDesc;
+    if (!displayInfo.decimalPlaces || displayInfo.assetKind !== 'nat') {
+      throw makeError(`bad brand: ${displayInfo}`);
+    }
+    const value = BigInt(
+      Number(m.groups.value.replace(/_/g, '')) *
+        10 ** displayInfo.decimalPlaces,
+    );
+    /** @type {Brand<'nat'>} */
+    // @ts-expect-error dynamic cast
+    const natBrand = anyBrand;
+    const amt = { value, brand: natBrand };
+    return amt;
+  };
+
 export const Offers = {
   auction: {
     Bid: makeBidOffer,
   },
+  fluxAggregator: {
+    PushPrice: makePushPriceOffer,
+  },
   psm: {
     // lowercase because it's not an invitation name. Instead it's an abstraction over two invitation makers.
     swap: makePsmSwapOffer,

package/src/price/fluxAggregatorContract.js

@@ -15,7 +15,7 @@ import { E } from '@endo/eventual-send';
 import { reserveThenDeposit } from '../proposals/utils.js';
 import { prepareFluxAggregatorKit } from './fluxAggregatorKit.js';
 
-const trace = makeTracer('FluxAgg');
+const trace = makeTracer('FluxAgg', false);
 /**
  * @typedef {import('@agoric/vat-data').Baggage} Baggage
  * @typedef {import('@agoric/time/src/types').TimerService} TimerService

package/src/price/fluxAggregatorKit.js

@@ -189,6 +189,7 @@ export const prepareFluxAggregatorKit = async (
     priceAuthority.makeQuoteNotifier(unitAmountIn, brandOut),
     {
       updateState: quote => {
+        trace('new quote', quote);
         void priceKit.recorder.write(priceDescriptionFromQuote(quote));
       },
       fail: reason => {

package/src/price/roundsManager.js

@@ -1,5 +1,6 @@
 import { Fail, q } from '@agoric/assert';
 import { AmountMath } from '@agoric/ertp';
+import { makeTracer } from '@agoric/internal';
 import { TimeMath } from '@agoric/time';
 import { M, makeScalarBigMapStore, prepareExoClassKit } from '@agoric/vat-data';
 import {
@@ -25,6 +26,8 @@ const V3_NO_DATA_ERROR = 'No data present';
 /** @type {bigint} */
 export const ROUND_MAX = BigInt(2 ** 32 - 1);
 
+const trace = makeTracer('RoundsM', false);
+
 /**
  * @param {bigint} roundId
  */
@@ -290,6 +293,7 @@ export const prepareRoundsManagerKit = baggage =>
          * @returns {OracleStatus} the new status
          */
         recordSubmission(submission, roundId, status) {
+          trace('recordSubmission', submission, roundId, status);
           const { helper } = this.facets;
           const { details } = this.state;
           helper.acceptingSubmissions(roundId) ||
@@ -670,6 +674,7 @@ export const prepareRoundsManagerKit = baggage =>
           status,
           { roundId: roundIdRaw = undefined, unitPrice: valueRaw },
         ) {
+          trace('handlePush', status, roundIdRaw, valueRaw);
           const value = Nat(valueRaw);
           const { minSubmissionValue, maxSubmissionValue, timerPresence } =
             this.state;
@@ -681,6 +686,7 @@ export const prepareRoundsManagerKit = baggage =>
             Fail`value above maxSubmissionValue ${q(maxSubmissionValue)}`;
 
           const blockTimestamp = await E(timerPresence).getCurrentTimestamp();
+          trace('handlePush blockTimestamp', blockTimestamp.absValue);
 
           let roundId;
           if (roundIdRaw === undefined) {
@@ -719,6 +725,8 @@ export const prepareRoundsManagerKit = baggage =>
           helper.updateRoundAnswer(roundId, blockTimestamp);
           helper.deleteRoundDetails(roundId);
 
+          trace('handlePush returning', settledStatus);
+
           return settledStatus;
         },
       },

package/src/proposals/econ-behaviors.js

@@ -17,6 +17,7 @@ import { makeGovernedTerms as makeGovernedVFTerms } from '../vaultFactory/params
 
 const trace = makeTracer('RunEconBehaviors', true);
 
+export const SECONDS_PER_MINUTE = 60n;
 export const SECONDS_PER_HOUR = 60n * 60n;
 export const SECONDS_PER_DAY = 24n * SECONDS_PER_HOUR;
 export const SECONDS_PER_WEEK = 7n * SECONDS_PER_DAY;
@@ -411,7 +412,7 @@ export const startRewardDistributor = async ({
   const feeDistributorTerms = await deeplyFulfilledObject(
     harden({
       timerService,
-      collectionInterval: 60n * 60n, // 1 hour
+      collectionInterval: 1n * SECONDS_PER_HOUR,
       keywordShares: {
         RewardDistributor: 0n,
         Reserve: 1n,
@@ -523,13 +524,13 @@ export const startAuctioneer = async (
   },
   {
     auctionParams = {
-      StartFrequency: 3600n,
-      ClockStep: 3n * 60n,
+      StartFrequency: 1n * SECONDS_PER_HOUR,
+      ClockStep: 3n * SECONDS_PER_MINUTE,
       StartingRate: 10500n,
       LowestRate: 6500n,
       DiscountStep: 500n,
       AuctionStartDelay: 2n,
-      PriceLockPeriod: 30n * 60n, // half an hour
+      PriceLockPeriod: SECONDS_PER_HOUR / 2n,
     },
   } = {},
 ) => {

package/src/vaultFactory/liquidation.js

@@ -157,7 +157,12 @@ const setWakeupsForNextAuction = async (
     E(timer).getCurrentTimestamp(),
   ]);
 
-  trace('SCHEDULE', now.absValue, nextAuctionSchedule);
+  trace(
+    'setWakeupsForNextAuction at',
+    now.absValue,
+    'with',
+    nextAuctionSchedule,
+  );
   if (!nextAuctionSchedule) {
     // There should always be a nextAuctionSchedule. If there isn't, give up for now.
     cancelWakeups(timer);