diff --git a/app/src/lib/queries/balance/index.ts b/app/src/lib/queries/balance/index.ts
index a6098b07a4..eefdfd5bbc 100644
--- a/app/src/lib/queries/balance/index.ts
+++ b/app/src/lib/queries/balance/index.ts
@@ -1,9 +1,9 @@
import { isAddress, type Address } from "viem"
import { raise } from "$lib/utilities/index.ts"
+import { bytesToBech32Address } from "@union/client"
import { getCosmosChainBalances } from "./cosmos.ts"
import { createQueries } from "@tanstack/svelte-query"
import { erc20ReadMulticall } from "./evm/multicall.ts"
-import { rawToBech32 } from "$lib/utilities/address.ts"
import type { Chain, UserAddresses } from "$lib/types.ts"
import { getBalancesFromAlchemy } from "./evm/alchemy.ts"
import { getBalancesFromRoutescan } from "./evm/routescan.ts"
@@ -72,8 +72,11 @@ export function userBalancesQuery({
const url = chain.rpcs.filter(rpc => rpc.type === "rest").at(0)?.url
if (!url) raise(`No REST RPC available for chain ${chain.chain_id}`)
- const bech32_addr = rawToBech32(chain.addr_prefix, userAddr.cosmos.bytes)
- return getCosmosChainBalances({ url, walletAddress: bech32_addr })
+ const bech32Address = bytesToBech32Address({
+ toPrefix: chain.addr_prefix,
+ bytes: userAddr.cosmos.bytes
+ })
+ return getCosmosChainBalances({ url, walletAddress: bech32Address })
}
return []
diff --git a/app/src/lib/swap-form.svelte b/app/src/lib/swap-form.svelte
index 664219c143..1cd80cbedb 100644
--- a/app/src/lib/swap-form.svelte
+++ b/app/src/lib/swap-form.svelte
@@ -7,7 +7,7 @@ import { userAddrEvm } from "$lib/wallet/evm"
import { userAddrCosmos } from "$lib/wallet/cosmos"
import * as Card from "$lib/components/ui/card/index.ts"
-import { UnionClient } from "@union/client"
+// import { UnionClient } from "@union/client"
import { Button } from "$lib/components/ui/button"
import type { Chain, UserAddresses } from "$lib/types.ts"
@@ -42,66 +42,66 @@ const BERACHAIN_CONTRACTS = {
ucs01_handler: "0x6F270608fB562133777AF0f71F6386ffc1737C30"
}
-const swap = async () => {
- const cosmosOfflineSigner = window?.keplr?.getOfflineSigner($fromChainId, {
- disableBalanceCheck: false
- })
-
- // TODO: don't hardcode union
- const cosmosClient = new UnionClient({
- cosmosOfflineSigner,
- evmSigner: undefined,
- bech32Prefix: "union",
- chainId: $fromChainId,
- gas: { denom: "UNO", amount: "0.0025" },
- rpcUrl: `https://rpc.testnet-8.union.build`
- })
-
- const evmNoteMsg = {
- kind: "cosmwasm",
- instructions: [
- {
- contractAddress: "union1c4wl7ytmf7kp6vupf50y3n8myu7m6xn8vspufledqd8x8hj9dn2s3clks5",
- msg: {
- execute: {
- msgs: [
- {
- call: {
- to: "0x08247b1C6D6AACF6C655f711661D5810380C8385",
- data: "095ea7b3000000000000000000000000ab827b1cc3535a9e549ee387a6e9c3f02f481b490000000000000000000000000000000000000000000000000000000000000007"
- }
- },
- {
- call: {
- to: "0xAB827b1Cc3535A9e549EE387A6E9C3F02F481B49",
- data: "3d719cd900000000000000000000000008247b1c6d6aacf6c655f711661d5810380c83850000000000000000000000000e4aaf1351de4c0264c5c7056ef3777b41bd8e030000000000000000000000000000000000000000000000000000000000008ca00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffff5433e2b3d8211706e6102aa947100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
- }
- },
- {
- ibc_send: {
- tokens: [
- {
- address: "0x0E4aaF1351de4c0264C5c7056Ef3777b41BD8e03",
- amount: "718283233153"
- }
- ],
- channel_id: "channel-3",
- receiver: "15cbba30256b961c37b3fd7224523abdf562fd72"
- }
- }
- ],
- callback: null,
- timeout_seconds: "5000000"
- }
- }
- }
- ]
- }
-
- // @ts-ignore
- const cosmosTransfer = await cosmosClient.transferAssets(evmNoteMsg)
- console.log(cosmosTransfer.transactionHash)
-}
+// const swap = async () => {
+// const cosmosOfflineSigner = window?.keplr?.getOfflineSigner($fromChainId, {
+// disableBalanceCheck: false
+// })
+
+// // TODO: don't hardcode union
+// const cosmosClient = new UnionClient({
+// cosmosOfflineSigner,
+// evmSigner: undefined,
+// bech32Prefix: "union",
+// chainId: $fromChainId,
+// gas: { denom: "UNO", amount: "0.0025" },
+// rpcUrl: `https://rpc.testnet-8.union.build`
+// })
+
+// const evmNoteMsg = {
+// kind: "cosmwasm",
+// instructions: [
+// {
+// contractAddress: "union1c4wl7ytmf7kp6vupf50y3n8myu7m6xn8vspufledqd8x8hj9dn2s3clks5",
+// msg: {
+// execute: {
+// msgs: [
+// {
+// call: {
+// to: "0x08247b1C6D6AACF6C655f711661D5810380C8385",
+// data: "095ea7b3000000000000000000000000ab827b1cc3535a9e549ee387a6e9c3f02f481b490000000000000000000000000000000000000000000000000000000000000007"
+// }
+// },
+// {
+// call: {
+// to: "0xAB827b1Cc3535A9e549EE387A6E9C3F02F481B49",
+// data: "3d719cd900000000000000000000000008247b1c6d6aacf6c655f711661d5810380c83850000000000000000000000000e4aaf1351de4c0264c5c7056ef3777b41bd8e030000000000000000000000000000000000000000000000000000000000008ca00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffff5433e2b3d8211706e6102aa947100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+// }
+// },
+// {
+// ibc_send: {
+// tokens: [
+// {
+// address: "0x0E4aaF1351de4c0264C5c7056Ef3777b41BD8e03",
+// amount: "718283233153"
+// }
+// ],
+// channel_id: "channel-3",
+// receiver: "15cbba30256b961c37b3fd7224523abdf562fd72"
+// }
+// }
+// ],
+// callback: null,
+// timeout_seconds: "5000000"
+// }
+// }
+// }
+// ]
+// }
+
+// // @ts-ignore
+// const cosmosTransfer = await cosmosClient.transferAssets(evmNoteMsg)
+// console.log(cosmosTransfer.transactionHash)
+// }
@@ -131,7 +131,7 @@ const swap = async () => {
{
- swap()
+ // swap()
}}
type="button"
>
diff --git a/app/src/lib/utilities/address.ts b/app/src/lib/utilities/address.ts
index f4e6e251b2..59a6262329 100644
--- a/app/src/lib/utilities/address.ts
+++ b/app/src/lib/utilities/address.ts
@@ -1,30 +1,12 @@
-import { bech32 } from "bech32"
+import { bytesToBech32Address } from "@union/client"
import type { Chain, UserAddresses } from "$lib/types"
-export function convertCosmosAddress({ address, toPrefix }: { address: string; toPrefix: string }) {
- const words = bech32.decode(address).words
- return bech32.encode(toPrefix, words)
-}
-
-export const rawToHex = (raw: Uint8Array): string =>
- `${Array.from(raw)
- .map(i => i.toString(16).padStart(2, "0"))
- .join("")
- .toLowerCase()}`
-
-export const rawToBech32 = (prefix: string, raw: Uint8Array): string => {
- const words = bech32.toWords(raw)
- return bech32.encode(prefix, words)
-}
-
-export const userAddrOnChain = (userAddr: UserAddresses, chain: Chain | null): string | null => {
- if (!chain) {
- return null
- }
+export const userAddrOnChain = (userAddr: UserAddresses, chain?: Chain): string | null => {
+ if (!chain) return null
if (chain.rpc_type === "cosmos") {
if (userAddr.cosmos?.bytes) {
- return rawToBech32(chain.addr_prefix, userAddr.cosmos.bytes)
+ return bytesToBech32Address({ bytes: userAddr.cosmos.bytes, toPrefix: chain.addr_prefix })
}
console.log("userAddrOnChain got no cosmos address")
return null
diff --git a/app/src/lib/utilities/types.ts b/app/src/lib/utilities/types.ts
index 476fda2665..42525c3700 100644
--- a/app/src/lib/utilities/types.ts
+++ b/app/src/lib/utilities/types.ts
@@ -1,5 +1,13 @@
import type { Readable } from "svelte/store"
+export type Pretty = { [K in keyof T]: T[K] } & {}
+
+export type MaybePromise = TValue | Promise
+
+export type TypeFromSet> = T extends Set ? U : never
+
+export type ExtractParameters = T extends new (..._args: infer P) => any ? P[0] : never
+
export type AtLeastOne = T extends any
? T | (U & Record, never>)
: never
diff --git a/app/src/lib/wallet/cosmos/config.ts b/app/src/lib/wallet/cosmos/config.ts
index 5633cbda26..429d489d7b 100644
--- a/app/src/lib/wallet/cosmos/config.ts
+++ b/app/src/lib/wallet/cosmos/config.ts
@@ -1,11 +1,12 @@
-import { derived, get, type Readable } from "svelte/store"
+import type { Address } from "viem"
+import { bytesToHex } from "@union/client"
import { sleep } from "$lib/utilities/index.ts"
import { persisted } from "svelte-persisted-store"
+import type { UserAddressCosmos } from "$lib/types"
+import type { OfflineSigner } from "@leapwallet/types"
import type { ChainWalletStore } from "$lib/wallet/types"
+import { derived, get, type Readable } from "svelte/store"
import { unionKeplrChainInfo, unionLeapChainInfo } from "$lib/wallet/cosmos/chain-info.ts"
-import type { UserAddressCosmos } from "$lib/types"
-import { rawToHex } from "$lib/utilities/address"
-import type { Address } from "viem"
export const cosmosWalletsInformation = [
{
@@ -38,7 +39,10 @@ export const cosmosWalletsInformation = [
export type CosmosWalletId = (typeof cosmosWalletsInformation)[number]["id"]
function createCosmosStore(
- previousState: ChainWalletStore<"cosmos"> = {
+ previousState: ChainWalletStore<"cosmos"> & {
+ rawAddress: Uint8Array | undefined
+ connectedWallet: CosmosWalletId | undefined
+ } = {
chain: "cosmos",
hoverState: "none",
address: undefined,
@@ -56,9 +60,11 @@ function createCosmosStore(
update,
subscribe,
connect: async (walletId: string) => {
+ console.info(walletId)
if (!walletId || (walletId !== "keplr" && walletId !== "leap")) return
update(v => ({ ...v, connectionStatus: "connecting", connectedWallet: walletId }))
const walletApi = window[walletId]
+
if (!walletApi) {
const walletInfo = cosmosWalletsInformation.find(wallet => wallet.id === walletId)
if (walletInfo) {
@@ -103,7 +109,7 @@ function createCosmosStore(
}
update(v => ({
...v,
- connectedWallet: "none",
+ connectedWallet: undefined,
connectionStatus: "disconnected",
address: undefined,
rawAddress: undefined
@@ -115,11 +121,16 @@ function createCosmosStore(
export const cosmosStore = createCosmosStore()
+export const getCosmosOfflineSigner = (chainId: string): OfflineSigner =>
+ get(cosmosStore).connectedWallet === "keplr"
+ ? window.keplr?.getOfflineSigner(chainId, { disableBalanceCheck: false })
+ : window.leap?.getOfflineSigner(chainId, { disableBalanceCheck: false })
+
export const userAddrCosmos: Readable = derived(
[cosmosStore],
([$cosmosStore]) => {
if ($cosmosStore?.rawAddress && $cosmosStore?.address) {
- const cosmos_normalized = rawToHex($cosmosStore.rawAddress)
+ const cosmos_normalized = bytesToHex($cosmosStore.rawAddress)
return {
canonical: $cosmosStore.address,
normalized: cosmos_normalized,
diff --git a/app/src/lib/wallet/evm/config.ts b/app/src/lib/wallet/evm/config.ts
index 33734608b5..ea6e18e4e1 100644
--- a/app/src/lib/wallet/evm/config.ts
+++ b/app/src/lib/wallet/evm/config.ts
@@ -15,17 +15,17 @@ import {
switchChain as _switchChain,
createStorage as createWagmiStorage
} from "@wagmi/core"
+import type { Address } from "viem"
import { sleep } from "$lib/utilities"
-import { derived, writable, type Readable } from "svelte/store"
import { KEY } from "$lib/constants/keys.ts"
+import type { UserAddressEvm } from "$lib/types"
import { APP_INFO } from "$lib/constants/app.ts"
import type { ChainWalletStore } from "$lib/wallet/types"
-import { sepolia, berachainTestnetbArtio, arbitrumSepolia, scrollSepolia } from "@wagmi/core/chains"
+import { derived, writable, type Readable } from "svelte/store"
import { injected, metaMask, coinbaseWallet } from "@wagmi/connectors"
-import type { UserAddressEvm } from "$lib/types"
-import type { Address } from "viem"
+import { sepolia, berachainTestnetbArtio, arbitrumSepolia, scrollSepolia } from "@wagmi/core/chains"
-const chains = [sepolia] as const
+const chains = [sepolia, berachainTestnetbArtio, arbitrumSepolia, scrollSepolia] as const
export type ConfiguredChainId = (typeof chains)[number]["id"]
export type Wallet = GetAccountReturnType
@@ -34,7 +34,7 @@ export type ConnectedWallet = Wallet & { status: "connected" }
export type ConnectorType = "injected" | "walletConnect"
export const config = createConfig({
- chains: [sepolia, berachainTestnetbArtio, arbitrumSepolia, scrollSepolia],
+ chains,
cacheTime: 4_000,
pollingInterval: 4_000,
syncConnectedChain: true,
diff --git a/app/src/lib/wallet/utilities/derive-address.ts b/app/src/lib/wallet/utilities/derive-address.ts
deleted file mode 100644
index fe70df764d..0000000000
--- a/app/src/lib/wallet/utilities/derive-address.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { isHex, bytesToHex } from "viem"
-import { hexToUint8Array } from "uint8array-extras"
-import { fromBech32, toBech32 } from "@cosmjs/encoding"
-
-import type { CosmosAddress, EvmAddress } from "$lib/wallet/types.ts"
-import { isValidCosmosAddress } from "$lib/wallet/utilities/validate.ts"
-
-export function cosmosToEvmAddress(address: CosmosAddress): EvmAddress {
- if (!isValidCosmosAddress(address)) throw new Error("Invalid Cosmos address")
- return bytesToHex(fromBech32(address).data)
-}
-
-export function evmToCosmosAddress(address: EvmAddress): CosmosAddress {
- const addressToBuffer = hexToUint8Array(address)
- return toBech32("union", addressToBuffer) as CosmosAddress
-}
-
-export const normalizeToCosmosAddress = (address: string): CosmosAddress =>
- isHex(address) ? evmToCosmosAddress(address) : (address as CosmosAddress)
-
-export const normalizeToEvmAddress = (address: string): EvmAddress =>
- isHex(address) ? address : cosmosToEvmAddress(address as CosmosAddress)
diff --git a/app/src/routes/explorer/+layout.svelte b/app/src/routes/explorer/+layout.svelte
index 1ec1362d5a..420582b72f 100644
--- a/app/src/routes/explorer/+layout.svelte
+++ b/app/src/routes/explorer/+layout.svelte
@@ -4,11 +4,8 @@ import { onNavigate } from "$app/navigation"
import { cn } from "$lib/utilities/shadcn.ts"
import type { LayoutData } from "./$types.ts"
import Menu from "./(components)/menu.svelte"
-import { deviceWidth } from "$lib/utilities/device.ts"
import StatsBar from "./(components)/stats-bar.svelte"
-import ArrowLeftIcon from "virtual:icons/lucide/arrow-left"
import ExplorerBreadcrumbs from "$lib/components/explorer-breadcrumbs.svelte"
-import ExplorerPagination from "$lib/components/explorer-pagination.svelte"
export let data: LayoutData
diff --git a/app/src/routes/explorer/address/[slug=address]/+page.svelte b/app/src/routes/explorer/address/[slug=address]/+page.svelte
index c3c4db6d08..04dfa950fe 100644
--- a/app/src/routes/explorer/address/[slug=address]/+page.svelte
+++ b/app/src/routes/explorer/address/[slug=address]/+page.svelte
@@ -1,11 +1,9 @@
diff --git a/app/src/routes/faucet/(components)/dydx-faucet.svelte b/app/src/routes/faucet/(components)/dydx-faucet.svelte
index 69992ce14b..19870a64c1 100644
--- a/app/src/routes/faucet/(components)/dydx-faucet.svelte
+++ b/app/src/routes/faucet/(components)/dydx-faucet.svelte
@@ -13,9 +13,9 @@ import { cosmosStore } from "$/lib/wallet/cosmos/config.ts"
import { derived, writable, type Writable } from "svelte/store"
import { dydxFaucetMutation } from "$lib/graphql/queries/faucet"
import { getCosmosChainBalances } from "$lib/queries/balance/cosmos"
-import { isValidCosmosAddress } from "$lib/wallet/utilities/validate.ts"
+import { createCosmosSdkAddressRegex } from "$lib/utilities/address.ts"
+import { bech32ToBech32Address, isValidBech32Address } from "@union/client"
import type { AwaitedReturnType, DiscriminatedUnion } from "$lib/utilities/types.ts"
-import { convertCosmosAddress, createCosmosSdkAddressRegex } from "$lib/utilities/address.ts"
type DydxFaucetState = DiscriminatedUnion<
"kind",
@@ -30,7 +30,7 @@ type DydxFaucetState = DiscriminatedUnion<
let dydxAddress = derived(cosmosStore, $cosmosStore =>
$cosmosStore.address
- ? convertCosmosAddress({
+ ? bech32ToBech32Address({
address: $cosmosStore.address,
toPrefix: "dydx"
})
@@ -242,7 +242,7 @@ let dydxBalance = createQuery(
requestDydxFromFaucet()
}}
disabled={$dydxFaucetState.kind !== "IDLE" ||
- isValidCosmosAddress($dydxAddress, ["dydx"]) === false}
+ isValidBech32Address($dydxAddress) === false}
class={cn(
"min-w-[110px] disabled:cursor-not-allowed disabled:opacity-50 rounded-md",
"bg-[#6866FF] text-[#ffffff] dark:bg-[#6866FF] dark:text-[#ffffff]"
@@ -270,5 +270,3 @@ let dydxBalance = createQuery(
{/if}
-
-
diff --git a/app/src/routes/faucet/(components)/stride-faucet.svelte b/app/src/routes/faucet/(components)/stride-faucet.svelte
index 8052335c28..7990e0b672 100644
--- a/app/src/routes/faucet/(components)/stride-faucet.svelte
+++ b/app/src/routes/faucet/(components)/stride-faucet.svelte
@@ -13,9 +13,9 @@ import { cosmosStore } from "$/lib/wallet/cosmos/config.ts"
import { derived, writable, type Writable } from "svelte/store"
import { strideFaucetMutation } from "$lib/graphql/queries/faucet"
import { getCosmosChainBalances } from "$lib/queries/balance/cosmos"
-import { isValidCosmosAddress } from "$lib/wallet/utilities/validate.ts"
+import { createCosmosSdkAddressRegex } from "$lib/utilities/address.ts"
+import { bech32ToBech32Address, isValidBech32Address } from "@union/client"
import type { AwaitedReturnType, DiscriminatedUnion } from "$lib/utilities/types.ts"
-import { convertCosmosAddress, createCosmosSdkAddressRegex } from "$lib/utilities/address.ts"
type DydxFaucetState = DiscriminatedUnion<
"kind",
@@ -30,7 +30,7 @@ type DydxFaucetState = DiscriminatedUnion<
let strideAddress = derived(cosmosStore, $cosmosStore =>
$cosmosStore.address
- ? convertCosmosAddress({
+ ? bech32ToBech32Address({
address: $cosmosStore.address,
toPrefix: "stride"
})
@@ -239,7 +239,7 @@ let strideBalance = createQuery(
requestStrdFromFaucet()
}}
disabled={$strideFaucetState.kind !== "IDLE" ||
- isValidCosmosAddress($strideAddress, ["stride"]) === false}
+ isValidBech32Address($strideAddress) === false}
class={cn(
"min-w-[110px] disabled:cursor-not-allowed disabled:opacity-50 rounded-md",
"bg-[#E6007A] text-[#ffffff] dark:bg-[#E6007A] dark:text-[#ffffff]"
@@ -267,5 +267,3 @@ let strideBalance = createQuery(
{/if}
-
-
diff --git a/app/src/routes/transfer/(components)/chain-dialog.svelte b/app/src/routes/transfer/(components)/chain-dialog.svelte
index 7eee0d9bee..d2cd88d073 100644
--- a/app/src/routes/transfer/(components)/chain-dialog.svelte
+++ b/app/src/routes/transfer/(components)/chain-dialog.svelte
@@ -1,27 +1,27 @@
+ class={cn(
+ 'size-full duration-1000 transition-colors dark:bg-muted',
+ $transferState.kind !== 'PRE_TRANSFER' ? 'bg-black/60' : '',
+ )}
+>