Add a `claim_deadline` field to `PaymentClaimable` with guarantees