Merge #737

737: Fix tx fee calculation r=dcoutts a=nc6 Issue 756 in cardano-ledger Co-authored-by: Nicholas Clarke <[email protected]>
IntersectMBO · Mar 30, 2020 · 5063cff · 5063cff
2 parents f9d541c + 43c988f
commit 5063cff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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