Implemented Publisher.createGcFsTx

Author: bladyjoker

coop-proto/publisher-service.proto

@@ -54,6 +54,10 @@ message CreateGcFsTxResponse {
     // Error encountered when servicing the request
     Error error = 2;
   }
+  message Info {
+    coop.tx_builder.GcFsInfo tx_builder_info = 1;
+  }
+  Info info = 3;
 }
 
 message Error {

coop-publisher/app/Coop/Cli/PublisherGrpc.hs

@@ -37,7 +37,7 @@ import Proto.PublisherService (
   Publisher,
  )
 import Proto.PublisherService qualified as PublisherService
-import Proto.PublisherService_Fields (fsId, fsIds, fsInfos, fsStoreErr, gcAfter, info, maybe'error, mintFsTx, msg, otherErr, submitter, txBuilderErr, txBuilderInfo)
+import Proto.PublisherService_Fields (fsId, fsIds, fsInfos, fsStoreErr, gcAfter, gcFsTx, info, maybe'error, mintFsTx, msg, otherErr, submitter, txBuilderErr, txBuilderInfo)
 import Proto.PublisherService_Fields qualified as PublisherService
 import Proto.TxBuilderService (FactStatementInfo, TxBuilder)
 import Proto.TxBuilderService qualified as TxBuilder
@@ -61,7 +61,7 @@ publisherService :: PublisherGrpcOpts -> IO ()
 publisherService opts = do
   let handleCreateMintFsTx :: Server.UnaryHandler IO CreateMintFsTxRequest CreateMintFsTxResponse
       handleCreateMintFsTx _ req = do
-        print (show req)
+        print ("Got from user: " <> show req)
         getFsRespOrErr <-
           call'
             (opts ^. fsStoreAddress)
@@ -73,7 +73,7 @@ publisherService opts = do
               return $ defMessage & PublisherService.error .~ err
           )
           ( \(getFsResp :: GetFactStatementResponse) -> do
-              print (show getFsResp)
+              print ("Got from FactStatementStore: " <> show getFsResp)
               case getFsResp ^. maybe'error of
                 Nothing -> do
                   let fsIdToGcAfter = Map.fromList [(fsI ^. fsId, fsI ^. gcAfter) | fsI <- req ^. fsInfos]
@@ -100,7 +100,7 @@ publisherService opts = do
                   either
                     (\err -> return $ defMessage & PublisherService.error .~ err)
                     ( \(createMintFsResp :: TxBuilder.CreateMintFsTxResp) -> do
-                        print (show createMintFsResp)
+                        print ("Got from TxBuilder: " <> show getFsResp)
                         case createMintFsResp ^. maybe'error of
                           Nothing ->
                             return $
@@ -119,7 +119,36 @@ publisherService opts = do
           getFsRespOrErr
 
       handleCreateGcFsTx :: Server.UnaryHandler IO CreateGcFsTxRequest CreateGcFsTxResponse
-      handleCreateGcFsTx _ _req = return defMessage
+      handleCreateGcFsTx _ req = do
+        print ("Got from user: " <> show req)
+        let txBuilderReq :: TxBuilder.CreateGcFsTxReq
+            txBuilderReq =
+              defMessage
+                & fsIds .~ req ^. fsIds
+                & submitter .~ req ^. submitter
+        createGcFsRespOrErr <-
+          call'
+            (opts ^. txBuilderAddress)
+            (fromInteger . toInteger $ opts ^. txBuilderPort)
+            (RPC :: RPC TxBuilder "createGcFsTx")
+            txBuilderReq
+        either
+          (\err -> return $ defMessage & PublisherService.error .~ err)
+          ( \(createGcFsResp :: TxBuilder.CreateGcFsTxResp) -> do
+              print ("Got from TxBuilder: " <> show createGcFsResp)
+              case createGcFsResp ^. maybe'error of
+                Nothing ->
+                  return $
+                    (defMessage :: CreateGcFsTxResponse)
+                      & gcFsTx .~ createGcFsResp ^. success . gcFsTx
+                      & info . txBuilderInfo .~ createGcFsResp ^. info
+                Just er ->
+                  return $
+                    (defMessage :: CreateGcFsTxResponse)
+                      & PublisherService.error . txBuilderErr .~ er
+                      & info . txBuilderInfo .~ createGcFsResp ^. info
+          )
+          createGcFsRespOrErr
 
       routes :: [ServiceHandler]
       routes =

coop-publisher/aux.sh

@@ -35,15 +35,25 @@ EOF
     echo $rawTx > .coop-publisher-cli/signed
 }
 
-function run-grpcui {
-    make-exports
-    grpcui -insecure -import-path ../coop-proto -proto ../coop-proto/publisher-service.proto localhost:5080
-}
+function coop-gc-fs {
+    resp=$(grpcurl -insecure -import-path ../coop-proto -proto ../coop-proto/publisher-service.proto -d @ localhost:5080 coop.publisher.Publisher/createGcFsTx <<EOF
+    {
+        "fsIds": ["$(echo -ne someidB | base64)", "$(echo -ne someidA | base64)"],
+        "submitter": {
+            "base16": "$SUBMITTER_WALLET"
+        }
+    }
 
-function cardano-cli-sign {
-    cardano-cli transaction sign --tx-file .coop-pab-cli/signed --signing-key-file .wallets/no-plutip-signing-key-$SUBMITTER_WALLET.skey --out-file .coop-pab-cli/ready
+EOF
+        )
+    echo $resp
+    rawTx=$(echo $resp | jq '.gcFsTx | .cborHex = .cborBase16 | del(.cborBase16) | .description = "" | .type = "Tx BabbageEra"')
+    echo $resp | jq '.info'
+    echo $resp | jq '.error'
+    echo $rawTx > .coop-publisher-cli/signed
 }
 
-function cardano-cli-submit {
-    cardano-cli transaction submit --tx-file .coop-pab-cli/ready  --mainnet
+function run-grpcui {
+    make-exports
+    grpcui -insecure -import-path ../coop-proto -proto ../coop-proto/publisher-service.proto localhost:5080
 }

coop-publisher/coop-publisher.cabal

@@ -88,9 +88,7 @@ executable coop-publisher-cli
   other-modules:  Coop.Cli.PublisherGrpc
   build-depends:
     , base
-    , bytestring
     , containers
-    , coop-cardano-proto
     , coop-fact-statement-store-service-proto
     , coop-publisher-service-proto
     , coop-tx-builder-service-proto
@@ -101,8 +99,6 @@ executable coop-publisher-cli
     , lens
     , optparse-applicative
     , proto-lens
-    , proto-lens-protobuf-types
-    , proto-lens-runtime
     , text
     , warp
     , warp-grpc