@agoric/inter-protocol 0.16.2-dev-a9d113a.0 → 0.16.2-dev-13a758d.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.16.2-dev-a9d113a.0+a9d113a",
+  "version": "0.16.2-dev-13a758d.0+13a758d",
   "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-a9d113a.0+a9d113a",
-    "@agoric/ertp": "0.16.3-dev-a9d113a.0+a9d113a",
-    "@agoric/governance": "0.10.4-dev-a9d113a.0+a9d113a",
-    "@agoric/internal": "0.3.3-dev-a9d113a.0+a9d113a",
-    "@agoric/notifier": "0.6.3-dev-a9d113a.0+a9d113a",
-    "@agoric/store": "0.9.3-dev-a9d113a.0+a9d113a",
-    "@agoric/time": "0.3.3-dev-a9d113a.0+a9d113a",
-    "@agoric/vat-data": "0.5.3-dev-a9d113a.0+a9d113a",
-    "@agoric/vats": "0.15.2-dev-a9d113a.0+a9d113a",
-    "@agoric/zoe": "0.26.3-dev-a9d113a.0+a9d113a",
+    "@agoric/assert": "0.6.1-dev-13a758d.0+13a758d",
+    "@agoric/ertp": "0.16.3-dev-13a758d.0+13a758d",
+    "@agoric/governance": "0.10.4-dev-13a758d.0+13a758d",
+    "@agoric/internal": "0.3.3-dev-13a758d.0+13a758d",
+    "@agoric/notifier": "0.6.3-dev-13a758d.0+13a758d",
+    "@agoric/store": "0.9.3-dev-13a758d.0+13a758d",
+    "@agoric/time": "0.3.3-dev-13a758d.0+13a758d",
+    "@agoric/vat-data": "0.5.3-dev-13a758d.0+13a758d",
+    "@agoric/vats": "0.15.2-dev-13a758d.0+13a758d",
+    "@agoric/zoe": "0.26.3-dev-13a758d.0+13a758d",
     "@endo/captp": "^3.1.4",
     "@endo/eventual-send": "^0.17.5",
     "@endo/far": "^0.2.21",
@@ -50,10 +50,10 @@
     "jessie.js": "^0.3.2"
   },
   "devDependencies": {
-    "@agoric/smart-wallet": "0.5.4-dev-a9d113a.0+a9d113a",
-    "@agoric/swingset-liveslots": "0.10.3-dev-a9d113a.0+a9d113a",
-    "@agoric/swingset-vat": "0.32.3-dev-a9d113a.0+a9d113a",
-    "@agoric/zone": "0.2.3-dev-a9d113a.0+a9d113a",
+    "@agoric/smart-wallet": "0.5.4-dev-13a758d.0+13a758d",
+    "@agoric/swingset-liveslots": "0.10.3-dev-13a758d.0+13a758d",
+    "@agoric/swingset-vat": "0.32.3-dev-13a758d.0+13a758d",
+    "@agoric/zone": "0.2.3-dev-13a758d.0+13a758d",
     "@endo/bundle-source": "^2.7.0",
     "@endo/init": "^0.5.59",
     "@endo/promise-kit": "^0.2.59",
@@ -85,5 +85,5 @@
   "typeCoverage": {
     "atLeast": 93.45
   },
-  "gitHead": "a9d113a09dfd93889ae985533535df53fdc771e7"
+  "gitHead": "13a758d01ee151552e5d9af8b7d3fc2cb9d4961f"
 }

package/src/price/README.md

@@ -4,6 +4,19 @@ This directory contains the `fluxAggregatorKit.js` contract which takes prices a
 input and outputs a best known price. There are multiple ways to get the price,
 including a PriceAuthority interface.
 
+## Design
+
+The authorities are hierarchical. Many authorities can be registered in the priceAuthorityRegistry.
+
+For oracles, there must be two: the negotiable brand and the _oracle_ brand (an inert one).
+
+The intended flow is that:
+1. a negotiable brand is created (e.g. ATOM)
+2. a price provider says “i can give you quotes for that” and runs price-feed-proposal. That makes “oracleBrands” (which are inert and have a separate identity so that they don’t have the authority to say they’re the real quote for it).
+3. Some higher authority (eg EC, Stakers) decides that should be the quote source for negotiable brand so it registers it under the real brand identity in the registry (with a new instance of a scaledPriceAuthority ).
+
+In practice we do these all in one core proposal. And each vault manager is started with a limit on minting to the EC has another way to gate transactions.
+
 ## Usage
 
 See the [Smart Wallet integration test](/packages/inter-protocol/test/smartWallet/test-oracle-integration.js) for how it's used.

package/src/proposals/addAssetToVault.d.ts

@@ -9,7 +9,7 @@ export function publishInterchainAssetFromBank({ consume: { bankManager, agoricN
         interchainAssetOptions: InterchainAssetOptions;
     };
 }): Promise<void>;
-export function registerScaledPriceAuthority({ consume: { agoricNamesAdmin, startUpgradable, priceAuthorityAdmin, priceAuthority, }, }: BootstrapPowers, { options: { interchainAssetOptions } }: {
+export function registerScaledPriceAuthority({ consume: { agoricNamesAdmin, startUpgradable, priceAuthorityAdmin, priceAuthority, }, instance: { produce: produceInstance }, }: BootstrapPowers, { options: { interchainAssetOptions } }: {
     options: {
         interchainAssetOptions: InterchainAssetOptions;
     };
@@ -45,8 +45,8 @@ export function getManifestForAddAssetToVault({ restoreRef }: {
             };
             produce?: undefined;
             installation?: undefined;
-            brand?: undefined;
             instance?: undefined;
+            brand?: undefined;
         } | {
             consume: {
                 bankManager: boolean;
@@ -63,7 +63,6 @@ export function getManifestForAddAssetToVault({ restoreRef }: {
             produce: {
                 bankMints: boolean;
                 vBankKits: boolean;
-                scaledPriceAuthorityKits?: undefined;
             };
             installation: {
                 consume: {
@@ -71,8 +70,8 @@ export function getManifestForAddAssetToVault({ restoreRef }: {
                     scaledPriceAuthority?: undefined;
                 };
             };
-            brand?: undefined;
             instance?: undefined;
+            brand?: undefined;
         } | {
             consume: {
                 agoricNamesAdmin: boolean;
@@ -86,10 +85,9 @@ export function getManifestForAddAssetToVault({ restoreRef }: {
                 vaultFactoryKit?: undefined;
                 chainTimerService?: undefined;
             };
-            produce: {
-                scaledPriceAuthorityKits: boolean;
-                bankMints?: undefined;
-                vBankKits?: undefined;
+            instance: {
+                produce: boolean;
+                consume?: undefined;
             };
             installation: {
                 consume: {
@@ -97,8 +95,8 @@ export function getManifestForAddAssetToVault({ restoreRef }: {
                     mintHolder?: undefined;
                 };
             };
+            produce?: undefined;
             brand?: undefined;
-            instance?: undefined;
         } | {
             consume: {
                 auctioneerKit: string;
@@ -119,6 +117,7 @@ export function getManifestForAddAssetToVault({ restoreRef }: {
             };
             instance: {
                 consume: boolean;
+                produce?: undefined;
             };
             produce?: undefined;
             installation?: undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"addAssetToVault.d.ts","sourceRoot":"","sources":["addAssetToVault.js"],"names":[],"mappings":";AA0CO,4FALI,eAAe;IAEA,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;AA+EM,mNAPI,sBAAsB;IAEP,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;QACmB,cAAc,EAAvD,MAAM,GAAG,MAAM,GAAG,MAAM;QACD,iBAAiB,EAAxC,MAAM;;kBAwEhB;AAEM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8EN;;;;;;;;aA7aa,MAAM;;;;;;;;;;;;;;;;qCAQN,OAAO,qBAAqB,EAAE,sBAAsB;uBAxB3C,gCAAgC"}
+{"version":3,"file":"addAssetToVault.d.ts","sourceRoot":"","sources":["addAssetToVault.js"],"names":[],"mappings":";AA6CO,4FALI,eAAe;IAEA,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;;0BAuBhC;AAQM,yKALI,sBAAsB;IAEP,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;;kBAoDhC;AAQM,gLALI,eAAe;IAEA,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;;kBA2GhC;AA+EM,mNAPI,sBAAsB;IAEP,OAAO;QACiB,sBAAsB,EAA7D,sBAAsB;QACmB,cAAc,EAAvD,MAAM,GAAG,MAAM,GAAG,MAAM;QACD,iBAAiB,EAAxC,MAAM;;kBA0EhB;AAEM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8EN;;;;;;;;aAvba,MAAM;;;;;;;;;;;;;;;;qCAQN,OAAO,qBAAqB,EAAE,sBAAsB;uBA3B3C,gCAAgC"}

package/src/proposals/addAssetToVault.js

@@ -12,8 +12,11 @@ import { Stable } from '@agoric/internal/src/tokens.js';
 import { TimeMath } from '@agoric/time/src/timeMath.js';
 import { makePromiseKit } from '@endo/promise-kit';
 
-import { instanceNameFor } from './price-feed-proposal.js';
-import { reserveThenGetNames } from './utils.js';
+import {
+  oracleBrandFeedName,
+  reserveThenGetNames,
+  scaledPriceFeedName,
+} from './utils.js';
 
 export * from './startPSM.js';
 
@@ -135,6 +138,7 @@ export const registerScaledPriceAuthority = async (
       priceAuthorityAdmin,
       priceAuthority,
     },
+    instance: { produce: produceInstance },
   },
   { options: { interchainAssetOptions } },
 ) => {
@@ -211,9 +215,11 @@ export const registerScaledPriceAuthority = async (
     }),
   );
 
+  const label = scaledPriceFeedName(issuerName);
+
   const spaKit = await E(startUpgradable)({
     installation: scaledPriceAuthority,
-    label: `scaledPriceAuthority-${issuerName}`,
+    label,
     terms,
   });
 
@@ -224,6 +230,11 @@ export const registerScaledPriceAuthority = async (
     stableBrand,
     true, // force
   );
+
+  // publish into agoricNames so that others can await its presence.
+  // This must stay after registerPriceAuthority above so it's evidence of registration.
+  // eslint-disable-next-line no-restricted-syntax -- computed property
+  produceInstance[label].resolve(spaKit.instance);
 };
 
 // wait a short while after end to allow things to settle
@@ -340,10 +351,12 @@ export const addAssetToVault = async (
     [issuerName],
   );
 
-  const oracleInstanceName = instanceNameFor(oracleBrand, 'USD');
   // don't add the collateral offering to vaultFactory until its price feed is available
   // eslint-disable-next-line no-restricted-syntax -- allow this computed property
-  await consumeInstance[oracleInstanceName];
+  await consumeInstance[oracleBrandFeedName(oracleBrand, 'USD')];
+  // await also the negotiable brand
+  // eslint-disable-next-line no-restricted-syntax -- allow this computed property
+  await consumeInstance[scaledPriceFeedName(issuerName)];
 
   const auctioneerCreator = E.get(auctioneerKit).creatorFacet;
   const schedules = await E(auctioneerCreator).getSchedule();
@@ -420,8 +433,8 @@ export const getManifestForAddAssetToVault = (
           priceAuthorityAdmin: true,
           priceAuthority: true,
         },
-        produce: {
-          scaledPriceAuthorityKits: true,
+        instance: {
+          produce: true,
         },
         installation: {
           consume: { scaledPriceAuthority: true },

package/src/proposals/price-feed-proposal.d.ts

@@ -1,4 +1,4 @@
-export function instanceNameFor(inBrandName: any, outBrandName: any): string;
+export { oracleBrandFeedName as instanceNameFor };
 export function ensureOracleBrands({ namedVat: { consume: { agoricNames }, }, oracleBrand: { produce: oracleBrandProduce }, }: ChainBootstrapSpace & NamedVatPowers, { options: { priceFeedOptions: { brandIn: rawBrandIn, brandOut: rawBrandOut, IN_BRAND_NAME, IN_BRAND_DECIMALS, OUT_BRAND_NAME, OUT_BRAND_DECIMALS, }, }, }: {
     options: {
         priceFeedOptions: PriceFeedOptions;
@@ -78,4 +78,5 @@ export type PriceFeedOptions = {
     OUT_BRAND_NAME: string;
     OUT_BRAND_DECIMALS: string;
 };
+import { oracleBrandFeedName } from './utils.js';
 //# sourceMappingURL=price-feed-proposal.d.ts.map

package/src/proposals/price-feed-proposal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"price-feed-proposal.d.ts","sourceRoot":"","sources":["price-feed-proposal.js"],"names":[],"mappings":"AAoBO,6EACsC;AAoBtC,+HAJI,mBAAmB,GAAG,cAAc,8JACpC;IAAE,OAAO,EAAE;QAAE,gBAAgB,EAAE,gBAAgB,CAAA;KAAE,CAAA;CAAE,GACjD,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAwCjD;AAgBM,4RAbI,mBAAmB,iIACnB;IACV,OAAW,EAAE;QACb,gBAAsB,EAAE;YACxB,oBAA4B,EAAE,MAAM,CAAC;YACrC,eAAuB,EAAE,MAAM,EAAE,CAAC;YAClC,aAAqB,EAAE,OAAO,uDAAuD,EAAE,eAAe,CAAC;YACvG,aAAqB,EAAE,MAAM,CAAC;YAC9B,cAAsB,EAAE,MAAM,CAAC;SACxB,CAAC;KACH,CAAC;CACH,iBA0IH;AAWM;IAH+C,UAAU,UAA/C,OAAO,KAAK,QAAQ,OAAO,CAAC;qBAClC,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2BArNP,MAAM;+BACF,MAAM;4BACT,MAAM;gCACF,MAAM;;;GAkQ7B;AAQK,wGALI,OAAO,kBAAkB,EAAE,sBAAsB;;;;8BA8D3D;+BAzUY;IACZ,OAAW,CAAC,EAAE,KAAK,MAAM,KAAK,CAAC,GAAG,SAAS,CAAC,CAAC;IAC7C,QAAY,CAAC,EAAE,KAAK,MAAM,KAAK,CAAC,GAAG,SAAS,CAAC,CAAC;IAC9C,aAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAsB,EAAE,MAAM,CAAC;CAC5B"}
+{"version":3,"file":"price-feed-proposal.d.ts","sourceRoot":"","sources":["price-feed-proposal.js"],"names":[],"mappings":";AA6CO,+HAJI,mBAAmB,GAAG,cAAc,8JACpC;IAAE,OAAO,EAAE;QAAE,gBAAgB,EAAE,gBAAgB,CAAA;KAAE,CAAA;CAAE,GACjD,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAwCjD;AAgBM,4RAbI,mBAAmB,iIACnB;IACV,OAAW,EAAE;QACb,gBAAsB,EAAE;YACxB,oBAA4B,EAAE,MAAM,CAAC;YACrC,eAAuB,EAAE,MAAM,EAAE,CAAC;YAClC,aAAqB,EAAE,OAAO,uDAAuD,EAAE,eAAe,CAAC;YACvG,aAAqB,EAAE,MAAM,CAAC;YAC9B,cAAsB,EAAE,MAAM,CAAC;SACxB,CAAC;KACH,CAAC;CACH,iBA0IH;AAWM;IAH+C,UAAU,UAA/C,OAAO,KAAK,QAAQ,OAAO,CAAC;qBAClC,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2BArNP,MAAM;+BACF,MAAM;4BACT,MAAM;gCACF,MAAM;;;GAkQ7B;AAQK,wGALI,OAAO,kBAAkB,EAAE,sBAAsB;;;;8BA8D3D;+BAzUY;IACZ,OAAW,CAAC,EAAE,KAAK,MAAM,KAAK,CAAC,GAAG,SAAS,CAAC,CAAC;IAC7C,QAAY,CAAC,EAAE,KAAK,MAAM,KAAK,CAAC,GAAG,SAAS,CAAC,CAAC;IAC9C,aAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAsB,EAAE,MAAM,CAAC;CAC5B;oCAtBG,YAAY"}

package/src/proposals/price-feed-proposal.js

@@ -7,7 +7,14 @@ import {
 import { E } from '@endo/far';
 
 import { unitAmount } from '@agoric/zoe/src/contractSupport/priceQuote.js';
-import { reserveThenDeposit, reserveThenGetNames } from './utils.js';
+import {
+  oracleBrandFeedName,
+  reserveThenDeposit,
+  reserveThenGetNames,
+} from './utils.js';
+
+// backwards compatibility
+export { oracleBrandFeedName as instanceNameFor };
 
 const trace = makeTracer('RunPriceFeed', true);
 
@@ -18,9 +25,6 @@ const sanitizePathSegment = name => {
   return candidate;
 };
 
-export const instanceNameFor = (inBrandName, outBrandName) =>
-  `${inBrandName}-${outBrandName} price feed`;
-
 /**
  * @typedef {{
  *   brandIn?: ERef<Brand<'nat'> | undefined>;
@@ -334,7 +338,7 @@ export const startPriceFeeds = async (
     {
       options: {
         priceFeedOptions: {
-          AGORIC_INSTANCE_NAME: instanceNameFor(inBrandName, outBrandName),
+          AGORIC_INSTANCE_NAME: oracleBrandFeedName(inBrandName, outBrandName),
           contractTerms: {
             minSubmissionCount: 2,
             minSubmissionValue: 1,

package/src/proposals/utils.d.ts

@@ -12,4 +12,6 @@ export function makeInstallCache(homeP: {
     wrapInstall: (install: any) => (mPath: any, bPath: any, opts: any) => Promise<any>;
     saveCache: () => Promise<void>;
 }>;
+export function oracleBrandFeedName(inBrandName: any, outBrandName: any): string;
+export function scaledPriceFeedName(issuerName: any): string;
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAUO,mDAHI,KAAK,OAAO,cAAc,EAAE,SAAS,CAAC,SACtC,MAAM,EAAE,EAAE,kBA+BpB;AAMM,+CAHI,KAAK,OAAO,cAAc,EAAE,SAAS,CAAC,SACtC,MAAM,EAAE,kBAMhB;AAQI,8CALI,MAAM,uBACN,KAAK,OAAO,cAAc,EAAE,SAAS,CAAC,QACtC,MAAM,YACN,KAAK,OAAO,CAAC,EAAE,iBAuBzB;AA6BM,wCAPI;IACV,OAAW,EAAE,KAAK,OAAO,iCAAiC,EAAE,UAAU,CAAC,CAAC;CACrE;4BAEmB,MAAM,KAAK,QAAQ;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;;;;;GAqD7D"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAUO,mDAHI,KAAK,OAAO,cAAc,EAAE,SAAS,CAAC,SACtC,MAAM,EAAE,EAAE,kBA+BpB;AAMM,+CAHI,KAAK,OAAO,cAAc,EAAE,SAAS,CAAC,SACtC,MAAM,EAAE,kBAMhB;AAQI,8CALI,MAAM,uBACN,KAAK,OAAO,cAAc,EAAE,SAAS,CAAC,QACtC,MAAM,YACN,KAAK,OAAO,CAAC,EAAE,iBAuBzB;AA6BM,wCAPI;IACV,OAAW,EAAE,KAAK,OAAO,iCAAiC,EAAE,UAAU,CAAC,CAAC;CACrE;4BAEmB,MAAM,KAAK,QAAQ;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;;;;;GAqD7D;AAEM,iFACsC;AAEtC,6DAC+B"}

package/src/proposals/utils.js

@@ -156,3 +156,9 @@ export const makeInstallCache = async (
 
   return { wrapInstall, saveCache };
 };
+
+export const oracleBrandFeedName = (inBrandName, outBrandName) =>
+  `${inBrandName}-${outBrandName} price feed`;
+
+export const scaledPriceFeedName = issuerName =>
+  `scaledPriceAuthority-${issuerName}`;