wip

input-output-hk · Feb 19, 2024 · c2e9cc7 · c2e9cc7
1 parent e43b0fb
commit c2e9cc7
Show file tree

Hide file tree

Showing 35 changed files with 2,357 additions and 180 deletions.
diff --git a/README.adoc b/README.adoc
@@ -180,7 +180,7 @@ maps to the volume (one-liner: `docker volume inspect marlowe-cardano_shared | j
 To use this with `cardano-cli`:
 
 ----
-export CARDANO_NODE_SOCKET_PATH=$(docker volume inspect marlowe-cardano_shared | jq -r '.[].Mountpoint')
+export CARDANO_NODE_SOCKET_PATH=$(docker volume inspect sanchonet-integration_shared | jq -r '.[].Mountpoint')
 # -E passes the current environment to sudo
 sudo -E cardano-cli ...
 ----

diff --git a/activate-cardano-nodesocket-path b/activate-cardano-nodesocket-path
@@ -0,0 +1,8 @@
+export CARDANO_NODE_SOCKET_PATH=$(docker volume inspect sanchonet-integration_shared | jq -r '.[].Mountpoint')/node.socket
+sudo chmod o+xrw $CARDANO_NODE_SOCKET_PATH
+sudo chmod o+rx $(dirname $CARDANO_NODE_SOCKET_PATH)
+sudo chmod o+rx $(dirname $(dirname $CARDANO_NODE_SOCKET_PATH))
+sudo chmod o+rx $(dirname $(dirname $(dirname $CARDANO_NODE_SOCKET_PATH)))
+sudo chmod o+rx $(dirname $(dirname $(dirname $(dirname $CARDANO_NODE_SOCKET_PATH))))
+sudo chmod o+rx $(dirname $(dirname $(dirname $(dirname $(dirname $CARDANO_NODE_SOCKET_PATH)))))
+export CARDANO_NODE_CONFIG=$(ps aux | grep 'cardano-node run' | grep -v grep | sed 's/.* --config \([^ ]*\).*/\1/')
diff --git a/cabal.project b/cabal.project
@@ -1,5 +1,5 @@
 repository cardano-haskell-packages
-  url: https://input-output-hk.github.io/cardano-haskell-packages
+  url: https://chap.intersectmbo.org/
   secure: True
   root-keys:
     3e0cce471cf09815f930210f7827266fd09045445d65923e6d0238a6cd15126f
@@ -14,10 +14,10 @@ repository cardano-haskell-packages
 -- We duplicate the hackage index-state first for haskell.nix, even though cabal ignores it.
 -- This must always match the hackage index-state on the next line.
 -- See https://github.com/input-output-hk/haskell.nix/issues/1869#issuecomment-1449272480
-index-state: 2024-02-01T00:00:00Z
+index-state: 2024-02-15T11:36:53Z
 index-state:
-  , hackage.haskell.org      2024-02-01T00:00:00Z
-  , cardano-haskell-packages 2024-02-01T00:00:00Z
+    hackage.haskell.org 2024-02-15T11:36:53Z
+  , cardano-haskell-packages 2024-02-14T10:17:08Z
 
 packages:
   async-components
@@ -194,13 +194,8 @@ source-repository-package
   --sha256: sha256-69iE7LrigHTSKJrgq6uGU+U4j+NtBwR4ae18vsLyVvI=
   subdir: core
 
--- These constraints needed for plutus-apps
 constraints:
-  -- 0.3.6.2 switched from cryptonite to crypton, and this causes linker
-  -- failures when other packages depend on cryptonite.
-  -- Can be removed when this is resolved: https://github.com/snoyberg/http-client/issues/508
-  http-client-tls < 0.3.6.2,
-  ouroboros-network-framework ==0.10.1.0
+  quickcheck-state-machine ==0.9.0
 
 allow-newer:
   primitive,
@@ -226,6 +221,12 @@ source-repository-package
 source-repository-package
    type: git
    location: https://github.com/intersectMBO/cardano-api
-   tag: 8a539a8e63d8c410a329e3bc028d8339f32e4c8f
+   tag: cardano-api-8.38.0.2
    subdir: cardano-api
-   --sha256: 0r2zi4is8ayjryq80b144zcfl95ylx60gjp9n1qdcr1hcyrm76aj
+   --sha256: 0pxwzw6yc0iwwm198fwbbgyyi7dqsg5vxy1by3isjwyhafm2a7qr
+
+source-repository-package
+   type: git
+   location: https://github.com/stevana/quickcheck-state-machine
+   tag: v0.9.0
+   --sha256: 0iwzvhpnr0b2qgbf13cdvkj1h1xr1v9dy4v0qy41r1qcljxajcbs
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -14,7 +14,7 @@
 
     marlowe-plutus.url = "github:input-output-hk/marlowe-plutus";
 
-    cardano-node.url = "github:input-output-hk/cardano-node?ref=8.7.3";
+    cardano-node.url = "github:input-output-hk/cardano-node?ref=8.8.0-pre";
 
     iogx = {
       url = "github:input-output-hk/iogx";

diff --git a/libs/plutus-ledger-ada/plutus-ledger-ada.cabal b/libs/plutus-ledger-ada/plutus-ledger-ada.cabal
@@ -46,8 +46,8 @@ library
   -- Other IOG dependencies
   --------------------------
   build-depends:
-    , plutus-ledger-api ^>=1.15
-    , plutus-tx ^>=1.15
+    , plutus-ledger-api ^>=1.21
+    , plutus-tx ^>=1.21
 
   ------------------------
   -- Non-IOG dependencies

diff --git a/libs/plutus-ledger-aeson/plutus-ledger-aeson.cabal b/libs/plutus-ledger-aeson/plutus-ledger-aeson.cabal
@@ -40,9 +40,9 @@ library
   -- Other IOG dependencies
   --------------------------
   build-depends:
-    , plutus-core ^>=1.15
-    , plutus-ledger-api ^>=1.15
-    , plutus-tx ^>=1.15
+    , plutus-ledger-api ^>=1.21
+    , plutus-tx ^>=1.21
+    , plutus-core ^>=1.21
 
   ------------------------
   -- Non-IOG dependencies

diff --git a/libs/plutus-ledger-slot/plutus-ledger-slot.cabal b/libs/plutus-ledger-slot/plutus-ledger-slot.cabal
@@ -48,8 +48,8 @@ library
   -- Other IOG dependencies
   --------------------------
   build-depends:
-    , plutus-ledger-api ^>=1.15
-    , plutus-tx ^>=1.15
+    , plutus-ledger-api ^>=1.21
+    , plutus-tx ^>=1.21
 
   -- We don't need plutus ledger here but
   -- we have orphans collision.

diff --git a/marlowe-actus/marlowe-actus.cabal b/marlowe-actus/marlowe-actus.cabal
@@ -37,7 +37,7 @@ library
     , base
     , marlowe-cardano
     , mtl
-    , plutus-ledger-api ^>=1.15
+    , plutus-ledger-api ^>=1.21
     , plutus-tx
     , time
     , validation

diff --git a/marlowe-apps/marlowe-apps.cabal b/marlowe-apps/marlowe-apps.cabal
@@ -30,7 +30,7 @@ library
     , async
     , base >=4.9 && <5
     , bytestring
-    , cardano-api ^>=8.37
+    , cardano-api ^>=8.38
     , containers
     , data-default
     , eventuo11y >=0.9 && <0.11
@@ -96,7 +96,7 @@ executable marlowe-oracle
     , base >=4.9 && <5
     , base16-aeson
     , bytestring
-    , cardano-api ^>=8.37
+    , cardano-api ^>=8.38
     , eventuo11y >=0.9 && <0.11
     , eventuo11y-dsl ^>=0.2
     , eventuo11y-json ^>=0.3.0.3
@@ -108,7 +108,7 @@ executable marlowe-oracle
     , marlowe-runtime
     , mtl
     , optparse-applicative
-    , plutus-ledger-api ^>=1.15
+    , plutus-ledger-api ^>=1.21
     , process
     , servant
     , servant-client

diff --git a/marlowe-benchmark/example/ReadMe.md b/marlowe-benchmark/example/ReadMe.md
@@ -60,6 +60,12 @@ source environment
 podman play kube --replace=true --start=false benchmark-preprod.yaml
 ```
 
+marlowe-benchmark \
+  --node-socket-path $CARDANO_NODE_SOCKET_PATH \
+  --network-magic 4 \
+  --address $FAUCET_ADDRESS \
+  --signing-key-file faucet.skey \
+  --out-file results.json
 
 ## 4. Measure the performance of syncing from genesis
 

diff --git a/marlowe-chain-sync/marlowe-chain-sync.cabal b/marlowe-chain-sync/marlowe-chain-sync.cabal
@@ -75,19 +75,19 @@ library
     , base16 ^>=0.3.2
     , binary ^>=0.8.8
     , bytestring >=0.10.12 && <0.12
-    , cardano-api ^>=8.37
+    , cardano-api ^>=8.38
     , cardano-binary
     , cardano-crypto-class
     , cardano-crypto-wrapper ^>=1.5
-    , cardano-ledger-allegra ^>=1.2
-    , cardano-ledger-alonzo ^>=1.5
-    , cardano-ledger-babbage ^>=1.5
-    , cardano-ledger-binary ^>=1.2
+    , cardano-ledger-allegra ^>=1.3
+    , cardano-ledger-alonzo ^>=1.6
+    , cardano-ledger-babbage ^>=1.6
+    , cardano-ledger-binary ^>=1.3
     , cardano-ledger-byron ^>=1.0
-    , cardano-ledger-conway ^>=1.11
-    , cardano-ledger-core ^>=1.9
-    , cardano-ledger-mary ^>=1.4
-    , cardano-ledger-shelley ^>=1.8
+    , cardano-ledger-conway ^>=1.12
+    , cardano-ledger-core ^>=1.10
+    , cardano-ledger-mary ^>=1.5
+    , cardano-ledger-shelley ^>=1.9
     , cassava
     , containers ^>=0.6.5
     , deepseq
@@ -96,10 +96,10 @@ library
     , hs-opentelemetry-api ^>=0.0.3
     , marlowe-protocols ==0.3.0.0
     , nonempty-containers ^>=0.3.4
-    , ouroboros-consensus ^>=0.14
+    , ouroboros-consensus ^>=0.15
     , ouroboros-consensus-cardano
-    , plutus-core ^>=1.15
-    , plutus-ledger-api ^>=1.15
+    , plutus-ledger-api ^>=1.21
+    , plutus-core ^>=1.21
     , scientific
     , serialise ^>=0.2.6
     , sop-core
@@ -128,7 +128,7 @@ library libchainsync
     , async-components ==0.1.1.0
     , base >=4.9 && <5
     , bytestring >=0.10.12 && <0.12
-    , cardano-api ^>=8.37
+    , cardano-api ^>=8.38
     , cardano-binary
     , co-log ^>=0.6
     , containers ^>=0.6.5
@@ -144,7 +144,7 @@ library libchainsync
     , marlowe-chain-sync ==0.0.6
     , marlowe-protocols ==0.3.0.0
     , nonempty-containers ^>=0.3.4
-    , ouroboros-network-protocols ^>=0.6.0
+    , ouroboros-network-protocols ^>=0.7.0
     , stm ^>=2.5
     , text ^>=2.0
     , transformers ^>=0.5.6
@@ -169,12 +169,12 @@ library chain-indexer
     , base >=4.9 && <5
     , base16 ^>=0.3.2
     , bytestring >=0.10.12 && <0.12
-    , cardano-api ^>=8.37
+    , cardano-api ^>=8.38
     , cardano-crypto-wrapper ^>=1.5
-    , cardano-ledger-alonzo ^>=1.5
+    , cardano-ledger-alonzo ^>=1.6
     , cardano-ledger-byron ^>=1.0
-    , cardano-ledger-core ^>=1.9
-    , cardano-ledger-shelley ^>=1.8
+    , cardano-ledger-core ^>=1.10
+    , cardano-ledger-shelley ^>=1.9
     , cardano-strict-containers
     , cassava
     , co-log ^>=0.6
@@ -211,13 +211,13 @@ library plutus-compat
   build-depends:
     , base >=4.9 && <5
     , base16 ^>=0.3.2
-    , cardano-api ^>=8.37
-    , cardano-ledger-binary ^>=1.2
+    , cardano-api ^>=8.38
+    , cardano-ledger-binary ^>=1.3
     , cardano-ledger-byron ^>=1.0
     , containers ^>=0.6.5
     , marlowe-chain-sync ==0.0.6
-    , plutus-ledger-api ^>=1.15
-    , plutus-tx ^>=1.15
+    , plutus-ledger-api ^>=1.21
+    , plutus-tx ^>=1.21
 
 library gen
   import:          lang
@@ -228,14 +228,14 @@ library gen
   build-depends:
     , base >=4.9 && <5
     , bytestring >=0.10.12 && <0.12
-    , cardano-api ^>=8.37
+    , cardano-api ^>=8.38
     , cardano-api-gen ^>=8.1
     , containers ^>=0.6.5
     , hedgehog-quickcheck ^>=0.1
     , marlowe-chain-sync ==0.0.6
     , marlowe-protocols ==0.3.0.0
     , nonempty-containers ^>=0.3.4
-    , ouroboros-consensus ^>=0.14
+    , ouroboros-consensus ^>=0.15
     , QuickCheck >=2.14 && <3
     , sop-core
     , sop-extras
@@ -277,7 +277,7 @@ executable marlowe-chain-indexer
     , async-components ==0.1.1.0
     , base >=4.9 && <5
     , bytestring >=0.10.12 && <0.12
-    , cardano-api ^>=8.37
+    , cardano-api ^>=8.38
     , cardano-crypto-wrapper ^>=1.5
     , cardano-ledger-byron ^>=1.0
     , eventuo11y >=0.9 && <0.11
@@ -310,7 +310,7 @@ executable marlowe-chain-sync
     , async-components ==0.1.1.0
     , base >=4.9 && <5
     , bytestring >=0.10.12 && <0.12
-    , cardano-api ^>=8.37
+    , cardano-api ^>=8.38
     , eventuo11y >=0.9 && <0.11
     , eventuo11y-extras ==0.1.1.0
     , eventuo11y-otel ^>=0.1
@@ -339,7 +339,7 @@ executable marlowe-chain-copy
   build-depends:
     , base >=4.9 && <5
     , bytestring >=0.10.12 && <0.12
-    , cardano-api ^>=8.37
+    , cardano-api ^>=8.38
     , cassava
     , marlowe-chain-sync ==0.0.6
     , optparse-applicative

diff --git a/marlowe-cli/ReadMe.md b/marlowe-cli/ReadMe.md
@@ -158,6 +158,7 @@ marlowe-cli --help
       --version                Show version.
       --alonzo-era             Read and write Alonzo transactions
       --babbage-era            Read and write Babbage transactions
+      --conway-era             Read and write Conway transactions
 
     High-level commands:
       run                      Run a contract.