Skip to content

Commit

Permalink
Fix fee rendering
Browse files Browse the repository at this point in the history
  • Loading branch information
carbolymer committed Aug 22, 2024
1 parent a105463 commit 0140cdd
Show file tree
Hide file tree
Showing 22 changed files with 34 additions and 30 deletions.
4 changes: 3 additions & 1 deletion cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ pTransactionCmds era envCli =
, line
, H.yellow $
mconcat
[ "Please note the order of some cmd options is crucial. If used incorrectly may produce "
[ "Please note "
, H.underline "the order"
, " of some cmd options is crucial. If used incorrectly may produce "
, "undesired tx body. See nested [] notation above for details."
]
]
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1065,7 +1065,7 @@ runTxBuild
cAddr
mOverrideWits

liftIO $ putStrLn $ "Estimated transaction fee: " <> (show fee :: String)
liftIO . putStrLn . docToString $ "Estimated transaction fee: " <> pretty fee

return balancedTxBody

Expand Down
4 changes: 3 additions & 1 deletion cardano-cli/src/Cardano/CLI/Legacy/Options.hs
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,9 @@ pTransaction envCli =
, line
, H.yellow $
mconcat
[ "Please note the order of some cmd options is crucial. If used incorrectly may produce "
[ "Please note "
, H.underline "the order"
, " of some cmd options is crucial. If used incorrectly may produce "
, "undesired tx body. See nested [] notation above for details."
]
]
Expand Down
18 changes: 9 additions & 9 deletions cardano-cli/test/cardano-cli-golden/files/golden/help.cli
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ Usage: cardano-cli shelley transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Usage: cardano-cli shelley transaction build --socket-path SOCKET_PATH
[--cardano-mode
Expand Down Expand Up @@ -2159,7 +2159,7 @@ Usage: cardano-cli allegra transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Usage: cardano-cli allegra transaction build --socket-path SOCKET_PATH
[--cardano-mode
Expand Down Expand Up @@ -3346,7 +3346,7 @@ Usage: cardano-cli mary transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Usage: cardano-cli mary transaction build --socket-path SOCKET_PATH
[--cardano-mode
Expand Down Expand Up @@ -4668,7 +4668,7 @@ Usage: cardano-cli alonzo transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Usage: cardano-cli alonzo transaction build --socket-path SOCKET_PATH
[--cardano-mode
Expand Down Expand Up @@ -6022,7 +6022,7 @@ Usage: cardano-cli babbage transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Usage: cardano-cli babbage transaction build --socket-path SOCKET_PATH
[--cardano-mode
Expand Down Expand Up @@ -7869,7 +7869,7 @@ Usage: cardano-cli conway transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Usage: cardano-cli conway transaction build --socket-path SOCKET_PATH
[--cardano-mode
Expand Down Expand Up @@ -9279,7 +9279,7 @@ Usage: cardano-cli latest transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Usage: cardano-cli latest transaction build --socket-path SOCKET_PATH
[--cardano-mode
Expand Down Expand Up @@ -10457,7 +10457,7 @@ Usage: cardano-cli legacy transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Usage: cardano-cli legacy transaction build --socket-path SOCKET_PATH
[ --shelley-era
Expand Down Expand Up @@ -11732,7 +11732,7 @@ Usage: cardano-cli transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Usage: cardano-cli transaction build --socket-path SOCKET_PATH
[ --shelley-era
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Available options:
Available commands:
build-raw Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
build Build a balanced transaction (automatically calculates fees)

Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Usage: cardano-cli allegra transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Available options:
--script-valid Assertion that the script is valid. (default)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Available options:
Available commands:
build-raw Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
build Build a balanced transaction (automatically calculates fees)

Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Usage: cardano-cli alonzo transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Available options:
--script-valid Assertion that the script is valid. (default)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Available options:
Available commands:
build-raw Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
build Build a balanced transaction (automatically calculates fees)

Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Usage: cardano-cli babbage transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Available options:
--script-valid Assertion that the script is valid. (default)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Available options:
Available commands:
build-raw Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
build Build a balanced transaction (automatically calculates fees)

Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Usage: cardano-cli conway transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Available options:
--script-valid Assertion that the script is valid. (default)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Available options:
Available commands:
build-raw Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
build Build a balanced transaction (automatically calculates fees)

Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Usage: cardano-cli latest transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Available options:
--script-valid Assertion that the script is valid. (default)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Available options:
Available commands:
build-raw Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
build Build a balanced transaction (automatically calculates fees)

Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Usage: cardano-cli legacy transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Available options:
--byron-era Specify the Byron era
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Available options:
Available commands:
build-raw Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
build Build a balanced transaction (automatically calculates fees)

Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Usage: cardano-cli mary transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Available options:
--script-valid Assertion that the script is valid. (default)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Available options:
Available commands:
build-raw Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
build Build a balanced transaction (automatically calculates fees)

Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Usage: cardano-cli shelley transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Available options:
--script-valid Assertion that the script is valid. (default)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Available options:
Available commands:
build-raw Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
build Build a balanced transaction (automatically calculates fees)

Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Usage: cardano-cli transaction build-raw

Build a transaction (low-level, inconvenient)

Please note the order of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m
Please note the order[93;22;23;24m of some cmd options is crucial. If used incorrectly may produce undesired tx body. See nested [] notation above for details.[0;22;23;24m

Available options:
--byron-era Specify the Byron era
Expand Down

0 comments on commit 0140cdd

Please sign in to comment.