Merge pull request #138 from AbstractSDK/adair/icaClientAddress

.changeset/angry-sloths-cheer.md

@@ -0,0 +1,6 @@
+---
+"@abstract-money/core": minor
+"@abstract-money/react": minor
+---
+
+Expose the ICA Client

packages/core/abstract.config.ts

@@ -4,19 +4,23 @@ import { registry, vanilla } from '@abstract-money/cli/plugins'
 const contractsConfig = [
   {
     name: 'account',
-    version: '0.24.1-beta.2',
+    version: '0.24.1',
   },
   {
     name: 'registry',
-    version: '0.24.1-beta.2',
+    version: '0.24.1',
   },
   {
     name: 'ans-host',
-    version: '0.24.1-beta.2',
+    version: '0.24.1',
   },
   {
     name: 'ibc-client',
-    version: '0.24.1-beta.2',
+    version: '0.24.1',
+  },
+  {
+    name: 'ica-client',
+    version: '0.24.1',
   },
 ]
 

packages/core/src/actions/account/public/get-ibc-client-query-client-from-account.ts

@@ -5,7 +5,7 @@ import { getIbcClientQueryClient } from '../../public/get-ibc-client-query-clien
 import { CommonModuleNames } from '../../public/types'
 import { getModuleAddress } from './get-module-address'
 
-export type GetIbcClientQueryClientParameters = {
+export type GetIbcClientQueryClientFromAccountParameters = {
   accountId: RegistryTypes.AccountId
   cosmWasmClient: CosmWasmClient
   apiUrl: string
@@ -22,7 +22,7 @@ export async function getIbcClientQueryClientFromAccount({
   accountId,
   cosmWasmClient,
   apiUrl,
-}: GetIbcClientQueryClientParameters) {
+}: GetIbcClientQueryClientFromAccountParameters) {
   const ibcClientAddress = await getModuleAddress({
     accountId,
     cosmWasmClient,

packages/core/src/actions/account/public/simulate-execute-remote-account.ts

@@ -2,7 +2,7 @@ import { cosmosWasmExecuteMsg } from '@abstract-money/core'
 import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'
 import { AccountTypes, RegistryTypes } from '../../../codegen/abstract'
 import { CosmosMsgForEmpty } from '../../../codegen/abstract/cosmwasm-codegen/Account.types'
-import { simulateRemoteMsg } from '../../simulate-remote-msg'
+import { simulateRemoteCosmosMsg } from '../../simulate-remote-cosmos-msg'
 import { getRemoteAccounts } from './get-remote-accounts'
 
 export type SimulateExecuteRemoteAccountParameters = {
@@ -46,7 +46,7 @@ export async function simulateExecuteRemoteAccount({
     [],
   )
 
-  return simulateRemoteMsg({
+  return simulateRemoteCosmosMsg({
     apiUrl,
     hostChainName,
     msgs: cosmosAccountMsg,

packages/core/src/actions/account/wallet/execute.ts

@@ -1,22 +1,13 @@
-import {
-  AccountExecuteMsgBuilder,
-  AccountMsgComposer,
-  AccountTypes,
-} from '../../../codegen/abstract'
-import { ModuleType } from '../../../codegen/gql/graphql'
+import { AccountTypes } from '../../../codegen/abstract'
 import { MaybeArray } from '../../../types/utils'
-import { executeOnModule } from './execute-on-module'
 import { BaseAccountWalletParameters } from './types'
 
-import { AccountId } from '@abstract-money/core'
 import { toUtf8 } from '@cosmjs/encoding'
 import { MsgExecuteContract } from 'cosmjs-types/cosmwasm/wasm/v1/tx'
 import { CosmosMsgForEmpty } from '../../../codegen/abstract/cosmwasm-codegen/Account.types'
 import { WithCosmWasmSignOptions } from '../../../types/parameters'
-import { abstractModuleId } from '../../../utils/modules/abstract-module-id'
-import { encodeModuleMsg } from '../../../utils/modules/encode-module-msg'
-import { CommonModuleNames } from '../../public/types'
 import { getAccountAddressFromApi } from '../public/get-account-address-from-api'
+
 export type ExecuteParameters = Omit<
   WithCosmWasmSignOptions<
     BaseAccountWalletParameters & {

packages/core/src/actions/get-simulation-result-from-api.ts

@@ -1,6 +1,6 @@
 import { AccountTypes } from '../codegen/abstract'
 import { MaybeArray } from '../types/utils'
-import { simulateWasmCosmosMsgs } from '../utils/cosmos'
+import { simulateWasmCosmosMsgs } from '../utils/cosmos/simulate-cosmos-msgs'
 import { getCometClientFromApi } from './get-comet-client-from-api'
 
 export type GetSimulationResultParameters = {

packages/core/src/actions/index.ts

@@ -36,6 +36,12 @@ export * from './public/get-ans-host-address-from-registry'
 export * from './public/get-ans-host-query-client-from-api'
 export * from './public/get-ans-host-query-client-from-registry'
 export * from './public/get-ans-host-query-client'
+export * from './public/get-ibc-client-query-client-from-registry'
+export * from './public/get-ibc-client-address-from-registry'
+export * from './public/get-ibc-client-query-client'
+export * from './public/get-ica-client-query-client-from-registry'
+export * from './public/get-ica-client-address-from-registry'
+export * from './public/get-ica-client-query-client'
 export * from './public/get-ans-host-version-from-api'
 export * from './public/get-app-module-code-id-from-registry'
 export * from './public/get-cosm-wasm-client'

packages/core/src/actions/public/get-ica-client-address-from-registry.ts

@@ -0,0 +1,21 @@
+import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'
+import { getAbstractModuleAddressFromRegistry } from './get-abstract-module-address-from-registry'
+import { CommonModuleNames } from './types'
+
+export type GetIcaClientAddressFromRegistryParameters = {
+  cosmWasmClient: CosmWasmClient
+  registryAddress: string
+  version?: string
+}
+export async function getIcaClientAddressFromRegistry({
+  cosmWasmClient,
+  registryAddress,
+  version,
+}: GetIcaClientAddressFromRegistryParameters) {
+  return getAbstractModuleAddressFromRegistry({
+    moduleName: CommonModuleNames.ICA_CLIENT,
+    cosmWasmClient,
+    registryAddress,
+    version,
+  })
+}

packages/core/src/actions/public/get-ica-client-query-client-from-registry.ts

@@ -0,0 +1,23 @@
+import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'
+import { getIcaClientAddressFromRegistry } from './get-ica-client-address-from-registry'
+import { getIcaClientQueryClient } from './get-ica-client-query-client'
+
+export type GetIcaClientQueryClientFromRegistryParameters = {
+  cosmWasmClient: CosmWasmClient
+  registryAddress: string
+  version?: string
+}
+
+export async function getIcaClientQueryClientFromRegistry({
+  cosmWasmClient,
+  registryAddress,
+  version,
+}: GetIcaClientQueryClientFromRegistryParameters) {
+  const icaClientAddress = await getIcaClientAddressFromRegistry({
+    cosmWasmClient,
+    registryAddress,
+    version,
+  })
+
+  return getIcaClientQueryClient({ cosmWasmClient, icaClientAddress })
+}

packages/core/src/actions/public/get-ica-client-query-client.ts

@@ -0,0 +1,15 @@
+import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'
+
+import { IcaClientQueryClient } from '../../codegen/abstract'
+
+export type GetIcaClientQueryClientParameters = {
+  cosmWasmClient: CosmWasmClient
+  icaClientAddress: string
+}
+
+export function getIcaClientQueryClient({
+  cosmWasmClient,
+  icaClientAddress,
+}: GetIcaClientQueryClientParameters) {
+  return new IcaClientQueryClient(cosmWasmClient, icaClientAddress)
+}

packages/core/src/actions/public/types.ts

@@ -3,5 +3,6 @@ export enum CommonModuleNames {
   MODULE_FACTORY = 'module-factory',
   ANS_HOST = 'ans-host',
   IBC_CLIENT = 'ibc-client',
+  ICA_CLIENT = 'ica-client',
   IBC_HOST = 'ibc-host',
 }

packages/core/src/actions/simulate-remote-msg.ts → packages/core/src/actions/simulate-remote-cosmos-msg.ts

@@ -6,7 +6,7 @@ import { getCometClientFromApi } from './get-comet-client-from-api'
 import { getRegistryAddressFromApi } from './get-registry-address-from-api'
 import { getIbcHostAddressFromRegistry } from './public/get-ibc-host-address-from-registry'
 
-export type SimulateRemoteMsgParameters = {
+export type SimulateRemoteCosmosMsgParameters = {
   apiUrl: string
   hostChainName: string
   msgs: MaybeArray<AccountTypes.CosmosMsgForEmpty>
@@ -21,11 +21,11 @@ export type SimulateRemoteMsgParameters = {
  * @param msgs
  * @experimental
  */
-export async function simulateRemoteMsg({
+export async function simulateRemoteCosmosMsg({
   apiUrl,
   hostChainName,
   msgs,
-}: SimulateRemoteMsgParameters) {
+}: SimulateRemoteCosmosMsgParameters) {
   // TODO: these queries could be combined
   const remoteVcAddress = await getRegistryAddressFromApi({
     apiUrl,

packages/core/src/clients/decorators/abstract-base.ts

@@ -1,4 +1,5 @@
 import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'
+import { getIcaClientQueryClient } from 'src/actions/public/get-ica-client-query-client'
 import { getAbstractModuleAddressFromRegistry } from '../../actions/public/get-abstract-module-address-from-registry'
 import { getAccountQueryClient } from '../../actions/public/get-account-query-client'
 import { getAnsHostAddressFromRegistry } from '../../actions/public/get-ans-host-address-from-registry'
@@ -34,16 +35,6 @@ export type AbstractBaseActions = {
       typeof getAnsHostQueryClient
     >,
   ): ReturnType<typeof getAnsHostQueryClient>
-  getIbcClientQueryClient(
-    parameters: ExtractAndPartializeDecoratedParametersFromParameters<
-      typeof getIbcClientQueryClient
-    >,
-  ): ReturnType<typeof getIbcClientQueryClient>
-  getAbstractModuleAddressFromRegistry(
-    parameters: ExtractAndPartializeDecoratedParametersFromParameters<
-      typeof getAbstractModuleAddressFromRegistry
-    >,
-  ): ReturnType<typeof getAbstractModuleAddressFromRegistry>
   getAnsHostAddressFromRegistry(
     parameters: ExtractAndPartializeDecoratedParametersFromParameters<
       typeof getAnsHostAddressFromRegistry
@@ -54,6 +45,22 @@ export type AbstractBaseActions = {
       typeof getAnsHostQueryClientFromRegistry
     >,
   ): ReturnType<typeof getAnsHostQueryClientFromRegistry>
+  getIbcClientQueryClient(
+    parameters: ExtractAndPartializeDecoratedParametersFromParameters<
+      typeof getIbcClientQueryClient
+    >,
+  ): ReturnType<typeof getIbcClientQueryClient>
+  getIcaClientQueryClient(
+    parameters: ExtractAndPartializeDecoratedParametersFromParameters<
+      typeof getIcaClientQueryClient
+    >,
+  ): ReturnType<typeof getIcaClientQueryClient>
+  getAbstractModuleAddressFromRegistry(
+    parameters: ExtractAndPartializeDecoratedParametersFromParameters<
+      typeof getAbstractModuleAddressFromRegistry
+    >,
+  ): ReturnType<typeof getAbstractModuleAddressFromRegistry>
+
   getRegistryModuleData(
     parameters: ExtractAndPartializeDecoratedParametersFromParameters<
       typeof getRegistryModuleData
@@ -94,6 +101,12 @@ export function abstractBaseActions(
         ...parameters,
         ...extra,
       }),
+    getIcaClientQueryClient: ({ extra, ...parameters }) =>
+      getIcaClientQueryClient({
+        cosmWasmClient,
+        ...parameters,
+        ...extra,
+      }),
     getAbstractModuleAddressFromRegistry: ({ extra, ...parameters }) =>
       getAbstractModuleAddressFromRegistry({
         cosmWasmClient,

packages/core/src/clients/decorators/public.ts

@@ -15,7 +15,7 @@ import { getRegistryModuleData } from '../../actions/public/get-registry-module-
 import { getRegistryQueryClient } from '../../actions/public/get-registry-query-client'
 import { getRegistryQueryClientFromApi } from '../../actions/public/get-registry-query-client-from-api'
 import { getRemoteHostsFromApi } from '../../actions/public/get-remote-hosts-from-api'
-import { simulateRemoteMsg } from '../../actions/simulate-remote-msg'
+import { simulateRemoteCosmosMsg } from '../../actions/simulate-remote-cosmos-msg'
 import { ExtractAndPartializeParameters } from '../../types/parameters'
 
 type ExtractAndPartializeDecoratedParametersFromParameters<
@@ -62,11 +62,11 @@ export type PublicActions = {
       typeof getSimulationResultFromApi
     >,
   ): ReturnType<typeof getSimulationResultFromApi>
-  simulateRemoteMsg(
+  simulateRemoteCosmosMsg(
     parameters: ExtractAndPartializeDecoratedParametersFromParameters<
-      typeof simulateRemoteMsg
+      typeof simulateRemoteCosmosMsg
     >,
-  ): ReturnType<typeof simulateRemoteMsg>
+  ): ReturnType<typeof simulateRemoteCosmosMsg>
 }
 
 export function publicActions(
@@ -123,8 +123,8 @@ export function publicActions(
         ...parameters,
         ...extra,
       }),
-    simulateRemoteMsg: ({ extra, ...parameters }) =>
-      simulateRemoteMsg({
+    simulateRemoteCosmosMsg: ({ extra, ...parameters }) =>
+      simulateRemoteCosmosMsg({
         cosmWasmClient,
         apiUrl,
         ...parameters,

packages/core/src/utils/cosmos/index.ts

@@ -1,2 +1,2 @@
 export * from './encoding'
-export * from './simulate-msgs'
+export * from './simulate-cosmos-msgs'

packages/core/src/utils/cosmos/simulate-msgs.ts → packages/core/src/utils/cosmos/simulate-cosmos-msgs.ts

@@ -1,4 +1,3 @@
-import { StargateClient } from '@abstract-money/cli/.tsup/declaration/_tsup-dts-aggregation'
 import { Registry } from '@cosmjs/proto-signing'
 import {
   QueryClient,

packages/react/src/hooks/public/use-simulate-remote-msg.ts

@@ -6,18 +6,22 @@ import {
   UseMutationReturnType,
 } from '../../types/queries'
 
-type SimulateRemoteMutation = Parameters<PublicClient['simulateRemoteMsg']>[0]
+type SimulateRemoteMutation = Parameters<
+  PublicClient['simulateRemoteCosmosMsg']
+>[0]
 
 export type UseSimulateRemoteMsgParameters = {
   chainName: string | undefined
   mutation?: UseMutationParameters<
-    Awaited<ReturnType<PublicClient['simulateRemoteMsg']>>,
+    Awaited<ReturnType<PublicClient['simulateRemoteCosmosMsg']>>,
     unknown,
     SimulateRemoteMutation
   >
 }
 
-type SimulatedReturn = Awaited<ReturnType<PublicClient['simulateRemoteMsg']>>
+type SimulatedReturn = Awaited<
+  ReturnType<PublicClient['simulateRemoteCosmosMsg']>
+>
 
 /**
  * Simulate a message to be executed on a remote chain by the ibc host.
@@ -38,10 +42,10 @@ export function useSimulateRemoteMsg({
   })
 
   return useMutation(
-    ['simulateRemoteMsg', chainName],
+    ['simulateRemoteCosmosMsg', chainName],
     ({ ...params }) => {
       if (!accountClient) throw new Error('accountClient is not defined')
-      return accountClient.simulateRemoteMsg({
+      return accountClient.simulateRemoteCosmosMsg({
         ...params,
       })
     },