diff --git a/app/rpc/rpccontext/verbosedata.go b/app/rpc/rpccontext/verbosedata.go index e42d3ed8d3..6307e5cc55 100644 --- a/app/rpc/rpccontext/verbosedata.go +++ b/app/rpc/rpccontext/verbosedata.go @@ -81,10 +81,6 @@ func (ctx *Context) PopulateBlockWithVerboseData(block *appmessage.RPCBlock, dom block.VerboseData.SelectedParentHash = blockInfo.SelectedParent.String() } - if blockInfo.BlockStatus == externalapi.StatusHeaderOnly { - return nil - } - // Get the block if we didn't receive it previously if domainBlock == nil { domainBlock, err = ctx.Domain.Consensus().GetBlockEvenIfHeaderOnly(blockHash) @@ -93,6 +89,10 @@ func (ctx *Context) PopulateBlockWithVerboseData(block *appmessage.RPCBlock, dom } } + if domainBlock == nil && blockInfo.BlockStatus == externalapi.StatusHeaderOnly { + return nil + } + transactionIDs := make([]string, len(domainBlock.Transactions)) for i, transaction := range domainBlock.Transactions { transactionIDs[i] = consensushashing.TransactionID(transaction).String()