Skip to content

Commit

Permalink
Merge pull request #4408 from input-output-hk/ludvikgalois/no-wit-tra…
Browse files Browse the repository at this point in the history
…nsactions

Allow assembling transactions with no witnesses
  • Loading branch information
Jimbo4350 authored Jan 5, 2023
2 parents bc88bb5 + faa52ab commit f8cf478
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 20 deletions.
1 change: 1 addition & 0 deletions cardano-cli/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

- Add `query tx-mempool` ([PR 4276](https://github.com/input-output-hk/cardano-node/pull/4276))

- Allow assembling transactions with no witnesses ([PR 4408](https://github.com/input-output-hk/cardano-node/pull/4408))

### Bugs

Expand Down
24 changes: 4 additions & 20 deletions cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ pTransaction =

pTransactionSign :: Parser TransactionCmd
pTransactionSign = TxSign <$> pInputTxOrTxBodyFile
<*> pSomeWitnessSigningData
<*> many pWitnessSigningData
<*> optional pNetworkId
<*> pTxFile Output

Expand All @@ -764,7 +764,7 @@ pTransaction =
pTransactionAssembleTxBodyWit :: Parser TransactionCmd
pTransactionAssembleTxBodyWit = TxAssembleTxBodyWitness
<$> pTxBodyFile Input
<*> some pWitnessFile
<*> many pWitnessFile
<*> pOutputFile

pTransactionSubmit :: Parser TransactionCmd
Expand Down Expand Up @@ -1665,9 +1665,8 @@ pWhichLeadershipSchedule = pCurrent <|> pNext
<> Opt.help "Get the leadership schedule for the following epoch."
)

pSomeWitnessSigningData :: Parser [WitnessSigningData]
pSomeWitnessSigningData =
some $
pWitnessSigningData :: Parser WitnessSigningData
pWitnessSigningData =
KeyWitnessSigningData
<$>
( SigningKeyFile <$>
Expand All @@ -1691,21 +1690,6 @@ pSigningKeyFile fdir =
<> Opt.completer (Opt.bashCompleter "file")
)

pWitnessSigningData :: Parser WitnessSigningData
pWitnessSigningData =
KeyWitnessSigningData
<$>
( SigningKeyFile <$>
Opt.strOption
( Opt.long "signing-key-file"
<> Opt.metavar "FILE"
<> Opt.help "Filepath of the signing key to be used in witness construction."
<> Opt.completer (Opt.bashCompleter "file")
)
)
<*>
optional pByronAddress

pKesPeriod :: Parser KESPeriod
pKesPeriod =
KESPeriod <$>
Expand Down

0 comments on commit f8cf478

Please sign in to comment.