diff --git a/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Api.hs b/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Api.hs
index dc6477436c0..ee307e10249 100644
--- a/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Api.hs
+++ b/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Api.hs
@@ -30,7 +30,7 @@ import Prelude
 
 import Cardano.Wallet.Jormungandr.Binary
     ( Block
-    , MessageType (..)
+    , FragmentSpec (..)
     , getBlock
     , putSignedTx
     , runGet
@@ -181,7 +181,7 @@ instance MimeUnrender JormungandrBinary Block where
 
 instance MimeRender JormungandrBinary (Tx, [TxWitness]) where
     mimeRender _ (Tx _ ins outs, wits) =
-        runPut $ withHeader MsgTypeTransaction $ putSignedTx ins outs wits
+        runPut $ withHeader FragmentTransaction $ putSignedTx ins outs wits
 
 data Hex
 
diff --git a/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Api/Client.hs b/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Api/Client.hs
index ebec841475f..d38625490dd 100644
--- a/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Api/Client.hs
+++ b/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Api/Client.hs
@@ -56,7 +56,7 @@ import Cardano.Wallet.Jormungandr.Api
     , api
     )
 import Cardano.Wallet.Jormungandr.Binary
-    ( ConfigParam (..), Message (..), convertBlock )
+    ( ConfigParam (..), Fragment (..), convertBlock )
 import Cardano.Wallet.Jormungandr.Compatibility
     ( softTxMaxSize )
 import Cardano.Wallet.Network
diff --git a/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Binary.hs b/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Binary.hs
index a3f33c31e08..0e5be45e892 100644
--- a/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Binary.hs
+++ b/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Binary.hs
@@ -13,11 +13,11 @@
 -- License: Apache-2.0
 --
 -- The format is for the Shelley era as implemented by the Jörmungandr node.
--- It is described [here](https://github.com/input-output-hk/chain-libs/blob/master/chain-impl-mockchain/doc/format.md)
+-- It is described [here](https://github.com/input-output-hk/chain-libs/blob/master/chain-impl-mockchain/doc/format.abnf)
 --
 -- The module to some extent defines its own Jörmungandr-specific types,
 -- different from "Cardano.Wallet.Primitive.Types". Here, transactions are just
--- one of many possible 'Message's that can be included in a block.
+-- one of many possible 'Fragment' that can be included in a block.
 --
 -- In some cases it also leads us to /throw exceptions/ when integers would
 -- otherwise overflow (look for uses of 'toEnum').
@@ -28,13 +28,13 @@ module Cardano.Wallet.Jormungandr.Binary
     , ConfigParam (..)
     , ConsensusVersion (..)
     , LeaderId (..)
-    , Message (..)
-    , MessageType (..)
+    , Fragment (..)
+    , FragmentSpec (..)
     , Milli (..)
     , getBlock
     , getBlockHeader
     , getBlockId
-    , getMessage
+    , getFragment
     , getTransaction
     , putSignedTx
     , putTx
@@ -111,7 +111,6 @@ import Data.Binary.Get
     , getByteString
     , getLazyByteString
     , getWord16be
-    , getWord16le
     , getWord32be
     , getWord64be
     , getWord8
@@ -125,14 +124,7 @@ import Data.Binary.Get
     , skip
     )
 import Data.Binary.Put
-    ( Put
-    , putByteString
-    , putWord16be
-    , putWord16le
-    , putWord64be
-    , putWord8
-    , runPut
-    )
+    ( Put, putByteString, putWord16be, putWord64be, putWord8, runPut )
 import Data.Bits
     ( shift, (.&.) )
 import Data.ByteString
@@ -181,7 +173,7 @@ data BlockHeader = BlockHeader
 
 data Block = Block
     { header :: BlockHeader
-    , messages :: [Message]
+    , fragments :: [Fragment]
     } deriving (Eq, Show)
 
 getBlockHeader :: Get BlockHeader
@@ -195,7 +187,7 @@ getBlockHeader = label "getBlockHeader" $ do
         slotEpoch <- fromIntegral <$> getWord32be
         slotId <- toEnum . fromEnum <$> getWord32be
         chainLength <- getWord32be
-        contentHash <- Hash <$> getByteString 32 -- or 256 bits
+        contentHash <- Hash <$> getByteString 32
         parentHeaderHash <- Hash <$> getByteString 32
         let headerHash = Hash $ blake2b256 bytes
         -- Proof.
@@ -207,8 +199,7 @@ getBlockHeader = label "getBlockHeader" $ do
         -- We could make sure we get the right kind of proof, but we don't need
         -- to.  Just checking that the length is not totally wrong is much
         -- simpler and gives us sanity about the binary format being correct.
-        read' <- fromIntegral <$> bytesRead
-        let remaining = size - read'
+        remaining <- (size -) . fromIntegral <$> bytesRead
         producedBy <- case remaining of
             0 ->
                 -- no proof
@@ -235,9 +226,9 @@ getBlockHeader = label "getBlockHeader" $ do
 getBlock :: Get Block
 getBlock = label "getBlock" $ do
     header <- getBlockHeader
-    messages <- isolate (fromIntegral $ contentSize header)
-        (whileM (not <$> isEmpty) getMessage)
-    return $ Block{header,messages}
+    fragments <- isolate (fromIntegral $ contentSize header)
+        (whileM (not <$> isEmpty) getFragment)
+    return $ Block{header,fragments}
 
 -- | Extract a 'Block' id from a serialized 'Block'.
 getBlockId :: Get (Hash "BlockHeader")
@@ -247,29 +238,38 @@ getBlockId = lookAhead getBlock *> label "getBlockId" (do
     return $ Hash $ blake2b256 bytes)
 
 {-------------------------------------------------------------------------------
-                           Messages
+                           Fragments
 -------------------------------------------------------------------------------}
 
--- | The block-body consists of messages. There are several types of messages.
---
---  Following, as closely as possible:
--- https://github.com/input-output-hk/rust-cardano/blob/e0616f13bebd6b908320bddb1c1502dea0d3305a/chain-impl-mockchain/src/message/mod.rs#L22-L29
-data Message
+-- | The block-body consists of fragments. There are several types of fragments.
+data Fragment
     = Initial [ConfigParam]
     -- ^ Found in the genesis block.
     | Transaction (Tx, [TxWitness])
     -- ^ A standard signed transaction
     | StakeDelegation (PoolId, ChimericAccount, Tx, [TxWitness])
     -- ^ A signed transaction with stake pool delegation
-    | UnimplementedMessage Int
-    -- Messages not yet supported go there.
+    | UnimplementedFragment Word8
+    -- Fragments not yet supported go there.
     deriving (Eq, Show)
 
-data MessageType
-    = MsgTypeInitial
-    | MsgTypeLegacyUTxO
-    | MsgTypeTransaction
-    | MsgTypeDelegation
+data FragmentSpec
+    = FragmentInitial
+    | FragmentLegacyUTxO
+    | FragmentTransaction
+    | FragmentDelegation
+
+putFragmentSpec :: FragmentSpec -> Put
+putFragmentSpec spec = do
+    putWord8 0x00
+    putWord8 (fragmentSpec spec)
+  where
+    fragmentSpec :: FragmentSpec -> Word8
+    fragmentSpec = \case
+        FragmentInitial -> 0
+        FragmentLegacyUTxO -> 1
+        FragmentTransaction -> 2
+        FragmentDelegation -> 4
 
 data TxWitnessTag
     = TxWitnessLegacyUTxO
@@ -293,9 +293,9 @@ getTxWitnessTag = getWord8 >>= \case
     3 -> pure TxWitnessMultisig
     other -> fail $ "Invalid witness type: " ++ show other
 
--- | Decode a message (header + contents).
-getMessage :: Get Message
-getMessage = label "getMessage" $ do
+-- | Decode a fragment (header + contents).
+getFragment :: Get Fragment
+getFragment = label "getFragment" $ do
     size <- fromIntegral <$> getWord16be
 
     -- We lazily compute the fragment-id, using lookAHead, before calling the
@@ -305,18 +305,21 @@ getMessage = label "getMessage" $ do
     -- corresponds to the txId (a.k.a "tx hash").
     fragId <- Hash . blake2b256 . BL.toStrict
         <$> lookAhead (getLazyByteString $ fromIntegral size)
-    msgType <- fromIntegral <$> getWord16le
+
+    -- A null byte for later extension
+    _nullByte <- getWord8
+    fragSpec <- getWord8
     let remaining = size - 2
-    let unimpl = skip remaining >> return (UnimplementedMessage msgType)
-    let typeLabelStr = "fragmentType " ++ show msgType
+    let unimpl = skip remaining >> return (UnimplementedFragment fragSpec)
+    let typeLabelStr = "fragmentType " ++ show fragSpec
 
-    label typeLabelStr $ isolate remaining $ case msgType of
+    label typeLabelStr $ isolate remaining $ case fragSpec of
         0 -> Initial <$> getInitial
         1 -> Transaction <$> getLegacyTransaction fragId
         2 -> Transaction <$> getTransaction fragId
         3 -> unimpl -- OwnerStakeDelegation
-        4 -> maybe (UnimplementedMessage msgType) StakeDelegation <$>
-            lookAheadM (getStakeDelegation fragId)
+        4 -> maybe (UnimplementedFragment fragSpec) StakeDelegation
+            <$> lookAheadM (getStakeDelegation fragId)
         5 -> unimpl -- PoolRegistration
         6 -> unimpl -- PoolRetirement
         7 -> unimpl -- PoolUpdate
@@ -324,14 +327,7 @@ getMessage = label "getMessage" $ do
         9 -> unimpl -- UpdateVote
         other -> fail $ "Unexpected content type tag " ++ show other
 
-messageTypeTag :: MessageType -> Word16
-messageTypeTag = \case
-    MsgTypeInitial -> 0
-    MsgTypeLegacyUTxO -> 1
-    MsgTypeTransaction -> 2
-    MsgTypeDelegation -> 4
-
--- | Decode the contents of a @Initial@-message.
+-- | Decode the contents of a @Initial@-fragment.
 getInitial :: Get [ConfigParam]
 getInitial = label "getInitial" $ do
     len <- fromIntegral <$> getWord16be
@@ -341,6 +337,10 @@ getInitial = label "getInitial" $ do
                                 Transactions
 -------------------------------------------------------------------------------}
 
+data AccountType
+    = SingleAccount
+    | MultiAccount
+
 txWitnessSize :: TxWitnessTag -> Int
 txWitnessSize = \case
     TxWitnessLegacyUTxO -> 128
@@ -375,7 +375,7 @@ stakeDelegationTypeTag = \case
     DlgFull -> 1
     DlgRatio -> 2
 
--- | Decode the contents of a @Transaction@-message carrying a delegation cert.
+-- | Decode the contents of a @Transaction@-fragment carrying a delegation cert.
 --
 -- Returns 'Nothing' for unsupported stake delegation types: DLG-NONE & DLG-RATIO
 getStakeDelegation
@@ -396,7 +396,7 @@ getStakeDelegation tid = do
     getStakeDelegationFull accId = Just <$> do
         poolId <- getByteString 32
         (tx, wits) <- getGenericTransaction tid
-        _accSignature <- getByteString 64
+        _accSignature <- getByteString 65
         pure (PoolId poolId, ChimericAccount accId, tx, wits )
 
     getStakeDelegationRatio =
@@ -419,12 +419,25 @@ putStakeDelegationTx
     -> [TxOut]
     -> [TxWitness]
     -> Put
-putStakeDelegationTx poolId accId (Hash accSig) inputs outputs witnesses = do
+putStakeDelegationTx poolId accId accSig inputs outputs witnesses = do
     putStakeCertificate poolId accId
     putSignedTx inputs outputs witnesses
+    putAccountSignature SingleAccount accSig
+
+putAccountSignature
+    :: AccountType
+    -> Hash "AccountSignature"
+    -> Put
+putAccountSignature tag (Hash accSig) = do
+    putWord8 (accountType tag)
     putByteString accSig
+  where
+    accountType :: AccountType -> Word8
+    accountType = \case
+        SingleAccount -> 0x01
+        MultiAccount  -> 0x02
 
--- | Decode the contents of a @Transaction@-message.
+-- | Decode the contents of a @Transaction@-fragment.
 getTransaction :: Hash "Tx" -> Get (Tx, [TxWitness])
 getTransaction = label "getTransaction" . getGenericTransaction
 
@@ -681,17 +694,23 @@ putAddress (Address bs) = putByteString bs
                               Helpers
 -------------------------------------------------------------------------------}
 
--- | Add a corresponding header to a message. Every message is encoded as:
---
---     HEADER(MESSAGE) | MESSAGE
---
--- where `HEADER` is:
---
---     SIZE (2 bytes) | TYPE (1 byte)
+-- | Add a corresponding header to a fragment. Every fragment is encoded as:
 --
-withHeader :: MessageType -> Put -> Put
-withHeader typ content = do
-    let bs = BL.toStrict $ runPut (putWord16le (messageTypeTag typ) *> content)
+-- FRAGMENT         = FRAGMENT-SIZE %x00 FRAGMENT-SPEC
+-- FRAGMENT-SIZE    = SIZE-BYTES-16BIT
+-- FRAGMENT-SPEC    = %x00 INITIAL
+--                  / %x01 OLD-UTXO-DECL
+--                  / %x02 SIMPLE-TRANSACTION
+--                  / %x03 OWNER-STAKE-DELEGATION
+--                  / %x04 STAKE-DELEGATION
+--                  / %x05 POOL-REGISTRATION
+--                  / %x06 POOL-RETIREMENT
+--                  / %x07 POOL-UPDATE
+--                  / %x08 UPDATE-PROPOSAL
+--                  / %x09 UPDATE-VOTE
+withHeader :: FragmentSpec -> Put -> Put
+withHeader spec content = do
+    let bs = BL.toStrict $ runPut (putFragmentSpec spec *> content)
     putWord16be (toEnum $ BS.length bs)
     putByteString bs
 
@@ -706,7 +725,7 @@ estimateMaxNumberOfInputsParams
     :: EstimateMaxNumberOfInputsParams t
 estimateMaxNumberOfInputsParams = EstimateMaxNumberOfInputsParams
     { estMeasureTx = \ins outs wits -> fromIntegral $ BL.length $
-        runPut $ withHeader MsgTypeTransaction $
+        runPut $ withHeader FragmentTransaction $
             putSignedTx (map (, Coin 0) ins) outs wits
 
     -- Block IDs are always this long.
@@ -727,7 +746,7 @@ fragmentId
     -> Hash "Tx"
 fragmentId inps outs wits =
     Hash $ blake2b256 $ BL.toStrict $ runPut $ do
-        putWord16le (messageTypeTag MsgTypeTransaction)
+        putFragmentSpec FragmentTransaction
         putSignedTx inps outs wits
 
 delegationFragmentId
@@ -740,7 +759,7 @@ delegationFragmentId
     -> Hash "Tx"
 delegationFragmentId poolId accId accSig inps outs wits =
     Hash $ blake2b256 $ BL.toStrict $ runPut $ do
-        putWord16le (messageTypeTag MsgTypeDelegation)
+        putFragmentSpec FragmentDelegation
         putStakeDelegationTx poolId accId accSig inps outs wits
 
 -- | See 'fragmentId'. This computes the signing data required for producing
@@ -760,13 +779,13 @@ signData inps outs =
 -- | Convert the Jörmungandr binary format block into a simpler Wallet block.
 convertBlock :: Block -> W.Block
 convertBlock (Block h msgs) =
-    W.Block (convertBlockHeader h) coerceMessages
+    W.Block (convertBlockHeader h) coerceFragments
   where
-    coerceMessages = msgs >>= \case
+    coerceFragments = msgs >>= \case
         Initial _ -> []
         Transaction (tx, _wits) -> return tx
         StakeDelegation (_poolId, _xpub, tx, _wits) -> return tx
-        UnimplementedMessage _ -> []
+        UnimplementedFragment _ -> []
 
 -- | Convert the Jörmungandr binary format header into a simpler Wallet header.
 convertBlockHeader :: BlockHeader -> W.BlockHeader
diff --git a/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Transaction.hs b/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Transaction.hs
index 899513df881..8770890edb7 100644
--- a/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Transaction.hs
+++ b/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Transaction.hs
@@ -18,9 +18,9 @@ module Cardano.Wallet.Jormungandr.Transaction
 import Prelude
 
 import Cardano.Wallet.Jormungandr.Binary
-    ( Message (..)
+    ( Fragment (..)
     , fragmentId
-    , getMessage
+    , getFragment
     , legacyUtxoWitness
     , maxNumberOfInputs
     , maxNumberOfOutputs
@@ -98,7 +98,7 @@ newTransactionLayer (Hash block0H) = TransactionLayer
     , decodeSignedTx = \payload -> do
         let errInvalidPayload =
                 ErrDecodeSignedTxWrongPayload "wrongly constructed binary blob"
-        case runGetOrFail getMessage (BL.fromStrict payload) of
+        case runGetOrFail getFragment (BL.fromStrict payload) of
             Left _ -> Left errInvalidPayload
             Right (_,_,msg) -> case msg of
                 Transaction stx -> pure stx
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-1.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-1.bin
index aca8709d0bc..3e8d00cc71f 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-1.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-1.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-10.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-10.bin
index 1de5dae7e74..cb3584c6693 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-10.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-10.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-11.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-11.bin
index ccf9d30b3ce..14b3a1ffe06 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-11.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-11.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-12.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-12.bin
index 33e114d9c98..9863863a12b 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-12.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-12.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-13.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-13.bin
index 9ce2b53fb1a..630a5a0d0b1 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-13.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-13.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-14.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-14.bin
index 38bce47c166..7e4aa0d754f 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-14.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-14.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-15.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-15.bin
index f65c0c70be8..27216a73366 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-15.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-15.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-16.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-16.bin
index e2df3ac959d..3bc65d8bbb9 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-16.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-16.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-17.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-17.bin
index 352df056deb..249e87e4792 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-17.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-17.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-18.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-18.bin
index e3531a1479c..16172e1abca 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-18.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-18.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-19.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-19.bin
index 26d76644936..06a368e6f4f 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-19.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-19.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-2.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-2.bin
index fab12488a39..f037af659da 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-2.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-2.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-20.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-20.bin
index 9ae7d57200e..935df890b89 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-20.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-20.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-21.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-21.bin
index 2e82f6d534d..304dbd7dad1 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-21.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-21.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-22.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-22.bin
index 14b165ab119..82179e4c6a1 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-22.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-22.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-23.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-23.bin
index e1ddc3752d0..b327f251ec4 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-23.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-23.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-24.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-24.bin
index 9e1c2b555a4..579545802b6 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-24.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-24.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-25.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-25.bin
index 30f29af8a98..3c7ee2df68f 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-25.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-25.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-26.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-26.bin
index 95b535c1f35..fd9f5bdb129 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-26.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-26.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-27.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-27.bin
index de578c8de89..d2827ccdaec 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-27.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-27.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-28.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-28.bin
index 7bae0ef33da..b190d993210 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-28.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-28.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-29.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-29.bin
index 911363fd5d2..2c9889860ea 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-29.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-29.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-3.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-3.bin
index 28a2c829774..ae3a32a4485 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-3.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-3.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-30.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-30.bin
index bbb2237aca8..10e6efb097e 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-30.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-30.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-31.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-31.bin
index c6483799e98..62cc5182078 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-31.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-31.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-32.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-32.bin
index 67f6cdb0468..dc0246c8d11 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-32.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-32.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-33.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-33.bin
index f9cbbe47575..d9cafcd6e21 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-33.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-33.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-34.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-34.bin
index 0206c3a3555..b8de6c519b2 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-34.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-34.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-35.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-35.bin
index 50f489f08e8..85eda24f1ed 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-35.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-35.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-36.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-36.bin
index 89e0d9fb542..71808c51e18 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-36.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-36.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-37.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-37.bin
index 2d5e0ac0a4c..daf00c53ebf 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-37.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-37.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-38.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-38.bin
index 19eabbca5b9..a84a029aed2 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-38.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-38.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-39.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-39.bin
index 6bf441b2cf3..e4bb6ee0599 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-39.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-39.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-4.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-4.bin
index a4bbc1576fc..075d4b98d65 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-4.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-4.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-40.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-40.bin
index dab3d722476..253eb9fbe66 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-40.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-40.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-41.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-41.bin
index e2de0bf746e..ebd4dc25a9d 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-41.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-41.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-42.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-42.bin
index 207b636e843..a52b4b79d96 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-42.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-42.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-43.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-43.bin
index 0655d4ae4cd..dceb13cf0fd 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-43.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-43.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-44.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-44.bin
index 3e45016f849..ebcf9022915 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-44.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-44.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-45.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-45.bin
index 83aa6f40d8c..735c3f1116a 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-45.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-45.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-46.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-46.bin
index e84272855d4..4e9362d0db1 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-46.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-46.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-47.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-47.bin
index b27dcdaae40..b39c54978f9 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-47.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-47.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-48.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-48.bin
index e1b9e0530dc..f441bf8108c 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-48.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-48.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-49.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-49.bin
index 06a3ea219e8..e434f3c30a8 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-49.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-49.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-5.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-5.bin
index 698d259cb5e..a064a5b43f7 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-5.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-5.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-50.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-50.bin
index 4a2845b2523..b63f3111cc2 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-50.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-50.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-51.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-51.bin
index 35a8be90184..ed0cc58573c 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-51.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-51.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-52.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-52.bin
index b0362c2facd..f5bb3bd3803 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-52.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-52.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-53.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-53.bin
index 0986c62c9e9..fa4161441e5 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-53.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-53.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-54.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-54.bin
index 976f0e82def..368c89c0090 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-54.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-54.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-55.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-55.bin
index e0e0c7a3d67..c4edb129e8a 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-55.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-55.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-56.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-56.bin
index 73bd5907f7d..ec39f85d416 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-56.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-56.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-57.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-57.bin
index 4d548fbd77a..c1a1c9b8bdd 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-57.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-57.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-58.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-58.bin
index b79c1df8151..a91b9651444 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-58.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-58.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-59.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-59.bin
index 5085db1d015..30272c05b6d 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-59.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-59.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-6.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-6.bin
index c65e5d75cc5..b33e75b50cc 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-6.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-6.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-60.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-60.bin
index dc0febb93e3..007633f5687 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-60.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-60.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-61.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-61.bin
index 24363ac058f..468e76ae8d4 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-61.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-61.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-62.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-62.bin
index b5c15423088..f07255b1fa1 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-62.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-62.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-63.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-63.bin
index 247bf2fad9f..b026d24d5fc 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-63.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-63.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-64.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-64.bin
index 17e1c23e93c..dbae2df0d13 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-64.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-64.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-65.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-65.bin
index a0241c549b7..5f266c47708 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-65.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-65.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-66.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-66.bin
index e87f1821078..675554e80dc 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-66.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-66.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-67.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-67.bin
index c5675702610..01a27bdf193 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-67.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-67.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-68.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-68.bin
index b2b748294b7..b981abea234 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-68.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-68.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-69.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-69.bin
index 9d2e906f438..ba981a9bc9d 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-69.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-69.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-7.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-7.bin
index 5b6eca40319..a490e69bd5a 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-7.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-7.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-70.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-70.bin
index e67c5263439..bacda433fd1 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-70.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-70.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-71.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-71.bin
index 787e2b0141d..e3ad74999de 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-71.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-71.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-72.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-72.bin
index 6582c38123c..a1ef5c174c4 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-72.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-72.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-73.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-73.bin
index 122df37a315..dd9a1bb58b5 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-73.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-73.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-74.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-74.bin
index c0473a9cbf1..0b6ef61aa43 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-74.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-74.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-75.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-75.bin
index d4ecd680319..bd7c833007e 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-75.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-75.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-76.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-76.bin
index db26175e65f..a77667c0d5e 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-76.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-76.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-77.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-77.bin
index e259df33ed6..0b6693e228c 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-77.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-77.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-78.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-78.bin
index 84fee282842..dcdc7a97964 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-78.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-78.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-79.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-79.bin
index a8e67696275..5bd1f53ec44 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-79.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-79.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-8.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-8.bin
index 5ea00651856..9f771cab335 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-8.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-8.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-80.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-80.bin
index 9157e0dc689..84bbcadbf7d 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-80.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-80.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-81.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-81.bin
index 3197cd79531..9140dcd6c13 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-81.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-81.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-82.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-82.bin
index f68a6613d0c..f4c084cec1f 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-82.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-82.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-83.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-83.bin
index 1d03644d33d..f81aaa1ffa9 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-83.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-83.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-84.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-84.bin
index eeef2ab4053..c56defce5e2 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-84.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-84.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-85.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-85.bin
index 3ccd734aa26..02dbbc00c20 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-85.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-85.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-86.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-86.bin
index 87282eca6b9..1b74eb34b94 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-86.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-86.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-87.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-87.bin
index 0dc52398b39..7452f5fb58c 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-87.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-87.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-88.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-88.bin
index ab1418ef23e..d6c5f7ee1d8 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-88.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-88.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-89.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-89.bin
index e5406ecd4d2..37a5c0ddcd9 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-89.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-89.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-9.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-9.bin
index 706abeade61..9f5df95b477 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-9.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-9.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-90.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-90.bin
index 465e9ea0387..f1eb32fa7fd 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-90.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-90.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-91.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-91.bin
index 498c9fd9e0f..6e568878272 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-91.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-91.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-92.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-92.bin
index c9d2da665ea..f817c7ee175 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-92.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-92.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-93.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-93.bin
index d6828f3dd8f..b016239b062 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-93.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-93.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-94.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-94.bin
index 91f526623d2..2d7fa51f3ed 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-94.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-94.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-95.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-95.bin
index 87cc9be6566..b4e2b4c0e68 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-95.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-95.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-96.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-96.bin
index 7f5931b7fcb..6a2f18081ba 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-96.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-96.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-97.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-97.bin
index f130e441eeb..2d6efb8dffd 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-97.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-97.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-98.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-98.bin
index a98374207b3..05b78a8f5b9 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-98.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-98.bin differ
diff --git a/lib/jormungandr/test/data/block0s/arbitrary-block0-99.bin b/lib/jormungandr/test/data/block0s/arbitrary-block0-99.bin
index df72b3538e9..f9a49e957c2 100644
Binary files a/lib/jormungandr/test/data/block0s/arbitrary-block0-99.bin and b/lib/jormungandr/test/data/block0s/arbitrary-block0-99.bin differ
diff --git a/lib/jormungandr/test/data/jormungandr/block0.bin b/lib/jormungandr/test/data/jormungandr/block0.bin
index 3aaf29dced1..7f49e8b3269 100644
Binary files a/lib/jormungandr/test/data/jormungandr/block0.bin and b/lib/jormungandr/test/data/jormungandr/block0.bin differ
diff --git a/lib/jormungandr/test/data/jormungandr/funds/regenerate.sh b/lib/jormungandr/test/data/jormungandr/funds/regenerate.sh
index c4daf5b8a87..37fee39e351 100755
--- a/lib/jormungandr/test/data/jormungandr/funds/regenerate.sh
+++ b/lib/jormungandr/test/data/jormungandr/funds/regenerate.sh
@@ -6,7 +6,7 @@ set -euo pipefail
 # First argument is the index for the account. (e.g. "1")
 # Second argument is the folder-name for the stake-pool (e.g. "a")
 delegate () {
-  jcli certificate new stake-delegation $(cat ../stake_pools/$2/pool_id) $(cat account$1.pub) > stake_delegation$1.cert
+  jcli certificate new stake-delegation $(cat account$1.pub) $(cat ../stake_pools/$2/stake_pool.id) > stake_delegation$1.cert
   cat stake_delegation$1.cert | jcli certificate sign -k account$1.prv > stake_delegation$1.signedcert
 }
 
diff --git a/lib/jormungandr/test/data/jormungandr/funds/stake_delegation1.cert b/lib/jormungandr/test/data/jormungandr/funds/stake_delegation1.cert
index cc20948bf45..9a2e64a84a7 100644
--- a/lib/jormungandr/test/data/jormungandr/funds/stake_delegation1.cert
+++ b/lib/jormungandr/test/data/jormungandr/funds/stake_delegation1.cert
@@ -1 +1 @@
-cert1qxkalz75s4vtw2e9wsy2q9jvsu3qtz6d2vm3xj4e5q4ufejpjjfn5q2wlgecssyxf683fx6z0kaj9hrwgnlld5u4q4npmpjfjx2dwvuswqyxhn7l
+cert1qxkalz75s4vtw2e9wsy2q9jvsu3qtz6d2vm3xj4e5q4ufejpjjfn5q20345x5qkxucjmtfvue83rfuewt4efsuqjl8p9exntvrw6mcvh6y2k8z3n
diff --git a/lib/jormungandr/test/data/jormungandr/funds/stake_delegation1.signedcert b/lib/jormungandr/test/data/jormungandr/funds/stake_delegation1.signedcert
index f1f6a0dde7d..45648255c15 100644
--- a/lib/jormungandr/test/data/jormungandr/funds/stake_delegation1.signedcert
+++ b/lib/jormungandr/test/data/jormungandr/funds/stake_delegation1.signedcert
@@ -1 +1 @@
-signedcert1qxkalz75s4vtw2e9wsy2q9jvsu3qtz6d2vm3xj4e5q4ufejpjjfn5q2wlgecssyxf683fx6z0kaj9hrwgnlld5u4q4npmpjfjx2dwvuswqsyfxf3ufe2me8jr3z70xcw930ewarlmz0ah67m6suzz9u524uucy2le5q26ukspl7k4gdlzyt3ldqzcv6gvcsmappmmpsx74639lgqg2a9kx
+signedcert1qxkalz75s4vtw2e9wsy2q9jvsu3qtz6d2vm3xj4e5q4ufejpjjfn5q20345x5qkxucjmtfvue83rfuewt4efsuqjl8p9exntvrw6mcvh6yqatymz6yv900jggz8f87j2rg7pdue9y7erxpehsy9v0yaz4mrfga4ezyhkqhtp02ju727e2cuhyuwknjps0hpc9py0ggdyy2shwfldquxhncdr
diff --git a/lib/jormungandr/test/data/jormungandr/funds/stake_delegation2.cert b/lib/jormungandr/test/data/jormungandr/funds/stake_delegation2.cert
index 4f8a4751b7f..522a4b2d643 100644
--- a/lib/jormungandr/test/data/jormungandr/funds/stake_delegation2.cert
+++ b/lib/jormungandr/test/data/jormungandr/funds/stake_delegation2.cert
@@ -1 +1 @@
-cert1q8qtmpgefmhlwrwlm48kxq43hpkxnvz8fey2jlmce5lea3mxnskfqq264syfguy58qc5aswgkp5hsg8u9ma2ey28dz6nu4xk3v9uu9af4qkhvkvg
+cert1q8qtmpgefmhlwrwlm48kxq43hpkxnvz8fey2jlmce5lea3mxnskfqqtne4rxffevd6wq9xczegz26egezseafg44zs8m7gluwh4thp8a4czqc73k
diff --git a/lib/jormungandr/test/data/jormungandr/funds/stake_delegation2.signedcert b/lib/jormungandr/test/data/jormungandr/funds/stake_delegation2.signedcert
index 886bb047848..a8dda6023fe 100644
--- a/lib/jormungandr/test/data/jormungandr/funds/stake_delegation2.signedcert
+++ b/lib/jormungandr/test/data/jormungandr/funds/stake_delegation2.signedcert
@@ -1 +1 @@
-signedcert1q8qtmpgefmhlwrwlm48kxq43hpkxnvz8fey2jlmce5lea3mxnskfqq264syfguy58qc5aswgkp5hsg8u9ma2ey28dz6nu4xk3v9uu9af4rmltr2l3fcuvvcncxcd8pkujg55zdm9vvkpd7v68fsk700346rkd0cew62txal4zzm082gf22t652dqeyxvxr8gve9kt30fvpg5yjgpwe6ppl
+signedcert1q8qtmpgefmhlwrwlm48kxq43hpkxnvz8fey2jlmce5lea3mxnskfqqtne4rxffevd6wq9xczegz26egezseafg44zs8m7gluwh4thp8a4cq3ljlvewvpyqkg3u3hvrrrkqekatwenwgh0d52x7d333gc4str9pnr5fn7yjegcj87dkzpe7nunnucgknyc87e73d64lmh47azmzqhpvknapz9
diff --git a/lib/jormungandr/test/data/jormungandr/funds/stake_delegation3.cert b/lib/jormungandr/test/data/jormungandr/funds/stake_delegation3.cert
index dbe04b7f6eb..41e7f0dc13a 100644
--- a/lib/jormungandr/test/data/jormungandr/funds/stake_delegation3.cert
+++ b/lib/jormungandr/test/data/jormungandr/funds/stake_delegation3.cert
@@ -1 +1 @@
-cert1qxzn99jx8a2rw80gp9uea47tmcndv7gm28vy9as6akevy32204aqwq2ulwml0mqq2pyel0gu09g4y9k9443kh973j39aaznahx886yngqvp3ahwf
+cert1qxzn99jx8a2rw80gp9uea47tmcndv7gm28vy9as6akevy32204aqwq2hdzqhcr3fhra2twme69s3l6hw7d43dlf2qa36sc7f9v6jzc5ygud3qtac
diff --git a/lib/jormungandr/test/data/jormungandr/funds/stake_delegation3.signedcert b/lib/jormungandr/test/data/jormungandr/funds/stake_delegation3.signedcert
index d22c007d0fb..9a9b8d05bd6 100644
--- a/lib/jormungandr/test/data/jormungandr/funds/stake_delegation3.signedcert
+++ b/lib/jormungandr/test/data/jormungandr/funds/stake_delegation3.signedcert
@@ -1 +1 @@
-signedcert1qxzn99jx8a2rw80gp9uea47tmcndv7gm28vy9as6akevy32204aqwq2ulwml0mqq2pyel0gu09g4y9k9443kh973j39aaznahx886yngqwgl2dse22c2n494hxlfzkw8v4rtxuj43unq04u7r848v28axlge63zlr4wpuwq080y3htyxxcx6dujzz84m7tupkhxrpcu0t9x67cq0x6dn8y
+signedcert1qxzn99jx8a2rw80gp9uea47tmcndv7gm28vy9as6akevy32204aqwq2hdzqhcr3fhra2twme69s3l6hw7d43dlf2qa36sc7f9v6jzc5yguqhp6p79m5xjp0u9j35dlpfutvvrcsv03tgfnzcqhsmgjwhqxkmd0ggmw84qjsctxu2pzg5fh55n492ue5mrsec7vmk04vyf0ly367dqgzj6m3e
diff --git a/lib/jormungandr/test/data/jormungandr/genesis.yaml b/lib/jormungandr/test/data/jormungandr/genesis.yaml
index 58770dc45f0..ed2ca5d339e 100644
--- a/lib/jormungandr/test/data/jormungandr/genesis.yaml
+++ b/lib/jormungandr/test/data/jormungandr/genesis.yaml
@@ -6098,29 +6098,29 @@ initial:
   # (The faucet-addresses above don't delegate.)
   - fund:
       # account1
-      # $ jcli address account (cat funds/account1.pub) --testing
-      - address: ca1skkalz75s4vtw2e9wsy2q9jvsu3qtz6d2vm3xj4e5q4ufejpjjfn5lh35yr
+      # $ jcli address account $(cat funds/account1.pub) --testing --prefix "account"
+      - address: account1skkalz75s4vtw2e9wsy2q9jvsu3qtz6d2vm3xj4e5q4ufejpjjfn5wlnrsk
         value: 1
       # account2
-      # $ jcli address account (cat funds/account2.pub) --testing
-      - address: ca1shqtmpgefmhlwrwlm48kxq43hpkxnvz8fey2jlmce5lea3mxnskfqr99fz4
+      # $ jcli address account $(cat funds/account2.pub) --testing --prefix "account"
+      - address: account1shqtmpgefmhlwrwlm48kxq43hpkxnvz8fey2jlmce5lea3mxnskfqjd87kq
         value: 1
       # account3
-      # $ jcli address account (cat funds/account3.pub) --testing
-      - address: ca1skzn99jx8a2rw80gp9uea47tmcndv7gm28vy9as6akevy32204aqwzpsctx
+      # $ jcli address account $(cat funds/account3.pub) --testing --prefix "account"
+      - address: account1skzn99jx8a2rw80gp9uea47tmcndv7gm28vy9as6akevy32204aqwnfj0ln
         value: 1
 
   # Stake pool registration certificates
-  # $ cat stake_pools/{a,b,c}/stake_pool_signed.cert
-  - cert: signedcert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqsqqf2kafzla95d8k2h7kk3870r5hlq76tmp539a02esh9x6jsxk7fhuqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqu3ed0wgwnzwff5hzmy3jtalnzhtnp8z4ee8ps6p8tafarwky06ln5djzklrfj288ngcah69frvqg9kz5wpjyx6qg08zvs0xce4vja8qqqgqqz070rdj0uf7gumvu9jkgz35e9rjejl9ktfrwrvut9tyhcfqpdfg53tmp9y95xw0fp5ejkjac3hyawr9mkpv0hk62nzt33wfh6d5u5s9qayyg7
-  - cert: signedcert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqsqqf2kafzla95d8k2h7kk3870r5hlq76tmp539a02esh9x6jsxk7fhuqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqpkpuhrghy89ppkeyvgvf6u2kn6wp2dmvwpa6tnddtdv0fy9hfme39ayqhwr76399cec9vmfqu4jpmlk52lt5xakhp8r9trauzwuzg2uqqqgqqpf7kwyfrqtzxwx06nnd2yd5m7g5pzuy98f3zqxvahcefx5kcm9a9fdp356vdttsz35nnfjanryagtyx2y06nr0snrznpqw2f60aaxcgmqmxek
-  - cert: signedcert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqsqqf2kafzla95d8k2h7kk3870r5hlq76tmp539a02esh9x6jsxk7fhuqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqp4rqy9u7fs5e8u77q42a0uuju962jans7ad7y5qn8k2cq9p6ay63gp0lxeydu3pmfw62lacxfn0qdyaam297qgeze03ues7elm7ju5xsqqgqqrz0xqrjl9cp3uqvl8a3s7jfsfkq623zfnc88wlsyz7yw8z53j4fe8nu6q97fw5znt36rjdr7fwj9nvcgt8sdqnvddwtz7zqu9z503s00q5umg
+  # $ cat stake_pools/{a,b,c}/stake_pool.cert.signed
+  - cert: signedcert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqqqqqqqqqqruyewhyw63znm6sqjp97v9v0lzxwrcpn5clpqjku9tvx7gm26cgu6dch9gvcaf2qtkjwk4dxnl9dwtx0drc3df7c6qf4ud0ntl65dl0sz24h2ghlfdrfaj4l445flnca9lc8kj7cdyf0t6kv9efk55p4hjdlqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqpqruenu0stnzsfs5eaxkfp5ycuj7mzwvh0drhuknhu00x2g5r0wwqh29a5pelyg6ftnzrpd6ss9z3s3mukcuss3tf75vnn7gjm2609jqdtvrgeh
+  - cert: signedcert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqqqqqqqqqqzqhrrx0rsyuc7uzd0fgzq7rlfkxl46uqa34vpsvlvkfhwcd9g8pmgqkmrlqp2pz3d6k3x3ffcvev968mwlxeuzgawla627j22t28fxhqz24h2ghlfdrfaj4l445flnca9lc8kj7cdyf0t6kv9efk55p4hjdlqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqpqq29drqd7vfcejvnst4luycy7xuegxwgj3hstkjz8jrj9egr73d0m9gjepjxa5kdewpczvxn9pvtvadar6f2dqw9x467qslv8a5l3nq2quec6p
+  - cert: signedcert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqqqqqqqqqqr9hzg7q7clf0wz0t8x6qjyjcnug3qy9ls7lptrfmjlp026cl9mqk066q5pwhpyst4vawatz2s8cxpv664kaw8tcd8zamfua009rndlksz24h2ghlfdrfaj4l445flnca9lc8kj7cdyf0t6kv9efk55p4hjdlqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqpqzsmgc3fj8f49j9r8xdnkdwjp8j7djnyw56ltu758pe3j42ahd64c6ckzfumuhpqhp9pcsnyxk2jmlvgvhjve338ssmh8dkpde8mvcqx64l5t6
 
   # Delegation certificates — delegating from the account addresses to the pools
   # $ cat funds/stake_delegation{1,2,3}.signedcert
-  - cert: signedcert1qxkalz75s4vtw2e9wsy2q9jvsu3qtz6d2vm3xj4e5q4ufejpjjfn5q2wlgecssyxf683fx6z0kaj9hrwgnlld5u4q4npmpjfjx2dwvuswqsyfxf3ufe2me8jr3z70xcw930ewarlmz0ah67m6suzz9u524uucy2le5q26ukspl7k4gdlzyt3ldqzcv6gvcsmappmmpsx74639lgqg2a9kx
-  - cert: signedcert1q8qtmpgefmhlwrwlm48kxq43hpkxnvz8fey2jlmce5lea3mxnskfqq264syfguy58qc5aswgkp5hsg8u9ma2ey28dz6nu4xk3v9uu9af4rmltr2l3fcuvvcncxcd8pkujg55zdm9vvkpd7v68fsk700346rkd0cew62txal4zzm082gf22t652dqeyxvxr8gve9kt30fvpg5yjgpwe6ppl
-  - cert: signedcert1qxzn99jx8a2rw80gp9uea47tmcndv7gm28vy9as6akevy32204aqwq2ulwml0mqq2pyel0gu09g4y9k9443kh973j39aaznahx886yngqwgl2dse22c2n494hxlfzkw8v4rtxuj43unq04u7r848v28axlge63zlr4wpuwq080y3htyxxcx6dujzz84m7tupkhxrpcu0t9x67cq0x6dn8y
+  - cert: signedcert1qxkalz75s4vtw2e9wsy2q9jvsu3qtz6d2vm3xj4e5q4ufejpjjfn5q20345x5qkxucjmtfvue83rfuewt4efsuqjl8p9exntvrw6mcvh6yqatymz6yv900jggz8f87j2rg7pdue9y7erxpehsy9v0yaz4mrfga4ezyhkqhtp02ju727e2cuhyuwknjps0hpc9py0ggdyy2shwfldquxhncdr
+  - cert: signedcert1q8qtmpgefmhlwrwlm48kxq43hpkxnvz8fey2jlmce5lea3mxnskfqqtne4rxffevd6wq9xczegz26egezseafg44zs8m7gluwh4thp8a4cq3ljlvewvpyqkg3u3hvrrrkqekatwenwgh0d52x7d333gc4str9pnr5fn7yjegcj87dkzpe7nunnucgknyc87e73d64lmh47azmzqhpvknapz9
+  - cert: signedcert1qxzn99jx8a2rw80gp9uea47tmcndv7gm28vy9as6akevy32204aqwq2hdzqhcr3fhra2twme69s3l6hw7d43dlf2qa36sc7f9v6jzc5yguqhp6p79m5xjp0u9j35dlpfutvvrcsv03tgfnzcqhsmgjwhqxkmd0ggmw84qjsctxu2pzg5fh55n492ue5mrsec7vmk04vyf0ly367dqgzj6m3e
 
   # A special Byron Wallet comming from ["suffer", "decorate", "head", "opera", "yellow", "debate", "visa", "fire", "salute", "hybrid", "stone", "smart"]
   #
diff --git a/lib/jormungandr/test/data/jormungandr/secret.yaml b/lib/jormungandr/test/data/jormungandr/secret.yaml
index 35409aee117..1215833a987 100644
--- a/lib/jormungandr/test/data/jormungandr/secret.yaml
+++ b/lib/jormungandr/test/data/jormungandr/secret.yaml
@@ -1,6 +1,6 @@
 genesis:
-  sig_key: kes25519-12-sk1qqqqqqp2devhu4w95ujxl8e478l7skhsxukrcp55pztmllp3hd2x35pyvmmkn7qf85shjmacc5kgcp6epghkmnu4tz9vdg377yw850n0tt3akxpzh0tuwejlua3qw92sn9sklrfx8xgpmscwut0q8n77d4qn35q4t5u9jywy4wp36jqpaz4ezj82rztwtys2drunsmxyjrwkhdmzguzfnhekr0an5n8vqpksule09w6l4j4enrmemh7ctegugrk7zcczkt666g3ska0ar6na5pt3etxfv9gmgvdrtjutks0rj7uqf8pc7u5mh6fkx8v6z6vppex084tqqtyqrptr69xtzfmzn2cpmt5jygdf7upcj4g5txnd5vadt2jm8tnwgcp88gpsny9n0mqutq5tnd6ddtsxvtlekhvd429gkkuwp9rgqcyhsw7esk0pt5km5phzs7faajpktwrytxpsy9lmq0y99jwvsglntkljda5jrm3rq4adz3mj7wfk47vfszqvmltdpj9n77xvuau0mw9x9mnpxvd3zk89sk9450vnzum7fq8eperenqd3rnp9ca30sf5tw7mph6atzfll6h8k3s2eelugnxc9m5dga2ck0vst2c0jg7q4xccn8yfu8grd9756qs6x23fxpwq0h0vpvynwv92dv0w0e03k50ufxnllfv5372a9jp5h78q7qktm4w7tjx3u6jv8xh6gf585j9qqap3wzqmg5ynrpq7v9hrxfhjh3crjpuk6mkxfp3n68y4vgq7ygl523lcpllfpzh40w7q52ze92w054fysk6vpdxaxx0l9xuq67838h2wldveg0gqtpsds9xmkd64w345egedu8x9vhs359s928q3swuc22yfuzkphccn2z4vaem34e6pfk3d6vqszh2gfm6yeg45jdx9nlydt5h0utv8t6sseraq7xszxt7jq0e0rl0wftj8qmpx5mm7vau4z2954mxwghmtwql5ftfpf58khqjf6nu49awx7rua32y28a86glj0ushvy4uhwv7tu0wuumq2mudf9g5kk3qnffkx2258d4004w5a7y7p07fc77gc4s4ynkj23ue5rgdpwclrvrl7vclnhvrq0xerjh0dfwcrz5jv7x6mdulh05u6sdm9qu4lxsl7zx5the6wlmajmscyp44fdlzunhmt7dxxld37dtlp4rtavrf67kfpjyymuer8e4z2jma40w60cpy7jz7t0hrzjerq8ty9z7mw0j4vg434z8mc3c737dadw8klm27cr3snfnkgng2vtqfyzmxjfj5vmzph9fl8f53lu6q7ercareedkv77nd3jj3zquyzvca59xlk4nhwtv3ut3lkzxz9gt8d4xf03qtugsyxfphhy3kvxxlqac2epu80509gwx4fa9h6avjp5j8pxw8hgujekf8cm3ndvm9zcm0gk6ukr7w7jdy53vpaur3hd2vg7gl4srf082wg7k2flt54azupnfaclt8x0pfhz49vwp0p2zldgay8hdjrz655z5qkepp9zne4yg92w2xuf7c6jgwwe0uak7a68yz6av7px6wy2xyyjk303ffn28ad4vv7k02xlaxz589hlkuf2h2rtlw24ewlyy6s5m5e80rd8jx43pfypy54yngm7qnfqqarpqcrsyphhwdc68way8cmynvzj6sy2tgkjcs94q3238gxkrlknfm30yf98ku9ps6z7hx9ea37j2ayeca3rz6yyxarwg54upph7pphq5uses3zhpfegym8h5n0ah5rs86dnrg2n2e95huvk7yddspnfz49vs4m00gpp4gvgpjr7h9ypy8h88qj26m4gck4r4u64cdjwy4rr3slx4mv4w0n60vzn3fldf3yu3d6fwcfrzapjvqykw705hrxjwxx0u0umf09kklq436pzv6kqaesgkyxw9vv
-  vrf_key: vrf_sk1r9933thflycr82et6qfvhw9se6dlur3ruzk8m03s3fclqsz7k5qqrvlmxf
-  node_id: 4efa338840864e8f149b427dbb22dc6e44fff6d39505661d86499194d7339070
+  sig_key: kes25519-12-sk1qqqqqqy2e9k99shyezvxv7kgsj0q7t9wglhvdv7l670zxm0x5ws0axu6nkp9e7ssz7xxpsf9zgfrj8qlyndzc0sj740c3dnk5a6xkhj38h6ytqlgun34f4q4wshm6qde93cqtxwwpkt46qf39k7yh00qpt7r206gd85dha8l89v0ml3sgner4tm7950krct7rr64ktm4dfxj7cp0heneq0vf5rxz6jezqxc9q7c9uu9ff8fe7dd8w4svecdq6kcqjvjzynvnq33zac8kgs2pdmgjr5h422790ssax2l7et4rdmuhctc8gny3sv7w6zacs2a9ygfncrc8fnvsg2fnxtj0ufllxt8zllgvmh8nny2hhnp8zwsnp3z65vhlnky04mmav3wz6yku7jxlrv8d3ng8847p4v9t0e4eyual53zm53q4v5lgs3p3pvug8dz8ead5tu44re5l7gll2jw9cl0wezxmukx6mvw0f66qgtpcngwdlh9q0pkpfq2vs8whcffwa6j4np82zd6aesc6yfgyanqtagnp3xv6gaggpe34fyve8eltz73x0aq58n3vsnplsagfucaltg0ah6vkdcrzjfau54ynen2d98gm2v6rpj80t94wgufwaaxnuhuh0mj9qhmmrfw320l7v7p36nnlxzqwz8temvlu07zgyxv3hn0y6svd382z7mwsjyk36vyge2k2fw9lfmjmwnpthat3au6ef099n9llw00unn86aewkh3lre846jc84tc4zcwdj76gtjwnrhe2r30gtek2m07s2m0v0343leq6cdp5a4486rnrhl9y8hsaj9rp3cyzad5se60ypuj49a99z4gf56e2exkxfewnyu2hvwmpa32hfq5ck7xxy39t74k78vt39nzd7m94cpulucnjl63kdngpdmczgp4wzs2p7cnr6wedwtgl222qjetkw9zh6um54eud3axp2hdpe07cus58ezaejp8runcvdv55wkazh0yrh6fgg239yl5e2fy4ppknxl48g4xcljcscsevp7pfm75x6wlvux6em45qs8wq3cntgt8u8tuhjlzxx9pqx3jhznnkaj754wc88r6wwlwj9nmhn272x4v4289gvtrn5gp6sf0vawdjdk4yt207ev2jmx4048zwz2nt4wacdwsps8yhty794487msvvafzx5zlxmg2fun4fn88sp4wjw22rcggfyzw0qjth5s6mgyh86zqtcccxpy5fpywgurujd5tp7zt64lz9kw6nhg6672y7lg32lwmtgevfqp5x676576f0r6zutp6x40sdefrrsshqvtysqy9dvwv86cav7htr0s84tjzpkc0x5vx27rgpvref99q6qaglutyjkm4k8ccww7a58y73neg4gc6jzptw4lps8adau4kaxtxyya352qztcluaglllv46zsfp3cdyx0l0vud066l45ckamq60nl64nguseza9hw8ku24wtq7czjp4nrggkze58al04kmc9x5mhjexxwr5ge59qn47xfeg6sdk7qphx3r520y4wgtn4vursewq7qga0zp6qw07udpc526crj3rk6me9nsuc2lt4xdrm4t0wfxqdjp4m86vqyxv0v855a98m6e03v2k7mvruq6melkmsncjcp48rqa399m3y84xdu65ms06nda6ycceqrkzghadegtx6xxha93jn2dcravw5d678htcc85qf3uetulw55u0eclk7eyxmhfjtz3qw3nxg0vxe7x6pfm540l6e0gt84r28chfurh6jr4yt43h2hxzr2z7xry849t3m9pufj9jcd3ltj60w5xcs2vrka79srdtx538e86pd83ljpg0v7az78qum83sz5c0r05fw5xp33v0vu4xamack4p9r8zzxxyznthlurfz7qyqp23nm94ecjyefm698d322ht3glwm
+  vrf_key: vrf_sk19xmdk588rc4p5aa454cm4lqrm3s33njfsfm2rkecazmf63weg5zqfnstvv
+  node_id: 4f8d686a02c6e625b5a59cc9e234f32e5d72987012f9c25c9a6b60ddade197d1
 bft:
   signing_key: ed25519_sk1gg2pjtmldtsukmwgnqjjjdhlty2vxd7lyxy4rp5sz5m60pq7gkdsjvm4j4
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/a/pool_id b/lib/jormungandr/test/data/jormungandr/stake_pools/a/pool_id
deleted file mode 100644
index e665938c231..00000000000
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/a/pool_id
+++ /dev/null
@@ -1 +0,0 @@
-4efa338840864e8f149b427dbb22dc6e44fff6d39505661d86499194d7339070
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool.cert b/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool.cert
index 8188e28fbf8..d82629e67ff 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool.cert
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool.cert
@@ -1 +1 @@
-signedcert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqsqqf2kafzla95d8k2h7kk3870r5hlq76tmp539a02esh9x6jsxk7fhuqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqu3ed0wgwnzwff5hzmy3jtalnzhtnp8z4ee8ps6p8tafarwky06ln5djzklrfj288ngcah69frvqg9kz5wpjyx6qg08zvs0xce4vja8qqqgqqz070rdj0uf7gumvu9jkgz35e9rjejl9ktfrwrvut9tyhcfqpdfg53tmp9y95xw0fp5ejkjac3hyawr9mkpv0hk62nzt33wfh6d5u5s9qayyg7
+cert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqqqqqqqqqqruyewhyw63znm6sqjp97v9v0lzxwrcpn5clpqjku9tvx7gm26cgu6dch9gvcaf2qtkjwk4dxnl9dwtx0drc3df7c6qf4ud0ntl65dl0sz24h2ghlfdrfaj4l445flnca9lc8kj7cdyf0t6kv9efk55p4hjdlqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqq2zlp6a
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool.cert.signed b/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool.cert.signed
new file mode 100644
index 00000000000..5efa5ed8dc0
--- /dev/null
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool.cert.signed
@@ -0,0 +1 @@
+signedcert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqqqqqqqqqqruyewhyw63znm6sqjp97v9v0lzxwrcpn5clpqjku9tvx7gm26cgu6dch9gvcaf2qtkjwk4dxnl9dwtx0drc3df7c6qf4ud0ntl65dl0sz24h2ghlfdrfaj4l445flnca9lc8kj7cdyf0t6kv9efk55p4hjdlqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqpqruenu0stnzsfs5eaxkfp5ycuj7mzwvh0drhuknhu00x2g5r0wwqh29a5pelyg6ftnzrpd6ss9z3s3mukcuss3tf75vnn7gjm2609jqdtvrgeh
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool.id b/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool.id
index e665938c231..1dd126f2d08 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool.id
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool.id
@@ -1 +1 @@
-4efa338840864e8f149b427dbb22dc6e44fff6d39505661d86499194d7339070
+4f8d686a02c6e625b5a59cc9e234f32e5d72987012f9c25c9a6b60ddade197d1
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_kes.prv b/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_kes.prv
index f247665bf42..c0ecd7d4633 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_kes.prv
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_kes.prv
@@ -1 +1 @@
-kes25519-12-sk1qqqqqqp2devhu4w95ujxl8e478l7skhsxukrcp55pztmllp3hd2x35pyvmmkn7qf85shjmacc5kgcp6epghkmnu4tz9vdg377yw850n0tt3akxpzh0tuwejlua3qw92sn9sklrfx8xgpmscwut0q8n77d4qn35q4t5u9jywy4wp36jqpaz4ezj82rztwtys2drunsmxyjrwkhdmzguzfnhekr0an5n8vqpksule09w6l4j4enrmemh7ctegugrk7zcczkt666g3ska0ar6na5pt3etxfv9gmgvdrtjutks0rj7uqf8pc7u5mh6fkx8v6z6vppex084tqqtyqrptr69xtzfmzn2cpmt5jygdf7upcj4g5txnd5vadt2jm8tnwgcp88gpsny9n0mqutq5tnd6ddtsxvtlekhvd429gkkuwp9rgqcyhsw7esk0pt5km5phzs7faajpktwrytxpsy9lmq0y99jwvsglntkljda5jrm3rq4adz3mj7wfk47vfszqvmltdpj9n77xvuau0mw9x9mnpxvd3zk89sk9450vnzum7fq8eperenqd3rnp9ca30sf5tw7mph6atzfll6h8k3s2eelugnxc9m5dga2ck0vst2c0jg7q4xccn8yfu8grd9756qs6x23fxpwq0h0vpvynwv92dv0w0e03k50ufxnllfv5372a9jp5h78q7qktm4w7tjx3u6jv8xh6gf585j9qqap3wzqmg5ynrpq7v9hrxfhjh3crjpuk6mkxfp3n68y4vgq7ygl523lcpllfpzh40w7q52ze92w054fysk6vpdxaxx0l9xuq67838h2wldveg0gqtpsds9xmkd64w345egedu8x9vhs359s928q3swuc22yfuzkphccn2z4vaem34e6pfk3d6vqszh2gfm6yeg45jdx9nlydt5h0utv8t6sseraq7xszxt7jq0e0rl0wftj8qmpx5mm7vau4z2954mxwghmtwql5ftfpf58khqjf6nu49awx7rua32y28a86glj0ushvy4uhwv7tu0wuumq2mudf9g5kk3qnffkx2258d4004w5a7y7p07fc77gc4s4ynkj23ue5rgdpwclrvrl7vclnhvrq0xerjh0dfwcrz5jv7x6mdulh05u6sdm9qu4lxsl7zx5the6wlmajmscyp44fdlzunhmt7dxxld37dtlp4rtavrf67kfpjyymuer8e4z2jma40w60cpy7jz7t0hrzjerq8ty9z7mw0j4vg434z8mc3c737dadw8klm27cr3snfnkgng2vtqfyzmxjfj5vmzph9fl8f53lu6q7ercareedkv77nd3jj3zquyzvca59xlk4nhwtv3ut3lkzxz9gt8d4xf03qtugsyxfphhy3kvxxlqac2epu80509gwx4fa9h6avjp5j8pxw8hgujekf8cm3ndvm9zcm0gk6ukr7w7jdy53vpaur3hd2vg7gl4srf082wg7k2flt54azupnfaclt8x0pfhz49vwp0p2zldgay8hdjrz655z5qkepp9zne4yg92w2xuf7c6jgwwe0uak7a68yz6av7px6wy2xyyjk303ffn28ad4vv7k02xlaxz589hlkuf2h2rtlw24ewlyy6s5m5e80rd8jx43pfypy54yngm7qnfqqarpqcrsyphhwdc68way8cmynvzj6sy2tgkjcs94q3238gxkrlknfm30yf98ku9ps6z7hx9ea37j2ayeca3rz6yyxarwg54upph7pphq5uses3zhpfegym8h5n0ah5rs86dnrg2n2e95huvk7yddspnfz49vs4m00gpp4gvgpjr7h9ypy8h88qj26m4gck4r4u64cdjwy4rr3slx4mv4w0n60vzn3fldf3yu3d6fwcfrzapjvqykw705hrxjwxx0u0umf09kklq436pzv6kqaesgkyxw9vv
+kes25519-12-sk1qqqqqqy2e9k99shyezvxv7kgsj0q7t9wglhvdv7l670zxm0x5ws0axu6nkp9e7ssz7xxpsf9zgfrj8qlyndzc0sj740c3dnk5a6xkhj38h6ytqlgun34f4q4wshm6qde93cqtxwwpkt46qf39k7yh00qpt7r206gd85dha8l89v0ml3sgner4tm7950krct7rr64ktm4dfxj7cp0heneq0vf5rxz6jezqxc9q7c9uu9ff8fe7dd8w4svecdq6kcqjvjzynvnq33zac8kgs2pdmgjr5h422790ssax2l7et4rdmuhctc8gny3sv7w6zacs2a9ygfncrc8fnvsg2fnxtj0ufllxt8zllgvmh8nny2hhnp8zwsnp3z65vhlnky04mmav3wz6yku7jxlrv8d3ng8847p4v9t0e4eyual53zm53q4v5lgs3p3pvug8dz8ead5tu44re5l7gll2jw9cl0wezxmukx6mvw0f66qgtpcngwdlh9q0pkpfq2vs8whcffwa6j4np82zd6aesc6yfgyanqtagnp3xv6gaggpe34fyve8eltz73x0aq58n3vsnplsagfucaltg0ah6vkdcrzjfau54ynen2d98gm2v6rpj80t94wgufwaaxnuhuh0mj9qhmmrfw320l7v7p36nnlxzqwz8temvlu07zgyxv3hn0y6svd382z7mwsjyk36vyge2k2fw9lfmjmwnpthat3au6ef099n9llw00unn86aewkh3lre846jc84tc4zcwdj76gtjwnrhe2r30gtek2m07s2m0v0343leq6cdp5a4486rnrhl9y8hsaj9rp3cyzad5se60ypuj49a99z4gf56e2exkxfewnyu2hvwmpa32hfq5ck7xxy39t74k78vt39nzd7m94cpulucnjl63kdngpdmczgp4wzs2p7cnr6wedwtgl222qjetkw9zh6um54eud3axp2hdpe07cus58ezaejp8runcvdv55wkazh0yrh6fgg239yl5e2fy4ppknxl48g4xcljcscsevp7pfm75x6wlvux6em45qs8wq3cntgt8u8tuhjlzxx9pqx3jhznnkaj754wc88r6wwlwj9nmhn272x4v4289gvtrn5gp6sf0vawdjdk4yt207ev2jmx4048zwz2nt4wacdwsps8yhty794487msvvafzx5zlxmg2fun4fn88sp4wjw22rcggfyzw0qjth5s6mgyh86zqtcccxpy5fpywgurujd5tp7zt64lz9kw6nhg6672y7lg32lwmtgevfqp5x676576f0r6zutp6x40sdefrrsshqvtysqy9dvwv86cav7htr0s84tjzpkc0x5vx27rgpvref99q6qaglutyjkm4k8ccww7a58y73neg4gc6jzptw4lps8adau4kaxtxyya352qztcluaglllv46zsfp3cdyx0l0vud066l45ckamq60nl64nguseza9hw8ku24wtq7czjp4nrggkze58al04kmc9x5mhjexxwr5ge59qn47xfeg6sdk7qphx3r520y4wgtn4vursewq7qga0zp6qw07udpc526crj3rk6me9nsuc2lt4xdrm4t0wfxqdjp4m86vqyxv0v855a98m6e03v2k7mvruq6melkmsncjcp48rqa399m3y84xdu65ms06nda6ycceqrkzghadegtx6xxha93jn2dcravw5d678htcc85qf3uetulw55u0eclk7eyxmhfjtz3qw3nxg0vxe7x6pfm540l6e0gt84r28chfurh6jr4yt43h2hxzr2z7xry849t3m9pufj9jcd3ltj60w5xcs2vrka79srdtx538e86pd83ljpg0v7az78qum83sz5c0r05fw5xp33v0vu4xamack4p9r8zzxxyznthlurfz7qyqp23nm94ecjyefm698d322ht3glwm
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_kes.pub b/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_kes.pub
index 6daec6a276c..672d712d5c7 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_kes.pub
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_kes.pub
@@ -1 +1 @@
-kes25519-12-pk1n5djzklrfj288ngcah69frvqg9kz5wpjyx6qg08zvs0xce4vja8qula03p
+kes25519-12-pk16dch9gvcaf2qtkjwk4dxnl9dwtx0drc3df7c6qf4ud0ntl65dl0skxw2me
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_signed.cert b/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_signed.cert
deleted file mode 100644
index 8188e28fbf8..00000000000
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_signed.cert
+++ /dev/null
@@ -1 +0,0 @@
-signedcert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqsqqf2kafzla95d8k2h7kk3870r5hlq76tmp539a02esh9x6jsxk7fhuqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqu3ed0wgwnzwff5hzmy3jtalnzhtnp8z4ee8ps6p8tafarwky06ln5djzklrfj288ngcah69frvqg9kz5wpjyx6qg08zvs0xce4vja8qqqgqqz070rdj0uf7gumvu9jkgz35e9rjejl9ktfrwrvut9tyhcfqpdfg53tmp9y95xw0fp5ejkjac3hyawr9mkpv0hk62nzt33wfh6d5u5s9qayyg7
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_vrf.prv b/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_vrf.prv
index 89d794a3af6..b7a9828b000 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_vrf.prv
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_vrf.prv
@@ -1 +1 @@
-vrf_sk1r9933thflycr82et6qfvhw9se6dlur3ruzk8m03s3fclqsz7k5qqrvlmxf
+vrf_sk19xmdk588rc4p5aa454cm4lqrm3s33njfsfm2rkecazmf63weg5zqfnstvv
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_vrf.pub b/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_vrf.pub
index 742226b6aee..5c36a5de1a5 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_vrf.pub
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/a/stake_pool_vrf.pub
@@ -1 +1 @@
-vrf_pk1wgukhhy8f38y56t3djge97le3t4esn32uunscdqn47573htz8a0sujn87u
+vrf_pk17zvhtj8dg3faagqfqjlxzk8l3r8puqe6v0ssftwz4kr0yd4dvywq3hkju2
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/b/pool_id b/lib/jormungandr/test/data/jormungandr/stake_pools/b/pool_id
deleted file mode 100644
index 5ef937e43c4..00000000000
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/b/pool_id
+++ /dev/null
@@ -1 +0,0 @@
-5aac0894709438314ec1c8b0697820fc2efaac914768b53e54d68b0bce17a9a8
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool.cert b/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool.cert
index 2ed44e31653..fd0c88dfd05 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool.cert
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool.cert
@@ -1 +1 @@
-signedcert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqsqqf2kafzla95d8k2h7kk3870r5hlq76tmp539a02esh9x6jsxk7fhuqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqpkpuhrghy89ppkeyvgvf6u2kn6wp2dmvwpa6tnddtdv0fy9hfme39ayqhwr76399cec9vmfqu4jpmlk52lt5xakhp8r9trauzwuzg2uqqqgqqpf7kwyfrqtzxwx06nnd2yd5m7g5pzuy98f3zqxvahcefx5kcm9a9fdp356vdttsz35nnfjanryagtyx2y06nr0snrznpqw2f60aaxcgmqmxek
+cert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqqqqqqqqqqzqhrrx0rsyuc7uzd0fgzq7rlfkxl46uqa34vpsvlvkfhwcd9g8pmgqkmrlqp2pz3d6k3x3ffcvev968mwlxeuzgawla627j22t28fxhqz24h2ghlfdrfaj4l445flnca9lc8kj7cdyf0t6kv9efk55p4hjdlqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqm9epex
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool.cert.signed b/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool.cert.signed
new file mode 100644
index 00000000000..51c1e6ae194
--- /dev/null
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool.cert.signed
@@ -0,0 +1 @@
+signedcert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqqqqqqqqqqzqhrrx0rsyuc7uzd0fgzq7rlfkxl46uqa34vpsvlvkfhwcd9g8pmgqkmrlqp2pz3d6k3x3ffcvev968mwlxeuzgawla627j22t28fxhqz24h2ghlfdrfaj4l445flnca9lc8kj7cdyf0t6kv9efk55p4hjdlqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqpqq29drqd7vfcejvnst4luycy7xuegxwgj3hstkjz8jrj9egr73d0m9gjepjxa5kdewpczvxn9pvtvadar6f2dqw9x467qslv8a5l3nq2quec6p
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool.id b/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool.id
index 5ef937e43c4..04e8953949a 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool.id
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool.id
@@ -1 +1 @@
-5aac0894709438314ec1c8b0697820fc2efaac914768b53e54d68b0bce17a9a8
+73cd4664a72c6e9c029b02ca04ad65191433d4a2b5140fbf23fc75eabb84fdae
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_kes.prv b/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_kes.prv
index 076d9f00e7c..31bc50b7d51 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_kes.prv
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_kes.prv
@@ -1 +1 @@
-kes25519-12-sk1qqqqqq9zedyyfq35uauysvx09lz7klh623kea6jjmmpymdnkn8luh7jaahaa6th046pyaxcjhwpcwduuhq4s7fpgucxt7lduvexh5alkpwwcxkrgfy2p0grwh0et52g223unmhf07eq73a36agkj32tyxl4ssvu7gujevy83ssgp4gf3jf0m75w8f542f3j835pd5jzx42lcd4an44yvl05gykptgtajzhq8nt0xsfm7nzud52zscgnpqj80z3nmvf94akl96qqt0t3vf8rnekz8uh8r4maf6zr8zrg5swlecrnwhzerfcukswwl6d4vzyrw643k4um5h9dl4purkt78438g72c8tfmhqzyalp92w50r0agw350xjmenwxgaagayjqjn6clq68qvqlwkmzy8ec4mykljaan7jy4l4ehu002hwsrkqf0s44rvk5xnt9nu628c2kxs9m3qsrsgkycuxen3lrde6hx7wrfdrmky5s6ah573r3c7gdtl5w0cd3supf9epfrf3qfh6sap279wyp0l8xsrf6sgksrqjurkkwzy54fnu6f8vj53430s2nwcj942mmu9ympkqeaphfjt9nu028es9aa7aq7f574y82x06ra6d6sr8wzscg3pl8f30dnyd6vxzkz9u8fqe6zq5lgg5zg30u3dztv7yf3a0ggzsrq7qnxrvudvvqqznythuuc2mc2nh9nwqjm3azh6ev2suylqhu0ruwxwsznfvh228c5kz3qfe4p04thcn9sdr5m75r3xkqtpp4ed7aygyuq7knqthrmu97fm29vqxgpqt6emyc8yeca08zygl8wkcq9rdls00lywwwek5wr8rl2mk0x6vygv2c7t0dtkjphlxf2sp8aqyhd88a99x38pkhf5yk3pcd87rry652xe8ylmswz6rn2v8aua2vq5xjcf56k3gq7as90005r4gaenf6xgzzzc7qn3kce2rh0fg4au9trl3fuxz65cr5evrjzz5g0mt6qjhr2rrly6a4gvwq9ttfwvnljsgmxwrjur04z5h4826wwhtcp8gs5r29sfr20at4dse27z9dhs7ffj7fkynz3qm4zgt3k2h8ysdqj58yz082stg9erz4lwet30wn6k8ezdpq9ar2t82shcwm2y3v9sy0sn7xvqlf7pxslgh9lsmx0ucc3kzn3lnvzzmf7mve840gjajlfj9l903qssszafx68qcnx0hhfwa7hgyn5mz2ac8pehnjuzkrey9rnqe0mah3ny67nh7c9emquyyt8n3j23ljlc43fc6kaylufed544ut7asmu0rzpcfgqhtvtmses6wk7kxq2ag2zvym7yht8gu2trmlzanmz8dnn0lam2ft7j5x5cpf9eryrdy6p9sde8v54qll9e5ccuvc9dx82cc33xavpsuwzelcxh5rap88tty00pesz75hrxn8qp48e6swkpm5f3jc5auxxqtq5jqdvcjcvhzvenrhede96np70p2xf6wj3uts43usrl9qmvhur96juux2np69s9pu5eeahy2g6udjy5v3mrs8st50f9tks0mtttp7ku0v0mj32hhppdxc69a499lj0yzjzcnu20gqp80es28a4u4zg70guucf8909gknqqgysf85gpnux4t95a75u7ksp5d3jv5qkkjz20dxgans6nrshqa3nux03vayj79vhxtwtx89vyyuxy5ec9w2796v77aelfmt3g7c42c00fmnglk3z4drjrk6cj4uhggxyrxf046555aldjsq3puwym66lnhmsheqkvdw75hl7a8kjc057wwupeg80er9f4mprm0mws3xf8pd2drzgwx3h577r2xm4e9l4n9nglqcgz5lng8z9w0snmwf5wwvgwe3cc2d67u6ycc05k6kn0kdnjd7fxy55qrky2c9mwu3qpk8vprn2jk3d
+kes25519-12-sk1qqqqqqx4rxyx8wldfhl8ufw5l4k8mrrvscfq86gc4zddzwz520jafkvxhq25tm7u68vnalx48e6zx9fhcwlspv0mcwg03xgu2e7rjus4pz2ssqw2kqde6t0wu2gz23u9jagzpxm5z5tcljhzmhhdm9z3zhh929y0qywpp4t3z33555z6zel3c9k9ma2y7adae5uypgtsx3gf328exrp4mqwghs7mmgddnj3z5s476hsp2lc9e7hhqntmgzpcd0fh92nmnpd3qmylg66gykxwxzkmjyk3j7skzuhke52uqjrjsjvmcfjz6h0yrz0tclwnrl5vdag7x5yqwx6hqcqey8sd0mn3sktyq59eu2gsj0r5u08epg4tu76qftdu8tc3te0e4dc0tnfj6c7uh28fc4zntug28ltek7mweqxr84v4dgsgpsf383w3990u30hj6p3dsa8u5cnc7r5s274e9ra2f58fjgc7z6v38n9pev880e2h4jqfgffvpcqgtnes5ejtfg43uqmfvz4vzjv3qch3ks4nzh8ayqejl46t88ul0kdlh9d4xsyhq4d2ju0z7r2ktz2r4w4zr4jwfayxk5sph5yg4j8qqq8489mpuls86ht33lnenh3n857r38jag469pse64e3sgf0e73lrayyy8hs9qz0ee5032mh7vgp83pplewc97u6wupwyzqcvqxpxuqp9398kpxec2d63tagpwj74r3ehp65frk2mw0gt28az2wq2tdw05c3ma8m5jvv3evude0mcqc3wfv2yw7qqh5ad5yln064xp43ddk742s39vxp0xu4n985j67autzq0fmx7rq50zly8pzdt42vk6hv4kzjy7xt3sdur76lvchg6ew9wm65ufgu8hmuetu8a6u2mqs7n2pk7j67zjm8udtnxqpxc6jg3rgg4yg7xcpwd2xa7du74gl5fk4fa9n5kgtt6409mwpvkwremng52etmcv27reknxgnn9y99rsathdxw93uq5e3vnqt4u8erudjdzptu5zvr60ftlpdpwaunhclg86ek40luujzk5j4glvr04h7yevjz2kkd8937h8ad52fjdf0uw3m0ujfray47elw20jejy30ha739m765j6ghewrmdc36yw5au85l3t9639p792d0jwzdfhgy7klqpk0xkqe4gd28qfqxafspl4hrzesll9eshxpxl90dwhwhu2pcc4c2vtps32300mngaj0hu65l8ggc4xlpm7q93l0pep7yer3t8cwtjz5yf2zprkc5ws8jyl0k3augl9u5ckarxjycvpvtcynpmqe2cx8zxr4l2z7gazum4vk7jr35zw3sp4flyw2ucsys7s8rj2ks2dfyydqhhu2c4y3pv49jsz8v9afewvvey8gu7lc6vktnumx90usgzzhe2eh2tspejs0n5nq88kev9xu6d2pgd5thkeaez9y3l964genvg292htfx8w5ettltfwsmcffqqr2l0j762lae430g59cjuqhyythjltadpdkktpndl7xfgtv75q853snm3yjt7td59j922srqy6ra960upx350hle4s7f75nyna0a4vkm3x92vrqfwt79a98kxcxkttpjumn3esd55wp3dk56prrmlt7aghyffaxyuxr76sn8rrqq2h4uz75y4hfxuxl5fmx63432p3gm85t84rpynwwm8deqtl2ckvdzp8emwqdy52kqm20x8gtqlse63gr7c7gnx2dt0m3erttjz8vldpnq2gqe472usr0p37stcyee04sj2sr4asdwhtgpmlctmx7uwyfq60xnupnjqn0xwpk2fsalkchhrag6p4rsl4qv5fjyeca2t3h32nym7hgfj4cny3dufjkwrawlzqjntgjmzexda6pvu3698mc5q03k8rr3y92u73ac45k5rm7g0dqzqw8d9vj
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_kes.pub b/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_kes.pub
index d0f2480bc11..670f8a22d9f 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_kes.pub
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_kes.pub
@@ -1 +1 @@
-kes25519-12-pk19ayqhwr76399cec9vmfqu4jpmlk52lt5xakhp8r9trauzwuzg2uqps9m76
+kes25519-12-pk1gqkmrlqp2pz3d6k3x3ffcvev968mwlxeuzgawla627j22t28fxhq6k30al
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_signed.cert b/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_signed.cert
deleted file mode 100644
index 2ed44e31653..00000000000
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_signed.cert
+++ /dev/null
@@ -1 +0,0 @@
-signedcert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqsqqf2kafzla95d8k2h7kk3870r5hlq76tmp539a02esh9x6jsxk7fhuqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqpkpuhrghy89ppkeyvgvf6u2kn6wp2dmvwpa6tnddtdv0fy9hfme39ayqhwr76399cec9vmfqu4jpmlk52lt5xakhp8r9trauzwuzg2uqqqgqqpf7kwyfrqtzxwx06nnd2yd5m7g5pzuy98f3zqxvahcefx5kcm9a9fdp356vdttsz35nnfjanryagtyx2y06nr0snrznpqw2f60aaxcgmqmxek
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_vrf.prv b/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_vrf.prv
index 08a7bd45547..77ba9c9187e 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_vrf.prv
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_vrf.prv
@@ -1 +1 @@
-vrf_sk1ew90nv065pfq3f69ddtvsvvwytevuuysgmwvya99kkjlchhcuc9snfl0x5
+vrf_sk1fpttua8lfv2s7xna8mxdv460xglsl43qh9rp8x7m3ghhk0p6vc9sxnmyj0
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_vrf.pub b/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_vrf.pub
index b1ddd9a454b..3783e6b1dd3 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_vrf.pub
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/b/stake_pool_vrf.pub
@@ -1 +1 @@
-vrf_pk1mq7t35tjrjssmvjxyxyaw9tfa8q4xak8q7a9ekk4kk85jzm5aucsdmn3pw
+vrf_pk1qt33n83czwv0wpxh55pq0pl5mr06awqwc6kqcx0ktymhvxj5rsasmu40jq
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/c/pool_id b/lib/jormungandr/test/data/jormungandr/stake_pools/c/pool_id
deleted file mode 100644
index b5b96ad2404..00000000000
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/c/pool_id
+++ /dev/null
@@ -1 +0,0 @@
-5cfbb7f7ec0050499fbd1c79515216c5ad636b97d1944bde8a7db98e7d126803
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool.cert b/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool.cert
index 24f232affd5..2945ee80e2e 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool.cert
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool.cert
@@ -1 +1 @@
-signedcert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqsqqf2kafzla95d8k2h7kk3870r5hlq76tmp539a02esh9x6jsxk7fhuqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqp4rqy9u7fs5e8u77q42a0uuju962jans7ad7y5qn8k2cq9p6ay63gp0lxeydu3pmfw62lacxfn0qdyaam297qgeze03ues7elm7ju5xsqqgqqrz0xqrjl9cp3uqvl8a3s7jfsfkq623zfnc88wlsyz7yw8z53j4fe8nu6q97fw5znt36rjdr7fwj9nvcgt8sdqnvddwtz7zqu9z503s00q5umg
+cert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqqqqqqqqqqr9hzg7q7clf0wz0t8x6qjyjcnug3qy9ls7lptrfmjlp026cl9mqk066q5pwhpyst4vawatz2s8cxpv664kaw8tcd8zamfua009rndlksz24h2ghlfdrfaj4l445flnca9lc8kj7cdyf0t6kv9efk55p4hjdlqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqq9kgx5w
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool.cert.signed b/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool.cert.signed
new file mode 100644
index 00000000000..90c94ec8c82
--- /dev/null
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool.cert.signed
@@ -0,0 +1 @@
+signedcert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqqqqqqqqqqr9hzg7q7clf0wz0t8x6qjyjcnug3qy9ls7lptrfmjlp026cl9mqk066q5pwhpyst4vawatz2s8cxpv664kaw8tcd8zamfua009rndlksz24h2ghlfdrfaj4l445flnca9lc8kj7cdyf0t6kv9efk55p4hjdlqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqpqzsmgc3fj8f49j9r8xdnkdwjp8j7djnyw56ltu758pe3j42ahd64c6ckzfumuhpqhp9pcsnyxk2jmlvgvhjve338ssmh8dkpde8mvcqx64l5t6
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool.id b/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool.id
index b5b96ad2404..262ee05e85b 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool.id
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool.id
@@ -1 +1 @@
-5cfbb7f7ec0050499fbd1c79515216c5ad636b97d1944bde8a7db98e7d126803
+5768817c0e29b8faa5bb79d1611feaeef36b16fd2a0763a863c92b3521628447
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_kes.prv b/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_kes.prv
index 1a842c306c1..e4f78df6050 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_kes.prv
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_kes.prv
@@ -1 +1 @@
-kes25519-12-sk1qqqqqqqay85v6h8j0x0qw2qfe2htzck37uyapcpje6m0pqlrkfxg6z7ly292hrnuqn3x3vaufmrnnnwtc56l927aeuxuzet9lfs7rr8hwq8fwvxxupt8gx3mv20u3f0neveje3vf3c9katzdd06f3ns9sr7ax3fq5hmw4efx3f44zk98yrvfwysfpzsx7e2sv4md268ujwk6kny4dsdeuzu7mtatlhg9plaq79h7l9y42vvc7cvz5apnwn98ra03tsc70ayu3a88fcgx2rmj289kxsh6rdxh6e046mw6mmlxfvu6cefujuaxehnqepet2efad556jwr3rv3nt2g9tvf4c9lrk86awx0rakfsh89pfd9j4nne05klmsxdkxhk9wyd6nux3cc39qetkr6xz42vskdn5spvrp6glht4us6h95jskht55yx9yeff3un4n0g5fhwfgzyj2y2uc70frysmhptm29hl9h6659tn7uxf5hvnmfx96amrdmez4j2w08008n97hlmu5y7jcs7w5zlcp97plcz9w6929us7nef4r83jqltg426lr3c0sjsm9e2vl8wmjjrwwu8vg9a2yq8yr9ghu0wa3ddstnn77ne47kxxtmxnqclxu3hv0zscsw9svw3sxxx7gx2mmwghxf3tuazjaj4wugc634j7ptgf7uttm6qux8hlj86l74p5m5x6rjlztcqp7rpjf92pfa74p3wcr94stft656yvsz3j797vq56ecjn6a3a5dsjsghvhy8jenat6jcqh0hwgunw8y07qsmuzuutnc75360uns4wm7lyu82f9mhnxxrx8qt7rqfmq553hcq0y022qyh0z4e3wr5n8am33ewsjwf4rex7tfukhnwanh7m4np87zenc2u8e3curza5r0ey5nuqpqaje3gcywqyd0edx0s2kjtg6jcctqyeftlehgpdgzs3k8ejfmzwg4m7llkf8ayuuuglgkfj0gklagxwuqfhh8l34d6246nx8hn2sv2n8e6p2fvrrlur0k955guw87as40lgzyxey836cj382r5ys2n7at0gqtxv6y53ze44kul48edkjthzhqz5lyeuddpndt6uk6flxgaqw40n4p3807lk5n8pfpkee8rjfvesekmcy9axqugmtt90cckkrah2djcathjeyl5ws5cplxztexlkp977m3dwxvswqdjzufkk7kvk6j7gfzvhver5c42uw0szwy69nh38vwwwde0zntu4tmh8smst9vhaxrcvv7acqa9m27wc7ap7x9gu02lr8sy30he4dvyll80ksx7a3aa2revhx6y82y9fzr2ntu865c32eyjnnlas52j4259avzxd50nvztfskjy3ft9a96kk7d7dhj3y3c5r6cp57ltw9a860c9j6tquqz6m4mfpllw2kzpgwpn830lr2h0duqcq0jj8vsx4ux6zjlmfqcdqwpjldq4cpn6ak7rwz6fe5zchu8nkzz2kceez7te0feqqzxe5hy5zg8px3l2skvzx3al8ynkt5ll7tjemzapcvmusz4exgyg38ju9eltesfdc4qt0ylx2eq5y4kml23kxtdgc278f9chpvkh4rp5m2qkquh40dyjcpu0x5lsmn0m3gcf8ac8dmq2haurvm40qvged9ekg7pfpk905jyesx7tj3p6kcpw3485q6rlyh4fj9hm5k9zmw5hx9s2rqnqsagxwhgy6xssplyp97vt4w867x5zgww4wfe37r60yskuxa0pxx05lhxqr0dspfve3ukv45mfunkh57scn7sjwm3juwt3jx4an3yr92fze4gx3zvufts96gf5sjnhj6hd98sjzgx4cms478l4202vq7s8xdu7y2ty77yzgrupt3zxx3vjg8chxnu9v3jjdp5yrgnqj3hugtrgr00yyavrerz8ld6jyy9zvfl9
+kes25519-12-sk1qqqqqqxvh3jqdkve2rxumrehy0rtdp67e4264vpquj43vkxadma7029uzmmw3hvthtcpz58lkuncv0ccapvm0u9cym0dtd9up7ckd33kltgxxqkh5589mjd8hx6ak34q66jmw0lgmph9k4ahfu044g5k6u90gemqfgs3yhfhgl5uadnte6rc27mxltaqt3hm5ca835jjtracq6rrl88ctd9kmkwkqfd566ryvz6urmpd2zzvjhe0clpxzyfgqet9p4nt7y0gqy453murtcglnxxk72562auxe2hakhcf687ykrcn6wkkq7q9m7y079qjkffj6qu5y4u8cawkhym3ql3lv9jak2ztxqgrj4t9h8j5a53dy6svkatn66e98fmms78k6860nwzvhz8dy7av7hx3z52hsx5yphghv4nkh5lpvjc56738zst3ed07s80j296kagkhv6gjy5p3d8w7gcnfvrd64qx7k00058qfm3yrkvcfc020ztjq8nlsaexd0hhkzy4jk8yuxgegltw7v4a8w0mc7mgul6fxrdss9ldt2rcfr7zf8et0se0aselth6r0ac7ca3lsg6kh6844vp2u0eercxr9dnwmqcttm9zhf9faj7fk8ndzf4spw4nnzxdfs9sxw8ueuwwr5zm2vxx5vcygtrxzhq74qex4fy5gt8n2qyfz5ud775qje2j2t2tjlpjrt303zwvt6u353t0uxzggerckc2q25w3d6l6pgf9plcsruel0z6ew2f7qrr3aj06ydr9gxq8dj20ar8tdmnn5t45a99te72ajv5vrvapqtvl3lhfh8f6y542xwj936wt7jakse9utq4pt3h3gga8jt59nwu320xjxyvx8wnyaqaz6etlgmgman5vjy9tay7sypntp5gwr7392ggvjftqk9gclku784fhglfvxvrndxlxvyjxplrlx5lp8apk76zw2jxzkwtkfek6zjarm70t8phkj88nk5xl3ptdjkl0kct8lmrnsj5qjf3vvm4rc5zfe6k6a06leek89t2j6jz0v4pvaqpfc9m0zm2wwuh9xdc7qwjte9uy6xfmdl3v44crfrg33c54jh0ux4kfm3cq9pqvugjq0f9n7f8q7hsds0rn25y7w8pexrv36dptqtm7573r3sh2rc48hdvtnkrl6jascne7jjjjg7da8tu3gzzdfwezwd76mg4twtjjs0d5rxfza5je5v2h0d6xa3wa0qy2sl7mj0p3lrr59ndlshqnda4d5hs8mzekxxmadqcu7p6s03gdrd3sgt7m6nevsy20taqnxe8ve7zs28k0242dkk9x0j4va6gj5uy28g2tva3sps2n6zvgg8tayq08n9hkplgsu9vjhduhejgnucgus04g85mgqcuaa290cm4cj2ka3kwuncz3zm8l2s0xxwfnw63ttl6q07yfjalgelu9w49r3mx2mqpt3m238n0rtmnkk4ry688d76gc4dx48jjj9e4vjft25uy8x3pqrkgtfrqezyelskuc7hsu7patekxdrepx337twje8zr6xjdypxylq6ml5rqxre90vuapc09njuvgnzscrk8stj73h9xcsr546927sj7q0s9v20y9rwa52lgcdz3xvcactf65ftjqu6xe6h20090ej856rc733kfmjreavh9tk379kn4ayfm2zf3lfk8426t6mkd8zs3vgp6leuh75egj0ze439pr45ca79frvgzd7hfeal0rtasdqqhe5l34f5r06mecl55eajga22ld6gkzyjafhra2sq696lwhgsncfusd9g4ef2ru2v09m6xsl0pyk29ggsaxp0zuq8ls29af3psdnhwv9ce5r88j9wsgd9pkxagju96qedd64z3jry7mdj4e2pur273j0zz07x4v4lv9r2f69gpxw67aknvt4nz4fhtjxhxguc9n
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_kes.pub b/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_kes.pub
index 17608b7af8d..1d7447864fb 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_kes.pub
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_kes.pub
@@ -1 +1 @@
-kes25519-12-pk1gp0lxeydu3pmfw62lacxfn0qdyaam297qgeze03ues7elm7ju5xszt485p
+kes25519-12-pk1066q5pwhpyst4vawatz2s8cxpv664kaw8tcd8zamfua009rndlksaz6ydf
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_signed.cert b/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_signed.cert
deleted file mode 100644
index 24f232affd5..00000000000
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_signed.cert
+++ /dev/null
@@ -1 +0,0 @@
-signedcert1qvqqqqqqqqqqqqqqqqqqq0p5avfqqqqqqqqqqqqqqqqsqqf2kafzla95d8k2h7kk3870r5hlq76tmp539a02esh9x6jsxk7fhuqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqp4rqy9u7fs5e8u77q42a0uuju962jans7ad7y5qn8k2cq9p6ay63gp0lxeydu3pmfw62lacxfn0qdyaam297qgeze03ues7elm7ju5xsqqgqqrz0xqrjl9cp3uqvl8a3s7jfsfkq623zfnc88wlsyz7yw8z53j4fe8nu6q97fw5znt36rjdr7fwj9nvcgt8sdqnvddwtz7zqu9z503s00q5umg
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_vrf.prv b/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_vrf.prv
index b1448b23b7a..5f43441cd3b 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_vrf.prv
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_vrf.prv
@@ -1 +1 @@
-vrf_sk1wj6fkrxemnpqjhpq7nqfw5qa2rpzxgzqq4zq2q9mx9sqa6dejvys9sr9uu
+vrf_sk1cxf64hqftzzglxxzd8dtz0fajpkktlw99dqwq5kg8y883pj8xcxq6em4uv
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_vrf.pub b/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_vrf.pub
index d60493b6a57..4547259347e 100644
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_vrf.pub
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/c/stake_pool_vrf.pub
@@ -1 +1 @@
-vrf_pk163szz70yc2vn700q24wh7wfwza9fwec0wklz2qfnm9vqzsawjdgsrj4e9j
+vrf_pk1jm3y0q0v05hhp84nndqfzfvf7ygszzlc00s435ae0sh4dv0jastq3frhdc
diff --git a/lib/jormungandr/test/data/jormungandr/stake_pools/create-stake-pool.sh b/lib/jormungandr/test/data/jormungandr/stake_pools/create-stake-pool.sh
index ff24da627c1..8132dd06c77 100755
--- a/lib/jormungandr/test/data/jormungandr/stake_pools/create-stake-pool.sh
+++ b/lib/jormungandr/test/data/jormungandr/stake_pools/create-stake-pool.sh
@@ -42,6 +42,6 @@ jcli certificate new stake-pool-registration \
     --owner $(cat ../owner.pub) \
     --management-threshold 1 > stake_pool.cert
 
-cat stake_pool.cert | jcli certificate sign -k ../owner.prv | tee stake_pool.cert > stake_pool_signed.cert
+cat stake_pool.cert | jcli certificate sign -k ../owner.prv > stake_pool.cert.signed
 
-cat stake_pool.cert | jcli certificate get-stake-pool-id | tee stake_pool.id > pool_id
+cat stake_pool.cert | jcli certificate get-stake-pool-id > stake_pool.id
diff --git a/lib/jormungandr/test/integration/Cardano/Wallet/Jormungandr/NetworkSpec.hs b/lib/jormungandr/test/integration/Cardano/Wallet/Jormungandr/NetworkSpec.hs
index f55f9395efd..a34ecabaf9c 100644
--- a/lib/jormungandr/test/integration/Cardano/Wallet/Jormungandr/NetworkSpec.hs
+++ b/lib/jormungandr/test/integration/Cardano/Wallet/Jormungandr/NetworkSpec.hs
@@ -17,7 +17,7 @@ import Cardano.BM.Trace
 import Cardano.Wallet.Jormungandr.Api
     ( GetTipId, api )
 import Cardano.Wallet.Jormungandr.Binary
-    ( MessageType (..)
+    ( FragmentSpec (..)
     , TxWitnessTag (..)
     , fragmentId
     , putSignedTx
@@ -319,7 +319,7 @@ spec = do
         it "decodeExternalTx works ok with properly constructed binary blob" $ do
             property $ \(SignedTx signedTx) -> monadicIO $ liftIO $ do
                 let encode ((Tx _ inps outs), wits) = runPut
-                        $ withHeader MsgTypeTransaction
+                        $ withHeader FragmentTransaction
                         $ putSignedTx inps outs wits
                 let encodedSignedTx = BL.toStrict $ encode signedTx
                 decodeSignedTx tl encodedSignedTx `shouldBe` Right signedTx
@@ -328,7 +328,7 @@ spec = do
             \transaction-type header or is wrongly constructed binary blob" $ do
             property $ \(SignedTx signedTx) -> monadicIO $ liftIO $ do
                 let encodeWrongly ((Tx _ inps outs), wits) = runPut
-                        $ withHeader MsgTypeInitial
+                        $ withHeader FragmentInitial
                         $ putSignedTx inps outs wits
                 let encodedSignedTx = BL.toStrict $ encodeWrongly signedTx
                 decodeSignedTx tl encodedSignedTx `shouldBe` Left
diff --git a/lib/jormungandr/test/integration/Test/Integration/Jormungandr/Scenario/API/Transactions.hs b/lib/jormungandr/test/integration/Test/Integration/Jormungandr/Scenario/API/Transactions.hs
index 6bd371e127a..9c33ac95510 100644
--- a/lib/jormungandr/test/integration/Test/Integration/Jormungandr/Scenario/API/Transactions.hs
+++ b/lib/jormungandr/test/integration/Test/Integration/Jormungandr/Scenario/API/Transactions.hs
@@ -27,7 +27,7 @@ import Cardano.Wallet.Api.Types
     , ApiWallet
     )
 import Cardano.Wallet.Jormungandr.Binary
-    ( MessageType (..), putSignedTx, runPut, withHeader )
+    ( FragmentSpec (..), putSignedTx, runPut, withHeader )
 import Cardano.Wallet.Jormungandr.Transaction
     ( newTransactionLayer )
 import Cardano.Wallet.Primitive.AddressDerivation
@@ -239,7 +239,7 @@ spec = do
         (ExternalTxFixture wSrc wDest fee txWits) <-
                 fixtureExternalTx ctx toSend
         let baseOk = Base64
-        let encodedSignedTx = encodeTx txWits MsgTypeTransaction baseOk
+        let encodedSignedTx = encodeTx txWits FragmentTransaction baseOk
         let payload = NonJson . BL.fromStrict . toRawBytes baseOk
         let headers = Headers [ ("Content-Type", "application/octet-stream") ]
         r <- request
@@ -265,7 +265,7 @@ spec = do
         (ExternalTxFixture _ _ _ txWits) <-
                 fixtureExternalTx ctx toSend
         let baseWrong = Base16
-        let wronglyEncodedTx = encodeTx txWits MsgTypeTransaction baseWrong
+        let wronglyEncodedTx = encodeTx txWits FragmentTransaction baseWrong
         let headers = Headers [ ("Content-Type", "application/octet-stream") ]
         let payloadWrong = NonJson . BL.fromStrict . T.encodeUtf8
         r1 <- request
@@ -280,7 +280,7 @@ spec = do
         let toSend = 1 :: Natural
         (ExternalTxFixture _ _ _ txWits) <- fixtureExternalTx ctx toSend
         let baseOk = Base16
-        let wronglyEncodedSignedTx = encodeTx txWits MsgTypeInitial baseOk
+        let wronglyEncodedSignedTx = encodeTx txWits FragmentInitial baseOk
         let payload = NonJson $ BL.fromStrict $
                 (toRawBytes baseOk) wronglyEncodedSignedTx
         let headers = Headers [ ("Content-Type", "application/octet-stream") ]
@@ -494,7 +494,7 @@ fixtureExternalTx ctx toSend = do
              , mkSeqState @n (rootXPrv, pwd) defaultAddressPoolGap
              )
 
-encodeTx :: (Tx, [TxWitness]) -> MessageType -> Base -> Text
+encodeTx :: (Tx, [TxWitness]) -> FragmentSpec -> Base -> Text
 encodeTx (tx, wits) msgType base =
     T.decodeUtf8 $ convertToBase base $ BL.toStrict $ encode (tx, wits) msgType
   where
diff --git a/lib/jormungandr/test/integration/Test/Integration/Jormungandr/Scenario/CLI/Transactions.hs b/lib/jormungandr/test/integration/Test/Integration/Jormungandr/Scenario/CLI/Transactions.hs
index 4602d90cbec..3a9c7deb757 100644
--- a/lib/jormungandr/test/integration/Test/Integration/Jormungandr/Scenario/CLI/Transactions.hs
+++ b/lib/jormungandr/test/integration/Test/Integration/Jormungandr/Scenario/CLI/Transactions.hs
@@ -13,7 +13,7 @@ import Prelude
 import Cardano.Wallet.Api.Types
     ( ApiTxId (..), ApiWallet, getApiT )
 import Cardano.Wallet.Jormungandr.Binary
-    ( MessageType (..) )
+    ( FragmentSpec (..) )
 import Cardano.Wallet.Primitive.AddressDerivation
     ( NetworkDiscriminant (..), hex )
 import Cardano.Wallet.Primitive.Types
@@ -93,7 +93,7 @@ spec = do
         (ExternalTxFixture _ wDest _ txWits@((Tx txid _ _), _)) <-
             fixtureExternalTx @t ctx toSend
         let baseOk = Base16
-        let arg = T.unpack $ encodeTx txWits MsgTypeTransaction baseOk
+        let arg = T.unpack $ encodeTx txWits FragmentTransaction baseOk
 
         -- post external transaction
         (Exit code, Stdout out, Stderr err) <-
@@ -119,7 +119,7 @@ spec = do
         let toSend = 1 :: Natural
         (ExternalTxFixture _ _ _ txWits) <- fixtureExternalTx @t ctx toSend
         let baseWrong = Base64
-        let argWrong = T.unpack $ encodeTx txWits MsgTypeTransaction baseWrong
+        let argWrong = T.unpack $ encodeTx txWits FragmentTransaction baseWrong
         -- post external transaction
         (Exit code1, Stdout out1, Stderr err1) <-
             postExternalTransactionViaCLI @t ctx [argWrong]
@@ -132,7 +132,7 @@ spec = do
         let toSend = 1 :: Natural
         (ExternalTxFixture _ _ _ txWits) <- fixtureExternalTx ctx toSend
         let baseOk = Base16
-        let arg = T.unpack $ encodeTx txWits MsgTypeInitial baseOk
+        let arg = T.unpack $ encodeTx txWits FragmentInitial baseOk
 
         -- post external transaction
         (Exit code, Stdout out, Stderr err) <-
diff --git a/lib/jormungandr/test/unit/Cardano/Wallet/Jormungandr/BinarySpec.hs b/lib/jormungandr/test/unit/Cardano/Wallet/Jormungandr/BinarySpec.hs
index 54a7e3e4c8b..fca1f1f139e 100644
--- a/lib/jormungandr/test/unit/Cardano/Wallet/Jormungandr/BinarySpec.hs
+++ b/lib/jormungandr/test/unit/Cardano/Wallet/Jormungandr/BinarySpec.hs
@@ -13,13 +13,13 @@ module Cardano.Wallet.Jormungandr.BinarySpec
 import Prelude
 
 import Cardano.Wallet.Jormungandr.Binary
-    ( Message (..)
-    , MessageType (..)
+    ( Fragment (..)
+    , FragmentSpec (..)
     , TxWitnessTag (..)
     , delegationFragmentId
     , fragmentId
     , getBlock
-    , getMessage
+    , getFragment
     , putSignedTx
     , putStakeDelegationTx
     , putTxWitnessTag
@@ -115,8 +115,8 @@ spec = do
                 -- Context: We use whileM not <$> isEmpty to decode multiple
                 -- block-fragments/messages. If a message-decoder is wrong, we
                 -- want to know that clearly.
-                let getMessage' = label "getMessage" $ isolate 3 getWord16be
-                let getBlock' = whileM (not <$> isEmpty) getMessage'
+                let getFragment' = label "getFragment" $ isolate 3 getWord16be
+                let getBlock' = whileM (not <$> isEmpty) getFragment'
                 res <- try' (runGet getBlock' $ BL.pack [0,0,0])
                 case res of
                     Right _ -> expectationFailure
@@ -125,16 +125,16 @@ spec = do
                         e `shouldContain`
                             "the decoder consumed 2 bytes which is less than \
                             \the expected 3 bytes"
-                        e `shouldContain` "getMessage"
+                        e `shouldContain` "getFragment"
 
     describe "Encoding" $ do
         it "decode (encode tx) === tx standard transaction" $ property $
             \(SignedTx signedTx) -> monadicIO $ liftIO $ do
                 let encode ((Tx _ inps outs), wits) = runPut
-                        $ withHeader MsgTypeTransaction
+                        $ withHeader FragmentTransaction
                         $ putSignedTx inps outs wits
                 let decode =
-                        unMessage . runGet getMessage
+                        unFragment . runGet getFragment
                 tx' <- try' (decode $ encode signedTx)
                 if tx' == Right signedTx
                 then return ()
@@ -145,23 +145,23 @@ spec = do
             property $ \(StakeDelegationTx args) -> monadicIO $ liftIO $ do
                 let (poolId, accId, accSig, tx@(Tx _ inps outs), wits) = args
                 let encode = runPut
-                        $ withHeader MsgTypeDelegation
+                        $ withHeader FragmentDelegation
                         $ putStakeDelegationTx poolId accId accSig inps outs wits
                 let decode =
-                        getStakeDelegationTxMessage . runGet getMessage
+                        getStakeDelegationTxFragment . runGet getFragment
                 tx' <- try' (decode encode)
                 if tx' == Right (poolId, accId, tx, wits)
                 then return ()
                 else expectationFailure $
                     "tx /= decode (encode tx) == " ++ show tx'
   where
-    unMessage :: Message -> (Tx, [TxWitness])
-    unMessage m = case m of
+    unFragment :: Fragment -> (Tx, [TxWitness])
+    unFragment m = case m of
         Transaction stx -> stx
         _ -> error "expected a Transaction message"
 
-    getStakeDelegationTxMessage :: Message -> (PoolId, ChimericAccount, Tx, [TxWitness])
-    getStakeDelegationTxMessage m = case m of
+    getStakeDelegationTxFragment :: Fragment -> (PoolId, ChimericAccount, Tx, [TxWitness])
+    getStakeDelegationTxFragment m = case m of
         StakeDelegation stx -> stx
         _ -> error "expected a Transaction message"
 
diff --git a/lib/jormungandr/test/unit/Cardano/Wallet/Jormungandr/TransactionSpec.hs b/lib/jormungandr/test/unit/Cardano/Wallet/Jormungandr/TransactionSpec.hs
index d82b7842028..70c2fd42a7b 100644
--- a/lib/jormungandr/test/unit/Cardano/Wallet/Jormungandr/TransactionSpec.hs
+++ b/lib/jormungandr/test/unit/Cardano/Wallet/Jormungandr/TransactionSpec.hs
@@ -14,7 +14,7 @@ module Cardano.Wallet.Jormungandr.TransactionSpec
 import Prelude
 
 import Cardano.Wallet.Jormungandr.Binary
-    ( MessageType (..), putSignedTx, runPut, withHeader )
+    ( FragmentSpec (..), putSignedTx, runPut, withHeader )
 import Cardano.Wallet.Jormungandr.Compatibility
     ( Jormungandr )
 import Cardano.Wallet.Jormungandr.Transaction
@@ -439,7 +439,7 @@ goldenTestStdTx tl keystore inps outs bytes' = it title $ do
             (\(Tx _ i o, w) -> hex
                 $ BL.toStrict
                 $ runPut
-                $ withHeader MsgTypeTransaction
+                $ withHeader FragmentTransaction
                 $ putSignedTx i o w)
             tx
     bytes `shouldBe` Right bytes'
diff --git a/nix/jormungandr.nix b/nix/jormungandr.nix
index 74386b6f5bb..0ef2aabb4a3 100644
--- a/nix/jormungandr.nix
+++ b/nix/jormungandr.nix
@@ -35,11 +35,11 @@
 
 let
   release = rec {
-    version = "0.7.0-rc7";
+    version = "0.7.0";
     # Git revision of input-output-hk/jormungandr repo.
     rev = "v${version}";
     # Hash of git repo and all of its submodules.
-    sha256 = "1x4y2snvqc8p1z5l5faqjssr988nqfgplcaz0sf9248cadc8cpg5";
+    sha256 = "0hhbn383z3j06llx887qpx7gmxyy7r1n2m79kx0hshhyd90w7rcs";
     # Hash of all Cargo dependencies.
     cargoSha256 = "0fqpm0a1824dirb3f5d4yw7vb8xrpj03n6gxw7rlfjbhy025spqh";
   };
@@ -47,7 +47,7 @@ let
   windows = rec {
     # URL and hash of windows binary release
     url = "https://github.com/input-output-hk/jormungandr/releases/download/v${release.version}/jormungandr-v${release.version}-x86_64-pc-windows-msvc.zip";
-    sha256 = "06imq6g0i7h0mp0sgkvn2c3lwq7mmx3vbc0m2pfmvmvh4vq4c6s3";
+    sha256 = "16imq6g0i7h0mp0sgkvn2c3lwq7mmx3vbc0m2pfmvmvh4vq4c6s3";
   };
 
   jormungandr-win64 = pkgs.runCommand "jormungandr-win64-${release.version}" {