Add expiry to inbound payment util functions