fix: real chainId in chainAccountKit

Agoric · Jun 12, 2024 · 521dfd0 · 521dfd0
1 parent d66276b
commit 521dfd0
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 12 deletions.
diff --git a/packages/boot/test/bootstrapTests/vat-orchestration.test.ts b/packages/boot/test/bootstrapTests/vat-orchestration.test.ts
@@ -78,6 +78,7 @@ test('makeAccount returns an ICA connection', async t => {
     await EV.vat('bootstrap').consumeItem('orchestration');
 
   const account = await EV(orchestration).makeAccount(
+    'somechain-1',
     'connection-0',
     'connection-0',
   );
@@ -95,7 +96,7 @@ test('makeAccount returns an ICA connection', async t => {
   t.regex(remoteAddress, /icahost/);
   t.regex(localAddress, /icacontroller/);
   t.regex(chainAddress.address, /cosmos1/);
-  t.regex(chainAddress.chainId, /FIXME/); // TODO, use a real chainId #9063
+  t.is(chainAddress.chainId, 'somechain-1');
   t.truthy(matches(port, M.remotable('Port')));
   t.log('ICA Account Addresses', {
     remoteAddress,
@@ -113,6 +114,7 @@ test('ICA connection can be closed', async t => {
     await EV.vat('bootstrap').consumeItem('orchestration');
 
   const account = await EV(orchestration).makeAccount(
+    'somechain-1',
     'connection-0',
     'connection-0',
   );
@@ -134,6 +136,7 @@ test('ICA connection can send msg with proto3', async t => {
     await EV.vat('bootstrap').consumeItem('orchestration');
 
   const account = await EV(orchestration).makeAccount(
+    'somechain-1',
     'connection-0',
     'connection-0',
   );

diff --git a/packages/orchestration/src/examples/stakeIca.contract.js b/packages/orchestration/src/examples/stakeIca.contract.js
@@ -19,6 +19,7 @@ const trace = makeTracer('StakeAtom');
 
 export const meta = harden({
   customTermsShape: {
+    chainId: M.string(),
     hostConnectionId: M.string(),
     controllerConnectionId: M.string(),
     bondDenom: M.string(),
@@ -34,6 +35,7 @@ export const privateArgsShape = meta.privateArgsShape;
 
 /**
  * @typedef {{
+ *   chainId: string;
  *   hostConnectionId: IBCConnectionID;
  *   controllerConnectionId: IBCConnectionID;
  *   bondDenom: string;
@@ -51,7 +53,7 @@ export const privateArgsShape = meta.privateArgsShape;
  * @param {Baggage} baggage
  */
 export const start = async (zcf, privateArgs, baggage) => {
-  const { hostConnectionId, controllerConnectionId, bondDenom } =
+  const { chainId, hostConnectionId, controllerConnectionId, bondDenom } =
     zcf.getTerms();
   const { orchestration, marshaller, storageNode, timer } = privateArgs;
 
@@ -67,6 +69,7 @@ export const start = async (zcf, privateArgs, baggage) => {
 
   async function makeAccountKit() {
     const account = await E(orchestration).makeAccount(
+      chainId,
       hostConnectionId,
       controllerConnectionId,
     );

diff --git a/packages/orchestration/src/exos/chainAccountKit.js b/packages/orchestration/src/exos/chainAccountKit.js
@@ -45,6 +45,7 @@ export const ChainAccountI = M.interface('ChainAccount', {
 
 /**
  * @typedef {{
+ *   chainId: string;
  *   port: Port;
  *   connection: Remote<Connection> | undefined;
  *   localAddress: LocalIbcAddress | undefined;
@@ -60,11 +61,13 @@ export const prepareChainAccountKit = zone =>
     'ChainAccountKit',
     { account: ChainAccountI, connectionHandler: ConnectionHandlerI },
     /**
+     * @param {string} chainId
      * @param {Port} port
      * @param {string} requestedRemoteAddress
      */
-    (port, requestedRemoteAddress) =>
+    (chainId, port, requestedRemoteAddress) =>
       /** @type {State} */ ({
+        chainId,
         port,
         connection: undefined,
         requestedRemoteAddress,
@@ -158,9 +161,7 @@ export const prepareChainAccountKit = zone =>
           this.state.localAddress = localAddr;
           this.state.chainAddress = harden({
             address: findAddressField(remoteAddr) || UNPARSABLE_CHAIN_ADDRESS,
-            // TODO get this from `Chain` object #9063
-            // XXX how do we get a chainId for an unknown chain? seems it may need to be a user supplied arg
-            chainId: 'FIXME',
+            chainId: this.state.chainId,
             addressEncoding: 'bech32',
           });
         },

diff --git a/packages/orchestration/src/facade.js b/packages/orchestration/src/facade.js
@@ -117,6 +117,7 @@ const makeRemoteChainFacade = (
     /** @returns {Promise<OrchestrationAccount<CCI>>} */
     makeAccount: async () => {
       const icaAccount = await E(orchestration).makeAccount(
+        chainInfo.chainId,
         // XXX IBCConnectionInfo concessions for JSON encoding
         /** @type {IBCConnectionID} */ (connectionInfo.id),
         /** @type {IBCConnectionID} */ (

diff --git a/packages/orchestration/src/proposals/start-stakeAtom.js b/packages/orchestration/src/proposals/start-stakeAtom.js
@@ -48,10 +48,11 @@ export const startStakeAtom = async ({
 
   const chainHub = makeChainHub(await agoricNames);
 
+  const agoric = await chainHub.getChainInfo('agoric');
   const cosmoshub = await chainHub.getChainInfo('cosmoshub');
   const connectionInfo = await chainHub.getConnectionInfo(
-    'agoriclocal',
-    'cosmoshub-4',
+    agoric.chainId,
+    cosmoshub.chainId,
   );
 
   /** @type {StartUpgradableOpts<StakeAtomSF>} */
@@ -60,6 +61,7 @@ export const startStakeAtom = async ({
     installation: stakeIca,
     issuerKeywordRecord: harden({ ATOM: atomIssuer }),
     terms: {
+      chainId: cosmoshub.chainId,
       hostConnectionId: /** @type {IBCConnectionID} */ (connectionInfo.id),
       controllerConnectionId: /** @type {IBCConnectionID} */ (
         connectionInfo.counterparty.connection_id

diff --git a/packages/orchestration/src/service.js b/packages/orchestration/src/service.js
@@ -51,7 +51,7 @@ const getPower = (powers, name) => {
 };
 
 export const OrchestrationI = M.interface('Orchestration', {
-  makeAccount: M.callWhen(M.string(), M.string()).returns(
+  makeAccount: M.callWhen(M.string(), M.string(), M.string()).returns(
     M.remotable('ChainAccount'),
   ),
   provideICQConnection: M.callWhen(M.string()).returns(
@@ -109,19 +109,24 @@ const prepareOrchestrationKit = (
       },
       public: {
         /**
+         * @param {string} chainId
          * @param {IBCConnectionID} hostConnectionId the counterparty
          *   connection_id
          * @param {IBCConnectionID} controllerConnectionId self connection_id
          * @returns {Promise<IcaAccount>}
          */
-        async makeAccount(hostConnectionId, controllerConnectionId) {
+        async makeAccount(chainId, hostConnectionId, controllerConnectionId) {
           const port = await this.facets.self.allocateICAControllerPort();
 
           const remoteConnAddr = makeICAChannelAddress(
             hostConnectionId,
             controllerConnectionId,
           );
-          const chainAccountKit = makeChainAccountKit(port, remoteConnAddr);
+          const chainAccountKit = makeChainAccountKit(
+            chainId,
+            port,
+            remoteConnAddr,
+          );
 
           // await so we do not return a ChainAccount before it successfully instantiates
           await E(port).connect(

diff --git a/packages/orchestration/test/examples/stake-atom.contract.test.ts b/packages/orchestration/test/examples/stake-atom.contract.test.ts
@@ -28,6 +28,7 @@ const startContract = async ({
     installation,
     { In: bld.issuer },
     {
+      chainId: 'cosmoshub-4',
       hostConnectionId: 'connection-1',
       controllerConnectionId: 'connection-2',
       bondDenom: 'uatom',
@@ -56,7 +57,7 @@ test('makeAccount, deposit, withdraw', async t => {
   const address = await E(account).getAddress();
   // XXX address.address is weird
   //   t.regex(address.address, /agoric1/);
-  t.like(address, { chainId: 'FIXME', addressEncoding: 'bech32' });
+  t.like(address, { chainId: 'cosmoshub-4', addressEncoding: 'bech32' });
 
   t.log('deposit 100 bld to account');
   await E(account).deposit(await utils.pourPayment(ist.units(100)));