Update dependencies and related code

cabal.project

@@ -109,29 +109,29 @@ package cardano-ledger
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: c845509c307af9df956ef203ac8ad67fe4d5d065
-  --sha256: 1ik5giyjinj5rq8yqxilw87n41c1zjrd83iihnfjnhpwwy86qza3
+  tag: 9d6e0f5efc8fe1bfff4825b3f52e80cdceac07b0
+  --sha256: 19hq5l9xdx1r5mv2aakazvf2xchdrlxdk6ywzdwwhv3g63ayfngn
   subdir: binary
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: c845509c307af9df956ef203ac8ad67fe4d5d065
-  --sha256: 1ik5giyjinj5rq8yqxilw87n41c1zjrd83iihnfjnhpwwy86qza3
+  tag: 9d6e0f5efc8fe1bfff4825b3f52e80cdceac07b0
+  --sha256: 19hq5l9xdx1r5mv2aakazvf2xchdrlxdk6ywzdwwhv3g63ayfngn
   subdir: binary/test
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: c845509c307af9df956ef203ac8ad67fe4d5d065
-  --sha256: 1ik5giyjinj5rq8yqxilw87n41c1zjrd83iihnfjnhpwwy86qza3
+  tag: 9d6e0f5efc8fe1bfff4825b3f52e80cdceac07b0
+  --sha256: 19hq5l9xdx1r5mv2aakazvf2xchdrlxdk6ywzdwwhv3g63ayfngn
   subdir: cardano-crypto-class
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: c845509c307af9df956ef203ac8ad67fe4d5d065
-  --sha256: 1ik5giyjinj5rq8yqxilw87n41c1zjrd83iihnfjnhpwwy86qza3
+  tag: 9d6e0f5efc8fe1bfff4825b3f52e80cdceac07b0
+  --sha256: 19hq5l9xdx1r5mv2aakazvf2xchdrlxdk6ywzdwwhv3g63ayfngn
   subdir: slotting
 
 source-repository-package
@@ -171,43 +171,43 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 1b2a06df9a710f5cc9b511b6ae39c23bcfd04486
-  --sha256: 0qva90k2alhznn88nkxp0ghphhnrynf2sl0n9jccc3q6hycdzxv8
+  tag: 25354e11ed43d59485c404f491a118efe0bd8e70
+  --sha256: 1hcmsc1pis5y9zdfw70jw5xy7y5ji16an82ppsl47r51s8h53lfk
   subdir: byron/chain/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 1b2a06df9a710f5cc9b511b6ae39c23bcfd04486
-  --sha256: 0qva90k2alhznn88nkxp0ghphhnrynf2sl0n9jccc3q6hycdzxv8
+  tag: 25354e11ed43d59485c404f491a118efe0bd8e70
+  --sha256: 1hcmsc1pis5y9zdfw70jw5xy7y5ji16an82ppsl47r51s8h53lfk
   subdir: byron/ledger/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 1b2a06df9a710f5cc9b511b6ae39c23bcfd04486
-  --sha256: 0qva90k2alhznn88nkxp0ghphhnrynf2sl0n9jccc3q6hycdzxv8
+  tag: 25354e11ed43d59485c404f491a118efe0bd8e70
+  --sha256: 1hcmsc1pis5y9zdfw70jw5xy7y5ji16an82ppsl47r51s8h53lfk
   subdir: semantics/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 1b2a06df9a710f5cc9b511b6ae39c23bcfd04486
-  --sha256: 0qva90k2alhznn88nkxp0ghphhnrynf2sl0n9jccc3q6hycdzxv8
+  tag: 25354e11ed43d59485c404f491a118efe0bd8e70
+  --sha256: 1hcmsc1pis5y9zdfw70jw5xy7y5ji16an82ppsl47r51s8h53lfk
   subdir: shelley/chain-and-ledger/dependencies/non-integer
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 1b2a06df9a710f5cc9b511b6ae39c23bcfd04486
-  --sha256: 0qva90k2alhznn88nkxp0ghphhnrynf2sl0n9jccc3q6hycdzxv8
+  tag: 25354e11ed43d59485c404f491a118efe0bd8e70
+  --sha256: 1hcmsc1pis5y9zdfw70jw5xy7y5ji16an82ppsl47r51s8h53lfk
   subdir: shelley/chain-and-ledger/executable-spec
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 1b2a06df9a710f5cc9b511b6ae39c23bcfd04486
-  --sha256: 0qva90k2alhznn88nkxp0ghphhnrynf2sl0n9jccc3q6hycdzxv8
+  tag: 25354e11ed43d59485c404f491a118efe0bd8e70
+  --sha256: 1hcmsc1pis5y9zdfw70jw5xy7y5ji16an82ppsl47r51s8h53lfk
   subdir: shelley/chain-and-ledger/executable-spec/test
 
 source-repository-package
@@ -301,99 +301,99 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 18ef245af8181cf3bc208b71c7c4f8502137dbbb
-  --sha256: 1v0ksjw1fp9md91igya9vlmnvw5z81jylywgwc2svx125k9b79bj
+  tag: e88f0ee194193f93e0e6c8bd2ae33f52bc3c7f0f
+  --sha256: 1wacbhdyy8k9zpd26l73iy011n8fjf6ap08pwidl727gb4ilv47y
   subdir: ouroboros-network
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 18ef245af8181cf3bc208b71c7c4f8502137dbbb
-  --sha256: 1v0ksjw1fp9md91igya9vlmnvw5z81jylywgwc2svx125k9b79bj
+  tag: e88f0ee194193f93e0e6c8bd2ae33f52bc3c7f0f
+  --sha256: 1wacbhdyy8k9zpd26l73iy011n8fjf6ap08pwidl727gb4ilv47y
   subdir: io-sim
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 18ef245af8181cf3bc208b71c7c4f8502137dbbb
-  --sha256: 1v0ksjw1fp9md91igya9vlmnvw5z81jylywgwc2svx125k9b79bj
+  tag: e88f0ee194193f93e0e6c8bd2ae33f52bc3c7f0f
+  --sha256: 1wacbhdyy8k9zpd26l73iy011n8fjf6ap08pwidl727gb4ilv47y
   subdir: ouroboros-network-testing
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 18ef245af8181cf3bc208b71c7c4f8502137dbbb
-  --sha256: 1v0ksjw1fp9md91igya9vlmnvw5z81jylywgwc2svx125k9b79bj
+  tag: e88f0ee194193f93e0e6c8bd2ae33f52bc3c7f0f
+  --sha256: 1wacbhdyy8k9zpd26l73iy011n8fjf6ap08pwidl727gb4ilv47y
   subdir: ouroboros-consensus
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 18ef245af8181cf3bc208b71c7c4f8502137dbbb
-  --sha256: 1v0ksjw1fp9md91igya9vlmnvw5z81jylywgwc2svx125k9b79bj
+  tag: e88f0ee194193f93e0e6c8bd2ae33f52bc3c7f0f
+  --sha256: 1wacbhdyy8k9zpd26l73iy011n8fjf6ap08pwidl727gb4ilv47y
   subdir: ouroboros-consensus/ouroboros-consensus-mock
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 18ef245af8181cf3bc208b71c7c4f8502137dbbb
-  --sha256: 1v0ksjw1fp9md91igya9vlmnvw5z81jylywgwc2svx125k9b79bj
+  tag: e88f0ee194193f93e0e6c8bd2ae33f52bc3c7f0f
+  --sha256: 1wacbhdyy8k9zpd26l73iy011n8fjf6ap08pwidl727gb4ilv47y
   subdir: ouroboros-consensus-byron
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 18ef245af8181cf3bc208b71c7c4f8502137dbbb
-  --sha256: 1v0ksjw1fp9md91igya9vlmnvw5z81jylywgwc2svx125k9b79bj
+  tag: e88f0ee194193f93e0e6c8bd2ae33f52bc3c7f0f
+  --sha256: 1wacbhdyy8k9zpd26l73iy011n8fjf6ap08pwidl727gb4ilv47y
   subdir: ouroboros-consensus-shelley
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 18ef245af8181cf3bc208b71c7c4f8502137dbbb
-  --sha256: 1v0ksjw1fp9md91igya9vlmnvw5z81jylywgwc2svx125k9b79bj
+  tag: e88f0ee194193f93e0e6c8bd2ae33f52bc3c7f0f
+  --sha256: 1wacbhdyy8k9zpd26l73iy011n8fjf6ap08pwidl727gb4ilv47y
   subdir: ouroboros-consensus-cardano
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 18ef245af8181cf3bc208b71c7c4f8502137dbbb
-  --sha256: 1v0ksjw1fp9md91igya9vlmnvw5z81jylywgwc2svx125k9b79bj
+  tag: e88f0ee194193f93e0e6c8bd2ae33f52bc3c7f0f
+  --sha256: 1wacbhdyy8k9zpd26l73iy011n8fjf6ap08pwidl727gb4ilv47y
   subdir: typed-protocols
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 18ef245af8181cf3bc208b71c7c4f8502137dbbb
-  --sha256: 1v0ksjw1fp9md91igya9vlmnvw5z81jylywgwc2svx125k9b79bj
+  tag: e88f0ee194193f93e0e6c8bd2ae33f52bc3c7f0f
+  --sha256: 1wacbhdyy8k9zpd26l73iy011n8fjf6ap08pwidl727gb4ilv47y
   subdir: typed-protocols-examples
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 18ef245af8181cf3bc208b71c7c4f8502137dbbb
-  --sha256: 1v0ksjw1fp9md91igya9vlmnvw5z81jylywgwc2svx125k9b79bj
+  tag: e88f0ee194193f93e0e6c8bd2ae33f52bc3c7f0f
+  --sha256: 1wacbhdyy8k9zpd26l73iy011n8fjf6ap08pwidl727gb4ilv47y
   subdir: ouroboros-network-framework
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 18ef245af8181cf3bc208b71c7c4f8502137dbbb
-  --sha256: 1v0ksjw1fp9md91igya9vlmnvw5z81jylywgwc2svx125k9b79bj
+  tag: e88f0ee194193f93e0e6c8bd2ae33f52bc3c7f0f
+  --sha256: 1wacbhdyy8k9zpd26l73iy011n8fjf6ap08pwidl727gb4ilv47y
   subdir: network-mux
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 18ef245af8181cf3bc208b71c7c4f8502137dbbb
-  --sha256: 1v0ksjw1fp9md91igya9vlmnvw5z81jylywgwc2svx125k9b79bj
+  tag: e88f0ee194193f93e0e6c8bd2ae33f52bc3c7f0f
+  --sha256: 1wacbhdyy8k9zpd26l73iy011n8fjf6ap08pwidl727gb4ilv47y
   subdir: io-sim-classes
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 18ef245af8181cf3bc208b71c7c4f8502137dbbb
-  --sha256: 1v0ksjw1fp9md91igya9vlmnvw5z81jylywgwc2svx125k9b79bj
+  tag: e88f0ee194193f93e0e6c8bd2ae33f52bc3c7f0f
+  --sha256: 1wacbhdyy8k9zpd26l73iy011n8fjf6ap08pwidl727gb4ilv47y
   subdir: Win32-network
 
 source-repository-package

cardano-api/src/Cardano/Api.hs

@@ -150,13 +150,15 @@ import qualified Cardano.Chain.UTxO    as Byron
 
 import qualified Ouroboros.Consensus.Shelley.Protocol.Crypto as Shelley
 import qualified Shelley.Spec.Ledger.Address     as Shelley
+import qualified Shelley.Spec.Ledger.BaseTypes   as Shelley
+import qualified Shelley.Spec.Ledger.Credential  as Shelley
 import qualified Shelley.Spec.Ledger.Keys        as Shelley
 import qualified Shelley.Spec.Ledger.LedgerState as Shelley (minfee)
 import qualified Shelley.Spec.Ledger.PParams     as Shelley
 import qualified Shelley.Spec.Ledger.Slot        as Shelley
 import qualified Shelley.Spec.Ledger.TxData      as Shelley
 import qualified Shelley.Spec.Ledger.Tx          as Shelley
-import qualified Shelley.Spec.Ledger.BaseTypes   as Shelley
+import qualified Shelley.Spec.Ledger.UTxO        as Shelley (hashTxBody)
 
 
 byronGenSigningKey :: IO SigningKey
@@ -526,7 +528,7 @@ shelleyWitnessTransaction txbody (SigningKeyShelley sk) =
     Shelley.WitVKey vk sig
   where
     vk  = Shelley.VKey (deriveVerKeyDSIGN sk)
-    sig = Shelley.signedDSIGN @Shelley.TPraosStandardCrypto sk txbody
+    sig = Shelley.signedDSIGN @Shelley.TPraosStandardCrypto sk (Shelley.hashTxBody txbody)
 
 
 -- Sign Transaction - signTransaction is built over witnesseTransaction/signTransactionWithWitness

cardano-api/src/Cardano/Api/CBOR.hs

@@ -43,7 +43,8 @@ import           Cardano.Api.Types
 import           Cardano.Binary (DecoderError (..), Decoder, Encoding, FromCBOR (..), ToCBOR (..))
 import qualified Cardano.Binary as CBOR
 
-import           Cardano.Crypto.DSIGN.Class (DSIGNAlgorithm (..))
+import           Cardano.Crypto.DSIGN.Class (decodeSignKeyDSIGN, decodeVerKeyDSIGN,
+                     encodeSignKeyDSIGN, encodeVerKeyDSIGN)
 import           Cardano.Prelude
 
 import           Data.ByteString (ByteString)

cardano-api/src/Cardano/Api/TxSubmit.hs

@@ -32,6 +32,7 @@ import           Ouroboros.Network.Mux
 import           Ouroboros.Network.NodeToClient hiding (NodeToClientVersion (..))
 import qualified Ouroboros.Network.NodeToClient as NtC
 import           Ouroboros.Network.Protocol.LocalTxSubmission.Client
+import           Ouroboros.Network.Protocol.LocalTxSubmission.Type (SubmitResult (..))
 
 import           Cardano.Chain.Slotting (EpochSlots (..))
 
@@ -72,8 +73,8 @@ submitTx network socketPath tx =
                       socketPath
                       genTx
           case result of
-            Nothing  -> return TxSubmitSuccess
-            Just err -> return (TxSubmitFailureByron err)
+            SubmitSuccess  -> return TxSubmitSuccess
+            SubmitFail err -> return (TxSubmitFailureByron err)
 
         TxSignedShelley stx -> do
           let genTx = mkShelleyTx stx
@@ -85,8 +86,8 @@ submitTx network socketPath tx =
                       socketPath
                       genTx
           case result of
-            Nothing  -> return TxSubmitSuccess
-            Just err -> return (TxSubmitFailureShelley err)
+            SubmitSuccess  -> return TxSubmitSuccess
+            SubmitFail err -> return (TxSubmitFailureShelley err)
 
 
 submitGenTx
@@ -98,7 +99,7 @@ submitGenTx
   -> Network
   -> SocketPath
   -> GenTx blk
-  -> IO (Maybe (ApplyTxErr blk))
+  -> IO (SubmitResult (ApplyTxErr blk))
 submitGenTx tracer iomgr cfg nm (SocketPath path) genTx = do
     resultVar <- newEmptyTMVarIO
     connectTo
@@ -121,7 +122,7 @@ localInitiatorNetworkApplication
   -- in 'ouroboros-network' package).
   -> ProtocolClientInfo blk
   -> Network
-  -> TMVar (Maybe (ApplyTxErr blk)) -- ^ Result will be placed here
+  -> TMVar (SubmitResult (ApplyTxErr blk)) -- ^ Result will be placed here
   -> GenTx blk
   -> Versions NtC.NodeToClientVersion DictVersion
               (LocalConnectionId
@@ -160,8 +161,8 @@ localInitiatorNetworkApplication tracer cfg nm resultVar genTx =
                             (localTxSubmissionClientPeer
                                (txSubmissionClientSingle tx))
                 case result of
-                  Nothing -> traceWith tracer "Transaction accepted"
-                  Just _  -> traceWith tracer "Transaction rejected"
+                  SubmitSuccess -> traceWith tracer "Transaction accepted"
+                  SubmitFail _  -> traceWith tracer "Transaction rejected"
                 atomically $ putTMVar resultVar result
 
         , localStateQueryProtocol =
@@ -182,7 +183,7 @@ txSubmissionClientSingle
   :: forall tx reject m.
      Applicative m
   => tx
-  -> LocalTxSubmissionClient tx reject m (Maybe reject)
+  -> LocalTxSubmissionClient tx reject m (SubmitResult reject)
 txSubmissionClientSingle tx =
     LocalTxSubmissionClient $
     pure $ SendMsgSubmitTx tx $ \result ->

cardano-api/src/Cardano/Api/Types.hs

@@ -113,8 +113,10 @@ import qualified Cardano.Crypto       as Byron
 --import qualified Cardano.Crypto.Hash                         as HASH
 --import qualified Cardano.Crypto.VRF                          as VRF
 import qualified Ouroboros.Consensus.Shelley.Protocol.Crypto as Shelley
+import qualified Shelley.Spec.Ledger.Address                 as Shelley
 import qualified Shelley.Spec.Ledger.BaseTypes               as Shelley
 import qualified Shelley.Spec.Ledger.Coin                    as Shelley
+import qualified Shelley.Spec.Ledger.Credential              as Shelley
 import qualified Shelley.Spec.Ledger.Delegation.Certificates as Shelley
 import qualified Shelley.Spec.Ledger.Keys                    as Shelley
 import qualified Shelley.Spec.Ledger.PParams                 as Shelley

cardano-api/test/Test/Cardano/Api/Convert.hs

@@ -14,11 +14,13 @@ import qualified Hedgehog as Hedgehog
 
 import           Test.Cardano.Api.Gen
 
-prop_roundtrip_AddressByron_hex :: Property
-prop_roundtrip_AddressByron_hex =
-  Hedgehog.withTests 500 . Hedgehog.property $ do
-    addr <- Hedgehog.forAll genVerificationKeyAddressByron
-    Hedgehog.tripping addr addressToHex addressFromHex
+-- TODO: Uncomment the test below once `Shelley.Spec.Ledger.Address.getByron`
+--       has been implemented and doesn't just `panic`.
+-- prop_roundtrip_AddressByron_hex :: Property
+-- prop_roundtrip_AddressByron_hex =
+--   Hedgehog.withTests 500 . Hedgehog.property $ do
+--     addr <- Hedgehog.forAll genVerificationKeyAddressByron
+--     Hedgehog.tripping addr addressToHex addressFromHex
 
 prop_roundtrip_AddressShelley_hex :: Property
 prop_roundtrip_AddressShelley_hex =

cardano-api/test/Test/Cardano/Api/Gen.hs

@@ -51,7 +51,7 @@ import           Shelley.Spec.Ledger.BaseTypes (Nonce (..),StrictMaybe (..),
                     UnitInterval(..), maybeToStrictMaybe, mkNonce,
                     mkUnitInterval, textToDns, textToUrl)
 import           Shelley.Spec.Ledger.Coin (Coin (..))
-import           Shelley.Spec.Ledger.Crypto
+import           Shelley.Spec.Ledger.Crypto hiding (Network (..))
 import           Shelley.Spec.Ledger.Keys (KeyHash, SignKeyVRF, VerKeyVRF,
                    VKey(..), hash, hashKey)
 import           Shelley.Spec.Ledger.PParams (PParamsUpdate,
@@ -74,8 +74,10 @@ import qualified Hedgehog.Range as Range
 genAddress :: Gen Address
 genAddress =
   Gen.choice
-    [ genVerificationKeyAddressByron
-    , genVerificationKeyAddressShelley
+    [ genVerificationKeyAddressShelley
+    -- TODO: Uncomment the line below once `Shelley.Spec.Ledger.Address.getByron`
+    --       has been implemented and doesn't just `panic`.
+    -- , genVerificationKeyAddressByron
     ]
 
 genCertificate :: Gen Certificate