{toDisplayName(chainId, chains)}
diff --git a/app/src/lib/components/transfer-details.svelte b/app/src/lib/components/transfer-details.svelte
index 6b7a748117..d62d59d5d7 100644
--- a/app/src/lib/components/transfer-details.svelte
+++ b/app/src/lib/components/transfer-details.svelte
@@ -32,7 +32,6 @@ let transfers = createQuery({
refetchInterval: query => (query.state.data?.length === 0 ? 1_000 : false), // fetch every second until we have the transaction
placeholderData: (previousData, _) => previousData,
queryFn: async () => {
- console.log("querying")
const response = await request(URLS().GRAPHQL, transfersBySourceHashBaseQueryDocument, {
source_transaction_hash: source
})
diff --git a/app/src/lib/queries/balance/cosmos.ts b/app/src/lib/queries/balance/cosmos.ts
index d6ccd382e6..29f4893255 100644
--- a/app/src/lib/queries/balance/cosmos.ts
+++ b/app/src/lib/queries/balance/cosmos.ts
@@ -1,5 +1,8 @@
import * as v from "valibot"
-import { raise } from "$lib/utilities"
+import { err, errAsync, ok, ResultAsync } from "neverthrow"
+import type { RawBalances } from "."
+import { toHex } from "viem"
+import { isValidBech32Address } from "@unionlabs/client"
const cosmosBalancesResponseSchema = v.object({
balances: v.array(
@@ -10,32 +13,39 @@ const cosmosBalancesResponseSchema = v.object({
)
})
-export async function getCosmosChainBalances({
+const fetchJson = (url: string) => {
+ return ResultAsync.fromPromise(
+ fetch(url).then(response => {
+ if (!response.ok) {
+ throw new Error(`HTTP error for url ${url} status: ${response.status}`)
+ }
+ return response.json()
+ }),
+ e =>
+ new Error(`Failed to fetch data from url ${url} with error: ${(e as Error).message}`, {
+ cause: e
+ })
+ )
+}
+
+export function getCosmosChainBalances({
url,
walletAddress
-}: { url: string; walletAddress: string }) {
- let json: undefined | unknown
-
- try {
- url = url.startsWith("https") ? url : `https://${url}`
- const response = await fetch(`${url}/cosmos/bank/v1beta1/balances/${walletAddress}`)
- if (!response.ok) raise("invalid response")
-
- json = await response.json()
- } catch (error) {
- if (error instanceof Error) {
- raise(`error fetching balances from /cosmos/bank: ${error.message}`)
- }
- raise(`unknown error while fetching from /cosmos/bank: ${JSON.stringify(error)}`)
- }
-
- const result = v.safeParse(cosmosBalancesResponseSchema, json)
-
- if (!result.success) raise(`error parsing result ${JSON.stringify(result.issues)}`)
- return result.output.balances.map(x => ({
- address: x.denom,
- symbol: x.denom,
- balance: BigInt(x.amount),
- decimals: 0
- }))
+}: { url: string; walletAddress: string }): ResultAsync
{
+ url = url.startsWith("https") ? url : `https://${url}`
+ if (!isValidBech32Address(walletAddress))
+ return errAsync(new Error(`invalid cosmos wallet address provided: ${walletAddress}`))
+ return fetchJson(`${url}/cosmos/bank/v1beta1/balances/${walletAddress}`)
+ .andThen(json => {
+ const result = v.safeParse(cosmosBalancesResponseSchema, json)
+ return result.success
+ ? ok(result.output)
+ : err(new Error("Validation failed:", { cause: result.issues }))
+ })
+ .map(balances =>
+ balances.balances.reduce((acc, cur) => {
+ acc[toHex(cur.denom)] = cur.amount
+ return acc
+ }, {})
+ )
}
diff --git a/app/src/lib/queries/balance/evm/multicall.ts b/app/src/lib/queries/balance/evm/multicall.ts
index 7df989382a..c51919fa6b 100644
--- a/app/src/lib/queries/balance/evm/multicall.ts
+++ b/app/src/lib/queries/balance/evm/multicall.ts
@@ -3,6 +3,7 @@ import { raise } from "$lib/utilities/index.ts"
import { config } from "$lib/wallet/evm/config.ts"
import { erc20Abi, getAddress, type Address } from "viem"
import type { NoRepetition } from "$lib/utilities/types.ts"
+import { ResultAsync } from "neverthrow"
/**
* @example
@@ -54,7 +55,9 @@ export async function erc20ReadMulticall({
const currentResult = accumulator.at(-1)
const fn = functionNames[index % functionNames.length]
if (!currentResult) return accumulator
- currentResult[fn === "balanceOf" ? "balance" : fn] = result ?? (fn === "decimals" ? 0 : "")
+ if (result !== undefined) {
+ currentResult[fn === "balanceOf" ? "balance" : fn] = result ?? (fn === "decimals" ? 0 : "")
+ }
return accumulator
},
[] as Array>
diff --git a/app/src/lib/queries/balance/index.ts b/app/src/lib/queries/balance/index.ts
index 3d9be9a3a4..3adfe33d94 100644
--- a/app/src/lib/queries/balance/index.ts
+++ b/app/src/lib/queries/balance/index.ts
@@ -5,6 +5,7 @@ import { erc20ReadMulticall } from "./evm/multicall.ts"
import { getCosmosChainBalances } from "./cosmos.ts"
import { getAptosChainBalances } from "./aptos.ts"
import { createQueries } from "@tanstack/svelte-query"
+import { err, errAsync, ok, ResultAsync, type Result } from "neverthrow"
export type AssetMetadata = {
denom: string
@@ -144,6 +145,9 @@ function getAddressForChain(chain: Chain, addresses: UserAddresses): string | nu
}
}
+export type Denom = string
+export type RawBalances = Record
+
export function userBalancesQuery({
userAddr,
chains
@@ -165,48 +169,74 @@ export function userBalancesQuery({
enabled: Boolean(getAddressForChain(chain, userAddr)),
refetchInterval: 4_000,
refetchOnWindowFocus: false,
- queryFn: async () => {
+ queryFn: async (): Promise<{ chain_id: string; balances: Result }> => {
const address = getAddressForChain(chain, userAddr)
- if (!address) return null
-
- let rawBalances: Record = {}
+ if (!address) {
+ return {
+ chain_id: chain.chain_id,
+ balances: err(new Error(`no user address for chain ${chain.chain_id}`))
+ }
+ }
if (chain.rpc_type === "evm") {
const tokenList = chain.tokens.filter(tokens => isAddress(tokens.denom))
- const multicallResults = await erc20ReadMulticall({
- chainId: chain.chain_id,
- functionNames: ["balanceOf"],
- address: address as Address,
- contractAddresses: tokenList.map(asset => asset.denom) as Array
- })
+ return {
+ chain_id: chain.chain_id,
+ balances: await ResultAsync.fromPromise(
+ erc20ReadMulticall({
+ chainId: chain.chain_id,
+ functionNames: ["balanceOf"],
+ address: address as Address,
+ contractAddresses: tokenList.map(asset => asset.denom) as Array
+ }),
+ error => new Error("error fetching evm balances", { cause: error })
+ ).andThen(multicallResultss =>
+ ok(
+ multicallResultss.reduce((acc, curr, index) => {
+ if (curr.balance) {
+ acc[tokenList[index].denom] = curr.balance.toString()
+ }
+ return acc
+ }, {})
+ )
+ )
+ }
+ }
- multicallResults.forEach((result, index) => {
- rawBalances[tokenList[index].denom] = result.balance?.toString() ?? "0"
- })
- } else if (chain.rpc_type === "cosmos") {
+ if (chain.rpc_type === "cosmos") {
const url = chain.rpcs.find(rpc => rpc.type === "rest")?.url
- if (!url) throw new Error(`No REST RPC available for chain ${chain.chain_id}`)
+ if (!url) {
+ return {
+ chain_id: chain.chain_id,
+ balances: err(new Error(`no rest url for cosmos chain ${chain.chain_id}`))
+ }
+ }
const bech32Address = bech32ToBech32Address({
toPrefix: chain.addr_prefix,
address: address
})
- const cosmosBalances = await getCosmosChainBalances({ url, walletAddress: bech32Address })
- cosmosBalances.forEach(balance => {
- rawBalances[balance.address] = balance.balance.toString()
- })
- } else if (chain.rpc_type === "aptos") {
- const url = chain.rpcs.find(rpc => rpc.type === "rpc")?.url
- if (!url) throw new Error(`No RPC available for chain ${chain.chain_id}`)
-
- const aptosBalances = await getAptosChainBalances({ url, walletAddress: address })
- aptosBalances.forEach(balance => {
- rawBalances[balance.address] = balance.balance.toString()
- })
+ return {
+ chain_id: chain.chain_id,
+ balances: await getCosmosChainBalances({ url, walletAddress: bech32Address })
+ }
+ // cosmosBalances.forEach(balance => {
+ // rawBalances[balance.address] = balance.balance.toString()
+ // })
}
-
- return { chain_id: chain.chain_id, balances: rawBalances }
+ // if (chain.rpc_type === "aptos") {
+ // const url = chain.rpcs.find(rpc => rpc.type === "rpc")?.url
+ // if (!url) throw new Error(`No RPC available for chain ${chain.chain_id}`)
+
+ // const aptosBalances = await getAptosChainBalances({ url, walletAddress: address })
+ // aptosBalances.forEach(balance => {
+ // rawBalances[balance.address] = balance.balance.toString()
+ // })
+ // }
+
+ // return { chain_id: chain.chain_id, balances: rawBalances }
+ return { chain_id: chain.chain_id, balances: err(new Error("unimplemented")) }
}
}))
})
diff --git a/app/src/routes/balances/UserBalances.svelte b/app/src/routes/balances/UserBalances.svelte
index 3c80165776..781cbfabb4 100644
--- a/app/src/routes/balances/UserBalances.svelte
+++ b/app/src/routes/balances/UserBalances.svelte
@@ -6,71 +6,23 @@ import { userAddress, balanceStore } from "$lib/components/TransferFrom/transfer
export let chains: Array
-$: userBalancesQueries = userBalancesQuery({ chains, userAddr: $userAddress, connected: true })
-$: balanceStore.set($userBalancesQueries.map(query => query.data || []))
-
-let hideZeroBalances = writable(true)
-
-$: filteredBalanceStore = derived(
- [balanceStore, hideZeroBalances],
- ([$balanceStore, $hideZeroBalances]) => {
- return $balanceStore.map(chainAssets =>
- $hideZeroBalances ? chainAssets.filter(asset => BigInt(asset.balance) > 0n) : chainAssets
- )
- }
-)
-
-function formatBalance(balance: string, decimals: number | null): string {
- if (!decimals) return balance
- const num = Number(balance) / 10 ** decimals
- return new Intl.NumberFormat("en-US", {
- minimumFractionDigits: 2,
- maximumFractionDigits: 6
- }).format(num)
-}
+let userBalancesQueries = userBalancesQuery({ chains, userAddr: $userAddress, connected: true })
-
-
-
-
-
-
- {#each $filteredBalanceStore as chainAssets, chainIndex}
- {#if chainAssets?.length}
-
-
- {chains[chainIndex].display_name}
-
-
- {#each chainAssets as asset}
-
-
- {asset.metadata.display_symbol ?? asset.metadata.denom}
- {#if asset.metadata.display_name}
-
- ({asset.metadata.display_name})
-
- {/if}
- {#if asset.metadata.gasToken}
-
- Gas Token
-
- {/if}
-
-
-
- {formatBalance(asset.balance, asset.metadata.decimals)}
-
-
- {asset.metadata.metadata_level}
-
-
-
- {/each}
-
-
+
+
+ {#each $userBalancesQueries as userBalance}
+ {#if userBalance.data}
+
{userBalance.data.chain_id}
+ {#if userBalance.data.balances.isOk()}
+
{JSON.stringify(userBalance.data.balances.value, null, 2)}
+ {:else}
+
{userBalance.data.balances.error.message}
+ {/if}
+ {:else}
+
{JSON.stringify(userBalance,null,2)}
{/if}
{/each}
-
\ No newline at end of file
+
+