Update client related code

Author: openhands-agent

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

packages/ast/src/client/client.ts

@@ -107,7 +107,7 @@ export const createQueryClass = (
   implementsClassName: string,
   queryMsg: QueryMsg
 ) => {
-  context.addUtil('CosmWasmClient');
+  context.addUtil('ICosmWasmClient');
 
   const propertyNames = getMessageProperties(queryMsg)
     .map((method) => Object.keys(method.properties)?.[0])
@@ -126,7 +126,7 @@ export const createQueryClass = (
         // client
         classProperty(
           'client',
-          t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))
+          t.tsTypeAnnotation(t.tsTypeReference(t.identifier('ICosmWasmClient')))
         ),
 
         // contractAddress
@@ -143,7 +143,7 @@ export const createQueryClass = (
             typedIdentifier(
               'client',
               t.tsTypeAnnotation(
-                t.tsTypeReference(t.identifier('CosmWasmClient'))
+                t.tsTypeReference(t.identifier('ICosmWasmClient'))
               )
             ),
             typedIdentifier(
@@ -296,7 +296,7 @@ export const createExecuteClass = (
   extendsClassName: string | null,
   execMsg: ExecuteMsg
 ) => {
-  context.addUtil('SigningCosmWasmClient');
+  context.addUtil('ISigningCosmWasmClient');
 
   const propertyNames = getMessageProperties(execMsg)
     .map((method) => Object.keys(method.properties)?.[0])
@@ -371,7 +371,7 @@ export const createExecuteClass = (
         classProperty(
           'client',
           t.tsTypeAnnotation(
-            t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
+            t.tsTypeReference(t.identifier('ISigningCosmWasmClient'))
           ),
           false,
           false,
@@ -400,7 +400,7 @@ export const createExecuteClass = (
             typedIdentifier(
               'client',
               t.tsTypeAnnotation(
-                t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
+                t.tsTypeReference(t.identifier('ISigningCosmWasmClient'))
               )
             ),
             typedIdentifier('sender', t.tsTypeAnnotation(t.tsStringKeyword())),

packages/ast/src/context/imports.ts

@@ -45,9 +45,9 @@ export const UTILS = {
   Coin: '@interchainjs/amino',
   toUtf8: '@interchainjs/encoding',
   StdFee: '@interchainjs/amino',
-  CosmWasmClient: '__contractContextBase__',
+  ICosmWasmClient: '__contractContextBase__',
   ExecuteResult: '@interchainjs/cosmos/signing-client',
-  SigningCosmWasmClient: '__contractContextBase__',
+  ISigningCosmWasmClient: '__contractContextBase__',
 
   // react-query
   useQuery: makeReactQuerySwitch('useQuery'),

packages/ast/src/provider/provider.ts

@@ -224,13 +224,13 @@ export const createGettingProviders = (providerInfos: {
             identifier(
               'cosmWasmClient?',
               t.tsTypeAnnotation(
-                t.tsTypeReference(t.identifier('CosmWasmClient'))
+                t.tsTypeReference(t.identifier('ICosmWasmClient'))
               )
             ),
             identifier(
               'signingCosmWasmClient?',
               t.tsTypeAnnotation(
-                t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
+                t.tsTypeReference(t.identifier('ISigningCosmWasmClient'))
               )
             ),
           ],

packages/ts-codegen/package.json

@@ -36,27 +36,25 @@
   "bugs": {
     "url": "https://github.com/hyperweb-io/ts-codegen/issues"
   },
-  "devDependencies": {
-  },
   "dependencies": {
     "@babel/generator": "7.24.4",
     "@babel/traverse": "7.24.1",
     "@babel/types": "7.24.0",
     "@cosmwasm/ts-codegen-ast": "^1.8.1",
     "@cosmwasm/ts-codegen-types": "^1.3.1",
-    "@pyramation/json-schema-to-typescript": " 11.0.4",
-    "@types/rimraf": "3.0.2",
-    "@types/shelljs": "0.8.15",
     "@interchainjs/amino": "^1.11.18",
     "@interchainjs/cosmos": "^1.11.18",
     "@interchainjs/types": "^1.11.18",
-    "interchainjs": "^1.11.18",
+    "@pyramation/json-schema-to-typescript": " 11.0.4",
+    "@types/rimraf": "3.0.2",
+    "@types/shelljs": "0.8.15",
     "case": "1.6.3",
     "dargs": "7.0.0",
     "deepmerge": "4.2.2",
     "fuzzy": "0.1.3",
     "glob": "^10",
     "inquirerer": "0.1.3",
+    "interchainjs": "^1.11.18",
     "minimist": "1.2.6",
     "mkdirp": "1.0.4",
     "nested-obj": "0.0.1",

packages/ts-codegen/src/helpers/contractContextBase.ts

@@ -12,7 +12,7 @@ export interface ICosmWasmClient {
   queryContractSmart(contractAddr: string, query: any): Promise<any>;
 }
 
-export interface ISigningCosmWasmClient {
+export interface ISigningCosmWasmClient extends ICosmWasmClient {
   execute(sender: string, contractAddress: string, msg: any, fee?: any, memo?: string, funds?: any[]): Promise<any>;
 }
 

packages/ts-codegen/src/helpers/contractContextBaseShortHandCtor.ts

@@ -12,7 +12,7 @@ export interface ICosmWasmClient {
   queryContractSmart(contractAddr: string, query: any): Promise<any>;
 }
 
-export interface ISigningCosmWasmClient {
+export interface ISigningCosmWasmClient extends ICosmWasmClient {
   execute(sender: string, contractAddress: string, msg: any, fee?: any, memo?: string, funds?: any[]): Promise<any>;
 }