General interest and redistribution with self-interested voters: Social contract revisited