Skip to content

cmd/account/deposit: Set gas price to 0 by default #510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cmd/account/deposit: Set gas price to 0 by default #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cmd/account/deposit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ var depositCmd = &cobra.Command{
amountBaseUnits, err := helpers.ParseParaTimeDenomination(npa.ParaTime, amount, npa.ConsensusDenomination())
cobra.CheckErr(err)

// ParaTime deposit tx doesn't need gas. Don't detect the gas price, but set it to 0, if none provided.
if common.TxGasPrice == "" {
common.TxGasPrice = "0"
}

// Prepare transaction.
tx := consensusaccounts.NewDepositTx(nil, &consensusaccounts.Deposit{
To: toAddr,
Expand Down
14 changes: 7 additions & 7 deletions cmd/common/transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var (
txOffline bool
txNonce uint64
txGasLimit uint64
txGasPrice string
TxGasPrice string
txFeeDenom string
txEncrypted bool
txUnsigned bool
Expand Down Expand Up @@ -109,8 +109,8 @@ func PrepareConsensusTransaction(ctx context.Context, npa *NPASelection, signer
// Gas price estimation if not specified.
gasPrice := quantity.NewQuantity()
var err error
if txGasPrice != "" {
gasPrice, err = helpers.ParseConsensusDenomination(npa.Network, txGasPrice)
if TxGasPrice != "" {
gasPrice, err = helpers.ParseConsensusDenomination(npa.Network, TxGasPrice)
if err != nil {
return 0, nil, fmt.Errorf("bad gas price: %w", err)
}
Expand Down Expand Up @@ -242,8 +242,8 @@ func PrepareParatimeTransaction(ctx context.Context, npa *NPASelection, account
// Gas price estimation if not specified.
gasPrice := &types.BaseUnits{}
feeDenom := types.Denomination(txFeeDenom)
if txGasPrice != "" {
gasPrice, err = helpers.ParseParaTimeDenomination(npa.ParaTime, txGasPrice, feeDenom)
if TxGasPrice != "" {
gasPrice, err = helpers.ParseParaTimeDenomination(npa.ParaTime, TxGasPrice, feeDenom)
if err != nil {
return 0, nil, "", fmt.Errorf("bad gas price: %w", err)
}
Expand Down Expand Up @@ -601,7 +601,7 @@ func init() {
RuntimeTxFlags.BoolVar(&txOffline, "offline", false, "do not perform any operations requiring network access")
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(&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(AnswerYesFlag)
Expand All @@ -613,7 +613,7 @@ func init() {
TxFlags.BoolVar(&txOffline, "offline", false, "do not perform any operations requiring network access")
TxFlags.Uint64Var(&txNonce, "nonce", invalidNonce, "override nonce to use")
TxFlags.Uint64Var(&txGasLimit, "gas-limit", invalidGasLimit, "override gas limit to use (disable estimation)")
TxFlags.StringVar(&txGasPrice, "gas-price", "", "override gas price to use")
TxFlags.StringVar(&TxGasPrice, "gas-price", "", "override gas price to use")
TxFlags.AddFlagSet(AnswerYesFlag)
TxFlags.BoolVar(&txUnsigned, "unsigned", false, "do not sign transaction")
TxFlags.StringVar(&txFormat, "format", "json", "transaction output format (for offline/unsigned modes) [json, cbor]")
Expand Down
Loading