Add host chain name helpers and fix bug with remote-account-ids

AbstractSDK · Jun 24, 2024 · ac063e9 · ac063e9
1 parent 092a808
commit ac063e9
Show file tree

Hide file tree

Showing 16 changed files with 82 additions and 8 deletions.
diff --git a/examples/wagemos-cosmoskit-nextjs/CHANGELOG.md b/examples/wagemos-cosmoskit-nextjs/CHANGELOG.md
@@ -1,5 +1,14 @@
 # wagemos-cosmoskit-nextjs
 
+## 0.3.20
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @abstract-money/core@1.3.4
+  - @abstract-money/react@1.3.7
+  - @abstract-money/provider-cosmoskit@5.0.7
+
 ## 0.3.19
 
 ### Patch Changes

diff --git a/examples/wagemos-cosmoskit-nextjs/package.json b/examples/wagemos-cosmoskit-nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wagemos-cosmoskit-nextjs",
-  "version": "0.3.19",
+  "version": "0.3.20",
   "private": true,
   "scripts": {
     "dev": "next dev",

diff --git a/examples/wagemos-graz-nextjs/CHANGELOG.md b/examples/wagemos-graz-nextjs/CHANGELOG.md
@@ -1,5 +1,14 @@
 # wagemos-graz-nextjs
 
+## 0.3.20
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @abstract-money/core@1.3.4
+  - @abstract-money/react@1.3.7
+  - @abstract-money/provider-graz@5.0.7
+
 ## 0.3.19
 
 ### Patch Changes

diff --git a/examples/wagemos-graz-nextjs/package.json b/examples/wagemos-graz-nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wagemos-graz-nextjs",
-  "version": "0.3.19",
+  "version": "0.3.20",
   "private": true,
   "scripts": {
     "dev": "NODE_OPTIONS='--inspect' next dev",

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## 0.1.0
 
+## 1.3.4
+
+### Patch Changes
+
+- Add host chain name helpers and fix bug with remote-account-ids
+
 ## 1.3.3
 
 ### Patch Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abstract-money/core",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "Typings for Abstract smart contracts",
   "homepage": "https://github.com/AbstractSDK/abstract.js#readme",
   "author": "adairrr <[email protected]>",

diff --git a/packages/core/src/actions/account/public/get-remote-account-ids.ts b/packages/core/src/actions/account/public/get-remote-account-ids.ts
@@ -1,4 +1,8 @@
-import { AccountId, chainIdToName } from '@abstract-money/core'
+import {
+  AccountId,
+  chainIdToName,
+  hostChainNameToName,
+} from '@abstract-money/core'
 import {
   GetRemoteProxiesParameters,
   getRemoteAccountProxies,
@@ -35,10 +39,12 @@ export async function getRemoteAccountIds({
         ? [sourceChainName]
         : accountId.trace.remote.concat(sourceChainName)
 
+    const remoteChainName = hostChainNameToName(hostChainName)
+
     return {
       seq: accountId.seq,
       trace: { remote: remoteTrace },
-      chainName: hostChainName,
+      chainName: remoteChainName,
     } satisfies AccountId
   })
 }
diff --git a/packages/core/src/utils/chain-registry/chain-id-to-host-chain-name.ts b/packages/core/src/utils/chain-registry/chain-id-to-host-chain-name.ts
@@ -0,0 +1,5 @@
+const CHAIN_ID_SEPARATOR = '-'
+
+export const chainIdToHostChainName = (chainId: string) => {
+  return chainId.split(CHAIN_ID_SEPARATOR)[0]
+}
diff --git a/packages/core/src/utils/chain-registry/host-chain-name-to-name.ts b/packages/core/src/utils/chain-registry/host-chain-name-to-name.ts
@@ -0,0 +1,13 @@
+import { chainIdToHostChainName, chains } from '@abstract-money/core'
+
+export function hostChainNameToName(hostChainName: string) {
+  const chainName = chains.find(
+    ({ chain_name, chain_id }) =>
+      chain_name === hostChainName ||
+      chainIdToHostChainName(chain_id) === hostChainName,
+  )?.chain_name
+  if (!chainName) {
+    throw new Error(`Chain not found by hostChain: ${hostChainName}`)
+  }
+  return chainName
+}
diff --git a/packages/core/src/utils/chain-registry/index.ts b/packages/core/src/utils/chain-registry/index.ts
@@ -1,4 +1,6 @@
 export * from './assets'
 export * from './chains'
 export * from './chain-id-to-name'
+export * from './host-chain-name-to-name'
+export * from './chain-id-to-host-chain-name'
 export * from './chain-name-to-id'
diff --git a/packages/provider-cosmoskit/CHANGELOG.md b/packages/provider-cosmoskit/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @abstract-money/provider-cosmoskit
 
+## 5.0.7
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @abstract-money/react@1.3.7
+
 ## 5.0.6
 
 ### Patch Changes

diff --git a/packages/provider-cosmoskit/package.json b/packages/provider-cosmoskit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abstract-money/provider-cosmoskit",
-  "version": "5.0.6",
+  "version": "5.0.7",
   "description": "Provider for CosmosKit",
   "homepage": "https://github.com/AbstractSDK/abstract.js#readme",
   "author": "dalechyn <[email protected]>",

diff --git a/packages/provider-graz/CHANGELOG.md b/packages/provider-graz/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @abstract-money/provider-graz
 
+## 5.0.7
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @abstract-money/core@1.3.4
+  - @abstract-money/react@1.3.7
+
 ## 5.0.6
 
 ### Patch Changes

diff --git a/packages/provider-graz/package.json b/packages/provider-graz/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abstract-money/provider-graz",
-  "version": "5.0.6",
+  "version": "5.0.7",
   "description": "Provider for Graz",
   "homepage": "https://github.com/AbstractSDK/abstract.js#readme",
   "author": "dalechyn <[email protected]>",

diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @abstract-money/react
 
+## 1.3.7
+
+### Patch Changes
+
+- Add host chain name helpers and fix bug with remote-account-ids
+
+- Updated dependencies []:
+  - @abstract-money/core@1.3.4
+
 ## 1.3.6
 
 ### Patch Changes

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abstract-money/react",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "description": "React Hooks for Abstract SDK",
   "homepage": "https://github.com/AbstractSDK/abstract.js#readme",
   "author": "dalechyn <[email protected]>",