cmd: Improve support for different denominations

Author: kostko

cmd/account/delegate.go

@@ -12,7 +12,6 @@ import (
 	sdkSignature "github.com/oasisprotocol/oasis-sdk/client-sdk/go/crypto/signature"
 	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/helpers"
 	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/modules/consensusaccounts"
-	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/types"
 
 	"github.com/oasisprotocol/cli/cmd/common"
 	cliConfig "github.com/oasisprotocol/cli/config"
@@ -67,9 +66,7 @@ var delegateCmd = &cobra.Command{
 			cobra.CheckErr(err)
 		default:
 			// ParaTime delegation.
-			// TODO: This should actually query the ParaTime (or config) to check what the consensus
-			//       layer denomination is in the ParaTime. Assume NATIVE for now.
-			amountBaseUnits, err := helpers.ParseParaTimeDenomination(npa.ParaTime, amount, types.NativeDenomination)
+			amountBaseUnits, err := helpers.ParseParaTimeDenomination(npa.ParaTime, amount, npa.ConsensusDenomination())
 			cobra.CheckErr(err)
 
 			// Prepare transaction.

cmd/account/deposit.go

@@ -63,9 +63,7 @@ var depositCmd = &cobra.Command{
 		}
 
 		// Parse amount.
-		// TODO: This should actually query the ParaTime (or config) to check what the consensus
-		//       layer denomination is in the ParaTime. Assume NATIVE for now.
-		amountBaseUnits, err := helpers.ParseParaTimeDenomination(npa.ParaTime, amount, types.NativeDenomination)
+		amountBaseUnits, err := helpers.ParseParaTimeDenomination(npa.ParaTime, amount, npa.ConsensusDenomination())
 		cobra.CheckErr(err)
 
 		// Prepare transaction.

cmd/account/transfer.go

@@ -17,15 +17,23 @@ import (
 )
 
 var transferCmd = &cobra.Command{
-	Use:     "transfer <amount> <to>",
+	Use:     "transfer <amount> [<denom>] <to>",
 	Short:   "Transfer given amount of tokens",
 	Aliases: []string{"t"},
-	Args:    cobra.ExactArgs(2),
+	Args:    cobra.RangeArgs(2, 3),
 	Run: func(cmd *cobra.Command, args []string) {
 		cfg := cliConfig.Global()
 		npa := common.GetNPASelection(cfg)
 		txCfg := common.GetTransactionConfig()
-		amount, to := args[0], args[1]
+		var amount, denom, to string
+		switch len(args) {
+		case 2:
+			amount, to = args[0], args[1]
+		case 3:
+			amount, denom, to = args[0], args[1], args[2]
+		default:
+			cobra.CheckErr("unexpected number of arguments") // Should never happen.
+		}
 
 		if npa.Account == nil {
 			cobra.CheckErr("no accounts configured in your wallet")
@@ -57,6 +65,10 @@ var transferCmd = &cobra.Command{
 				common.CheckForceErr(common.CheckAddressIsConsensusCapable(cfg, toEthAddr.Hex()))
 			}
 
+			if denom != "" {
+				cobra.CheckErr("consensus layer only supports the native denomination")
+			}
+
 			// Consensus layer transfer.
 			amount, err := helpers.ParseConsensusDenomination(npa.Network, amount)
 			cobra.CheckErr(err)
@@ -71,9 +83,7 @@ var transferCmd = &cobra.Command{
 			cobra.CheckErr(err)
 		default:
 			// ParaTime transfer.
-			// TODO: This should actually query the ParaTime (or config) to check what the consensus
-			//       layer denomination is in the ParaTime. Assume NATIVE for now.
-			amountBaseUnits, err := helpers.ParseParaTimeDenomination(npa.ParaTime, amount, types.NativeDenomination)
+			amountBaseUnits, err := helpers.ParseParaTimeDenomination(npa.ParaTime, amount, types.Denomination(denom))
 			cobra.CheckErr(err)
 
 			// Prepare transaction.

cmd/account/withdraw.go

@@ -71,9 +71,7 @@ var withdrawCmd = &cobra.Command{
 		common.CheckForceErr(common.CheckAddressNotReserved(cfg, addrToCheck))
 
 		// Parse amount.
-		// TODO: This should actually query the ParaTime (or config) to check what the consensus
-		//       layer denomination is in the ParaTime. Assume NATIVE for now.
-		amountBaseUnits, err := helpers.ParseParaTimeDenomination(npa.ParaTime, amount, types.NativeDenomination)
+		amountBaseUnits, err := helpers.ParseParaTimeDenomination(npa.ParaTime, amount, npa.ConsensusDenomination())
 		cobra.CheckErr(err)
 
 		// Prepare transaction.

cmd/common/selector.go

@@ -7,6 +7,7 @@ import (
 	flag "github.com/spf13/pflag"
 
 	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/config"
+	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/types"
 
 	cliConfig "github.com/oasisprotocol/cli/config"
 )
@@ -96,6 +97,21 @@ func (npa *NPASelection) PrettyPrintNetwork() (out string) {
 	return
 }
 
+// ConsensusDenomination returns the denomination used to represent the consensus layer token.
+func (npa *NPASelection) ConsensusDenomination() (denom types.Denomination) {
+	if npa.ParaTime == nil {
+		return types.NativeDenomination
+	}
+
+	switch cfgDenom := npa.ParaTime.ConsensusDenomination; cfgDenom {
+	case config.NativeDenominationKey:
+		denom = types.NativeDenomination
+	default:
+		denom = types.Denomination(cfgDenom)
+	}
+	return
+}
+
 func init() {
 	AccountFlag = flag.NewFlagSet("", flag.ContinueOnError)
 	AccountFlag.StringVar(&selectedAccount, "account", "", "explicitly set account to use")

cmd/common/transaction.go

@@ -34,6 +34,7 @@ var (
 	txNonce      uint64
 	txGasLimit   uint64
 	txGasPrice   string
+	txFeeDenom   string
 	txEncrypted  bool
 	txYes        bool
 	txUnsigned   bool
@@ -116,6 +117,11 @@ func SignConsensusTransaction(
 	}
 	tx.Fee.Gas = consensusTx.Gas(txGasLimit)
 
+	// For sanity make sure no fee denomination has been specified.
+	if txFeeDenom != "" {
+		return nil, fmt.Errorf("consensus layer only supports the native denomination for paying fees")
+	}
+
 	gasPrice := quantity.NewQuantity()
 	if txGasPrice != "" {
 		var err error
@@ -215,11 +221,12 @@ func SignParaTimeTransaction(
 		tx.AuthInfo.Fee.Gas = txGasLimit
 	}
 
+	feeDenom := types.Denomination(txFeeDenom)
+
 	gasPrice := &types.BaseUnits{}
 	if txGasPrice != "" {
-		// TODO: Support different denominations for gas fees.
 		var err error
-		gasPrice, err = helpers.ParseParaTimeDenomination(npa.ParaTime, txGasPrice, types.NativeDenomination)
+		gasPrice, err = helpers.ParseParaTimeDenomination(npa.ParaTime, txGasPrice, feeDenom)
 		if err != nil {
 			return nil, nil, fmt.Errorf("bad gas price: %w", err)
 		}
@@ -262,9 +269,7 @@ func SignParaTimeTransaction(
 				return nil, nil, fmt.Errorf("failed to query minimum gas price: %w", err)
 			}
 
-			// TODO: Support different denominations for gas fees.
-			denom := types.NativeDenomination
-			*gasPrice = types.NewBaseUnits(mgp[denom], denom)
+			*gasPrice = types.NewBaseUnits(mgp[feeDenom], feeDenom)
 		}
 	}
 
@@ -575,6 +580,7 @@ func init() {
 	RuntimeTxFlags.Uint64Var(&txNonce, "nonce", invalidNonce, "override nonce to use")
 	RuntimeTxFlags.Uint64Var(&txGasLimit, "gas-limit", invalidGasLimit, "override gas limit to use (disable estimation)")
 	RuntimeTxFlags.StringVar(&txGasPrice, "gas-price", "", "override gas price to use")
+	RuntimeTxFlags.StringVar(&txFeeDenom, "fee-denom", "", "override fee denomination (defaults to native)")
 	RuntimeTxFlags.BoolVar(&txEncrypted, "encrypted", false, "encrypt transaction call data (requires online mode)")
 	RuntimeTxFlags.AddFlagSet(YesFlag)
 	RuntimeTxFlags.BoolVar(&txUnsigned, "unsigned", false, "do not sign transaction")