diff --git a/cabal.project b/cabal.project
index da2ec2c4e6..39afda1056 100644
--- a/cabal.project
+++ b/cabal.project
@@ -57,3 +57,20 @@ if impl (ghc >= 9.12)
 
     -- https://github.com/kapralVV/Unique/issues/11
     , Unique:hashable
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/plutus
+  tag: be9ccfc7f8ecc6ebc577dcf3374a30530ecdb168
+  --sha256: sha256-R7t5Luc1d9l2tXKg5Jgqye+vQAEONwCrQ9/JDkFCu9M=
+  subdir:
+    plutus-core
+    plutus-ledger-api
+    plutus-tx
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/ouroboros-network
+  -- branch: fraser-iohk/one-era-gen-tx-id-protocol-version-bump
+  tag: d1f4c7983b19a5e4768fb5f691fa8d10cd0f10ee
+  subdir: ouroboros-network-api
diff --git a/ouroboros-consensus-cardano/golden/byron/ByronNodeToNodeVersion2/GenTxId b/ouroboros-consensus-cardano/golden/byron/ByronNodeToNodeVersion2/GenTxId
index 9511ba87ee..a0a1e937dc 100644
Binary files a/ouroboros-consensus-cardano/golden/byron/ByronNodeToNodeVersion2/GenTxId and b/ouroboros-consensus-cardano/golden/byron/ByronNodeToNodeVersion2/GenTxId differ
diff --git a/ouroboros-consensus-cardano/golden/byron/QueryVersion1/ByronNodeToClientVersion1/GenTxId b/ouroboros-consensus-cardano/golden/byron/QueryVersion1/ByronNodeToClientVersion1/GenTxId
new file mode 100644
index 0000000000..0eaababb81
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/byron/QueryVersion1/ByronNodeToClientVersion1/GenTxId
@@ -0,0 +1 @@
+X K�9� �ҽC�0�������F0��.�	b���
diff --git a/ouroboros-consensus-cardano/golden/byron/QueryVersion2/ByronNodeToClientVersion1/GenTxId b/ouroboros-consensus-cardano/golden/byron/QueryVersion2/ByronNodeToClientVersion1/GenTxId
index 9511ba87ee..a0a1e937dc 100644
Binary files a/ouroboros-consensus-cardano/golden/byron/QueryVersion2/ByronNodeToClientVersion1/GenTxId and b/ouroboros-consensus-cardano/golden/byron/QueryVersion2/ByronNodeToClientVersion1/GenTxId differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Allegra
index 61ec98ae96..a1b108b647 100644
--- a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Allegra
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Allegra
@@ -1,3 +1,3 @@
-�X cA:^D
��d�
+�
X cA:^D
��d�
 �u�S�|���
]�
 q�
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Alonzo
index 6e6d3158a7..3c280119f4 100644
--- a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Alonzo
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Alonzo
@@ -1 +1 @@
-�X ��3�?
�G�Ca�\�ո��1�%E�g# 
+�
X ��3�?
�G�Ca�\�ո��1�%E�g# 
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Babbage
index 3c56b72b00..0a9e8f1976 100644
--- a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Babbage
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Babbage
@@ -1 +1 @@
-�X M~@)_ur7��WH5���O�2��$�h���
h

\ No newline at end of file
+�
X M~@)_ur7��WH5���O�2��$�h���
h

\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Byron
index a07d334baa..3ccdd3059b 100644
Binary files a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Byron and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Byron differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Conway
index 8f2268ce3f..c795639f31 100644
--- a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Conway
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Conway
@@ -1 +1 @@
-�X �K�8�aL�s��,��а�^�����"��5�J
\ No newline at end of file
+�
X �K�8�aL�s��,��а�^�����"��5�J
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Mary
index 1235567289..ead4fbe073 100644
--- a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Mary
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Mary
@@ -1 +1 @@
-�X �Ճ(x��.��x�_G��F��ߖ}	Ԉh+
ޢ
\ No newline at end of file
+�
X �Ճ(x��.��x�_G��F��ߖ}	Ԉh+
ޢ
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Allegra b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Allegra
new file mode 100644
index 0000000000..b525fa7868
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Allegra differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Alonzo b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Alonzo
new file mode 100644
index 0000000000..dc3903d3a6
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Alonzo differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Babbage b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Babbage
new file mode 100644
index 0000000000..279d590c81
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Babbage differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Byron_EBB b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Byron_EBB
new file mode 100644
index 0000000000..d2bc47fdf7
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Byron_EBB differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Byron_regular
new file mode 100644
index 0000000000..ce89fa545b
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Byron_regular differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Conway b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Conway
new file mode 100644
index 0000000000..5ae5c5065d
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Conway differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Mary b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Mary
new file mode 100644
index 0000000000..14d8281f93
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Mary differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Shelley b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Shelley
new file mode 100644
index 0000000000..7d900c96a8
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Shelley differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Allegra
new file mode 100644
index 0000000000..8507fa8715
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Allegra
@@ -0,0 +1,3 @@
+X cA:^D
��d�
+�u�S�|���
]�
+q�
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Alonzo
new file mode 100644
index 0000000000..0e06fd5e02
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Alonzo
@@ -0,0 +1 @@
+X ��3�?
�G�Ca�\�ո��1�%E�g# 
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Babbage
new file mode 100644
index 0000000000..f875b3bdec
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Babbage
@@ -0,0 +1 @@
+X M~@)_ur7��WH5���O�2��$�h���
h

\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Byron
new file mode 100644
index 0000000000..a0a1e937dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Byron
@@ -0,0 +1 @@
+X K�9� �ҽC�0�������F0��.�	b���
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Conway
new file mode 100644
index 0000000000..426c12e555
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Conway
@@ -0,0 +1 @@
+X �K�8�aL�s��,��а�^�����"��5�J
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Mary
new file mode 100644
index 0000000000..dd7df1c0fc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Mary
@@ -0,0 +1 @@
+X �Ճ(x��.��x�_G��F��ߖ}	Ԉh+
ޢ
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Shelley b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Shelley
new file mode 100644
index 0000000000..b26e394526
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Shelley
@@ -0,0 +1 @@
+X ���np��+�t���3N��Ue�<Ҷ���=�
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Allegra b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Allegra
new file mode 100644
index 0000000000..786e482302
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Allegra differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Alonzo b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Alonzo
new file mode 100644
index 0000000000..558dfbcca8
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Alonzo differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Babbage b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Babbage
new file mode 100644
index 0000000000..0be195e3f1
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Babbage differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Byron b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Byron
new file mode 100644
index 0000000000..9c10e1bb39
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Byron differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Conway b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Conway
new file mode 100644
index 0000000000..9d1ce51c81
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Conway differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Mary b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Mary
new file mode 100644
index 0000000000..1d7d61fa77
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Mary differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Shelley b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Shelley
new file mode 100644
index 0000000000..d41c1aacc8
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Shelley differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Allegra b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Allegra
new file mode 100644
index 0000000000..2d2c467c6f
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Allegra differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Alonzo b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Alonzo
new file mode 100644
index 0000000000..a446de19eb
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Alonzo differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Babbage b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Babbage
new file mode 100644
index 0000000000..91d4f95385
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Babbage differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Byron_EBB b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Byron_EBB
new file mode 100644
index 0000000000..f69f3d5796
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Byron_EBB differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Byron_regular
new file mode 100644
index 0000000000..749614e068
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Byron_regular differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Conway b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Conway
new file mode 100644
index 0000000000..7bea7230e7
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Conway differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Mary b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Mary
new file mode 100644
index 0000000000..b07156aa39
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Mary differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Shelley b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Shelley
new file mode 100644
index 0000000000..2aad81040d
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Shelley differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Allegra b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Allegra
new file mode 100644
index 0000000000..6a5024d0dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Allegra
@@ -0,0 +1 @@
+�O<CARDANO_BLOCK>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Alonzo b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Alonzo
new file mode 100644
index 0000000000..6a5024d0dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Alonzo
@@ -0,0 +1 @@
+�O<CARDANO_BLOCK>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Babbage b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Babbage
new file mode 100644
index 0000000000..6a5024d0dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Babbage
@@ -0,0 +1 @@
+�O<CARDANO_BLOCK>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Byron_EBB b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Byron_EBB
new file mode 100644
index 0000000000..6a5024d0dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Byron_EBB
@@ -0,0 +1 @@
+�O<CARDANO_BLOCK>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Byron_regular
new file mode 100644
index 0000000000..6a5024d0dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Byron_regular
@@ -0,0 +1 @@
+�O<CARDANO_BLOCK>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Conway b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Conway
new file mode 100644
index 0000000000..6a5024d0dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Conway
@@ -0,0 +1 @@
+�O<CARDANO_BLOCK>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Mary b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Mary
new file mode 100644
index 0000000000..6a5024d0dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Mary
@@ -0,0 +1 @@
+�O<CARDANO_BLOCK>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Shelley b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Shelley
new file mode 100644
index 0000000000..6a5024d0dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Shelley
@@ -0,0 +1 @@
+�O<CARDANO_BLOCK>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Allegra b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Allegra
new file mode 100644
index 0000000000..fc2db110cd
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Allegra
@@ -0,0 +1 @@
+��H<HEADER>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Alonzo b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Alonzo
new file mode 100644
index 0000000000..bd4f42fa98
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Alonzo
@@ -0,0 +1 @@
+��H<HEADER>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Babbage b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Babbage
new file mode 100644
index 0000000000..ea805c4a85
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Babbage
@@ -0,0 +1 @@
+��H<HEADER>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Byron_EBB b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Byron_EBB
new file mode 100644
index 0000000000..71629ccde7
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Byron_EBB differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Byron_regular
new file mode 100644
index 0000000000..9f4c849c9c
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Byron_regular differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Conway b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Conway
new file mode 100644
index 0000000000..9225aa4174
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Conway
@@ -0,0 +1 @@
+��H<HEADER>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Mary b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Mary
new file mode 100644
index 0000000000..f8aa87eb5c
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Mary
@@ -0,0 +1 @@
+��H<HEADER>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Shelley b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Shelley
new file mode 100644
index 0000000000..d5a1a05c35
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Shelley
@@ -0,0 +1 @@
+�
�H<HEADER>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Byron
new file mode 100644
index 0000000000..73f032d2b8
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Byron differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Allegra
index 61ec98ae96..a1b108b647 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Allegra
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Allegra
@@ -1,3 +1,3 @@
-�X cA:^D
��d�
+�
X cA:^D
��d�
 �u�S�|���
]�
 q�
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Alonzo
index 6e6d3158a7..3c280119f4 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Alonzo
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Alonzo
@@ -1 +1 @@
-�X ��3�?
�G�Ca�\�ո��1�%E�g# 
+�
X ��3�?
�G�Ca�\�ո��1�%E�g# 
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Babbage
index 3c56b72b00..0a9e8f1976 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Babbage
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Babbage
@@ -1 +1 @@
-�X M~@)_ur7��WH5���O�2��$�h���
h

\ No newline at end of file
+�
X M~@)_ur7��WH5���O�2��$�h���
h

\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Byron
index a07d334baa..3ccdd3059b 100644
Binary files a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Byron and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Byron differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Conway
index 8f2268ce3f..c795639f31 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Conway
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Conway
@@ -1 +1 @@
-�X �K�8�aL�s��,��а�^�����"��5�J
\ No newline at end of file
+�
X �K�8�aL�s��,��а�^�����"��5�J
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Mary
index 1235567289..ead4fbe073 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Mary
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Mary
@@ -1 +1 @@
-�X �Ճ(x��.��x�_G��F��ߖ}	Ԉh+
ޢ
\ No newline at end of file
+�
X �Ճ(x��.��x�_G��F��ߖ}	Ԉh+
ޢ
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Allegra
index 61ec98ae96..a1b108b647 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Allegra
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Allegra
@@ -1,3 +1,3 @@
-�X cA:^D
��d�
+�
X cA:^D
��d�
 �u�S�|���
]�
 q�
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Alonzo
index 6e6d3158a7..3c280119f4 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Alonzo
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Alonzo
@@ -1 +1 @@
-�X ��3�?
�G�Ca�\�ո��1�%E�g# 
+�
X ��3�?
�G�Ca�\�ո��1�%E�g# 
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Babbage
index 3c56b72b00..0a9e8f1976 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Babbage
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Babbage
@@ -1 +1 @@
-�X M~@)_ur7��WH5���O�2��$�h���
h

\ No newline at end of file
+�
X M~@)_ur7��WH5���O�2��$�h���
h

\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Byron
index a07d334baa..3ccdd3059b 100644
Binary files a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Byron and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Byron differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Conway
index 8f2268ce3f..c795639f31 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Conway
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Conway
@@ -1 +1 @@
-�X �K�8�aL�s��,��а�^�����"��5�J
\ No newline at end of file
+�
X �K�8�aL�s��,��а�^�����"��5�J
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Mary
index 1235567289..ead4fbe073 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Mary
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Mary
@@ -1 +1 @@
-�X �Ճ(x��.��x�_G��F��ߖ}	Ԉh+
ޢ
\ No newline at end of file
+�
X �Ճ(x��.��x�_G��F��ߖ}	Ԉh+
ޢ
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Allegra
index 61ec98ae96..a1b108b647 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Allegra
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Allegra
@@ -1,3 +1,3 @@
-�X cA:^D
��d�
+�
X cA:^D
��d�
 �u�S�|���
]�
 q�
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Alonzo
index 6e6d3158a7..3c280119f4 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Alonzo
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Alonzo
@@ -1 +1 @@
-�X ��3�?
�G�Ca�\�ո��1�%E�g# 
+�
X ��3�?
�G�Ca�\�ո��1�%E�g# 
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Babbage
index 3c56b72b00..0a9e8f1976 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Babbage
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Babbage
@@ -1 +1 @@
-�X M~@)_ur7��WH5���O�2��$�h���
h

\ No newline at end of file
+�
X M~@)_ur7��WH5���O�2��$�h���
h

\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Byron
index a07d334baa..3ccdd3059b 100644
Binary files a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Byron and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Byron differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Conway
index 8f2268ce3f..c795639f31 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Conway
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Conway
@@ -1 +1 @@
-�X �K�8�aL�s��,��а�^�����"��5�J
\ No newline at end of file
+�
X �K�8�aL�s��,��а�^�����"��5�J
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Mary
index 1235567289..ead4fbe073 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Mary
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Mary
@@ -1 +1 @@
-�X �Ճ(x��.��x�_G��F��ߖ}	Ԉh+
ޢ
\ No newline at end of file
+�
X �Ճ(x��.��x�_G��F��ߖ}	Ԉh+
ޢ
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Allegra
index 61ec98ae96..a1b108b647 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Allegra
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Allegra
@@ -1,3 +1,3 @@
-�X cA:^D
��d�
+�
X cA:^D
��d�
 �u�S�|���
]�
 q�
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Alonzo
index 6e6d3158a7..3c280119f4 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Alonzo
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Alonzo
@@ -1 +1 @@
-�X ��3�?
�G�Ca�\�ո��1�%E�g# 
+�
X ��3�?
�G�Ca�\�ո��1�%E�g# 
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Babbage
index 3c56b72b00..0a9e8f1976 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Babbage
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Babbage
@@ -1 +1 @@
-�X M~@)_ur7��WH5���O�2��$�h���
h

\ No newline at end of file
+�
X M~@)_ur7��WH5���O�2��$�h���
h

\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Byron
index a07d334baa..3ccdd3059b 100644
Binary files a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Byron and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Byron differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Conway
index 8f2268ce3f..c795639f31 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Conway
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Conway
@@ -1 +1 @@
-�X �K�8�aL�s��,��а�^�����"��5�J
\ No newline at end of file
+�
X �K�8�aL�s��,��а�^�����"��5�J
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Mary
index 1235567289..ead4fbe073 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Mary
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Mary
@@ -1 +1 @@
-�X �Ճ(x��.��x�_G��F��ߖ}	Ԉh+
ޢ
\ No newline at end of file
+�
X �Ճ(x��.��x�_G��F��ߖ}	Ԉh+
ޢ
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Allegra
index 61ec98ae96..a1b108b647 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Allegra
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Allegra
@@ -1,3 +1,3 @@
-�X cA:^D
��d�
+�
X cA:^D
��d�
 �u�S�|���
]�
 q�
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Alonzo
index 6e6d3158a7..3c280119f4 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Alonzo
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Alonzo
@@ -1 +1 @@
-�X ��3�?
�G�Ca�\�ո��1�%E�g# 
+�
X ��3�?
�G�Ca�\�ո��1�%E�g# 
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Babbage
index 3c56b72b00..0a9e8f1976 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Babbage
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Babbage
@@ -1 +1 @@
-�X M~@)_ur7��WH5���O�2��$�h���
h

\ No newline at end of file
+�
X M~@)_ur7��WH5���O�2��$�h���
h

\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Byron
index a07d334baa..3ccdd3059b 100644
Binary files a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Byron and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Byron differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Conway
index 8f2268ce3f..c795639f31 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Conway
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Conway
@@ -1 +1 @@
-�X �K�8�aL�s��,��а�^�����"��5�J
\ No newline at end of file
+�
X �K�8�aL�s��,��а�^�����"��5�J
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Mary
index 1235567289..ead4fbe073 100644
--- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Mary
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Mary
@@ -1 +1 @@
-�X �Ճ(x��.��x�_G��F��ߖ}	Ԉh+
ޢ
\ No newline at end of file
+�
X �Ճ(x��.��x�_G��F��ߖ}	Ԉh+
ޢ
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Allegra
new file mode 100644
index 0000000000..df2444bf34
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Allegra differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Alonzo
new file mode 100644
index 0000000000..4637c62e4d
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Alonzo differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Babbage
new file mode 100644
index 0000000000..736de5a8ef
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Babbage differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Byron
new file mode 100644
index 0000000000..1728309622
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Byron differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Conway
new file mode 100644
index 0000000000..7e36ce4445
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Conway
@@ -0,0 +1 @@
+�����
�
�X�1���s��]k?�ժ�P�[{%A
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Mary
new file mode 100644
index 0000000000..b22d0e75ef
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Mary differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Shelley
new file mode 100644
index 0000000000..ed31f2848b
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Shelley differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_WrongEraByron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_WrongEraByron
new file mode 100644
index 0000000000..9735c28d23
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_WrongEraByron differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_WrongEraShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_WrongEraShelley
new file mode 100644
index 0000000000..43f2fa8267
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_WrongEraShelley differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Allegra
new file mode 100644
index 0000000000..b525fa7868
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Allegra differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Alonzo
new file mode 100644
index 0000000000..dc3903d3a6
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Alonzo differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Babbage
new file mode 100644
index 0000000000..279d590c81
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Babbage differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Byron_EBB b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Byron_EBB
new file mode 100644
index 0000000000..d2bc47fdf7
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Byron_EBB differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Byron_regular
new file mode 100644
index 0000000000..ce89fa545b
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Byron_regular differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Conway
new file mode 100644
index 0000000000..5ae5c5065d
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Conway differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Mary
new file mode 100644
index 0000000000..14d8281f93
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Mary differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Shelley
new file mode 100644
index 0000000000..7d900c96a8
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Shelley differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Allegra
new file mode 100644
index 0000000000..8507fa8715
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Allegra
@@ -0,0 +1,3 @@
+X cA:^D
��d�
+�u�S�|���
]�
+q�
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Alonzo
new file mode 100644
index 0000000000..0e06fd5e02
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Alonzo
@@ -0,0 +1 @@
+X ��3�?
�G�Ca�\�ո��1�%E�g# 
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Babbage
new file mode 100644
index 0000000000..f875b3bdec
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Babbage
@@ -0,0 +1 @@
+X M~@)_ur7��WH5���O�2��$�h���
h

\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Byron
new file mode 100644
index 0000000000..a0a1e937dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Byron
@@ -0,0 +1 @@
+X K�9� �ҽC�0�������F0��.�	b���
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Conway
new file mode 100644
index 0000000000..426c12e555
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Conway
@@ -0,0 +1 @@
+X �K�8�aL�s��,��а�^�����"��5�J
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Mary
new file mode 100644
index 0000000000..dd7df1c0fc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Mary
@@ -0,0 +1 @@
+X �Ճ(x��.��x�_G��F��ߖ}	Ԉh+
ޢ
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Shelley
new file mode 100644
index 0000000000..b26e394526
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Shelley
@@ -0,0 +1 @@
+X ���np��+�t���3N��Ue�<Ҷ���=�
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Allegra
new file mode 100644
index 0000000000..786e482302
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Allegra differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Alonzo
new file mode 100644
index 0000000000..558dfbcca8
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Alonzo differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Babbage
new file mode 100644
index 0000000000..0be195e3f1
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Babbage differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Byron
new file mode 100644
index 0000000000..9c10e1bb39
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Byron differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Conway
new file mode 100644
index 0000000000..9d1ce51c81
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Conway differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Mary
new file mode 100644
index 0000000000..1d7d61fa77
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Mary differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Shelley
new file mode 100644
index 0000000000..d41c1aacc8
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Shelley differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/LedgerConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/LedgerConfig
new file mode 100644
index 0000000000..bb0583694a
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/LedgerConfig differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetBigLedgerPeerSnapshot b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetBigLedgerPeerSnapshot
new file mode 100644
index 0000000000..bc0aee634c
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetBigLedgerPeerSnapshot differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetCurrentPParams
new file mode 100644
index 0000000000..4d12a7ad6b
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetCurrentPParams differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetEpochNo
new file mode 100644
index 0000000000..1d07267558
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetEpochNo differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetGenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetGenesisConfig
new file mode 100644
index 0000000000..6741a401cb
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetGenesisConfig differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetLedgerTip
new file mode 100644
index 0000000000..6706725ac7
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetLedgerTip differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetNonMyopicMemberRewards
new file mode 100644
index 0000000000..08c5c789e9
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetNonMyopicMemberRewards differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetStakeDistribution
new file mode 100644
index 0000000000..b5f799b270
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetStakeDistribution differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetBigLedgerPeerSnapshot b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetBigLedgerPeerSnapshot
new file mode 100644
index 0000000000..7312d4e726
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetBigLedgerPeerSnapshot differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetCurrentPParams
new file mode 100644
index 0000000000..046b306d4d
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetCurrentPParams differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetEpochNo
new file mode 100644
index 0000000000..a6f766751b
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetEpochNo differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetGenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetGenesisConfig
new file mode 100644
index 0000000000..f701524d73
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetGenesisConfig differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetLedgerTip
new file mode 100644
index 0000000000..d9a18e85a2
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetLedgerTip differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetNonMyopicMemberRewards
new file mode 100644
index 0000000000..58e70d849d
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetNonMyopicMemberRewards differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetStakeDistribution
new file mode 100644
index 0000000000..e5308b275a
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetStakeDistribution differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_AnytimeByron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_AnytimeByron
new file mode 100644
index 0000000000..6fd42d6043
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_AnytimeByron differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_AnytimeShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_AnytimeShelley
new file mode 100644
index 0000000000..d82b9fc7f4
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_AnytimeShelley differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetCurrentPParams
new file mode 100644
index 0000000000..cd6d53bc79
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetCurrentPParams differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetEpochNo
new file mode 100644
index 0000000000..f5ea7bd085
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetEpochNo differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetGenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetGenesisConfig
new file mode 100644
index 0000000000..e6ee8c45c4
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetGenesisConfig differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetLedgerTip
new file mode 100644
index 0000000000..4d00b4e9fa
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetLedgerTip differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetNonMyopicMemberRewards
new file mode 100644
index 0000000000..b5217dc67a
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetNonMyopicMemberRewards differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetStakeDistribution
new file mode 100644
index 0000000000..41aeabd30d
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetStakeDistribution differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Byron
new file mode 100644
index 0000000000..cfa4236d51
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Byron differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetCurrentPParams
new file mode 100644
index 0000000000..05f2ba9773
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetCurrentPParams differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetEpochNo
new file mode 100644
index 0000000000..915b078647
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetEpochNo differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetGenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetGenesisConfig
new file mode 100644
index 0000000000..70189500e9
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetGenesisConfig differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetLedgerTip
new file mode 100644
index 0000000000..7337b0de4e
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetLedgerTip differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetNonMyopicMemberRewards
new file mode 100644
index 0000000000..b47684f4c3
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetNonMyopicMemberRewards differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetStakeDistribution
new file mode 100644
index 0000000000..89ed187e31
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetStakeDistribution differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_HardFork b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_HardFork
new file mode 100644
index 0000000000..64c266fdc5
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_HardFork differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetBigLedgerPeerSnapshot b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetBigLedgerPeerSnapshot
new file mode 100644
index 0000000000..b3f0d169c0
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetBigLedgerPeerSnapshot differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetCurrentPParams
new file mode 100644
index 0000000000..7338cd7416
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetCurrentPParams differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetEpochNo
new file mode 100644
index 0000000000..58e4767132
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetEpochNo differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetGenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetGenesisConfig
new file mode 100644
index 0000000000..2306eb025e
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetGenesisConfig differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetLedgerTip
new file mode 100644
index 0000000000..c5b7ef0497
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetLedgerTip differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetNonMyopicMemberRewards
new file mode 100644
index 0000000000..72f3ff8f93
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetNonMyopicMemberRewards differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetStakeDistribution
new file mode 100644
index 0000000000..e63d41b76d
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetStakeDistribution differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetBigLedgerPeerSnapshot b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetBigLedgerPeerSnapshot
new file mode 100644
index 0000000000..95d62a50fd
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetBigLedgerPeerSnapshot differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetCurrentPParams
new file mode 100644
index 0000000000..cafc5b7290
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetCurrentPParams differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetEpochNo
new file mode 100644
index 0000000000..112bec95a3
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetEpochNo differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetGenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetGenesisConfig
new file mode 100644
index 0000000000..bca99cf254
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetGenesisConfig differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetLedgerTip
new file mode 100644
index 0000000000..33dba00f05
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetLedgerTip differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetNonMyopicMemberRewards
new file mode 100644
index 0000000000..57e64f50fb
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetNonMyopicMemberRewards differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetStakeDistribution
new file mode 100644
index 0000000000..8d50b1f974
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetStakeDistribution differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_EmptyPParams
new file mode 100644
index 0000000000..231cb35567
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_EmptyPParams differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_EpochNo
new file mode 100644
index 0000000000..b180370379
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_EpochNo
@@ -0,0 +1 @@
+�
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_GenesisConfig
new file mode 100644
index 0000000000..10a12c2526
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_GenesisConfig differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_GetBigLedgerPeerSnapshot b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_GetBigLedgerPeerSnapshot
new file mode 100644
index 0000000000..2c6a1843ac
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_GetBigLedgerPeerSnapshot
@@ -0,0 +1,3 @@
+��
��
*���	
+��	
+��
ҟ



���
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_LedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_LedgerTip
new file mode 100644
index 0000000000..e64ffada5d
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_LedgerTip
@@ -0,0 +1 @@
+��	X �B!��)k�8�
Pl��"����5����^
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_NonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_NonMyopicMemberRewards
new file mode 100644
index 0000000000..c47618c170
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_NonMyopicMemberRewards differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_StakeDistribution
new file mode 100644
index 0000000000..968f15663d
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_StakeDistribution
@@ -0,0 +1 @@
+��X�1���s��]k?�ժ�P�[{%A��

X �����-�ò^46���R�>Žb�{L
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_EmptyPParams
new file mode 100644
index 0000000000..9e750e2688
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_EmptyPParams differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_EpochNo
new file mode 100644
index 0000000000..b180370379
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_EpochNo
@@ -0,0 +1 @@
+�
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_GenesisConfig
new file mode 100644
index 0000000000..10a12c2526
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_GenesisConfig differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_GetBigLedgerPeerSnapshot b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_GetBigLedgerPeerSnapshot
new file mode 100644
index 0000000000..2c6a1843ac
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_GetBigLedgerPeerSnapshot
@@ -0,0 +1,3 @@
+��
��
*���	
+��	
+��
ҟ



���
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_LedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_LedgerTip
new file mode 100644
index 0000000000..a8d3ebca89
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_LedgerTip
@@ -0,0 +1 @@
+��	X ����8����o�fo&&���&n�s�s$&�
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_NonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_NonMyopicMemberRewards
new file mode 100644
index 0000000000..c47618c170
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_NonMyopicMemberRewards differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_StakeDistribution
new file mode 100644
index 0000000000..968f15663d
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_StakeDistribution
@@ -0,0 +1 @@
+��X�1���s��]k?�ժ�P�[{%A��

X �����-�ò^46���R�>Žb�{L
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_AnytimeByron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_AnytimeByron
new file mode 100644
index 0000000000..070897ad04
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_AnytimeByron differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_AnytimeShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_AnytimeShelley
new file mode 100644
index 0000000000..61dee1376e
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_AnytimeShelley differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_EmptyPParams
new file mode 100644
index 0000000000..edc6f11887
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_EmptyPParams differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_EpochNo
new file mode 100644
index 0000000000..b180370379
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_EpochNo
@@ -0,0 +1 @@
+�
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_GenesisConfig
new file mode 100644
index 0000000000..10a12c2526
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_GenesisConfig differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_LedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_LedgerTip
new file mode 100644
index 0000000000..c36241968e
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_LedgerTip differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_NonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_NonMyopicMemberRewards
new file mode 100644
index 0000000000..c47618c170
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_NonMyopicMemberRewards differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_StakeDistribution
new file mode 100644
index 0000000000..968f15663d
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_StakeDistribution
@@ -0,0 +1 @@
+��X�1���s��]k?�ժ�P�[{%A��

X �����-�ò^46���R�>Žb�{L
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Byron
new file mode 100644
index 0000000000..d66107b64e
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Byron differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_EmptyPParams
new file mode 100644
index 0000000000..04416edc30
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_EmptyPParams differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_EpochNo
new file mode 100644
index 0000000000..b180370379
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_EpochNo
@@ -0,0 +1 @@
+�
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_GenesisConfig
new file mode 100644
index 0000000000..10a12c2526
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_GenesisConfig differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_LedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_LedgerTip
new file mode 100644
index 0000000000..2eeba1fbba
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_LedgerTip
@@ -0,0 +1 @@
+��	X �M����7!SY�ǭ���dG��f�p�;����
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_NonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_NonMyopicMemberRewards
new file mode 100644
index 0000000000..c47618c170
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_NonMyopicMemberRewards differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_StakeDistribution
new file mode 100644
index 0000000000..967baf0b47
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_StakeDistribution
@@ -0,0 +1 @@
+��X�1���s��]k?�ժ�P�[{%A���

X �����-�ò^46���R�>Žb�{L
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_EraMismatchByron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_EraMismatchByron
new file mode 100644
index 0000000000..9735c28d23
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_EraMismatchByron differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_EraMismatchShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_EraMismatchShelley
new file mode 100644
index 0000000000..43f2fa8267
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_EraMismatchShelley differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_HardFork b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_HardFork
new file mode 100644
index 0000000000..84885abaa8
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_HardFork differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_EmptyPParams
new file mode 100644
index 0000000000..0240c52f6f
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_EmptyPParams differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_EpochNo
new file mode 100644
index 0000000000..b180370379
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_EpochNo
@@ -0,0 +1 @@
+�
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_GenesisConfig
new file mode 100644
index 0000000000..10a12c2526
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_GenesisConfig differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_GetBigLedgerPeerSnapshot b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_GetBigLedgerPeerSnapshot
new file mode 100644
index 0000000000..2c6a1843ac
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_GetBigLedgerPeerSnapshot
@@ -0,0 +1,3 @@
+��
��
*���	
+��	
+��
ҟ



���
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_LedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_LedgerTip
new file mode 100644
index 0000000000..6ec12660a7
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_LedgerTip
@@ -0,0 +1 @@
+��	X ��E<���p���2W@Y��rJt=&��v��j
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_NonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_NonMyopicMemberRewards
new file mode 100644
index 0000000000..c47618c170
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_NonMyopicMemberRewards differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_StakeDistribution
new file mode 100644
index 0000000000..968f15663d
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_StakeDistribution
@@ -0,0 +1 @@
+��X�1���s��]k?�ժ�P�[{%A��

X �����-�ò^46���R�>Žb�{L
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_EmptyPParams
new file mode 100644
index 0000000000..b792678e2e
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_EmptyPParams differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_EpochNo
new file mode 100644
index 0000000000..b180370379
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_EpochNo
@@ -0,0 +1 @@
+�
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_GenesisConfig
new file mode 100644
index 0000000000..10a12c2526
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_GenesisConfig differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_GetBigLedgerPeerSnapshot b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_GetBigLedgerPeerSnapshot
new file mode 100644
index 0000000000..2c6a1843ac
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_GetBigLedgerPeerSnapshot
@@ -0,0 +1,3 @@
+��
��
*���	
+��	
+��
ҟ



���
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_LedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_LedgerTip
new file mode 100644
index 0000000000..32d3f65a35
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_LedgerTip
@@ -0,0 +1 @@
+��	X ��� u��'9Ki�(�׺y���C����)�l
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_NonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_NonMyopicMemberRewards
new file mode 100644
index 0000000000..c47618c170
Binary files /dev/null and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_NonMyopicMemberRewards differ
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_StakeDistribution
new file mode 100644
index 0000000000..968f15663d
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_StakeDistribution
@@ -0,0 +1 @@
+��X�1���s��]k?�ժ�P�[{%A��

X �����-�ò^46���R�>Žb�{L
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Allegra
new file mode 100644
index 0000000000..6a5024d0dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Allegra
@@ -0,0 +1 @@
+�O<CARDANO_BLOCK>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Alonzo
new file mode 100644
index 0000000000..6a5024d0dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Alonzo
@@ -0,0 +1 @@
+�O<CARDANO_BLOCK>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Babbage
new file mode 100644
index 0000000000..6a5024d0dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Babbage
@@ -0,0 +1 @@
+�O<CARDANO_BLOCK>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Byron_EBB b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Byron_EBB
new file mode 100644
index 0000000000..6a5024d0dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Byron_EBB
@@ -0,0 +1 @@
+�O<CARDANO_BLOCK>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Byron_regular
new file mode 100644
index 0000000000..6a5024d0dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Byron_regular
@@ -0,0 +1 @@
+�O<CARDANO_BLOCK>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Conway
new file mode 100644
index 0000000000..6a5024d0dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Conway
@@ -0,0 +1 @@
+�O<CARDANO_BLOCK>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Mary
new file mode 100644
index 0000000000..6a5024d0dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Mary
@@ -0,0 +1 @@
+�O<CARDANO_BLOCK>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Shelley
new file mode 100644
index 0000000000..6a5024d0dc
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Shelley
@@ -0,0 +1 @@
+�O<CARDANO_BLOCK>
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Allegra
new file mode 100644
index 0000000000..d9ba7315ac
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Allegra
@@ -0,0 +1 @@
+*
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Alonzo
new file mode 100644
index 0000000000..d9ba7315ac
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Alonzo
@@ -0,0 +1 @@
+*
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Babbage
new file mode 100644
index 0000000000..d9ba7315ac
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Babbage
@@ -0,0 +1 @@
+*
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Byron
new file mode 100644
index 0000000000..d9ba7315ac
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Byron
@@ -0,0 +1 @@
+*
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Conway
new file mode 100644
index 0000000000..d9ba7315ac
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Conway
@@ -0,0 +1 @@
+*
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Mary
new file mode 100644
index 0000000000..d9ba7315ac
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Mary
@@ -0,0 +1 @@
+*
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Shelley
new file mode 100644
index 0000000000..d9ba7315ac
--- /dev/null
+++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Shelley
@@ -0,0 +1 @@
+*
\ No newline at end of file
diff --git a/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/ByronHFC.hs b/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/ByronHFC.hs
index 6761c762ea..12b3cbab20 100644
--- a/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/ByronHFC.hs
+++ b/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/ByronHFC.hs
@@ -29,6 +29,7 @@ import           Data.Maybe (listToMaybe, mapMaybe)
 import           Data.MemPack
 import           Data.SOP.Index (Index (..))
 import           Data.Void (Void, absurd)
+import           Data.SOP.Strict.NS (NS(..))
 import           Data.Word
 import           GHC.Generics
 import           NoThunks.Class
@@ -88,6 +89,13 @@ instance SupportedNetworkProtocolVersion ByronBlockHFC where
 
   latestReleasedNodeVersion = latestReleasedNodeVersionDefault
 
+{-------------------------------------------------------------------------------
+  HasBlessedGenTxIdEra instance
+-------------------------------------------------------------------------------}
+
+instance HasBlessedGenTxIdEra '[ByronBlock] where
+  blessedGenTxIdEra = Z mempty
+
 {-------------------------------------------------------------------------------
   SerialiseHFC instance
 -------------------------------------------------------------------------------}
diff --git a/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/Ledger/Mempool.hs b/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/Ledger/Mempool.hs
index 1a323e58e6..1504b34810 100644
--- a/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/Ledger/Mempool.hs
+++ b/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/Ledger/Mempool.hs
@@ -6,7 +6,9 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE ViewPatterns #-}
 
 {-# OPTIONS_GHC -Wno-orphans #-}
 
@@ -16,6 +18,10 @@ module Ouroboros.Consensus.Byron.Ledger.Mempool (
     GenTx (..)
   , TxId (..)
   , Validated (..)
+  , pattern ByronDlgId
+  , pattern ByronTxId
+  , pattern ByronUpdateProposalId
+  , pattern ByronUpdateVoteId
     -- * Transaction IDs
   , byronIdDlg
   , byronIdProp
@@ -44,20 +50,17 @@ import qualified Cardano.Chain.UTxO as Utxo
 import qualified Cardano.Chain.ValidationMode as CC
 import           Cardano.Crypto (hashDecoded)
 import qualified Cardano.Crypto as CC
-import           Cardano.Ledger.Binary (ByteSpan, DecoderError (..),
-                     byronProtVer, fromByronCBOR, serialize, slice, toByronCBOR,
-                     unsafeDeserialize)
-import           Cardano.Ledger.Binary.Plain (enforceSize)
-import           Cardano.Prelude (Natural, cborError)
+import           Cardano.Ledger.Binary (ByteSpan, byronProtVer, fromByronCBOR,
+                     serialize, slice, toByronCBOR, unsafeDeserialize)
+import           Cardano.Prelude (Natural)
 import           Codec.CBOR.Decoding (Decoder)
-import qualified Codec.CBOR.Decoding as CBOR
 import           Codec.CBOR.Encoding (Encoding)
-import qualified Codec.CBOR.Encoding as CBOR
 import           Control.Monad (void)
 import           Control.Monad.Except (Except, throwError)
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString as Strict
 import qualified Data.ByteString.Lazy as Lazy
+import           Data.Coerce
 import           Data.Maybe (maybeToList)
 import           Data.Word
 import           GHC.Generics (Generic)
@@ -84,10 +87,10 @@ import           Ouroboros.Consensus.Util.Condense
 -- This is effectively the same as 'CC.AMempoolPayload' but we cache the
 -- transaction ID (a hash).
 data instance GenTx ByronBlock
-  = ByronTx             !Utxo.TxId                !(Utxo.ATxAux             ByteString)
-  | ByronDlg            !Delegation.CertificateId !(Delegation.ACertificate ByteString)
-  | ByronUpdateProposal !Update.UpId              !(Update.AProposal        ByteString)
-  | ByronUpdateVote     !Update.VoteId            !(Update.AVote            ByteString)
+  = ByronTx             !(GenTxId ByronBlock) !(Utxo.ATxAux             ByteString)
+  | ByronDlg            !(GenTxId ByronBlock) !(Delegation.ACertificate ByteString)
+  | ByronUpdateProposal !(GenTxId ByronBlock) !(Update.AProposal        ByteString)
+  | ByronUpdateVote     !(GenTxId ByronBlock) !(Update.AVote            ByteString)
   deriving (Eq, Generic)
   deriving NoThunks via InspectHeapNamed "GenTx ByronBlock" (GenTx ByronBlock)
 
@@ -160,26 +163,47 @@ instance TxLimits ByronBlock where
         $ Utxo.TxValidationTxTooLarge txszNat maxTxSize
 
 data instance TxId (GenTx ByronBlock)
-  = ByronTxId             !Utxo.TxId
-  | ByronDlgId            !Delegation.CertificateId
-  | ByronUpdateProposalId !Update.UpId
-  | ByronUpdateVoteId     !Update.VoteId
+  = ByronGenTxId !(CC.Hash (GenTx ByronBlock))
   deriving (Eq, Ord)
   deriving NoThunks via InspectHeapNamed "TxId (GenTx ByronBlock)" (TxId (GenTx ByronBlock))
 
 instance ShowProxy (TxId (GenTx ByronBlock)) where
 
 instance HasTxId (GenTx ByronBlock) where
-  txId (ByronTx             i _) = ByronTxId             i
-  txId (ByronDlg            i _) = ByronDlgId            i
-  txId (ByronUpdateProposal i _) = ByronUpdateProposalId i
-  txId (ByronUpdateVote     i _) = ByronUpdateVoteId     i
+  txId (ByronTx             i _) = i
+  txId (ByronDlg            i _) = i
+  txId (ByronUpdateProposal i _) = i
+  txId (ByronUpdateVote     i _) = i
 
 instance ConvertRawTxId (GenTx ByronBlock) where
-  toRawTxIdHash (ByronTxId             i) = CC.abstractHashToShort i
-  toRawTxIdHash (ByronDlgId            i) = CC.abstractHashToShort i
-  toRawTxIdHash (ByronUpdateProposalId i) = CC.abstractHashToShort i
-  toRawTxIdHash (ByronUpdateVoteId     i) = CC.abstractHashToShort i
+  toRawTxIdHash (ByronGenTxId i) = CC.abstractHashToShort i
+
+castAbstractHash :: CC.Hash a -> CC.Hash b
+castAbstractHash = coerce
+
+pattern ByronTxId :: Utxo.TxId -> TxId (GenTx ByronBlock)
+pattern ByronTxId i <- ByronGenTxId (castAbstractHash -> i)
+  where ByronTxId i = ByronGenTxId (castAbstractHash i)
+
+{-# COMPLETE ByronTxId #-}
+
+pattern ByronDlgId :: Delegation.CertificateId -> TxId (GenTx ByronBlock)
+pattern ByronDlgId i <- ByronGenTxId (castAbstractHash -> i)
+  where ByronDlgId i = ByronGenTxId (castAbstractHash i)
+
+{-# COMPLETE ByronDlgId #-}
+
+pattern ByronUpdateProposalId :: Update.UpId -> TxId (GenTx ByronBlock)
+pattern ByronUpdateProposalId i <- ByronGenTxId (castAbstractHash -> i)
+  where ByronUpdateProposalId i = ByronGenTxId (castAbstractHash i)
+
+{-# COMPLETE ByronUpdateProposalId #-}
+
+pattern ByronUpdateVoteId :: Update.VoteId -> TxId (GenTx ByronBlock)
+pattern ByronUpdateVoteId i <- ByronGenTxId (castAbstractHash -> i)
+  where ByronUpdateVoteId i = ByronGenTxId (castAbstractHash i)
+
+{-# COMPLETE ByronUpdateVoteId #-}
 
 instance HasTxs ByronBlock where
   extractTxs blk = case byronBlockRaw blk of
@@ -224,17 +248,17 @@ fromMempoolPayload = go
 -------------------------------------------------------------------------------}
 
 -- TODO: move to cardano-ledger-byron (cardano-ledger-byron#581)
-byronIdTx :: Utxo.ATxAux ByteString -> Utxo.TxId
-byronIdTx = hashDecoded . Utxo.aTaTx
+byronIdTx :: Utxo.ATxAux ByteString -> GenTxId ByronBlock
+byronIdTx = ByronTxId . hashDecoded . Utxo.aTaTx
 
-byronIdDlg :: Delegation.ACertificate ByteString -> Delegation.CertificateId
-byronIdDlg = Delegation.recoverCertificateId
+byronIdDlg :: Delegation.ACertificate ByteString -> GenTxId ByronBlock
+byronIdDlg = ByronDlgId . Delegation.recoverCertificateId
 
-byronIdProp :: Update.AProposal ByteString -> Update.UpId
-byronIdProp = Update.recoverUpId
+byronIdProp :: Update.AProposal ByteString -> GenTxId ByronBlock
+byronIdProp = ByronUpdateProposalId . Update.recoverUpId
 
-byronIdVote :: Update.AVote ByteString -> Update.VoteId
-byronIdVote = Update.recoverVoteId
+byronIdVote :: Update.AVote ByteString -> GenTxId ByronBlock
+byronIdVote = ByronUpdateVoteId . Update.recoverVoteId
 
 {-------------------------------------------------------------------------------
   Pretty-printing
@@ -244,10 +268,7 @@ instance Condense (GenTx ByronBlock) where
   condense = condense . toMempoolPayload
 
 instance Condense (GenTxId ByronBlock) where
-  condense (ByronTxId             i) = condense i
-  condense (ByronDlgId            i) = condense i
-  condense (ByronUpdateProposalId i) = condense i
-  condense (ByronUpdateVoteId     i) = condense i
+  condense (ByronGenTxId i) = show $ CC.abstractHashToShort i
 
 instance Show (GenTx ByronBlock) where
   show = condense
@@ -316,24 +337,10 @@ decodeByronGenTx = fromMempoolPayload . canonicalise <$> fromByronCBOR
         mp'            = unsafeDeserialize byronProtVer canonicalBytes
 
 encodeByronGenTxId :: GenTxId ByronBlock -> Encoding
-encodeByronGenTxId genTxId = mconcat [
-      CBOR.encodeListLen 2
-    , case genTxId of
-        ByronTxId             i -> toByronCBOR (0 :: Word8) <> toByronCBOR i
-        ByronDlgId            i -> toByronCBOR (1 :: Word8) <> toByronCBOR i
-        ByronUpdateProposalId i -> toByronCBOR (2 :: Word8) <> toByronCBOR i
-        ByronUpdateVoteId     i -> toByronCBOR (3 :: Word8) <> toByronCBOR i
-    ]
+encodeByronGenTxId (ByronGenTxId i) = toByronCBOR i
 
 decodeByronGenTxId :: Decoder s (GenTxId ByronBlock)
-decodeByronGenTxId = do
-    enforceSize "GenTxId (ByronBlock cfg)" 2
-    CBOR.decodeWord8 >>= \case
-      0   -> ByronTxId             <$> fromByronCBOR
-      1   -> ByronDlgId            <$> fromByronCBOR
-      2   -> ByronUpdateProposalId <$> fromByronCBOR
-      3   -> ByronUpdateVoteId     <$> fromByronCBOR
-      tag -> cborError $ DecoderErrorUnknownTag "GenTxId (ByronBlock cfg)" tag
+decodeByronGenTxId = ByronGenTxId <$> fromByronCBOR
 
 encodeByronApplyTxError :: ApplyTxErr ByronBlock -> Encoding
 encodeByronApplyTxError = toByronCBOR
diff --git a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Block.hs b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Block.hs
index 8db3c12acc..642e01f130 100644
--- a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Block.hs
+++ b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Block.hs
@@ -31,7 +31,7 @@ module Ouroboros.Consensus.Cardano.Block (
   , CardanoGenTxId
   , GenTx (GenTxAllegra, GenTxAlonzo, GenTxByron, GenTxMary, GenTxShelley, GenTxBabbage, GenTxConway)
   , HardForkApplyTxErr (ApplyTxErrAllegra, ApplyTxErrAlonzo, ApplyTxErrByron, ApplyTxErrMary, ApplyTxErrShelley, ApplyTxErrWrongEra, ApplyTxErrBabbage, ApplyTxErrConway)
-  , TxId (GenTxIdAllegra, GenTxIdAlonzo, GenTxIdByron, GenTxIdMary, GenTxIdShelley, GenTxIdBabbage, GenTxIdConway)
+  , TxId (CardanoGenTxId)
     -- * LedgerError
   , CardanoLedgerError
   , HardForkLedgerError (LedgerErrorAllegra, LedgerErrorAlonzo, LedgerErrorByron, LedgerErrorMary, LedgerErrorShelley, LedgerErrorWrongEra, LedgerErrorBabbage, LedgerErrorConway)
@@ -71,6 +71,7 @@ module Ouroboros.Consensus.Cardano.Block (
   , EraMismatch (..)
   ) where
 
+import           Data.ByteString.Short (ShortByteString)
 import           Data.Kind
 import           Data.SOP.BasicFunctors
 import           Data.SOP.Functors
@@ -353,54 +354,10 @@ pattern GenTxConway tx = HardForkGenTx (OneEraGenTx (TagConway tx))
 -- | The ID of a Cardano transaction.
 type CardanoGenTxId c = GenTxId (CardanoBlock c)
 
-pattern GenTxIdByron :: GenTxId ByronBlock -> CardanoGenTxId c
-pattern GenTxIdByron txid =
-    HardForkGenTxId (OneEraGenTxId (TagByron (WrapGenTxId txid)))
-
-pattern GenTxIdShelley ::
-     GenTxId (ShelleyBlock (TPraos c) ShelleyEra)
-  -> CardanoGenTxId c
-pattern GenTxIdShelley txid =
-    HardForkGenTxId (OneEraGenTxId (TagShelley (WrapGenTxId txid)))
-
-pattern GenTxIdAllegra ::
-     GenTxId (ShelleyBlock (TPraos c) AllegraEra)
-  -> CardanoGenTxId c
-pattern GenTxIdAllegra txid =
-    HardForkGenTxId (OneEraGenTxId (TagAllegra (WrapGenTxId txid)))
-
-pattern GenTxIdMary ::
-     GenTxId (ShelleyBlock (TPraos c) MaryEra)
-  -> CardanoGenTxId c
-pattern GenTxIdMary txid =
-    HardForkGenTxId (OneEraGenTxId (TagMary (WrapGenTxId txid)))
-
-pattern GenTxIdAlonzo ::
-     GenTxId (ShelleyBlock (TPraos c) AlonzoEra)
-  -> CardanoGenTxId c
-pattern GenTxIdAlonzo txid =
-    HardForkGenTxId (OneEraGenTxId (TagAlonzo (WrapGenTxId txid)))
-
-pattern GenTxIdBabbage ::
-     GenTxId (ShelleyBlock (Praos c) BabbageEra)
-  -> CardanoGenTxId c
-pattern GenTxIdBabbage txid =
-    HardForkGenTxId (OneEraGenTxId (TagBabbage (WrapGenTxId txid)))
-
-pattern GenTxIdConway ::
-     GenTxId (ShelleyBlock (Praos c) ConwayEra)
-  -> CardanoGenTxId c
-pattern GenTxIdConway txid =
-    HardForkGenTxId (OneEraGenTxId (TagConway (WrapGenTxId txid)))
-
-{-# COMPLETE GenTxIdByron
-           , GenTxIdShelley
-           , GenTxIdAllegra
-           , GenTxIdMary
-           , GenTxIdAlonzo
-           , GenTxIdBabbage
-           , GenTxIdConway
-  #-}
+pattern CardanoGenTxId :: ShortByteString -> CardanoGenTxId c
+pattern CardanoGenTxId txid = HardForkGenTxId (OneEraGenTxId txid)
+
+{-# COMPLETE CardanoGenTxId #-}
 
 -- | An error resulting from applying a 'CardanoGenTx' to the ledger.
 --
diff --git a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/ByronHFC.hs b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/ByronHFC.hs
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs
index 61fc950ca6..c2f28208f0 100644
--- a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs
+++ b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs
@@ -32,8 +32,10 @@ module Ouroboros.Consensus.Cardano.Node (
   , pattern CardanoNodeToClientVersion14
   , pattern CardanoNodeToClientVersion15
   , pattern CardanoNodeToClientVersion16
+  , pattern CardanoNodeToClientVersion17
   , pattern CardanoNodeToNodeVersion1
   , pattern CardanoNodeToNodeVersion2
+  , pattern CardanoNodeToNodeVersion3
   ) where
 
 import           Cardano.Binary (DecoderError (..), enforceSize)
@@ -222,6 +224,16 @@ prependTag tag payload = mconcat [
     , payload
     ]
 
+{-------------------------------------------------------------------------------
+  HasBlessedGenTxIdEra instances
+-------------------------------------------------------------------------------}
+
+instance HasBlessedGenTxIdEra (CardanoShelleyEras c) where
+  blessedGenTxIdEra = Z mempty
+
+instance HasBlessedGenTxIdEra (CardanoEras c) where
+  blessedGenTxIdEra = S blessedGenTxIdEra
+
 {-------------------------------------------------------------------------------
   SupportedNetworkProtocolVersion instance
 -------------------------------------------------------------------------------}
@@ -251,6 +263,20 @@ pattern CardanoNodeToNodeVersion2 =
       :* Nil
       )
 
+pattern CardanoNodeToNodeVersion3 :: BlockNodeToNodeVersion (CardanoBlock c)
+pattern CardanoNodeToNodeVersion3 =
+    HardForkNodeToNodeEnabled
+      HardForkSpecificNodeToNodeVersion2
+      (  WrapNodeToNodeVersion ByronNodeToNodeVersion2
+      :* WrapNodeToNodeVersion ShelleyNodeToNodeVersion1
+      :* WrapNodeToNodeVersion ShelleyNodeToNodeVersion1
+      :* WrapNodeToNodeVersion ShelleyNodeToNodeVersion1
+      :* WrapNodeToNodeVersion ShelleyNodeToNodeVersion1
+      :* WrapNodeToNodeVersion ShelleyNodeToNodeVersion1
+      :* WrapNodeToNodeVersion ShelleyNodeToNodeVersion1
+      :* Nil
+      )
+
 -- | The hard fork enabled, and the Shelley, Allegra, Mary, Alonzo and Babbage
 -- and Conway eras enabled, using 'ShelleyNodeToClientVersion8' for the
 -- Shelley-based eras.
@@ -336,11 +362,29 @@ pattern CardanoNodeToClientVersion16 =
       :* Nil
       )
 
+-- | The hard fork enabled, using 'HardForkSpecificNodeToClientVersion4', and the Shelley, Allegra, Mary, Alonzo and Babbage
+-- and Conway eras enabled, using 'ShelleyNodeToClientVersion12' for the
+-- Shelley-based eras.
+pattern CardanoNodeToClientVersion17 :: BlockNodeToClientVersion (CardanoBlock c)
+pattern CardanoNodeToClientVersion17 =
+    HardForkNodeToClientEnabled
+      HardForkSpecificNodeToClientVersion4
+      (  EraNodeToClientEnabled ByronNodeToClientVersion1
+      :* EraNodeToClientEnabled ShelleyNodeToClientVersion12
+      :* EraNodeToClientEnabled ShelleyNodeToClientVersion12
+      :* EraNodeToClientEnabled ShelleyNodeToClientVersion12
+      :* EraNodeToClientEnabled ShelleyNodeToClientVersion12
+      :* EraNodeToClientEnabled ShelleyNodeToClientVersion12
+      :* EraNodeToClientEnabled ShelleyNodeToClientVersion12
+      :* Nil
+      )
+
 instance CardanoHardForkConstraints c
       => SupportedNetworkProtocolVersion (CardanoBlock c) where
   supportedNodeToNodeVersions _ = Map.fromList $
       [ (NodeToNodeV_13, CardanoNodeToNodeVersion2)
       , (NodeToNodeV_14, CardanoNodeToNodeVersion2)
+      , (NodeToNodeV_15, CardanoNodeToNodeVersion3)
       ]
 
   supportedNodeToClientVersions _ = Map.fromList $
@@ -349,9 +393,10 @@ instance CardanoHardForkConstraints c
       , (NodeToClientV_18, CardanoNodeToClientVersion14)
       , (NodeToClientV_19, CardanoNodeToClientVersion15)
       , (NodeToClientV_20, CardanoNodeToClientVersion16)
+      , (NodeToClientV_21, CardanoNodeToClientVersion17)
       ]
 
-  latestReleasedNodeVersion _prx = (Just NodeToNodeV_14, Just NodeToClientV_20)
+  latestReleasedNodeVersion _prx = (Just NodeToNodeV_15, Just NodeToClientV_20)
 
 {-------------------------------------------------------------------------------
   ProtocolInfo
diff --git a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs
index 5b8810bcf9..76529c94cb 100644
--- a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs
+++ b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs
@@ -41,6 +41,7 @@ instance SupportedNetworkProtocolVersion (ShelleyBlock proto era) where
   supportedNodeToNodeVersions   _ = Map.fromList [
         (NodeToNodeV_13, ShelleyNodeToNodeVersion1)
       , (NodeToNodeV_14, ShelleyNodeToNodeVersion1)
+      , (NodeToNodeV_15, ShelleyNodeToNodeVersion1)
       ]
   supportedNodeToClientVersions _ = Map.fromList [
         (NodeToClientV_16, ShelleyNodeToClientVersion8)
diff --git a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/ShelleyHFC.hs b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/ShelleyHFC.hs
index 403564ee40..80418eee02 100644
--- a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/ShelleyHFC.hs
+++ b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/ShelleyHFC.hs
@@ -54,6 +54,7 @@ import           Data.SOP.InPairs (RequiringBoth (..), ignoringBoth)
 import           Data.SOP.Strict
 import qualified Data.SOP.Tails as Tails
 import qualified Data.SOP.Telescope as Telescope
+import           Data.SOP.Strict.NS
 import qualified Data.Text as T (pack)
 import           Data.Typeable
 import           Data.Void (Void)
@@ -141,6 +142,9 @@ instance ( ShelleyCompatible proto era
   SerialiseHFC instance
 -------------------------------------------------------------------------------}
 
+instance HasBlessedGenTxIdEra '[ShelleyBlock proto era] where
+  blessedGenTxIdEra = Z mempty
+
 -- | Use the default implementations. This means the serialisation of blocks
 -- includes an era wrapper. Each block should do this from the start to be
 -- prepared for future hard forks without having to do any bit twiddling.
diff --git a/ouroboros-consensus-cardano/src/unstable-byron-testlib/Ouroboros/Consensus/ByronDual/Ledger.hs b/ouroboros-consensus-cardano/src/unstable-byron-testlib/Ouroboros/Consensus/ByronDual/Ledger.hs
index 81e449725e..4e0414283d 100644
--- a/ouroboros-consensus-cardano/src/unstable-byron-testlib/Ouroboros/Consensus/ByronDual/Ledger.hs
+++ b/ouroboros-consensus-cardano/src/unstable-byron-testlib/Ouroboros/Consensus/ByronDual/Ledger.hs
@@ -30,6 +30,7 @@ import qualified Cardano.Chain.UTxO as Impl
 import           Cardano.Crypto.DSIGN.Class
 import           Codec.Serialise
 import           Data.ByteString (ByteString)
+import           Data.Coerce
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
@@ -82,13 +83,17 @@ instance Monoid SpecToImplIds where
 -- | Construct singleton 'SpecToImplIds' for a transaction
 specToImplTx :: Spec.Tx -> Impl.ATxAux ByteString -> SpecToImplIds
 specToImplTx spec impl = SpecToImplIds $ Spec.Test.AbstractToConcreteIdMaps {
-      transactionIds = Map.singleton (specTxId spec) (byronIdTx impl)
+      transactionIds =
+        Map.singleton (specTxId spec) (byronGenTxIdToTxId $ byronIdTx impl)
     , proposalIds    = Map.empty
     }
   where
     specTxId :: Spec.Tx -> Spec.TxId
     specTxId = Spec.txid . Spec.body
 
+    byronGenTxIdToTxId :: TxId (GenTx ByronBlock) -> Impl.TxId
+    byronGenTxIdToTxId (ByronGenTxId i) = coerce i
+
 {-------------------------------------------------------------------------------
   Bridge
 -------------------------------------------------------------------------------}
diff --git a/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Examples.hs b/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Examples.hs
index 981536e699..44b263333c 100644
--- a/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Examples.hs
+++ b/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Examples.hs
@@ -30,8 +30,10 @@ import qualified Cardano.Chain.Byron.API as CC
 import qualified Cardano.Chain.Common as CC
 import qualified Cardano.Chain.Update.Validation.Interface as CC.UPI
 import qualified Cardano.Chain.UTxO as CC
+import qualified Cardano.Crypto.Hashing as Crypto
 import           Cardano.Ledger.BaseTypes (knownNonZeroBounded)
 import           Control.Monad.Except (runExcept)
+import           Data.Coerce
 import qualified Data.Map.Strict as Map
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.Byron.Crypto.DSIGN (SignKeyDSIGN (..))
@@ -215,11 +217,14 @@ exampleExtLedgerState = ExtLedgerState {
 exampleHeaderHash :: ByronHash
 exampleHeaderHash = blockHash exampleBlock
 
+exampleTxId :: Crypto.Hash (GenTx ByronBlock)
+exampleTxId = coerce CC.exampleTxId
+
 exampleGenTx :: GenTx ByronBlock
-exampleGenTx = ByronTx CC.exampleTxId (CC.annotateTxAux CC.exampleTxAux)
+exampleGenTx = ByronTx exampleGenTxId (CC.annotateTxAux CC.exampleTxAux)
 
 exampleGenTxId :: TxId (GenTx ByronBlock)
-exampleGenTxId = ByronTxId CC.exampleTxId
+exampleGenTxId = ByronGenTxId exampleTxId
 
 exampleUPIState :: CC.UPI.State
 exampleUPIState = CC.UPI.initialState ledgerConfig
diff --git a/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Generators.hs b/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Generators.hs
index 3bbd2123e1..2948aaf905 100644
--- a/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Generators.hs
+++ b/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Generators.hs
@@ -234,10 +234,10 @@ instance Arbitrary (GenTx ByronBlock) where
 
 instance Arbitrary (GenTxId ByronBlock) where
   arbitrary = oneof
-      [ ByronTxId             <$> hedgehog CC.genTxId
-      , ByronDlgId            <$> hedgehog genCertificateId
+      [ ByronTxId <$> hedgehog CC.genTxId
+      , ByronDlgId <$> hedgehog genCertificateId
       , ByronUpdateProposalId <$> hedgehog (UG.genUpId protocolMagicId)
-      , ByronUpdateVoteId     <$> hedgehog genUpdateVoteId
+      , ByronUpdateVoteId <$> hedgehog genUpdateVoteId
       ]
     where
       genCertificateId = CC.genAbstractHash (CC.genCertificate protocolMagicId)
diff --git a/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs
index f5726d67fb..1a641f5b95 100644
--- a/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs
+++ b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs
@@ -44,6 +44,8 @@ import           Ouroboros.Consensus.HardFork.Combinator.Serialisation
 import qualified Ouroboros.Consensus.HardFork.History as History
 import           Ouroboros.Consensus.HeaderValidation
 import           Ouroboros.Consensus.Ledger.Query
+import           Ouroboros.Consensus.Ledger.SupportsMempool
+                     (ConvertRawTxId (..))
 import           Ouroboros.Consensus.Node.NetworkProtocolVersion
 import           Ouroboros.Consensus.Node.Serialisation (Some (..))
 import           Ouroboros.Consensus.Protocol.TPraos (TPraos)
@@ -263,7 +265,11 @@ instance c ~ MockCryptoCompatByron
 instance c ~ MockCryptoCompatByron
       => Arbitrary (WithVersion (HardForkNodeToNodeVersion (CardanoEras c))
                                 (CardanoGenTxId c)) where
-  arbitrary = arbitraryNodeToNode GenTxIdByron GenTxIdShelley GenTxIdAllegra GenTxIdMary GenTxIdAlonzo GenTxIdBabbage GenTxIdConway
+  arbitrary = do
+    let fromByronGenTxId :: TxId (GenTx ByronBlock) -> CardanoGenTxId c
+        fromByronGenTxId = HardForkGenTxId . OneEraGenTxId . toRawTxIdHash
+    arbitraryNodeToNode fromByronGenTxId fromByronGenTxId fromByronGenTxId fromByronGenTxId fromByronGenTxId fromByronGenTxId fromByronGenTxId
+
 
 {-------------------------------------------------------------------------------
   NodeToClient
@@ -468,6 +474,14 @@ instance c ~ MockCryptoCompatByron
                                 (CardanoGenTx c)) where
   arbitrary = arbitraryNodeToClient GenTxByron GenTxShelley GenTxAllegra GenTxMary GenTxAlonzo GenTxBabbage GenTxConway
 
+instance c ~ MockCryptoCompatByron
+      => Arbitrary (WithVersion (HardForkNodeToClientVersion (CardanoEras c))
+                                (CardanoGenTxId c)) where
+  arbitrary = do
+    let fromByronGenTxId :: TxId (GenTx ByronBlock) -> CardanoGenTxId c
+        fromByronGenTxId = HardForkGenTxId . OneEraGenTxId . toRawTxIdHash
+    arbitraryNodeToClient fromByronGenTxId fromByronGenTxId fromByronGenTxId fromByronGenTxId fromByronGenTxId fromByronGenTxId fromByronGenTxId
+
 instance c ~ MockCryptoCompatByron
       => Arbitrary (WithVersion (HardForkNodeToClientVersion (CardanoEras c))
                                 (CardanoApplyTxErr c)) where
diff --git a/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs
index 6c6f044823..9c8a7c3ba1 100644
--- a/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs
+++ b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs
@@ -216,6 +216,9 @@ instance TranslateTxMeasure AlonzoMeasure ConwayMeasure where
 instance TranslateTxMeasure ConwayMeasure ConwayMeasure where
   translateTxMeasure = id
 
+instance HasBlessedGenTxIdEra (ShelleyBasedHardForkEras proto1 era1 proto2 era2) where
+  blessedGenTxIdEra = S $ Z mempty
+
 instance ShelleyBasedHardForkConstraints proto1 era1 proto2 era2
       => SerialiseHFC (ShelleyBasedHardForkEras proto1 era1 proto2 era2)
    -- use defaults
diff --git a/ouroboros-consensus-cardano/test/byron-test/Test/ThreadNet/Byron.hs b/ouroboros-consensus-cardano/test/byron-test/Test/ThreadNet/Byron.hs
index d2f0502662..1a66c9c3f4 100644
--- a/ouroboros-consensus-cardano/test/byron-test/Test/ThreadNet/Byron.hs
+++ b/ouroboros-consensus-cardano/test/byron-test/Test/ThreadNet/Byron.hs
@@ -1368,4 +1368,4 @@ dlgTx cert =
               reAnnotate byronProtVer (Delegation.aEpoch cert)
           , Delegation.annotation = ann
           }
-    in Byron.ByronDlg (Delegation.recoverCertificateId cert') cert'
+    in Byron.ByronDlg (Byron.ByronGenTxId $ coerce $ Delegation.recoverCertificateId cert') cert'
diff --git a/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/ByronCompatibility.hs b/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/ByronCompatibility.hs
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/Golden.hs b/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/Golden.hs
index b89e7708ea..fd7afb7c8f 100644
--- a/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/Golden.hs
+++ b/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/Golden.hs
@@ -27,6 +27,7 @@ instance CardanoHardForkConstraints c
   toGoldenDirectory v = case v of
     CardanoNodeToNodeVersion1 -> "CardanoNodeToNodeVersion1"
     CardanoNodeToNodeVersion2 -> "CardanoNodeToNodeVersion2"
+    CardanoNodeToNodeVersion3 -> "CardanoNodeToNodeVersion3"
     _                         -> error $ "Unknown version: " <> show v
 
 instance CardanoHardForkConstraints c
@@ -37,4 +38,5 @@ instance CardanoHardForkConstraints c
     CardanoNodeToClientVersion14 -> "CardanoNodeToClientVersion14"
     CardanoNodeToClientVersion15 -> "CardanoNodeToClientVersion15"
     CardanoNodeToClientVersion16 -> "CardanoNodeToClientVersion16"
+    CardanoNodeToClientVersion17 -> "CardanoNodeToClientVersion17"
     _                            -> error $ "Unknown version: " <> show blockVersion
diff --git a/ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/HardFork/Combinator.hs b/ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/HardFork/Combinator.hs
index 014d286490..e664d1fa65 100644
--- a/ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/HardFork/Combinator.hs
+++ b/ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/HardFork/Combinator.hs
@@ -396,6 +396,9 @@ instance HasHardForkTxOut '[BlockA, BlockB] where
 
 type TestBlock = HardForkBlock '[BlockA, BlockB]
 
+instance HasBlessedGenTxIdEra '[BlockA, BlockB] where
+  blessedGenTxIdEra = Z mempty
+
 instance CanHardFork '[BlockA, BlockB] where
   type HardForkTxMeasure '[BlockA, BlockB] = IgnoringOverflow ByteSize32
 
diff --git a/ouroboros-consensus/changelog.d/20241128_123146_fraser.murray_one_era_gen_tx_id_bytestring.md b/ouroboros-consensus/changelog.d/20241128_123146_fraser.murray_one_era_gen_tx_id_bytestring.md
new file mode 100644
index 0000000000..acb132b72c
--- /dev/null
+++ b/ouroboros-consensus/changelog.d/20241128_123146_fraser.murray_one_era_gen_tx_id_bytestring.md
@@ -0,0 +1,4 @@
+### Breaking
+
+- Change internal representation of `OneEraGenTxId xs` from `NS WrapGenTxId xs` to `ShortByteString`. This breaks backwards compatibility for serialisation of Byron-era `GenTxId`s, and introduces new hard-fork-specific node-to-client and node-to-node versions, `HardForkSpecificNodeToClientVersion4` and `HardForkSpecificNodeToNodeVersion2`. Currently-running networks which require the ability to submit Byron transactions should ensure that all nodes are upgraded simultaneously, or these nodes may be unable to communicate with one another.
+- Change internal representation of Byron-era `GenTxId`s from a sum of the different possible Byron IDs (transaction ID, certification delegation ID, etc.) to `Hash`. In order to determine the type of a Byron `GenTxId`, you'll now need to find the transaction that the ID refers to and check its type.
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/AcrossEras.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/AcrossEras.hs
index 6e5f55da74..65e2d7226d 100644
--- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/AcrossEras.hs
+++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/AcrossEras.hs
@@ -68,7 +68,6 @@ import qualified Data.ByteString.Base16 as B16
 import qualified Data.ByteString.Char8 as BSC
 import           Data.ByteString.Short (ShortByteString)
 import qualified Data.ByteString.Short as Short
-import           Data.Function (on)
 import           Data.Proxy
 import           Data.SOP.BasicFunctors
 import           Data.SOP.Constraint
@@ -124,7 +123,6 @@ newtype OneEraEnvelopeErr           xs = OneEraEnvelopeErr           { getOneEra
 newtype OneEraForgeStateInfo        xs = OneEraForgeStateInfo        { getOneEraForgeStateInfo        :: NS WrapForgeStateInfo        xs }
 newtype OneEraForgeStateUpdateError xs = OneEraForgeStateUpdateError { getOneEraForgeStateUpdateError :: NS WrapForgeStateUpdateError xs }
 newtype OneEraGenTx                 xs = OneEraGenTx                 { getOneEraGenTx                 :: NS GenTx                     xs }
-newtype OneEraGenTxId               xs = OneEraGenTxId               { getOneEraGenTxId               :: NS WrapGenTxId               xs }
 newtype OneEraHeader                xs = OneEraHeader                { getOneEraHeader                :: NS Header                    xs }
 newtype OneEraIsLeader              xs = OneEraIsLeader              { getOneEraIsLeader              :: NS WrapIsLeader              xs }
 newtype OneEraLedgerError           xs = OneEraLedgerError           { getOneEraLedgerError           :: NS WrapLedgerErr             xs }
@@ -160,21 +158,20 @@ instance Condense (OneEraHash xs) where
   condense = show
 
 {-------------------------------------------------------------------------------
-  OneEraGenTxId
+  GenTxId
 -------------------------------------------------------------------------------}
 
--- | This instance compares the underlying raw hash ('toRawTxIdHash') of the
--- 'TxId'.
+-- | The GenTxId for an era
 --
--- Note that this means that transactions in different eras can have equal
--- 'TxId's. This should only be the case when the transaction format is
--- backwards compatible from one era to the next.
-instance CanHardFork xs => Eq (OneEraGenTxId xs) where
-  (==) = (==) `on` oneEraGenTxIdRawHash
-
--- | See the corresponding 'Eq' instance.
-instance CanHardFork xs => Ord (OneEraGenTxId xs) where
-  compare = compare `on` oneEraGenTxIdRawHash
+-- This type is special in effectively the same way as OneEraHash (and for
+-- basically the same reason, too) -- it doesn't use an NS, because we don't
+-- want to be able to differentiate eras' 'GenTxId's. Ideally, 'OneEraGenTxId'
+-- would be serialised simply as a 'ShortByteString', but for backwards
+-- compatibility reasons we /pretend/ that it's always a Shelley-era 'GenTxId'
+-- when we're communicating with other nodes or clients that don't support the
+-- new serialisation format.
+newtype OneEraGenTxId xs = OneEraGenTxId { getOneEraGenTxId :: ShortByteString }
+  deriving (Show, Eq, Ord, Generic, NoThunks)
 
 {-------------------------------------------------------------------------------
   Value for two /different/ eras
@@ -265,12 +262,6 @@ getSameValue values =
         | otherwise
         = throwError "differing values across hard fork"
 
-oneEraGenTxIdRawHash :: CanHardFork xs => OneEraGenTxId xs -> ShortByteString
-oneEraGenTxIdRawHash =
-      hcollapse
-    . hcmap proxySingle (K . toRawTxIdHash . unwrapGenTxId)
-    . getOneEraGenTxId
-
 {-------------------------------------------------------------------------------
   NoThunks instances
 -------------------------------------------------------------------------------}
@@ -296,9 +287,6 @@ deriving via LiftNamedNS "OneEraEnvelopeErr" WrapEnvelopeErr xs
 deriving via LiftNamedNS "OneEraGenTx" GenTx xs
          instance CanHardFork xs => NoThunks (OneEraGenTx xs)
 
-deriving via LiftNamedNS "OneEraGenTxId" WrapGenTxId xs
-         instance CanHardFork xs => NoThunks (OneEraGenTxId xs)
-
 deriving via LiftNamedNS "OneEraHeader" Header xs
          instance CanHardFork xs => NoThunks (OneEraHeader xs)
 
@@ -364,6 +352,5 @@ deriving via LiftNS WrapApplyTxErr  xs instance CanHardFork xs => Show (OneEraAp
 deriving via LiftNS I               xs instance CanHardFork xs => Show (OneEraBlock       xs)
 deriving via LiftNS WrapCannotForge xs instance CanHardFork xs => Show (OneEraCannotForge xs)
 deriving via LiftNS GenTx           xs instance CanHardFork xs => Show (OneEraGenTx       xs)
-deriving via LiftNS WrapGenTxId     xs instance CanHardFork xs => Show (OneEraGenTxId     xs)
 deriving via LiftNS Header          xs instance CanHardFork xs => Show (OneEraHeader      xs)
 deriving via LiftNS WrapSelectView  xs instance CanHardFork xs => Show (OneEraSelectView  xs)
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Condense.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Condense.hs
index afed7eafb5..380125f06e 100644
--- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Condense.hs
+++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Condense.hs
@@ -57,7 +57,7 @@ instance All CondenseConstraints xs => Condense (GenTx (HardForkBlock xs)) where
   condense = defaultCondenseNS (Proxy @GenTx) . coerce
 
 instance All CondenseConstraints xs => Condense (TxId (GenTx (HardForkBlock xs))) where
-  condense = defaultCondenseNS (Proxy @WrapGenTxId) . coerce
+  condense (HardForkGenTxId (OneEraGenTxId txid)) = show txid
 
 {-------------------------------------------------------------------------------
   Forwarding
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Degenerate.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Degenerate.hs
index 289f92ee50..cda1520690 100644
--- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Degenerate.hs
+++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Degenerate.hs
@@ -29,7 +29,6 @@ module Ouroboros.Consensus.HardFork.Combinator.Degenerate (
   , LedgerState (DegenLedgerState)
   , OneEraTipInfo (DegenTipInfo)
   , TopLevelConfig (DegenTopLevelConfig)
-  , TxId (DegenGenTxId)
   ) where
 
 import           Data.SOP.Functors (Flip (..))
@@ -63,7 +62,6 @@ import           Ouroboros.Consensus.TypeFamilyWrappers
 {-# COMPLETE DegenBlockConfig              #-}
 {-# COMPLETE DegenCodecConfig              #-}
 {-# COMPLETE DegenGenTx                    #-}
-{-# COMPLETE DegenGenTxId                  #-}
 {-# COMPLETE DegenHeader                   #-}
 {-# COMPLETE DegenLedgerError              #-}
 {-# COMPLETE DegenLedgerState              #-}
@@ -96,14 +94,6 @@ pattern DegenGenTx x <- (project -> x)
   where
     DegenGenTx x = inject x
 
-pattern DegenGenTxId ::
-     forall b. NoHardForks b
-  => GenTxId b
-  -> GenTxId (HardForkBlock '[b])
-pattern DegenGenTxId x <- (project' (Proxy @(WrapGenTxId b)) -> x)
-  where
-    DegenGenTxId x = inject' (Proxy @(WrapGenTxId b)) x
-
 pattern DegenApplyTxErr ::
      forall b. NoHardForks b
   => ApplyTxErr b
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs
index 1074e8ad7b..b0c6d9cc41 100644
--- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs
+++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs
@@ -44,6 +44,8 @@ import           Ouroboros.Consensus.Ledger.Basics
 import           Ouroboros.Consensus.Ledger.Extended (ExtLedgerState (..))
 import           Ouroboros.Consensus.Ledger.Query
 import           Ouroboros.Consensus.Ledger.Tables.Utils
+import           Ouroboros.Consensus.Ledger.SupportsMempool
+                     (ConvertRawTxId (..))
 import           Ouroboros.Consensus.Storage.Serialisation
 import           Ouroboros.Consensus.TypeFamilyWrappers
 
@@ -197,7 +199,10 @@ instance Inject GenTx where
   inject = injectNS' (Proxy @GenTx) . forgetInjectionIndex
 
 instance Inject WrapGenTxId where
-  inject = injectNS' (Proxy @WrapGenTxId) . forgetInjectionIndex
+  inject ix w =
+    WrapGenTxId $ HardForkGenTxId $ OneEraGenTxId $
+    hcollapse $ hcmap proxySingle (K . toRawTxIdHash . unwrapGenTxId) $
+    injectNS (forgetInjectionIndex ix) w
 
 instance Inject WrapApplyTxErr where
   inject =
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Unary.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Unary.hs
index 772cd86fdb..f71c3478c5 100644
--- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Unary.hs
+++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Unary.hs
@@ -166,7 +166,6 @@ deriving via IsomorphicUnary NS Header                    instance Isomorphic He
 deriving via IsomorphicUnary NS I                         instance Isomorphic I
 deriving via IsomorphicUnary NS WrapCannotForge           instance Isomorphic WrapCannotForge
 deriving via IsomorphicUnary NS WrapForgeStateUpdateError instance Isomorphic WrapForgeStateUpdateError
-deriving via IsomorphicUnary NS WrapGenTxId               instance Isomorphic WrapGenTxId
 deriving via IsomorphicUnary NS WrapIsLeader              instance Isomorphic WrapIsLeader
 deriving via IsomorphicUnary NS WrapTipInfo               instance Isomorphic WrapTipInfo
 deriving via IsomorphicUnary NS WrapValidatedGenTx        instance Isomorphic WrapValidatedGenTx
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Mempool.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Mempool.hs
index 46eacc01d0..2555cadfc0 100644
--- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Mempool.hs
+++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Mempool.hs
@@ -488,9 +488,12 @@ instance Typeable xs => ShowProxy (TxId (GenTx (HardForkBlock xs))) where
 
 instance CanHardFork xs => HasTxId (GenTx (HardForkBlock xs)) where
   txId = HardForkGenTxId . OneEraGenTxId
-       . hcmap proxySingle (WrapGenTxId . txId)
+       . hcollapse . hcmap proxySingle (K . toRawTxIdHash . txId)
        . getOneEraGenTx . getHardForkGenTx
 
+instance CanHardFork xs => ConvertRawTxId (GenTx (HardForkBlock xs)) where
+  toRawTxIdHash (HardForkGenTxId (OneEraGenTxId txid)) = txid
+
 {-------------------------------------------------------------------------------
   HasTxs
 
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/NetworkVersion.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/NetworkVersion.hs
index 858fa5dcde..ef2e91ee59 100644
--- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/NetworkVersion.hs
+++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/NetworkVersion.hs
@@ -34,6 +34,8 @@ import           Ouroboros.Consensus.TypeFamilyWrappers
 -- protocols, e.g., the era tag.
 data HardForkSpecificNodeToNodeVersion =
     HardForkSpecificNodeToNodeVersion1
+    -- | Represent GenTxId as an era-agnostic ShortByteStrings
+  | HardForkSpecificNodeToNodeVersion2
   deriving (Eq, Ord, Show, Enum, Bounded)
 
 -- | Versioning of the specific additions made by the HFC to the @NodeToClient@
@@ -41,6 +43,8 @@ data HardForkSpecificNodeToNodeVersion =
 data HardForkSpecificNodeToClientVersion =
     -- | Include the Genesis window in 'EraParams'.
     HardForkSpecificNodeToClientVersion3
+    -- | Represent GenTxId as an era-agnostic ShortByteString
+  | HardForkSpecificNodeToClientVersion4
   deriving (Eq, Ord, Show, Enum, Bounded)
 
 data HardForkNodeToNodeVersion xs where
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation.hs
index 578f6001c4..011dbd6e51 100644
--- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation.hs
+++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation.hs
@@ -7,8 +7,9 @@ import           Ouroboros.Consensus.HardFork.Combinator.Serialisation.Common as
                      HardForkNodeToNodeVersion (..),
                      HardForkSpecificNodeToClientVersion (..),
                      HardForkSpecificNodeToNodeVersion (..),
-                     SerialiseConstraintsHFC, SerialiseHFC (..),
-                     isHardForkNodeToClientEnabled, isHardForkNodeToNodeEnabled)
+                     HasBlessedGenTxIdEra (..), SerialiseConstraintsHFC,
+                     SerialiseHFC (..), isHardForkNodeToClientEnabled,
+                     isHardForkNodeToNodeEnabled)
 import           Ouroboros.Consensus.HardFork.Combinator.Serialisation.SerialiseDisk as X ()
 import           Ouroboros.Consensus.HardFork.Combinator.Serialisation.SerialiseNodeToClient as X ()
 import           Ouroboros.Consensus.HardFork.Combinator.Serialisation.SerialiseNodeToNode as X ()
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/Common.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/Common.hs
index a0b10c5cc5..720476b2a5 100644
--- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/Common.hs
+++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/Common.hs
@@ -17,6 +17,7 @@
 module Ouroboros.Consensus.HardFork.Combinator.Serialisation.Common (
     -- * Conditions required by the HFC to support serialisation
     HardForkEncoderException (..)
+  , HasBlessedGenTxIdEra (..)
   , SerialiseConstraintsHFC
   , SerialiseHFC (..)
   , disabledEraException
@@ -129,6 +130,15 @@ notFirstEra = hcmap proxySingle aux
     aux :: forall f blk. SingleEraBlock blk => f blk -> SingleEraInfo blk
     aux _ = singleEraInfo (Proxy @blk)
 
+
+-- | 'HasBlessedGenTxIdEra' is used solely for backwards-compatibility reasons
+-- for when we're communicating with older node / client versions and need to
+-- serialise / deserialise era-tagged 'GenTxId's. The 'blessedGenTxIdEra' is
+-- used as the "default" era tag when we want to send a (non-era-tagged)
+-- 'GenTxId' to these nodes / clients.
+class HasBlessedGenTxIdEra (xs :: [Type]) where
+  blessedGenTxIdEra :: NS Proxy xs
+
 {-------------------------------------------------------------------------------
   Conditions required by the HFC to support serialisation
 -------------------------------------------------------------------------------}
@@ -169,6 +179,7 @@ pSHFC = Proxy
 --    This would then lead to problems with binary streaming, and we do not
 --    currently provide any provisions to resolve these.
 class ( CanHardFork xs
+      , HasBlessedGenTxIdEra xs
       , All SerialiseConstraintsHFC xs
         -- Required for HasNetworkProtocolVersion
       , All (Compose Show EraNodeToClientVersion) xs
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs
index f0744af20e..2b9bcd2db9 100644
--- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs
+++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs
@@ -44,12 +44,14 @@ import           Ouroboros.Consensus.HardFork.Combinator.Serialisation.Serialise
 import qualified Ouroboros.Consensus.HardFork.History as History
 import           Ouroboros.Consensus.Ledger.Query
 import           Ouroboros.Consensus.Ledger.SupportsMempool (GenTxId)
+import           Ouroboros.Consensus.Ledger.SupportsMempool (GenTxId, toRawTxIdHash)
 import           Ouroboros.Consensus.Node.NetworkProtocolVersion
 import           Ouroboros.Consensus.Node.Run
 import           Ouroboros.Consensus.Node.Serialisation
 import           Ouroboros.Consensus.Util ((.:))
 import           Ouroboros.Network.Block (Serialised, unwrapCBORinCBOR,
                      wrapCBORinCBOR)
+import           Data.ByteString.Short (ShortByteString)
 
 {-------------------------------------------------------------------------------
   Serialisation of products
@@ -328,8 +330,33 @@ instance SerialiseHFC xs
 
 instance SerialiseHFC xs
       => SerialiseNodeToClient (HardForkBlock xs) (GenTxId (HardForkBlock xs)) where
-  encodeNodeToClient = dispatchEncoder `after` (getOneEraGenTxId . getHardForkGenTxId)
-  decodeNodeToClient = fmap (HardForkGenTxId . OneEraGenTxId) .: dispatchDecoder
+  -- This instance can be massively simplified after we drop support for
+  -- 'NodeToClientVersion's earlier than 'NodeToClientV_19', since we no longer
+  -- need to handle the cases where 'ShortByteString's are serialised with
+  -- an era tag ('encodeNS').
+
+  encodeNodeToClient _cc v (HardForkGenTxId (OneEraGenTxId txid)) =
+    case v of
+      HardForkNodeToClientEnabled hfv _ | hfv >= HardForkSpecificNodeToClientVersion4 ->
+        Serialise.encode txid
+      HardForkNodeToClientEnabled _ _ -> do
+        let blessedGenTxId :: NS (K ShortByteString) xs
+            blessedGenTxId = hmap (pure $ K txid) blessedGenTxIdEra
+        encodeNS (hpure $ Fn $ K . Serialise.encode . unK) blessedGenTxId
+      HardForkNodeToClientDisabled _ ->
+        Serialise.encode txid
+  decodeNodeToClient _cc v =
+    fmap (HardForkGenTxId . OneEraGenTxId) $
+      case v of
+        HardForkNodeToClientEnabled hfc _
+          | hfc >= HardForkSpecificNodeToClientVersion4 -> do
+            Serialise.decode
+        HardForkNodeToClientEnabled _ _ -> do
+          let eraDecoders :: NP (Decoder s :.: K ShortByteString) xs
+              eraDecoders = hpure $ Comp $ K <$> Serialise.decode
+          hcollapse <$> decodeNS eraDecoders
+        HardForkNodeToClientDisabled _ ->
+          Serialise.decode
 
 instance SerialiseHFC xs
       => SerialiseNodeToClient (HardForkBlock xs) SlotNo where
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs
index edf78b0051..877a107a3f 100644
--- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs
+++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE KindSignatures #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE QuantifiedConstraints #-}
 {-# LANGUAGE RankNTypes #-}
@@ -17,6 +18,7 @@ import           Codec.CBOR.Decoding (Decoder)
 import           Codec.CBOR.Encoding (Encoding)
 import qualified Codec.Serialise as Serialise
 import           Control.Exception (throw)
+import           Data.ByteString.Short (ShortByteString)
 import           Data.Proxy
 import           Data.SOP.BasicFunctors
 import           Data.SOP.NonEmpty (ProofNonEmpty (..), isNonEmpty)
@@ -137,7 +139,32 @@ instance SerialiseHFC xs
   encodeNodeToNode = dispatchEncoder `after` (getOneEraGenTx . getHardForkGenTx)
   decodeNodeToNode = fmap (HardForkGenTx . OneEraGenTx) .: dispatchDecoder
 
+
 instance SerialiseHFC xs
       => SerialiseNodeToNode (HardForkBlock xs) (GenTxId (HardForkBlock xs)) where
-  encodeNodeToNode = dispatchEncoder `after` (getOneEraGenTxId . getHardForkGenTxId)
-  decodeNodeToNode = fmap (HardForkGenTxId . OneEraGenTxId) .: dispatchDecoder
+  -- This instance can be massively simplified after we drop support for
+  -- 'NodeToNodeVersion's earlier than 'NodeToNodeV_15', since we no longer
+  -- need to handle the cases where 'ShortByteString's are serialised with
+  -- an era tag ('encodeNS').
+
+  encodeNodeToNode _cc v (HardForkGenTxId (OneEraGenTxId txid)) = do
+    case v of
+      HardForkNodeToNodeEnabled hfv _ | hfv >= HardForkSpecificNodeToNodeVersion2 ->
+        Serialise.encode txid
+      HardForkNodeToNodeEnabled _ _ -> do
+        let blessedGenTxId :: NS (K ShortByteString) xs
+            blessedGenTxId = hmap (pure $ K txid) blessedGenTxIdEra
+        encodeNS (hpure $ Fn $ K . Serialise.encode . unK) blessedGenTxId
+      HardForkNodeToNodeDisabled _ ->
+        Serialise.encode txid
+  decodeNodeToNode _cc v =
+    fmap (HardForkGenTxId . OneEraGenTxId) $
+      case v of
+        HardForkNodeToNodeEnabled hfv _ | hfv >= HardForkSpecificNodeToNodeVersion2 ->
+          Serialise.decode
+        HardForkNodeToNodeEnabled _ _ -> do
+          let eraDecoders :: NP (Decoder s :.: K ShortByteString) xs
+              eraDecoders = hpure $ Comp $ K <$> Serialise.decode
+          hcollapse <$> decodeNS eraDecoders
+        HardForkNodeToNodeDisabled _ ->
+          Serialise.decode
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs
index 9ed29584a3..7ef85266b1 100644
--- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs
+++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs
@@ -28,3 +28,4 @@ nodeToClientVersionToQueryVersion x = case x of
   NodeToClientV_18 -> QueryVersion2
   NodeToClientV_19 -> QueryVersion2
   NodeToClientV_20 -> QueryVersion3
+  NodeToClientV_21 -> QueryVersion3
diff --git a/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/Serialisation/Roundtrip.hs b/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/Serialisation/Roundtrip.hs
index 109c4c3753..addca0473c 100644
--- a/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/Serialisation/Roundtrip.hs
+++ b/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/Serialisation/Roundtrip.hs
@@ -235,6 +235,7 @@ roundtrip_all
 
      , ArbitraryWithVersion (BlockNodeToClientVersion blk) blk
      , ArbitraryWithVersion (BlockNodeToClientVersion blk) (GenTx blk)
+     , ArbitraryWithVersion (BlockNodeToClientVersion blk) (GenTxId blk)
      , ArbitraryWithVersion (BlockNodeToClientVersion blk) (ApplyTxErr blk)
      , ArbitraryWithVersion (BlockNodeToClientVersion blk) (SomeBlockQuery (BlockQuery blk))
      , ArbitraryWithVersion (BlockNodeToClientVersion blk) (SomeResult blk)
@@ -286,6 +287,7 @@ roundtrip_all_skipping
 
      , ArbitraryWithVersion (BlockNodeToClientVersion blk) blk
      , ArbitraryWithVersion (BlockNodeToClientVersion blk) (GenTx blk)
+     , ArbitraryWithVersion (BlockNodeToClientVersion blk) (GenTxId blk)
      , ArbitraryWithVersion (BlockNodeToClientVersion blk) (ApplyTxErr blk)
      , ArbitraryWithVersion (BlockNodeToClientVersion blk) (SomeBlockQuery (BlockQuery blk))
      , ArbitraryWithVersion (BlockNodeToClientVersion blk) (SomeResult blk)
@@ -542,6 +544,7 @@ roundtrip_SerialiseNodeToClient
      ( SerialiseNodeToClientConstraints blk
      , ArbitraryWithVersion (BlockNodeToClientVersion blk) blk
      , ArbitraryWithVersion (BlockNodeToClientVersion blk) (GenTx blk)
+     , ArbitraryWithVersion (BlockNodeToClientVersion blk) (GenTxId blk)
      , ArbitraryWithVersion (BlockNodeToClientVersion blk) (ApplyTxErr blk)
      , ArbitraryWithVersion (BlockNodeToClientVersion blk) (SomeBlockQuery (BlockQuery blk))
      , ArbitraryWithVersion (BlockNodeToClientVersion blk) (SomeResult blk)
@@ -560,6 +563,7 @@ roundtrip_SerialiseNodeToClient
 roundtrip_SerialiseNodeToClient shouldCheckCBORvalidity ccfg =
     [ rt (Proxy @blk)                         "blk"
     , rt (Proxy @(GenTx blk))                 "GenTx"
+    , rt (Proxy @(GenTxId blk))               "GenTxId"
     , rt (Proxy @(ApplyTxErr blk))            "ApplyTxErr"
     , rt (Proxy @(SomeBlockQuery (BlockQuery blk))) "BlockQuery"
     -- Note: Ideally we'd just use 'rt' to test Ledger config, but that would