@agoric/inter-protocol 0.16.2-dev-2ac22d3.0 → 0.16.2-dev-a0c5f45.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.16.2-dev-2ac22d3.0+2ac22d3",
+  "version": "0.16.2-dev-a0c5f45.0+a0c5f45",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -31,16 +31,16 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-2ac22d3.0+2ac22d3",
-    "@agoric/ertp": "0.16.3-dev-2ac22d3.0+2ac22d3",
-    "@agoric/governance": "0.10.4-dev-2ac22d3.0+2ac22d3",
-    "@agoric/internal": "0.3.3-dev-2ac22d3.0+2ac22d3",
-    "@agoric/notifier": "0.6.3-dev-2ac22d3.0+2ac22d3",
-    "@agoric/store": "0.9.3-dev-2ac22d3.0+2ac22d3",
-    "@agoric/time": "0.3.3-dev-2ac22d3.0+2ac22d3",
-    "@agoric/vat-data": "0.5.3-dev-2ac22d3.0+2ac22d3",
-    "@agoric/vats": "0.15.2-dev-2ac22d3.0+2ac22d3",
-    "@agoric/zoe": "0.26.3-dev-2ac22d3.0+2ac22d3",
+    "@agoric/assert": "0.6.1-dev-a0c5f45.0+a0c5f45",
+    "@agoric/ertp": "0.16.3-dev-a0c5f45.0+a0c5f45",
+    "@agoric/governance": "0.10.4-dev-a0c5f45.0+a0c5f45",
+    "@agoric/internal": "0.3.3-dev-a0c5f45.0+a0c5f45",
+    "@agoric/notifier": "0.6.3-dev-a0c5f45.0+a0c5f45",
+    "@agoric/store": "0.9.3-dev-a0c5f45.0+a0c5f45",
+    "@agoric/time": "0.3.3-dev-a0c5f45.0+a0c5f45",
+    "@agoric/vat-data": "0.5.3-dev-a0c5f45.0+a0c5f45",
+    "@agoric/vats": "0.15.2-dev-a0c5f45.0+a0c5f45",
+    "@agoric/zoe": "0.26.3-dev-a0c5f45.0+a0c5f45",
     "@endo/captp": "^3.1.4",
     "@endo/eventual-send": "^0.17.5",
     "@endo/far": "^0.2.21",
@@ -49,10 +49,10 @@
     "jessie.js": "^0.3.2"
   },
   "devDependencies": {
-    "@agoric/smart-wallet": "0.5.4-dev-2ac22d3.0+2ac22d3",
-    "@agoric/swingset-liveslots": "0.10.3-dev-2ac22d3.0+2ac22d3",
-    "@agoric/swingset-vat": "0.32.3-dev-2ac22d3.0+2ac22d3",
-    "@agoric/zone": "0.2.3-dev-2ac22d3.0+2ac22d3",
+    "@agoric/smart-wallet": "0.5.4-dev-a0c5f45.0+a0c5f45",
+    "@agoric/swingset-liveslots": "0.10.3-dev-a0c5f45.0+a0c5f45",
+    "@agoric/swingset-vat": "0.32.3-dev-a0c5f45.0+a0c5f45",
+    "@agoric/zone": "0.2.3-dev-a0c5f45.0+a0c5f45",
     "@endo/bundle-source": "^2.7.0",
     "@endo/init": "^0.5.59",
     "@endo/promise-kit": "^0.2.59",
@@ -84,5 +84,5 @@
   "typeCoverage": {
     "atLeast": 93.45
   },
-  "gitHead": "2ac22d3353281e7319adca67a8580024171a8066"
+  "gitHead": "a0c5f45598785cdb60fb472649eecdcd13f05108"
 }

package/src/proposals/addAssetToVault.d.ts

@@ -133,9 +133,23 @@ export type InterchainAssetOptions = {
     issuerBoardId?: string | undefined;
     denom?: string | undefined;
     decimalPlaces?: number | undefined;
-    proposedName?: string | undefined;
+    /**
+     * - used in regstering with reserve, vaultFactory
+     */
     keyword: string;
-    oracleBrand: string;
+    /**
+     * - used in agoricNames for compatibility:
+     * defaults to `keyword` if not provided
+     */
+    issuerName?: string | undefined;
+    /**
+     * - defaults to `issuerName` if not provided
+     */
+    proposedName?: string | undefined;
+    /**
+     * - defaults to `issuerName` if not provided
+     */
+    oracleBrand?: string | undefined;
     initialPrice?: number | undefined;
 };
 export type EconomyBootstrapPowers = import('./econ-behaviors.js').EconomyBootstrapPowers;

package/src/proposals/addAssetToVault.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addAssetToVault.d.ts","sourceRoot":"","sources":["addAssetToVault.js"],"names":[],"mappings":";AA8BO,4FALI,sBAAsB;IAEP,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;;0BAmBhC;AAQM,yKALI,sBAAsB;IAEP,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;;kBA+ChC;AAQM,wIALI,eAAe;IAEA,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;;kBAkGhC;AAYM,+LAPI,sBAAsB;IAEP,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;QACmB,cAAc,EAAvD,MAAM,GAAG,MAAM,GAAG,MAAM;QACD,iBAAiB,EAAxC,MAAM;;kBAkDhB;AAEM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6EN;;;;;;aApUa,MAAM;iBACN,MAAM;;;qCA0LN,OAAO,qBAAqB,EAAE,sBAAsB;uBAvM3C,gCAAgC"}
+{"version":3,"file":"addAssetToVault.d.ts","sourceRoot":"","sources":["addAssetToVault.js"],"names":[],"mappings":";AAgCO,4FALI,sBAAsB;IAEP,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;;0BAuBhC;AAQM,yKALI,sBAAsB;IAEP,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;;kBAoDhC;AAQM,wIALI,eAAe;IAEA,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;;kBAmGhC;AAYM,+LAPI,sBAAsB;IAEP,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;QACmB,cAAc,EAAvD,MAAM,GAAG,MAAM,GAAG,MAAM;QACD,iBAAiB,EAAxC,MAAM;;kBAuDhB;AAEM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6EN;;;;;;;;aAtVa,MAAM;;;;;;;;;;;;;;;;qCAwMN,OAAO,qBAAqB,EAAE,sBAAsB;uBAnN3C,gCAAgC"}

package/src/proposals/addAssetToVault.js

@@ -16,9 +16,11 @@ export * from './startPSM.js';
  * @property {string} [issuerBoardId]
  * @property {string} [denom]
  * @property {number} [decimalPlaces]
- * @property {string} [proposedName]
- * @property {string} keyword
- * @property {string} oracleBrand
+ * @property {string} keyword - used in regstering with reserve, vaultFactory
+ * @property {string} [issuerName] - used in agoricNames for compatibility:
+ *   defaults to `keyword` if not provided
+ * @property {string} [proposedName] - defaults to `issuerName` if not provided
+ * @property {string} [oracleBrand] - defaults to `issuerName` if not provided
  * @property {number} [initialPrice]
  */
 
@@ -32,18 +34,22 @@ export const publishInterchainAssetFromBoardId = async (
   { consume: { board, agoricNamesAdmin } },
   { options: { interchainAssetOptions } },
 ) => {
-  const { issuerBoardId, keyword } = interchainAssetOptions;
+  const {
+    issuerBoardId,
+    keyword,
+    issuerName = keyword,
+  } = interchainAssetOptions;
   // Incompatible with denom.
   assert.equal(interchainAssetOptions.denom, undefined);
   assert.typeof(issuerBoardId, 'string');
-  assert.typeof(keyword, 'string');
+  assert.typeof(issuerName, 'string');
 
   const issuer = await E(board).getValue(issuerBoardId);
   const brand = await E(issuer).getBrand();
 
   return Promise.all([
-    E(E(agoricNamesAdmin).lookupAdmin('issuer')).update(keyword, issuer),
-    E(E(agoricNamesAdmin).lookupAdmin('brand')).update(keyword, brand),
+    E(E(agoricNamesAdmin).lookupAdmin('issuer')).update(issuerName, issuer),
+    E(E(agoricNamesAdmin).lookupAdmin('brand')).update(issuerName, brand),
   ]);
 };
 
@@ -62,18 +68,23 @@ export const publishInterchainAssetFromBank = async (
   },
   { options: { interchainAssetOptions } },
 ) => {
-  const { denom, decimalPlaces, proposedName, keyword } =
-    interchainAssetOptions;
+  const {
+    denom,
+    decimalPlaces,
+    keyword,
+    issuerName = keyword,
+    proposedName = keyword,
+  } = interchainAssetOptions;
 
   // Incompatible with issuerBoardId.
   assert.equal(interchainAssetOptions.issuerBoardId, undefined);
   assert.typeof(denom, 'string');
-  assert.typeof(keyword, 'string');
   assert.typeof(decimalPlaces, 'number');
+  assert.typeof(issuerName, 'string');
   assert.typeof(proposedName, 'string');
 
   const terms = {
-    keyword,
+    keyword: issuerName, // "keyword" is a misnomer in mintHolder terms
     assetKind: AssetKind.NAT,
     displayInfo: {
       decimalPlaces,
@@ -83,7 +94,7 @@ export const publishInterchainAssetFromBank = async (
 
   const { creatorFacet: mint, publicFacet: issuer } = await E(startUpgradable)({
     installation: mintHolder,
-    label: keyword,
+    label: issuerName,
     privateArgs: undefined,
     terms,
   });
@@ -94,9 +105,9 @@ export const publishInterchainAssetFromBank = async (
   await E(E.get(reserveKit).creatorFacet).addIssuer(issuer, keyword);
 
   await Promise.all([
-    E(E(agoricNamesAdmin).lookupAdmin('issuer')).update(keyword, issuer),
-    E(E(agoricNamesAdmin).lookupAdmin('brand')).update(keyword, brand),
-    E(bankManager).addAsset(denom, keyword, proposedName, kit),
+    E(E(agoricNamesAdmin).lookupAdmin('issuer')).update(issuerName, issuer),
+    E(E(agoricNamesAdmin).lookupAdmin('brand')).update(issuerName, brand),
+    E(bankManager).addAsset(denom, issuerName, proposedName, kit),
   ]);
 };
 
@@ -119,10 +130,11 @@ export const registerScaledPriceAuthority = async (
 ) => {
   const {
     keyword,
-    oracleBrand,
+    issuerName = keyword,
+    oracleBrand = issuerName,
     initialPrice: initialPriceRaw,
   } = interchainAssetOptions;
-  assert.typeof(keyword, 'string');
+  assert.typeof(issuerName, 'string');
   assert.typeof(oracleBrand, 'string');
 
   const [
@@ -133,7 +145,7 @@ export const registerScaledPriceAuthority = async (
   ] = await Promise.all([
     priceAuthority,
     reserveThenGetNames(E(agoricNamesAdmin).lookupAdmin('brand'), [
-      keyword,
+      issuerName,
       'IST',
     ]),
     reserveThenGetNames(E(agoricNamesAdmin).lookupAdmin('oracleBrand'), [
@@ -191,7 +203,7 @@ export const registerScaledPriceAuthority = async (
 
   const spaKit = await E(startUpgradable)({
     installation: scaledPriceAuthority,
-    label: `scaledPriceAuthority-${keyword}`,
+    label: `scaledPriceAuthority-${issuerName}`,
     terms,
   });
 
@@ -233,12 +245,17 @@ export const addAssetToVault = async (
     },
   },
 ) => {
-  const { keyword, oracleBrand } = interchainAssetOptions;
+  const {
+    keyword,
+    issuerName = keyword,
+    oracleBrand = issuerName,
+  } = interchainAssetOptions;
   assert.typeof(keyword, 'string');
+  assert.typeof(issuerName, 'string');
   assert.typeof(oracleBrand, 'string');
   const [interchainIssuer] = await reserveThenGetNames(
     E(agoricNamesAdmin).lookupAdmin('issuer'),
-    [keyword],
+    [issuerName],
   );
 
   const oracleInstanceName = instanceNameFor(oracleBrand, 'USD');
@@ -248,7 +265,7 @@ export const addAssetToVault = async (
 
   const stable = await stableP;
   const vaultFactoryCreator = E.get(vaultFactoryKit).creatorFacet;
-  await E(vaultFactoryCreator).addVaultType(interchainIssuer, oracleBrand, {
+  await E(vaultFactoryCreator).addVaultType(interchainIssuer, keyword, {
     debtLimit: AmountMath.make(stable, BigInt(debtLimitValue)),
     interestRate: makeRatio(interestRateValue, stable),
     // The rest of these we use safe defaults.