Introduce OnchainTxHandler, move bumping and tracking logic