Use current height when generating claims on block_disconnected