Merge pull request #541 from cosmology-tech/test-connect-comet

test useConnectComet and debug
hyperweb-io · Dec 13, 2023 · a4d8c65 · a4d8c65
2 parents 44144f1 + d5740af
commit a4d8c65
Show file tree

Hide file tree

Showing 41 changed files with 120 additions and 78 deletions.
diff --git a/__fixtures__/misc/output-impl-interfaces-gen/extern.ts b/__fixtures__/misc/output-impl-interfaces-gen/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/misc/output-proto-amino/amino-interface/extern.ts b/__fixtures__/misc/output-proto-amino/amino-interface/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/extern.ts b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/extern.ts b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/extern.ts b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/misc/output-proto-amino/no-amino-legacy-no-proto/extern.ts b/__fixtures__/misc/output-proto-amino/no-amino-legacy-no-proto/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/misc/output-proto-amino/no-amino-legacy/extern.ts b/__fixtures__/misc/output-proto-amino/no-amino-legacy/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/misc/output-proto-amino/no-amino-no-proto/extern.ts b/__fixtures__/misc/output-proto-amino/no-amino-no-proto/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/misc/output-proto-amino/no-amino/extern.ts b/__fixtures__/misc/output-proto-amino/no-amino/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/misc/output-proto-amino/proto-only-legacy/extern.ts b/__fixtures__/misc/output-proto-amino/proto-only-legacy/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/misc/output-proto-amino/proto-only/extern.ts b/__fixtures__/misc/output-proto-amino/proto-only/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/misc/output/extern.ts b/__fixtures__/misc/output/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/output1/extern.ts b/__fixtures__/output1/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/v-next/outputinstantrpc/extern.ts b/__fixtures__/v-next/outputinstantrpc/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/v-next/outputosmojs/extern.ts b/__fixtures__/v-next/outputosmojs/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/v-next/outputsign/extern.ts b/__fixtures__/v-next/outputsign/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/v-next/outputv2/extern.ts b/__fixtures__/v-next/outputv2/extern.ts
@@ -13,7 +13,7 @@ export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }

diff --git a/__fixtures__/v-next/outputv4/akash/rpc.query.ts b/__fixtures__/v-next/outputv4/akash/rpc.query.ts
@@ -1,12 +1,12 @@
 import { Rpc } from "../helpers";
-import { Tendermint34Client, HttpEndpoint } from "@cosmjs/tendermint-rpc";
+import { connectComet, HttpEndpoint } from "@cosmjs/tendermint-rpc";
 import { QueryClient } from "@cosmjs/stargate";
 export const createRPCQueryClient = async ({
   rpcEndpoint
 }: {
   rpcEndpoint: string | HttpEndpoint;
 }) => {
-  const tmClient = await Tendermint34Client.connect(rpcEndpoint);
+  const tmClient = await connectComet(rpcEndpoint);
   const client = new QueryClient(tmClient);
   return {
     akash: {

diff --git a/__fixtures__/v-next/outputv4/cosmos/cosmos-rpc-client.query.ts b/__fixtures__/v-next/outputv4/cosmos/cosmos-rpc-client.query.ts
@@ -1,12 +1,12 @@
 import { Rpc } from "../helpers";
-import { Tendermint34Client, HttpEndpoint } from "@cosmjs/tendermint-rpc";
+import { connectComet, HttpEndpoint } from "@cosmjs/tendermint-rpc";
 import { QueryClient } from "@cosmjs/stargate";
 export const createCosmicRPCQueryClient = async ({
   rpcEndpoint
 }: {
   rpcEndpoint: string | HttpEndpoint;
 }) => {
-  const tmClient = await Tendermint34Client.connect(rpcEndpoint);
+  const tmClient = await connectComet(rpcEndpoint);
   const client = new QueryClient(tmClient);
   return {
     cosmos: {

diff --git a/__fixtures__/v-next/outputv4/cosmos/rpc.query.ts b/__fixtures__/v-next/outputv4/cosmos/rpc.query.ts
@@ -1,12 +1,12 @@
 import { Rpc } from "../helpers";
-import { Tendermint34Client, HttpEndpoint } from "@cosmjs/tendermint-rpc";
+import { connectComet, HttpEndpoint } from "@cosmjs/tendermint-rpc";
 import { QueryClient } from "@cosmjs/stargate";
 export const createRPCQueryClient = async ({
   rpcEndpoint
 }: {
   rpcEndpoint: string | HttpEndpoint;
 }) => {
-  const tmClient = await Tendermint34Client.connect(rpcEndpoint);
+  const tmClient = await connectComet(rpcEndpoint);
   const client = new QueryClient(tmClient);
   return {
     cosmos: {

diff --git a/__fixtures__/v-next/outputv4/cosmwasm/rpc.query.ts b/__fixtures__/v-next/outputv4/cosmwasm/rpc.query.ts
@@ -1,12 +1,12 @@
 import { Rpc } from "../helpers";
-import { Tendermint34Client, HttpEndpoint } from "@cosmjs/tendermint-rpc";
+import { connectComet, HttpEndpoint } from "@cosmjs/tendermint-rpc";
 import { QueryClient } from "@cosmjs/stargate";
 export const createRPCQueryClient = async ({
   rpcEndpoint
 }: {
   rpcEndpoint: string | HttpEndpoint;
 }) => {
-  const tmClient = await Tendermint34Client.connect(rpcEndpoint);
+  const tmClient = await connectComet(rpcEndpoint);
   const client = new QueryClient(tmClient);
   return {
     cosmos: {

diff --git a/__fixtures__/v-next/outputv4/evmos/evmos-rpc-client.query.ts b/__fixtures__/v-next/outputv4/evmos/evmos-rpc-client.query.ts
@@ -1,12 +1,12 @@
 import { Rpc } from "../helpers";
-import { Tendermint34Client, HttpEndpoint } from "@cosmjs/tendermint-rpc";
+import { connectComet, HttpEndpoint } from "@cosmjs/tendermint-rpc";
 import { QueryClient } from "@cosmjs/stargate";
 export const createEvmosRPCQueryClient = async ({
   rpcEndpoint
 }: {
   rpcEndpoint: string | HttpEndpoint;
 }) => {
-  const tmClient = await Tendermint34Client.connect(rpcEndpoint);
+  const tmClient = await connectComet(rpcEndpoint);
   const client = new QueryClient(tmClient);
   return {
     cosmos: {

diff --git a/__fixtures__/v-next/outputv4/evmos/rpc.query.ts b/__fixtures__/v-next/outputv4/evmos/rpc.query.ts
@@ -1,12 +1,12 @@
 import { Rpc } from "../helpers";
-import { Tendermint34Client, HttpEndpoint } from "@cosmjs/tendermint-rpc";
+import { connectComet, HttpEndpoint } from "@cosmjs/tendermint-rpc";
 import { QueryClient } from "@cosmjs/stargate";
 export const createRPCQueryClient = async ({
   rpcEndpoint
 }: {
   rpcEndpoint: string | HttpEndpoint;
 }) => {
-  const tmClient = await Tendermint34Client.connect(rpcEndpoint);
+  const tmClient = await connectComet(rpcEndpoint);
   const client = new QueryClient(tmClient);
   return {
     cosmos: {

diff --git a/__fixtures__/v-next/outputv4/extern.ts b/__fixtures__/v-next/outputv4/extern.ts
@@ -5,15 +5,15 @@
 */
 
 import { QueryClient, createProtobufRpcClient, ProtobufRpcClient } from '@cosmjs/stargate'
-import { Tendermint34Client, HttpEndpoint } from "@cosmjs/tendermint-rpc";
+import { connectComet, HttpEndpoint } from "@cosmjs/tendermint-rpc";
 
 const _rpcClients: Record<string, ProtobufRpcClient> = {};
 
 export const getRpcEndpointKey = (rpcEndpoint: string | HttpEndpoint) => {
     if (typeof rpcEndpoint === 'string') {
         return rpcEndpoint;
     } else if (!!rpcEndpoint) {
-        //@ts-ignore 
+        //@ts-ignore
         return rpcEndpoint.url;
     }
 }
@@ -24,9 +24,9 @@ export const getRpcClient = async (rpcEndpoint: string | HttpEndpoint) => {
     if (_rpcClients.hasOwnProperty(key)) {
         return _rpcClients[key];
     }
-    const tmClient = await Tendermint34Client.connect(rpcEndpoint);
+    const cometClient = await connectComet(rpcEndpoint);
     //@ts-ignore
-    const client = new QueryClient(tmClient);
+    const client = new QueryClient(cometClient);
     const rpc = createProtobufRpcClient(client);
     _rpcClients[key] = rpc;
     return rpc;

diff --git a/__fixtures__/v-next/outputv4/ibc/rpc.query.ts b/__fixtures__/v-next/outputv4/ibc/rpc.query.ts
@@ -1,12 +1,12 @@
 import { Rpc } from "../helpers";
-import { Tendermint34Client, HttpEndpoint } from "@cosmjs/tendermint-rpc";
+import { connectComet, HttpEndpoint } from "@cosmjs/tendermint-rpc";
 import { QueryClient } from "@cosmjs/stargate";
 export const createRPCQueryClient = async ({
   rpcEndpoint
 }: {
   rpcEndpoint: string | HttpEndpoint;
 }) => {
-  const tmClient = await Tendermint34Client.connect(rpcEndpoint);
+  const tmClient = await connectComet(rpcEndpoint);
   const client = new QueryClient(tmClient);
   return {
     cosmos: {

diff --git a/__fixtures__/v-next/outputv4/osmosis/rpc.query.ts b/__fixtures__/v-next/outputv4/osmosis/rpc.query.ts
@@ -1,12 +1,12 @@
 import { Rpc } from "../helpers";
-import { Tendermint34Client, HttpEndpoint } from "@cosmjs/tendermint-rpc";
+import { connectComet, HttpEndpoint } from "@cosmjs/tendermint-rpc";
 import { QueryClient } from "@cosmjs/stargate";
 export const createRPCQueryClient = async ({
   rpcEndpoint
 }: {
   rpcEndpoint: string | HttpEndpoint;
 }) => {
-  const tmClient = await Tendermint34Client.connect(rpcEndpoint);
+  const tmClient = await connectComet(rpcEndpoint);
   const client = new QueryClient(tmClient);
   return {
     cosmos: {

diff --git a/__fixtures__/v-next/outputv4/tendermint/rpc.query.ts b/__fixtures__/v-next/outputv4/tendermint/rpc.query.ts
@@ -1,12 +1,12 @@
 import { Rpc } from "../helpers";
-import { Tendermint34Client, HttpEndpoint } from "@cosmjs/tendermint-rpc";
+import { connectComet, HttpEndpoint } from "@cosmjs/tendermint-rpc";
 import { QueryClient } from "@cosmjs/stargate";
 export const createRPCQueryClient = async ({
   rpcEndpoint
 }: {
   rpcEndpoint: string | HttpEndpoint;
 }) => {
-  const tmClient = await Tendermint34Client.connect(rpcEndpoint);
+  const tmClient = await connectComet(rpcEndpoint);
   const client = new QueryClient(tmClient);
   return {
     cosmos: {

diff --git a/package.json b/package.json
@@ -28,7 +28,11 @@
     "jest": "29.5.0",
     "lerna": "7.0.2",
     "esprima": "4.0.1",
-    "prettier": "2.8.7"
+    "prettier": "2.8.7",
+    "@cosmjs/amino": "^0.32.0",
+    "@cosmjs/proto-signing": "^0.32.0",
+    "@cosmjs/stargate": "^0.32.0",
+    "@cosmjs/tendermint-rpc": "^0.32.0"
   },
   "workspaces": [
     "packages/*"

diff --git a/packages/ast/src/clients/rpc/scoped/__snapshots__/rpc.test.ts.snap b/packages/ast/src/clients/rpc/scoped/__snapshots__/rpc.test.ts.snap
@@ -24,22 +24,24 @@ exports[`createScopedRpcFactory 1`] = `
 
 exports[`createScopedRpcFactoryWithComet 1`] = `
 "export const createRpcFactorizzleWithComet = async ({
-  rpc
+  rpcEndpoint
 }: {
-  rpc: Rpc;
+  rpcEndpoint: string | HttpEndpoint;
 }) => {
+  const tmClient = await connectComet(rpcEndpoint);
+  const client = new QueryClient(tmClient);
   return {
     cosmos: {
       bank: {
-        v1beta1: (await import("./proto/cosmos/bank/v1beta1/query.lcd")).createClientImpl(rpc)
+        v1beta1: (await import("./proto/cosmos/bank/v1beta1/query.lcd")).createRpcQueryExtension(client)
       },
       gov: {
-        v1beta1: (await import("./proto/cosmos/bank/v1beta1/query.lcd")).createClientImpl(rpc)
+        v1beta1: (await import("./proto/cosmos/bank/v1beta1/query.lcd")).createRpcQueryExtension(client)
       }
     },
     osmosis: {
       gamm: {
-        v1beta1: (await import("./proto/cosmos/bank/v1beta1/query.lcd")).createClientImpl(rpc)
+        v1beta1: (await import("./proto/cosmos/bank/v1beta1/query.lcd")).createRpcQueryExtension(client)
       }
     }
   };

diff --git a/packages/ast/src/clients/rpc/scoped/rpc.test.ts b/packages/ast/src/clients/rpc/scoped/rpc.test.ts
@@ -76,6 +76,7 @@ it('createScopedRpcFactoryWithoutTm', async () => {
 
   it('createScopedRpcFactoryWithComet', async () => {
     const context = getGenericParseContext();
+    context.options!.rpcClients!.extensions = true;
     context.options!.rpcClients!.useConnectComet = true;
     expectCode(createScopedRpcTmFactory(context, {
         cosmos: {