From 43c988f0dde4c20e5b265f30f96ac8ee0653fa89 Mon Sep 17 00:00:00 2001 From: Nicholas Clarke Date: Mon, 30 Mar 2020 18:19:41 +0200 Subject: [PATCH] Fix tx fee calculation Issue 756 in cardano-ledger --- cabal.project | 16 ++++++++-------- cardano-node/src/Cardano/CLI/Byron/Parsers.hs | 2 +- stack.yaml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cabal.project b/cabal.project index 4601d9c8520..e086790f636 100644 --- a/cabal.project +++ b/cabal.project @@ -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 diff --git a/cardano-node/src/Cardano/CLI/Byron/Parsers.hs b/cardano-node/src/Cardano/CLI/Byron/Parsers.hs index f17a7eac0bd..82052994997 100644 --- a/cardano-node/src/Cardano/CLI/Byron/Parsers.hs +++ b/cardano-node/src/Cardano/CLI/Byron/Parsers.hs @@ -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) diff --git a/stack.yaml b/stack.yaml index 12b0442a14e..d829a96d610 100644 --- a/stack.yaml +++ b/stack.yaml @@ -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