Diffraction and total cross-section at the Tevatron and the LHC