From b0a7c42ff350c5786ea2bc9c5a5affcf8137ad1b Mon Sep 17 00:00:00 2001 From: Johannes Lund Date: Sat, 13 Jun 2020 11:41:37 +0200 Subject: [PATCH] Bump libraries to target most recent cardano-node --- lib/byron/src/Cardano/Wallet/Byron/Network.hs | 4 +- .../Cardano/Wallet/Shelley/Compatibility.hs | 22 +-- .../src/Cardano/Wallet/Shelley/Launch.hs | 4 +- .../src/Cardano/Wallet/Shelley/Network.hs | 6 +- .../src/Cardano/Wallet/Shelley/Transaction.hs | 25 ++- .../data/cardano-node-shelley/genesis.yaml | 1 + .../Wallet/Shelley/CompatibilitySpec.hs | 6 +- nix/.stack.nix/Win32-network.nix | 4 +- nix/.stack.nix/byron-spec-chain.nix | 4 +- nix/.stack.nix/byron-spec-ledger.nix | 4 +- nix/.stack.nix/cardano-api.nix | 5 +- nix/.stack.nix/cardano-cli.nix | 6 +- nix/.stack.nix/cardano-config.nix | 4 +- nix/.stack.nix/cardano-crypto-test.nix | 4 +- nix/.stack.nix/cardano-crypto-wrapper.nix | 4 +- nix/.stack.nix/cardano-ledger-test.nix | 4 +- nix/.stack.nix/cardano-ledger.nix | 4 +- nix/.stack.nix/cardano-node.nix | 4 +- nix/.stack.nix/contra-tracer.nix | 4 +- nix/.stack.nix/io-sim-classes.nix | 4 +- nix/.stack.nix/io-sim.nix | 4 +- nix/.stack.nix/iohk-monitoring.nix | 4 +- nix/.stack.nix/lobemo-backend-aggregation.nix | 4 +- nix/.stack.nix/lobemo-backend-ekg.nix | 4 +- nix/.stack.nix/lobemo-backend-monitoring.nix | 4 +- .../lobemo-backend-trace-forwarder.nix | 4 +- nix/.stack.nix/lobemo-scribe-systemd.nix | 4 +- nix/.stack.nix/network-mux.nix | 4 +- nix/.stack.nix/ntp-client.nix | 4 +- nix/.stack.nix/ouroboros-consensus-byron.nix | 4 +- .../ouroboros-consensus-byronspec.nix | 4 +- .../ouroboros-consensus-cardano.nix | 23 ++- nix/.stack.nix/ouroboros-consensus-mock.nix | 4 +- .../ouroboros-consensus-shelley.nix | 4 +- .../ouroboros-consensus-test-infra.nix | 6 +- nix/.stack.nix/ouroboros-consensus.nix | 4 +- .../ouroboros-network-framework.nix | 4 +- nix/.stack.nix/ouroboros-network-testing.nix | 4 +- nix/.stack.nix/ouroboros-network.nix | 5 +- nix/.stack.nix/shelley-spec-ledger-test.nix | 9 +- nix/.stack.nix/shelley-spec-ledger.nix | 64 ++++++-- nix/.stack.nix/shelley-spec-non-integral.nix | 4 +- nix/.stack.nix/small-steps.nix | 4 +- nix/.stack.nix/tracer-transformers.nix | 4 +- nix/.stack.nix/typed-protocols-examples.nix | 4 +- nix/.stack.nix/typed-protocols.nix | 4 +- nix/sources.json | 8 +- snapshot.yaml | 146 ++++++++++++++++++ stack.yaml | 2 +- 49 files changed, 340 insertions(+), 130 deletions(-) create mode 100644 snapshot.yaml diff --git a/lib/byron/src/Cardano/Wallet/Byron/Network.hs b/lib/byron/src/Cardano/Wallet/Byron/Network.hs index 70fbdf777b3..4b30b239c55 100644 --- a/lib/byron/src/Cardano/Wallet/Byron/Network.hs +++ b/lib/byron/src/Cardano/Wallet/Byron/Network.hs @@ -318,7 +318,7 @@ mkWalletClient -> m (NetworkClient m) mkWalletClient gp chainSyncQ = do responsesBuffer <- atomically newTQueue - pure $ nodeToClientProtocols (const NodeToClientProtocols + pure $ nodeToClientProtocols (const $ pure $ NodeToClientProtocols { localChainSyncProtocol = let fromTip' = @@ -391,7 +391,7 @@ mkTipSyncClient tr np localTxSubmissionQ onTipUpdate onProtocolParamsUpdate = do onTipUpdate tip queryLocalState (getTipPoint tip) - pure $ nodeToClientProtocols (const NodeToClientProtocols + pure $ nodeToClientProtocols (const $ pure $ NodeToClientProtocols { localChainSyncProtocol = let codec = cChainSyncCodec codecs diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs index 3b01a191d51..02dbd3a4ec6 100644 --- a/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs +++ b/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs @@ -120,14 +120,8 @@ import GHC.Stack ( HasCallStack ) import Numeric.Natural ( Natural ) -import Ouroboros.Consensus.BlockchainTime.WallClock.Types - ( SlotLength (..), getSystemStart ) -import Ouroboros.Consensus.Protocol.Abstract - ( SecurityParam (..) ) import Ouroboros.Consensus.Shelley.Ledger ( GenTx, ShelleyHash (..) ) -import Ouroboros.Consensus.Shelley.Node - ( initialFundsPseudoTxIn ) import Ouroboros.Consensus.Shelley.Protocol.Crypto ( TPraosStandardCrypto ) import Ouroboros.Network.Block @@ -170,6 +164,7 @@ import qualified Shelley.Spec.Ledger.BaseTypes as SL import qualified Shelley.Spec.Ledger.BlockChain as SL import qualified Shelley.Spec.Ledger.Coin as SL import qualified Shelley.Spec.Ledger.Credential as SL +import qualified Shelley.Spec.Ledger.Genesis as SL import qualified Shelley.Spec.Ledger.Keys as SL import qualified Shelley.Spec.Ledger.LedgerState as SL import qualified Shelley.Spec.Ledger.PParams as SL @@ -386,10 +381,6 @@ fromTip' gp = fromTip getGenesisBlockHash getEpochLength , getGenesisBlockHash } = gp -fromSlotLength :: SlotLength -> W.SlotLength -fromSlotLength = W.SlotLength - . getSlotLength - -- NOTE: Unsafe conversion from Natural -> Word16 fromMaxTxSize :: Natural -> Quantity "byte" Word16 fromMaxTxSize = @@ -429,6 +420,7 @@ decentralizationLevelFromPParams decentralizationLevelFromPParams pp = either reportInvalidValue W.DecentralizationLevel $ mkPercentage + $ toRational $ SL.intervalValue -- We must invert the value provided: (see function comment) $ invertUnitInterval d @@ -464,13 +456,13 @@ fromGenesisData g = { genesisParameters = W.GenesisParameters { getGenesisBlockHash = dummyGenesisHash , getGenesisBlockDate = - W.StartTime . getSystemStart . sgSystemStart $ g + W.StartTime . sgSystemStart $ g , getSlotLength = - fromSlotLength . sgSlotLength $ g + W.SlotLength $ sgSlotLength g , getEpochLength = W.EpochLength . fromIntegral . unEpochSize . sgEpochLength $ g , getEpochStability = - Quantity . fromIntegral . maxRollbacks . sgSecurityParam $ g + Quantity . fromIntegral . sgSecurityParam $ g , getActiveSlotCoefficient = W.ActiveSlotCoefficient 1.0 } @@ -515,7 +507,7 @@ fromGenesisData g = [W.TxOut (fromShelleyAddress addr) (fromShelleyCoin c)] where W.TxIn pseudoHash _ = fromShelleyTxIn $ - initialFundsPseudoTxIn @TPraosStandardCrypto addr + SL.initialFundsPseudoTxIn @TPraosStandardCrypto addr fromNetworkMagic :: NetworkMagic -> W.ProtocolMagic fromNetworkMagic (NetworkMagic magic) = @@ -559,7 +551,7 @@ fromShelleyCoin (SL.Coin c) = W.Coin $ unsafeCast c -- NOTE: For resolved inputs we have to pass in a dummy value of 0. fromShelleyTx :: SL.Tx TPraosStandardCrypto -> (W.Tx, [W.DelegationCertificate]) -fromShelleyTx (SL.Tx bod@(SL.TxBody ins outs certs _ _ _ _ _) _ _ _) = +fromShelleyTx (SL.Tx bod@(SL.TxBody ins outs certs _ _ _ _ _) _ _) = ( W.Tx (fromShelleyTxId $ SL.txid bod) (map ((,W.Coin 0) . fromShelleyTxIn) (toList ins)) diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Launch.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Launch.hs index 13066b0bafd..85e85a9652f 100644 --- a/lib/shelley/src/Cardano/Wallet/Shelley/Launch.hs +++ b/lib/shelley/src/Cardano/Wallet/Shelley/Launch.hs @@ -182,7 +182,7 @@ parseGenesisData = \case TestnetConfig genesisFile -> do (genesis :: ShelleyGenesis TPraosStandardCrypto) <- ExceptT $ eitherDecode <$> BL.readFile genesisFile - let nm = unNetworkMagic $ sgNetworkMagic genesis + let nm = sgNetworkMagic genesis let (discriminant, vData) = someTestnetDiscriminant $ ProtocolMagic $ fromIntegral nm let (np, block0) = fromGenesisData genesis @@ -434,7 +434,7 @@ genConfig dir severity = do ( dir "node.config" , block0 , networkParameters - , (NodeToClientVersionData nm, nodeToClientCodecCBORTerm) + , (NodeToClientVersionData $ NetworkMagic nm, nodeToClientCodecCBORTerm) ) where source :: FilePath diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Network.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Network.hs index ae2ae0a6da8..ee4282530bc 100644 --- a/lib/shelley/src/Cardano/Wallet/Shelley/Network.hs +++ b/lib/shelley/src/Cardano/Wallet/Shelley/Network.hs @@ -364,7 +364,7 @@ mkWalletClient -> m (NetworkClient m) mkWalletClient gp chainSyncQ = do stash <- atomically newTQueue - pure $ nodeToClientProtocols (const NodeToClientProtocols + pure $ nodeToClientProtocols (const $ return $ NodeToClientProtocols { localChainSyncProtocol = let codec = cChainSyncCodec codecs @@ -393,7 +393,7 @@ mkDelegationRewardsClient -- ^ Communication channel with the LocalStateQuery client -> NetworkClient m mkDelegationRewardsClient tr queryRewardQ = - nodeToClientProtocols (const NodeToClientProtocols + nodeToClientProtocols (const $ return $ NodeToClientProtocols { localChainSyncProtocol = doNothingProtocol @@ -480,7 +480,7 @@ mkTipSyncClient tr np localTxSubmissionQ onTipUpdate onPParamsUpdate = do onTipUpdate tip queryLocalState (getTipPoint tip) - pure $ nodeToClientProtocols (const NodeToClientProtocols + pure $ nodeToClientProtocols (const $ return $ NodeToClientProtocols { localChainSyncProtocol = let codec = cChainSyncCodec $ serialisedCodecs @m diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Transaction.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Transaction.hs index 2eaec2c943e..b09a28507b3 100644 --- a/lib/shelley/src/Cardano/Wallet/Shelley/Transaction.hs +++ b/lib/shelley/src/Cardano/Wallet/Shelley/Transaction.hs @@ -106,6 +106,7 @@ import qualified Shelley.Spec.Ledger.BaseTypes as SL import qualified Shelley.Spec.Ledger.Keys as SL import qualified Shelley.Spec.Ledger.LedgerState as SL import qualified Shelley.Spec.Ledger.Tx as SL +import qualified Shelley.Spec.Ledger.TxData as SL import qualified Shelley.Spec.Ledger.UTxO as SL newTransactionLayer @@ -142,10 +143,10 @@ newTransactionLayer _proxy _protocolMagic epochLength = TransactionLayer (k, pwd) <- lookupPrivateKey keyFrom addr pure $ mkWitness unsigned (getRawKey k, pwd) - let scriptWits = mempty - let metadata = SL.SNothing + let metadata = SL.SNothing - pure $ toSealed $ SL.Tx unsigned addrWits scriptWits metadata + let wits = SL.WitnessSet addrWits mempty mempty + pure $ toSealed $ SL.Tx unsigned wits metadata _mkDelegationJoinTx :: WalletDelegation @@ -174,11 +175,9 @@ newTransactionLayer _proxy _protocolMagic epochLength = TransactionLayer pure $ mkWitness unsigned (getRawKey k, pwd) let certWits = Set.singleton (mkWitness unsigned (getRawKey accXPrv, pwd')) - let scriptWits = - mempty - let wits = Set.unions [addrWits,certWits] + let wits = SL.WitnessSet (Set.union addrWits certWits) mempty mempty - pure $ toSealed $ SL.Tx unsigned wits scriptWits metadata + pure $ toSealed $ SL.Tx unsigned wits metadata _mkDelegationQuitTx :: (k 'AddressK XPrv, Passphrase "encryption") @@ -199,11 +198,9 @@ newTransactionLayer _proxy _protocolMagic epochLength = TransactionLayer pure $ mkWitness unsigned (getRawKey k, pwd) let certWits = Set.singleton (mkWitness unsigned (getRawKey accXPrv, pwd')) - let scriptWits = - mempty - let wits = Set.unions [addrWits,certWits] + let wits = SL.WitnessSet (Set.union addrWits certWits) mempty mempty - pure $ toSealed $ SL.Tx unsigned wits scriptWits metadata + pure $ toSealed $ SL.Tx unsigned wits metadata _estimateMaxNumberOfInputs @@ -223,7 +220,7 @@ _minimumFee -> Fee _minimumFee policy (WithDelegation withDelegation) (CoinSelection inps outs chngs) = computeFee $ SL.txsize $ - SL.Tx unsigned addrWits scriptWits metadata + SL.Tx unsigned wits metadata where computeFee :: Integer -> Fee computeFee size = @@ -231,7 +228,7 @@ _minimumFee policy (WithDelegation withDelegation) (CoinSelection inps outs chng where LinearFee (Quantity a) (Quantity b) (Quantity _unused) = policy - scriptWits = mempty + wits = SL.WitnessSet addrWits mempty mempty metadata = SL.SNothing @@ -280,7 +277,9 @@ mkUnsignedTx ttl ownedIns outs certs = ttl (realFee (snd <$> ownedIns) outs) certs + (Cardano.WithdrawalsShelley $ SL.Wdrl mempty) -- Withdrawals Nothing -- Update + Nothing -- Metadata hash in unsigned diff --git a/lib/shelley/test/data/cardano-node-shelley/genesis.yaml b/lib/shelley/test/data/cardano-node-shelley/genesis.yaml index 2b73d9d01c1..1edbed44dc8 100644 --- a/lib/shelley/test/data/cardano-node-shelley/genesis.yaml +++ b/lib/shelley/test/data/cardano-node-shelley/genesis.yaml @@ -21,6 +21,7 @@ protocolParams: nOpt: 100 rho: 0 poolMinRefund: 0 + minPoolCost: 0 tau: 0 a0: 0 genDelegs: diff --git a/lib/shelley/test/unit/Cardano/Wallet/Shelley/CompatibilitySpec.hs b/lib/shelley/test/unit/Cardano/Wallet/Shelley/CompatibilitySpec.hs index d2bee33788f..25ef37693a4 100644 --- a/lib/shelley/test/unit/Cardano/Wallet/Shelley/CompatibilitySpec.hs +++ b/lib/shelley/test/unit/Cardano/Wallet/Shelley/CompatibilitySpec.hs @@ -59,11 +59,13 @@ import Data.Function import Data.Proxy ( Proxy (..) ) import Data.Ratio - ( (%) ) + ( Ratio, (%) ) import Data.Text ( Text ) import Data.Text.Class ( toText ) +import Data.Word + ( Word64 ) import GHC.TypeLits ( natVal ) import Ouroboros.Consensus.Shelley.Protocol.Crypto @@ -136,7 +138,7 @@ spec = do let mkDecentralizationParam :: SL.UnitInterval -> SL.PParams mkDecentralizationParam i = SL.emptyPParams { SL._d = i } - let testCases :: [(Rational, Text)] + let testCases :: [(Ratio Word64, Text)] testCases = [ (10 % 10, "0.00%") , ( 9 % 10, "10.00%") diff --git a/nix/.stack.nix/Win32-network.nix b/nix/.stack.nix/Win32-network.nix index 2e484a75c8f..6186830d89b 100644 --- a/nix/.stack.nix/Win32-network.nix +++ b/nix/.stack.nix/Win32-network.nix @@ -74,8 +74,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/Win32-network; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/byron-spec-chain.nix b/nix/.stack.nix/byron-spec-chain.nix index f97a170eab1..e429da4bb60 100644 --- a/nix/.stack.nix/byron-spec-chain.nix +++ b/nix/.stack.nix/byron-spec-chain.nix @@ -61,8 +61,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); postUnpack = "sourceRoot+=/byron/chain/executable-spec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/byron-spec-ledger.nix b/nix/.stack.nix/byron-spec-ledger.nix index e21e13b2401..ceb621bffea 100644 --- a/nix/.stack.nix/byron-spec-ledger.nix +++ b/nix/.stack.nix/byron-spec-ledger.nix @@ -82,8 +82,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); postUnpack = "sourceRoot+=/byron/ledger/executable-spec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-api.nix b/nix/.stack.nix/cardano-api.nix index 16489b065ac..ed0178018c7 100644 --- a/nix/.stack.nix/cardano-api.nix +++ b/nix/.stack.nix/cardano-api.nix @@ -97,6 +97,7 @@ (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) + (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) ]; buildable = true; @@ -106,8 +107,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "9925ef37dccbe7f423f3ceb81a5e1da3d924393b"; - sha256 = "1yw5axs33g33znqxjkmjlrgks8ky79mc6lj2f28m2i2qfifyz12y"; + rev = "478230484677e1940291eff6004e93d71692a242"; + sha256 = "0v9f2bn3zq181wdzlkf3klibbmf3jkq5q6sd2y564ramq9yh4k45"; }); postUnpack = "sourceRoot+=/cardano-api; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-cli.nix b/nix/.stack.nix/cardano-cli.nix index 8003bd568b0..bdd78c4dfa9 100644 --- a/nix/.stack.nix/cardano-cli.nix +++ b/nix/.stack.nix/cardano-cli.nix @@ -29,6 +29,7 @@ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."aeson-pretty" or (errorHandler.buildDepError "aeson-pretty")) + (hsPkgs."bech32" or (errorHandler.buildDepError "bech32")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) (hsPkgs."base58-bytestring" or (errorHandler.buildDepError "base58-bytestring")) @@ -104,6 +105,7 @@ "cardano-cli-pioneers" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."bech32" or (errorHandler.buildDepError "bech32")) (hsPkgs."cardano-cli" or (errorHandler.buildDepError "cardano-cli")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) @@ -119,8 +121,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "9925ef37dccbe7f423f3ceb81a5e1da3d924393b"; - sha256 = "1yw5axs33g33znqxjkmjlrgks8ky79mc6lj2f28m2i2qfifyz12y"; + rev = "478230484677e1940291eff6004e93d71692a242"; + sha256 = "0v9f2bn3zq181wdzlkf3klibbmf3jkq5q6sd2y564ramq9yh4k45"; }); postUnpack = "sourceRoot+=/cardano-cli; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-config.nix b/nix/.stack.nix/cardano-config.nix index 2e4aff289c6..c8ebf4005eb 100644 --- a/nix/.stack.nix/cardano-config.nix +++ b/nix/.stack.nix/cardano-config.nix @@ -113,8 +113,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "9925ef37dccbe7f423f3ceb81a5e1da3d924393b"; - sha256 = "1yw5axs33g33znqxjkmjlrgks8ky79mc6lj2f28m2i2qfifyz12y"; + rev = "478230484677e1940291eff6004e93d71692a242"; + sha256 = "0v9f2bn3zq181wdzlkf3klibbmf3jkq5q6sd2y564ramq9yh4k45"; }); postUnpack = "sourceRoot+=/cardano-config; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-crypto-test.nix b/nix/.stack.nix/cardano-crypto-test.nix index d96c2d7a3a7..e1065a877a5 100644 --- a/nix/.stack.nix/cardano-crypto-test.nix +++ b/nix/.stack.nix/cardano-crypto-test.nix @@ -44,8 +44,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); postUnpack = "sourceRoot+=/byron/crypto/test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-crypto-wrapper.nix b/nix/.stack.nix/cardano-crypto-wrapper.nix index 227b6b83ed0..270a58bdde2 100644 --- a/nix/.stack.nix/cardano-crypto-wrapper.nix +++ b/nix/.stack.nix/cardano-crypto-wrapper.nix @@ -69,8 +69,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); postUnpack = "sourceRoot+=/byron/crypto; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-ledger-test.nix b/nix/.stack.nix/cardano-ledger-test.nix index ed3043ed7bd..be2d89e7b9c 100644 --- a/nix/.stack.nix/cardano-ledger-test.nix +++ b/nix/.stack.nix/cardano-ledger-test.nix @@ -65,8 +65,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); postUnpack = "sourceRoot+=/byron/ledger/impl/test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-ledger.nix b/nix/.stack.nix/cardano-ledger.nix index a46c4f3d533..63ccffa23e1 100644 --- a/nix/.stack.nix/cardano-ledger.nix +++ b/nix/.stack.nix/cardano-ledger.nix @@ -133,8 +133,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); postUnpack = "sourceRoot+=/byron/ledger/impl; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-node.nix b/nix/.stack.nix/cardano-node.nix index 495974d0ba7..7e8632d1ab5 100644 --- a/nix/.stack.nix/cardano-node.nix +++ b/nix/.stack.nix/cardano-node.nix @@ -114,8 +114,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "9925ef37dccbe7f423f3ceb81a5e1da3d924393b"; - sha256 = "1yw5axs33g33znqxjkmjlrgks8ky79mc6lj2f28m2i2qfifyz12y"; + rev = "478230484677e1940291eff6004e93d71692a242"; + sha256 = "0v9f2bn3zq181wdzlkf3klibbmf3jkq5q6sd2y564ramq9yh4k45"; }); postUnpack = "sourceRoot+=/cardano-node; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/contra-tracer.nix b/nix/.stack.nix/contra-tracer.nix index bd700630474..147f34c7e38 100644 --- a/nix/.stack.nix/contra-tracer.nix +++ b/nix/.stack.nix/contra-tracer.nix @@ -34,8 +34,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "71df15f7b888d2671f619cc632080aaaaca48087"; - sha256 = "02shwi4qppf88biq2y9amfzkzif9j0fdj0d77zdjrfjacldvc6ci"; + rev = "2a1afe23d88b91027f972dd7c70cd4aadfb19768"; + sha256 = "0azd8m9qqvpmlqaddyi41iyksx08zn4ffyngmg83psp74l6dwzyf"; }); postUnpack = "sourceRoot+=/contra-tracer; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/io-sim-classes.nix b/nix/.stack.nix/io-sim-classes.nix index 23db9381b2c..61a01b130c4 100644 --- a/nix/.stack.nix/io-sim-classes.nix +++ b/nix/.stack.nix/io-sim-classes.nix @@ -51,8 +51,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/io-sim-classes; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/io-sim.nix b/nix/.stack.nix/io-sim.nix index 1fa6a87ed92..128c535dd5e 100644 --- a/nix/.stack.nix/io-sim.nix +++ b/nix/.stack.nix/io-sim.nix @@ -55,8 +55,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/io-sim; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/iohk-monitoring.nix b/nix/.stack.nix/iohk-monitoring.nix index 9b0f2cf3497..0b59cb0d18f 100644 --- a/nix/.stack.nix/iohk-monitoring.nix +++ b/nix/.stack.nix/iohk-monitoring.nix @@ -108,8 +108,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "71df15f7b888d2671f619cc632080aaaaca48087"; - sha256 = "02shwi4qppf88biq2y9amfzkzif9j0fdj0d77zdjrfjacldvc6ci"; + rev = "2a1afe23d88b91027f972dd7c70cd4aadfb19768"; + sha256 = "0azd8m9qqvpmlqaddyi41iyksx08zn4ffyngmg83psp74l6dwzyf"; }); postUnpack = "sourceRoot+=/iohk-monitoring; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-backend-aggregation.nix b/nix/.stack.nix/lobemo-backend-aggregation.nix index f04f3cf5283..eaf3d154f81 100644 --- a/nix/.stack.nix/lobemo-backend-aggregation.nix +++ b/nix/.stack.nix/lobemo-backend-aggregation.nix @@ -47,8 +47,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "71df15f7b888d2671f619cc632080aaaaca48087"; - sha256 = "02shwi4qppf88biq2y9amfzkzif9j0fdj0d77zdjrfjacldvc6ci"; + rev = "2a1afe23d88b91027f972dd7c70cd4aadfb19768"; + sha256 = "0azd8m9qqvpmlqaddyi41iyksx08zn4ffyngmg83psp74l6dwzyf"; }); postUnpack = "sourceRoot+=/plugins/backend-aggregation; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-backend-ekg.nix b/nix/.stack.nix/lobemo-backend-ekg.nix index 100128313b8..b8ad81f5daa 100644 --- a/nix/.stack.nix/lobemo-backend-ekg.nix +++ b/nix/.stack.nix/lobemo-backend-ekg.nix @@ -47,8 +47,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "71df15f7b888d2671f619cc632080aaaaca48087"; - sha256 = "02shwi4qppf88biq2y9amfzkzif9j0fdj0d77zdjrfjacldvc6ci"; + rev = "2a1afe23d88b91027f972dd7c70cd4aadfb19768"; + sha256 = "0azd8m9qqvpmlqaddyi41iyksx08zn4ffyngmg83psp74l6dwzyf"; }); postUnpack = "sourceRoot+=/plugins/backend-ekg; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-backend-monitoring.nix b/nix/.stack.nix/lobemo-backend-monitoring.nix index 7a67bd564d9..152d0d9f49e 100644 --- a/nix/.stack.nix/lobemo-backend-monitoring.nix +++ b/nix/.stack.nix/lobemo-backend-monitoring.nix @@ -83,8 +83,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "71df15f7b888d2671f619cc632080aaaaca48087"; - sha256 = "02shwi4qppf88biq2y9amfzkzif9j0fdj0d77zdjrfjacldvc6ci"; + rev = "2a1afe23d88b91027f972dd7c70cd4aadfb19768"; + sha256 = "0azd8m9qqvpmlqaddyi41iyksx08zn4ffyngmg83psp74l6dwzyf"; }); postUnpack = "sourceRoot+=/plugins/backend-monitoring; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-backend-trace-forwarder.nix b/nix/.stack.nix/lobemo-backend-trace-forwarder.nix index 54c85e52f7a..4bc7d98ff41 100644 --- a/nix/.stack.nix/lobemo-backend-trace-forwarder.nix +++ b/nix/.stack.nix/lobemo-backend-trace-forwarder.nix @@ -47,8 +47,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "71df15f7b888d2671f619cc632080aaaaca48087"; - sha256 = "02shwi4qppf88biq2y9amfzkzif9j0fdj0d77zdjrfjacldvc6ci"; + rev = "2a1afe23d88b91027f972dd7c70cd4aadfb19768"; + sha256 = "0azd8m9qqvpmlqaddyi41iyksx08zn4ffyngmg83psp74l6dwzyf"; }); postUnpack = "sourceRoot+=/plugins/backend-trace-forwarder; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-scribe-systemd.nix b/nix/.stack.nix/lobemo-scribe-systemd.nix index 0415cbc2375..35834c2dcb6 100644 --- a/nix/.stack.nix/lobemo-scribe-systemd.nix +++ b/nix/.stack.nix/lobemo-scribe-systemd.nix @@ -48,8 +48,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "71df15f7b888d2671f619cc632080aaaaca48087"; - sha256 = "02shwi4qppf88biq2y9amfzkzif9j0fdj0d77zdjrfjacldvc6ci"; + rev = "2a1afe23d88b91027f972dd7c70cd4aadfb19768"; + sha256 = "0azd8m9qqvpmlqaddyi41iyksx08zn4ffyngmg83psp74l6dwzyf"; }); postUnpack = "sourceRoot+=/plugins/scribe-systemd; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/network-mux.nix b/nix/.stack.nix/network-mux.nix index beadc81837b..c8b4a366a47 100644 --- a/nix/.stack.nix/network-mux.nix +++ b/nix/.stack.nix/network-mux.nix @@ -104,8 +104,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/network-mux; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ntp-client.nix b/nix/.stack.nix/ntp-client.nix index 85dd47a8d61..18bfd15cb90 100644 --- a/nix/.stack.nix/ntp-client.nix +++ b/nix/.stack.nix/ntp-client.nix @@ -67,8 +67,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ntp-client; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus-byron.nix b/nix/.stack.nix/ouroboros-consensus-byron.nix index 938b6a7f3c0..ace2ca2123f 100644 --- a/nix/.stack.nix/ouroboros-consensus-byron.nix +++ b/nix/.stack.nix/ouroboros-consensus-byron.nix @@ -95,8 +95,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-consensus-byron; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus-byronspec.nix b/nix/.stack.nix/ouroboros-consensus-byronspec.nix index a76d39bc2e0..d6b4466ce88 100644 --- a/nix/.stack.nix/ouroboros-consensus-byronspec.nix +++ b/nix/.stack.nix/ouroboros-consensus-byronspec.nix @@ -52,8 +52,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-consensus-byronspec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus-cardano.nix b/nix/.stack.nix/ouroboros-consensus-cardano.nix index 3c63a1291b3..df1e5237562 100644 --- a/nix/.stack.nix/ouroboros-consensus-cardano.nix +++ b/nix/.stack.nix/ouroboros-consensus-cardano.nix @@ -30,10 +30,23 @@ "library" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."binary" or (errorHandler.buildDepError "binary")) + (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) + (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) (hsPkgs."ouroboros-consensus-byron" or (errorHandler.buildDepError "ouroboros-consensus-byron")) (hsPkgs."ouroboros-consensus-mock" or (errorHandler.buildDepError "ouroboros-consensus-mock")) @@ -45,11 +58,16 @@ "test" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."binary" or (errorHandler.buildDepError "binary")) + (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) (hsPkgs."cardano-ledger-test" or (errorHandler.buildDepError "cardano-ledger-test")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) @@ -61,6 +79,7 @@ (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) (hsPkgs."ouroboros-consensus-test-infra" or (errorHandler.buildDepError "ouroboros-consensus-test-infra")) (hsPkgs."ouroboros-consensus-byron" or (errorHandler.buildDepError "ouroboros-consensus-byron")) + (hsPkgs."ouroboros-consensus-byron-test" or (errorHandler.buildDepError "ouroboros-consensus-byron-test")) (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) (hsPkgs."ouroboros-consensus-shelley-test" or (errorHandler.buildDepError "ouroboros-consensus-shelley-test")) (hsPkgs."ouroboros-consensus-cardano" or (errorHandler.buildDepError "ouroboros-consensus-cardano")) @@ -72,8 +91,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-consensus-cardano; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus-mock.nix b/nix/.stack.nix/ouroboros-consensus-mock.nix index 3162dd551e7..e6a315f16aa 100644 --- a/nix/.stack.nix/ouroboros-consensus-mock.nix +++ b/nix/.stack.nix/ouroboros-consensus-mock.nix @@ -75,8 +75,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-consensus/ouroboros-consensus-mock; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus-shelley.nix b/nix/.stack.nix/ouroboros-consensus-shelley.nix index 42450d727ab..5521ed5a51b 100644 --- a/nix/.stack.nix/ouroboros-consensus-shelley.nix +++ b/nix/.stack.nix/ouroboros-consensus-shelley.nix @@ -55,8 +55,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-consensus-shelley; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus-test-infra.nix b/nix/.stack.nix/ouroboros-consensus-test-infra.nix index 2ac5ea05ff2..9640038fbdd 100644 --- a/nix/.stack.nix/ouroboros-consensus-test-infra.nix +++ b/nix/.stack.nix/ouroboros-consensus-test-infra.nix @@ -49,7 +49,9 @@ (hsPkgs."quickcheck-state-machine" or (errorHandler.buildDepError "quickcheck-state-machine")) (hsPkgs."random" or (errorHandler.buildDepError "random")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) + (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) @@ -80,8 +82,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-consensus/ouroboros-consensus-test-infra; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus.nix b/nix/.stack.nix/ouroboros-consensus.nix index 7fc81832887..2f29d422036 100644 --- a/nix/.stack.nix/ouroboros-consensus.nix +++ b/nix/.stack.nix/ouroboros-consensus.nix @@ -163,8 +163,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-consensus; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-network-framework.nix b/nix/.stack.nix/ouroboros-network-framework.nix index 812d4787077..fc0254d5455 100644 --- a/nix/.stack.nix/ouroboros-network-framework.nix +++ b/nix/.stack.nix/ouroboros-network-framework.nix @@ -116,8 +116,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-network-framework; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-network-testing.nix b/nix/.stack.nix/ouroboros-network-testing.nix index 820f153fc40..648bc75d32f 100644 --- a/nix/.stack.nix/ouroboros-network-testing.nix +++ b/nix/.stack.nix/ouroboros-network-testing.nix @@ -38,8 +38,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-network-testing; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-network.nix b/nix/.stack.nix/ouroboros-network.nix index 4b161ab493e..6fb97a3e5e0 100644 --- a/nix/.stack.nix/ouroboros-network.nix +++ b/nix/.stack.nix/ouroboros-network.nix @@ -33,6 +33,7 @@ (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."async" or (errorHandler.buildDepError "async")) + (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) @@ -184,8 +185,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-network; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/shelley-spec-ledger-test.nix b/nix/.stack.nix/shelley-spec-ledger-test.nix index 62ec7edd55b..5a21e8d54eb 100644 --- a/nix/.stack.nix/shelley-spec-ledger-test.nix +++ b/nix/.stack.nix/shelley-spec-ledger-test.nix @@ -26,13 +26,17 @@ components = { "library" = { depends = [ + (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."bytestring-conversion" or (errorHandler.buildDepError "bytestring-conversion")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-crypto-test" or (errorHandler.buildDepError "cardano-crypto-test")) + (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-prelude-test" or (errorHandler.buildDepError "cardano-prelude-test")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) @@ -51,6 +55,7 @@ (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) ]; buildable = true; @@ -59,8 +64,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); postUnpack = "sourceRoot+=/shelley/chain-and-ledger/executable-spec/test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/shelley-spec-ledger.nix b/nix/.stack.nix/shelley-spec-ledger.nix index ef8cec28784..ec3cee9a5b3 100644 --- a/nix/.stack.nix/shelley-spec-ledger.nix +++ b/nix/.stack.nix/shelley-spec-ledger.nix @@ -28,29 +28,35 @@ depends = [ (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) (hsPkgs."binary" or (errorHandler.buildDepError "binary")) + (hsPkgs."binary" or (errorHandler.buildDepError "binary")) + (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-crypto" or (errorHandler.buildDepError "cardano-crypto")) + (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."cborg-json" or (errorHandler.buildDepError "cborg-json")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) - (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."network" or (errorHandler.buildDepError "network")) (hsPkgs."shelley-spec-non-integral" or (errorHandler.buildDepError "shelley-spec-non-integral")) + (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) - (hsPkgs."network" or (errorHandler.buildDepError "network")) - (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) - (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) - (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) - (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) - (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (hsPkgs."bimap" or (errorHandler.buildDepError "bimap")) + (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) + (hsPkgs."goblins" or (errorHandler.buildDepError "goblins")) ]; buildable = true; }; @@ -58,6 +64,7 @@ "shelley-spec-ledger-test" = { depends = [ (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) (hsPkgs."binary" or (errorHandler.buildDepError "binary")) @@ -65,8 +72,12 @@ (hsPkgs."bytestring-conversion" or (errorHandler.buildDepError "bytestring-conversion")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-crypto-test" or (errorHandler.buildDepError "cardano-crypto-test")) + (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) + (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) (hsPkgs."cardano-ledger-test" or (errorHandler.buildDepError "cardano-ledger-test")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-prelude-test" or (errorHandler.buildDepError "cardano-prelude-test")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) @@ -86,7 +97,36 @@ (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) + (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) + ]; + buildable = true; + }; + }; + benchmarks = { + "mainbench" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-crypto" or (errorHandler.buildDepError "cardano-crypto")) + (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) + (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."bytestring-conversion" or (errorHandler.buildDepError "bytestring-conversion")) + (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."criterion" or (errorHandler.buildDepError "criterion")) + (hsPkgs."random" or (errorHandler.buildDepError "random")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."MonadRandom" or (errorHandler.buildDepError "MonadRandom")) ]; buildable = true; }; @@ -95,8 +135,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); postUnpack = "sourceRoot+=/shelley/chain-and-ledger/executable-spec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/shelley-spec-non-integral.nix b/nix/.stack.nix/shelley-spec-non-integral.nix index c0b8bd1b0e0..a0480451049 100644 --- a/nix/.stack.nix/shelley-spec-non-integral.nix +++ b/nix/.stack.nix/shelley-spec-non-integral.nix @@ -42,8 +42,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); postUnpack = "sourceRoot+=/shelley/chain-and-ledger/dependencies/non-integer; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/small-steps.nix b/nix/.stack.nix/small-steps.nix index 0772ca6a13b..9e788f47653 100644 --- a/nix/.stack.nix/small-steps.nix +++ b/nix/.stack.nix/small-steps.nix @@ -88,8 +88,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); postUnpack = "sourceRoot+=/semantics/executable-spec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/tracer-transformers.nix b/nix/.stack.nix/tracer-transformers.nix index 9307acfc2ef..ede79a31da5 100644 --- a/nix/.stack.nix/tracer-transformers.nix +++ b/nix/.stack.nix/tracer-transformers.nix @@ -57,8 +57,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "71df15f7b888d2671f619cc632080aaaaca48087"; - sha256 = "02shwi4qppf88biq2y9amfzkzif9j0fdj0d77zdjrfjacldvc6ci"; + rev = "2a1afe23d88b91027f972dd7c70cd4aadfb19768"; + sha256 = "0azd8m9qqvpmlqaddyi41iyksx08zn4ffyngmg83psp74l6dwzyf"; }); postUnpack = "sourceRoot+=/tracer-transformers; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/typed-protocols-examples.nix b/nix/.stack.nix/typed-protocols-examples.nix index 832a739d854..625044e0eaf 100644 --- a/nix/.stack.nix/typed-protocols-examples.nix +++ b/nix/.stack.nix/typed-protocols-examples.nix @@ -57,8 +57,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/typed-protocols-examples; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/typed-protocols.nix b/nix/.stack.nix/typed-protocols.nix index 7279406b7bf..2aa26b2708a 100644 --- a/nix/.stack.nix/typed-protocols.nix +++ b/nix/.stack.nix/typed-protocols.nix @@ -35,8 +35,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/typed-protocols; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/sources.json b/nix/sources.json index 10dc5154974..22f2ab46ac5 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -1,14 +1,14 @@ { "cardano-node": { - "branch": "1.13.0", + "branch": "master", "description": null, "homepage": null, "owner": "input-output-hk", "repo": "cardano-node", - "rev": "9925ef37dccbe7f423f3ceb81a5e1da3d924393b", - "sha256": "1yw5axs33g33znqxjkmjlrgks8ky79mc6lj2f28m2i2qfifyz12y", + "rev": "478230484677e1940291eff6004e93d71692a242", + "sha256": "0v9f2bn3zq181wdzlkf3klibbmf3jkq5q6sd2y564ramq9yh4k45", "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-node/archive/9925ef37dccbe7f423f3ceb81a5e1da3d924393b.tar.gz", + "url": "https://github.com/input-output-hk/cardano-node/archive/478230484677e1940291eff6004e93d71692a242.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "haskell.nix": { diff --git a/snapshot.yaml b/snapshot.yaml new file mode 100644 index 00000000000..95f18764f1a --- /dev/null +++ b/snapshot.yaml @@ -0,0 +1,146 @@ +name: cardano-1.13.0 + +resolver: lts-14.25 + +packages: +- base16-0.1.2.1 +- base58-bytestring-0.1.0 +- base64-0.4.1 +- bimap-0.4.0 +- binary-0.8.7.0 +- brick-0.47 +- canonical-json-0.6.0.0 +- clock-0.8 +- config-ini-0.2.4.0 +- connection-0.3.1 +- containers-0.5.11.0 +- data-clist-0.1.2.2 +- dns-3.0.4 +- generic-monoid-0.1.0.0 +- generics-sop-0.5.1.0 +- gray-code-0.3.1 +- hedgehog-1.0.2 +- hspec-2.7.0 +- hspec-core-2.7.0 +- hspec-discover-2.7.0 +- io-streams-1.5.1.0 +- io-streams-haproxy-1.0.1.0 +- katip-0.8.4.0 +- libsystemd-journal-1.4.4 +- micro-recursion-schemes-5.0.2.2 +- moo-1.2 +- network-3.1.1.1 +- prometheus-2.1.2 +- quickcheck-instances-0.3.19 +- QuickCheck-2.12.6.1 +- quiet-0.2 +- snap-core-1.0.4.1 +- snap-server-1.1.1.1 +- sop-core-0.5.0.1 +- statistics-linreg-0.3 +- streaming-binary-0.3.0.1 +- systemd-2.3.0 +- tasty-hedgehog-1.0.0.2 +- text-1.2.4.0 +- text-zipper-0.10.1 +- th-lift-instances-0.1.14 +- time-units-1.0.0 +- transformers-except-0.1.1 +- Unique-0.4.7.6 +- websockets-0.12.6.1 +- Win32-2.6.2.0 +- word-wrap-0.4.1 + +- git: https://github.com/input-output-hk/cardano-base + commit: 4a457f44e68132ce2bd978ab45a3188e64327abc + subdirs: + - binary + - binary/test + - cardano-crypto-class + - slotting + +- git: https://github.com/input-output-hk/cardano-crypto + commit: 2547ad1e80aeabca2899951601079408becbc92c + +- git: https://github.com/input-output-hk/cardano-ledger-specs + commit: 036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3 + subdirs: + - byron/ledger/impl + - byron/crypto + - byron/ledger/impl/test + - byron/crypto/test + - byron/chain/executable-spec + - byron/ledger/executable-spec + - semantics/executable-spec + - shelley/chain-and-ledger/dependencies/non-integer + - shelley/chain-and-ledger/executable-spec + - shelley/chain-and-ledger/executable-spec/test + +- git: https://github.com/input-output-hk/cardano-node + commit: 478230484677e1940291eff6004e93d71692a242 + subdirs: + - cardano-api + - cardano-cli + - cardano-config + - cardano-node + +- git: https://github.com/input-output-hk/cardano-prelude + commit: e0257be9d745a04f85ab8287a48a9c193acafec8 + subdirs: + - . + - test + +- git: https://github.com/input-output-hk/cardano-shell + commit: 601bb4324c258e3c8cbd2d532e5696fd09e2582e + subdirs: + - cardano-shell + +- git: https://github.com/input-output-hk/cardano-sl-x509 + commit: 43a036c5bbe68ca2e9cbe611eab7982e2348fe49 + +- git: https://github.com/input-output-hk/goblins + commit: 26d35ad52fe9ade3391532dbfeb2f416f07650bc + +- git: https://github.com/input-output-hk/iohk-monitoring-framework + commit: 2a1afe23d88b91027f972dd7c70cd4aadfb19768 + subdirs: + - contra-tracer + - iohk-monitoring + - plugins/backend-aggregation + - plugins/backend-ekg + - plugins/backend-monitoring + - plugins/scribe-systemd + - tracer-transformers + - plugins/backend-trace-forwarder + +- git: https://github.com/input-output-hk/ouroboros-network + commit: f9469fa3885aefdfa852216a66c4e319a0d19c11 + subdirs: + - io-sim + - io-sim-classes + - network-mux + - ntp-client + - Win32-network + - ouroboros-consensus + - ouroboros-consensus-byron + - ouroboros-consensus-byronspec + - ouroboros-consensus-cardano + - ouroboros-consensus-shelley + - ouroboros-consensus/ouroboros-consensus-mock + - ouroboros-consensus/ouroboros-consensus-test-infra + - ouroboros-network + - ouroboros-network-framework + - ouroboros-network-testing + - typed-protocols + - typed-protocols-examples + +- git: https://github.com/well-typed/cborg + commit: 42a83192749774268337258f4f94c97584b80ca6 + subdirs: + - cborg + +- git: https://github.com/snoyberg/http-client.git + commit: 1a75bdfca014723dd5d40760fad854b3f0f37156 + subdirs: + - http-client + diff --git a/stack.yaml b/stack.yaml index 23cee3046f7..09c0f3fdafb 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: https://raw.githubusercontent.com/input-output-hk/cardano-haskell/0055f4dee47f966f1cb45e03610dac727c87e0a8/snapshots/cardano-1.13.0.yaml +resolver: snapshot.yaml packages: - lib/core