re-organized the rollback() and modified the asserts which were redundant after state save was switched from timestamp to event address
re-organized the rollback() and modified the asserts which were redundant after state save was switched from timestamp to event address

wilseypa/warped2,CastMi/warped2