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

Preserve ScriptData bytes fix #4926

Merged
merged 2 commits into from
Mar 6, 2023
+4 −6
Merged

Preserve ScriptData bytes fix #4926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc69901
Fix for https://github.com/input-output-hk/cardano-node/issues/4924 b…
Jimbo4350 Mar 1, 2023
e6e6baa
Remove --protocol-params-file from example-babbage-script-usage.sh
Jimbo4350 Mar 2, 2023
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
4 changes: 2 additions & 2 deletions cardano-api/src/Cardano/Api/ScriptData.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/src/Cardano/CLI/Shelley/Run/Read.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions scripts/babbage/example-babbage-script-usage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down