-
Notifications
You must be signed in to change notification settings - Fork 15
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.
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
Check if stake addresses in proposals are registered onchain #963
Open
CarlosLopezDeLara
wants to merge
2
commits into
master
Choose a base branch
from
cl/checkproposal
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,7 +56,7 @@ import Cardano.CLI.Types.TxFeature | |
import qualified Ouroboros.Network.Protocol.LocalStateQuery.Type as Consensus | ||
import qualified Ouroboros.Network.Protocol.LocalTxSubmission.Client as Net.Tx | ||
|
||
import Control.Monad (forM) | ||
import Control.Monad (forM, unless) | ||
import Data.Aeson ((.=)) | ||
import qualified Data.Aeson as Aeson | ||
import Data.Aeson.Encode.Pretty (encodePretty) | ||
|
@@ -198,6 +198,44 @@ runTransactionBuildCmd | |
first TxCmdProposalError | ||
<$> readTxGovernanceActions eon proposalFiles | ||
|
||
-- Extract return addresses from proposals and check that the return address in each proposal is registered | ||
|
||
let returnAddrHashes = | ||
Set.fromList | ||
[ StakeCredentialByKey returnAddrHash | ||
| (proposal, _) <- proposals | ||
, let (_, returnAddrHash, _) = fromProposalProcedure eon proposal -- fromProposalProcedure needs to be adjusted so that it works with script hashes. | ||
] | ||
treasuryWithdrawalAddresses = | ||
Set.fromList | ||
[ stakeCred | ||
| (proposal, _) <- proposals | ||
, let (_, _, govAction) = fromProposalProcedure eon proposal | ||
, TreasuryWithdrawal withdrawalsList _ <- [govAction] -- Match on TreasuryWithdrawal action | ||
, (_, stakeCred, _) <- withdrawalsList -- Extract fund-receiving stake credentials | ||
] | ||
allAddrHashes = Set.union returnAddrHashes treasuryWithdrawalAddresses | ||
Comment on lines
+203
to
+217
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe it would be nicer to pattern-match only once on each proposal. I would make a |
||
|
||
(balances, _) <- | ||
lift | ||
( executeLocalStateQueryExpr | ||
localNodeConnInfo | ||
Consensus.VolatileTip | ||
(queryStakeAddresses eon allAddrHashes networkId) | ||
) | ||
& onLeft (left . TxCmdQueryConvenienceError . AcqFailure) | ||
& onLeft (left . TxCmdQueryConvenienceError . QceUnsupportedNtcVersion) | ||
& onLeft (left . TxCmdTxSubmitErrorEraMismatch) | ||
|
||
let unregisteredAddresses = | ||
Set.filter | ||
(\stakeCred -> Map.notMember (makeStakeAddress networkId stakeCred) balances) | ||
allAddrHashes | ||
|
||
unless (null unregisteredAddresses) $ | ||
throwError $ | ||
TxCmdUnregisteredStakeAddress unregisteredAddresses | ||
|
||
-- the same collateral input can be used for several plutus scripts | ||
let filteredTxinsc = nubOrd txinsc | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As I said during the pair programming session, I don't like pattern matching in list comprehensions generally speaking. But in this case, it would be way more verbose to do differently, so I'm fine with this version.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was going to say I thought it was an interesting way of pattern-matching