Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use simplified queryStateForBalancedTx #24

Merged
merged 1 commit into from
Jun 15, 2023
Merged

Use simplified queryStateForBalancedTx #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions cardano-cli/cardano-cli.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
39 changes: 20 additions & 19 deletions cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (..))
Expand All @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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)
Expand Down