Default to alonzo era in the cli

IntersectMBO · Nov 3, 2021 · 66aa8ba · 66aa8ba
1 parent b6c7928
commit 66aa8ba
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs b/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs
@@ -1842,7 +1842,7 @@ pCardanoEra = asum
       )
 
     -- Default for now:
-  , pure (AnyCardanoEra MaryEra)
+  , pure (AnyCardanoEra AlonzoEra)
   ]
 
 pTxIn :: BalanceTxExecUnits

diff --git a/cardano-cli/test/Test/Golden/Shelley/TextEnvelope/Tx/TxBody.hs b/cardano-cli/test/Test/Golden/Shelley/TextEnvelope/Tx/TxBody.hs
@@ -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"

diff --git a/cardano-cli/test/Test/Golden/Shelley/Transaction/Build.hs b/cardano-cli/test/Test/Golden/Shelley/Transaction/Build.hs
@@ -34,6 +34,7 @@ golden_shelleyTransactionBuild =
 
     void $ execCardanoCLI
       [ "transaction","build-raw"
+      , "--mary-era"
       , "--tx-in", txIn
       , "--tx-out", txOut
       , "--fee", "12"
@@ -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
@@ -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
@@ -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
@@ -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"

diff --git a/cardano-submit-api/README.md b/cardano-submit-api/README.md
@@ -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" \

diff --git a/doc/reference/multi-assets.md b/doc/reference/multi-assets.md
@@ -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\

diff --git a/doc/reference/shelley-genesis.md b/doc/reference/shelley-genesis.md
@@ -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