Sulkta-Coop/agora
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

flake: bump plutarch, fix resulting issues

Browse source 
Collection of things fixed:
- `agora-test`: Fix compile resulting from some changes to hackage.
- `agora-benchmark`: Switched to `plutarch`-style `evalScript`.
- CI: Ported over new flake changes.

This is quite a mess.
This commit is contained in:
Emily Martins 2022-06-02 20:30:28 +02:00
parent 8e71ecbdfd
commit ad9da8e6b3
49 changed files with 3487 additions and 3829 deletions
Download patch file Download diff file Expand all files Collapse all files

41
agora-purescript-bridge/AgoraTypes.hs
View file

@ -2,6 +2,7 @@ module AgoraTypes (agoraTypes) where
--------------------------------------------------------------------------------
import Data.Proxy (Proxy (..))
import Language.PureScript.Bridge (
Language (Haskell),
SumType,
@ -24,30 +25,30 @@ import Agora.Treasury qualified as Treasury
agoraTypes :: [SumType 'Haskell]
agoraTypes =
[ -- Proposal
mkSumType @Proposal.ProposalId
, mkSumType @Proposal.ResultTag
, mkSumType @Proposal.ProposalStatus
, mkSumType @Proposal.ProposalThresholds
, mkSumType @Proposal.ProposalVotes
, mkSumType @Proposal.ProposalDatum
, mkSumType @Proposal.ProposalRedeemer
, mkSumType @Proposal.Proposal
mkSumType (Proxy @Proposal.ProposalId)
, mkSumType (Proxy @Proposal.ResultTag)
, mkSumType (Proxy @Proposal.ProposalStatus)
, mkSumType (Proxy @Proposal.ProposalThresholds)
, mkSumType (Proxy @Proposal.ProposalVotes)
, mkSumType (Proxy @Proposal.ProposalDatum)
, mkSumType (Proxy @Proposal.ProposalRedeemer)
, mkSumType (Proxy @Proposal.Proposal)
, -- Governor
mkSumType @Governor.GovernorDatum
, mkSumType @Governor.GovernorRedeemer
, mkSumType @Governor.Governor
mkSumType (Proxy @Governor.GovernorDatum)
, mkSumType (Proxy @Governor.GovernorRedeemer)
, mkSumType (Proxy @Governor.Governor)
, -- MultiSig
mkSumType @MultiSig.MultiSig
mkSumType (Proxy @MultiSig.MultiSig)
, -- Stake
mkSumType @Stake.Stake
, mkSumType @Stake.ProposalLock
, mkSumType @Stake.StakeRedeemer
, mkSumType @Stake.StakeDatum
mkSumType (Proxy @Stake.Stake)
, mkSumType (Proxy @Stake.ProposalLock)
, mkSumType (Proxy @Stake.StakeRedeemer)
, mkSumType (Proxy @Stake.StakeDatum)
, -- Treasury
mkSumType @Treasury.TreasuryRedeemer
mkSumType (Proxy @Treasury.TreasuryRedeemer)
, -- AuthorityToken
mkSumType @AuthorityToken.AuthorityToken
mkSumType (Proxy @AuthorityToken.AuthorityToken)
, -- Effects
mkSumType @TreasuryWithdrawalEffect.TreasuryWithdrawalDatum
, mkSumType @GovernorMutation.MutateGovernorDatum
mkSumType (Proxy @TreasuryWithdrawalEffect.TreasuryWithdrawalDatum)
, mkSumType (Proxy @GovernorMutation.MutateGovernorDatum)
]

2
agora-purescript-bridge/src/Agora/AuthorityToken.purs
View file

@ -9,7 +9,7 @@ import Data.Lens.Iso.Newtype (_Newtype)
import Data.Lens.Record (prop)
import Data.Maybe (Maybe(..))
import Data.Newtype (class Newtype)
import Plutus.V1.Ledger.Value (AssetClass)
import PlutusLedgerApi.V1.Value (AssetClass)
import Type.Proxy (Proxy(Proxy))
newtype AuthorityToken = AuthorityToken { authority :: AssetClass }

2
agora-purescript-bridge/src/Agora/Effect/GovernorMutation.purs
View file

@ -10,7 +10,7 @@ import Data.Lens.Iso.Newtype (_Newtype)
import Data.Lens.Record (prop)
import Data.Maybe (Maybe(..))
import Data.Newtype (class Newtype)
import Plutus.V1.Ledger.Tx (TxOutRef)
import PlutusLedgerApi.V1.Tx (TxOutRef)
import Type.Proxy (Proxy(Proxy))
newtype MutateGovernorDatum = MutateGovernorDatum

4
agora-purescript-bridge/src/Agora/Effect/TreasuryWithdrawal.purs
View file

@ -10,8 +10,8 @@ import Data.Lens.Record (prop)
import Data.Maybe (Maybe(..))
import Data.Newtype (class Newtype)
import Data.Tuple (Tuple)
import Plutus.V1.Ledger.Credential (Credential)
import Plutus.V1.Ledger.Value (Value)
import PlutusLedgerApi.V1.Credential (Credential)
import PlutusLedgerApi.V1.Value (Value)
import Type.Proxy (Proxy(Proxy))
newtype TreasuryWithdrawalDatum = TreasuryWithdrawalDatum

4
agora-purescript-bridge/src/Agora/Governor.purs
View file

@ -17,8 +17,8 @@ import Data.Maybe (Maybe(..))
import Data.Newtype (class Newtype)
import Data.Tagged (Tagged)
import GHC.Num.Integer (Integer)
import Plutus.V1.Ledger.Tx (TxOutRef)
import Plutus.V1.Ledger.Value (AssetClass)
import PlutusLedgerApi.V1.Tx (TxOutRef)
import PlutusLedgerApi.V1.Value (AssetClass)
import Type.Proxy (Proxy(Proxy))
newtype GovernorDatum = GovernorDatum

2
agora-purescript-bridge/src/Agora/MultiSig.purs
View file

@ -10,7 +10,7 @@ import Data.Lens.Record (prop)
import Data.Maybe (Maybe(..))
import Data.Newtype (class Newtype)
import GHC.Num.Integer (Integer)
import Plutus.V1.Ledger.Crypto (PubKeyHash)
import PlutusLedgerApi.V1.Crypto (PubKeyHash)
import Type.Proxy (Proxy(Proxy))
newtype MultiSig = MultiSig

6
agora-purescript-bridge/src/Agora/Proposal.purs
View file

@ -16,9 +16,9 @@ import Data.Maybe (Maybe(..))
import Data.Newtype (class Newtype)
import Data.Tagged (Tagged)
import GHC.Num.Integer (Integer)
import Plutus.V1.Ledger.Crypto (PubKeyHash)
import Plutus.V1.Ledger.Scripts (DatumHash, ValidatorHash)
import Plutus.V1.Ledger.Value (AssetClass)
import PlutusLedgerApi.V1.Crypto (PubKeyHash)
import PlutusLedgerApi.V1.Scripts (DatumHash, ValidatorHash)
import PlutusLedgerApi.V1.Value (AssetClass)
import PlutusTx.AssocMap (Map)
import Type.Proxy (Proxy(Proxy))

4
agora-purescript-bridge/src/Agora/Stake.purs
View file

@ -13,8 +13,8 @@ import Data.Maybe (Maybe(..))
import Data.Newtype (class Newtype)
import Data.Tagged (Tagged)
import GHC.Num.Integer (Integer)
import Plutus.V1.Ledger.Crypto (PubKeyHash)
import Plutus.V1.Ledger.Value (AssetClass)
import PlutusLedgerApi.V1.Crypto (PubKeyHash)
import PlutusLedgerApi.V1.Value (AssetClass)
import Type.Proxy (Proxy(Proxy))
newtype Stake = Stake