feat: ocap makeStargateClient

Agoric · Nov 6, 2024 · c8f7407 · c8f7407
1 parent 129516a
commit c8f7407
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/packages/client-utils/package.json b/packages/client-utils/package.json
@@ -26,11 +26,13 @@
     "ts-blank-space": "^0.4.1"
   },
   "dependencies": {
+    "@agoric/casting": "^0.4.2",
     "@agoric/ertp": "^0.16.2",
     "@agoric/internal": "^0.3.2",
     "@agoric/smart-wallet": "^0.5.3",
     "@agoric/vats": "^0.15.1",
     "@cosmjs/stargate": "^0.32.3",
+    "@cosmjs/tendermint-rpc": "^0.32.3",
     "@endo/common": "^1.2.7",
     "@endo/errors": "^1.2.7",
     "@endo/marshal": "^1.6.1",

diff --git a/packages/client-utils/src/chain.js b/packages/client-utils/src/chain.js
@@ -3,14 +3,18 @@
  */
 
 import { StargateClient } from '@cosmjs/stargate';
-import { pickEndpoint } from './rpc.js';
+import { makeTendermint34Client, pickEndpoint } from './rpc.js';
 
 /**
  * @param {MinimalNetworkConfig} config
+ * @param {{ fetch: typeof window.fetch }} io
  * @returns {Promise<StargateClient>}
  */
-export const makeStargateClient = config =>
-  StargateClient.connect(pickEndpoint(config));
+export const makeStargateClient = async (config, { fetch }) => {
+  const url = pickEndpoint(config);
+  const tm = await makeTendermint34Client(url, { fetch });
+  return StargateClient.create(tm);
+};
 
 /**
  * @param {{

diff --git a/packages/client-utils/src/rpc.js b/packages/client-utils/src/rpc.js
@@ -3,6 +3,8 @@ import {
   boardSlottingMarshaller,
   makeBoardRemote,
 } from '@agoric/vats/tools/board-utils.js';
+import { makeTendermintRpcClient } from '@agoric/casting';
+import { Tendermint34Client } from '@cosmjs/tendermint-rpc';
 
 export { boardSlottingMarshaller };
 
@@ -246,3 +248,13 @@ export const makeRpcUtils = async ({ fetch }, config) => {
   }
 };
 /** @typedef {Awaited<ReturnType<typeof makeRpcUtils>>} RpcUtils */
+
+/**
+ * @param {string} endpoint
+ * @param {{ fetch: typeof window.fetch }} io
+ * @returns {Promise<Tendermint34Client>}
+ */
+export const makeTendermint34Client = (endpoint, { fetch }) => {
+  const rpcClient = makeTendermintRpcClient(endpoint, fetch);
+  return Tendermint34Client.create(rpcClient);
+};
diff --git a/packages/client-utils/src/wallet-utils.js b/packages/client-utils/src/wallet-utils.js
@@ -19,7 +19,7 @@ export const makeWalletUtils = async ({ fetch, delay }, networkConfig) => {
     await makeRpcUtils({ fetch }, networkConfig);
   const m = boardSlottingMarshaller(fromBoard.convertSlotToVal);
 
-  const client = await makeStargateClient(networkConfig);
+  const client = await makeStargateClient(networkConfig, { fetch });
 
   /**
    * @param {string} from