Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
frontend
Commits
e1c2c54e
Commit
e1c2c54e
authored
Feb 08, 2024
by
tom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix block views
parent
1bedf712
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
15 deletions
+34
-15
client.ts
lib/web3/client.ts
+13
-7
useBlockQuery.tsx
ui/block/useBlockQuery.tsx
+7
-3
useBlockTxQuery.tsx
ui/block/useBlockTxQuery.tsx
+7
-3
useBlockWithdrawalsQuery.tsx
ui/block/useBlockWithdrawalsQuery.tsx
+7
-2
No files found.
lib/web3/client.ts
View file @
e1c2c54e
...
@@ -2,10 +2,16 @@ import { createPublicClient, http } from 'viem';
...
@@ -2,10 +2,16 @@ import { createPublicClient, http } from 'viem';
import
currentChain
from
'
./currentChain
'
;
import
currentChain
from
'
./currentChain
'
;
export
const
publicClient
=
createPublicClient
({
export
const
publicClient
=
(()
=>
{
chain
:
currentChain
,
if
(
currentChain
.
rpcUrls
.
public
.
http
.
filter
(
Boolean
).
length
===
0
)
{
transport
:
http
(),
return
;
batch
:
{
}
multicall
:
true
,
},
return
createPublicClient
({
});
chain
:
currentChain
,
transport
:
http
(),
batch
:
{
multicall
:
true
,
},
});
})();
ui/block/useBlockQuery.tsx
View file @
e1c2c54e
...
@@ -50,6 +50,10 @@ export default function useBlockQuery({ heightOrHash }: Params): BlockQuery {
...
@@ -50,6 +50,10 @@ export default function useBlockQuery({ heightOrHash }: Params): BlockQuery {
const
rpcQuery
=
useQuery
<
RpcResponseType
,
unknown
,
Block
|
null
>
({
const
rpcQuery
=
useQuery
<
RpcResponseType
,
unknown
,
Block
|
null
>
({
queryKey
:
[
'
RPC
'
,
'
block
'
,
{
heightOrHash
}
],
queryKey
:
[
'
RPC
'
,
'
block
'
,
{
heightOrHash
}
],
queryFn
:
async
()
=>
{
queryFn
:
async
()
=>
{
if
(
!
publicClient
)
{
return
null
;
}
const
blockParams
=
heightOrHash
.
startsWith
(
'
0x
'
)
?
{
blockHash
:
heightOrHash
as
`0x
${
string
}
`
}
:
{
blockNumber
:
BigInt
(
heightOrHash
)
};
const
blockParams
=
heightOrHash
.
startsWith
(
'
0x
'
)
?
{
blockHash
:
heightOrHash
as
`0x
${
string
}
`
}
:
{
blockNumber
:
BigInt
(
heightOrHash
)
};
return
publicClient
.
getBlock
(
blockParams
).
catch
(()
=>
null
);
return
publicClient
.
getBlock
(
blockParams
).
catch
(()
=>
null
);
},
},
...
@@ -86,13 +90,13 @@ export default function useBlockQuery({ heightOrHash }: Params): BlockQuery {
...
@@ -86,13 +90,13 @@ export default function useBlockQuery({ heightOrHash }: Params): BlockQuery {
};
};
},
},
placeholderData
:
GET_BLOCK
,
placeholderData
:
GET_BLOCK
,
enabled
:
apiQuery
.
isError
||
apiQuery
.
errorUpdateCount
>
0
,
enabled
:
publicClient
!==
undefined
&&
(
apiQuery
.
isError
||
apiQuery
.
errorUpdateCount
>
0
)
,
retry
:
false
,
retry
:
false
,
refetchOnMount
:
false
,
refetchOnMount
:
false
,
});
});
React
.
useEffect
(()
=>
{
React
.
useEffect
(()
=>
{
if
(
apiQuery
.
isPlaceholderData
)
{
if
(
apiQuery
.
isPlaceholderData
||
!
publicClient
)
{
return
;
return
;
}
}
...
@@ -109,7 +113,7 @@ export default function useBlockQuery({ heightOrHash }: Params): BlockQuery {
...
@@ -109,7 +113,7 @@ export default function useBlockQuery({ heightOrHash }: Params): BlockQuery {
}
}
},
[
rpcQuery
.
data
,
rpcQuery
.
isPlaceholderData
]);
},
[
rpcQuery
.
data
,
rpcQuery
.
isPlaceholderData
]);
const
isRpcQuery
=
Boolean
((
apiQuery
.
isError
||
apiQuery
.
isPlaceholderData
)
&&
apiQuery
.
errorUpdateCount
>
0
&&
rpcQuery
.
data
);
const
isRpcQuery
=
Boolean
(
publicClient
&&
(
apiQuery
.
isError
||
apiQuery
.
isPlaceholderData
)
&&
apiQuery
.
errorUpdateCount
>
0
&&
rpcQuery
.
data
);
const
query
=
isRpcQuery
?
rpcQuery
as
UseQueryResult
<
Block
,
ResourceError
<
{
status
:
number
}
>>
:
apiQuery
;
const
query
=
isRpcQuery
?
rpcQuery
as
UseQueryResult
<
Block
,
ResourceError
<
{
status
:
number
}
>>
:
apiQuery
;
return
{
return
{
...
...
ui/block/useBlockTxQuery.tsx
View file @
e1c2c54e
...
@@ -63,6 +63,10 @@ export default function useBlockTxQuery({ heightOrHash, blockQuery, tab }: Param
...
@@ -63,6 +63,10 @@ export default function useBlockTxQuery({ heightOrHash, blockQuery, tab }: Param
const
rpcQuery
=
useQuery
<
RpcResponseType
,
unknown
,
BlockTransactionsResponse
|
null
>
({
const
rpcQuery
=
useQuery
<
RpcResponseType
,
unknown
,
BlockTransactionsResponse
|
null
>
({
queryKey
:
[
'
RPC
'
,
'
block_txs
'
,
{
heightOrHash
}
],
queryKey
:
[
'
RPC
'
,
'
block_txs
'
,
{
heightOrHash
}
],
queryFn
:
async
()
=>
{
queryFn
:
async
()
=>
{
if
(
!
publicClient
)
{
return
null
;
}
const
blockParams
=
heightOrHash
.
startsWith
(
'
0x
'
)
?
const
blockParams
=
heightOrHash
.
startsWith
(
'
0x
'
)
?
{
blockHash
:
heightOrHash
as
`0x
${
string
}
`
,
includeTransactions
:
true
}
:
{
blockHash
:
heightOrHash
as
`0x
${
string
}
`
,
includeTransactions
:
true
}
:
{
blockNumber
:
BigInt
(
heightOrHash
),
includeTransactions
:
true
};
{
blockNumber
:
BigInt
(
heightOrHash
),
includeTransactions
:
true
};
...
@@ -125,13 +129,13 @@ export default function useBlockTxQuery({ heightOrHash, blockQuery, tab }: Param
...
@@ -125,13 +129,13 @@ export default function useBlockTxQuery({ heightOrHash, blockQuery, tab }: Param
};
};
},
},
placeholderData
:
GET_BLOCK_WITH_TRANSACTIONS
,
placeholderData
:
GET_BLOCK_WITH_TRANSACTIONS
,
enabled
:
tab
===
'
txs
'
&&
(
blockQuery
.
isDegradedData
||
apiQuery
.
isError
||
apiQuery
.
errorUpdateCount
>
0
),
enabled
:
publicClient
!==
undefined
&&
tab
===
'
txs
'
&&
(
blockQuery
.
isDegradedData
||
apiQuery
.
isError
||
apiQuery
.
errorUpdateCount
>
0
),
retry
:
false
,
retry
:
false
,
refetchOnMount
:
false
,
refetchOnMount
:
false
,
});
});
React
.
useEffect
(()
=>
{
React
.
useEffect
(()
=>
{
if
(
apiQuery
.
isPlaceholderData
)
{
if
(
apiQuery
.
isPlaceholderData
||
!
publicClient
)
{
return
;
return
;
}
}
...
@@ -151,7 +155,7 @@ export default function useBlockTxQuery({ heightOrHash, blockQuery, tab }: Param
...
@@ -151,7 +155,7 @@ export default function useBlockTxQuery({ heightOrHash, blockQuery, tab }: Param
const
isRpcQuery
=
Boolean
((
const
isRpcQuery
=
Boolean
((
blockQuery
.
isDegradedData
||
blockQuery
.
isDegradedData
||
((
apiQuery
.
isError
||
apiQuery
.
isPlaceholderData
)
&&
apiQuery
.
errorUpdateCount
>
0
)
((
apiQuery
.
isError
||
apiQuery
.
isPlaceholderData
)
&&
apiQuery
.
errorUpdateCount
>
0
)
)
&&
rpcQuery
.
data
);
)
&&
rpcQuery
.
data
&&
publicClient
);
const
rpcQueryWithPages
:
QueryWithPagesResult
<
'
block_txs
'
>
=
React
.
useMemo
(()
=>
{
const
rpcQueryWithPages
:
QueryWithPagesResult
<
'
block_txs
'
>
=
React
.
useMemo
(()
=>
{
return
{
return
{
...
...
ui/block/useBlockWithdrawalsQuery.tsx
View file @
e1c2c54e
...
@@ -65,6 +65,10 @@ export default function useBlockWithdrawalsQuery({ heightOrHash, blockQuery, tab
...
@@ -65,6 +65,10 @@ export default function useBlockWithdrawalsQuery({ heightOrHash, blockQuery, tab
const
rpcQuery
=
useQuery
<
RpcResponseType
,
unknown
,
BlockWithdrawalsResponse
|
null
>
({
const
rpcQuery
=
useQuery
<
RpcResponseType
,
unknown
,
BlockWithdrawalsResponse
|
null
>
({
queryKey
:
[
'
RPC
'
,
'
block
'
,
{
heightOrHash
}
],
queryKey
:
[
'
RPC
'
,
'
block
'
,
{
heightOrHash
}
],
queryFn
:
async
()
=>
{
queryFn
:
async
()
=>
{
if
(
!
publicClient
)
{
return
null
;
}
const
blockParams
=
heightOrHash
.
startsWith
(
'
0x
'
)
?
{
blockHash
:
heightOrHash
as
`0x
${
string
}
`
}
:
{
blockNumber
:
BigInt
(
heightOrHash
)
};
const
blockParams
=
heightOrHash
.
startsWith
(
'
0x
'
)
?
{
blockHash
:
heightOrHash
as
`0x
${
string
}
`
}
:
{
blockNumber
:
BigInt
(
heightOrHash
)
};
return
publicClient
.
getBlock
(
blockParams
).
catch
(()
=>
null
);
return
publicClient
.
getBlock
(
blockParams
).
catch
(()
=>
null
);
},
},
...
@@ -89,6 +93,7 @@ export default function useBlockWithdrawalsQuery({ heightOrHash, blockQuery, tab
...
@@ -89,6 +93,7 @@ export default function useBlockWithdrawalsQuery({ heightOrHash, blockQuery, tab
},
},
placeholderData
:
GET_BLOCK
,
placeholderData
:
GET_BLOCK
,
enabled
:
enabled
:
publicClient
!==
undefined
&&
tab
===
'
withdrawals
'
&&
tab
===
'
withdrawals
'
&&
config
.
features
.
beaconChain
.
isEnabled
&&
config
.
features
.
beaconChain
.
isEnabled
&&
(
blockQuery
.
isDegradedData
||
apiQuery
.
isError
||
apiQuery
.
errorUpdateCount
>
0
),
(
blockQuery
.
isDegradedData
||
apiQuery
.
isError
||
apiQuery
.
errorUpdateCount
>
0
),
...
@@ -97,7 +102,7 @@ export default function useBlockWithdrawalsQuery({ heightOrHash, blockQuery, tab
...
@@ -97,7 +102,7 @@ export default function useBlockWithdrawalsQuery({ heightOrHash, blockQuery, tab
});
});
React
.
useEffect
(()
=>
{
React
.
useEffect
(()
=>
{
if
(
apiQuery
.
isPlaceholderData
)
{
if
(
apiQuery
.
isPlaceholderData
||
!
publicClient
)
{
return
;
return
;
}
}
...
@@ -117,7 +122,7 @@ export default function useBlockWithdrawalsQuery({ heightOrHash, blockQuery, tab
...
@@ -117,7 +122,7 @@ export default function useBlockWithdrawalsQuery({ heightOrHash, blockQuery, tab
const
isRpcQuery
=
Boolean
((
const
isRpcQuery
=
Boolean
((
blockQuery
.
isDegradedData
||
blockQuery
.
isDegradedData
||
((
apiQuery
.
isError
||
apiQuery
.
isPlaceholderData
)
&&
apiQuery
.
errorUpdateCount
>
0
)
((
apiQuery
.
isError
||
apiQuery
.
isPlaceholderData
)
&&
apiQuery
.
errorUpdateCount
>
0
)
)
&&
rpcQuery
.
data
);
)
&&
rpcQuery
.
data
&&
publicClient
);
const
rpcQueryWithPages
:
QueryWithPagesResult
<
'
block_withdrawals
'
>
=
React
.
useMemo
(()
=>
{
const
rpcQueryWithPages
:
QueryWithPagesResult
<
'
block_withdrawals
'
>
=
React
.
useMemo
(()
=>
{
return
{
return
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment