Merge branch 'mainline' into believathon

.changeset/hip-turtles-sin.md

@@ -0,0 +1,5 @@
+---
+"@abstract-money/core": patch
+---
+
+Ensure that hostChainNameToName doesn't throw

examples/wagemos-cosmoskit-nextjs/CHANGELOG.md

@@ -1,5 +1,14 @@
 # wagemos-cosmoskit-nextjs
 
+## 0.4.9
+
+### Patch Changes
+
+- Updated dependencies [[`5bb5a12`](https://github.com/AbstractSDK/abstract.js/commit/5bb5a12dc20cec33ea0e1a3569387a1497e2bc7b)]:
+  - @abstract-money/core@3.4.2
+  - @abstract-money/react@2.3.5
+  - @abstract-money/provider-cosmoskit@10.0.5
+
 ## 0.4.8
 
 ### Patch Changes

examples/wagemos-cosmoskit-nextjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wagemos-cosmoskit-nextjs",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "private": true,
   "scripts": {
     "dev": "next dev",

examples/wagemos-graz-nextjs/CHANGELOG.md

@@ -1,5 +1,14 @@
 # wagemos-graz-nextjs
 
+## 0.4.9
+
+### Patch Changes
+
+- Updated dependencies [[`5bb5a12`](https://github.com/AbstractSDK/abstract.js/commit/5bb5a12dc20cec33ea0e1a3569387a1497e2bc7b)]:
+  - @abstract-money/core@3.4.2
+  - @abstract-money/provider-graz@11.0.2
+  - @abstract-money/react@2.3.5
+
 ## 0.4.8
 
 ### Patch Changes

examples/wagemos-graz-nextjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wagemos-graz-nextjs",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "private": true,
   "scripts": {
     "dev": "NODE_OPTIONS='--inspect' next dev",

packages/actions-xion/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @abstract-money/actions-xion
 
+## 0.0.4
+
+### Patch Changes
+
+- Updated dependencies [[`5bb5a12`](https://github.com/AbstractSDK/abstract.js/commit/5bb5a12dc20cec33ea0e1a3569387a1497e2bc7b)]:
+  - @abstract-money/core@3.4.2
+
 ## 0.0.3
 
 ### Patch Changes

packages/actions-xion/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abstract-money/actions-xion",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Abstraxion utils",
   "author": "adairrr <[email protected]>",
   "license": "MIT",

packages/core/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## 0.1.0
 
+## 3.4.2
+
+### Patch Changes
+
+- [`5bb5a12`](https://github.com/AbstractSDK/abstract.js/commit/5bb5a12dc20cec33ea0e1a3569387a1497e2bc7b) Thanks [@adairrr](https://github.com/adairrr)! - Update adapter message builders
+
 ## 3.4.1
 
 ### Patch Changes

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abstract-money/core",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "description": "Typings for Abstract smart contracts",
   "homepage": "https://github.com/AbstractSDK/abstract.js#readme",
   "author": "adairrr <[email protected]>",

packages/core/src/actions/account/public/get-adapter-authorized-addresses.ts

@@ -0,0 +1,30 @@
+import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'
+
+import { AdapterQueryMsgBuilder } from '@abstract-money/core'
+import { RegistryTypes } from '../../../codegen/abstract'
+import { getAccountAddressFromApi } from './get-account-address-from-api'
+
+export type GetAdapterAuthorizedAddresses = {
+  cosmWasmClient: CosmWasmClient
+  apiUrl: string
+  accountId: RegistryTypes.AccountId
+  adapterAddress: string
+}
+
+export async function getAdapterAuthorizedAddresses({
+  cosmWasmClient,
+  accountId,
+  adapterAddress,
+  apiUrl,
+}: GetAdapterAuthorizedAddresses) {
+  const account = await getAccountAddressFromApi({
+    accountId,
+    cosmWasmClient,
+    apiUrl,
+  })
+
+  return await cosmWasmClient.queryContractSmart(
+    adapterAddress,
+    AdapterQueryMsgBuilder.authorizedAddresses(account),
+  )
+}

packages/core/src/utils/chain-registry/host-chain-name-to-name.ts

@@ -4,7 +4,7 @@ export function hostChainNameToName(hostChainName: string) {
   const chainName = chains.find(
     ({ chain_name, chain_id }) =>
       chain_name === hostChainName ||
-      chainIdToHostChainName(chain_id) === hostChainName,
+      (chain_id && chainIdToHostChainName(chain_id) === hostChainName),
   )?.chain_name
   if (!chainName) {
     throw new Error(`Chain not found by hostChain: ${hostChainName}`)

packages/core/src/utils/modules/msg-factory/Adapter.msg-factory.ts

@@ -1,4 +1,4 @@
-import { ContractMsg } from '@abstract-money/core'
+import { type AppQueryMsg, ContractMsg } from '@abstract-money/core'
 import { CamelCasedProperties } from 'type-fest'
 import {
   AdapterBaseExecuteMsg,
@@ -33,17 +33,17 @@ import {
 export abstract class AdapterExecuteMsgFactory {
   /**
    * Make a request to an adapter module.
-   * @param proxyAddress
+   * @param accountAddress
    * @param request
    */
   static executeAdapter = <TAppMsg>({
-    proxyAddress,
+    accountAddress,
     request,
   }: CamelCasedProperties<
     AdapterRequestMsg<TAppMsg>
   >): AdapterExecuteMsg<TAppMsg> => {
     return ModuleExecuteMsgFactory.module({
-      proxy_address: proxyAddress,
+      account_address: accountAddress,
       request,
     })
   }
@@ -82,14 +82,14 @@ export abstract class AdapterQueryMsgBuilder {
 
   /**
    * Base adapter authorized addresses query.
-   * @param proxyAddress
+   * @param accountAddress
    */
   static authorizedAddresses = (
-    proxyAddress?: string,
+    accountAddress?: string,
   ): AdapterQueryMsg<never> => {
     return ModuleQueryMsgFactory.base({
       authorized_addresses: {
-        proxy_address: proxyAddress,
+        account_address: accountAddress,
       },
     })
   }
@@ -99,7 +99,16 @@ export abstract class AdapterQueryMsgBuilder {
    */
   static config = (): AdapterQueryMsg<never> => {
     return ModuleQueryMsgFactory.base({
-      config: {},
+      base_config: {},
+    })
+  }
+
+  /**
+   * App module data query.
+   */
+  static moduleData = (): AppQueryMsg<never> => {
+    return ModuleQueryMsgFactory.base({
+      module_data: {},
     })
   }
 }

packages/core/src/utils/modules/msg-factory/Adapter.types.ts

@@ -7,7 +7,7 @@ export type AdapterBaseExecuteMsg = {
   }
 }
 export type AdapterRequestMsg<TAppMsg> = {
-  proxy_address?: string | null
+  account_address?: string | null
   request: TAppMsg
 }
 
@@ -18,11 +18,14 @@ export type AdapterExecuteMsg<TAppMsg> = ModuleExecuteMsg<
 export type AdapterBaseQueryMsg =
   | {
       authorized_addresses: {
-        proxy_address?: string | null
+        account_address?: string | null
       }
     }
   | {
-      config: Record<string, never>
+      base_config: Record<string, never>
+    }
+  | {
+      module_data: Record<string, never>
     }
 
 export type AdapterQueryMsg<TAppMsg> = ModuleQueryMsg<
@@ -32,15 +35,15 @@ export type AdapterQueryMsg<TAppMsg> = ModuleQueryMsg<
 
 export type AdapterBaseInitMsg = {
   ans_host_address: string
-  version_control_address: string
+  registry_address: string
 }
 
 export interface AdapterAuthorizedAddressesResponse {
   addresses: string[]
 }
 
 export interface AdapterConfigResponse {
-  version_control_address: string
+  registry_address: string
   ans_host_address: string
   dependencies: string[]
 }

packages/core/src/utils/modules/msg-factory/App.msg-factory.ts

@@ -56,7 +56,7 @@ export abstract class AppQueryMsgFactory {
    */
   static config = (): AppQueryMsg<never> => {
     return ModuleQueryMsgFactory.base({
-      config: {},
+      base_config: {},
     })
   }
 
@@ -65,7 +65,25 @@ export abstract class AppQueryMsgFactory {
    */
   static admin = (): AppQueryMsg<never> => {
     return ModuleQueryMsgFactory.base({
-      admin: {},
+      base_admin: {},
+    })
+  }
+
+  /**
+   * App module data query.
+   */
+  static moduleData = (): AppQueryMsg<never> => {
+    return ModuleQueryMsgFactory.base({
+      module_data: {},
+    })
+  }
+
+  /**
+   * App top level owner query.
+   */
+  static topLevelOwner = (): AppQueryMsg<never> => {
+    return ModuleQueryMsgFactory.base({
+      top_level_owner: {},
     })
   }
 }

packages/core/src/utils/modules/msg-factory/App.types.ts

@@ -12,18 +12,30 @@ export type AppExecuteMsg<TAppMsg> = ModuleExecuteMsg<
 >
 export type AppBaseQueryMsg =
   | {
-      admin: Record<string, never>
+      base_admin: Record<string, never>
     }
   | {
-      config: Record<string, never>
+      base_config: Record<string, never>
+    }
+  | {
+      module_data: Record<string, never>
+    }
+  | {
+      top_level_owner: Record<string, never>
     }
 
 export type AppQueryMsg<TAppMsg> = ModuleQueryMsg<AppBaseQueryMsg, TAppMsg>
 
 export type AppBaseInitMsg = {
   ans_host_address: string
-  version_control_address: string
+  registry_address: string
 }
 
 // Empty migrate msg
 export type AppBaseMigrateMsg = Record<string, never>
+
+export interface AppConfigResponse {
+  account: string
+  ans_host_address: string
+  registry_address: string
+}

packages/core/src/utils/modules/msg-factory/Module.msg-factory.ts

@@ -79,7 +79,7 @@ export abstract class ModuleInitMsgFactory {
     return {
       base: {
         ans_host_address: ansHostAddress,
-        version_control_address: registryAddress,
+        registry_address: registryAddress,
       },
       module: appModuleInitMsg,
     }
@@ -99,7 +99,7 @@ export abstract class ModuleInitMsgFactory {
     return {
       base: {
         ans_host_address: ansHostAddress,
-        version_control_address: registryAddress,
+        registry_address: registryAddress,
       },
       module: adapterInitMsg,
     }

packages/provider-cosmoskit/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @abstract-money/provider-cosmoskit
 
+## 10.0.5
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @abstract-money/react@2.3.5
+
 ## 10.0.4
 
 ### Patch Changes

packages/provider-cosmoskit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abstract-money/provider-cosmoskit",
-  "version": "10.0.4",
+  "version": "10.0.5",
   "description": "Provider for CosmosKit",
   "homepage": "https://github.com/AbstractSDK/abstract.js#readme",
   "author": "dalechyn <[email protected]>",

packages/provider-graz/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @abstract-money/provider-graz
 
+## 11.0.2
+
+### Patch Changes
+
+- Updated dependencies [[`5bb5a12`](https://github.com/AbstractSDK/abstract.js/commit/5bb5a12dc20cec33ea0e1a3569387a1497e2bc7b)]:
+  - @abstract-money/core@3.4.2
+  - @abstract-money/react@2.3.5
+
 ## 11.0.1
 
 ### Patch Changes

packages/provider-graz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abstract-money/provider-graz",
-  "version": "11.0.1",
+  "version": "11.0.2",
   "description": "Provider for Graz",
   "homepage": "https://github.com/AbstractSDK/abstract.js#readme",
   "author": "dalechyn <[email protected]>",

packages/provider-xion/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @abstract-money/provider-xion
 
+## 4.0.2
+
+### Patch Changes
+
+- Updated dependencies [[`5bb5a12`](https://github.com/AbstractSDK/abstract.js/commit/5bb5a12dc20cec33ea0e1a3569387a1497e2bc7b)]:
+  - @abstract-money/core@3.4.2
+  - @abstract-money/react@2.3.5
+
 ## 4.0.1
 
 ### Patch Changes

packages/provider-xion/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abstract-money/provider-xion",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Provider for Xion",
   "homepage": "https://github.com/AbstractSDK/abstract.js#readme",
   "author": "adair <[email protected]>",