From 95ff74c9095554ee98797c6ff7dff9deeecfc9f3 Mon Sep 17 00:00:00 2001 From: jxom <7336481+jxom@users.noreply.github.com> Date: Wed, 13 Nov 2024 07:32:33 +1100 Subject: [PATCH] fix: fetch block from header --- src/actions/public/watchBlocks.ts | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/actions/public/watchBlocks.ts b/src/actions/public/watchBlocks.ts index 54bfbf7dc9..c6b37e3b8c 100644 --- a/src/actions/public/watchBlocks.ts +++ b/src/actions/public/watchBlocks.ts @@ -236,12 +236,18 @@ export function watchBlocks< const { unsubscribe: unsubscribe_ } = await transport.subscribe({ params: ['newHeads'], - onData(data: any) { + async onData(data: any) { if (!active) return - const format = - client.chain?.formatters?.block?.format || formatBlock - const block = format(data.result) - onBlock(block, prevBlock as any) + const block = (await getAction( + client, + getBlock, + 'getBlock', + )({ + blockNumber: data.blockNumber, + includeTransactions, + }).catch(() => {})) as GetBlockReturnType + if (!active) return + onBlock(block as any, prevBlock as any) emitFetched = false prevBlock = block },