@agoric/inter-protocol 0.16.2-dev-1cd6408.0 → 0.16.2-dev-2a16ddd.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.16.2-dev-1cd6408.0+1cd6408",
+  "version": "0.16.2-dev-2a16ddd.0+2a16ddd",
   "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-1cd6408.0+1cd6408",
-    "@agoric/ertp": "0.16.3-dev-1cd6408.0+1cd6408",
-    "@agoric/governance": "0.10.4-dev-1cd6408.0+1cd6408",
-    "@agoric/internal": "0.3.3-dev-1cd6408.0+1cd6408",
-    "@agoric/notifier": "0.6.3-dev-1cd6408.0+1cd6408",
-    "@agoric/store": "0.9.3-dev-1cd6408.0+1cd6408",
-    "@agoric/time": "0.3.3-dev-1cd6408.0+1cd6408",
-    "@agoric/vat-data": "0.5.3-dev-1cd6408.0+1cd6408",
-    "@agoric/vats": "0.15.2-dev-1cd6408.0+1cd6408",
-    "@agoric/zoe": "0.26.3-dev-1cd6408.0+1cd6408",
+    "@agoric/assert": "0.6.1-dev-2a16ddd.0+2a16ddd",
+    "@agoric/ertp": "0.16.3-dev-2a16ddd.0+2a16ddd",
+    "@agoric/governance": "0.10.4-dev-2a16ddd.0+2a16ddd",
+    "@agoric/internal": "0.3.3-dev-2a16ddd.0+2a16ddd",
+    "@agoric/notifier": "0.6.3-dev-2a16ddd.0+2a16ddd",
+    "@agoric/store": "0.9.3-dev-2a16ddd.0+2a16ddd",
+    "@agoric/time": "0.3.3-dev-2a16ddd.0+2a16ddd",
+    "@agoric/vat-data": "0.5.3-dev-2a16ddd.0+2a16ddd",
+    "@agoric/vats": "0.15.2-dev-2a16ddd.0+2a16ddd",
+    "@agoric/zoe": "0.26.3-dev-2a16ddd.0+2a16ddd",
     "@endo/captp": "^4.0.4",
     "@endo/eventual-send": "^1.1.2",
     "@endo/far": "^1.0.4",
@@ -50,10 +50,10 @@
     "jessie.js": "^0.3.2"
   },
   "devDependencies": {
-    "@agoric/smart-wallet": "0.5.4-dev-1cd6408.0+1cd6408",
-    "@agoric/swingset-liveslots": "0.10.3-dev-1cd6408.0+1cd6408",
-    "@agoric/swingset-vat": "0.32.3-dev-1cd6408.0+1cd6408",
-    "@agoric/zone": "0.2.3-dev-1cd6408.0+1cd6408",
+    "@agoric/smart-wallet": "0.5.4-dev-2a16ddd.0+2a16ddd",
+    "@agoric/swingset-liveslots": "0.10.3-dev-2a16ddd.0+2a16ddd",
+    "@agoric/swingset-vat": "0.32.3-dev-2a16ddd.0+2a16ddd",
+    "@agoric/zone": "0.2.3-dev-2a16ddd.0+2a16ddd",
     "@endo/bundle-source": "^3.1.0",
     "@endo/init": "^1.0.4",
     "@endo/promise-kit": "^1.0.4",
@@ -85,5 +85,5 @@
   "typeCoverage": {
     "atLeast": 95.9
   },
-  "gitHead": "1cd6408e27271160227f8aaa12d9771ea73a1da1"
+  "gitHead": "2a16ddd09a7e81241548e7a29e13c41cae065709"
 }

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

@@ -4,7 +4,7 @@ export function ensureOracleBrands({ namedVat: { consume: { agoricNames }, }, or
         priceFeedOptions: PriceFeedOptions;
     };
 }): Promise<[Brand<'nat'>, Brand<'nat'>]>;
-export function createPriceFeed({ consume: { agoricNamesAdmin, board, chainStorage, chainTimerService, client, econCharterKit, highPrioritySendersManager, namesByAddressAdmin, priceAuthority, priceAuthorityAdmin, startGovernedUpgradable, }, instance: { produce: produceInstance }, }: ChainBootstrapSpace, { options: { priceFeedOptions: { AGORIC_INSTANCE_NAME, oracleAddresses, contractTerms, IN_BRAND_NAME, OUT_BRAND_NAME, }, }, }: {
+export function createPriceFeed({ consume: { agoricNamesAdmin, board, chainStorage, chainTimerService, client, econCharterKit, highPrioritySendersManager, namesByAddressAdmin, priceAuthority, priceAuthorityAdmin, startGovernedUpgradable, zoe, }, instance: { produce: produceInstance }, }: ChainBootstrapSpace, { options: { priceFeedOptions: { AGORIC_INSTANCE_NAME, oracleAddresses, contractTerms, IN_BRAND_NAME, OUT_BRAND_NAME, priceAggregatorRef, }, }, }: {
     options: {
         priceFeedOptions: {
             AGORIC_INSTANCE_NAME: string;
@@ -12,6 +12,7 @@ export function createPriceFeed({ consume: { agoricNamesAdmin, board, chainStora
             contractTerms: import('@agoric/inter-protocol/src/price/fluxAggregatorKit.js').ChainlinkConfig;
             IN_BRAND_NAME: string;
             OUT_BRAND_NAME: string;
+            priceAggregatorRef: Installation;
         };
     };
 }): Promise<void>;
@@ -32,6 +33,7 @@ export function getManifestForPriceFeed({ restoreRef }: {
                 priceAuthority: string;
                 priceAuthorityAdmin: string;
                 startGovernedUpgradable: string;
+                zoe: string;
             };
             instance: {
                 produce: string;

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":";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,qBAAqB,EAAE,sBAAsB;;;;8BA8D9D;+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"}
+{"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,CAsCjD;AAiBM,iSAdI,mBAAmB,qJACnB;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;YAC/B,kBAA0B,EAAE,YAAY,CAAC;SAClC,CAAC;KACH,CAAC;CACH,iBAgKH;AAWM;IAH+C,UAAU,UAA/C,OAAO,KAAK,QAAQ,OAAO,CAAC;qBAClC,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2BA1OP,MAAM;+BACF,MAAM;4BACT,MAAM;gCACF,MAAM;;;GAwR7B;AAQK,wGALI,OAAO,qBAAqB,EAAE,sBAAsB;;;;8BA8D9D;+BA/VY;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

@@ -63,8 +63,6 @@ export const ensureOracleBrands = async (
     },
   },
 ) => {
-  trace('ensureOracleBrands');
-
   const updateFreshBrand = async (brand, name, decimals) => {
     let b = await brand;
     if (!b) {
@@ -93,6 +91,7 @@ export const ensureOracleBrands = async (
  *       contractTerms: import('@agoric/inter-protocol/src/price/fluxAggregatorKit.js').ChainlinkConfig;
  *       IN_BRAND_NAME: string;
  *       OUT_BRAND_NAME: string;
+ *       priceAggregatorRef: Installation;
  *     };
  *   };
  * }} config
@@ -111,6 +110,7 @@ export const createPriceFeed = async (
       priceAuthority,
       priceAuthorityAdmin,
       startGovernedUpgradable,
+      zoe,
     },
     instance: { produce: produceInstance },
   },
@@ -122,38 +122,62 @@ export const createPriceFeed = async (
         contractTerms,
         IN_BRAND_NAME,
         OUT_BRAND_NAME,
+        priceAggregatorRef,
       },
     },
   },
 ) => {
-  trace('createPriceFeed');
+  trace('createPriceFeed', AGORIC_INSTANCE_NAME);
   const STORAGE_PATH = 'priceFeed';
 
   void E(client).assignBundle([_addr => ({ priceAuthority })]);
 
-  const timer = await chainTimerService;
+  let installationP;
+  await null;
+  if (priceAggregatorRef) {
+    const bundleID = await E.get(priceAggregatorRef).bundleID;
+    if (bundleID) {
+      installationP = E(zoe).installBundleID(bundleID);
+      await E.when(
+        installationP,
+        installation =>
+          E(E(agoricNamesAdmin).lookupAdmin('installation')).update(
+            'priceAggregator',
+            installation,
+          ),
+        err =>
+          console.error(
+            `🚨 failed to update priceAggregator instance for ${AGORIC_INSTANCE_NAME}`,
+            err,
+          ),
+      );
+    }
+  }
+  if (!installationP) {
+    installationP = E.get(
+      reserveThenGetNames(E(agoricNamesAdmin).lookupAdmin('installation'), [
+        'priceAggregator',
+      ]),
+    )[0];
+    console.error(
+      '🚨 failed to install new fluxAggregator bundle, reusing previous one.',
+    );
+  }
 
   /**
-   * Values come from economy-template.json, which at this writing had IN:ATOM,
-   * OUT:USD
-   *
    * @type {[
    *   [Brand<'nat'>, Brand<'nat'>],
-   *   [
-   *     Installation<
-   *       import('@agoric/inter-protocol/src/price/fluxAggregatorContract.js')['start]
-   *     >,
-   *   ],
+   *   Installation<import('@agoric/inter-protocol/src/price/fluxAggregatorContract.js')['start]>,
+   *   Timer,
    * ]}
    */
-  const [[brandIn, brandOut], [priceAggregator]] = await Promise.all([
+  const [[brandIn, brandOut], installation, timer] = await Promise.all([
     reserveThenGetNames(E(agoricNamesAdmin).lookupAdmin('oracleBrand'), [
       IN_BRAND_NAME,
       OUT_BRAND_NAME,
     ]),
-    reserveThenGetNames(E(agoricNamesAdmin).lookupAdmin('installation'), [
-      'priceAggregator',
-    ]),
+    installationP,
+    chainTimerService,
   ]);
 
   const unitAmountIn = await unitAmount(brandIn);
@@ -165,14 +189,11 @@ export const createPriceFeed = async (
     timer,
     unitAmountIn,
   });
-  trace('got terms');
-
   const label = sanitizePathSegment(AGORIC_INSTANCE_NAME);
 
   const storageNode = await makeStorageNodeChild(chainStorage, STORAGE_PATH);
   const marshaller = await E(board).getReadonlyMarshaller();
 
-  trace('awaiting startInstance');
   const faKit = await E(startGovernedUpgradable)({
     governedParams: {},
     privateArgs: {
@@ -183,7 +204,7 @@ export const createPriceFeed = async (
     },
     terms,
     label,
-    installation: priceAggregator,
+    installation,
   });
 
   // Publish price feed in home.priceAuthority.
@@ -203,6 +224,7 @@ export const createPriceFeed = async (
     .catch(err =>
       console.error(`🚨 failed to update ${AGORIC_INSTANCE_NAME}`, err),
     );
+
   // being after the above awaits means that when this resolves, the consumer
   // gets notified that the authority is in the registry and its instance is in
   // agoricNames.
@@ -213,7 +235,6 @@ export const createPriceFeed = async (
     faKit.governorCreatorFacet,
     AGORIC_INSTANCE_NAME,
   );
-  trace('registered', AGORIC_INSTANCE_NAME, faKit.instance);
 
   /**
    * Initialize a new oracle and send an invitation to administer it.
@@ -262,6 +283,7 @@ export const getManifestForPriceFeed = async (
         priceAuthority: t,
         priceAuthorityAdmin: t,
         startGovernedUpgradable: t,
+        zoe: t,
       },
       instance: {
         produce: t,