@agoric/orchestration 0.1.1-dev-66bf702.0 → 0.1.1-dev-76f3e6f.0

package/src/proposals/orchestration-proposal.js

@@ -2,7 +2,7 @@ import { Fail } from '@endo/errors';
 import { E, Far } from '@endo/far';
 import { makeMarshal } from '@endo/marshal';
 import { makeTracer } from '@agoric/internal';
-import { registerChainNamespace } from '../chain-info.js';
+import { registerKnownChains } from '../chain-info.js';
 import { CHAIN_KEY, CONNECTIONS_KEY } from '../exos/chain-hub.js';
 
 const trace = makeTracer('CoreEvalOrchestration', true);
@@ -127,7 +127,7 @@ export const initChainInfo = async ({
   await publishChainInfoToChainStorage(agoricNamesAdmin, chainStorageP);
 
   // Now register the names
-  await registerChainNamespace(agoricNamesAdmin, trace);
+  await registerKnownChains(agoricNamesAdmin, trace);
 };
 harden(initChainInfo);
 

package/src/proposals/start-stakeAtom.js

@@ -59,8 +59,8 @@ export const startStakeAtom = async ({
     installation: stakeIca,
     terms: {
       chainId: cosmoshub.chainId,
-      hostConnectionId: connectionInfo.id,
-      controllerConnectionId: connectionInfo.counterparty.connection_id,
+      hostConnectionId: connectionInfo.counterparty.connection_id,
+      controllerConnectionId: connectionInfo.id,
       bondDenom: cosmoshub.stakingTokens[0].denom,
       icqEnabled: cosmoshub.icqEnabled,
     },

package/src/proposals/start-stakeOsmo.js

@@ -64,8 +64,8 @@ export const startStakeOsmo = async ({
     installation: stakeIca,
     terms: {
       chainId: osmosis.chainId,
-      hostConnectionId: connectionInfo.id,
-      controllerConnectionId: connectionInfo.counterparty.connection_id,
+      hostConnectionId: connectionInfo.counterparty.connection_id,
+      controllerConnectionId: connectionInfo.id,
       bondDenom: osmosis.stakingTokens[0].denom,
       icqEnabled: osmosis.icqEnabled,
     },

package/src/typeGuards.d.ts

@@ -1,6 +1,6 @@
 /**
  * @import {TypedPattern} from '@agoric/internal';
- * @import {CosmosChainInfo} from './cosmos-api.js';
+ * @import {ChainInfo, CosmosChainInfo} from './types.js';
  */
 /**
  * Used for IBC Channel Connections that only send outgoing transactions. If
@@ -42,11 +42,10 @@ export const IBCChannelIDShape: import("@endo/patterns").Matcher;
 export const IBCChannelInfoShape: import("@endo/patterns").Matcher;
 export const IBCConnectionIDShape: import("@endo/patterns").Matcher;
 export const IBCConnectionInfoShape: import("@endo/patterns").Matcher;
-/**
- * @type {TypedPattern<CosmosChainInfo>}
- */
+/** @type {TypedPattern<CosmosChainInfo>} */
 export const CosmosChainInfoShape: TypedPattern<CosmosChainInfo>;
-export const ChainInfoShape: import("@endo/patterns").Matcher;
+/** @type {TypedPattern<ChainInfo>} */
+export const ChainInfoShape: TypedPattern<ChainInfo>;
 export const LocalChainAccountShape: import("@endo/patterns").Matcher;
 export const DenomShape: import("@endo/patterns").Matcher;
 export const BrandInfoShape: import("@endo/patterns").Matcher;
@@ -64,6 +63,7 @@ export namespace TimestampProtoShape {
     let seconds: import("@endo/patterns").Matcher;
     let nanos: import("@endo/patterns").Matcher;
 }
-import type { CosmosChainInfo } from './cosmos-api.js';
+import type { CosmosChainInfo } from './types.js';
 import type { TypedPattern } from '@agoric/internal';
+import type { ChainInfo } from './types.js';
 //# sourceMappingURL=typeGuards.d.ts.map

package/src/typeGuards.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typeGuards.d.ts","sourceRoot":"","sources":["typeGuards.js"],"names":[],"mappings":"AAIA;;;GAGG;AAEH;;;;GAIG;AACH;;;GAQE;;;;;;;;;;;;;;;;;;;;;;AAiBF,8DAAkE;;;;;AAOlE,uEAUE;AAEF,iEAA4C;AAC5C,mEAQG;AACH,oEAA+C;AAC/C,sEAYG;AAEH;;GAEG;AACH,mCAFU,aAAa,eAAe,CAAC,CAYrC;AAGF,8DAAsC;AACtC,sEAAuE;AACvE,0DAAqC;AAErC,8DAAsC;;;;;;AAItC,mBAAmB;AACnB;;;GAGG;;;;;qCAzG+B,iBAAiB;kCADpB,kBAAkB"}
+{"version":3,"file":"typeGuards.d.ts","sourceRoot":"","sources":["typeGuards.js"],"names":[],"mappings":"AAIA;;;GAGG;AAEH;;;;GAIG;AACH;;;GAQE;;;;;;;;;;;;;;;;;;;;;;AAiBF,8DAAkE;;;;;AAOlE,uEAUE;AAEF,iEAA4C;AAC5C,mEAQG;AACH,oEAA+C;AAC/C,sEAYG;AAEH,4CAA4C;AAC5C,mCADW,aAAa,eAAe,CAAC,CAWtC;AAEF,sCAAsC;AACtC,6BADW,aAAa,SAAS,CAAC,CAG/B;AACH,sEAAuE;AACvE,0DAAqC;AAErC,8DAAsC;;;;;;AAItC,mBAAmB;AACnB;;;GAGG;;;;;qCAzG0C,YAAY;kCAD1B,kBAAkB;+BACJ,YAAY"}

package/src/typeGuards.js

@@ -4,7 +4,7 @@ import { M } from '@endo/patterns';
 
 /**
  * @import {TypedPattern} from '@agoric/internal';
- * @import {CosmosChainInfo} from './cosmos-api.js';
+ * @import {ChainInfo, CosmosChainInfo} from './types.js';
  */
 
 /**
@@ -81,9 +81,7 @@ export const IBCConnectionInfoShape = M.splitRecord({
   transferChannel: IBCChannelInfoShape,
 });
 
-/**
- * @type {TypedPattern<CosmosChainInfo>}
- */
+/** @type {TypedPattern<CosmosChainInfo>} */
 export const CosmosChainInfoShape = M.splitRecord(
   {
     chainId: M.string(),
@@ -96,11 +94,13 @@ export const CosmosChainInfoShape = M.splitRecord(
   },
 );
 
-// FIXME more validation
-export const ChainInfoShape = M.any();
+/** @type {TypedPattern<ChainInfo>} */
+export const ChainInfoShape = M.splitRecord({
+  chainId: M.string(),
+});
 export const LocalChainAccountShape = M.remotable('LocalChainAccount');
 export const DenomShape = M.string();
-// FIXME more validation
+// TODO define for #9211
 export const BrandInfoShape = M.any();
 
 export const DenomAmountShape = { denom: DenomShape, value: M.bigint() };

package/src/utils/address.js

@@ -7,7 +7,7 @@ import { Fail } from '@endo/errors';
  */
 
 /**
- * @param {IBCConnectionID} hostConnectionId Counterpart Connection ID
+ * @param {IBCConnectionID} hostConnectionId Counterparty Connection ID
  * @param {IBCConnectionID} controllerConnectionId Self Connection ID
  * @param {object} [opts]
  * @param {string} [opts.encoding] - message encoding format for the channel.

package/src/utils/registry.js

@@ -53,8 +53,8 @@ function toConnectionEntry(ibcInfo, name, chainInfo) {
   }
   const [channel] = transferChannels;
   const [channelFrom, channelTo] = fromChain1
-    ? [channel.chain_2, channel.chain_1]
-    : [channel.chain_1, channel.chain_2];
+    ? [channel.chain_1, channel.chain_2]
+    : [channel.chain_2, channel.chain_1];
   const record = {
     id: /** @type {IBCConnectionID} */ (from.connection_id),
     client_id: from.client_id,

package/src/utils/start-helper.d.ts

@@ -2,13 +2,13 @@ export function provideOrchestration(zcf: ZCF, baggage: Baggage, remotePowers: O
     chainHub: import("@endo/exo").Guarded<{
         registerChain(name: string, chainInfo: import("../cosmos-api.js").CosmosChainInfo): void;
         getChainInfo<K extends string>(chainName: K): import("@agoric/vow").Vow<ActualChainInfo<K>>;
-        registerConnection(chainId1: string, chainId2: string, connectionInfo: import("../cosmos-api.js").IBCConnectionInfo): void;
-        getConnectionInfo(chain1: string | {
+        registerConnection(primaryChainId: string, counterpartyChainId: string, connectionInfo: import("../cosmos-api.js").IBCConnectionInfo): void;
+        getConnectionInfo(primary: string | {
             chainId: string;
-        }, chain2: string | {
+        }, counter: string | {
             chainId: string;
         }): import("@agoric/vow").Vow<import("../cosmos-api.js").IBCConnectionInfo>;
-        getChainsAndConnection<C1 extends string, C2 extends string>(chainName1: C1, chainName2: C2): import("@agoric/vow").Vow<[ActualChainInfo<C1>, ActualChainInfo<C2>, import("../cosmos-api.js").IBCConnectionInfo]>;
+        getChainsAndConnection<C1 extends string, C2 extends string>(primaryName: C1, counterName: C2): import("@agoric/vow").Vow<[ActualChainInfo<C1>, ActualChainInfo<C2>, import("../cosmos-api.js").IBCConnectionInfo]>;
     }>;
     vowTools: {
         when: <T, TResult1 = import("@agoric/vow").EUnwrap<T>, TResult2 = never>(specimenP: T, onFulfilled?: ((value: import("@agoric/vow").EUnwrap<T>) => TResult1 | PromiseLike<TResult1>) | undefined, onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined) => Promise<TResult1 | TResult2>;