attempt to use buf and create a buildable plan

Author: carbolymer

cabal.project

@@ -20,8 +20,7 @@ packages:
     cardano-api
     cardano-api-gen
     cardano-wasm
-    -- TODO fix potential issues with build-type: Custom and protoc and reenable
-    -- cardano-rpc
+    cardano-rpc
 
 extra-packages: Cabal, process
 
@@ -56,6 +55,19 @@ write-ghc-environment-files: always
 jobs: $ncpus
 semaphore: True
 
+constraints:
+  , hedgehog == 1.5
+  , lifted-async == 0.10.2.7
+  , random == 1.2.1.3
+  , tls == 2.1.6
+  , optparse-applicative==0.18.1.0
+  , kes-agent == 0.1.0.1
+
+allow-newer:
+  -- https://github.com/kapralVV/Unique/issues/11
+  , Unique:hashable
+  , kes-agent:filepath
+
 if impl (ghc >= 9.12)
   allow-newer:
     -- https://github.com/kapralVV/Unique/issues/11

cardano-rpc/Setup.hs

@@ -0,0 +1,26 @@
+version: v1
+
+managed:
+  enabled: true
+
+plugins:
+  # node
+  # - plugin: es
+  #   out: gen/node/src
+  #   opt:
+  #     - target=ts
+  #
+  # - plugin: connect-es
+  #   out: gen/node/src
+  #   opt:
+  #     - target=ts
+  #
+  # - plugin: buf.build/bufbuild/protoschema-jsonschema
+  #   out: gen/jsonschema/schema
+
+  # haskell
+
+  - plugin: haskell-protolens
+    path: proto-lens-protoc
+    out: gen
+

cardano-rpc/buf.gen.yaml

@@ -17,19 +17,11 @@ license-files:
   LICENSE
   NOTICE
 
-build-type: Custom
+build-type: Simple
 extra-doc-files:
   CHANGELOG.md
   README.md
 
-extra-source-files: proto/**/*.proto
-
-custom-setup
-  setup-depends:
-    Cabal >=3.0 && <3.13,
-    base >=4.14 && <5,
-    proto-lens-setup >=0.4 && <0.5,
-
 common project-config
   default-language: Haskell2010
   default-extensions:
@@ -50,7 +42,6 @@ common project-config
 library
   import: project-config
   hs-source-dirs: src
-  build-tool-depends: proto-lens-protoc:proto-lens-protoc
   exposed-modules:
     Cardano.Rpc.Client
     Cardano.Rpc.Proto.Api.Node
@@ -65,35 +56,20 @@ library
     Cardano.Rpc.Server.Internal.UtxoRpc.Query
     Cardano.Rpc.Server.Internal.UtxoRpc.Submit
     Cardano.Rpc.Server.Internal.UtxoRpc.Type
-    Proto.Cardano.Rpc.Node
-    Proto.Cardano.Rpc.Node_Fields
-    Proto.Utxorpc.V1alpha.Cardano.Cardano
-    Proto.Utxorpc.V1alpha.Cardano.Cardano_Fields
-    Proto.Utxorpc.V1alpha.Query.Query
-    Proto.Utxorpc.V1alpha.Query.Query_Fields
-    Proto.Utxorpc.V1alpha.Submit.Submit
-    Proto.Utxorpc.V1alpha.Submit.Submit_Fields
 
   other-modules:
     Cardano.Rpc.Server.Internal.Orphans
     Paths_cardano_rpc
 
   autogen-modules:
     Paths_cardano_rpc
-    Proto.Cardano.Rpc.Node
-    Proto.Cardano.Rpc.Node_Fields
-    Proto.Utxorpc.V1alpha.Cardano.Cardano
-    Proto.Utxorpc.V1alpha.Cardano.Cardano_Fields
-    Proto.Utxorpc.V1alpha.Query.Query
-    Proto.Utxorpc.V1alpha.Query.Query_Fields
-    Proto.Utxorpc.V1alpha.Submit.Submit
-    Proto.Utxorpc.V1alpha.Submit.Submit_Fields
 
   build-depends:
     aeson,
     base,
     bytestring,
     cardano-api >=10.17,
+    cardano-rpc:gen,
     cardano-ledger-api,
     cardano-ledger-binary,
     cardano-ledger-conway,
@@ -111,6 +87,26 @@ library
     rio,
     text,
 
+-- this should be replaced by utxorpc pacakge from hackage
+-- ideally we should upstream whatever is implemented in Proto.Cardano.Rpc.Node
+-- into utxorpc
+library gen
+  import: project-config
+  hs-source-dirs: gen
+  exposed-modules:
+    Proto.Cardano.Rpc.Node
+    Proto.Cardano.Rpc.Node_Fields
+    Proto.Utxorpc.V1alpha.Cardano.Cardano
+    Proto.Utxorpc.V1alpha.Cardano.Cardano_Fields
+    Proto.Utxorpc.V1alpha.Query.Query
+    Proto.Utxorpc.V1alpha.Query.Query_Fields
+    Proto.Utxorpc.V1alpha.Submit.Submit
+    Proto.Utxorpc.V1alpha.Submit.Submit_Fields
+  build-depends:
+    proto-lens,
+    proto-lens-protobuf-types,
+    proto-lens-runtime,
+
 test-suite cardano-rpc-test
   import: project-config
   hs-source-dirs: test/cardano-rpc-test
@@ -123,8 +119,9 @@ test-suite cardano-rpc-test
     cardano-ledger-conway,
     cardano-ledger-core,
     cardano-rpc,
+    cardano-rpc:gen,
     containers,
-    hedgehog >=1.1,
+    hedgehog ^>=1.5,
     rio,
     tasty,
     tasty-hedgehog,