Merge branch 'master' into swagger

.buildkite/pipeline.yml

@@ -1,40 +1,4 @@
 steps:
-  - label: 'deploy (alpha) 🚀'
-    command:
-      - "./.buildkite/deploy.sh alpha"
-    branches: "alpha"
-    concurrency: 1
-    concurrency_group: "plutus-alpha-deploy"
-    agents:
-      system: x86_64-linux
-
-  - label: 'deploy (production) 🚀'
-    command:
-      - "./.buildkite/deploy.sh production"
-    branches: "production"
-    concurrency: 1
-    concurrency_group: "plutus-production-deploy"
-    agents:
-      system: x86_64-linux
-
-  - label: 'deploy (staging) 🚀'
-    command:
-      - "./.buildkite/deploy.sh staging"
-    branches: "master"
-    concurrency: 1
-    concurrency_group: "plutus-staging-deploy"
-    agents:
-      system: x86_64-linux
-
-  - label: 'deploy (bitte_match) 🚀'
-    command:
-      - "./.buildkite/deploy.sh bitte_match"
-    branches: "bitte"
-    concurrency: 1
-    concurrency_group: "plutus-bitte_match-deploy"
-    agents:
-      system: x86_64-linux
-
   - label: ':shipit: deploy devcontainer image for plutus-starter'
     branches: "plutus-starter-devcontainer/v*"
     command:

bitte/pab.nix

@@ -1,4 +1,4 @@
-{ writeShellScriptBin, writeText, pabExe, staticPkg, cacert, coreutils, lib, gnused }:
+{ writeShellScriptBin, writeText, pabExe, staticPkg, cacert, coreutils, lib, gnused, utillinux }:
 let
   dbFile = "/var/lib/pab/pab-core.db";
 
@@ -78,8 +78,6 @@ let
   pab-init-cmd = writeShellScriptBin "pab-init-cmd" ''
     set -eEuo pipefail
 
-    export PATH=${lib.makeBinPath [ coreutils ]}
-
     echo "[pab-init-cmd]: Dropping PAB database file '${dbFile}'" >&2
     rm -rf ${dbFile}
 
@@ -90,9 +88,11 @@ in
 writeShellScriptBin "entrypoint" ''
   set -eEuo pipefail
 
+  export PATH=${lib.makeBinPath [ coreutils gnused utillinux ]}
+
   export SYSTEM_CERTIFICATE_PATH=${cacert}/etc/ssl/certs/ca-bundle.crt
 
-  ${gnused}/bin/sed -e "s|@WEBSERVER_PORT@|$((PORT_RANGE_BASE))|g" \
+  sed -e "s|@WEBSERVER_PORT@|$((PORT_RANGE_BASE))|g" \
       -e "s|@NODE_PORT@|$((PORT_RANGE_BASE + 1))|g" \
       -e "s|@CHAIN_INDEX_PORT@|$((PORT_RANGE_BASE + 2))|g" \
       -e "s|@SIGNING_PROCESS_PORT@|$((PORT_RANGE_BASE + 3))|g" \
@@ -102,5 +102,10 @@ writeShellScriptBin "entrypoint" ''
 
   ${pab-init-cmd}/bin/pab-init-cmd
 
-  exec ${pabExe} --config=${pabYaml} all-servers
+  # Ugly ugly hack to kill the PAB at midnight UTC
+  ${pabExe} --config=${pabYaml} all-servers&
+  pab_pid=$!
+  sleep $(($(date -f - +%s- <<< $'tomorrow 00:00\nnow')0))
+  kill $pab_pid
+  exit 1
 ''

cabal.project

@@ -185,7 +185,7 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 8efcfc755faae4db3a64ad45343235fce3ed5c47
+  tag: 6b884673ab0bfa120b63a30fb4dc255e3f3a02bc
   subdir:
     byron/chain/executable-spec
     byron/crypto

nix/pkgs/haskell/haskell.nix

@@ -48,7 +48,7 @@ let
       "https://github.com/shmish111/servant-purescript.git"."a76104490499aa72d40c2790d10e9383e0dbde63" = "11nxxmi5bw66va7psvrgrw7b7n85fvqgfp58yva99w3v9q3a50v9";
       "https://github.com/input-output-hk/cardano-base"."46502694f6a9f0498f822068008b232b3837a9e9" = "04bvsvghkrjhfjb3phh0s5yfb37fishglrrlcwbvcv48y2in1dcz";
       "https://github.com/input-output-hk/cardano-crypto.git"."07397f0e50da97eaa0575d93bee7ac4b2b2576ec" = "06sdx5ndn2g722jhpicmg96vsrys89fl81k8290b3lr6b1b0w4m3";
-      "https://github.com/input-output-hk/cardano-ledger-specs"."8efcfc755faae4db3a64ad45343235fce3ed5c47" = "13mj8nqk4jglyl96d6zm3dbjmx2qn5gwn06g7cmanxiwfkfm7bi1";
+      "https://github.com/input-output-hk/cardano-ledger-specs"."6b884673ab0bfa120b63a30fb4dc255e3f3a02bc" = "1lpr35zpp4sqy4lqra24wswwkmaryvgj4rlbkn5n3z79f83jqgz4";
       "https://github.com/input-output-hk/cardano-prelude"."fd773f7a58412131512b9f694ab95653ac430852" = "02jddik1yw0222wd6q0vv10f7y8rdgrlqaiy83ph002f9kjx7mh6";
       "https://github.com/input-output-hk/goblins"."cde90a2b27f79187ca8310b6549331e59595e7ba" = "17c88rbva3iw82yg9srlxjv2ia5wjb9cyqw44hik565f5v9svnyg";
       "https://github.com/input-output-hk/iohk-monitoring-framework"."46f994e216a1f8b36fe4669b47b2a7011b0e153c" = "1il8fx3misp3650ryj368b3x95ksz01zz3x0z9k00807j93d0ka0";

plutus-chain-index/app/Main.hs

@@ -19,6 +19,7 @@ import           Control.Monad.Freer.Extras.Log      (LogLevel (..), LogMessage
 import           Control.Monad.Freer.State           (State, runState)
 import           Control.Monad.Freer.Writer          (runWriter)
 import           Control.Monad.IO.Class              (liftIO)
+import           Control.Tracer                      (nullTracer)
 import qualified Data.Aeson                          as A
 import           Data.Foldable                       (for_, traverse_)
 import           Data.Function                       ((&))
@@ -143,6 +144,7 @@ main = do
 
       putStrLn $ "Connecting to the node using socket: " <> Config.cicSocketPath config
       void $ runChainSync (Config.cicSocketPath config)
+                          nullTracer
                           (Config.cicSlotConfig config)
                           (Config.cicNetworkId  config)
                           []

plutus-chain-index/plutus-chain-index.cabal

@@ -68,6 +68,7 @@ library
         cardano-api -any,
         cardano-ledger-byron -any,
         containers -any,
+        contra-tracer -any,
         cryptonite -any,
         data-default -any,
         exceptions -any,
@@ -85,6 +86,7 @@ library
         ouroboros-consensus-cardano -any,
         ouroboros-consensus-shelley -any,
         prettyprinter >=1.1.0.1,
+        retry -any,
         semigroups -any,
         serialise -any,
         time-units -any,
@@ -144,6 +146,7 @@ executable plutus-chain-index
     cardano-api -any,
     cardano-slotting -any,
     containers -any,
+    contra-tracer -any,
     freer-extras -any,
     freer-simple -any,
     lens -any,