@agoric/inter-protocol 0.16.2-dev-ecf2d8e.0 → 0.16.2-other-dev-70beeb7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.16.2-dev-ecf2d8e.0+ecf2d8e",
+  "version": "0.16.2-other-dev-70beeb7.0+70beeb7",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -10,15 +10,13 @@
   "scripts": {
     "build": "yarn build:bundles",
     "build:bundles": "node ./scripts/build-bundles.js",
-    "prepack": "tsc --build tsconfig.build.json",
-    "postpack": "git clean -f '*.d.ts*' src/types.js",
     "test": "ava",
     "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js",
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
     "lint:eslint": "eslint .",
-    "lint:types": "tsc"
+    "lint:types": "tsc -p jsconfig.json"
   },
   "repository": {
     "type": "git",
@@ -31,39 +29,40 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-ecf2d8e.0+ecf2d8e",
-    "@agoric/ertp": "0.16.3-dev-ecf2d8e.0+ecf2d8e",
-    "@agoric/governance": "0.10.4-dev-ecf2d8e.0+ecf2d8e",
-    "@agoric/internal": "0.3.3-dev-ecf2d8e.0+ecf2d8e",
-    "@agoric/notifier": "0.6.3-dev-ecf2d8e.0+ecf2d8e",
-    "@agoric/store": "0.9.3-dev-ecf2d8e.0+ecf2d8e",
-    "@agoric/time": "0.3.3-dev-ecf2d8e.0+ecf2d8e",
-    "@agoric/vat-data": "0.5.3-dev-ecf2d8e.0+ecf2d8e",
-    "@agoric/vats": "0.15.2-dev-ecf2d8e.0+ecf2d8e",
-    "@agoric/zoe": "0.26.3-dev-ecf2d8e.0+ecf2d8e",
-    "@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",
+    "@agoric/assert": "0.6.1-other-dev-70beeb7.0+70beeb7",
+    "@agoric/ertp": "0.16.3-other-dev-70beeb7.0+70beeb7",
+    "@agoric/governance": "0.10.4-other-dev-70beeb7.0+70beeb7",
+    "@agoric/internal": "0.3.3-other-dev-70beeb7.0+70beeb7",
+    "@agoric/notifier": "0.6.3-other-dev-70beeb7.0+70beeb7",
+    "@agoric/store": "0.9.3-other-dev-70beeb7.0+70beeb7",
+    "@agoric/time": "0.3.3-other-dev-70beeb7.0+70beeb7",
+    "@agoric/vat-data": "0.5.3-other-dev-70beeb7.0+70beeb7",
+    "@agoric/vats": "0.15.2-other-dev-70beeb7.0+70beeb7",
+    "@agoric/zoe": "0.26.3-other-dev-70beeb7.0+70beeb7",
+    "@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.21.2-other-dev-70beeb7.0+70beeb7",
     "jessie.js": "^0.3.2"
   },
   "devDependencies": {
-    "@agoric/smart-wallet": "0.5.4-dev-ecf2d8e.0+ecf2d8e",
-    "@agoric/swingset-liveslots": "0.10.3-dev-ecf2d8e.0+ecf2d8e",
-    "@agoric/swingset-vat": "0.32.3-dev-ecf2d8e.0+ecf2d8e",
-    "@agoric/zone": "0.2.3-dev-ecf2d8e.0+ecf2d8e",
-    "@endo/bundle-source": "^2.7.0",
-    "@endo/init": "^0.5.59",
-    "@endo/promise-kit": "^0.2.59",
-    "@fast-check/ava": "^1.1.5",
-    "ava": "^5.3.0",
+    "@agoric/deploy-script-support": "0.10.4-other-dev-70beeb7.0+70beeb7",
+    "@agoric/smart-wallet": "0.5.4-other-dev-70beeb7.0+70beeb7",
+    "@agoric/swingset-liveslots": "0.10.3-other-dev-70beeb7.0+70beeb7",
+    "@agoric/swingset-vat": "0.32.3-other-dev-70beeb7.0+70beeb7",
+    "@endo/bundle-source": "2.5.2-upstream-rollup",
+    "@endo/init": "0.5.56",
+    "@endo/promise-kit": "0.2.56",
+    "@fast-check/ava": "^1.1.3",
+    "ava": "^5.2.0",
     "c8": "^7.13.0",
     "deep-object-diff": "^1.1.9",
     "import-meta-resolve": "^2.2.1"
   },
   "files": [
-    "scripts",
+    "scripts/",
     "src/",
     "exported.js",
     "NEWS.md"
@@ -72,14 +71,12 @@
     "files": [
       "test/**/test-*.js"
     ],
-    "require": [
-      "@endo/init/debug.js"
-    ],
+    "concurrency": 2,
     "workerThreads": false,
     "timeout": "10m"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ecf2d8ec1a63bd3c23cbca27f89ca9675a163611"
+  "gitHead": "70beeb7e476f24cfad30fa8cd5918f04746e8839"
 }

package/scripts/add-collateral-core.js

@@ -0,0 +1,112 @@
+/* global process */
+import { makeHelpers } from '@agoric/deploy-script-support';
+
+import { getManifestForAddAssetToVault } from '../src/proposals/addAssetToVault.js';
+import { getManifestForPsm } from '../src/proposals/startPSM.js';
+import { makeInstallCache } from '../src/proposals/utils.js';
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
+export const defaultProposalBuilder = async (
+  { publishRef, install: install0, wrapInstall },
+  {
+    debtLimitValue = undefined,
+    interestRateValue = undefined,
+    interchainAssetOptions = /** @type {object} */ ({}),
+  } = {},
+  { env = process.env } = {},
+) => {
+  /** @type {import('../src/proposals/addAssetToVault.js').InterchainAssetOptions} */
+  const {
+    issuerBoardId = env.INTERCHAIN_ISSUER_BOARD_ID,
+    denom = env.INTERCHAIN_DENOM,
+    oracleBrand = 'ATOM',
+    decimalPlaces = 6,
+    keyword = 'ATOM',
+    proposedName = oracleBrand,
+    initialPrice = undefined,
+  } = interchainAssetOptions;
+
+  if (!denom) {
+    assert(issuerBoardId, 'INTERCHAIN_ISSUER_BOARD_ID is required');
+  }
+
+  const install = wrapInstall ? wrapInstall(install0) : install0;
+
+  return harden({
+    sourceSpec: '../src/proposals/addAssetToVault.js',
+    getManifestCall: [
+      getManifestForAddAssetToVault.name,
+      {
+        debtLimitValue: debtLimitValue && BigInt(debtLimitValue),
+        interestRateValue: interestRateValue && BigInt(interestRateValue),
+        interchainAssetOptions: {
+          denom,
+          issuerBoardId,
+          decimalPlaces,
+          initialPrice,
+          keyword,
+          proposedName,
+          oracleBrand,
+        },
+        scaledPriceAuthorityRef: publishRef(
+          install(
+            '@agoric/zoe/src/contracts/scaledPriceAuthority.js',
+            '../bundles/bundle-scaledPriceAuthority.js',
+            { persist: true },
+          ),
+        ),
+      },
+    ],
+  });
+};
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
+export const psmProposalBuilder = async (
+  { publishRef, install: install0, wrapInstall },
+  { anchorOptions = /** @type {object} */ ({}) } = {},
+  { env = process.env } = {},
+) => {
+  const { denom = env.ANCHOR_DENOM, decimalPlaces = 6 } = anchorOptions;
+
+  assert(denom, 'ANCHOR_DENOM is required');
+
+  const install = wrapInstall ? wrapInstall(install0) : install0;
+
+  return harden({
+    sourceSpec: '../src/proposals/startPSM.js',
+    getManifestCall: [
+      getManifestForPsm.name,
+      {
+        anchorOptions: {
+          ...anchorOptions,
+          denom,
+          decimalPlaces,
+        },
+        installKeys: {
+          psm: publishRef(
+            install('../src/psm/psm.js', '../bundles/bundle-psm.js'),
+          ),
+          mintHolder: publishRef(
+            install(
+              '@agoric/vats/src/mintHolder.js',
+              '../../vats/bundles/bundle-mintHolder.js',
+            ),
+          ),
+        },
+      },
+    ],
+  });
+};
+
+export default async (homeP, endowments) => {
+  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
+
+  const tool = await makeInstallCache(homeP, {
+    loadBundle: spec => import(spec),
+  });
+
+  await writeCoreProposal('gov-add-collateral', defaultProposalBuilder);
+  await writeCoreProposal('gov-start-psm', opts =>
+    psmProposalBuilder({ ...opts, wrapInstall: tool.wrapInstall }),
+  );
+};

package/scripts/build-bundles.js

@@ -1,20 +1,36 @@
 #! /usr/bin/env node
 import '@endo/init';
-
-import { createBundles } from '@agoric/internal/src/node/createBundles.js';
+import {
+  createBundles,
+  extractProposalBundles,
+} from '@agoric/internal/src/node/createBundles.js';
 import url from 'url';
+import process from 'process';
+
+import { defaultProposalBuilder } from './init-core.js';
+import { defaultProposalBuilder as collateralProposalBuilder } from './add-collateral-core.js';
+
+process.env.INTERCHAIN_ISSUER_BOARD_ID =
+  'arbitrary value to prevent build error';
 
 const dirname = url.fileURLToPath(new URL('.', import.meta.url));
+await extractProposalBundles(
+  [
+    ['.', defaultProposalBuilder],
+    ['.', collateralProposalBuilder],
+  ],
+  dirname,
+);
 
 await createBundles(
   [
-    ['@agoric/inter-protocol/src/psm/psm.js', '../bundles/bundle-psm.js'],
+    ['../src/psm/psm.js', '../bundles/bundle-psm.js'],
     [
-      '@agoric/inter-protocol/src/econCommitteeCharter.js',
+      '../src/econCommitteeCharter.js',
       '../bundles/bundle-econCommitteeCharter.js',
     ],
     [
-      '@agoric/inter-protocol/src/price/fluxAggregatorContract.js',
+      '../src/price/fluxAggregatorContract.js',
       '../bundles/bundle-fluxAggregatorKit.js',
     ],
   ],

package/scripts/deploy-contracts.js

@@ -0,0 +1,100 @@
+#!/usr/bin/env node
+import url from 'url';
+import { makeHelpers } from '@agoric/deploy-script-support';
+import { E } from '@endo/eventual-send';
+import { getCopyMapEntries, makeCopyMap } from '@agoric/store';
+
+// TODO: CLI options to choose contracts
+const contractRefs = [
+  '../../governance/bundles/bundle-contractGovernor.js',
+  '../../governance/bundles/bundle-committee.js',
+  '../../governance/bundles/bundle-binaryVoteCounter.js',
+  '../bundles/bundle-vaultFactory.js',
+  '../bundles/bundle-reserve.js',
+  '../bundles/bundle-psm.js',
+  '../bundles/bundle-auctioneer.js',
+  '../../vats/bundles/bundle-mintHolder.js',
+];
+const contractRoots = contractRefs.map(ref =>
+  url.fileURLToPath(new URL(ref, import.meta.url)),
+);
+
+/** @type {<T>(store: any, key: string, make: () => T) => Promise<T>} */
+const provideWhen = async (store, key, make) => {
+  const found = await E(store).get(key);
+  if (found) {
+    return found;
+  }
+  const value = make();
+  await E(store).set(key, value);
+  return value;
+};
+
+export default async (homeP, endowments) => {
+  const home = await homeP;
+  const { zoe, scratch, board } = home;
+
+  const { installInPieces, getBundlerMaker } = await makeHelpers(
+    homeP,
+    endowments,
+  );
+  const bundler = E(getBundlerMaker({ log: console.log })).makeBundler({
+    zoe,
+  });
+
+  console.log('getting installCache...');
+  /** @type {CopyMap<string, {installation: Installation, boardId: string, path?: string}>} */
+  const initial = await provideWhen(scratch, 'installCache', () =>
+    makeCopyMap([]),
+  );
+  console.log('initially:', initial.payload.keys.length, 'entries');
+
+  // ISSUE: getCopyMapEntries of CopyMap<K, V> loses K, V.
+  /** @type {Map<string, {installation: Installation, boardId: string, path?: string}>} */
+  const working = new Map(getCopyMapEntries(initial));
+
+  let added = 0;
+
+  /** @type {EndoZipBase64Bundle[]} */
+  const bundles = await Promise.all(
+    contractRoots.map(path => import(path).then(m => m.default)),
+  );
+
+  let ix = 0;
+  for await (const bundle of bundles) {
+    const sha512 = bundle.endoZipBase64Sha512;
+    if (working.has(bundle.endoZipBase64Sha512)) {
+      console.log('hit:', { path: contractRefs[ix], sha512 });
+    } else {
+      console.log('miss:', {
+        path: contractRefs[ix],
+        length: bundle.endoZipBase64.length,
+        sha512,
+      });
+      const installation = await installInPieces(bundle, bundler, {
+        persist: true,
+      });
+      const boardId = await E(board).getId(installation);
+      working.set(sha512, { installation, boardId, path: contractRefs[ix] });
+      added += 1;
+    }
+    ix += 1;
+  }
+
+  const final = makeCopyMap(working);
+  assert.equal(final.payload.keys.length, working.size);
+  await (added > 0 && E(home.scratch).set('installCache', final));
+  console.log({
+    initial: initial.payload.keys.length,
+    added,
+    total: working.size,
+  });
+
+  const items = [...working.entries()]
+    .map(([sha512, { boardId, path }]) => ({ sha512, boardId, path }))
+    .sort();
+  const boardId = await E(board).getId(JSON.stringify(items));
+  console.log({
+    boardId,
+  });
+};

package/scripts/init-core.js

@@ -0,0 +1,198 @@
+/* global process */
+/**
+ * @file can be run with `agoric deploy` after a chain is running (depends on chain state)
+ * Only works with "local" chain and not sim-chain b/c it needs governance votes (n/a on sim-chain).
+ */
+import { makeHelpers } from '@agoric/deploy-script-support';
+import { objectMap } from '@agoric/internal';
+
+import {
+  getManifestForInterProtocol,
+  getManifestForEconCommittee,
+  getManifestForMain,
+} from '../src/proposals/core-proposal.js';
+import { makeInstallCache } from '../src/proposals/utils.js';
+
+/** @type {Record<string, Record<string, [string, string]>>} */
+const installKeyGroups = {
+  econCommittee: {
+    contractGovernor: [
+      '@agoric/governance/src/contractGovernor.js',
+      '../../governance/bundles/bundle-contractGovernor.js',
+    ],
+    committee: [
+      '@agoric/governance/src/committee.js',
+      '../../governance/bundles/bundle-committee.js',
+    ],
+    binaryVoteCounter: [
+      '@agoric/governance/src/binaryVoteCounter.js',
+      '../../governance/bundles/bundle-binaryVoteCounter.js',
+    ],
+  },
+  main: {
+    auctioneer: [
+      '../src/auction/auctioneer.js',
+      '../bundles/bundle-auctioneer.js',
+    ],
+    vaultFactory: [
+      '../src/vaultFactory/vaultFactory.js',
+      '../bundles/bundle-vaultFactory.js',
+    ],
+    feeDistributor: [
+      '../src/feeDistributor.js',
+      '../bundles/bundle-feeDistributor.js',
+    ],
+    reserve: ['../src/reserve/assetReserve.js', '../bundles/bundle-reserve.js'],
+  },
+};
+
+/**
+ * @param {object} opts
+ * @param {(i: I) => R} opts.publishRef
+ * @param {(m: string, b: string, opts?: any) => I} opts.install
+ * @param {<T>(f: T) => T} [opts.wrapInstall]
+ *
+ * @param {object} [options]
+ * @param {{ committeeName?: string, committeeSize?: number}} [options.econCommitteeOptions]
+ * @template I
+ * @template R
+ */
+export const committeeProposalBuilder = async (
+  { publishRef, install: install0, wrapInstall },
+  { econCommitteeOptions } = {},
+) => {
+  const install = wrapInstall ? wrapInstall(install0) : install0;
+
+  /** @param {Record<string, [string, string]>} group */
+  const publishGroup = group =>
+    objectMap(group, ([mod, bundle]) =>
+      publishRef(install(mod, bundle, { persist: true })),
+    );
+  return harden({
+    sourceSpec: '../src/proposals/core-proposal.js',
+    getManifestCall: [
+      getManifestForEconCommittee.name,
+      {
+        econCommitteeOptions,
+        installKeys: {
+          ...publishGroup(installKeyGroups.econCommittee),
+        },
+      },
+    ],
+  });
+};
+
+/**
+ * @param {object} opts
+ * @param {(i: I) => R} opts.publishRef
+ * @param {(m: string, b: string, opts?: any) => I} opts.install
+ * @param {<T>(f: T) => T} [opts.wrapInstall]
+ *
+ * @template I
+ * @template R
+ */
+export const mainProposalBuilder = async ({
+  publishRef,
+  install: install0,
+  wrapInstall,
+}) => {
+  const { VAULT_FACTORY_CONTROLLER_ADDR } = process.env;
+
+  const install = wrapInstall ? wrapInstall(install0) : install0;
+
+  const persist = true;
+  /** @param {Record<string, [string, string]>} group */
+  const publishGroup = group =>
+    objectMap(group, ([mod, bundle]) =>
+      publishRef(install(mod, bundle, { persist })),
+    );
+  return harden({
+    sourceSpec: '../src/proposals/core-proposal.js',
+    getManifestCall: [
+      getManifestForMain.name,
+      {
+        vaultFactoryControllerAddress: VAULT_FACTORY_CONTROLLER_ADDR,
+        installKeys: {
+          ...publishGroup(installKeyGroups.main),
+        },
+      },
+    ],
+  });
+};
+
+// Build proposal for sim-chain etc.
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
+export const defaultProposalBuilder = async (
+  { publishRef, install },
+  options = {},
+  { env = process.env } = {},
+) => {
+  /** @param {string|undefined} s */
+  const optBigInt = s => s && BigInt(s);
+  const {
+    vaultFactoryControllerAddress = env.VAULT_FACTORY_CONTROLLER_ADDR,
+    minInitialPoolLiquidity = env.MIN_INITIAL_POOL_LIQUIDITY,
+    referencedUi,
+    anchorOptions: {
+      anchorDenom = env.ANCHOR_DENOM,
+      anchorDecimalPlaces = '6',
+      anchorKeyword = 'AUSD',
+      anchorProposedName = anchorKeyword,
+      initialPrice = undefined,
+    } = {},
+    econCommitteeOptions: {
+      committeeSize: econCommitteeSize = env.ECON_COMMITTEE_SIZE || '3',
+    } = {},
+  } = options;
+
+  /** @param {Record<string, [string, string]>} group */
+  const publishGroup = group =>
+    objectMap(group, ([mod, bundle]) => publishRef(install(mod, bundle)));
+
+  const anchorOptions = anchorDenom && {
+    denom: anchorDenom,
+    decimalPlaces: parseInt(anchorDecimalPlaces, 10),
+    initialPrice,
+    keyword: anchorKeyword,
+    proposedName: anchorProposedName,
+  };
+
+  const econCommitteeOptions = {
+    committeeSize: parseInt(econCommitteeSize, 10),
+  };
+
+  return harden({
+    sourceSpec: '../src/proposals/core-proposal.js',
+    getManifestCall: [
+      getManifestForInterProtocol.name,
+      {
+        vaultFactoryControllerAddress,
+        minInitialPoolLiquidity: optBigInt(minInitialPoolLiquidity),
+        referencedUi,
+        anchorOptions,
+        econCommitteeOptions,
+        installKeys: {
+          ...publishGroup(installKeyGroups.econCommittee),
+          ...publishGroup(installKeyGroups.main),
+        },
+      },
+    ],
+  });
+};
+
+export default async (homeP, endowments) => {
+  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
+
+  const tool = await makeInstallCache(homeP, {
+    loadBundle: spec => import(spec),
+  });
+  await Promise.all([
+    writeCoreProposal('gov-econ-committee', opts =>
+      committeeProposalBuilder({ ...opts, wrapInstall: tool.wrapInstall }),
+    ),
+    writeCoreProposal('gov-amm-vaults-etc', opts =>
+      mainProposalBuilder({ ...opts, wrapInstall: tool.wrapInstall }),
+    ),
+  ]);
+  await tool.saveCache();
+};

package/scripts/invite-committee-core.js

@@ -0,0 +1,42 @@
+/* global process */
+import { makeHelpers } from '@agoric/deploy-script-support';
+
+import { getManifestForInviteCommittee } from '../src/proposals/committee-proposal.js';
+
+// Build proposal for sim-chain etc.
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
+export const defaultProposalBuilder = async (
+  { publishRef, install },
+  options = {},
+) => {
+  const {
+    ECON_COMMITTEE_ADDRESSES = process.env.ECON_COMMITTEE_ADDRESSES,
+    voterAddresses = JSON.parse(ECON_COMMITTEE_ADDRESSES),
+  } = options;
+
+  assert(voterAddresses, 'ECON_COMMITTEE_ADDRESSES is required');
+
+  return harden({
+    sourceSpec: '../src/proposals/committee-proposal.js',
+    getManifestCall: [
+      getManifestForInviteCommittee.name,
+      {
+        voterAddresses,
+        econCommitteeCharterRef: publishRef(
+          install(
+            '../src/econCommitteeCharter.js',
+            '../bundles/bundle-econCommitteeCharter.js',
+            {
+              persist: true,
+            },
+          ),
+        ),
+      },
+    ],
+  });
+};
+
+export default async (homeP, endowments) => {
+  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
+  await writeCoreProposal('gov-invite-committee', defaultProposalBuilder);
+};