Marlowe lib updates (#436)

* Added marlowe-cardano-0.1.2.0 From https://github.com/input-output-hk/marlowe-cardano at addc170fecf45c48a9e728b791217879969d0876 * Added marlowe-chain-sync-0.0.4 From https://github.com/input-output-hk/marlowe-cardano at addc170fecf45c48a9e728b791217879969d0876 * Added marlowe-client-0.0.4 From https://github.com/input-output-hk/marlowe-cardano at addc170fecf45c48a9e728b791217879969d0876 * Added marlowe-protocols-0.2.0.0 From https://github.com/input-output-hk/marlowe-cardano at addc170fecf45c48a9e728b791217879969d0876 * Added marlowe-runtime-0.0.4 From https://github.com/input-output-hk/marlowe-cardano at addc170fecf45c48a9e728b791217879969d0876 * Added marlowe-runtime-web-0.0.4 From https://github.com/input-output-hk/marlowe-cardano at addc170fecf45c48a9e728b791217879969d0876 * Added marlowe-test-0.1.3.0 From https://github.com/input-output-hk/marlowe-cardano at addc170fecf45c48a9e728b791217879969d0876 * Added marlowe-object-0.1.0.0 From https://github.com/input-output-hk/marlowe-cardano at addc170fecf45c48a9e728b791217879969d0876 * Update codeowners * Added aeson-record-0.1.0.0 From https://github.com/input-output-hk/marlowe-cardano at 8d95e711e45984b8845f20c51acce98a3da186ee * Add metadata revision for marlowe-object * Don't build marlowe-object with GHC 9 * Add byron-spec-chain revision to prevent hedgehog >= 1.3
IntersectMBO · Aug 14, 2023 · 7119fb4 · 7119fb4
1 parent f3b6e5d
commit 7119fb4
Show file tree

Hide file tree

Showing 14 changed files with 237 additions and 0 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -140,6 +140,7 @@ _sources/eventuo11y-extras   @input-output-hk/marlowe
 _sources/marlowe-cardano     @input-output-hk/marlowe
 _sources/marlowe-chain-sync  @input-output-hk/marlowe
 _sources/marlowe-client      @input-output-hk/marlowe
+_sources/marlowe-object      @input-output-hk/marlowe
 _sources/marlowe-protocols   @input-output-hk/marlowe
 _sources/marlowe-runtime     @input-output-hk/marlowe
 _sources/marlowe-runtime-web @input-output-hk/marlowe

diff --git a/_sources/aeson-record/0.1.0.0/meta.toml b/_sources/aeson-record/0.1.0.0/meta.toml
@@ -0,0 +1,3 @@
+timestamp = 2023-08-14T16:15:22Z
+github = { repo = "input-output-hk/marlowe-cardano", rev = "8d95e711e45984b8845f20c51acce98a3da186ee" }
+subdir = 'libs/aeson-record'
diff --git a/_sources/byron-spec-chain/0.1.0.0/meta.toml b/_sources/byron-spec-chain/0.1.0.0/meta.toml
@@ -1,3 +1,7 @@
 timestamp = 2022-10-17T00:00:00Z
 github = { repo = "input-output-hk/cardano-ledger", rev = "c7c63dabdb215ebdaed8b63274965966f2bf408f" }
 subdir = 'eras/byron/chain/executable-spec'
+
+[[revisions]]
+number = 1
+timestamp = 2023-08-14T17:27:06Z
diff --git a/_sources/byron-spec-chain/0.1.0.0/revisions/1.cabal b/_sources/byron-spec-chain/0.1.0.0/revisions/1.cabal
@@ -0,0 +1,78 @@
+cabal-version: 2.2
+
+name:                byron-spec-chain
+version:             0.1.0.0
+synopsis:            Executable specification of the Cardano blockchain
+-- description:
+homepage:            https://github.com/input-output-hk/cardano-legder-specs
+license:             Apache-2.0
+author:              IOHK Formal Methods Team
+maintainer:          formal.methods@iohk.io
+-- copyright:
+category:            Testing
+build-type:          Simple
+extra-source-files:  ChangeLog.md
+
+common base
+  build-depends:      base >= 4.12 && < 4.15
+
+common project-config
+  default-language:   Haskell2010
+
+  ghc-options:        -Wall
+                      -Wcompat
+                      -Wincomplete-record-updates
+                      -Wincomplete-uni-patterns
+                      -Wredundant-constraints
+                      -Wunused-packages
+
+library
+  import:             base, project-config
+
+  exposed-modules:     Byron.Spec.Chain.STS.Block
+                     , Byron.Spec.Chain.STS.Rule.BBody
+                     , Byron.Spec.Chain.STS.Rule.Bupi
+                     , Byron.Spec.Chain.STS.Rule.Chain
+                     , Byron.Spec.Chain.STS.Rule.Epoch
+                     , Byron.Spec.Chain.STS.Rule.Pbft
+                     , Byron.Spec.Chain.STS.Rule.SigCnt
+
+  hs-source-dirs:      src
+  build-depends:       bimap >=0.4 && <0.5
+                     , bytestring
+                     , cardano-data
+                     , containers
+                     , byron-spec-ledger
+                     , goblins
+                     , hashable
+                     , hedgehog >= 1.0.4 && < 1.3
+                     , microlens
+                     , microlens-th
+                     , small-steps
+                     , small-steps-test
+
+test-suite chain-rules-test
+  import:             base, project-config
+
+  hs-source-dirs:      test
+  main-is:             Main.hs
+  other-modules:       Test.Byron.Spec.Chain.STS.Properties
+                     , Test.Byron.AbstractSize.Properties
+  type:                exitcode-stdio-1.0
+  default-language:    Haskell2010
+  build-depends:       containers
+                     , cardano-data
+                     , data-ordlist
+                     , hedgehog >= 1.0.4 && < 1.3
+                     , microlens
+                     , tasty
+                     , tasty-hedgehog
+                     , tasty-hunit
+                     -- local deps
+                     , byron-spec-chain
+                     , byron-spec-ledger
+                     , small-steps
+                     , small-steps-test
+
+  -- See `byron-spec-ledger.cabal` for an explanation of the options below.
+  ghc-options:         "-with-rtsopts=-K4m -M300m"
diff --git a/_sources/marlowe-cardano/0.1.2.0/meta.toml b/_sources/marlowe-cardano/0.1.2.0/meta.toml
@@ -0,0 +1,3 @@
+timestamp = 2023-08-14T16:15:22Z
+github = { repo = "input-output-hk/marlowe-cardano", rev = "e5ac319e7e5dcc3768bba5714487c7c7ca40cb30" }
+subdir = 'marlowe'
diff --git a/_sources/marlowe-chain-sync/0.0.4/meta.toml b/_sources/marlowe-chain-sync/0.0.4/meta.toml
@@ -0,0 +1,3 @@
+timestamp = 2023-08-14T16:15:22Z
+github = { repo = "input-output-hk/marlowe-cardano", rev = "addc170fecf45c48a9e728b791217879969d0876" }
+subdir = 'marlowe-chain-sync'
diff --git a/_sources/marlowe-client/0.0.4/meta.toml b/_sources/marlowe-client/0.0.4/meta.toml
@@ -0,0 +1,3 @@
+timestamp = 2023-08-14T16:15:22Z
+github = { repo = "input-output-hk/marlowe-cardano", rev = "addc170fecf45c48a9e728b791217879969d0876" }
+subdir = 'marlowe-client'
diff --git a/_sources/marlowe-object/0.1.0.0/meta.toml b/_sources/marlowe-object/0.1.0.0/meta.toml
@@ -0,0 +1,7 @@
+timestamp = 2023-08-14T16:15:22Z
+github = { repo = "input-output-hk/marlowe-cardano", rev = "addc170fecf45c48a9e728b791217879969d0876" }
+subdir = 'marlowe-object'
+
+[[revisions]]
+number = 1
+timestamp = 2023-08-14T16:21:23Z
diff --git a/_sources/marlowe-object/0.1.0.0/revisions/1.cabal b/_sources/marlowe-object/0.1.0.0/revisions/1.cabal
@@ -0,0 +1,122 @@
+cabal-version: 3.0
+name:          marlowe-object
+version:       0.1.0.0
+synopsis:      Object format for Marlowe contracts.
+bug-reports:   https://github.com/input-output-hk/marlowe-marlowe/issues
+license:       Apache-2.0
+author:        Jamie Bertram
+maintainer:    jamie.bertram@iohk.io
+stability:     experimental
+category:      Language
+license-files:
+  LICENSE
+  NOTICE
+
+source-repository head
+  type:     git
+  location: https://github.com/input-output-hk/marlowe-cardano
+  subdir:   marlowe-object
+
+common lang
+  default-language:   Haskell2010
+  default-extensions:
+    BlockArguments
+    DeriveAnyClass
+    DeriveFoldable
+    DeriveFunctor
+    DeriveGeneric
+    DeriveLift
+    DeriveTraversable
+    DerivingStrategies
+    DerivingVia
+    EmptyCase
+    ExplicitForAll
+    GeneralizedNewtypeDeriving
+    LambdaCase
+    NamedFieldPuns
+    NumericUnderscores
+    OverloadedStrings
+    RecordWildCards
+    ScopedTypeVariables
+    StandaloneDeriving
+    TupleSections
+    TypeApplications
+
+  ghc-options:
+    -Wall -Wnoncanonical-monad-instances -Wunused-packages
+    -Wincomplete-uni-patterns -Wincomplete-record-updates
+    -Wredundant-constraints -Widentities
+
+library
+  import:          lang
+  hs-source-dirs:  src
+  exposed-modules:
+    Language.Marlowe.Object.Archive
+    Language.Marlowe.Object.Bundler
+    Language.Marlowe.Object.Link
+    Language.Marlowe.Object.Types
+
+  build-depends:
+    , aeson >=2 && <3
+    , aeson-record ==0.1.0.0
+    , base >=4.9 && <5
+    , base16 ^>=0.3.2
+    , binary ^>=0.8.8
+    , bytestring >=0.10.12 && <0.12
+    , cardano-api ==1.35.4
+    , cardano-ledger-core ==0.1.0.0
+    , dlist ^>=1.0
+    , filepath ^>=1.4
+    , hashable >=1.3 && <2
+    , lens >=5.2 && <6
+    , marlowe-cardano ==0.1.2.0
+    , marlowe-protocols ==0.2.0.0
+    , mtl >=2.2 && <3
+    , pipes ^>=4.3.16
+    , plutus-ledger-api ==1.0.0.1
+    , text >=1.2.4 && <2
+    , time >=1.9 && <2
+    , transformers ^>=0.5.6
+    , unliftio ^>=0.2.1
+    , unordered-containers ^>=0.2.19
+    , zip ^>=1.7.2
+
+library gen
+  import:          lang
+  hs-source-dirs:  gen
+  exposed-modules: Language.Marlowe.Object.Gen
+  build-depends:
+    , base >=4.9 && <5
+    , bytestring >=0.10.12 && <0.12
+    , cardano-api:gen ==1.35.4
+    , hedgehog-quickcheck ^>=0.1
+    , lens >=5.2 && <6
+    , marlowe-object ==0.1.0.0
+    , marlowe-test ==0.1.3.0
+    , QuickCheck >=2.14 && <3
+    , quickcheck-instances ^>=0.3.29
+
+  visibility:      public
+
+test-suite marlowe-object-test
+  import:             lang
+  hs-source-dirs:     test
+  type:               exitcode-stdio-1.0
+  main-is:            Spec.hs
+  other-modules:
+    Language.Marlowe.Object.BundlerSpec
+    Language.Marlowe.Object.LinkSpec
+    Language.Marlowe.Object.TypesSpec
+
+  build-depends:
+    , aeson >=2 && <3
+    , base >=4.9 && <5
+    , binary ^>=0.8.8
+    , hspec
+    , marlowe-object:{marlowe-object, gen}
+    , QuickCheck >=2.14 && <3
+    , quickcheck-classes
+    , unordered-containers ^>=0.2.19
+
+  build-tool-depends: hspec-discover:hspec-discover
+  ghc-options:        -threaded
diff --git a/_sources/marlowe-protocols/0.2.0.0/meta.toml b/_sources/marlowe-protocols/0.2.0.0/meta.toml
@@ -0,0 +1,3 @@
+timestamp = 2023-08-14T16:15:22Z
+github = { repo = "input-output-hk/marlowe-cardano", rev = "addc170fecf45c48a9e728b791217879969d0876" }
+subdir = 'marlowe-protocols'
diff --git a/_sources/marlowe-runtime-web/0.0.4/meta.toml b/_sources/marlowe-runtime-web/0.0.4/meta.toml
@@ -0,0 +1,3 @@
+timestamp = 2023-08-14T16:15:22Z
+github = { repo = "input-output-hk/marlowe-cardano", rev = "addc170fecf45c48a9e728b791217879969d0876" }
+subdir = 'marlowe-runtime-web'
diff --git a/_sources/marlowe-runtime/0.0.4/meta.toml b/_sources/marlowe-runtime/0.0.4/meta.toml
@@ -0,0 +1,3 @@
+timestamp = 2023-08-14T16:15:22Z
+github = { repo = "input-output-hk/marlowe-cardano", rev = "addc170fecf45c48a9e728b791217879969d0876" }
+subdir = 'marlowe-runtime'
diff --git a/_sources/marlowe-test/0.1.3.0/meta.toml b/_sources/marlowe-test/0.1.3.0/meta.toml
@@ -0,0 +1,3 @@
+timestamp = 2023-08-14T16:15:22Z
+github = { repo = "input-output-hk/marlowe-cardano", rev = "addc170fecf45c48a9e728b791217879969d0876" }
+subdir = 'marlowe-test'
diff --git a/flake.nix b/flake.nix
@@ -81,6 +81,7 @@
                 (lib.setAttrByPath [ "ghc927" "marlowe-runtime" ] null)
                 (lib.setAttrByPath [ "ghc927" "marlowe-runtime-web" ] null)
                 (lib.setAttrByPath [ "ghc927" "marlowe-test" ] null)
+                (lib.setAttrByPath [ "ghc927" "marlowe-object" ] null)
                 (lib.setAttrByPath [ "ghc927" "quickcheck-contractmodel" ] null)
               ];
               filtered = builtins.foldl' lib.recursiveUpdate perCompilerDerivations toRemove;