[API BREAK] Use a nonce-generation function instead of a nonce

Fixed.