Tag non-custodial swaps