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.

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

Jump to bottom

Default to alonzo era in the cli #3339

Merged
merged 1 commit into from
Nov 4, 2021
Merged

Default to alonzo era in the cli #3339

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
2 changes: 1 addition & 1 deletion cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1842,7 +1842,7 @@ pCardanoEra = asum
)

-- Default for now:
, pure (AnyCardanoEra MaryEra)
, pure (AnyCardanoEra AlonzoEra)
]

pTxIn :: BalanceTxExecUnits
Expand Down
1 change: 1 addition & 0 deletions cardano-cli/test/Test/Golden/Shelley/TextEnvelope/Tx/TxBody.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ golden_shelleyTxBody = propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
-- Create transaction body
void $ execCardanoCLI
[ "transaction", "build-raw"
, "--mary-era"
, "--tx-in", "91999ea21177b33ebe6b8690724a0c026d410a11ad7521caa350abdafa5394c3#0"
, "--tx-out", "addr1v9wmu83pzajplrtpsq6tsqdgwr98x888trpmah2u0ezznsge7del3+100000000"
, "--fee", "1000000"
Expand Down
5 changes: 5 additions & 0 deletions cardano-cli/test/Test/Golden/Shelley/Transaction/Build.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ golden_shelleyTransactionBuild =

void $ execCardanoCLI
[ "transaction","build-raw"
, "--mary-era"
, "--tx-in", txIn
, "--tx-out", txOut
, "--fee", "12"
Expand All @@ -55,6 +56,7 @@ golden_shelleyTransactionBuild_CertificateScriptWitnessed =

void $ execCardanoCLI
[ "transaction","build-raw"
, "--mary-era"
, "--tx-in", txIn
, "--tx-out", txOut
, "--certificate-file", deregcert, "--certificate-script-file", scriptWit
Expand Down Expand Up @@ -86,6 +88,7 @@ golden_shelleyTransactionBuild_Minting =

void $ execCardanoCLI
[ "transaction","build-raw"
, "--mary-era"
, "--tx-in", txIn
, "--tx-out", txOut ++ "+" ++ dummyMA, "--minting-script-file", scriptWit
, "--mint", dummyMA
Expand All @@ -109,6 +112,7 @@ golden_shelleyTransactionBuild_WithdrawalScriptWitnessed =

void $ execCardanoCLI
[ "transaction","build-raw"
, "--mary-era"
, "--tx-in", txIn
, "--tx-out", txOut
, "--withdrawal", withdrawal, "--withdrawal-script-file", scriptWit
Expand All @@ -129,6 +133,7 @@ golden_shelleyTransactionBuild_TxInScriptWitnessed =

void $ execCardanoCLI
[ "transaction","build-raw"
, "--mary-era"
, "--tx-in", txIn, "--txin-script-file", scriptWit
, "--tx-out", txOut
, "--fee", "12"
Expand Down
2 changes: 1 addition & 1 deletion cardano-submit-api/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Build a raw transaction:

```bash
playground $ cardano-cli transaction build-raw \
--mary-era \
--alonzo-era \
--tx-in "$txhash#0" \
--tx-out "$(cat testnet-user-1-payment.addr)+$remaining" \
--tx-out "$(cat testnet-user-2-payment.addr)+1000000" \
Expand Down
2 changes: 1 addition & 1 deletion doc/reference/multi-assets.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ cardano-cli transaction submit --tx-file tx --testnet-magic 42

```bash
cardano-cli transaction build-raw \
--mary-era \
--alonzo-era \
--fee 0 \
--tx-in $TXIN \
--tx-out $TXOUT\
Expand Down
3 changes: 2 additions & 1 deletion doc/reference/shelley-genesis.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1445,7 +1445,8 @@ Available options:
--byron-era Specify the Byron era
--shelley-era Specify the Shelley era
--allegra-era Specify the Allegra era
--mary-era Specify the Mary era (default)
--mary-era Specify the Mary era
--alonzo-era Specify the Alonzo era (default)
--tx-in TX-IN TxId#TxIx
--txin-script-file FILE Filepath of the spending script witness
--tx-out TX-OUT The transaction output as Address+Lovelace where
Expand Down