@agoric/orchestration 0.1.1-dev-3c4ffbe.0.3c4ffbe → 0.1.1-dev-47014db.0.47014db

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.1.1-dev-3c4ffbe.0.3c4ffbe",
+  "version": "0.1.1-dev-47014db.0.47014db",
   "description": "Chain abstraction for Agoric's orchestration clients",
   "type": "module",
   "main": "index.js",
@@ -35,19 +35,19 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/async-flow": "0.1.1-dev-3c4ffbe.0.3c4ffbe",
-    "@agoric/cosmic-proto": "0.4.1-dev-3c4ffbe.0.3c4ffbe",
-    "@agoric/ertp": "0.16.3-dev-3c4ffbe.0.3c4ffbe",
-    "@agoric/internal": "0.3.3-dev-3c4ffbe.0.3c4ffbe",
-    "@agoric/network": "0.1.1-dev-3c4ffbe.0.3c4ffbe",
-    "@agoric/notifier": "0.6.3-dev-3c4ffbe.0.3c4ffbe",
-    "@agoric/store": "0.9.3-dev-3c4ffbe.0.3c4ffbe",
-    "@agoric/time": "0.3.3-dev-3c4ffbe.0.3c4ffbe",
-    "@agoric/vat-data": "0.5.3-dev-3c4ffbe.0.3c4ffbe",
-    "@agoric/vats": "0.15.2-dev-3c4ffbe.0.3c4ffbe",
-    "@agoric/vow": "0.1.1-dev-3c4ffbe.0.3c4ffbe",
-    "@agoric/zoe": "0.26.3-dev-3c4ffbe.0.3c4ffbe",
-    "@agoric/zone": "0.2.3-dev-3c4ffbe.0.3c4ffbe",
+    "@agoric/async-flow": "0.1.1-dev-47014db.0.47014db",
+    "@agoric/cosmic-proto": "0.4.1-dev-47014db.0.47014db",
+    "@agoric/ertp": "0.16.3-dev-47014db.0.47014db",
+    "@agoric/internal": "0.3.3-dev-47014db.0.47014db",
+    "@agoric/network": "0.1.1-dev-47014db.0.47014db",
+    "@agoric/notifier": "0.6.3-dev-47014db.0.47014db",
+    "@agoric/store": "0.9.3-dev-47014db.0.47014db",
+    "@agoric/time": "0.3.3-dev-47014db.0.47014db",
+    "@agoric/vat-data": "0.5.3-dev-47014db.0.47014db",
+    "@agoric/vats": "0.15.2-dev-47014db.0.47014db",
+    "@agoric/vow": "0.1.1-dev-47014db.0.47014db",
+    "@agoric/zoe": "0.26.3-dev-47014db.0.47014db",
+    "@agoric/zone": "0.2.3-dev-47014db.0.47014db",
     "@cosmjs/encoding": "^0.36.0",
     "@endo/base64": "^1.0.12",
     "@endo/errors": "^1.2.13",
@@ -59,7 +59,7 @@
     "bs58": "^6.0.0"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-3c4ffbe.0.3c4ffbe",
+    "@agoric/swingset-liveslots": "0.10.3-dev-47014db.0.47014db",
     "@chain-registry/client": "^1.53.194",
     "@cosmjs/amino": "^0.36.0",
     "@cosmjs/proto-signing": "^0.36.0",
@@ -105,5 +105,5 @@
   "typeCoverage": {
     "atLeast": 97.49
   },
-  "gitHead": "3c4ffbe7c4da60bfe6decd7c49262d4a3231352a"
+  "gitHead": "47014db07286cf552da73810603af34ef3e7b064"
 }

package/src/exos/local-orchestration-account.d.ts

@@ -135,16 +135,17 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, { makeRecorderKi
     };
     parseInboundTransferWatcher: {
         /**
-         * @param {QueryDenomHashResponse} localDenomHash
+         * @param {{ error?: string; reply: TypedJson<string> }[]
+         *   | TypedJson<string>} result
          * @param {Awaited<
          *   ReturnType<LocalAccountMethods['parseInboundTransfer']>
          * >} naiveResult
          */
-        onFulfilled(localDenomHash: QueryDenomHashResponse, naiveResult: Awaited<ReturnType<LocalAccountMethods["parseInboundTransfer"]>>): {
-            amount: {
-                denom: string;
-                value: bigint;
-            };
+        onFulfilled(result: {
+            error?: string;
+            reply: TypedJson<string>;
+        }[] | TypedJson<string>, naiveResult: Awaited<ReturnType<LocalAccountMethods["parseInboundTransfer"]>>): {
+            amount: DenomAmount;
             fromAccount: string;
             toAccount: string;
             extra: Record<string, any>;
@@ -253,7 +254,6 @@ import type { TransferRoute } from '@agoric/orchestration';
 import type { DenomAmount } from '@agoric/orchestration';
 import type { ZCFSeat } from '@agoric/zoe';
 import type { ResponseTo } from '@agoric/cosmic-proto';
-import type { QueryDenomHashResponse } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/query.js';
 import type { LocalAccountMethods } from '@agoric/orchestration';
 import type { RecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
 import type { PacketTools } from './packet-tools.js';

package/src/exos/local-orchestration-account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-orchestration-account.d.ts","sourceRoot":"","sources":["local-orchestration-account.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"local-orchestration-account.d.ts","sourceRoot":"","sources":["local-orchestration-account.js"],"names":[],"mappings":"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"}

package/src/exos/local-orchestration-account.js

@@ -9,7 +9,10 @@ import { E } from '@endo/far';
 import { Fail, q } from '@endo/errors';
 
 import { MsgTransfer as MsgTransferType } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
-import { QueryDenomHashRequest as QueryDenomHashRequestType } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/query.js';
+import {
+  QueryDenomHashRequest as QueryDenomHashRequestType,
+  QueryDenomHashResponse as QueryDenomHashResponseType,
+} from '@agoric/cosmic-proto/ibc/applications/transfer/v1/query.js';
 import {
   QueryAllBalancesRequest as QueryAllBalancesRequestType,
   QueryBalanceRequest as QueryBalanceRequestType,
@@ -36,8 +39,11 @@ import { prepareIBCTools } from './ibc-packet.js';
 import { coerceCoin, coerceDenomAmount } from '../utils/amounts.js';
 import { TransferRouteShape } from './chain-hub.js';
 
+const { details: X } = assert;
+
 const MsgTransfer = CodecHelper(MsgTransferType);
 const QueryDenomHashRequest = CodecHelper(QueryDenomHashRequestType);
+const QueryDenomHashResponse = CodecHelper(QueryDenomHashResponseType);
 const QueryAllBalancesRequest = CodecHelper(QueryAllBalancesRequestType);
 const QueryBalanceRequest = CodecHelper(QueryBalanceRequestType);
 const MsgDelegate = CodecHelper(MsgDelegateType);
@@ -72,6 +78,22 @@ const { Vow$ } = NetworkShape; // TODO #9611
 
 const EVow$ = shape => M.or(Vow$(shape), M.promise(/* shape */));
 
+/**
+ * @template {string} TU
+ * @param {{ error?: string; reply: TypedJson<TU> }[] | TypedJson<TU>} result
+ * @returns {{ error?: string; reply: TypedJson<TU> }}
+ */
+const extractFirstQueryResult = result => {
+  if (Array.isArray(result)) {
+    assert(
+      result.length > 0,
+      X`Expected result to be a nonempty array, got ${result}`,
+    );
+    return result[0];
+  }
+  return { reply: result };
+};
+
 /**
  * @typedef {object} LocalChainAccountNotification
  * @property {string} address
@@ -115,6 +137,12 @@ const PUBLIC_TOPICS = {
   account: ['Account holder status', M.any()],
 };
 
+/**
+ * @see {@link https://github.com/cosmos/ibc-go/blob/a24a6c6/modules/apps/transfer/types/errors.go#L13}
+ * a24a6c6 Feb 27, 2023
+ */
+const ErrTraceNotFound = 'denomination trace not found';
+
 /**
  * @param {Zone} zone
  * @param {object} powers
@@ -198,7 +226,7 @@ export const prepareLocalOrchestrationAccountKit = (
         ),
       }),
       parseInboundTransferWatcher: M.interface('parseInboundTransferWatcher', {
-        onFulfilled: M.call(M.record(), M.record()).returns(M.record()),
+        onFulfilled: M.call(M.any(), M.record()).returns(M.record()),
         onRejected: M.call(M.any(), M.record()).returns(M.record()),
       }),
       invitationMakers: M.interface('invitationMakers', {
@@ -516,12 +544,23 @@ export const prepareLocalOrchestrationAccountKit = (
       },
       parseInboundTransferWatcher: {
         /**
-         * @param {QueryDenomHashResponse} localDenomHash
+         * @param {{ error?: string; reply: TypedJson<string> }[]
+         *   | TypedJson<string>} result
          * @param {Awaited<
          *   ReturnType<LocalAccountMethods['parseInboundTransfer']>
          * >} naiveResult
          */
-        onFulfilled(localDenomHash, naiveResult) {
+        onFulfilled(result, naiveResult) {
+          const { error, reply } = extractFirstQueryResult(result);
+          if (typeof error === 'string') {
+            if (error.includes(ErrTraceNotFound)) {
+              // Looks like the trace was not found; The naive result is good enough.
+              return naiveResult;
+            }
+            throw Error(`IBC denom trace query failed: ${error}`);
+          }
+
+          const localDenomHash = QueryDenomHashResponse.fromTyped(reply);
           const localDenom = `ibc/${localDenomHash.hash}`;
           const { amount, ...rest } = naiveResult;
           const { denom: _, ...amountRest } = amount;
@@ -539,7 +578,7 @@ export const prepareLocalOrchestrationAccountKit = (
         onRejected(reason, naiveResult) {
           if (
             reason instanceof Error &&
-            String(reason.message).includes('denomination trace not found')
+            String(reason.message).includes(ErrTraceNotFound)
           ) {
             // Looks like the trace was not found; The naive result is good enough.
             return naiveResult;
@@ -836,11 +875,11 @@ export const prepareLocalOrchestrationAccountKit = (
 
             // Find the local denom hash for the transferDenom, if there is one.
             return watch(
-              E(localchain).query(
+              E(localchain).queryMany([
                 QueryDenomHashRequest.typedJson({
                   trace: denomOrTrace,
                 }),
-              ),
+              ]),
               this.facets.parseInboundTransferWatcher,
               buildReturnValue(denomOrTrace),
             );