Merge pull request #148 from AbstractSDK/adair/0.25-update

adairrr · web-flow · commit df3cf873804c · 2024-11-22T19:05:26.000-05:00
Abstract 0.25
diff --git a/.changeset/smooth-walls-compare.md b/.changeset/smooth-walls-compare.md
@@ -0,0 +1,6 @@
+---
+"@abstract-money/core": minor
+"@abstract-money/cosmwasm-utils": patch
+---
+
+Update Abstract to 0.25 with account instantiation changes
diff --git a/packages/core/abstract.config.ts b/packages/core/abstract.config.ts
@@ -4,23 +4,23 @@ import { registry, vanilla } from '@abstract-money/cli/plugins'
 const contractsConfig = [
   {
     name: 'account',
-    version: '0.24.1',
+    version: '0.25.0',
   },
   {
     name: 'registry',
-    version: '0.24.1',
+    version: '0.25.0',
   },
   {
     name: 'ans-host',
-    version: '0.24.1',
+    version: '0.25.0',
   },
   {
     name: 'ibc-client',
-    version: '0.24.1',
+    version: '0.25.0',
   },
   {
     name: 'ica-client',
-    version: '0.24.1',
+    version: '0.25.0',
   },
 ]
 
diff --git a/packages/core/src/actions/public/get-registry-module-data.ts b/packages/core/src/actions/public/get-registry-module-data.ts
@@ -57,9 +57,31 @@ export async function getRegistryModuleData<
     return null
   }
 
-  return await rawQuery<ModuleData | null>({
-    client: cosmWasmClient,
-    address: firstInstantiation,
-    key: 'module_data',
-  })
+  let moduleData: ModuleData | null = null
+  try {
+    moduleData = await rawQuery<ModuleData | null>({
+      client: cosmWasmClient,
+      address: firstInstantiation,
+      key: 'mod',
+    })
+  } catch (error) {
+    try {
+      moduleData = await rawQuery<ModuleData | null>({
+        client: cosmWasmClient,
+        address: firstInstantiation,
+        key: 'module_data',
+      })
+    } catch (error2) {
+      console.debug(
+        `Could not retrieve module_data for ${formatModuleIdWithVersion(
+          module.info.namespace,
+          module.info.name,
+          module.info.version,
+        )}`,
+        error,
+        error2,
+      )
+    }
+  }
+  return moduleData
 }
diff --git a/packages/core/src/actions/wallet/create-account.ts b/packages/core/src/actions/wallet/create-account.ts
@@ -30,7 +30,7 @@ export type CreateAccountParameters = WithCosmWasmSignOptions<
           install_modules?: MergedModuleInstallConfig[]
         }
       >,
-      'owner'
+      'owner' | 'code_id'
     >
   >
 >
@@ -44,6 +44,7 @@ export async function createAccount({
   namespace,
   authenticator,
   link,
+  codeId,
   accountId,
   enableIbc,
   owner,
@@ -82,6 +83,7 @@ export async function createAccount({
   })
 
   const instantiateMsg: AccountTypes.InstantiateMsg = {
+    code_id: codeId ?? accountCodeId,
     owner: owner || {
       monarchy: {
         monarch: sender,
diff --git a/packages/core/src/actions/wallet/get-ans-host-client.ts b/packages/core/src/actions/wallet/get-ans-host-client.ts
@@ -8,7 +8,7 @@ export type GetAnsHostClientParameters = {
   ansHostAddress: string
 }
 
-export async function getAnsHostClient({
+export function getAnsHostClient({
   signingCosmWasmClient,
   sender,
   ansHostAddress,
diff --git a/packages/core/src/actions/wallet/get-registry-client.ts b/packages/core/src/actions/wallet/get-registry-client.ts
@@ -8,7 +8,7 @@ export type GetRegistryClientParameters = {
   registryAddress: string
 }
 
-export async function getRegistryClient({
+export function getRegistryClient({
   signingCosmWasmClient,
   sender,
   registryAddress,
diff --git a/packages/core/src/actions/wallet/get-sender-address.ts b/packages/core/src/actions/wallet/get-sender-address.ts
@@ -2,6 +2,6 @@ export type GetSenderAddressParameters = {
   sender: string
 }
 
-export async function getSenderAddress({ sender }: GetSenderAddressParameters) {
+export function getSenderAddress({ sender }: GetSenderAddressParameters) {
   return sender
 }
diff --git a/packages/core/src/actions/wallet/get-signing-cosm-wasm-client.ts b/packages/core/src/actions/wallet/get-signing-cosm-wasm-client.ts
@@ -4,7 +4,7 @@ export type GetSigningCosmWasmClientParameters = {
   signingCosmWasmClient: SigningCosmWasmClient
 }
 
-export async function getSigningCosmWasmClient({
+export function getSigningCosmWasmClient({
   signingCosmWasmClient,
 }: GetSigningCosmWasmClientParameters) {
   return signingCosmWasmClient
diff --git a/packages/core/src/clients/create-wallet-client.ts b/packages/core/src/clients/create-wallet-client.ts
@@ -2,7 +2,12 @@ import { SigningCosmWasmClient } from '@cosmjs/cosmwasm-stargate'
 import type { Evaluate } from '../types/utils'
 import { ABSTRACT_API_URL } from '../utils'
 import { type Client } from './create-client'
-import { PublicClientConfig, createPublicClient } from './create-public-client'
+import {
+  PublicClient,
+  PublicClientConfig,
+  createPublicClient,
+} from './create-public-client'
+import { PublicActions } from './decorators/public'
 import { type WalletActions, walletActions } from './decorators/wallet'
 
 export type WalletClientConfig = Omit<PublicClientConfig, 'cosmWasmClient'> & {
diff --git a/packages/core/src/utils/account-id/account-id-to-string.test.ts b/packages/core/src/utils/account-id/account-id-to-string.test.ts
@@ -0,0 +1,92 @@
+import { describe, expect, it } from 'vitest'
+import { accountIdToString } from './account-id-to-string'
+
+describe('accountIdToString', () => {
+  it('should convert a local account ID object to string', () => {
+    const accountId = {
+      chainName: 'neutrontestnet',
+      seq: 42,
+      trace: 'local' as const,
+    }
+    const result = accountIdToString(accountId)
+    expect(result).toEqual('neutrontestnet-42')
+  })
+
+  it('should convert a simple chain account ID object to string', () => {
+    const accountId = {
+      chainName: 'neutrontestnet',
+      seq: 42,
+      trace: 'local' as const,
+    }
+    const result = accountIdToString(accountId)
+    expect(result).toEqual('neutrontestnet-42')
+  })
+
+  it('should convert a multi-hop chain account ID object to string', () => {
+    const accountId = {
+      chainName: 'neutron',
+      seq: 42,
+      trace: {
+        remote: ['osmosis'],
+      },
+    }
+    const result = accountIdToString(accountId)
+    expect(result).toEqual('neutron>osmosis-42')
+  })
+
+  it('should convert a complex multi-hop chain account ID object to string', () => {
+    const accountId = {
+      chainName: 'neutron',
+      seq: 42,
+      trace: {
+        remote: ['juno', 'osmosis'],
+      },
+    }
+    const result = accountIdToString(accountId)
+    expect(result).toEqual('neutron>osmosis>juno-42')
+  })
+
+  it('should throw an error if seq is not a valid number', () => {
+    const accountId = {
+      chainName: 'neutron',
+      seq: -1,
+      trace: 'local' as const,
+    }
+    expect(() => accountIdToString(accountId)).toThrow(
+      'Invalid account sequence: -1',
+    )
+  })
+
+  it('should throw an error if chainName is missing', () => {
+    const accountId = {
+      seq: 42,
+      trace: 'local' as const,
+      chainName: '',
+    }
+    expect(() => accountIdToString(accountId)).toThrow(
+      'AccountId must have a chainName',
+    )
+  })
+
+  it('should throw an error if trace is not valid', () => {
+    const accountId = {
+      chainName: 'neutron',
+      seq: 42,
+      trace: { remote: [] },
+    }
+    expect(() => accountIdToString(accountId)).toThrow(
+      'Invalid remote trace: []',
+    )
+  })
+
+  it('should throw an error if trace is not valid', () => {
+    const accountId = {
+      chainName: 'neutron',
+      seq: 42,
+      trace: { remote: [''] },
+    }
+    expect(() => accountIdToString(accountId)).toThrow(
+      'Invalid remote trace: [""]',
+    )
+  })
+})
diff --git a/packages/core/src/utils/account-id/account-id-to-string.ts b/packages/core/src/utils/account-id/account-id-to-string.ts
@@ -14,16 +14,35 @@ import {
 export function accountIdToString<TChainName extends string = string>(
   id: AccountId<TChainName>,
 ) {
-  const baseId = s.join(
-    [id.chainName, `${id.seq}`],
-    ACCOUNT_ID_SEQUENCE_DELIMITER,
-  )
+  // Sequence check
+  if (id.seq < 0) {
+    throw new Error(`Invalid account sequence: ${id.seq}`)
+  }
+
+  // ChainName check
+  if (!id.chainName) {
+    throw new Error('AccountId must have a chainName')
+  }
 
+  // Trace check
   if (id.trace === 'local') {
-    return baseId
+    if (!id.chainName) {
+      throw new Error('chainName must be provided for local account ids')
+    }
+    return s.join([id.chainName, `${id.seq}`], ACCOUNT_ID_SEQUENCE_DELIMITER)
   }
 
-  return `${id.trace.remote.join(
+  if (!id.trace.remote.length || id.trace.remote.some((s) => !s)) {
+    throw new Error(`Invalid remote trace: ${JSON.stringify(id.trace.remote)}`)
+  }
+  const sourceChain = id.trace.remote[0]!
+
+  const baseId = s.join(
+    [sourceChain, `${id.seq}`],
+    ACCOUNT_ID_SEQUENCE_DELIMITER,
+  )
+
+  return `${[id.chainName, ...id.trace.remote.slice(1).reverse()].join(
     ACCOUNT_ID_CHAIN_DELIMITER,
   )}${ACCOUNT_ID_CHAIN_DELIMITER}${baseId}` as const
 }
diff --git a/packages/core/src/utils/account-id/account-id.ts b/packages/core/src/utils/account-id/account-id.ts
@@ -1,5 +1,9 @@
 import { RegistryTypes } from '../../codegen/abstract'
 
+/**
+ * AccountId is a globally unique identifier for an account.
+ * The chainName is the name of the chain where the account is located.
+ */
 export type AccountId<TChainName extends string = string> = {
   chainName: TChainName
 } & RegistryTypes.AccountId
diff --git a/packages/core/src/utils/account-id/string-to-account-id.test.ts b/packages/core/src/utils/account-id/string-to-account-id.test.ts
@@ -0,0 +1,79 @@
+import { describe, expect, it } from 'vitest'
+import { stringToAccountId } from './string-to-account-id'
+
+describe('stringToAccountId', () => {
+  it('should parse a local account ID with chainName', () => {
+    const result = stringToAccountId('local-42', 'neutrontestnet')
+    expect(result).toEqual({
+      chainName: 'neutrontestnet',
+      seq: 42,
+      trace: 'local',
+    })
+  })
+
+  it('should throw an error for a local account ID without chainName', () => {
+    expect(() => stringToAccountId('local-42')).toThrow(
+      'chainName must be provided for local account ids',
+    )
+  })
+
+  it('should parse a simple chain account ID', () => {
+    const result = stringToAccountId('neutrontestnet-42')
+    expect(result).toEqual({
+      chainName: 'neutrontestnet',
+      seq: 42,
+      trace: 'local',
+    })
+  })
+
+  it('should parse a multi-hop chain account ID', () => {
+    const result = stringToAccountId('osmosis>neutron-42')
+    expect(result).toEqual({
+      chainName: 'osmosis',
+      seq: 42,
+      trace: {
+        remote: ['neutron'],
+      },
+    })
+  })
+
+  it('should parse a multi-hop chain account ID with provided chain', () => {
+    const result = stringToAccountId('osmosis>neutron-42', 'osmosis')
+    expect(result).toEqual({
+      chainName: 'osmosis',
+      seq: 42,
+      trace: {
+        remote: ['neutron'],
+      },
+    })
+  })
+
+  it('should parse a complex multi-hop chain account ID', () => {
+    const result = stringToAccountId('neutron>juno>osmosis-42')
+    expect(result).toEqual({
+      chainName: 'neutron',
+      seq: 42,
+      trace: {
+        remote: ['osmosis', 'juno'],
+      },
+    })
+  })
+
+  it('should throw an error when the account string is invalid', () => {
+    expect(() => stringToAccountId('invalidString')).toThrow(
+      'Cannot find chain or sequence for account: invalidString',
+    )
+  })
+
+  it('should throw an error when source chain does not match provided chainName', () => {
+    expect(() => stringToAccountId('neutrontestnet-42', 'osmosis')).toThrow(
+      'chainName osmosis does not match chain in account id neutrontestnet-42',
+    )
+  })
+
+  it('should throw an error when account has no source chain in non-local accounts', () => {
+    expect(() => stringToAccountId('>osmosis-42')).toThrow(
+      'Invalid chain string in account id >osmosis-42',
+    )
+  })
+})
diff --git a/packages/core/src/utils/account-id/string-to-account-id.ts b/packages/core/src/utils/account-id/string-to-account-id.ts
diff --git a/packages/cosmwasm-utils/src/client/MultiqueryCosmWasmClient.ts b/packages/cosmwasm-utils/src/client/MultiqueryCosmWasmClient.ts

Original file line number	Diff line number	Diff line change
`@@ -4,23 +4,23 @@ import { registry, vanilla } from '@abstract-money/cli/plugins'`
`4`	`4`	`const contractsConfig = [`
`5`	`5`	`{`
`6`	`6`	`name: 'account',`
`7`		`- version: '0.24.1',`
	`7`	`+ version: '0.25.0',`
`8`	`8`	`},`
`9`	`9`	`{`
`10`	`10`	`name: 'registry',`
`11`		`- version: '0.24.1',`
	`11`	`+ version: '0.25.0',`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`name: 'ans-host',`
`15`		`- version: '0.24.1',`
	`15`	`+ version: '0.25.0',`
`16`	`16`	`},`
`17`	`17`	`{`
`18`	`18`	`name: 'ibc-client',`
`19`		`- version: '0.24.1',`
	`19`	`+ version: '0.25.0',`
`20`	`20`	`},`
`21`	`21`	`{`
`22`	`22`	`name: 'ica-client',`
`23`		`- version: '0.24.1',`
	`23`	`+ version: '0.25.0',`
`24`	`24`	`},`
`25`	`25`	`]`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ export type CreateAccountParameters = WithCosmWasmSignOptions<`
`30`	`30`	`install_modules?: MergedModuleInstallConfig[]`
`31`	`31`	`}`
`32`	`32`	`>,`
`33`		`- 'owner'`
	`33`	`+ 'owner' \| 'code_id'`
`34`	`34`	`>`
`35`	`35`	`>`
`36`	`36`	`>`
`@@ -44,6 +44,7 @@ export async function createAccount({`
`44`	`44`	`namespace,`
`45`	`45`	`authenticator,`
`46`	`46`	`link,`
	`47`	`+ codeId,`
`47`	`48`	`accountId,`
`48`	`49`	`enableIbc,`
`49`	`50`	`owner,`
`@@ -82,6 +83,7 @@ export async function createAccount({`
`82`	`83`	`})`
`83`	`84`
`84`	`85`	`const instantiateMsg: AccountTypes.InstantiateMsg = {`
	`86`	`+ code_id: codeId ?? accountCodeId,`
`85`	`87`	`owner: owner \|\| {`
`86`	`88`	`monarchy: {`
`87`	`89`	`monarch: sender,`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ export type GetAnsHostClientParameters = {`
`8`	`8`	`ansHostAddress: string`
`9`	`9`	`}`
`10`	`10`
`11`		`-export async function getAnsHostClient({`
	`11`	`+export function getAnsHostClient({`
`12`	`12`	`signingCosmWasmClient,`
`13`	`13`	`sender,`
`14`	`14`	`ansHostAddress,`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ export type GetRegistryClientParameters = {`
`8`	`8`	`registryAddress: string`
`9`	`9`	`}`
`10`	`10`
`11`		`-export async function getRegistryClient({`
	`11`	`+export function getRegistryClient({`
`12`	`12`	`signingCosmWasmClient,`
`13`	`13`	`sender,`
`14`	`14`	`registryAddress,`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ export type GetSenderAddressParameters = {`
`2`	`2`	`sender: string`
`3`	`3`	`}`
`4`	`4`
`5`		`-export async function getSenderAddress({ sender }: GetSenderAddressParameters) {`
	`5`	`+export function getSenderAddress({ sender }: GetSenderAddressParameters) {`
`6`	`6`	`return sender`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ export type GetSigningCosmWasmClientParameters = {`
`4`	`4`	`signingCosmWasmClient: SigningCosmWasmClient`
`5`	`5`	`}`
`6`	`6`
`7`		`-export async function getSigningCosmWasmClient({`
	`7`	`+export function getSigningCosmWasmClient({`
`8`	`8`	`signingCosmWasmClient,`
`9`	`9`	`}: GetSigningCosmWasmClientParameters) {`
`10`	`10`	`return signingCosmWasmClient`