cmd: Add subtract-fee flag

Used by:
- oasis account transfer --paratime xyz
- oasis account trnasfer --no-paratime
- oasis account withdraw

Author: matevz

cmd/account/account.go

@@ -2,17 +2,27 @@ package account
 
 import (
 	"github.com/spf13/cobra"
+	flag "github.com/spf13/pflag"
 
 	"github.com/oasisprotocol/cli/cmd/account/show"
 )
 
-var Cmd = &cobra.Command{
-	Use:     "account",
-	Short:   "Account operations",
-	Aliases: []string{"a", "acc", "accounts"},
-}
+// SubtractFeeFlags is a force mode switch.
+var (
+	subtractFee      bool
+	SubtractFeeFlags *flag.FlagSet
+
+	Cmd = &cobra.Command{
+		Use:     "account",
+		Short:   "Account operations",
+		Aliases: []string{"a", "acc", "accounts"},
+	}
+)
 
 func init() {
+	SubtractFeeFlags = flag.NewFlagSet("", flag.ContinueOnError)
+	SubtractFeeFlags.BoolVar(&subtractFee, "subtract-fee", false, "subtract fee from the amount")
+
 	Cmd.AddCommand(allowCmd)
 	Cmd.AddCommand(amendCommissionScheduleCmd)
 	Cmd.AddCommand(burnCmd)

cmd/account/allow.go

@@ -65,6 +65,7 @@ var allowCmd = &cobra.Command{
 }
 
 func init() {
+	allowCmd.Flags().AddFlagSet(SubtractFeeFlags)
 	allowCmd.Flags().AddFlagSet(common.SelectorNAFlags)
 	allowCmd.Flags().AddFlagSet(common.TxFlags)
 }

cmd/account/burn.go

@@ -55,6 +55,7 @@ var burnCmd = &cobra.Command{
 }
 
 func init() {
+	burnCmd.Flags().AddFlagSet(SubtractFeeFlags)
 	burnCmd.Flags().AddFlagSet(common.SelectorNAFlags)
 	burnCmd.Flags().AddFlagSet(common.TxFlags)
 }

cmd/account/delegate.go

@@ -124,6 +124,7 @@ var delegateCmd = &cobra.Command{
 }
 
 func init() {
+	delegateCmd.Flags().AddFlagSet(SubtractFeeFlags)
 	delegateCmd.Flags().AddFlagSet(common.SelectorFlags)
 	delegateCmd.Flags().AddFlagSet(common.RuntimeTxFlags)
 }

cmd/account/deposit.go

@@ -117,6 +117,7 @@ var depositCmd = &cobra.Command{
 }
 
 func init() {
+	depositCmd.Flags().AddFlagSet(SubtractFeeFlags)
 	depositCmd.Flags().AddFlagSet(common.SelectorFlags)
 	depositCmd.Flags().AddFlagSet(common.RuntimeTxFlags)
 	depositCmd.Flags().AddFlagSet(common.ForceFlag)

cmd/account/show/delegations.go

@@ -168,6 +168,8 @@ func prettyPrintAccountBalanceAndDelegationsFrom(
 	}
 	_ = totalAmount.Add(&totalDebDelegationsAmount)
 
+	txt, _ := generalAccount.Balance.MarshalText()
+	fmt.Printf("%s\n", txt)
 	fmt.Fprintf(w, "%sTotal: ", prefix)
 	fmt.Fprintf(w, "%s\n", helpers.FormatConsensusDenomination(network, *totalAmount))
 	fmt.Fprintf(w, "%sAvailable: ", prefix)

cmd/account/transfer.go

@@ -60,6 +60,7 @@ var transferCmd = &cobra.Command{
 		var sigTx, meta interface{}
 		switch npa.ParaTime {
 		case nil:
+			// Consensus layer transfer.
 			common.CheckForceErr(common.CheckAddressIsConsensusCapable(cfg, toAddr.String()))
 			if toEthAddr != nil {
 				common.CheckForceErr(common.CheckAddressIsConsensusCapable(cfg, toEthAddr.Hex()))
@@ -69,16 +70,23 @@ var transferCmd = &cobra.Command{
 				cobra.CheckErr("consensus layer only supports the native denomination")
 			}
 
-			// Consensus layer transfer.
-			amount, err := helpers.ParseConsensusDenomination(npa.Network, amount)
+			amt, err := helpers.ParseConsensusDenomination(npa.Network, amount)
 			cobra.CheckErr(err)
 
 			// Prepare transaction.
-			tx := staking.NewTransferTx(0, nil, &staking.Transfer{
+			innerTx := staking.Transfer{
 				To:     toAddr.ConsensusAddress(),
-				Amount: *amount,
-			})
-
+				Amount: *amt,
+			}
+			tx := staking.NewTransferTx(0, nil, &innerTx)
+			if subtractFee {
+				_, fee, err := common.PrepareConsensusTransaction(ctx, npa, acc.ConsensusSigner(), conn, tx)
+				cobra.CheckErr(err)
+				err = amt.Sub(fee)
+				cobra.CheckErr(err)
+				innerTx.Amount = *amt
+				tx = staking.NewTransferTx(0, nil, &innerTx)
+			}
 			sigTx, err = common.SignConsensusTransaction(ctx, npa, acc, conn, tx)
 			cobra.CheckErr(err)
 		default:
@@ -87,11 +95,19 @@ var transferCmd = &cobra.Command{
 			cobra.CheckErr(err)
 
 			// Prepare transaction.
-			tx := accounts.NewTransferTx(nil, &accounts.Transfer{
+			innerTx := accounts.Transfer{
 				To:     *toAddr,
 				Amount: *amountBaseUnits,
-			})
-
+			}
+			tx := accounts.NewTransferTx(nil, &innerTx)
+			if subtractFee {
+				_, fee, _, err := common.PrepareParatimeTransaction(ctx, npa, acc, conn, tx)
+				cobra.CheckErr(err)
+				err = amountBaseUnits.Amount.Sub(fee)
+				cobra.CheckErr(err)
+				innerTx.Amount = *amountBaseUnits
+				tx = accounts.NewTransferTx(nil, &innerTx)
+			}
 			txDetails := sdkSignature.TxDetails{OrigTo: toEthAddr}
 			sigTx, meta, err = common.SignParaTimeTransaction(ctx, npa, acc, conn, tx, &txDetails)
 			cobra.CheckErr(err)
@@ -102,6 +118,7 @@ var transferCmd = &cobra.Command{
 }
 
 func init() {
+	transferCmd.Flags().AddFlagSet(SubtractFeeFlags)
 	transferCmd.Flags().AddFlagSet(common.SelectorFlags)
 	transferCmd.Flags().AddFlagSet(common.RuntimeTxFlags)
 	transferCmd.Flags().AddFlagSet(common.ForceFlag)

cmd/account/withdraw.go

@@ -75,12 +75,21 @@ var withdrawCmd = &cobra.Command{
 		cobra.CheckErr(err)
 
 		// Prepare transaction.
-		tx := consensusaccounts.NewWithdrawTx(nil, &consensusaccounts.Withdraw{
+		innerTx := consensusaccounts.Withdraw{
 			To:     toAddr,
 			Amount: *amountBaseUnits,
-		})
+		}
+		tx := consensusaccounts.NewWithdrawTx(nil, &innerTx)
 
 		acc := common.LoadAccount(cfg, npa.AccountName)
+		if subtractFee {
+			_, fee, _, err := common.PrepareParatimeTransaction(ctx, npa, acc, conn, tx)
+			cobra.CheckErr(err)
+			err = amountBaseUnits.Amount.Sub(fee)
+			cobra.CheckErr(err)
+			innerTx.Amount = *amountBaseUnits
+			tx = consensusaccounts.NewWithdrawTx(nil, &innerTx)
+		}
 		sigTx, meta, err := common.SignParaTimeTransaction(ctx, npa, acc, conn, tx, nil)
 		cobra.CheckErr(err)
 
@@ -125,6 +134,7 @@ var withdrawCmd = &cobra.Command{
 }
 
 func init() {
+	withdrawCmd.Flags().AddFlagSet(SubtractFeeFlags)
 	withdrawCmd.Flags().AddFlagSet(common.SelectorFlags)
 	withdrawCmd.Flags().AddFlagSet(common.RuntimeTxFlags)
 	withdrawCmd.Flags().AddFlagSet(common.ForceFlag)