Merge branch 'master' into gibson-7156-bootstrap-chainstorage-export

Agoric · Apr 25, 2023 · d375995 · d375995
2 parents 201d3e2 + bf2a9ff
commit d375995
Show file tree

Hide file tree

Showing 79 changed files with 1,241 additions and 446 deletions.
diff --git a/packages/ERTP/src/displayInfo.js b/packages/ERTP/src/displayInfo.js
@@ -1,3 +1,5 @@
+// @jessie-check
+
 import { Fail } from '@agoric/assert';
 import { mustMatch } from '@agoric/store';
 

diff --git a/packages/ERTP/src/index.js b/packages/ERTP/src/index.js
@@ -1,3 +1,5 @@
+// @jessie-check
+
 export * from './amountMath.js';
 export * from './issuerKit.js';
 export * from './typeGuards.js';
diff --git a/packages/ERTP/src/legacy-payment-helpers.js b/packages/ERTP/src/legacy-payment-helpers.js
@@ -1,3 +1,5 @@
+// @jessie-check
+
 import { mustMatch } from '@agoric/store';
 import { E } from '@endo/far';
 import { AmountMath } from './amountMath.js';

diff --git a/packages/ERTP/src/mathHelpers/copyBagMathHelpers.js b/packages/ERTP/src/mathHelpers/copyBagMathHelpers.js
@@ -1,3 +1,5 @@
+// @jessie-check
+
 import {
   keyEQ,
   makeCopyBag,

diff --git a/packages/ERTP/src/mathHelpers/copySetMathHelpers.js b/packages/ERTP/src/mathHelpers/copySetMathHelpers.js
@@ -1,3 +1,5 @@
+// @jessie-check
+
 import {
   keyEQ,
   makeCopySet,

diff --git a/packages/ERTP/src/mathHelpers/natMathHelpers.js b/packages/ERTP/src/mathHelpers/natMathHelpers.js
@@ -1,3 +1,5 @@
+// @jessie-check
+
 import { Nat, isNat } from '@endo/nat';
 
 import '../types-ambient.js';

diff --git a/packages/ERTP/src/mathHelpers/setMathHelpers.js b/packages/ERTP/src/mathHelpers/setMathHelpers.js
@@ -1,3 +1,5 @@
+// @jessie-check
+
 import { passStyleOf } from '@endo/marshal';
 import {
   assertKey,

diff --git a/packages/ERTP/src/payment.js b/packages/ERTP/src/payment.js
@@ -1,3 +1,5 @@
+// @jessie-check
+
 import { initEmpty } from '@agoric/store';
 import { prepareExoClass } from '@agoric/vat-data';
 

diff --git a/packages/ERTP/src/paymentLedger.js b/packages/ERTP/src/paymentLedger.js
@@ -1,3 +1,5 @@
+// @jessie-check
+
 /* eslint-disable no-use-before-define */
 import { isPromise } from '@endo/promise-kit';
 import { mustMatch, M, keyEQ } from '@agoric/store';

diff --git a/packages/ERTP/src/transientNotifier.js b/packages/ERTP/src/transientNotifier.js
@@ -1,3 +1,5 @@
+// @jessie-check
+
 import { makeScalarBigWeakMapStore } from '@agoric/vat-data';
 import { provideLazy } from '@agoric/store';
 import { makeNotifierKit } from '@agoric/notifier';

diff --git a/packages/ERTP/src/typeGuards.js b/packages/ERTP/src/typeGuards.js
@@ -1,3 +1,5 @@
+// @jessie-check
+
 import { M, matches } from '@agoric/store';
 
 export const BrandShape = M.remotable('Brand');

diff --git a/packages/ERTP/src/types-ambient.js b/packages/ERTP/src/types-ambient.js
@@ -1,3 +1,5 @@
+// @jessie-check
+
 /// <reference types="ses"/>
 
 /**

diff --git a/packages/SwingSet/src/kernel/kernel.js b/packages/SwingSet/src/kernel/kernel.js
@@ -1,6 +1,7 @@
 import { assert, Fail } from '@agoric/assert';
 import { isNat } from '@endo/nat';
 import { importBundle } from '@endo/import-bundle';
+import { makeUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
 import { assertKnownOptions } from '../lib/assertOptions.js';
 import { foreverPolicy } from '../lib/runPolicies.js';
 import { kser, kslot, makeError } from '../lib/kmarshal.js';
@@ -815,12 +816,11 @@ export default function buildKernel(
     const { meterID } = vatInfo;
     let computrons;
     const vatKeeper = kernelKeeper.provideVatKeeper(vatID);
-    const disconnectObject = {
-      name: 'vatUpgraded',
+    const disconnectionObject = makeUpgradeDisconnection(
       upgradeMessage,
-      incarnationNumber: vatKeeper.getIncarnationNumber(),
-    };
-    const disconnectionCapData = kser(disconnectObject);
+      vatKeeper.getIncarnationNumber(),
+    );
+    const disconnectionCapData = kser(disconnectionObject);
 
     /**
      * Terminate the vat and translate internal-delivery results into

diff --git a/packages/SwingSet/src/types-external.js b/packages/SwingSet/src/types-external.js
@@ -65,7 +65,7 @@ export {};
  * @typedef { import('@agoric/swingset-liveslots').Message } Message
  *
  * @typedef { 'none' | 'ignore' | 'logAlways' | 'logFailure' | 'panic' } ResolutionPolicy
- * @typedef {{ name: string, upgradeMessage: string, incarnationNumber: number }} DisconnectObject
+ * @typedef {import('@agoric/internal/src/upgrade-api.js').DisconnectionObject} DisconnectionObject
  *
  * @typedef { import('@agoric/swingset-liveslots').VatDeliveryObject } VatDeliveryObject
  * @typedef { import('@agoric/swingset-liveslots').VatDeliveryResult } VatDeliveryResult

diff --git a/packages/agoric-cli/src/commands/ec.js b/packages/agoric-cli/src/commands/ec.js
@@ -237,7 +237,9 @@ export const makeEconomicCommiteeCommand = (_logger, io = {}) => {
 
       const info = await readLatestHead(
         'published.committees.Economic_Committee.latestQuestion',
-      );
+      ).catch(err => {
+        throw new CommanderError(1, 'VSTORAGE_FAILURE', err.message);
+      });
       // XXX runtime shape-check
       const questionDesc = /** @type {any} */ (info);
 

diff --git a/packages/agoric-cli/src/commands/inter.js b/packages/agoric-cli/src/commands/inter.js
@@ -45,6 +45,8 @@ const bidInvitationShape = harden({
  * @param {AssetDescriptor[]} assets
  */
 const makeFormatters = assets => {
+  const r4 = x => Math.round(x * 10_000) / 10_000;
+
   const br = asBoardRemote;
   const fmtAmtTuple = makeAmountFormatter(assets);
 
@@ -56,11 +58,11 @@ const makeFormatters = assets => {
   const price = r => {
     const [nl, nm] = fmtAmtTuple(br(r.numerator));
     const [dl, dm] = fmtAmtTuple(br(r.denominator));
-    return `${Number(nm) / Number(dm)} ${nl}/${dl}`;
+    return `${r4(Number(nm) / Number(dm))} ${nl}/${dl}`;
   };
   /** @param {Ratio} r */
   const discount = r =>
-    100 - (Number(r.numerator.value) / Number(r.denominator.value)) * 100;
+    r4(100 - (Number(r.numerator.value) / Number(r.denominator.value)) * 100);
 
   /** @param {import('@agoric/time/src/types.js').TimestampRecord} tr */
   const absTime = tr => new Date(Number(tr.absValue) * 1000).toISOString();
@@ -146,7 +148,7 @@ export const fmtBid = (bid, assets) => {
 
   const {
     id,
-    proposal: { give },
+    proposal: { give, want },
     offerArgs: { maxBuy },
     payouts,
     result,
@@ -156,6 +158,7 @@ export const fmtBid = (bid, assets) => {
     !error && result && result !== 'UNPUBLISHED' ? { result } : {};
   const props = {
     ...(give ? { give: fmt.record(give) } : {}),
+    ...(want ? { give: fmt.record(want) } : {}),
     ...(maxBuy ? { maxBuy: fmt.amount(maxBuy) } : {}),
     ...(payouts ? { payouts: fmt.record(payouts) } : resultProp),
     ...(error ? { error } : {}),

diff --git a/packages/agoric-cli/src/lib/format.js b/packages/agoric-cli/src/lib/format.js
@@ -75,12 +75,18 @@ export const asPercent = ratio => {
   return (100 * Number(numerator.value)) / Number(denominator.value);
 };
 
+const { Fail, quote: q } = assert;
+
+const isObject = x => typeof x === 'object' && x !== null;
+
 /**
  * @param {Amount} x
  * @returns {Amount & { brand: BoardRemote }}
  */
 export const asBoardRemote = x => {
-  assert('getBoardId' in x.brand);
+  isObject(x) || Fail`not object: ${q(x)}`;
+  isObject(x.brand) || Fail`not object: ${q(x.brand)}`;
+  'getBoardId' in x.brand || Fail`missing getBoardId: ${q(x.brand)}`;
   // @ts-expect-error dynamic check
   return x;
 };

diff --git a/packages/agoric-cli/src/lib/rpc.js b/packages/agoric-cli/src/lib/rpc.js
@@ -71,9 +71,21 @@ export const makeVStorage = (powers, config = networkConfig) => {
     `/abci_query?path=%22/custom/vstorage/${kind}/${path}%22&height=${height}`;
 
   const readStorage = (path = 'published', { kind = 'children', height = 0 }) =>
-    getJSON(url(path, { kind, height })).catch(err => {
-      throw Error(`cannot read ${kind} of ${path}: ${err.message}`);
-    });
+    getJSON(url(path, { kind, height }))
+      .catch(err => {
+        throw Error(`cannot read ${kind} of ${path}: ${err.message}`);
+      })
+      .then(data => {
+        const {
+          result: { response },
+        } = data;
+        if (response?.code !== 0) {
+          throw Error(
+            `error code ${response?.code} reading ${kind} of ${path}: ${response.log}`,
+          );
+        }
+        return data;
+      });
 
   return {
     url,

diff --git a/packages/agoric-cli/test/snapshots/test-inter-cli.js.md b/packages/agoric-cli/test/snapshots/test-inter-cli.js.md
@@ -73,7 +73,7 @@ Generated by [AVA](https://avajs.dev).
       --maxBuy <amount>       max Collateral wanted (default: "1_000_000IbcATOM")␊
       --wantMinimum <amount>  only transact a bid that supplies this much␊
                               collateral␊
-      --offer-id <string>     Offer id (default: "bid-978307200000")␊
+      --offer-id <string>     Offer id (default: "bid-1680241587424")␊
       --generate-only         print wallet action only␊
       --price <number>        bid price (IST/Collateral)␊
       -h, --help              display help for command`
@@ -92,7 +92,7 @@ Generated by [AVA](https://avajs.dev).
       --maxBuy <amount>       max Collateral wanted (default: "1_000_000IbcATOM")␊
       --wantMinimum <amount>  only transact a bid that supplies this much␊
                               collateral␊
-      --offer-id <string>     Offer id (default: "bid-978307200000")␊
+      --offer-id <string>     Offer id (default: "bid-1680241587424")␊
       --generate-only         print wallet action only␊
       --discount <percent>    bid discount (0 to 100) or markup (0 to -100) %␊
       -h, --help              display help for command`

diff --git a/packages/agoric-cli/test/snapshots/test-inter-cli.js.snap b/packages/agoric-cli/test/snapshots/test-inter-cli.js.snap