Skip to content
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.

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

Fix tx fee calculation #737

Merged
merged 1 commit into from
Mar 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -56,29 +56,29 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: 22e89a5f7cc2b02192b1eb420d74530eb2d6cb82
--sha256: 1bazrgw2r9zi3p9m8is2pkbfrn9gqh22jfp5arvb4fc67mmmmm0l
tag: 512c26a66a6a63278846646b81bf8eadcd4ae99c
--sha256: 117fx48g459n80s42hmcbgraq6ham98cbisr82z96ghlwn8y31sa
subdir: cardano-ledger

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: 22e89a5f7cc2b02192b1eb420d74530eb2d6cb82
--sha256: 1bazrgw2r9zi3p9m8is2pkbfrn9gqh22jfp5arvb4fc67mmmmm0l
tag: 512c26a66a6a63278846646b81bf8eadcd4ae99c
--sha256: 117fx48g459n80s42hmcbgraq6ham98cbisr82z96ghlwn8y31sa
subdir: crypto

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: 22e89a5f7cc2b02192b1eb420d74530eb2d6cb82
--sha256: 1bazrgw2r9zi3p9m8is2pkbfrn9gqh22jfp5arvb4fc67mmmmm0l
tag: 512c26a66a6a63278846646b81bf8eadcd4ae99c
--sha256: 117fx48g459n80s42hmcbgraq6ham98cbisr82z96ghlwn8y31sa
subdir: cardano-ledger/test

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-ledger
tag: 22e89a5f7cc2b02192b1eb420d74530eb2d6cb82
--sha256: 1bazrgw2r9zi3p9m8is2pkbfrn9gqh22jfp5arvb4fc67mmmmm0l
tag: 512c26a66a6a63278846646b81bf8eadcd4ae99c
--sha256: 117fx48g459n80s42hmcbgraq6ham98cbisr82z96ghlwn8y31sa
subdir: crypto/test

source-repository-package
Expand Down
2 changes: 1 addition & 1 deletion cardano-node/src/Cardano/CLI/Byron/Parsers.hs
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ parseTxFeePolicy :: Parser (Maybe ParametersToUpdate)
parseTxFeePolicy = optional $
TxFeePolicy . TxFeePolicyTxSizeLinear
<$> ( TxSizeLinear <$> parseLovelace "tx-fee-a-constant" "Propose the constant a for txfee = a + b*s where s is the size."
<*> parseLovelace "tx-fee-b-constant" "Propose the constant b for txfee = a + b*s where s is the size."
<*> parseFraction "tx-fee-b-constant" "Propose the constant b for txfee = a + b*s where s is the size."
)

parseUnlockStakeEpoch :: Parser (Maybe ParametersToUpdate)
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ extra-deps:

# Cardano-ledger dependencies
- git: https://github.com/input-output-hk/cardano-ledger
commit: 22e89a5f7cc2b02192b1eb420d74530eb2d6cb82
commit: 512c26a66a6a63278846646b81bf8eadcd4ae99c
subdirs:
- cardano-ledger
- cardano-ledger/test
Expand Down