Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat(spaceward): fix sending cosmos not using the same rpc as in assets fetch data; fix handling collapsed transactions #892

Merged
merged 2 commits into from
Sep 24, 2024
Merged

feat(spaceward): fix sending cosmos not using the same rpc as in assets fetch data; fix handling collapsed transactions #892

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
305feaf
fix tx handle on collapsed sidebar block
alex-nax Sep 24, 2024
4a982bd
clenup unused type
alex-nax Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spaceward/src/components/ui/popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const PopoverContent = React.forwardRef<
React.ElementRef<typeof PopoverPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>
>(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
<PopoverPrimitive.Portal>
<PopoverPrimitive.Portal forceMount={props.forceMount}>
<PopoverPrimitive.Content
ref={ref}
align={align}
Expand Down
6 changes: 5 additions & 1 deletion spaceward/src/config/tokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,11 @@ export const COSMOS_PRICES: Record<string, bigint | undefined> = {
OSMO: BigInt(0.4446 * 10 ** 8),
};

const _ENABLED_ETH_CHAINS: { chainName: ChainName; testnet?: boolean }[] = [
const _ENABLED_ETH_CHAINS: {
chainName: ChainName;
testnet?: boolean;
title?: string;
}[] = [
{ chainName: "arbitrum" },
{ chainName: "astar" },
{ chainName: "avalanche" },
Expand Down
25 changes: 18 additions & 7 deletions spaceward/src/features/actions/StatusSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import clsx from "clsx";
import { useContext, useEffect } from "react";
import { useContext, useEffect, useRef, useState } from "react";
import { isDeliverTxSuccess } from "@cosmjs/stargate";
import { useChain, walletContext } from "@cosmos-kit/react-lite";
import { cosmos, warden } from "@wardenprotocol/wardenjs";
Expand All @@ -20,7 +20,9 @@ import { QueuedAction, QueuedActionStatus, useActionsState } from "./hooks";
import { getActionHandler, GetStatus, handleCosmos, handleEth, handleEthRaw } from "./util";
import { TEMP_KEY, useKeySettingsState } from "../keys/state";
import Assets from "../keys/assets";
import { useQueryClient } from "@tanstack/react-query";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { capitalize } from "../modals/util";
import { queryCosmosClients } from "../assets/queries";

interface ItemProps extends QueuedAction {
single?: boolean;
Expand All @@ -46,6 +48,10 @@ const waitForVisibility = () => {
function ActionItem({ single, ...item }: ItemProps) {
const queryClient = useQueryClient();
const { walletManager } = useContext(walletContext);
const cosmosClients = useQuery(queryCosmosClients(walletManager)).data;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Handle loading and error states from useQuery

The cosmosClients variable is directly accessed from useQuery(queryCosmosClients(walletManager)).data without checking for loading or error states. This might lead to issues if the data is not immediately available.

Suggested fix:

Destructure the result of useQuery to handle loading and error states:

const { data: cosmosClients, isLoading, error } = useQuery(queryCosmosClients(walletManager));

if (isLoading) {
  // Handle loading state, e.g., return a loader or null
}

if (error) {
  // Handle error state, e.g., display an error message
}

This ensures that your component handles all possible states and doesn't attempt to access data that may be undefined.

const clientsRef = useRef(cosmosClients);
clientsRef.current = cosmosClients;
Comment on lines +51 to +53
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Unnecessary use of useRef for cosmosClients

The clientsRef is initialized with cosmosClients and then updated on each render. Since cosmosClients is already reactive, using a ref here is unnecessary and can be simplified.

Suggested refactor:

Remove the useRef and use cosmosClients directly in your code.

- const clientsRef = useRef(cosmosClients);
- clientsRef.current = cosmosClients;

And update the usage accordingly:

- const [, , rpcEndpoint] = clientsRef.current?.find((v) => v[1] === item?.chainName) ?? [];
+ const [, , rpcEndpoint] = cosmosClients?.find((v) => v[1] === item?.chainName) ?? [];

This simplifies the code and avoids unnecessary complexity.

Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
const cosmosClients = useQuery(queryCosmosClients(walletManager)).data;
const clientsRef = useRef(cosmosClients);
clientsRef.current = cosmosClients;
const cosmosClients = useQuery(queryCosmosClients(walletManager)).data;


const { data: ks, setData: setKeySettings } = useKeySettingsState();
const { toast } = useToast()
const { w } = useWeb3Wallet("wss://relay.walletconnect.org");
Expand Down Expand Up @@ -311,7 +317,8 @@ function ActionItem({ single, ...item }: ItemProps) {
} else if (item.networkType === "eth") {
res = await handleEth({ action: item, w, queryClient });
} else if (item.networkType === "cosmos") {
res = await handleCosmos({ action: item, w, walletManager, queryClient });
const [, , rpcEndpoint] = clientsRef.current?.find((v) => v[1] === item?.chainName) ?? [];
res = await handleCosmos({ action: item, w, queryClient, rpcEndpoint });
Comment on lines +320 to +321
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Fragile array destructuring when extracting rpcEndpoint

Destructuring with positional indexes can lead to maintenance issues if the structure of the array changes. Relying on specific indices makes the code less readable and more error-prone.

Suggested refactor:

Consider restructuring your data to use objects instead of arrays, allowing for property-based access which is more robust.

If modifying the data structure is not feasible, you can enhance readability by destructuring with meaningful variable names:

- const [, , rpcEndpoint] = cosmosClients?.find((v) => v[1] === item?.chainName) ?? [];
+ const clientEntry = cosmosClients?.find((v) => v[1] === item?.chainName) ?? [];
+ const rpcEndpoint = clientEntry ? clientEntry[2] : undefined;

Or, if possible, adjust the data to be an array of objects:

// Example structure
[
  { key: ..., chainName: ..., rpcEndpoint: ... },
  // ...
]

And then use:

const clientEntry = cosmosClients?.find((v) => v.chainName === item?.chainName);
const rpcEndpoint = clientEntry?.rpcEndpoint;

This makes the code clearer and less dependent on the array structure.

}
} catch (e) {
console.error("broadcast failed", e);
Expand Down Expand Up @@ -407,7 +414,7 @@ function ActionItem({ single, ...item }: ItemProps) {
? "Action ready"
: item.status ===
QueuedActionStatus.AwaitingBroadcast
? "Awaiting broadcast"
? `Awaiting broadcast on ${capitalize(item.chainName)}`
: item.status === QueuedActionStatus.Success
? "Success"
: item.status ===
Expand Down Expand Up @@ -437,6 +444,7 @@ function ActionItem({ single, ...item }: ItemProps) {
}

export default function StatusSidebar() {
const [hide, setHide] = useState(true);
const { data } = useActionsState();
const storeIds = Object.keys(data ?? {});

Expand Down Expand Up @@ -469,7 +477,9 @@ export default function StatusSidebar() {
<ActionItem single {...data?.[filtered[0]]!} />
) : null
) : (
<Popover>
<Popover onOpenChange={open => {
setHide(!open);
}}>
Comment on lines +480 to +482
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Inconsistent visibility logic for PopoverContent

The logic controlling the visibility and mounting of PopoverContent may lead to unintended behavior:

  • You are toggling hide based on the open state with setHide(!open).
  • The className applies the hidden class when hide is true.
  • The forceMount prop is set to hide ? true : undefined, which forces mounting when hide is true.

This could result in the PopoverContent being mounted and hidden when it's supposed to be visible, and vice versa.

Suggested fix:

Simplify the state management by using the open state directly and adjust the forceMount logic accordingly.

- const [hide, setHide] = useState(true);
+ const [open, setOpen] = useState(false);

...

<Popover
-   onOpenChange={open => {
-       setHide(!open);
-   }}
+   open={open}
+   onOpenChange={setOpen}
>

Update the PopoverContent:

<PopoverContent
    side="left"
    sideOffset={20}
-   className={clsx("p-0", { hidden: hide })}
-   forceMount={hide ? true : undefined}
+   className="p-0"
+   forceMount
>

This ensures that:

  • The open state directly controls the visibility.
  • forceMount is always true to keep the content in the DOM.
  • The hidden class is no longer needed since the visibility is managed by the Popover component.

Also applies to: 497-498

<PopoverTrigger asChild>
<div className="flex flex-col relative cursor-pointer">
<p className="text-lg font-semibold">
Expand All @@ -484,9 +494,10 @@ export default function StatusSidebar() {
<PopoverContent
side="left"
sideOffset={20}
className="p-0"
className={clsx("p-0", { hidden: hide })}
forceMount={hide ? true : undefined}
>
<div className="bg-fill-quaternary max-h-80 overflow-auto">
<div className={"bg-fill-quaternary max-h-80 overflow-auto"}>
{filtered.map((id) => {
const action = data?.[id];

Expand Down
1 change: 1 addition & 0 deletions spaceward/src/features/actions/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export enum QueuedActionStatus {
Broadcast,
AwaitingApprovals,
ActionReady,
// fixme rename
AwaitingBroadcast,
Success = 0x99,
Failed = 0xff,
Expand Down
21 changes: 5 additions & 16 deletions spaceward/src/features/actions/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,12 +293,12 @@ export const handleEth = async ({
export const handleCosmos = async ({
action,
w,
walletManager,
queryClient,
rpcEndpoint,
}: {
action: QueuedAction;
w: IWeb3Wallet | null;
walletManager: WalletManager;
rpcEndpoint?: string;
Comment on lines +297 to +301
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Make rpcEndpoint a required parameter in handleCosmos

Since handleCosmos throws an error when rpcEndpoint is not provided, the rpcEndpoint parameter should be marked as required in the function's type definitions.

Apply this diff to make rpcEndpoint a required parameter:

 export const handleCosmos = async ({
     action,
     w,
     queryClient,
     rpcEndpoint,
 }: {
     action: QueuedAction;
     w: IWeb3Wallet | null;
-    rpcEndpoint?: string;
+    rpcEndpoint: string;
     queryClient: QueryClient;
 }) => {

Committable suggestion was skipped due to low confidence.

queryClient: QueryClient;
}) => {
const {
Expand Down Expand Up @@ -384,22 +384,11 @@ export const handleCosmos = async ({
signatures: [sig],
});

let rpc: string;
if (chain.rpc) {
[rpc] = chain.rpc;
} else {
const repo = walletManager.getWalletRepo(chainName);
repo.activate();
const endpoint = await repo.getRpcEndpoint();

rpc = endpoint
? typeof endpoint === "string"
? endpoint
: endpoint.url
: "https://rpc.cosmos.directory/" + chainName;
if (!rpcEndpoint) {
throw new Error("missing rpcEndpoint");
}

const client = await StargateClient.connect(rpc);
const client = await StargateClient.connect(rpcEndpoint);

const res = await client.broadcastTx(
cosmos.tx.v1beta1.TxRaw.encode(txRaw).finish(),
Expand Down
29 changes: 17 additions & 12 deletions spaceward/src/features/assets/queries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ const eip155NativeBalanceQuery = ({
throw new Error("Address is required");
}

const { provider, token } = getProvider(chainName);
const { provider, tokenSymbol: token } = getProvider(chainName);
const slinkyPrice = prices?.[token];
const priceFeed = EIP_155_NATIVE_PRICE_FEEDS[chainName];

Expand Down Expand Up @@ -427,7 +427,7 @@ const DEFAULT_BECH32_PREFIX = getCosmosChain("osmosis")!.bech32_prefix;
export const balancesQueryCosmos = (
enabled: boolean,
keys?: QueryKeyResponse[],
clients?: [CosmosQueryClient, string][],
clients?: [CosmosQueryClient, string, string][],
prices?: PriceMapSlinky,
) => {
const byAddress: Record<string, QueryKeyResponse> = {};
Expand Down Expand Up @@ -629,7 +629,10 @@ export const fiatPricesQuery = (enabled: boolean) => {
};
};

const rpcClients: Record<string, CosmosQueryClient | undefined> = {};
const rpcClients: Record<
string,
{ client: CosmosQueryClient; rpcEndpoint: string } | undefined
> = {};
const rpcRetry: Record<string, number> = {};

const checkHealth = async (
Expand Down Expand Up @@ -666,18 +669,18 @@ export const queryCosmosClients = (walletManager: WalletManager) => {
return {
queryKey: ["cosmos", "rpcClients"],
queryFn: async () => {
const clients: [CosmosQueryClient, string][] = [];
const clients: [CosmosQueryClient, string, string][] = [];

for (let i = 0; i < COSMOS_CHAINS.length; i++) {
const { chainName, rpc } = COSMOS_CHAINS[i];
const retries = (rpc?.length ?? 0) + 1;

for (let i = 0; i < retries; i++) {
let client = rpcClients[chainName];
let { client, rpcEndpoint } = rpcClients[chainName] ?? {};
const retry = (rpcRetry[chainName] ?? 0) % (retries + 1);
rpcRetry[chainName] = retry + 1;

if (!client) {
if (!client || !rpcEndpoint) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Ensure proper handling when rpcEndpoint is undefined

When checking if (!client || !rpcEndpoint), consider scenarios where client is defined but rpcEndpoint is undefined. Verify that the logic accounts for cases where only one of these variables is missing, and that subsequent code handles these situations appropriately.

Consider adjusting the condition to explicitly handle each case or adding further validation as needed.

let endpoint: ExtendedHttpEndpoint | string;

if (!rpc?.[retry]) {
Expand All @@ -694,14 +697,16 @@ export const queryCosmosClients = (walletManager: WalletManager) => {
endpoint = rpc[retry];
}

rpcEndpoint =
typeof endpoint === "string"
? endpoint
: endpoint.url;

try {
client =
await cosmos.ClientFactory.createRPCQueryClient(
{
rpcEndpoint:
typeof endpoint === "string"
? endpoint
: endpoint.url,
rpcEndpoint,
},
);
} catch (e) {
Expand All @@ -711,8 +716,8 @@ export const queryCosmosClients = (walletManager: WalletManager) => {
}

if (await checkHealth(client, chainName)) {
rpcClients[chainName] = client;
clients.push([client!, chainName]);
rpcClients[chainName] = { client, rpcEndpoint };
clients.push([client, chainName, rpcEndpoint]);
break;
} else if (rpcClients[chainName]) {
delete rpcClients[chainName];
Expand Down
17 changes: 7 additions & 10 deletions spaceward/src/features/modals/SendAssets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ import { validateAddress } from "../intents/AddAddressModal";
import { StargateClient } from "@cosmjs/stargate";
import { useModalState } from "./state";
import KeySelector from "./KeySelector";
import { COSMOS_CHAINS } from "@/config/tokens";
import { walletContext } from "@cosmos-kit/react-lite";
import { BalanceEntry } from "../assets/types";
import { useQuery } from "@tanstack/react-query";
import { queryCosmosClients } from "../assets/queries";

export default function SendAssetsModal({
// address,
Expand All @@ -31,6 +32,7 @@ export default function SendAssetsModal({

const { spaceId } = useSpaceId();
const { queryBalances } = useAssetQueries(spaceId);
const cosmosClients = useQuery(queryCosmosClients(walletManager)).data;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Issue: Handle loading and error states for useQuery

The cosmosClients data fetched via useQuery may be undefined while loading or if an error occurs. Accessing cosmosClients without checking can lead to runtime errors.

Consider destructuring the result of useQuery to handle isLoading and error, ensuring that cosmosClients is defined before usage:

- const cosmosClients = useQuery(queryCosmosClients(walletManager)).data;
+ const { data: cosmosClients, isLoading, error } = useQuery(queryCosmosClients(walletManager));

+ if (isLoading) {
+   // Optionally handle the loading state, e.g., disable submit button
+ }

+ if (error) {
+   // Handle the error state
+   console.error(error);
+ }

Ensure that cosmosClients is checked for availability before it's used elsewhere in the component.

Committable suggestion was skipped due to low confidence.


const results: (BalanceEntry & { refetch: () => void })[] = queryBalances
.filter((result) => result.data?.key?.key?.id === key?.key?.id)
Expand Down Expand Up @@ -97,17 +99,12 @@ export default function SendAssetsModal({
setModal({ type: undefined });
}
} else if (txBuild.type === "cosmos") {
const chain = COSMOS_CHAINS.find(
(item) => item.chainName === chainName,
);

let rpc = chain?.rpc?.[0];
const [, , rpc] = cosmosClients?.find((item) => {
return item[1] === chainName
}) ?? [];
Comment on lines +102 to +104
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Refactor Suggestion: Improve clarity when extracting rpc

Destructuring array elements by index reduces code readability and can be error-prone. Consider refactoring to make the code clearer.

Refactored code:

- const [, , rpc] = cosmosClients?.find((item) => {
-   return item[1] === chainName
- }) ?? [];

+ const client = cosmosClients?.find((item) => item[1] === chainName);
+ const rpc = client ? client[2] : undefined;

Alternatively, if cosmosClients is an array of objects:

+ const client = cosmosClients?.find((item) => item.chainName === chainName);
+ const rpc = client?.rpc;

This refactor enhances readability by explicitly accessing the rpc value.

Committable suggestion was skipped due to low confidence.


if (!rpc) {
const repo = walletManager.getWalletRepo(chainName);
repo.activate();
const endpoint = await repo.getRpcEndpoint();
rpc = endpoint ? typeof endpoint === "string" ? endpoint : endpoint.url : `https://rpc.cosmos.directory/${chainName}`;
throw new Error(`unable to find rpc for ${chainName}`);
}

const client = await StargateClient.connect(rpc);
Expand Down
17 changes: 7 additions & 10 deletions spaceward/src/hooks/state.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,7 @@ export function createPersistantState<T>(
});

const ref = useRef(data);

useEffect(() => {
ref.current = data;
}, [data]);
ref.current = data;

const setData = useCallback(
(nextData: Partial<T>) => {
Expand All @@ -120,14 +117,14 @@ export function createPersistantState<T>(
JSON.stringify(_data, (_, v) =>
typeof v === "bigint"
? {
type: "bigint",
value: v.toString(),
}
type: "bigint",
value: v.toString(),
}
: v instanceof Uint8Array
? {
type: "Uint8Array",
value: Array.from(v)
}
type: "Uint8Array",
value: Array.from(v)
}
: v,
),
);
Expand Down
23 changes: 15 additions & 8 deletions spaceward/src/lib/eth/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
// taken from https://chainlist.org
export const ETH_CHAIN_CONFIG: Record<
string,
{ rpc: string[]; token?: string }
{ rpc: string[]; token?: { symbol: string; name: string }; title?: string }
> = {
"1": { rpc: ["https://cloudflare-eth.com", "https://eth.llamarpc.com"] },
"1": {
rpc: ["https://cloudflare-eth.com", "https://eth.llamarpc.com"],
title: "Ethereum",
},
Comment on lines +6 to +9
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Consider adding the token property for consistency.

The addition of the title property improves clarity for the Ethereum chain. However, the token property is missing, which is inconsistent with other chain configurations and the type definition.

For consistency, consider adding the token property to the Ethereum configuration:

"1": {
  rpc: ["https://cloudflare-eth.com", "https://eth.llamarpc.com"],
  title: "Ethereum",
  token: { symbol: "ETH", name: "Ether" },
},

"5": { rpc: ["https://rpc.goerli.mudit.blog/"] },
"10": {
rpc: ["https://mainnet.optimism.io/", "https://optimism.llamarpc.com"],
Expand All @@ -13,30 +16,34 @@ export const ETH_CHAIN_CONFIG: Record<
"https://bsc-dataseed1.bnbchain.org",
"https://binance.llamarpc.com",
],
token: "BNB",
token: { symbol: "BNB", name: "Binance Coin" },
},
"61": {
rpc: ["https://etc.etcdesktop.com", "https://geth-at.etc-network.info"],
token: "ETC",
token: { symbol: "ETC", name: "Ethereum Classic" },
title: "Ethereum Classic",
},
"137": {
rpc: ["https://polygon-rpc.com/", "https://polygon.llamarpc.com"],
token: "MATIC",
token: { symbol: "MATIC", name: "Polygon" },
},
"324": { rpc: ["https://mainnet.era.zksync.io/"] },
"420": { rpc: ["https://goerli.optimism.io"] },
"592": {
rpc: ["https://astar-rpc.dwellir.com", "https://1rpc.io/astr"],
token: "ASTR",
token: { symbol: "ASTR", name: "Astar" },
},
"8453": {
rpc: ["https://mainnet.base.org/", "https://base.llamarpc.com"],
token: { symbol: "BASE", name: "Base" },
},
"8453": { rpc: ["https://mainnet.base.org/", "https://base.llamarpc.com"] },
"42161": {
rpc: ["https://arb1.arbitrum.io/rpc", "https://arbitrum.llamarpc.com"],
},
"42220": { rpc: ["https://forno.celo.org"] },
"43114": {
rpc: ["https://api.avax.network/ext/bc/C/rpc"],
token: "AVAX",
token: { symbol: "AVAX", name: "Avalanche" },
},
"44787": { rpc: ["https://alfajores-forno.celo-testnet.org"] },
"80001": { rpc: ["https://rpc-mumbai.maticvigil.com"] },
Expand Down
7 changes: 5 additions & 2 deletions spaceward/src/lib/eth/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ethers } from "ethers";
import { ETH_CHAINID_MAP, ETH_CHAIN_CONFIG } from "./constants";
import { capitalize } from "@/features/modals/util";

export const REVERSE_ETH_CHAINID_MAP = Object.fromEntries(
Object.entries(ETH_CHAINID_MAP).map(([k, v]) => [v, k]),
Expand All @@ -16,7 +17,9 @@ export const isSupportedNetwork = (
export const getProvider = (type: SupportedNetwork) => {
const chainId = ETH_CHAINID_MAP[type];
const config = ETH_CHAIN_CONFIG[chainId];
const token = config?.token ?? "ETH";
const tokenSymbol = config?.token?.symbol ?? "ETH";
const tokenName = config?.token?.name ?? "Ethereum";
const title = config?.title ?? capitalize(type);

if (!providers[type]) {
if (!chainId || !config) {
Expand Down Expand Up @@ -53,7 +56,7 @@ export const getProvider = (type: SupportedNetwork) => {
}

const provider = providers[type];
return { provider, token };
return { provider, tokenSymbol, tokenName, title };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Action Required: Update getProvider Usage Across the Codebase

The getProvider function now returns additional properties (tokenSymbol, tokenName, title) alongside provider. However, several calls to this function are only destructuring the provider, ignoring the new properties. Please update these instances to handle the expanded return structure.

Affected Files:

  • spaceward/src/features/actions/util.ts (Line 264)
  • spaceward/src/features/assets/queries.ts (Lines 202, 286, 599)
  • spaceward/src/features/home/TotalAssetValue.tsx (Line 12)
  • spaceward/src/features/home/HomeAssets.tsx (Line 17)
  • spaceward/src/features/assets/Assets.tsx (Line 18)
  • spaceward/src/features/modals/util.ts (Line 75)
  • spaceward/src/features/intents/util/query.ts (Line 3)
  • spaceward/src/components/SendEth.tsx (Line 11)
Analysis chain

LGTM: Updated return value of getProvider function.

The function now returns an object with additional properties (tokenSymbol, tokenName, title) along with the provider. This change enhances the information provided by the function.

Please ensure that all calls to getProvider across the codebase have been updated to handle the new return object structure. Run the following script to identify potential places that need updating:

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Find all usages of getProvider function
# Expected result: List of files and line numbers where getProvider is called

rg --type typescript -n 'getProvider\(' --glob '!spaceward/src/lib/eth/util.ts'

Length of output: 116

Script:

#!/bin/bash
# Description: Find all usages of getProvider function
# Expected result: List of files and line numbers where getProvider is called

rg -g '*.ts' -g '*.tsx' -n 'getProvider\(' --glob '!spaceward/src/lib/eth/util.ts'

Length of output: 1014

};

export const getProviderByChainId = (chainId: string) => {
Expand Down
Loading