tx: update the elements transaction discount calculation

As reported to and fixed in Elements upstream, the amount and nonce
commitments must be counted as base weight, not witness weight.

This makes blinded and unblinded standard txs the same size with the
discount applied.

Author: jgriffiths