@agoric/inter-protocol 0.13.2-dev-8cbf697.0 → 0.13.2-dev-52646a8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.13.2-dev-8cbf697.0+8cbf697",
+  "version": "0.13.2-dev-52646a8.0+52646a8",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -29,18 +29,18 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.5.2-dev-8cbf697.0+8cbf697",
-    "@agoric/ertp": "0.15.4-dev-8cbf697.0+8cbf697",
-    "@agoric/governance": "0.9.2-dev-8cbf697.0+8cbf697",
-    "@agoric/internal": "0.2.2-dev-8cbf697.0+8cbf697",
-    "@agoric/notifier": "0.5.2-dev-8cbf697.0+8cbf697",
-    "@agoric/store": "0.8.4-dev-8cbf697.0+8cbf697",
-    "@agoric/swingset-liveslots": "0.9.1-dev-8cbf697.0+8cbf697",
-    "@agoric/swingset-vat": "0.30.3-dev-8cbf697.0+8cbf697",
-    "@agoric/time": "0.2.2-dev-8cbf697.0+8cbf697",
-    "@agoric/vat-data": "0.4.4-dev-8cbf697.0+8cbf697",
-    "@agoric/vats": "0.13.1-dev-8cbf697.0+8cbf697",
-    "@agoric/zoe": "0.25.4-dev-8cbf697.0+8cbf697",
+    "@agoric/assert": "0.5.2-dev-52646a8.0+52646a8",
+    "@agoric/ertp": "0.15.4-dev-52646a8.0+52646a8",
+    "@agoric/governance": "0.9.2-dev-52646a8.0+52646a8",
+    "@agoric/internal": "0.2.2-dev-52646a8.0+52646a8",
+    "@agoric/notifier": "0.5.2-dev-52646a8.0+52646a8",
+    "@agoric/store": "0.8.4-dev-52646a8.0+52646a8",
+    "@agoric/swingset-liveslots": "0.9.1-dev-52646a8.0+52646a8",
+    "@agoric/swingset-vat": "0.30.3-dev-52646a8.0+52646a8",
+    "@agoric/time": "0.2.2-dev-52646a8.0+52646a8",
+    "@agoric/vat-data": "0.4.4-dev-52646a8.0+52646a8",
+    "@agoric/vats": "0.13.1-dev-52646a8.0+52646a8",
+    "@agoric/zoe": "0.25.4-dev-52646a8.0+52646a8",
     "@endo/bundle-source": "^2.4.2",
     "@endo/captp": "^2.0.18",
     "@endo/eventual-send": "^0.16.8",
@@ -50,8 +50,8 @@
     "@endo/promise-kit": "^0.2.52"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.9.5-dev-8cbf697.0+8cbf697",
-    "@agoric/smart-wallet": "0.4.3-dev-8cbf697.0+8cbf697",
+    "@agoric/deploy-script-support": "0.9.5-dev-52646a8.0+52646a8",
+    "@agoric/smart-wallet": "0.4.3-dev-52646a8.0+52646a8",
     "@endo/init": "^0.5.52",
     "@fast-check/ava": "^1.1.3",
     "ava": "^5.1.0",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8cbf6974a8c1e189589620fef4b682b1c3e134b2"
+  "gitHead": "52646a8133d8fcf1bff2ad9b141b94c6dfd4e2ef"
 }

package/scripts/add-collateral-core.js

@@ -21,6 +21,7 @@ export const defaultProposalBuilder = async (
     decimalPlaces = 6,
     keyword = 'IbcATOM',
     proposedName = oracleBrand,
+    initialPricePct = undefined,
   } = interchainAssetOptions;
 
   if (!denom) {
@@ -38,6 +39,7 @@ export const defaultProposalBuilder = async (
           denom,
           issuerBoardId,
           decimalPlaces,
+          initialPricePct,
           keyword,
           proposedName,
           oracleBrand,

package/scripts/init-core.js

@@ -154,11 +154,13 @@ export const defaultProposalBuilder = async (
     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,
+      initialPricePct = undefined,
     } = {},
     econCommitteeOptions: {
       committeeSize: econCommitteeSize = env.ECON_COMMITTEE_SIZE || '3',
@@ -172,6 +174,7 @@ export const defaultProposalBuilder = async (
   const anchorOptions = anchorDenom && {
     denom: anchorDenom,
     decimalPlaces: parseInt(anchorDecimalPlaces, 10),
+    initialPricePct: optBigInt(initialPricePct),
     keyword: anchorKeyword,
     proposedName: anchorProposedName,
   };
@@ -188,6 +191,7 @@ export const defaultProposalBuilder = async (
         ROLE,
         vaultFactoryControllerAddress,
         minInitialPoolLiquidity: optBigInt(minInitialPoolLiquidity),
+        endorsedUi,
         anchorOptions,
         econCommitteeOptions,
         installKeys: {

package/scripts/start-local-chain.sh

@@ -68,7 +68,7 @@ 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 IbcATOM
-make ACCT_ADDR="$WALLET_BECH32" FUNDS=20000000ubld,20000000ibc/usdc1234,1000000000000ibc/atom1234 fund-acct
+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..."
@@ -80,5 +80,5 @@ agoric wallet --keyring-backend=test list
 agoric wallet --keyring-backend=test show --from "$WALLET"
 
 echo "Repeating for oracle2 account..."
-make ACCT_ADDR="$WALLET2_BECH32" FUNDS=20000000ubld,20000000ibc/usdc1234 fund-acct
+make ACCT_ADDR="$WALLET2_BECH32" FUNDS=20000000ubld,20000000ibc/toyusdc fund-acct
 agoric wallet --keyring-backend=test provision --spend --account "$WALLET2"

package/src/proposals/addAssetToVault.js

@@ -15,6 +15,7 @@ export * from './startPSM.js';
  * @property {string} [proposedName]
  * @property {string} keyword
  * @property {string} oracleBrand
+ * @property {number} [initialPricePct]
  */
 
 /**
@@ -160,7 +161,7 @@ export const registerScaledPriceAuthority = async (
   { consume: { agoricNamesAdmin, zoe, priceAuthorityAdmin, priceAuthority } },
   { options: { interchainAssetOptions } },
 ) => {
-  const { keyword, oracleBrand } = interchainAssetOptions;
+  const { keyword, oracleBrand, initialPricePct } = interchainAssetOptions;
   assert.typeof(keyword, 'string');
   assert.typeof(oracleBrand, 'string');
 
@@ -215,12 +216,16 @@ export const registerScaledPriceAuthority = async (
     10n ** BigInt(decimalPlacesRun),
     runBrand,
   );
+  const initialPrice = initialPricePct
+    ? makeRatio(BigInt(initialPricePct), interchainBrand, 100n, runBrand)
+    : undefined;
 
   const terms = await deeplyFulfilledObject(
     harden({
       sourcePriceAuthority,
       scaleIn,
       scaleOut,
+      initialPrice,
     }),
   );
   const { publicFacet } = E.get(
@@ -270,11 +275,12 @@ export const addAssetToVault = async (
   const vaultFactoryCreator = E.get(vaultFactoryKit).creatorFacet;
   await E(vaultFactoryCreator).addVaultType(interchainIssuer, oracleBrand, {
     debtLimit: AmountMath.make(stable, debtLimitValue),
-    // the rest of these are arbitrary, TBD by gov cttee
-    interestRate: makeRatio(1n, stable),
-    liquidationMargin: makeRatio(1n, stable),
+    // the rest of these are arbitrary but plausible, TBD by gov cttee
+    liquidationPadding: makeRatio(25n, stable),
+    liquidationMargin: makeRatio(150n, stable),
+    loanFee: makeRatio(50n, stable, 10_000n),
     liquidationPenalty: makeRatio(1n, stable),
-    loanFee: makeRatio(1n, stable),
+    interestRate: makeRatio(1n, stable),
   });
 };
 

package/src/proposals/core-proposal.js

@@ -223,7 +223,12 @@ export const getManifestForEconCommittee = (
 
 export const getManifestForMain = (
   { restoreRef },
-  { installKeys, vaultFactoryControllerAddress, minInitialPoolLiquidity },
+  {
+    installKeys,
+    vaultFactoryControllerAddress,
+    minInitialPoolLiquidity,
+    endorsedUi,
+  },
 ) => {
   return {
     manifest: SHARED_MAIN_MANIFEST,
@@ -238,6 +243,7 @@ export const getManifestForMain = (
     options: {
       vaultFactoryControllerAddress,
       minInitialPoolLiquidity,
+      endorsedUi,
     },
   };
 };
@@ -259,6 +265,7 @@ export const getManifestForInterProtocol = (
     installKeys,
     vaultFactoryControllerAddress,
     minInitialPoolLiquidity,
+    endorsedUi,
   },
 ) => {
   const econCommitteeManifest = getManifestForEconCommittee(
@@ -271,6 +278,7 @@ export const getManifestForInterProtocol = (
       installKeys,
       vaultFactoryControllerAddress,
       minInitialPoolLiquidity,
+      endorsedUi,
     },
   );
   return {

package/src/proposals/econ-behaviors.js

@@ -357,6 +357,8 @@ export const setupReserve = async ({
  * @param {EconomyBootstrapPowers} powers
  * @param {object} config
  * @param {LoanTiming} [config.loanParams]
+ * @param {object} [config.options]
+ * @param {string} [config.options.endorsedUi]
  * @param {bigint} minInitialDebt
  */
 export const startVaultFactory = async (
@@ -392,6 +394,7 @@ export const startVaultFactory = async (
       chargingPeriod: SECONDS_PER_HOUR,
       recordingPeriod: SECONDS_PER_DAY,
     },
+    options: { endorsedUi } = {},
   } = {},
   minInitialDebt = 5_000_000n,
 ) => {
@@ -439,6 +442,7 @@ export const startVaultFactory = async (
       minInitialDebt: AmountMath.make(centralBrand, minInitialDebt),
       bootstrapPaymentValue: 0n,
       shortfallInvitationAmount,
+      endorsedUi,
     },
   );
 

package/src/vaultFactory/vaultFactory.js

@@ -25,6 +25,7 @@ import {
   LIQUIDATION_INSTALL_KEY,
   LIQUIDATION_TERMS_KEY,
   MIN_INITIAL_DEBT_KEY,
+  ENDORSED_UI_KEY,
 } from './params.js';
 import { prepareVaultDirector } from './vaultDirector.js';
 
@@ -76,6 +77,7 @@ export const start = async (zcf, privateArgs, baggage) => {
     [LIQUIDATION_INSTALL_KEY]: { value: liqInstall },
     [LIQUIDATION_TERMS_KEY]: { value: liqTerms },
     [MIN_INITIAL_DEBT_KEY]: { value: minInitialDebt },
+    [ENDORSED_UI_KEY]: { value: endorsedUi },
   } = zcf.getTerms().governedParams;
   /** a powerful object; can modify the invitation */
   const vaultDirectorParamManager = await makeVaultDirectorParamManager(
@@ -86,6 +88,7 @@ export const start = async (zcf, privateArgs, baggage) => {
     liqTerms,
     minInitialDebt,
     initialShortfallInvitation,
+    endorsedUi,
   );
 
   assertElectorateMatches(