-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add interchain account queries #50
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"@abstract-money/core": minor | ||
--- | ||
|
||
Add interchain account queries |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
packages/core/src/actions/account/public/get-ibc-client-query-client-from-manager.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate' | ||
import { | ||
IbcClientQueryClient, | ||
VersionControlTypes, | ||
} from '../../../codegen/abstract' | ||
import { WithArgs } from '../../../types/with-args' | ||
import { getManagerQueryClientFromApi } from './get-manager-query-client-from-api' | ||
import { getModuleAddress } from './get-module-address' | ||
|
||
export type GetModuleAddressParameters = WithArgs<{ | ||
accountId: VersionControlTypes.AccountId | ||
cosmWasmClient: CosmWasmClient | ||
apiUrl: string | ||
}> | ||
|
||
const IBC_CLIENT_MODULE_ID = 'abstract:ibc-client' | ||
|
||
/** | ||
* Retrieve the {@link IbcClientQueryClient} from the manager account. | ||
* @throws if the IBC-client module is not installed | ||
* @param accountId | ||
* @param cosmWasmClient | ||
* @param apiUrl | ||
*/ | ||
export async function getIbcClientQueryClientFromManager({ | ||
args: { accountId, cosmWasmClient, apiUrl }, | ||
}: GetModuleAddressParameters) { | ||
const ibcClientAddress = await getModuleAddress({ | ||
args: { accountId, cosmWasmClient, apiUrl, id: IBC_CLIENT_MODULE_ID }, | ||
}) | ||
|
||
if (!ibcClientAddress) { | ||
throw new Error('IBC-client module not installed') | ||
} | ||
|
||
return new IbcClientQueryClient(cosmWasmClient, ibcClientAddress) | ||
} |
45 changes: 45 additions & 0 deletions
45
packages/core/src/actions/account/public/get-remote-account-ids.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
import { AccountId, chainIdToName } from '@abstract-money/core' | ||
import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate' | ||
import { | ||
IbcClientQueryClient, | ||
VersionControlTypes, | ||
} from '../../../codegen/abstract' | ||
import { WithArgs } from '../../../types/with-args' | ||
import { getIbcClientQueryClientFromManager } from './get-ibc-client-query-client-from-manager' | ||
import { | ||
GetRemoteProxiesParameters, | ||
getRemoteAccountProxies, | ||
} from './get-remote-account-proxies' | ||
|
||
export type GetRemoteAccountIdsParameters = GetRemoteProxiesParameters | ||
|
||
/** | ||
* Get the Account's remote Account ids. | ||
* @param accountId | ||
* @param cosmWasmClient | ||
* @param apiUrl | ||
*/ | ||
export async function getRemoteAccountIds({ | ||
args: { accountId, cosmWasmClient, apiUrl }, | ||
}: GetRemoteAccountIdsParameters): Promise<AccountId[]> { | ||
const remoteProxies = await getRemoteAccountProxies({ | ||
args: { accountId, cosmWasmClient, apiUrl }, | ||
}) | ||
|
||
const chainId = await cosmWasmClient.getChainId() | ||
const sourceChainName = chainIdToName(chainId) | ||
|
||
return Object.keys(remoteProxies).map((remoteChainName) => { | ||
// local accounts are now remote accounts, remote accounts are now one hop further | ||
const remoteTrace = | ||
accountId.trace === 'local' | ||
? [sourceChainName] | ||
: accountId.trace.remote.concat(sourceChainName) | ||
|
||
return { | ||
seq: accountId.seq, | ||
trace: { remote: remoteTrace }, | ||
chainName: remoteChainName, | ||
} satisfies AccountId | ||
}) | ||
} |
49 changes: 49 additions & 0 deletions
49
packages/core/src/actions/account/public/get-remote-account-proxies.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate' | ||
import { | ||
IbcClientQueryClient, | ||
VersionControlTypes, | ||
} from '../../../codegen/abstract' | ||
import { WithArgs } from '../../../types/with-args' | ||
import { getIbcClientQueryClientFromManager } from './get-ibc-client-query-client-from-manager' | ||
|
||
export type GetRemoteProxiesParameters = WithArgs< | ||
{ | ||
accountId: VersionControlTypes.AccountId | ||
cosmWasmClient: CosmWasmClient | ||
apiUrl: string | ||
} & Omit< | ||
Parameters< | ||
typeof IbcClientQueryClient.prototype.listRemoteProxiesByAccountId | ||
>[0], | ||
'accountId' | ||
> | ||
> | ||
|
||
type ChainName = string | ||
type MaybeProxyAddress = string | null | ||
|
||
/** | ||
* Get the remote proxies for the given account. | ||
* @param accountId | ||
* @param cosmWasmClient | ||
* @param apiUrl | ||
*/ | ||
export async function getRemoteAccountProxies({ | ||
args: { accountId, cosmWasmClient, apiUrl }, | ||
}: GetRemoteProxiesParameters): Promise<Record<ChainName, MaybeProxyAddress>> { | ||
let ibcClient: IbcClientQueryClient | ||
try { | ||
ibcClient = await getIbcClientQueryClientFromManager({ | ||
args: { accountId, cosmWasmClient, apiUrl }, | ||
}) | ||
} catch (e) { | ||
// IBC client not installed | ||
return {} | ||
} | ||
adairrr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
const remoteProxies = await ibcClient.listRemoteProxiesByAccountId({ | ||
accountId, | ||
}) | ||
|
||
return Object.fromEntries(remoteProxies.proxies) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
interesting,
vanilla
plugin could have done it instead, but it doesn't.