Henry Archibald, 40, from Gilmours Close, Edinburgh, was pulled from the Water of Leith in the city on Monday.
His death is being treated as unexplained.
He was found at around 9.30am, face-down in the shallows at the edge of the water below a popular cycle path that runs next to Stenhouse Industrial Estate.
Witnesses said police dive teams waded through the waters and found a bicycle.
In March 2012, Mr Archibald was attacked with a meat cleaver at his home the Slateford area of the city.
He suffered cuts to his back, chest and face.
Two men were later charged with attempted murder.