Propagate new `TxBodyContent` type by Jimbo4350 · Pull Request #1309 · IntersectMBO/cardano-cli

Jimbo4350 · 2025-11-25T17:43:41Z

Changelog

- description: |
    Propagate new `TxBodyContent` type
# uncomment types applicable to the change:
  type:
  - compatible

Context

Additional context for the PR goes here. If the PR fixes a particular issue please provide a link to the issue.

How to trust this PR

Highlight important bits of the PR that will make the review faster. If there are commands the reviewer can run to observe the new behavior, describe them.

Checklist

Commit sequence broadly makes sense and commits have useful messages
New tests are added if needed and existing tests are updated. See Running tests for more details
Self-reviewed the diff

cardano-cli/src/Cardano/CLI/EraBased/Transaction/Run.hs

+        Exp.TxMintValue $
          Map.intersectionWith
-            (\assets wit -> (assets, BuildTxWith wit))
+            (\assets wit -> (assets, wit))


cardano-cli/src/Cardano/CLI/EraBased/Script/Read/Common.hs

cardano-cli/src/Cardano/CLI/EraBased/Transaction/Run.hs

- estimateBalancedTxBody - makeUnsignedTx - makeTransactionBodyAutoBalance Propagate new TxBodyContent definition Replace *Witness types with AnyWitness Update proposal's do not exist in Conway era onwards therefore begin process removing this feature

Co-authored-by: Mateusz Gałażyn <mateusz.galazyn@iohk.io>

carbolymer · 2026-01-27T13:45:45Z

cardano-cli/src/Cardano/CLI/Compatible/Read.hs

haddocks missing

Sorry what do you mean?

There are no comments over the exported functions which end up in generated haddocks 😄

cardano-cli/src/Cardano/CLI/Compatible/Read.hs

cardano-cli/src/Cardano/CLI/Compatible/Transaction/Run.hs

carbolymer

Blocking on unexplained golden file change

carbolymer · 2026-01-27T14:06:50Z

cardano-cli/src/Cardano/CLI/Compatible/Read.hs

+
+
+
+data AnyPlutusScript where


how it is different from https://github.com/IntersectMBO/cardano-api/blob/mgalazyn/feature/utxorpc-upgrade/cardano-api/src/Cardano/Api/Plutus/Internal/Script.hs#L305-L305 ?

data AnyPlutusScript is a stopgap. It needs to be replaced with the AnyPlutusScript era in cardano-api: #1328

cardano-cli/src/Cardano/CLI/Compatible/Transaction/ScriptWitness.hs

cardano-cli/test/cardano-cli-golden/files/golden/alonzo/transaction-view.out

Jimbo4350 · 2026-01-27T15:40:55Z

Blocking on unexplained golden file change

#1309 (comment)

palas

It all looks correct to me. I wrote a few potential simplifications that I saw. And the hardcoding of ConwayEra in some places (in estimation command for example) is a bit unsatisfying, but I cannot think of a way of getting around it at the moment.

cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Read.hs

palas · 2026-01-27T23:07:31Z

cardano-cli/src/Cardano/CLI/EraBased/Transaction/Run.hs

-          witnessesProvidedMap :: Map PolicyId (ScriptWitness WitCtxMint era)
-          witnessesProvidedMap = fromList $ [(polid, sWit) | MintScriptWitnessWithPolicyId polid sWit <- scriptWitnesses]
-
+      let witnessesProvidedMap = fromList scriptWitnesses


Suggested change

let witnessesProvidedMap = fromList scriptWitnesses

witnessesProvidedMap :: Map PolicyId (Exp.AnyWitness (Exp.LedgerEra era))

witnessesProvidedMap = fromList scriptWitnesses

For the signature, it also needs the following suggestion to compile

palas · 2026-01-27T23:07:46Z

cardano-cli/src/Cardano/CLI/EraBased/Transaction/Run.hs

+  :: (L.MultiAsset, [(PolicyId, Exp.AnyWitness (Exp.LedgerEra era))])
+  -> Either TxCmdError (Exp.TxMintValue (Exp.LedgerEra era))


Suggested change

:: (L.MultiAsset, [(PolicyId, Exp.AnyWitness (Exp.LedgerEra era))])

-> Either TxCmdError (Exp.TxMintValue (Exp.LedgerEra era))

:: forall era

. (L.MultiAsset, [(PolicyId, Exp.AnyWitness (Exp.LedgerEra era))])

-> Either TxCmdError (Exp.TxMintValue (Exp.LedgerEra era))

For the previous suggestion to compile

cardano-cli/src/Cardano/CLI/EraBased/Transaction/Run.hs

palas · 2026-01-27T23:30:22Z

cardano-cli/src/Cardano/CLI/EraBased/Transaction/Run.hs

+unsignedToToApiTx :: forall era. Exp.IsEra era => Exp.UnsignedTx era -> Api.Tx era
+unsignedToToApiTx (Exp.UnsignedTx lTx) =
+  ShelleyTx (convert $ Exp.useEra @era) $ obtainCommonConstraints (Exp.useEra @era) lTx


unsignedToToApiTx -> unsignedToApiTx?

cardano-cli/src/Cardano/CLI/EraBased/Transaction/Run.hs

Jimbo4350 force-pushed the jordan/new-tx-body-content branch 3 times, most recently from 559c0a2 to 0d78776 Compare November 27, 2025 15:21

Jimbo4350 force-pushed the jordan/new-tx-body-content branch from 84aa453 to dfdfae8 Compare December 5, 2025 15:22

github-advanced-security bot found potential problems Dec 5, 2025

View reviewed changes

Jimbo4350 force-pushed the jordan/new-tx-body-content branch from dfdfae8 to b1b3b59 Compare December 16, 2025 19:04

github-advanced-security bot found potential problems Dec 16, 2025

View reviewed changes

cardano-cli/src/Cardano/CLI/EraBased/Script/Read/Common.hs Fixed Show fixed Hide fixed

Jimbo4350 force-pushed the jordan/new-tx-body-content branch 3 times, most recently from 16b0451 to d1cb86e Compare December 24, 2025 20:30

Jimbo4350 force-pushed the jordan/new-tx-body-content branch 16 times, most recently from 9896d0c to f1da65d Compare January 15, 2026 14:49

github-advanced-security bot found potential problems Jan 15, 2026

View reviewed changes

cardano-cli/src/Cardano/CLI/EraBased/Transaction/Run.hs Fixed Show fixed Hide fixed

Jimbo4350 force-pushed the jordan/new-tx-body-content branch from aa60a8c to 3c05d75 Compare January 15, 2026 15:06

github-advanced-security bot found potential problems Jan 15, 2026

View reviewed changes

cardano-cli/src/Cardano/CLI/EraBased/Transaction/Run.hs Fixed Show fixed Hide fixed

Jimbo4350 force-pushed the jordan/new-tx-body-content branch from 06b29bf to ee402b1 Compare January 15, 2026 15:24

Jimbo4350 added 9 commits January 20, 2026 13:04

Propagate AnySLanguage

ae83b4d

Remove Typeable era constraint from AnyCompatibleCommand

0ed608b

Propagate readAnyScript

603ef00

Remove unused ScriptDecodeUnknownPlutusScriptVersion constructor

d11e4d8

Add LostScriptWitnesses error constructor

d34af23

Replace ProposalScriptWitness with AnyWitness

99f315d

Auxiliary scripts can only be simple scripts

48f7084

Misc changes

1362c82

Jimbo4350 force-pushed the jordan/new-tx-body-content branch 4 times, most recently from 94e5b2a to ac0ef3a Compare January 26, 2026 17:30

Update to cardano-api-10.22

bcb12b5

Co-authored-by: Mateusz Gałażyn <mateusz.galazyn@iohk.io>

Jimbo4350 force-pushed the jordan/new-tx-body-content branch from ac0ef3a to bcb12b5 Compare January 27, 2026 13:23

Bump flake.lock's CHaP

3049c62

carbolymer reviewed Jan 27, 2026

View reviewed changes

cardano-cli/src/Cardano/CLI/Compatible/Read.hs Outdated Show resolved Hide resolved

carbolymer reviewed Jan 27, 2026

View reviewed changes

cardano-cli/src/Cardano/CLI/Compatible/Transaction/Run.hs Outdated Show resolved Hide resolved

carbolymer requested changes Jan 27, 2026

View reviewed changes

palas approved these changes Jan 27, 2026

View reviewed changes

carbolymer approved these changes Jan 28, 2026

View reviewed changes

Address review

66661b0

Jimbo4350 force-pushed the jordan/new-tx-body-content branch from 9d62fb3 to 66661b0 Compare January 28, 2026 14:05

Jimbo4350 enabled auto-merge January 28, 2026 14:05

Jimbo4350 added this pull request to the merge queue Jan 28, 2026

Merged via the queue into master with commit dd03c5a Jan 28, 2026
25 checks passed

Jimbo4350 deleted the jordan/new-tx-body-content branch January 28, 2026 15:42

		:: (L.MultiAsset, [(PolicyId, Exp.AnyWitness (Exp.LedgerEra era))])
		-> Either TxCmdError (Exp.TxMintValue (Exp.LedgerEra era))

Conversation

Jimbo4350 commented Nov 25, 2025

Changelog

Context

How to trust this PR

Checklist

Uh oh!

Check notice

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

carbolymer left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Jimbo4350 commented Jan 27, 2026

Uh oh!

palas left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants