There is a drug called modafinil, is not an amphetamine in the strict sense of the word but it can keep you awake for many hours, is used to treat narcolepsy and its already being used in the military.
It's not an amphetamine in any sense of the word. Scientists were hesitant to even call it a "stimulant" at first.
It also does not have aggression inducing effects, or a lot of the other negative side effects of amphetamines.