diff --git a/cardano-api/src/Cardano/Api/ScriptData.hs b/cardano-api/src/Cardano/Api/ScriptData.hs index 0b898ec0749..a87dacd626f 100644 --- a/cardano-api/src/Cardano/Api/ScriptData.hs +++ b/cardano-api/src/Cardano/Api/ScriptData.hs @@ -490,9 +490,9 @@ data ScriptDataJsonBytesError instance Error ScriptDataJsonBytesError where displayError (ScriptDataJsonBytesErrorValue e) = - "Error decoding ScriptData JSON value: " <> show e + "Error decoding ScriptData JSON value: " <> displayError e displayError (ScriptDataJsonBytesErrorInvalid e) = - "ScriptData is invalid: " <> show e + "ScriptData is invalid: " <> displayError e -- | This allows us to take JSON formatted ScriptData and encode it in the CDDL format diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Read.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Read.hs index fb91b698cd3..b9b5c91ffcf 100644 --- a/cardano-cli/src/Cardano/CLI/Shelley/Run/Read.hs +++ b/cardano-cli/src/Cardano/CLI/Shelley/Run/Read.hs @@ -366,7 +366,7 @@ readScriptDataOrFile (ScriptDataJsonFile fp) = do sDataValue <- hoistEither . first (ScriptDataErrorJsonParse fp) $ Aeson.eitherDecode sDataBs hoistEither . first ScriptDataErrorJsonBytes - $ scriptDataJsonToHashable ScriptDataJsonNoSchema sDataValue + $ scriptDataJsonToHashable ScriptDataJsonDetailedSchema sDataValue readScriptDataOrFile (ScriptDataCborFile fp) = do origBs <- handleIOExceptT (ScriptDataErrorFile . FileIOError fp) (BS.readFile fp) diff --git a/scripts/babbage/example-babbage-script-usage.sh b/scripts/babbage/example-babbage-script-usage.sh index 3e84c2208d4..7552c6a2f7e 100755 --- a/scripts/babbage/example-babbage-script-usage.sh +++ b/scripts/babbage/example-babbage-script-usage.sh @@ -75,7 +75,6 @@ $CARDANO_CLI transaction build \ --tx-out-reference-script-file "$plutusspendingscript" \ --tx-out "$addressformintingrefscript+$lovelaceattxindiv6" \ --tx-out-reference-script-file "$plutusmintingscript" \ - --protocol-params-file "$WORK/pparams.json" \ --out-file "$WORK/create-datum-output.body" $CARDANO_CLI transaction sign \ @@ -182,8 +181,7 @@ $CARDANO_CLI transaction build \ --mint-plutus-script-v2 \ --mint-reference-tx-in-redeemer-file "$redeemerfilepath" \ --policy-id "$mintpolicyid" \ - --tx-out "$dummyaddress2+10000000 + 5 $mintpolicyid.4D696C6C6172436F696E" \ - --protocol-params-file "$WORK/pparams.json" + --tx-out "$dummyaddress2+10000000 + 5 $mintpolicyid.4D696C6C6172436F696E" $CARDANO_CLI transaction sign \ --tx-body-file $WORK/test-alonzo-ref-script.body \