@agoric/vats 0.15.2-dev-6bf6362.0.6bf6362 → 0.15.2-dev-01b8bed.0.01b8bed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vats",
-  "version": "0.15.2-dev-6bf6362.0.6bf6362",
+  "version": "0.15.2-dev-01b8bed.0.01b8bed",
   "description": "Agoric's Vat library",
   "type": "module",
   "main": "./index.js",
@@ -22,19 +22,19 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/cosmic-proto": "0.4.1-dev-6bf6362.0.6bf6362",
-    "@agoric/ertp": "0.16.3-dev-6bf6362.0.6bf6362",
-    "@agoric/governance": "0.10.4-dev-6bf6362.0.6bf6362",
-    "@agoric/internal": "0.3.3-dev-6bf6362.0.6bf6362",
-    "@agoric/network": "0.1.1-dev-6bf6362.0.6bf6362",
-    "@agoric/notifier": "0.6.3-dev-6bf6362.0.6bf6362",
-    "@agoric/store": "0.9.3-dev-6bf6362.0.6bf6362",
-    "@agoric/swingset-vat": "0.32.3-dev-6bf6362.0.6bf6362",
-    "@agoric/time": "0.3.3-dev-6bf6362.0.6bf6362",
-    "@agoric/vat-data": "0.5.3-dev-6bf6362.0.6bf6362",
-    "@agoric/vow": "0.1.1-dev-6bf6362.0.6bf6362",
-    "@agoric/zoe": "0.26.3-dev-6bf6362.0.6bf6362",
-    "@agoric/zone": "0.2.3-dev-6bf6362.0.6bf6362",
+    "@agoric/cosmic-proto": "0.4.1-dev-01b8bed.0.01b8bed",
+    "@agoric/ertp": "0.16.3-dev-01b8bed.0.01b8bed",
+    "@agoric/governance": "0.10.4-dev-01b8bed.0.01b8bed",
+    "@agoric/internal": "0.3.3-dev-01b8bed.0.01b8bed",
+    "@agoric/network": "0.1.1-dev-01b8bed.0.01b8bed",
+    "@agoric/notifier": "0.6.3-dev-01b8bed.0.01b8bed",
+    "@agoric/store": "0.9.3-dev-01b8bed.0.01b8bed",
+    "@agoric/swingset-vat": "0.32.3-dev-01b8bed.0.01b8bed",
+    "@agoric/time": "0.3.3-dev-01b8bed.0.01b8bed",
+    "@agoric/vat-data": "0.5.3-dev-01b8bed.0.01b8bed",
+    "@agoric/vow": "0.1.1-dev-01b8bed.0.01b8bed",
+    "@agoric/zoe": "0.26.3-dev-01b8bed.0.01b8bed",
+    "@agoric/zone": "0.2.3-dev-01b8bed.0.01b8bed",
     "@endo/errors": "^1.2.13",
     "@endo/far": "^1.1.14",
     "@endo/import-bundle": "^1.5.2",
@@ -47,7 +47,7 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-6bf6362.0.6bf6362",
+    "@agoric/swingset-liveslots": "0.10.3-dev-01b8bed.0.01b8bed",
     "@endo/bundle-source": "^4.1.2",
     "@endo/init": "^1.1.12",
     "ava": "^5.3.0",
@@ -79,5 +79,5 @@
   "typeCoverage": {
     "atLeast": 90.31
   },
-  "gitHead": "6bf6362ab112a35cf93311f17160fc9e577729c6"
+  "gitHead": "01b8beda43fafc16d741a066c3195941fe52a015"
 }

package/src/ibc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ibc.d.ts","sourceRoot":"","sources":["ibc.js"],"names":[],"mappings":"AAsDO,kDAHI,IAAI,GACF,GAAG,CA8Hf;AAMM,yCAHI,IAAI,UACJ,QAAQ;cASH,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC;;qBAOpC,eAAe;mBACjB,aAAa;EAuqBpC;AAIM,uCADK,IAAI;IAQV;;;OAGG;qBAFQ,MAAM,OACN,GAAG;GAYnB;yBAn2Ba,OAAO,kBAAkB,CAAC;uBAG3B,IAAI,CAChB,cAAkB,EAClB,cAAkB,GAAG,WAAW,GAAG,qBAAqB,CACrD,GAAG;IACF,SAAS,EAAE,QAAQ,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CACnC;0BAdmB,mBAAmB;8BAC0B,aAAa;qCAH+B,iBAAiB;mCAC4F,YAAY;yCAAZ,YAAY;wCAZpM,iBAAiB;4BAcc,aAAa;oCAF4I,YAAY;8BADzH,iBAAiB"}
+{"version":3,"file":"ibc.d.ts","sourceRoot":"","sources":["ibc.js"],"names":[],"mappings":"AAwDO,kDAHI,IAAI,GACF,GAAG,CA8Hf;AAMM,yCAHI,IAAI,UACJ,QAAQ;cASH,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC;;qBAOpC,eAAe;mBACjB,aAAa;EA8qBpC;AAIM,uCADK,IAAI;IAQV;;;OAGG;qBAFQ,MAAM,OACN,GAAG;GAYnB;yBA12Ba,OAAO,kBAAkB,CAAC;uBAG3B,IAAI,CAChB,cAAkB,EAClB,cAAkB,GAAG,WAAW,GAAG,qBAAqB,CACrD,GAAG;IACF,SAAS,EAAE,QAAQ,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CACnC;0BAdmB,mBAAmB;8BAC0B,aAAa;qCAH+B,iBAAiB;mCAC4F,YAAY;yCAAZ,YAAY;wCAZpM,iBAAiB;4BAcc,aAAa;oCAF4I,YAAY;8BADzH,iBAAiB"}

package/src/ibc.js

@@ -11,6 +11,8 @@ import {
   decodeRemoteIbcAddress,
   encodeLocalIbcAddress,
   encodeRemoteIbcAddress,
+  decodeIbcEndpoint,
+  encodeIbcEndpoint,
 } from '../tools/ibc-utils.js';
 
 const trace = makeTracer('IBC', false);
@@ -454,10 +456,12 @@ export const prepareIBCProtocol = (zone, powers) => {
                 connectionHops: rHops,
               } = /** @type {IBCEvent<'channelOpenAck'>} */ (obj);
 
-              const outbounds = this.state.srcPortToOutbounds.has(portID)
-                ? [...this.state.srcPortToOutbounds.get(portID)]
+              const readonlyOutbounds = this.state.srcPortToOutbounds.has(
+                portID,
+              )
+                ? this.state.srcPortToOutbounds.get(portID)
                 : [];
-              const oidx = outbounds.findIndex(
+              const oidx = readonlyOutbounds.findIndex(
                 ({
                   counterparty: { port_id: iPortID },
                   connectionHops: iHops,
@@ -477,8 +481,11 @@ export const prepareIBCProtocol = (zone, powers) => {
                 },
               );
               oidx >= 0 || Fail`${portID}: did not expect channelOpenAck`;
-              const { onConnectP, localAddr, ...chanInfo } = outbounds[oidx];
-              outbounds.splice(oidx, 1);
+              const { onConnectP, localAddr, ...chanInfo } =
+                readonlyOutbounds[oidx];
+              const outbounds = readonlyOutbounds
+                .slice(0, oidx)
+                .concat(readonlyOutbounds.slice(oidx + 1));
               if (outbounds.length === 0) {
                 srcPortToOutbounds.delete(portID);
               } else {
@@ -493,7 +500,13 @@ export const prepareIBCProtocol = (zone, powers) => {
                 rVersion,
                 rChannelID,
               );
-              const localAddress = `${localAddr}/${chanInfo.order.toLowerCase()}/${rVersion}/ibc-channel/${channelID}`;
+              const decodedLocal = decodeIbcEndpoint(localAddr);
+              const localAddress = encodeIbcEndpoint({
+                ...decodedLocal,
+                order: chanInfo.order,
+                version: rVersion,
+                channelID,
+              });
               const rchandler = makeIBCConnectionHandler(
                 {
                   protocolUtils: util,
@@ -791,13 +804,9 @@ export const prepareIBCProtocol = (zone, powers) => {
           } = watcherContext;
           const { channelKeyToAttempt, channelKeyToInfo } = this.state;
 
-          const match = attemptedLocal.match(
-            // Match:  ... /ORDER/VERSION ...
-            new RegExp('^(/[^/]+/[^/]+)*/(ordered|unordered)/([^/]+)(/|$)'),
-          );
-
+          const al = decodeIbcEndpoint(attemptedLocal);
           const channelKey = `${channelID}:${portID}`;
-          if (!match) {
+          if (!al.version) {
             throw Error(
               `${channelKey}: cannot determine version from attempted local address ${attemptedLocal}`,
             );
@@ -806,7 +815,7 @@ export const prepareIBCProtocol = (zone, powers) => {
           channelKeyToAttempt.init(channelKey, attempt);
           channelKeyToInfo.init(channelKey, obj);
 
-          const negotiatedVersion = match[3];
+          const negotiatedVersion = al.version;
 
           try {
             if (asyncVersions) {

package/src/proposals/network-proposal.d.ts

@@ -55,7 +55,7 @@ export type SoloVats = {
  *
  * - loopback ports: `E(portAllocator).allocateCustomLocalPort()`
  * - an echo port: `E(portAllocator).allocateCustomIBCPort("echo")`
- * - echo port addrees: /ibc-port/custom-echo
+ * - echo port address: /ibc-port/custom-echo
  */
 export type NetVats = {
     network: ERef<NetworkVat>;

package/src/proposals/network-proposal.js

@@ -96,7 +96,7 @@ export const registerNetworkProtocols = async (vats, dibcBridgeManager) => {
  *
  * - loopback ports: `E(portAllocator).allocateCustomLocalPort()`
  * - an echo port: `E(portAllocator).allocateCustomIBCPort("echo")`
- * - echo port addrees: /ibc-port/custom-echo
+ * - echo port address: /ibc-port/custom-echo
  *
  * @param {BootstrapPowers & {
  *   produce: { portAllocator: Producer<any> };

package/src/types.d.ts

@@ -123,6 +123,20 @@ export type IBCPacket = JsonSafe<{
     timeout_height?: PacketSDKType['timeout_height'];
     timeout_timestamp?: PacketSDKType['timeout_timestamp'];
 }>;
+export interface NetworkEndpoints {
+    relative: {
+        ibc: [protocol: 'ibc', port: IBCPortID, channel: IBCChannelID];
+    };
+    absolute: {
+        ibc: [
+            protocol: 'ibc',
+            namespace: string,
+            reference: string,
+            port: IBCPortID,
+            channel: IBCChannelID
+        ];
+    };
+}
 export type IBCCounterParty = {
     port_id: IBCPortID;
     channel_id: IBCChannelID;

package/src/types.d.ts.map

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

package/src/types.ts

@@ -150,6 +150,21 @@ export type IBCPacket = JsonSafe<{
   timeout_timestamp?: PacketSDKType['timeout_timestamp'];
 }>;
 
+export interface NetworkEndpoints {
+  relative: {
+    ibc: [protocol: 'ibc', port: IBCPortID, channel: IBCChannelID];
+  };
+  absolute: {
+    ibc: [
+      protocol: 'ibc',
+      namespace: string,
+      reference: string,
+      port: IBCPortID,
+      channel: IBCChannelID,
+    ];
+  };
+}
+
 export type IBCCounterParty = {
   port_id: IBCPortID;
   channel_id: IBCChannelID;

package/tools/ibc-utils.d.ts

@@ -1,6 +1,40 @@
-export const REMOTE_ADDR_RE: RegExp;
+/**
+ * @file Conversion from IBC endpoints to Agoric Network API Endpoints
+ * @summary Utilities for constructing and parsing Agoric Network API IBC addresses, which
+ *   are used to identify IBC ports and channels in a Cosmos-participating
+ *   blockchain.
+ *
+ *   Agoric Network API addresses are roughly akin to Multiaddrs (@ref
+ *   https://github.com/multiformats/js-multiaddr) but with a less rigid
+ *   structure. Both share a similar textual representation, which is
+ *   encapsulated protocols and values separated by slashes.
+ */
 /** @typedef {`/${string}ibc-port/${string}/${'ordered' | 'unordered'}/${string}`} RemoteIbcAddress */
-export const LOCAL_ADDR_RE: RegExp;
+/** @typedef {`/ibc-port/${string}`} LocalIbcAddress */
+/**
+ * @import {IBCChannelID, IBCChannelOrdering,
+ *   IBCConnectionID, IBCPortID} from '../src/types.js';
+ */
+export const IBC_ADDR_RE: RegExp;
+export const VALID_ORDERS: readonly ["ordered", "unordered", "ORDERED", "UNORDERED"];
+export function encodeSlashes(raw: string): string;
+export function decodeSlashes(encoded: string): string;
+export function validateIbcAddress(addr: any): any;
+export function decodeIbcHops(h: string): IBCConnectionID[];
+export function decodeIbcEndpoint(addr: string): {
+    hops: IBCConnectionID[];
+    portID: IBCPortID;
+    order?: IBCChannelOrdering;
+    version?: string;
+    channelID?: IBCChannelID;
+};
+export function encodeIbcEndpoint({ hops, portID, order: rawOrder, version, channelID, }: {
+    hops?: string[] | undefined;
+    portID: string;
+    order: "ordered" | "unordered" | "ORDERED" | "UNORDERED";
+    version: string;
+    channelID?: string | undefined;
+}): import("@agoric/network").Endpoint;
 /**
  * @overload
  * @param {string} remoteAddr
@@ -17,13 +51,17 @@ export function validateRemoteIbcAddress(remoteAddr: string, returnMatch?: undef
 export function validateRemoteIbcAddress(remoteAddr: string, returnMatch: true): RegExpMatchArray;
 export function decodeRemoteIbcAddress(remoteAddr: string): {
     rPortID: string;
-    hops: `connection-${number}`[];
-    order: import("../index.js").IBCChannelOrdering;
+    order: IBCChannelOrdering;
     version: string;
+    hops: `connection-${number}`[];
 };
 export function localAddrToPortID(localAddr: LocalIbcAddress): string;
-export function encodeRemoteIbcAddress(hops: string[], rPortID: string, order: "ordered" | "unordered" | "ORDERED" | "UNORDERED", rVersion: string, rChannelID: string): RemoteIbcAddress;
+export function encodeRemoteIbcAddress(hops: string[], portID: string, order: "ordered" | "unordered" | "ORDERED" | "UNORDERED", version: string, channelID?: string): RemoteIbcAddress;
 export function encodeLocalIbcAddress(portID: string, order: "ordered" | "unordered" | "ORDERED" | "UNORDERED", version: string): string;
 export type RemoteIbcAddress = `/${string}ibc-port/${string}/${"ordered" | "unordered"}/${string}`;
 export type LocalIbcAddress = `/ibc-port/${string}`;
+import type { IBCConnectionID } from '../src/types.js';
+import type { IBCPortID } from '../src/types.js';
+import type { IBCChannelOrdering } from '../src/types.js';
+import type { IBCChannelID } from '../src/types.js';
 //# sourceMappingURL=ibc-utils.d.ts.map

package/tools/ibc-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ibc-utils.d.ts","sourceRoot":"","sources":["ibc-utils.js"],"names":[],"mappings":"AAAA,oCAC8G;AAE9G,sGAAsG;AAEtG,mCAA+E;;;;;;;AAI5E,qDACQ,MAAM,gBACN,SAAS,GAAG,KAAK,GACf,OAAO,CACnB;;;;;;;AAEE,qDACQ,MAAM,eACN,IAAI,GACF,gBAAgB,CAC5B;AAoBM,mDADK,MAAM;;;;;EA0BjB;AAOM,6CAHI,eAAe,GACb,MAAM,CAWlB;AAWM,6CAPI,MAAM,EAAE,WACR,MAAM,SACN,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW,YACjD,MAAM,cACN,MAAM,GACJ,gBAAgB,CAa5B;AAQM,8CAJI,MAAM,SACN,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW,WACjD,MAAM,UAIhB;+BA7Ga,IAAI,MAAM,YAAY,MAAM,IAAI,SAAS,GAAG,WAAW,IAAI,MAAM,EAAE;8BAGnE,aAAa,MAAM,EAAE"}
+{"version":3,"file":"ibc-utils.d.ts","sourceRoot":"","sources":["ibc-utils.js"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,sGAAsG;AACtG,uDAAuD;AAEvD;;;GAGG;AAEH,iCACsJ;AAGtJ,qFAKG;AAII,mCADK,MAAM,UAC8C;AAIzD,uCADK,MAAM,UACsD;AAGjE,mDASN;AAQM,iCAHI,MAAM,GACJ,eAAe,EAAE,CAsB7B;AAaM,wCATI,MAAM,GACJ;IACR,IAAI,EAAE,eAAe,EAAE,CAAC;IACxB,MAAM,EAAE,SAAS,CAAC;IAClB,KAAK,CAAC,EAAE,kBAAkB,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,YAAY,CAAC;CAC1B,CAkBH;AAYM,0FAPJ;IAAwB,IAAI;IACP,MAAM,EAAnB,MAAM;IACkD,KAAK,EAA7D,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW;IACpC,OAAO,EAApB,MAAM;IACQ,SAAS;CAC/B,GAAU,OAAO,iBAAiB,EAAE,QAAQ,CAwC9C;;;;;;;AAIE,qDACQ,MAAM,gBACN,SAAS,GAAG,KAAK,GACf,OAAO,CACnB;;;;;;;AAEE,qDACQ,MAAM,eACN,IAAI,GACF,gBAAgB,CAC5B;AA0BM,mDADK,MAAM;;;;;EAYjB;AAOM,6CAHI,eAAe,GACb,MAAM,CAqBlB;AAWM,6CAPI,MAAM,EAAE,UACR,MAAM,SACN,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW,WACjD,MAAM,cACN,MAAM,GACJ,gBAAgB,CAiB5B;AAQM,8CAJI,MAAM,SACN,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW,WACjD,MAAM,UAIhB;+BAjQa,IAAI,MAAM,YAAY,MAAM,IAAI,SAAS,GAAG,WAAW,IAAI,MAAM,EAAE;8BACnE,aAAa,MAAM,EAAE;qCAIG,iBAAiB;+BAAjB,iBAAiB;wCAAjB,iBAAiB;kCAAjB,iBAAiB"}

package/tools/ibc-utils.js

@@ -1,11 +1,162 @@
-export const REMOTE_ADDR_RE =
-  /^(?<hops>\/ibc-hop\/[^/]+)*\/ibc-port\/(?<portID>[^/]+)\/(?<order>ordered|unordered)\/(?<version>[^/]+)$/s;
-harden(REMOTE_ADDR_RE);
-/** @typedef {`/${string}ibc-port/${string}/${'ordered' | 'unordered'}/${string}`} RemoteIbcAddress */
+/**
+ * @file Conversion from IBC endpoints to Agoric Network API Endpoints
+ * @summary Utilities for constructing and parsing Agoric Network API IBC addresses, which
+ *   are used to identify IBC ports and channels in a Cosmos-participating
+ *   blockchain.
+ *
+ *   Agoric Network API addresses are roughly akin to Multiaddrs (@ref
+ *   https://github.com/multiformats/js-multiaddr) but with a less rigid
+ *   structure. Both share a similar textual representation, which is
+ *   encapsulated protocols and values separated by slashes.
+ */
 
-export const LOCAL_ADDR_RE = /^\/ibc-port\/(?<portID>[-a-zA-Z0-9._+#[\]<>]+)$/;
+/** @typedef {`/${string}ibc-port/${string}/${'ordered' | 'unordered'}/${string}`} RemoteIbcAddress */
 /** @typedef {`/ibc-port/${string}`} LocalIbcAddress */
 
+/**
+ * @import {IBCChannelID, IBCChannelOrdering,
+ *   IBCConnectionID, IBCPortID} from '../src/types.js';
+ */
+
+export const IBC_ADDR_RE =
+  /^(?<hops>\/ibc-hop\/[^/]+)*\/ibc-port\/(?<portID>[^/]+)(\/(?<order>ordered|unordered)\/(?<version>[^/]+)(\/ibc-channel\/(?<channelID>[^/]+))?)?$/s;
+harden(IBC_ADDR_RE);
+
+export const VALID_ORDERS = /** @type {const} */ ([
+  'ordered',
+  'unordered',
+  'ORDERED',
+  'UNORDERED',
+]);
+harden(VALID_ORDERS);
+
+/** @param {string} raw */
+export const encodeSlashes = raw => raw.replaceAll('/', '\\x2f');
+harden(encodeSlashes);
+
+/** @param {string} encoded */
+export const decodeSlashes = encoded => encoded.replaceAll('\\x2f', '/');
+harden(decodeSlashes);
+
+export const validateIbcAddress = addr => {
+  const match = addr.match(IBC_ADDR_RE);
+  // .groups is to inform TS
+  if (!(match && match.groups)) {
+    throw TypeError(
+      `IBC address ${addr} must be '(/ibc-hop/CONNECTION)*/ibc-port/PORT/(ordered|unordered)/VERSION(/ibc-channel/CHANNEL_ID)?'`,
+    );
+  }
+  return match;
+};
+
+/**
+ * Decode the /ibc-hop/CONNECTION segments of an IBC address.
+ *
+ * @param {string} h
+ * @returns {IBCConnectionID[]}
+ */
+export const decodeIbcHops = h => {
+  /** @type {IBCConnectionID[]} */
+  const hops = [];
+
+  /** @type {string} */
+  while (h) {
+    const m = h.match(/^\/ibc-hop\/(?<hop>[^/]+)/);
+    if (!m || !m.groups) {
+      throw Error(
+        `internal: ${JSON.stringify(h)} did not begin with "/ibc-hop/XXX"`,
+      );
+    }
+    h = h.slice(m[0].length);
+
+    const hop = /** @type {IBCConnectionID} */ (m.groups.hop);
+    assert(typeof hop === 'string' && hop.startsWith('connection-'));
+    hops.push(hop);
+  }
+
+  return hops;
+};
+harden(decodeIbcHops);
+
+/**
+ * @param {string} addr
+ * @returns {{
+ *   hops: IBCConnectionID[];
+ *   portID: IBCPortID;
+ *   order?: IBCChannelOrdering;
+ *   version?: string;
+ *   channelID?: IBCChannelID;
+ * }}
+ */
+export const decodeIbcEndpoint = addr => {
+  const match = validateIbcAddress(addr);
+  if (!match.groups)
+    throw Error('Unexpected error, validateRemoteIbcAddress should throw.');
+
+  const hops = decodeIbcHops(match.groups.hops);
+
+  // Generate a circuit.
+  const { portID, version, channelID, order } = match.groups;
+  return {
+    hops,
+    portID,
+    ...(order && { order: order.toUpperCase() }),
+    ...(version && { version: decodeSlashes(version) }),
+    ...(channelID && { channelID }),
+  };
+};
+harden(decodeIbcEndpoint);
+
+/**
+ * @param {object} spec
+ * @param {string[]} [spec.hops]
+ * @param {string} spec.portID
+ * @param {'ordered' | 'unordered' | 'ORDERED' | 'UNORDERED'} spec.order
+ * @param {string} spec.version
+ * @param {string} [spec.channelID]
+ * @returns {import('@agoric/network').Endpoint}
+ */
+export const encodeIbcEndpoint = ({
+  hops = [],
+  portID,
+  order: rawOrder,
+  version,
+  channelID,
+}) => {
+  const isLegitString = str =>
+    typeof str === 'string' && str && !str.includes('/');
+  let addr = '';
+  assert(Array.isArray(hops), 'hops must be an array');
+  for (const hop of hops) {
+    assert(isLegitString(hop), `invalid hop ${hop}`);
+    addr += `/ibc-hop/${hop}`;
+  }
+  assert(isLegitString(portID), `invalid portID ${portID}`);
+  addr += `/ibc-port/${portID}`;
+
+  if (rawOrder !== undefined) {
+    assert(isLegitString(rawOrder), `invalid order ${rawOrder}`);
+
+    assert(
+      VALID_ORDERS.includes(rawOrder),
+      `invalid order ${rawOrder}; ${rawOrder} not found in ${JSON.stringify(VALID_ORDERS)}`,
+    );
+
+    const order = rawOrder.toLowerCase();
+
+    assert(typeof version === 'string' && version, 'missing version');
+    addr += `/${order}/${encodeSlashes(version)}`;
+
+    if (channelID !== undefined) {
+      assert(isLegitString(channelID), `invalid channelID ${channelID}`);
+      addr += `/ibc-channel/${channelID}`;
+    }
+  }
+
+  return addr;
+};
+harden(encodeIbcEndpoint);
+
 /**
  * @overload
  * @param {string} remoteAddr
@@ -26,42 +177,34 @@ export const LOCAL_ADDR_RE = /^\/ibc-port\/(?<portID>[-a-zA-Z0-9._+#[\]<>]+)$/;
  * @param {boolean} [returnMatch]
  */
 export const validateRemoteIbcAddress = (remoteAddr, returnMatch = false) => {
-  const match = remoteAddr.match(REMOTE_ADDR_RE);
+  const match = validateIbcAddress(remoteAddr);
   // .groups is to inform TS https://github.com/microsoft/TypeScript/issues/32098
   if (!(match && match.groups)) {
     throw TypeError(
       `Remote address ${remoteAddr} must be '(/ibc-hop/CONNECTION)*/ibc-port/PORT/(ordered|unordered)/VERSION'`,
     );
   }
+  if (match.groups.channelID) {
+    throw TypeError(
+      `Remote address ${remoteAddr} must not include channelID; found ${match.groups.channelID}`,
+    );
+  }
   return returnMatch ? match : true;
 };
+harden(validateRemoteIbcAddress);
 
 /** @param {string} remoteAddr */
 export const decodeRemoteIbcAddress = remoteAddr => {
-  const match = validateRemoteIbcAddress(remoteAddr, true);
-  if (!match.groups)
-    throw Error('Unexpected error, validateRemoteIbcAddress should throw.');
-
-  /** @type {import('../src/types.js').IBCConnectionID[]} */
-  const hops = [];
-
-  let h = match.groups.hops;
-  while (h) {
-    const m = h.match(/^\/ibc-hop\/(?<hop>[^/]+)/);
-    if (!m) {
-      throw Error(
-        `internal: ${JSON.stringify(h)} did not begin with "/ibc-hop/XXX"`,
-      );
-    }
-    h = h.substr(m[0].length);
-    // @ts-expect-error unchecked cast
-    hops.push(m.groups.hop);
-  }
-  // Generate a circuit.
-  const { portID: rPortID, version } = match.groups;
-  /** @type {import('../src/types.js').IBCChannelOrdering} */
-  const order = match.groups.order === 'ordered' ? 'ORDERED' : 'UNORDERED';
-  return { rPortID, hops, order, version };
+  validateRemoteIbcAddress(remoteAddr);
+  const {
+    hops,
+    portID: rPortID,
+    order,
+    version,
+  } = decodeIbcEndpoint(remoteAddr);
+  assert(order !== undefined, 'missing order');
+  assert(version !== undefined, 'missing version');
+  return { rPortID, order, version, hops };
 };
 harden(decodeRemoteIbcAddress);
 
@@ -70,36 +213,50 @@ harden(decodeRemoteIbcAddress);
  * @returns {string}
  */
 export const localAddrToPortID = localAddr => {
-  const m = localAddr.match(LOCAL_ADDR_RE);
+  const m = localAddr.match(IBC_ADDR_RE);
   // .groups is to inform TS https://github.com/microsoft/TypeScript/issues/32098
   if (!(m && m.groups)) {
     throw TypeError(
       `Invalid port specification ${localAddr}; expected "/ibc-port/PORT"`,
     );
   }
+  for (const group of Object.keys(m.groups)) {
+    if (group === 'portID') {
+      continue;
+    }
+    if (m.groups[group] !== undefined) {
+      throw TypeError(
+        `Invalid port specification ${localAddr}; unexpected ${group}=${m.groups[group]}`,
+      );
+    }
+  }
   return m.groups.portID;
 };
 harden(localAddrToPortID);
 
 /**
  * @param {string[]} hops
- * @param {string} rPortID
+ * @param {string} portID
  * @param {'ordered' | 'unordered' | 'ORDERED' | 'UNORDERED'} order
- * @param {string} rVersion
- * @param {string} rChannelID
+ * @param {string} version
+ * @param {string} [channelID]
  * @returns {RemoteIbcAddress}
  */
 export const encodeRemoteIbcAddress = (
   hops,
-  rPortID,
+  portID,
   order,
-  rVersion,
-  rChannelID,
+  version,
+  channelID,
 ) => {
-  const ibcHops = hops.map(hop => `/ibc-hop/${hop}`).join('/');
-  return /** @type {RemoteIbcAddress} */ (
-    `${ibcHops}/ibc-port/${rPortID}/${order.toLowerCase()}/${rVersion}/ibc-channel/${rChannelID}`
-  );
+  const ep = encodeIbcEndpoint({
+    hops,
+    portID,
+    order,
+    version,
+    ...(channelID && { channelID }),
+  });
+  return /** @type {RemoteIbcAddress} */ (ep);
 };
 harden(encodeRemoteIbcAddress);
 
@@ -109,7 +266,6 @@ harden(encodeRemoteIbcAddress);
  * @param {string} version
  */
 export const encodeLocalIbcAddress = (portID, order, version) => {
-  return `/ibc-port/${portID}/${order.toLowerCase()}/${version}`;
+  return encodeIbcEndpoint({ portID, order, version });
 };
-
 harden(encodeLocalIbcAddress);