diff --git a/cabal.project b/cabal.project index 593b460da8..717167fdc9 100644 --- a/cabal.project +++ b/cabal.project @@ -13,8 +13,8 @@ repository cardano-haskell-packages -- See CONTRIBUTING.adoc for how to update index-state index-state: - , hackage.haskell.org 2023-08-03T00:00:00Z - , cardano-haskell-packages 2023-07-27T00:00:00Z + , hackage.haskell.org 2023-08-23T00:00:00Z + , cardano-haskell-packages 2023-08-23T00:00:00Z packages: cardano-node-emulator cardano-node-socket-emulator @@ -32,6 +32,8 @@ packages: cardano-node-emulator plutus-script-utils plutus-tx-constraints plutus-use-cases + /Users/sjoerdvisscher/Documents/GitHub/quickcheck-contractmodel/quickcheck-contractmodel + /Users/sjoerdvisscher/Documents/GitHub/quickcheck-contractmodel/quickcheck-threatmodel -- We never, ever, want this. write-ghc-environment-files: never @@ -62,17 +64,34 @@ allow-newer: , docopt:template-haskell , *:vector -- temporary - , quickcheck-contractmodel:* , cardano-wallet:cardano-api + , cardano-testnet:cardano-api , ouroboros-consensus-byron:* allow-older: strict-containers:binary,containers + , marconi-chain-index:* constraints: dependent-sum-template >= 0.2 , docopt >= 0.7.0.7 - , strict-containers ^>= 0.2 + , strict-containers ^>= 0.2, + plutus-tx >= 1.5.0 && < 1.6, + cardano-api >= 8.2.0 && < 8.3, + cardano-strict-containers >= 0.1.2 && < 0.2, + cardano-slotting >= 0.1.1 && < 0.2, + cardano-ledger-binary >= 1.1.1 && < 1.2, + cardano-ledger-allegra >= 1.1.1 && < 1.2, + cardano-ledger-core >= 1.2.0 && < 1.3, + cardano-ledger-shelley >= 1.2.0 && < 1.3, + cardano-ledger-alonzo >= 1.2.1 && < 1.3, + cardano-ledger-api >= 1.2.0 && < 1.3, + cardano-ledger-babbage >= 1.2.1 && < 1.3, + ouroboros-consensus >= 0.7.0 && < 0.8, + ouroboros-consensus-cardano >= 0.6.0 && < 0.7, + + optparse-applicative-fork < 0.18, + optparse-applicative < 0.18 -- The plugin will typically fail when producing Haddock documentation. However, -- in this instance you can simply tell it to defer any errors to runtime (which @@ -95,8 +114,6 @@ package plutus-contract-model -- For dev work we don't care about performance so much, so this is okay. package cardano-ledger-alonzo optimization: False -package ouroboros-consensus-shelley - optimization: False package ouroboros-consensus-cardano optimization: False package cardano-api @@ -137,16 +154,14 @@ source-repository-package tag: 6b55f96d57a181f898eb2a50531d3ae4280c549c --sha256: 0yygam995i3mawk6hfgxb6v918phvqzyipzhjflff0l6zfrldy7f subdir: - -- cardano-addresses-cli command-line - -- cardano-addresses core source-repository-package type: git location: https://github.com/input-output-hk/marconi - tag: 7285a3bc1ae53bf672c7cc2359210c6c29fbce44 + tag: 6a747440d3289e55c3e8b76d3e3f13fe8202b438 + --sha256: sha256-QrfxWBQdOWYAVxzUIPTr5BjnLgMNv9NCcu4l9nbru/8= subdir: - cardano-streaming marconi-chain-index marconi-core diff --git a/cardano-node-socket-emulator/cardano-node-socket-emulator.cabal b/cardano-node-socket-emulator/cardano-node-socket-emulator.cabal index e0a867128d..9efef9c779 100644 --- a/cardano-node-socket-emulator/cardano-node-socket-emulator.cabal +++ b/cardano-node-socket-emulator/cardano-node-socket-emulator.cabal @@ -63,10 +63,8 @@ library , iohk-monitoring , memory , ouroboros-consensus - , ouroboros-consensus-byron , ouroboros-consensus-cardano , ouroboros-consensus-protocol - , ouroboros-consensus-shelley , ouroboros-network , ouroboros-network-framework , plutus-core >=1.0.0 diff --git a/flake.lock b/flake.lock index b6cef3e7e3..084c968270 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1690341504, - "narHash": "sha256-RWMP2yOu1/k6hUpQqn1PZ/n1e07lkiZjIGK6ZK+EAns=", + "lastModified": 1693988844, + "narHash": "sha256-0fvQy6GxgSkpufa0QeEtYNEY4G5nSQ7L4VIkGdfTt+w=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "21f05b352252442b483677211ad401e9458e802e", + "rev": "27f047c00b5d079e6322a3eab53549cad9e77680", "type": "github" }, "original": { @@ -336,11 +336,11 @@ "hackage-nix": { "flake": false, "locked": { - "lastModified": 1691022320, - "narHash": "sha256-P8/QsT2Jn25R2GzQqBhBv7ghKVybVC0G0st2njicz84=", + "lastModified": 1693959895, + "narHash": "sha256-qLmbEucG4NTA507cQzhsqnE3nJqUSVAALQX6MgzDwGo=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "c7abe023b3352f1202b3dd09d7e5ce8a9ed09058", + "rev": "d0d990c3a8daba50aee6ee31794cb87226f4e18f", "type": "github" }, "original": { diff --git a/plutus-ledger/plutus-ledger.cabal b/plutus-ledger/plutus-ledger.cabal index d15ba27207..43ae9f912d 100644 --- a/plutus-ledger/plutus-ledger.cabal +++ b/plutus-ledger/plutus-ledger.cabal @@ -114,7 +114,7 @@ library -- Other IOG dependencies -------------------------- build-depends: - , cardano-api >=8.0 + , cardano-api >=8.0 , cardano-binary , cardano-crypto , cardano-crypto-class @@ -128,10 +128,9 @@ library , cardano-slotting , data-default , iohk-monitoring - , ouroboros-consensus-shelley - , plutus-core >=1.0.0 - , plutus-ledger-api >=1.0.0 - , plutus-tx >=1.0.0 + , plutus-core >=1.0.0 + , plutus-ledger-api >=1.0.0 + , plutus-tx >=1.0.0 ------------------------ -- Non-IOG dependencies diff --git a/plutus-pab-executables/plutus-pab-executables.cabal b/plutus-pab-executables/plutus-pab-executables.cabal index ba8df233e9..7838e4d7ad 100644 --- a/plutus-pab-executables/plutus-pab-executables.cabal +++ b/plutus-pab-executables/plutus-pab-executables.cabal @@ -449,9 +449,8 @@ executable pab-cli -- Other IOG dependencies -------------------------- build-depends: - , cardano-api >=8.0 + , cardano-api >=8.0 , cardano-ledger-shelley - , ouroboros-consensus-shelley ------------------------ -- Non-IOG dependencies