I went through this exact same thing when DD was about 4 months. She had been rolling for a couple of weeks and started to roll in her sleep and waking herself up. She was also wrapped at this point too. I did get those 'wrap' things - which were more of 2 'triangles' connected by some material that just goes under the baby (they weren't too expensive - got them from Target I think) and she slept with them for about 3 weeks before she wanted to roll when in her cot and got cranky when she couldn't!

Her sleep was never the greatest in those early days and I ended up contacting Karitane for some advise, to which I was told:

* if she is rolling, and can push herself up onto her hands (outside of the cot), them I need to unwrap her because of the suffocation risk if she rolled in her sleep and couldn't push herself up.
* This is a stage and baby will eventually learn to roll over, while still asleep and stay asleep, and will prob end up on the belly, where most children end up sleeping once unwrapped and rolling anyway!

DD was always in a sleeping bag but always managed to roll in them anyway (and stand, and crawl and walk...but that's a whole different story!!!).

I know how frustrating it can be when you are constantly woken up. But I can only say that it IS a stage and it WILL pass. Just hold on, and if possible (and only if you are comfortable wiith it), let your DD roll, unwrapped, while in bed. You may find that she sleeps easier being able to move more freely, and get comfortable by herself.