Decouple indexing from evaluation

IntersectMBO · Feb 19, 2025 · e59f594 · e59f594
1 parent 43dda5f
commit e59f594
Show file tree

Hide file tree

Showing 44 changed files with 1,378 additions and 156 deletions.
diff --git a/.envrc → index-script-evaluations/.envrc b/.envrc → index-script-evaluations/.envrc
diff --git a/index-script-evaluations/cabal.project b/index-script-evaluations/cabal.project
@@ -0,0 +1,24 @@
+repository cardano-haskell-packages
+  url: https://chap.intersectmbo.org/
+  secure: True
+  root-keys:
+    3e0cce471cf09815f930210f7827266fd09045445d65923e6d0238a6cd15126f
+    443abb7fb497a134c343faf52f0b659bd7999bc06b7f63fa76dc99d631f9bea1
+    a86a1f6ce86c449c46666bda44268677abf29b5b2d2eb5ec7af903ec2f117a82
+    bcec67e8e99cabfa7764d75ad9b158d72bfacf70ca1d0ec8bc6b4406d1bf8413
+    c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
+    d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
+
+index-state:
+  , hackage.haskell.org 2025-02-14T10:33:49Z
+  , cardano-haskell-packages 2025-02-11T21:18:23Z
+
+write-ghc-environment-files: never
+tests: true
+benchmarks: true
+test-show-details: direct
+
+packages: .
+
+package postgresql-libpq
+  flags: +use-pkg-config
diff --git a/...valuation/deserialise-scripts/exe/Main.hs → ...aluations/deserialise-scripts/exe/Main.hs b/...valuation/deserialise-scripts/exe/Main.hs → ...aluations/deserialise-scripts/exe/Main.hs
diff --git a/...uation/deserialise-scripts/exe/Options.hs → ...ations/deserialise-scripts/exe/Options.hs b/...uation/deserialise-scripts/exe/Options.hs → ...ations/deserialise-scripts/exe/Options.hs
diff --git a/...on/deserialise-scripts/lib/Deserialise.hs → ...ns/deserialise-scripts/lib/Deserialise.hs b/...on/deserialise-scripts/lib/Deserialise.hs → ...ns/deserialise-scripts/lib/Deserialise.hs
diff --git a/...ipt-evaluation/dump-script-events/Main.hs → ...pt-evaluations/dump-script-events/Main.hs b/...ipt-evaluation/dump-script-events/Main.hs → ...pt-evaluations/dump-script-events/Main.hs
diff --git a/...-evaluation/dump-script-events/Options.hs → ...evaluations/dump-script-events/Options.hs b/...-evaluation/dump-script-events/Options.hs → ...evaluations/dump-script-events/Options.hs
diff --git a/flake.lock → index-script-evaluations/flake.lock b/flake.lock → index-script-evaluations/flake.lock
diff --git a/flake.nix → index-script-evaluations/flake.nix b/flake.nix → index-script-evaluations/flake.nix
diff --git a/...evaluation/plutus-script-evaluation.cabal → ...valuations/index-script-evaluations.cabal b/...evaluation/plutus-script-evaluation.cabal → ...valuations/index-script-evaluations.cabal
@@ -1,5 +1,5 @@
 cabal-version: 3.0
-name:          plutus-script-evaluation
+name:          index-script-evaluations
 version:       0.1.0.0
 
 common lang
@@ -47,6 +47,10 @@ library
   import:          lang
   hs-source-dirs:  lib
   exposed-modules:
+    Database
+    Database.Orphans
+    Database.Query
+    Database.Schema
     Dump
     FileStorage
     LedgerEvents.FileWriter
@@ -56,47 +60,32 @@ library
     Types
 
   build-depends:
-    , base                                         >=4.9      && <5
+    , aeson
+    , base                                         >=4.9       && <5
     , base16-bytestring
+    , bytestring
     , cardano-api                                  ^>=10.4
     , cardano-ledger-alonzo
     , cardano-ledger-core
     , cardano-slotting                             ^>=0.2.0.0
     , deepseq
     , dlist
+    , int-cast
+    , murmur-hash                                  ^>=0.1.0.10
+    , opaleye
     , ouroboros-consensus
     , ouroboros-consensus-cardano
     , path
     , path-io
+    , plutus-core
     , plutus-ledger-api
     , plutus-ledger-api:plutus-ledger-api-testlib
+    , postgresql-simple
+    , product-profunctors
     , serialise
     , string-interpolate                           ^>=0.3
     , text
     , transformers
-
--- Internal library for database access
-library lib-database
-  import:          lang
-  hs-source-dirs:  database
-  exposed-modules:
-    Database
-    Database.Orphans
-    Database.Query
-    Database.Schema
-
-  build-depends:
-    , aeson
-    , base                 >=4.9       && <5
-    , bytestring
-    , cardano-slotting
-    , int-cast
-    , murmur-hash          ^>=0.1.0.10
-    , opaleye
-    , plutus-core
-    , plutus-ledger-api
-    , postgresql-simple
-    , product-profunctors
     , unliftio-core
 
 -- Executable for dumping script events to file system
@@ -110,9 +99,9 @@ executable dump-script-events
     , base                      >=4.9   && <5
     , bytestring
     , cardano-api               ^>=10.4
+    , index-script-evaluations
     , optparse-applicative
     , path
-    , plutus-script-evaluation
     , postgresql-simple
     , with-utf8
 
@@ -133,7 +122,7 @@ executable load-script-events
     , cardano-api               ^>=10.4
     , cardano-ledger-binary
     , cardano-ledger-core
-    , lib-database
+    , index-script-evaluations
     , lib-deserialise-scripts
     , lib-materialise-views
     , murmur-hash
@@ -142,7 +131,6 @@ executable load-script-events
     , path-io
     , plutus-core
     , plutus-ledger-api
-    , plutus-script-evaluation
     , postgresql-simple
     , pretty-show
     , serialise
@@ -157,11 +145,11 @@ library lib-deserialise-scripts
   exposed-modules: Deserialise
   build-depends:
     , aeson
-    , base                >=4.9 && <5
+    , base                      >=4.9 && <5
     , base64
     , bytestring
     , cborg
-    , lib-database
+    , index-script-evaluations
     , mtl
     , plutus-core
     , plutus-ledger-api
@@ -184,7 +172,6 @@ executable deserialise-scripts
     , base64
     , bytestring
     , cborg
-    , lib-database
     , lib-deserialise-scripts
     , mtl
     , optparse-applicative
@@ -216,37 +203,7 @@ executable materialise-views
   build-depends:
     , base                   >=4.9 && <5
     , bytestring
-    , lib-database
     , lib-materialise-views
     , optparse-applicative
     , postgresql-simple
     , with-utf8
-
--- Executabe for evaluating scripts
-executable evaluate-scripts
-  import:         lang
-  hs-source-dirs: evaluate-scripts
-  main-is:        Main.hs
-  ghc-options:    -threaded -with-rtsopts=-N
-  other-modules:
-    Evaluate
-    Options
-
-  build-depends:
-    , base                        >=4.9 && <5
-    , bytestring
-    , cardano-slotting
-    , containers
-    , lib-database
-    , murmur-hash
-    , optparse-applicative
-    , plutus-ledger-api
-    , postgresql-simple
-    , prettyprinter-configurable
-    , serialise
-    , text
-    , time
-    , transformers
-    , unliftio
-    , unliftio-core
-    , with-utf8
diff --git a/...us-script-evaluation/database/Database.hs → index-script-evaluations/lib/Database.hs b/...us-script-evaluation/database/Database.hs → index-script-evaluations/lib/Database.hs
diff --git a/...t-evaluation/database/Database/Orphans.hs → ...cript-evaluations/lib/Database/Orphans.hs b/...t-evaluation/database/Database/Orphans.hs → ...cript-evaluations/lib/Database/Orphans.hs
diff --git a/...ipt-evaluation/database/Database/Query.hs → ...-script-evaluations/lib/Database/Query.hs b/...ipt-evaluation/database/Database/Query.hs → ...-script-evaluations/lib/Database/Query.hs
diff --git a/...pt-evaluation/database/Database/Schema.hs → ...script-evaluations/lib/Database/Schema.hs b/...pt-evaluation/database/Database/Schema.hs → ...script-evaluations/lib/Database/Schema.hs
diff --git a/plutus-script-evaluation/lib/Dump.hs → index-script-evaluations/lib/Dump.hs b/plutus-script-evaluation/lib/Dump.hs → index-script-evaluations/lib/Dump.hs
diff --git a/plutus-script-evaluation/lib/FileStorage.hs → index-script-evaluations/lib/FileStorage.hs b/plutus-script-evaluation/lib/FileStorage.hs → index-script-evaluations/lib/FileStorage.hs
diff --git a/...evaluation/lib/LedgerEvents/FileWriter.hs → ...valuations/lib/LedgerEvents/FileWriter.hs b/...evaluation/lib/LedgerEvents/FileWriter.hs → ...valuations/lib/LedgerEvents/FileWriter.hs
diff --git a/plutus-script-evaluation/lib/LedgerStates.hs → index-script-evaluations/lib/LedgerStates.hs b/plutus-script-evaluation/lib/LedgerStates.hs → index-script-evaluations/lib/LedgerStates.hs
diff --git a/plutus-script-evaluation/lib/Render.hs → index-script-evaluations/lib/Render.hs b/plutus-script-evaluation/lib/Render.hs → index-script-evaluations/lib/Render.hs
diff --git a/plutus-script-evaluation/lib/Streaming.hs → index-script-evaluations/lib/Streaming.hs b/plutus-script-evaluation/lib/Streaming.hs → index-script-evaluations/lib/Streaming.hs
diff --git a/plutus-script-evaluation/lib/Types.hs → index-script-evaluations/lib/Types.hs b/plutus-script-evaluation/lib/Types.hs → index-script-evaluations/lib/Types.hs
diff --git a/...ad-script-events/LedgerEvents/DbLoader.hs → ...ad-script-events/LedgerEvents/DbLoader.hs b/...ad-script-events/LedgerEvents/DbLoader.hs → ...ad-script-events/LedgerEvents/DbLoader.hs
diff --git a/...ipt-evaluation/load-script-events/Load.hs → ...pt-evaluations/load-script-events/Load.hs b/...ipt-evaluation/load-script-events/Load.hs → ...pt-evaluations/load-script-events/Load.hs
diff --git a/...ipt-evaluation/load-script-events/Main.hs → ...pt-evaluations/load-script-events/Main.hs b/...ipt-evaluation/load-script-events/Main.hs → ...pt-evaluations/load-script-events/Main.hs
diff --git a/...-evaluation/load-script-events/Options.hs → ...evaluations/load-script-events/Options.hs b/...-evaluation/load-script-events/Options.hs → ...evaluations/load-script-events/Options.hs
diff --git a/...-evaluation/materialise-views/exe/Main.hs → ...evaluations/materialise-views/exe/Main.hs b/...-evaluation/materialise-views/exe/Main.hs → ...evaluations/materialise-views/exe/Main.hs
diff --git a/...aluation/materialise-views/exe/Options.hs → ...luations/materialise-views/exe/Options.hs b/...aluation/materialise-views/exe/Options.hs → ...luations/materialise-views/exe/Options.hs
diff --git a/...tion/materialise-views/lib/Materialise.hs → ...ions/materialise-views/lib/Materialise.hs b/...tion/materialise-views/lib/Materialise.hs → ...ions/materialise-views/lib/Materialise.hs
diff --git a/nix/outputs.nix → index-script-evaluations/nix/outputs.nix b/nix/outputs.nix → index-script-evaluations/nix/outputs.nix
diff --git a/nix/project.nix → index-script-evaluations/nix/project.nix b/nix/project.nix → index-script-evaluations/nix/project.nix
@@ -29,7 +29,7 @@ let
         "https://chap.intersectmbo.org/" = inputs.CHaP;
       };
 
-      name = "plutus-script-evaluation";
+      name = "index-script-evaluations";
 
       compiler-nix-name = lib.mkDefault "ghc96";
 

diff --git a/nix/shell.nix → index-script-evaluations/nix/shell.nix b/nix/shell.nix → index-script-evaluations/nix/shell.nix
@@ -1,18 +1,18 @@
 # Docs for this file: https://github.com/input-output-hk/iogx/blob/main/doc/api.md#mkhaskellprojectinshellargs
 # See `shellArgs` in `mkHaskellProject` in ./project.nix for more details.
 
-{ repoRoot
-, inputs
-, pkgs
-, lib
-, system
-,
+{
+  repoRoot,
+  inputs,
+  pkgs,
+  lib,
+  system,
 }:
 
 # Each flake variant defined in your project.nix project will yield a separate
 # shell. If no flake variants are defined, then cabalProject is the original project.
 cabalProject: {
-  name = "plutus-script-evaluation";
+  name = "index-script-evaluations";
 
   packages = [
     pkgs.figlet
@@ -61,22 +61,10 @@ cabalProject: {
         cabal run materialise-views -- --database-conn-str "$DB_CONN_STRING"
       '';
     };
-
-    evaluate = {
-      description = "Evaluate Plutus Scripts from mainnet";
-      group = "general";
-      exec = ''
-        cabal run evaluate-scripts -- --start-block=0 --database-conn-str "$DB_CONN_STRING"
-      '';
-    };
   };
 
-  # env = {
-  #   KEY = "VALUE";
-  # };
-
   shellHook = ''
-    figlet "Plutus Script Evaluation"
+    figlet "Plutus Script Evaluations: Indexer"
   '';
 
   preCommit = {

diff --git a/run-script-evaluations/.envrc b/run-script-evaluations/.envrc
@@ -0,0 +1,2 @@
+use flake
+source_env_if_exists .envrc.local
diff --git a/cabal.project → run-script-evaluations/cabal.project b/cabal.project → run-script-evaluations/cabal.project
@@ -1,4 +1,3 @@
--- Custom repository for cardano haskell packages, see CONTRIBUTING for more
 repository cardano-haskell-packages
   url: https://chap.intersectmbo.org/
   secure: True
@@ -10,27 +9,26 @@ repository cardano-haskell-packages
     c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
--- See CONTRIBUTING for some Nix commands you will need to run if you
--- update either of these.
 index-state:
-  -- Bump both the following dates if you need newer packages from Hackage
   , hackage.haskell.org 2025-02-14T10:33:49Z
-  -- Bump this if you need newer packages from CHaP
   , cardano-haskell-packages 2025-02-11T21:18:23Z
 
--- We never, ever, want this.
 write-ghc-environment-files: never
-
--- Always build tests and benchmarks.
 tests: true
 benchmarks: true
-
--- The only sensible test display option, since it allows us to have colourized
--- 'tasty' output.
 test-show-details: direct
 
-packages:
-  plutus-script-evaluation
+packages: .
 
 package postgresql-libpq
   flags: +use-pkg-config
+
+source-repository-package
+  type: git
+  location: https://github.com/intersectmbo/plutus
+  tag: 262adfd2c7fadb6d89a3c1835eb36b7f85bcf09d
+  --sha256: sha256-fWwRMARDf3KHIDvGKTInFGz/ISvgGLfF8r2MhK969y8=
+  subdir:
+    plutus-tx
+    plutus-core
+    plutus-ledger-api