-
+
iExec Explorer
-
+
{(tasks.isError || tasks.errorUpdateCount > 0) && !tasks.data ? (
diff --git a/src/modules/workerpools/WorkerpoolsPreviewTable.tsx b/src/modules/workerpools/WorkerpoolsPreviewTable.tsx
index eac85811..ab6eda30 100644
--- a/src/modules/workerpools/WorkerpoolsPreviewTable.tsx
+++ b/src/modules/workerpools/WorkerpoolsPreviewTable.tsx
@@ -2,21 +2,26 @@ import { PREVIEW_TABLE_LENGTH, PREVIEW_TABLE_REFETCH_INTERVAL } from '@/config';
import { execute } from '@/graphql/execute';
import { cn } from '@/lib/utils';
import { useQuery } from '@tanstack/react-query';
-import { Link } from '@tanstack/react-router';
import { Box, LoaderCircle, Terminal } from 'lucide-react';
-import { CircularLoader } from '@/components/CircularLoader';
+import { ChainLink } from '@/components/ChainLink';
import { DataTable } from '@/components/DataTable';
import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
import { Button } from '@/components/ui/button';
+import useUserStore from '@/stores/useUser.store';
import { workerpoolsQuery } from './workerpoolsQuery';
import { columns } from './workerpoolsTable/columns';
export function WorkerpoolsPreviewTable({ className }: { className?: string }) {
+ const { chainId } = useUserStore();
const workerpools = useQuery({
- queryKey: ['workerpools_preview'],
+ queryKey: [chainId, 'workerpools_preview'],
queryFn: () =>
- execute(workerpoolsQuery, { length: PREVIEW_TABLE_LENGTH, skip: 0 }),
+ execute(workerpoolsQuery, chainId, {
+ length: PREVIEW_TABLE_LENGTH,
+ skip: 0,
+ }),
refetchInterval: PREVIEW_TABLE_REFETCH_INTERVAL,
+ enabled: !!chainId,
});
const formattedData =
@@ -39,7 +44,7 @@ export function WorkerpoolsPreviewTable({ className }: { className?: string }) {
{workerpools.isFetching &&
+
+ );
+}
diff --git a/src/routes/tasks.tsx b/src/routes/$chainSlug/_layout/tasks.tsx
similarity index 87%
rename from src/routes/tasks.tsx
rename to src/routes/$chainSlug/_layout/tasks.tsx
index 36b15858..cb997137 100644
--- a/src/routes/tasks.tsx
+++ b/src/routes/$chainSlug/_layout/tasks.tsx
@@ -11,30 +11,35 @@ import { SearcherBar } from '@/modules/SearcherBar';
import { nextTasksQuery } from '@/modules/tasks/nextTasksQuery';
import { tasksQuery } from '@/modules/tasks/tasksQuery';
import { columns } from '@/modules/tasks/tasksTable/columns';
+import useUserStore from '@/stores/useUser.store';
-export const Route = createFileRoute('/tasks')({
+export const Route = createFileRoute('/$chainSlug/_layout/tasks')({
component: TasksRoute,
});
function useTasksData(currentPage: number) {
+ const { chainId } = useUserStore();
const skip = currentPage * TABLE_LENGTH;
const { data, isLoading, isRefetching, isError, errorUpdateCount } = useQuery(
{
- queryKey: ['tasks', currentPage],
- queryFn: () => execute(tasksQuery, { length: TABLE_LENGTH, skip }),
+ queryKey: [chainId, 'tasks', currentPage],
+ queryFn: () =>
+ execute(tasksQuery, chainId, { length: TABLE_LENGTH, skip }),
refetchInterval: TABLE_REFETCH_INTERVAL,
+ enabled: !!chainId,
}
);
const { data: nextData } = useQuery({
- queryKey: ['tasks-next', currentPage],
+ queryKey: [chainId, 'tasks-next', currentPage],
queryFn: () =>
- execute(nextTasksQuery, {
+ execute(nextTasksQuery, chainId, {
length: TABLE_LENGTH * 2,
skip: (currentPage + 1) * TABLE_LENGTH,
}),
refetchInterval: TABLE_REFETCH_INTERVAL,
+ enabled: !!chainId,
});
const nextTasks = nextData?.tasks ?? [];
diff --git a/src/routes/workerpools.tsx b/src/routes/$chainSlug/_layout/workerpools.tsx
similarity index 87%
rename from src/routes/workerpools.tsx
rename to src/routes/$chainSlug/_layout/workerpools.tsx
index bb9d0676..d2f8e578 100644
--- a/src/routes/workerpools.tsx
+++ b/src/routes/$chainSlug/_layout/workerpools.tsx
@@ -11,30 +11,35 @@ import { SearcherBar } from '@/modules/SearcherBar';
import { nextWorkerpoolsQuery } from '@/modules/workerpools/nextWorkerpoolsQuery';
import { workerpoolsQuery } from '@/modules/workerpools/workerpoolsQuery';
import { columns } from '@/modules/workerpools/workerpoolsTable/columns';
+import useUserStore from '@/stores/useUser.store';
-export const Route = createFileRoute('/workerpools')({
+export const Route = createFileRoute('/$chainSlug/_layout/workerpools')({
component: WorkerpoolsRoute,
});
function useWorkerpoolsData(currentPage: number) {
+ const { chainId } = useUserStore();
const skip = currentPage * TABLE_LENGTH;
const { data, isLoading, isRefetching, isError, errorUpdateCount } = useQuery(
{
- queryKey: ['workerpools', currentPage],
- queryFn: () => execute(workerpoolsQuery, { length: TABLE_LENGTH, skip }),
+ queryKey: [chainId, 'workerpools', currentPage],
+ queryFn: () =>
+ execute(workerpoolsQuery, chainId, { length: TABLE_LENGTH, skip }),
refetchInterval: TABLE_REFETCH_INTERVAL,
+ enabled: !!chainId,
}
);
const { data: nextData } = useQuery({
- queryKey: ['workerpools-next', currentPage],
+ queryKey: [chainId, 'workerpools-next', currentPage],
queryFn: () =>
- execute(nextWorkerpoolsQuery, {
+ execute(nextWorkerpoolsQuery, chainId, {
length: TABLE_LENGTH * 2,
skip: (currentPage + 1) * TABLE_LENGTH,
}),
refetchInterval: TABLE_REFETCH_INTERVAL,
+ enabled: !!chainId,
});
const nextWorkerpools = nextData?.workerpools ?? [];
diff --git a/src/routes/__root.tsx b/src/routes/__root.tsx
index 7546ad92..4cdc6574 100644
--- a/src/routes/__root.tsx
+++ b/src/routes/__root.tsx
@@ -3,17 +3,16 @@ import { TanStackRouterDevtools } from '@tanstack/react-router-devtools';
import { Footer } from '@/components/Footer';
import { UnsupportedChain } from '@/components/UnsupportedChain';
import { Navbar } from '@/components/navbar/NavBar';
-import { useSyncAccountWithUserStore } from '@/hooks/useSyncAccountWithUserStore';
+import { ChainSyncManager } from '@/hooks/ChainSyncManger';
export const Route = createRootRoute({
component: Root,
});
function Root() {
- useSyncAccountWithUserStore();
-
return (
+
+
+
+
+
+
+
+
+ ((set) => ({
- connector: undefined,
- setConnector: (connector: Connector | undefined) => set({ connector }),
isConnected: false,
setIsConnected: (isConnected: boolean) => set({ isConnected }),
isInitialized: false,
@@ -27,7 +22,7 @@ const useUserStore = create((set) => ({
set({ address: address?.toLowerCase() as Address });
},
chainId: undefined,
- setChainId: (chainId: number | undefined) => {
+ setChainId: (chainId: number) => {
set({ chainId: chainId });
},
}));
diff --git a/src/utils/chain.utils.ts b/src/utils/chain.utils.ts
new file mode 100644
index 00000000..2c0fbb6c
--- /dev/null
+++ b/src/utils/chain.utils.ts
@@ -0,0 +1,31 @@
+import { SUPPORTED_CHAINS } from '@/config';
+
+export function getSubgraphUrl(chainId: number) {
+ const subgraphUrl = SUPPORTED_CHAINS.find(
+ (chain) => chain.id === chainId
+ )?.subgraphUrl;
+ if (!subgraphUrl) {
+ throw new Error(`Subgraph URL not found for chain ID: ${chainId}`);
+ }
+ return subgraphUrl;
+}
+
+export function getChainFromSlug(slug: string | undefined) {
+ return SUPPORTED_CHAINS.find((c) => c.slug === slug);
+}
+
+export function getChainFromId(id: number | undefined) {
+ return SUPPORTED_CHAINS.find((c) => c.id === id);
+}
+
+export function getBlockExplorerUrl(chainId: number) {
+ const chain = getChainFromId(chainId);
+ return chain?.blockExplorerUrl ?? 'https://blockscout.com/';
+}
+
+/**
+ * initial chain evaluated once against the current location when the app loads
+ */
+export const INITIAL_CHAIN =
+ getChainFromSlug(new URL(window.location.href).pathname.split('/')[1]) ||
+ SUPPORTED_CHAINS[0];
diff --git a/src/utils/wagmiConfig.ts b/src/utils/wagmiConfig.ts
index 8a05749b..ba50be07 100644
--- a/src/utils/wagmiConfig.ts
+++ b/src/utils/wagmiConfig.ts
@@ -1,10 +1,11 @@
import { WagmiAdapter } from '@reown/appkit-adapter-wagmi';
+import { AppKitNetwork } from '@reown/appkit/networks';
import { createAppKit } from '@reown/appkit/react';
import { http, CreateConnectorFn } from 'wagmi';
import { injected, walletConnect } from 'wagmi/connectors';
-import { bellecour } from './bellecourChainConfig.ts';
import { InjectedWalletProvider } from './injected-wallet-provider/injected-wallet-provider.ts';
import { EIP6963ProviderDetail } from './injected-wallet-provider/types.ts';
+import wagmiNetworks from './wagmiNetworks.ts';
// Wagmi Client initialization
if (!import.meta.env.VITE_REOWN_PROJECT_ID) {
@@ -68,12 +69,17 @@ preservedAvailableProviderDetails.forEach((providerDetails) => {
);
});
+const networks = Object.values(wagmiNetworks) as [
+ AppKitNetwork,
+ ...AppKitNetwork[],
+];
+
export const wagmiAdapter = new WagmiAdapter({
- networks: [bellecour],
+ networks: networks,
multiInjectedProviderDiscovery: false,
- transports: {
- [bellecour.id]: http(),
- },
+ transports: Object.fromEntries(
+ Object.values(wagmiNetworks).map((network) => [network.id, http()])
+ ),
projectId,
connectors,
});
@@ -87,12 +93,10 @@ const featuredWalletIds = [
'ecc4036f814562b41a5268adc86270fba1365471402006302e70169465b7ac18', // Zerion
];
-// Create modal
createAppKit({
adapters: [wagmiAdapter],
- networks: [bellecour],
+ networks: networks,
projectId,
- defaultNetwork: bellecour,
featuredWalletIds,
features: {
email: false,
diff --git a/src/utils/bellecourChainConfig.ts b/src/utils/wagmiNetworks.ts
similarity index 62%
rename from src/utils/bellecourChainConfig.ts
rename to src/utils/wagmiNetworks.ts
index 99a221bb..2be3b395 100644
--- a/src/utils/bellecourChainConfig.ts
+++ b/src/utils/wagmiNetworks.ts
@@ -1,7 +1,10 @@
-export const bellecour = {
+import { AppKitNetwork, arbitrumSepolia } from '@reown/appkit/networks';
+
+export { arbitrumSepolia } from '@reown/appkit/networks';
+
+export const bellecour: AppKitNetwork = {
id: 0x86,
name: 'iExec Sidechain',
- network: 'bellecour',
nativeCurrency: {
decimals: 18,
name: 'xRLC',
@@ -19,3 +22,10 @@ export const bellecour = {
default: { name: 'Blockscout', url: 'https://blockscout-bellecour.iex.ec' },
},
};
+
+const wagmiNetworks = {
+ bellecour,
+ arbitrumSepolia,
+};
+
+export default wagmiNetworks;
-
- );
-}
diff --git a/src/stores/useUser.store.ts b/src/stores/useUser.store.ts
index 135623d4..ee84b606 100644
--- a/src/stores/useUser.store.ts
+++ b/src/stores/useUser.store.ts
@@ -1,10 +1,7 @@
import { Address } from '@/types';
-import type { Connector } from 'wagmi';
import { create } from 'zustand';
type UserState = {
- connector: Connector | undefined;
- setConnector: (param: Connector | undefined) => void;
isConnected: boolean;
setIsConnected: (param: boolean) => void;
isInitialized: boolean;
@@ -12,12 +9,10 @@ type UserState = {
address: Address | undefined;
setAddress: (param: Address | undefined) => void;
chainId: number | undefined;
- setChainId: (param: number | undefined) => void;
+ setChainId: (param: number) => void;
};
const useUserStore = create
-
-
-
-
-
-
-
-