agoric 0.21.2-dev-76118c5.0 → 0.21.2-dev-312271b.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-76118c5.0+76118c5",
+  "version": "0.21.2-dev-312271b.0+312271b",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -28,29 +28,29 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-76118c5.0+76118c5",
-    "@agoric/deploy-script-support": "0.10.4-dev-76118c5.0+76118c5",
+    "@agoric/cosmic-swingset": "0.41.4-dev-312271b.0+312271b",
+    "@agoric/deploy-script-support": "0.10.4-dev-312271b.0+312271b",
     "ava": "^5.3.0",
     "c8": "^7.13.0",
     "dd-trace": "^4.11.1"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-76118c5.0+76118c5",
-    "@agoric/assert": "0.6.1-dev-76118c5.0+76118c5",
-    "@agoric/cache": "0.3.3-dev-76118c5.0+76118c5",
-    "@agoric/casting": "0.4.3-dev-76118c5.0+76118c5",
-    "@agoric/cosmic-proto": "0.3.1-dev-76118c5.0+76118c5",
-    "@agoric/ertp": "0.16.3-dev-76118c5.0+76118c5",
-    "@agoric/governance": "0.10.4-dev-76118c5.0+76118c5",
-    "@agoric/inter-protocol": "0.16.2-dev-76118c5.0+76118c5",
-    "@agoric/internal": "0.3.3-dev-76118c5.0+76118c5",
-    "@agoric/network": "0.1.1-dev-76118c5.0+76118c5",
-    "@agoric/smart-wallet": "0.5.4-dev-76118c5.0+76118c5",
-    "@agoric/store": "0.9.3-dev-76118c5.0+76118c5",
-    "@agoric/swingset-vat": "0.32.3-dev-76118c5.0+76118c5",
-    "@agoric/vats": "0.15.2-dev-76118c5.0+76118c5",
-    "@agoric/zoe": "0.26.3-dev-76118c5.0+76118c5",
-    "@agoric/zone": "0.2.3-dev-76118c5.0+76118c5",
+    "@agoric/access-token": "0.4.22-dev-312271b.0+312271b",
+    "@agoric/assert": "0.6.1-dev-312271b.0+312271b",
+    "@agoric/cache": "0.3.3-dev-312271b.0+312271b",
+    "@agoric/casting": "0.4.3-dev-312271b.0+312271b",
+    "@agoric/cosmic-proto": "0.3.1-dev-312271b.0+312271b",
+    "@agoric/ertp": "0.16.3-dev-312271b.0+312271b",
+    "@agoric/governance": "0.10.4-dev-312271b.0+312271b",
+    "@agoric/inter-protocol": "0.16.2-dev-312271b.0+312271b",
+    "@agoric/internal": "0.3.3-dev-312271b.0+312271b",
+    "@agoric/network": "0.1.1-dev-312271b.0+312271b",
+    "@agoric/smart-wallet": "0.5.4-dev-312271b.0+312271b",
+    "@agoric/store": "0.9.3-dev-312271b.0+312271b",
+    "@agoric/swingset-vat": "0.32.3-dev-312271b.0+312271b",
+    "@agoric/vats": "0.15.2-dev-312271b.0+312271b",
+    "@agoric/zoe": "0.26.3-dev-312271b.0+312271b",
+    "@agoric/zone": "0.2.3-dev-312271b.0+312271b",
     "@confio/relayer": "^0.9.0",
     "@cosmjs/crypto": "^0.30.1",
     "@cosmjs/encoding": "^0.30.1",
@@ -98,5 +98,5 @@
   "typeCoverage": {
     "atLeast": 77.53
   },
-  "gitHead": "76118c5ceb3aeed6bbb54f8d24c3b9e4ade43be2"
+  "gitHead": "312271b6db71af347640a4d3a789dd37e42e5c12"
 }

package/src/commands/oracle.js

@@ -70,6 +70,11 @@ export const makeOracleCommand = (logger, io = {}) => {
       env.AGORIC_KEYRING_BACKEND,
     );
 
+  const normalizeAddress = literalOrName =>
+    normalizeAddressWithOptions(literalOrName, oracle.opts(), {
+      execFileSync,
+    });
+
   const rpcTools = async () => {
     // XXX pass fetch to getNetworkConfig() explicitly
     const networkConfig = await getNetworkConfig(env);
@@ -161,7 +166,7 @@ export const makeOracleCommand = (logger, io = {}) => {
       console.warn('Now execute the prepared offer');
     });
 
-  const findOracleCap = async (from, readLatestHead) => {
+  const findOracleCap = async (instance, from, readLatestHead) => {
     const current = await getCurrent(from, { readLatestHead });
 
     const { offerToUsedInvitation: entries } = /** @type {any} */ (current);
@@ -169,8 +174,8 @@ export const makeOracleCommand = (logger, io = {}) => {
 
     for (const [offerId, { value }] of entries) {
       /** @type {{ description: string, instance: unknown }[]} */
-      const [{ description }] = value;
-      if (description === 'oracle invitation') {
+      const [{ description, instance: candidate }] = value;
+      if (description === 'oracle invitation' && candidate === instance) {
         return offerId;
       }
     }
@@ -179,11 +184,22 @@ export const makeOracleCommand = (logger, io = {}) => {
   oracle
     .command('find-continuing-id')
     .description('print id of specified oracle continuing invitation')
-    .requiredOption('--from <address>', 'from address', String)
+    .requiredOption(
+      '--from <address>',
+      'wallet address literal or name',
+      normalizeAddress,
+    )
+    .requiredOption(
+      '--pair [brandIn.brandOut]',
+      'token pair (brandIn.brandOut)',
+      s => s.split('.'),
+    )
     .action(async opts => {
-      const { readLatestHead } = await makeRpcUtils({ fetch });
+      const { readLatestHead, lookupPriceAggregatorInstance } =
+        await rpcTools();
+      const instance = lookupPriceAggregatorInstance(opts.pair);
 
-      const offerId = await findOracleCap(opts.from, readLatestHead);
+      const offerId = await findOracleCap(instance, opts.from, readLatestHead);
       if (!offerId) {
         console.error('No continuing ids found');
       }
@@ -211,11 +227,6 @@ export const makeOracleCommand = (logger, io = {}) => {
       console.log(inspect(capDatas[0], { depth: 10, colors: true }));
     });
 
-  /** @param {string} literalOrName */
-  const normalizeAddress = literalOrName =>
-    normalizeAddressWithOptions(literalOrName, oracle.opts(), {
-      execFileSync,
-    });
   const show = (info, indent = false) =>
     stdout.write(
       `${JSON.stringify(info, bigintReplacer, indent ? 2 : undefined)}\n`,
@@ -249,7 +260,8 @@ export const makeOracleCommand = (logger, io = {}) => {
          * }}
          */ { pair, keys, price },
       ) => {
-        const { readLatestHead, networkConfig } = await rpcTools();
+        const { readLatestHead, networkConfig, lookupPriceAggregatorInstance } =
+          await rpcTools();
         const wutil = await makeWalletUtils(
           { fetch, execFileSync, delay },
           networkConfig,
@@ -307,9 +319,12 @@ export const makeOracleCommand = (logger, io = {}) => {
           console.warn(err);
         });
 
+        const instance = lookupPriceAggregatorInstance(pair);
+
         console.error('pushPrice from each:', keyOrder);
         for await (const from of keyOrder) {
           const oracleAdminAcceptOfferId = await findOracleCap(
+            instance,
             from,
             readLatestHead,
           );