Use waiting for blocks instead epochs, when waiting for new UTXOs

Use waiting for blocks instead epochs, when waiting for new UTXOs #27032