Sulkta-OSS/agora
3
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

store proposal timing conf in the governor datum

Browse source
This commit is contained in:
fanghr 2022-05-20 19:58:29 +08:00
parent f2f355b47c
commit 1a2693aa98
7 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

14
agora-sample/Sample/Proposal.hs
View file

@ -39,7 +39,7 @@ import Plutus.V1.Ledger.Value qualified as Value
--------------------------------------------------------------------------------
import Agora.Governor (
GovernorDatum (GovernorDatum, nextProposalId, proposalThresholds),
GovernorDatum (..),
)
import Agora.Proposal (
Proposal (..),
@ -79,7 +79,7 @@ proposalCreation =
, cosigners = [signer]
, thresholds = defaultProposalThresholds
, votes = emptyVotesFor effects
, timingConfig = proposalTimingConfig
, timingConfig = defaultProposalTimingConfig
, startingTime = tmpProposalStartingTime
}
)
@ -91,6 +91,7 @@ proposalCreation =
GovernorDatum
{ proposalThresholds = defaultProposalThresholds
, nextProposalId = ProposalId 0
, proposalTimings = defaultProposalTimingConfig
}
)
govAfter :: Datum
@ -100,6 +101,7 @@ proposalCreation =
GovernorDatum
{ proposalThresholds = defaultProposalThresholds
, nextProposalId = ProposalId 1
, proposalTimings = defaultProposalTimingConfig
}
)
in ScriptContext
@ -174,7 +176,7 @@ cosignProposal newSigners =
, cosigners = [signer]
, thresholds = defaultProposalThresholds
, votes = emptyVotesFor effects
, timingConfig = proposalTimingConfig
, timingConfig = defaultProposalTimingConfig
, startingTime = tmpProposalStartingTime
}
stakeDatum :: StakeDatum
@ -185,7 +187,7 @@ cosignProposal newSigners =
validTimeRange =
closedBoundedInterval
10
(proposalTimingConfig.draftTime - 10)
(defaultProposalTimingConfig.draftTime - 10)
in TxInfo
{ txInfoInputs =
[ TxInInfo
@ -295,7 +297,7 @@ voteOnProposal params =
, cosigners = [stakeOwner]
, thresholds = defaultProposalThresholds
, votes = ProposalVotes initialVotes
, timingConfig = proposalTimingConfig
, timingConfig = defaultProposalTimingConfig
, startingTime = tmpProposalStartingTime
}
proposalInputDatum :: Datum
@ -384,7 +386,7 @@ voteOnProposal params =
---
validTimeRange =
closedBoundedInterval (proposalTimingConfig.draftTime + 1) (proposalTimingConfig.votingTime - 1)
closedBoundedInterval (defaultProposalTimingConfig.draftTime + 1) (defaultProposalTimingConfig.votingTime - 1)
in TxInfo
{ txInfoInputs =
[ TxInInfo proposalRef proposalInput