@agoric/inter-protocol 0.13.4-pismo-dev-0d5327f.0 → 0.14.0

package/exported.js

@@ -1,4 +1,2 @@
-import './src/stakeFactory/types.js';
 import './src/psm/types.js';
 import './src/vaultFactory/types.js';
-import './src/vpool-xyk-amm/types.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.13.4-pismo-dev-0d5327f.0+0d5327f",
+  "version": "0.14.0",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -16,7 +16,7 @@
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
     "lint:eslint": "eslint .",
-    "lint:types": "tsc --maxNodeModuleJsDepth 5 -p jsconfig.json"
+    "lint:types": "tsc -p jsconfig.json"
   },
   "repository": {
     "type": "git",
@@ -29,33 +29,37 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.5.2-pismo-dev-0d5327f.0+0d5327f",
-    "@agoric/ertp": "0.15.6-pismo-dev-0d5327f.0+0d5327f",
-    "@agoric/governance": "0.9.4-pismo-dev-0d5327f.0+0d5327f",
-    "@agoric/internal": "0.2.2-pismo-dev-0d5327f.0+0d5327f",
-    "@agoric/nat": "^4.1.0",
-    "@agoric/notifier": "0.5.2-pismo-dev-0d5327f.0+0d5327f",
-    "@agoric/store": "0.8.6-pismo-dev-0d5327f.0+0d5327f",
-    "@agoric/swingset-vat": "0.31.1-pismo-dev-0d5327f.0+0d5327f",
-    "@agoric/vat-data": "0.4.6-pismo-dev-0d5327f.0+0d5327f",
-    "@agoric/vats": "0.13.3-pismo-dev-0d5327f.0+0d5327f",
-    "@agoric/zoe": "0.25.6-pismo-dev-0d5327f.0+0d5327f",
-    "@endo/bundle-source": "^2.3.1",
-    "@endo/captp": "^2.0.15",
-    "@endo/eventual-send": "^0.16.5",
-    "@endo/far": "^0.2.11",
-    "@endo/marshal": "^0.7.5",
-    "@endo/nat": "^4.1.20",
-    "@endo/promise-kit": "^0.2.49"
+    "@agoric/assert": "^0.6.0",
+    "@agoric/ertp": "^0.16.0",
+    "@agoric/governance": "^0.10.0",
+    "@agoric/internal": "^0.3.0",
+    "@agoric/notifier": "^0.6.0",
+    "@agoric/store": "^0.9.0",
+    "@agoric/time": "^0.3.0",
+    "@agoric/vat-data": "^0.5.0",
+    "@agoric/vats": "^0.14.0",
+    "@agoric/zoe": "^0.26.0",
+    "@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.0",
+    "jessie.js": "^0.3.2"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.9.7-pismo-dev-0d5327f.0+0d5327f",
-    "@endo/init": "^0.5.49",
-    "@fast-check/ava": "^1.0.1",
-    "ava": "^4.3.1",
-    "c8": "^7.11.0",
-    "deep-object-diff": "^1.1.7",
-    "import-meta-resolve": "^1.1.1"
+    "@agoric/deploy-script-support": "^0.10.0",
+    "@agoric/smart-wallet": "^0.5.0",
+    "@agoric/swingset-liveslots": "^0.10.0",
+    "@agoric/swingset-vat": "^0.32.0",
+    "@endo/bundle-source": "^2.5.1",
+    "@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": [
     "bundles/",
@@ -68,13 +72,12 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "concurrency": 2,
+    "workerThreads": false,
     "timeout": "10m"
   },
-  "eslintIgnore": [
-    "bundle-*.js"
-  ],
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0d5327f87310cf523834853b0546d0e217f37009"
+  "gitHead": "ea8c1c64911b4c58fb43635b25e17e3d50d0cf2a"
 }

package/scripts/add-collateral-core.js

@@ -1,14 +1,18 @@
 /* global process */
-// @ts-check
 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 },
-  { interchainAssetOptions = /** @type {object} */ ({}) } = {},
+  {
+    debtLimitValue = undefined,
+    interestRateValue = undefined,
+    interchainAssetOptions = /** @type {object} */ ({}),
+  } = {},
   { env = process.env } = {},
 ) => {
   /** @type {import('../src/proposals/addAssetToVault.js').InterchainAssetOptions} */
@@ -17,8 +21,9 @@ export const defaultProposalBuilder = async (
     denom = env.INTERCHAIN_DENOM,
     oracleBrand = 'ATOM',
     decimalPlaces = 6,
-    keyword = 'IbcATOM',
+    keyword = 'ATOM',
     proposedName = oracleBrand,
+    initialPrice = undefined,
   } = interchainAssetOptions;
 
   if (!denom) {
@@ -32,10 +37,13 @@ export const defaultProposalBuilder = async (
     getManifestCall: [
       getManifestForAddAssetToVault.name,
       {
+        debtLimitValue: debtLimitValue && BigInt(debtLimitValue),
+        interestRateValue: interestRateValue && BigInt(interestRateValue),
         interchainAssetOptions: {
           denom,
           issuerBoardId,
           decimalPlaces,
+          initialPrice,
           keyword,
           proposedName,
           oracleBrand,
@@ -52,6 +60,7 @@ export const defaultProposalBuilder = async (
   });
 };
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
 export const psmProposalBuilder = async (
   { publishRef, install: install0, wrapInstall },
   { anchorOptions = /** @type {object} */ ({}) } = {},
@@ -64,11 +73,12 @@ export const psmProposalBuilder = async (
   const install = wrapInstall ? wrapInstall(install0) : install0;
 
   return harden({
-    sourceSpec: '../src/proposals/addAssetToVault.js',
+    sourceSpec: '../src/proposals/startPSM.js',
     getManifestCall: [
       getManifestForPsm.name,
       {
         anchorOptions: {
+          ...anchorOptions,
           denom,
           decimalPlaces,
         },

package/scripts/build-bundles.js

@@ -3,7 +3,7 @@ import '@endo/init';
 import {
   createBundles,
   extractProposalBundles,
-} from '@agoric/deploy-script-support';
+} from '@agoric/internal/src/node/createBundles.js';
 import url from 'url';
 import process from 'process';
 
@@ -25,7 +25,14 @@ await extractProposalBundles(
 await createBundles(
   [
     ['../src/psm/psm.js', '../bundles/bundle-psm.js'],
-    ['../src/psm/psmCharter.js', '../bundles/bundle-psmCharter.js'],
+    [
+      '../src/econCommitteeCharter.js',
+      '../bundles/bundle-econCommitteeCharter.js',
+    ],
+    [
+      '../src/price/fluxAggregatorContract.js',
+      '../bundles/bundle-fluxAggregatorKit.js',
+    ],
   ],
   dirname,
 );

package/scripts/deploy-contracts.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-// @ts-check
 import url from 'url';
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { E } from '@endo/eventual-send';
@@ -10,12 +9,10 @@ const contractRefs = [
   '../../governance/bundles/bundle-contractGovernor.js',
   '../../governance/bundles/bundle-committee.js',
   '../../governance/bundles/bundle-binaryVoteCounter.js',
-  '../bundles/bundle-stakeFactory.js',
-  '../bundles/bundle-amm.js',
   '../bundles/bundle-vaultFactory.js',
-  '../bundles/bundle-liquidateMinimum.js',
   '../bundles/bundle-reserve.js',
   '../bundles/bundle-psm.js',
+  '../bundles/bundle-auctioneer.js',
   '../../vats/bundles/bundle-mintHolder.js',
 ];
 const contractRoots = contractRefs.map(ref =>

package/scripts/init-core.js

@@ -1,5 +1,8 @@
 /* global process */
-// @ts-check
+/**
+ * @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';
 
@@ -26,20 +29,10 @@ const installKeyGroups = {
       '../../governance/bundles/bundle-binaryVoteCounter.js',
     ],
   },
-  stakeFactory: {
-    stakeFactory: [
-      '../src/stakeFactory/stakeFactory.js',
-      '../bundles/bundle-stakeFactory.js',
-    ],
-  },
   main: {
-    amm: [
-      '../src/vpool-xyk-amm/multipoolMarketMaker.js',
-      '../bundles/bundle-amm.js',
-    ],
-    interchainPool: [
-      '../src/interchainPool.js',
-      '../bundles/bundle-interchainPool.js',
+    auctioneer: [
+      '../src/auction/auctioneer.js',
+      '../bundles/bundle-auctioneer.js',
     ],
     vaultFactory: [
       '../src/vaultFactory/vaultFactory.js',
@@ -49,35 +42,25 @@ const installKeyGroups = {
       '../src/feeDistributor.js',
       '../bundles/bundle-feeDistributor.js',
     ],
-    liquidateMinimum: [
-      '../src/vaultFactory/liquidateMinimum.js',
-      '../bundles/bundle-liquidateMinimum.js',
-    ],
-    liquidate: [
-      '../src/vaultFactory/liquidateIncrementally.js',
-      '../bundles/bundle-liquidateIncrementally.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,
-}) => {
-  const { ROLE = 'chain' } = process.env;
-
+export const committeeProposalBuilder = async (
+  { publishRef, install: install0, wrapInstall },
+  { econCommitteeOptions } = {},
+) => {
   const install = wrapInstall ? wrapInstall(install0) : install0;
 
   /** @param {Record<string, [string, string]>} group */
@@ -90,7 +73,7 @@ export const committeeProposalBuilder = async ({
     getManifestCall: [
       getManifestForEconCommittee.name,
       {
-        ROLE,
+        econCommitteeOptions,
         installKeys: {
           ...publishGroup(installKeyGroups.econCommittee),
         },
@@ -100,7 +83,6 @@ export const committeeProposalBuilder = async ({
 };
 
 /**
- *
  * @param {object} opts
  * @param {(i: I) => R} opts.publishRef
  * @param {(m: string, b: string, opts?: any) => I} opts.install
@@ -114,7 +96,7 @@ export const mainProposalBuilder = async ({
   install: install0,
   wrapInstall,
 }) => {
-  const { ROLE = 'chain', VAULT_FACTORY_CONTROLLER_ADDR } = process.env;
+  const { VAULT_FACTORY_CONTROLLER_ADDR } = process.env;
 
   const install = wrapInstall ? wrapInstall(install0) : install0;
 
@@ -129,11 +111,9 @@ export const mainProposalBuilder = async ({
     getManifestCall: [
       getManifestForMain.name,
       {
-        ROLE,
         vaultFactoryControllerAddress: VAULT_FACTORY_CONTROLLER_ADDR,
         installKeys: {
           ...publishGroup(installKeyGroups.main),
-          ...publishGroup(installKeyGroups.stakeFactory),
         },
       },
     ],
@@ -141,6 +121,7 @@ export const mainProposalBuilder = async ({
 };
 
 // Build proposal for sim-chain etc.
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
 export const defaultProposalBuilder = async (
   { publishRef, install },
   options = {},
@@ -149,14 +130,15 @@ export const defaultProposalBuilder = async (
   /** @param {string|undefined} s */
   const optBigInt = s => s && BigInt(s);
   const {
-    ROLE = env.ROLE || 'chain',
     vaultFactoryControllerAddress = env.VAULT_FACTORY_CONTROLLER_ADDR,
     minInitialPoolLiquidity = env.MIN_INITIAL_POOL_LIQUIDITY,
+    endorsedUi,
     anchorOptions: {
       anchorDenom = env.ANCHOR_DENOM,
       anchorDecimalPlaces = '6',
       anchorKeyword = 'AUSD',
       anchorProposedName = anchorKeyword,
+      initialPrice = undefined,
     } = {},
     econCommitteeOptions: {
       committeeSize: econCommitteeSize = env.ECON_COMMITTEE_SIZE || '3',
@@ -170,6 +152,7 @@ export const defaultProposalBuilder = async (
   const anchorOptions = anchorDenom && {
     denom: anchorDenom,
     decimalPlaces: parseInt(anchorDecimalPlaces, 10),
+    initialPrice,
     keyword: anchorKeyword,
     proposedName: anchorProposedName,
   };
@@ -183,14 +166,13 @@ export const defaultProposalBuilder = async (
     getManifestCall: [
       getManifestForInterProtocol.name,
       {
-        ROLE,
         vaultFactoryControllerAddress,
         minInitialPoolLiquidity: optBigInt(minInitialPoolLiquidity),
+        endorsedUi,
         anchorOptions,
         econCommitteeOptions,
         installKeys: {
           ...publishGroup(installKeyGroups.econCommittee),
-          ...publishGroup(installKeyGroups.stakeFactory),
           ...publishGroup(installKeyGroups.main),
         },
       },

package/scripts/invite-committee-core.js

@@ -1,10 +1,10 @@
 /* global process */
-// @ts-check
 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 = {},

package/scripts/manual-price-feed.js

@@ -21,7 +21,7 @@ import process from 'process';
  * E(oa).pushResult('19.37')
  * E(qn).getUpdateSince()
  *
- * @typedef {{ board: Board, chainTimerService, scratch, zoe }} Home
+ * @typedef {{ board: import('@agoric/vats').Board, chainTimerService, scratch, zoe }} Home
  * @param {Promise<Home>} homePromise
  * @param {object} root0
  * @param {(...path: string[]) => Promise<any>} root0.lookup
@@ -50,7 +50,7 @@ export default async function priceAuthorityFromNotifier(
     );
     if (invitations.length > 1) {
       console.error('Multiple oracle invitations found', invitations);
-      throw new Error('You need an AGGREGATOR_INSTANCE_LOOKUP to disambiguate');
+      throw Error('You need an AGGREGATOR_INSTANCE_LOOKUP to disambiguate');
     }
     if (invitations.length === 0) {
       console.error(

package/scripts/price-feed-core.js

@@ -4,13 +4,14 @@ import { makeHelpers } from '@agoric/deploy-script-support';
 const DEFAULT_CONTRACT_TERMS = {
   POLL_INTERVAL: 30n,
   maxSubmissionCount: 1000,
-  minSubmissionCount: 1,
-  restartDelay: 5, // in seconds according to chainTimerService
+  minSubmissionCount: 2,
+  restartDelay: 1, // the number of rounds an Oracle has to wait before they can initiate another round
   timeout: 10, // in seconds according to chainTimerService
   minSubmissionValue: 1n,
   maxSubmissionValue: 2n ** 256n,
 };
 
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
 export const defaultProposalBuilder = async (
   { publishRef, install },
   options = {},
@@ -57,8 +58,8 @@ export const defaultProposalBuilder = async (
         brandOutRef: brandOut && publishRef(brandOut),
         priceAggregatorRef: publishRef(
           install(
-            '@agoric/zoe/src/contracts/priceAggregator.js',
-            '../bundles/bundle-priceAggregator.js',
+            '@agoric/inter-protocol/src/price/fluxAggregatorContract.js',
+            '../bundles/bundle-fluxAggregatorKit.js',
           ),
         ),
       },
@@ -71,9 +72,9 @@ export const createGov = async (homeP, endowments) => {
 
   const {
     AGORIC_INSTANCE_NAME,
-    IN_BRAND_DECIMALS,
+    IN_BRAND_DECIMALS = '6',
     IN_BRAND_LOOKUP = JSON.stringify(['wallet', 'brand', 'BLD']),
-    OUT_BRAND_DECIMALS,
+    OUT_BRAND_DECIMALS = '6',
     OUT_BRAND_LOOKUP = JSON.stringify(['agoricNames', 'oracleBrand', 'USD']),
     ORACLE_ADDRESSES,
   } = process.env;

package/scripts/start-local-chain.sh

@@ -0,0 +1,84 @@
+#!/bin/bash
+#
+# Start a chain with "economy" and provision wallet to use it
+#
+
+# run an Archive node to keep all history https://docs.desmos.network/fullnode/overview/
+# (the Makefile passes this to agd start)
+export AGC_START_ARGS="--pruning=nothing"
+
+CHAIN_LOG=$(mktemp -t Agoric-start-local-chain-log-XXXXXXX)
+if [[ $(uname) == "Darwin" ]]; then
+    open -a /System/Applications/Utilities/Console.app "$CHAIN_LOG"
+fi
+
+# ugly way to get SDK path regardless of cwd
+SDK=$(readlink -f "$(dirname -- "$(readlink -f -- "$0")")/../../..")
+
+WALLET=gov1
+WALLET_BECH32=$(agd keys --keyring-backend=test show "$WALLET" --output json | jq -r .address)
+
+if [ -z "$WALLET_BECH32" ]; then
+    echo "USAGE: $0 wallet-key"
+    # The key must be from the 'test' keyring, for non-interactive use.
+    # To migrate one of your 'os' keys:
+    #   agd keys export the-wallet-key-name > wallet.key
+    #   agd keys import --keyring-backend=test the-wallet-key-name wallet.key
+    exit 1
+fi
+
+# this is in economy-template.json in the oracleAddresses list (agoric1dy0yegdsev4xvce3dx7zrz2ad9pesf5svzud6y)
+# to use it run `agd keys --keyring-backend=test add oracle2 --interactive` and enter this mnenomic:
+# dizzy scale gentle good play scene certain acquire approve alarm retreat recycle inch journey fitness grass minimum learn funny way unlock what buzz upon
+WALLET2=gov2
+WALLET2_BECH32=$(agd keys --keyring-backend=test show "$WALLET2" --output json | jq -r .address)
+if [ -z "$WALLET2_BECH32" ]; then
+    echo "missing oracle2 key in test keyring"
+    exit 1
+fi
+
+echo CHAIN_LOG "$CHAIN_LOG"
+echo SDK "$SDK"
+echo WALLET "$WALLET"
+echo WALLET_BECH32 "$WALLET_BECH32"
+
+cd "$SDK"/packages/cosmic-swingset || exit 1
+
+echo "Logs written to $CHAIN_LOG"
+# specifies the address to use for chain config
+export PRIMARY_ADDRESS=$WALLET_BECH32
+# nobuild variety skips Golang artifacts; if you get errors try make scenario2-setup
+make scenario2-setup-nobuild >>"$CHAIN_LOG" 2>&1
+
+# TODO detect it's already running, indicate when it started and offer to restart
+# e.g. killall node xsnap-worker
+echo "Starting the chain..."
+# use -economy target to get the kitchen sink
+# disable pruning to keep all history https://docs.desmos.network/fullnode/overview/
+make AGC_START_ARGS="--pruning=nothing" CHAIN_BOOTSTRAP_VAT_CONFIG=@agoric/vats/decentral-test-vaults-config.json scenario2-run-chain >>"$CHAIN_LOG" 2>&1 &
+make wait-for-cosmos
+
+# xxx sleep to let it settle
+sleep 15
+
+echo "Funding the pool..."
+make fund-provision-pool
+
+echo "Funding your wallet account..."
+# After `fund-provision-pool` there is 900 IST remaining for other account funding.
+# A wallet can be tested with 20 BLD for provisioning wallet and 20 USDC for psm trading
+# Also include 1M ATOM
+make ACCT_ADDR="$WALLET_BECH32" FUNDS=20000000ubld,20000000ibc/toyusdc,1000000000000ibc/toyatom fund-acct
+agd query bank balances "$WALLET_BECH32" | grep ubld || exit 1
+
+echo "Provisioning your smart wallet..."
+agoric wallet --keyring-backend=test provision --spend --account "$WALLET"
+echo "waiting for blocks"
+sleep 15
+# verify
+agoric wallet --keyring-backend=test list
+agoric wallet --keyring-backend=test show --from "$WALLET"
+
+echo "Repeating for gov2 account..."
+make ACCT_ADDR="$WALLET2_BECH32" FUNDS=20000000ubld,20000000ibc/toyusdc fund-acct
+agoric wallet --keyring-backend=test provision --spend --account "$WALLET2"