Use simplified queryStateForBalancedTx

IntersectMBO · Jun 15, 2023 · 818bc62 · 818bc62
1 parent 5e42a37
commit 818bc62
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/cabal.project b/cabal.project
@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2023-06-05T00:00:00Z
-  , cardano-haskell-packages 2023-06-14T23:47:02Z
+  , cardano-haskell-packages 2023-06-15T04:42:31Z
 
 packages:
     cardano-cli

diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -110,7 +110,7 @@ library
                       , binary
                       , bytestring
                       , canonical-json
-                      , cardano-api ^>= 8.3
+                      , cardano-api ^>= 8.4
                       , cardano-binary
                       , cardano-crypto
                       , cardano-crypto-class >= 2.1.1
@@ -198,8 +198,8 @@ test-suite cardano-cli-test
                       , base16-bytestring
                       , bech32 >= 1.1.0
                       , bytestring
-                      , cardano-api ^>= 8.3
-                      , cardano-api:internal ^>= 8.3
+                      , cardano-api ^>= 8.4
+                      , cardano-api:internal ^>= 8.4
                       , cardano-api-gen ^>= 8.1.0.2
                       , cardano-cli
                       , cardano-cli:cardano-cli-test-lib
@@ -240,7 +240,7 @@ test-suite cardano-cli-golden
   build-depends:        aeson >= 1.5.6.0
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 8.3
+                      , cardano-api ^>= 8.4
                       , cardano-cli
                       , cardano-cli:cardano-cli-test-lib
                       , cardano-crypto-class ^>= 2.1

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs
@@ -17,6 +17,21 @@ module Cardano.CLI.Shelley.Run.Transaction
   , toTxOutInAnyEra
   ) where
 
+import           Cardano.Api
+import           Cardano.Api.Byron hiding (SomeByronSigningKey (..))
+import           Cardano.Api.Shelley
+
+import           Cardano.CLI.Helpers (printWarning)
+import           Cardano.CLI.Run.Friendly (friendlyTxBS, friendlyTxBodyBS)
+import           Cardano.CLI.Shelley.Output
+import           Cardano.CLI.Shelley.Parsers
+import           Cardano.CLI.Shelley.Run.Genesis
+import           Cardano.CLI.Shelley.Run.Read
+import           Cardano.CLI.Shelley.Run.Validate
+import           Cardano.CLI.Types
+import           Ouroboros.Consensus.Cardano.Block (EraMismatch (..))
+import qualified Ouroboros.Network.Protocol.LocalTxSubmission.Client as Net.Tx
+
 import           Control.Monad (forM, forM_, void)
 import           Control.Monad.IO.Class (MonadIO (..))
 import           Control.Monad.Trans (MonadTrans (..))
@@ -42,22 +57,6 @@ import qualified Data.Text.IO as Text
 import           Data.Type.Equality (TestEquality (..))
 import qualified System.IO as IO
 
-import           Cardano.Api
-import           Cardano.Api.Byron hiding (SomeByronSigningKey (..))
-import           Cardano.Api.Shelley
-
-import           Cardano.CLI.Helpers (printWarning)
-import           Cardano.CLI.Run.Friendly (friendlyTxBS, friendlyTxBodyBS)
-import           Cardano.CLI.Shelley.Output
-import           Cardano.CLI.Shelley.Parsers
-import           Cardano.CLI.Shelley.Run.Genesis
-import           Cardano.CLI.Shelley.Run.Read
-import           Cardano.CLI.Shelley.Run.Validate
-import           Cardano.CLI.Types
-
-import           Ouroboros.Consensus.Cardano.Block (EraMismatch (..))
-import qualified Ouroboros.Network.Protocol.LocalTxSubmission.Client as Net.Tx
-
 {- HLINT ignore "Use let" -}
 
 data ShelleyTxCmdError
@@ -406,7 +405,8 @@ runTxBuildCmd
       case consensusMode of
         CardanoMode -> do
           (nodeEraUTxO, _, eraHistory, systemStart, _, _) <-
-            lift (queryStateForBalancedTx socketPath nodeEra nid allTxInputs [])
+            lift (executeLocalStateQueryExpr localNodeConnInfo Nothing (queryStateForBalancedTx nodeEra allTxInputs []))
+              & onLeft (left . ShelleyTxCmdQueryConvenienceError . AcqFailure)
               & onLeft (left . ShelleyTxCmdQueryConvenienceError)
 
           -- Why do we cast the era? The user can specify an era prior to the era that the node is currently in.
@@ -697,8 +697,9 @@ runTxBuild
               _ -> []
 
       (nodeEraUTxO, pparams, eraHistory, systemStart, stakePools, stakeDelegDeposits) <-
-        firstExceptT ShelleyTxCmdQueryConvenienceError . newExceptT
-          $ queryStateForBalancedTx socketPath nodeEra networkId allTxInputs certs
+        lift (executeLocalStateQueryExpr localNodeConnInfo Nothing $ queryStateForBalancedTx nodeEra allTxInputs certs)
+          & onLeft (left . ShelleyTxCmdQueryConvenienceError . AcqFailure)
+          & onLeft (left . ShelleyTxCmdQueryConvenienceError)
 
       validatedPParams <- hoistEither $ first ShelleyTxCmdProtocolParametersValidationError
                                       $ validateProtocolParameters era (Just pparams)