Fix datum in tx and ref scripts #3882

ch1bo · 2022-05-22T16:10:52Z

(Couldn't reopen #3881, so created this one)

❄️ Add a roundtrip property TxBodyContent -> TxBody -> TxBodyContent

This helped in fixing the 🐛 and uncover the two additional gaps in the code. I'm not 100% happy with the current implementation of the property though! I needed to accept two exceptions to the general ===:

SimpleScriptV1 reference scripts may become SimpleScriptV2
A TxOutDatumHash + a matching ScriptData may become a TxOutDatumTx

❄️ Resolve datum hash + matching datum in transaction to TxOutDatumInTx, fixes #3866

❄️ Add missing script languages to scriptLanguageSupportedInEra for BabbageEra

❄️ Allow scripts in any language as refeference scripts

Jimbo4350

Thanks a lot @ch1bo. Just one comment.

Jimbo4350 · 2022-05-23T14:55:29Z

cardano-api/test/Test/Cardano/Api/Typed/TxBody.hs

+  upgradeSimpleScripts sbe content@TxBodyContent{txOuts} =
+    content{txOuts = map (upgradeSimpleRefScript sbe) txOuts }
+
+  upgradeSimpleRefScript sbe (TxOut address value datum refScript) =


Can you add a type signature here?

I'm sorry, but I changed the implementation to something else after opening the PR on friday. You seem to have reviewed the first implementation. The current one is less hacky.

This is the current implementation: https://github.com/input-output-hk/cardano-node/pull/3882/files#diff-fbcbdd541a4b962af6f9b72d66ae6d2e6968076fd3755caf99f0d75d9d9f49f8R25-R71

The property accepts two exceptions: - SimpleScriptV1 reference scripts may become SimpleScriptV2 - TxOutDatumHash may become TxOutDatumInTx

…xOuts This behavior was the only way to resolve full datums from Alonzo TxOuts. In Babbage, there are also inline datums, which were incorrectly "observed" when a transaction had outputs with datum hashes and full datums attached. These cases yield now a 'TxOutDatumInTx'. Fixes #3866

ch1bo · 2022-05-23T17:04:31Z

@Jimbo4350 squashed commits correctly and added type signatures to all functions in where clauses. Might want to have another look if this is good to go.

Jimbo4350 · 2022-05-23T18:24:03Z

bors merge

3852: cardano-tracer: init RTView r=denisshevchenko a=denisshevchenko This is pre-MVP for RTView. 3882: Fix datum in tx and ref scripts r=Jimbo4350 a=ch1bo (Couldn't reopen #3881, so created this one) :snowflake: Add a roundtrip property `TxBodyContent -> TxBody -> TxBodyContent` This helped in fixing the :bug: and uncover the two additional gaps in the code. I'm not 100% happy with the current implementation of the property though! I needed to accept two exceptions to the general `===`: 1. `SimpleScriptV1` reference scripts may become `SimpleScriptV2` 2. A `TxOutDatumHash` + a matching `ScriptData` may become a `TxOutDatumTx` :snowflake: Resolve datum hash + matching datum in transaction to `TxOutDatumInTx`, fixes #3866 ❄️ Add missing script languages to `scriptLanguageSupportedInEra` for `BabbageEra` ❄️ Allow scripts in any language as refeference scripts Co-authored-by: Denis Shevchenko <denis.shevchenko@iohk.io> Co-authored-by: Kosyrev Serge <serge.kosyrev@iohk.io> Co-authored-by: Sebastian Nagel <sebastian.nagel@ncoding.at>

iohk-bors · 2022-05-23T21:20:59Z

This PR was included in a batch that successfully built, but then failed to merge into master. It will not be retried.

Additional information:

{"message":"Waiting on code owner review from DavidEichmann, JaredCorduan, Jimbo4350, dcoutts, erikd, nc6, and/or newhoggy.","documentation_url":"https://docs.github.com/articles/about-protected-branches"}

Jimbo4350 · 2022-05-23T23:32:24Z

bors r+

3852: cardano-tracer: init RTView r=deepfire a=denisshevchenko This is pre-MVP for RTView. 3880: Old peers tracing was erroneously called in new tracing r=deepfire a=jutaro /nix/store/qaplqccmisqy8n7ai65nssafzkxyyc7p-cabal-install-exe-cabal-3.6.2.0/bin/cabal --project-file=/home/deepfire/cardano-node/.nix-shell-cabal.project run exe:cardano-node -- +RTS -sghc-rts-report.txt -RTS run --config config.json --database-path run/current/node-0/db-testnet --topology topology.json --host-addr 127.0.0.1 --port 30000 --socket-path node.socket +RTS -N2 -I0 -A16m -qg -qb --disable-delayed-os-memory-return -RTS cardano-node: ExceptionInLinkedThread (ThreadId 11) The name ""peersFromNodeKernel"" is already taken by a metric. CallStack (from HasCallStack): error, called at ./System/Metrics.hs:214:5 in ekg-core-0.1.1.7-FjoslY1tzknIAl90c73kOZ:System.Metrics 3882: Fix datum in tx and ref scripts r=Jimbo4350 a=ch1bo (Couldn't reopen #3881, so created this one) :snowflake: Add a roundtrip property `TxBodyContent -> TxBody -> TxBodyContent` This helped in fixing the :bug: and uncover the two additional gaps in the code. I'm not 100% happy with the current implementation of the property though! I needed to accept two exceptions to the general `===`: 1. `SimpleScriptV1` reference scripts may become `SimpleScriptV2` 2. A `TxOutDatumHash` + a matching `ScriptData` may become a `TxOutDatumTx` :snowflake: Resolve datum hash + matching datum in transaction to `TxOutDatumInTx`, fixes #3866 ❄️ Add missing script languages to `scriptLanguageSupportedInEra` for `BabbageEra` ❄️ Allow scripts in any language as refeference scripts Co-authored-by: Denis Shevchenko <denis.shevchenko@iohk.io> Co-authored-by: Kosyrev Serge <serge.kosyrev@iohk.io> Co-authored-by: Yupanqui <jnf@arcor.de> Co-authored-by: Sebastian Nagel <sebastian.nagel@ncoding.at>

iohk-bors · 2022-05-24T01:40:50Z

This PR was included in a batch that successfully built, but then failed to merge into master. It will not be retried.

Additional information:

{"message":"Waiting on code owner review from DavidEichmann, JaredCorduan, Jimbo4350, dcoutts, erikd, nc6, and/or newhoggy.","documentation_url":"https://docs.github.com/articles/about-protected-branches"}

nc6

LGTM

nc6 · 2022-05-24T09:03:33Z

bors merge

3882: Fix datum in tx and ref scripts r=nc6 a=ch1bo (Couldn't reopen #3881, so created this one) :snowflake: Add a roundtrip property `TxBodyContent -> TxBody -> TxBodyContent` This helped in fixing the :bug: and uncover the two additional gaps in the code. I'm not 100% happy with the current implementation of the property though! I needed to accept two exceptions to the general `===`: 1. `SimpleScriptV1` reference scripts may become `SimpleScriptV2` 2. A `TxOutDatumHash` + a matching `ScriptData` may become a `TxOutDatumTx` :snowflake: Resolve datum hash + matching datum in transaction to `TxOutDatumInTx`, fixes #3866 ❄️ Add missing script languages to `scriptLanguageSupportedInEra` for `BabbageEra` ❄️ Allow scripts in any language as refeference scripts Co-authored-by: Sebastian Nagel <sebastian.nagel@ncoding.at>

iohk-bors · 2022-05-24T11:30:14Z

Timed out.

ch1bo requested review from DavidEichmann, dcoutts, Jimbo4350, erikd, newhoggy, nc6 and JaredCorduan as code owners May 22, 2022 16:10

mkoura mentioned this pull request May 23, 2022

[BUG] - PlutusScriptV1 is not supported in Babbage #3886

Closed

Jimbo4350 approved these changes May 23, 2022

View reviewed changes

ch1bo force-pushed the ch1bo/fix-datum-in-tx-and-ref-scripts branch from 5ea5dea to e4b8305 Compare May 23, 2022 17:02

ch1bo added 4 commits May 23, 2022 19:03

Test roundtrips of TxBodyContent txOuts

ea179d3

The property accepts two exceptions: - SimpleScriptV1 reference scripts may become SimpleScriptV2 - TxOutDatumHash may become TxOutDatumInTx

Add missing languages to scriptLanguageSupportedInEra for BabbageEra

c091335

Allow scripts in any language as reference scripts

cf150b4

ch1bo force-pushed the ch1bo/fix-datum-in-tx-and-ref-scripts branch from e4b8305 to cf150b4 Compare May 23, 2022 17:03

nc6 approved these changes May 24, 2022

View reviewed changes

mkoura mentioned this pull request May 24, 2022

[BUG] - MuxError MuxBearerClosed for PastHorizon error #3895

Closed

mkoura mentioned this pull request May 24, 2022

[BUG] - CDDL format of tx body not working in Babbage #3899

Closed

Jimbo4350 merged commit ec84a30 into master May 24, 2022

iohk-bors bot deleted the ch1bo/fix-datum-in-tx-and-ref-scripts branch May 24, 2022 14:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix datum in tx and ref scripts #3882

Fix datum in tx and ref scripts #3882

ch1bo commented May 22, 2022

Jimbo4350 left a comment

Jimbo4350 May 23, 2022

ch1bo May 23, 2022

ch1bo May 23, 2022

ch1bo commented May 23, 2022

Jimbo4350 commented May 23, 2022

iohk-bors bot commented May 23, 2022

Jimbo4350 commented May 23, 2022

iohk-bors bot commented May 24, 2022

nc6 left a comment

nc6 commented May 24, 2022

iohk-bors bot commented May 24, 2022

Fix datum in tx and ref scripts #3882

Fix datum in tx and ref scripts #3882

Conversation

ch1bo commented May 22, 2022

Jimbo4350 left a comment

Choose a reason for hiding this comment

Jimbo4350 May 23, 2022

Choose a reason for hiding this comment

ch1bo May 23, 2022

Choose a reason for hiding this comment

ch1bo May 23, 2022

Choose a reason for hiding this comment

ch1bo commented May 23, 2022

Jimbo4350 commented May 23, 2022

iohk-bors bot commented May 23, 2022

Jimbo4350 commented May 23, 2022

iohk-bors bot commented May 24, 2022

nc6 left a comment

Choose a reason for hiding this comment

nc6 commented May 24, 2022

iohk-bors bot commented May 24, 2022