diff --git a/agora.cabal b/agora.cabal index ff6275d..ef56307 100644 --- a/agora.cabal +++ b/agora.cabal @@ -103,6 +103,7 @@ common deps , generics-sop , liqwid-plutarch-extra , plutarch + , plutarch-extra , plutarch-numeric , plutarch-safe-money , plutarch-script-export diff --git a/agora/Agora/Aeson/Orphans.hs b/agora/Agora/Aeson/Orphans.hs index 2408add..765f25b 100644 --- a/agora/Agora/Aeson/Orphans.hs +++ b/agora/Agora/Aeson/Orphans.hs @@ -48,9 +48,6 @@ deriving via instance Aeson.ToJSON Plutus.TxId -deriving anyclass instance Aeson.FromJSON Plutus.TxOutRef -deriving anyclass instance Aeson.ToJSON Plutus.TxOutRef - instance (Coercible a Plutus.LedgerBytes) => Aeson.ToJSON (AsBase16Bytes a) where toJSON = Aeson.String diff --git a/agora/Agora/AuthorityToken.hs b/agora/Agora/AuthorityToken.hs index caa0428..8c9f4ec 100644 --- a/agora/Agora/AuthorityToken.hs +++ b/agora/Agora/AuthorityToken.hs @@ -30,10 +30,10 @@ import Plutarch.Api.V2 ( PTxOut (PTxOut), ) import Plutarch.Extra.AssetClass (passetClass, passetClassValueOf) -import Plutarch.Extra.List (plookup) +import "liqwid-plutarch-extra" Plutarch.Extra.List (plookupAssoc) import Plutarch.Extra.ScriptContext (pisTokenSpent) import Plutarch.Extra.Sum (PSum (PSum)) -import Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC, pmatchC) +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC, pmatchC) import Plutarch.Extra.Traversable (pfoldMap) import Plutarch.Extra.Value (psymbolValueOf) import PlutusLedgerApi.V1.Value (AssetClass (AssetClass)) @@ -83,7 +83,7 @@ authorityTokensValidIn = phoistAcyclic $ PValue value' <- pmatchC txOut.value PMap value <- pmatchC value' pure $ - pmatch (plookup # pdata authorityTokenSym # value) $ \case + pmatch (plookupAssoc # pfstBuiltin # psndBuiltin # pdata authorityTokenSym # value) $ \case PJust (pfromData -> _tokenMap') -> pmatch (pfield @"credential" # address) $ \case PPubKeyCredential _ -> diff --git a/agora/Agora/Credential.hs b/agora/Agora/Credential.hs index d4743df..2f8ff90 100644 --- a/agora/Agora/Credential.hs +++ b/agora/Agora/Credential.hs @@ -14,7 +14,7 @@ import GHC.Records (HasField) import Plutarch.Api.V1 (PCredential (PPubKeyCredential, PScriptCredential), PPubKeyHash) import Plutarch.Api.V2 (PTxInInfo) import Plutarch.Extra.ScriptContext (ptxSignedBy) -import Plutarch.Extra.TermCont (pmatchC) +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pmatchC) {- | Context required in order to check 'AuthorizationCredential'. diff --git a/agora/Agora/Effect.hs b/agora/Agora/Effect.hs index 74f309c..70b2c7f 100644 --- a/agora/Agora/Effect.hs +++ b/agora/Agora/Effect.hs @@ -17,7 +17,7 @@ import Plutarch.Api.V2 ( PTxOutRef, PValidator, ) -import Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC, pmatchC, ptryFromC) +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC, pmatchC, ptryFromC) import Plutarch.TryFrom () import PlutusLedgerApi.V1.Value (CurrencySymbol) diff --git a/agora/Agora/Effect/GovernorMutation.hs b/agora/Agora/Effect/GovernorMutation.hs index ae708ed..ec265a4 100644 --- a/agora/Agora/Effect/GovernorMutation.hs +++ b/agora/Agora/Effect/GovernorMutation.hs @@ -39,7 +39,7 @@ import Plutarch.Extra.Maybe ( passertPJust, ) import Plutarch.Extra.ScriptContext (pfromOutputDatum, pisScriptAddress) -import Plutarch.Extra.TermCont (pguardC, pletFieldsC) +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pguardC, pletFieldsC) import Plutarch.Extra.Value (pvalueOf) import Plutarch.Lift (PConstantDecl, PLifted, PUnsafeLiftDecl) import PlutusLedgerApi.V1 (TxOutRef) diff --git a/agora/Agora/Effect/TreasuryWithdrawal.hs b/agora/Agora/Effect/TreasuryWithdrawal.hs index 85eae21..290c43b 100644 --- a/agora/Agora/Effect/TreasuryWithdrawal.hs +++ b/agora/Agora/Effect/TreasuryWithdrawal.hs @@ -32,7 +32,7 @@ import Plutarch.DataRepr ( PDataFields, ) import Plutarch.Extra.ScriptContext (pfindTxInByTxOutRef, pisPubKey) -import Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC, pmatchC) +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC, pmatchC) import Plutarch.Lift (PConstantDecl, PUnsafeLiftDecl (PLifted)) import PlutusLedgerApi.V1.Credential (Credential) import PlutusLedgerApi.V1.Value (CurrencySymbol, Value) diff --git a/agora/Agora/Governor.hs b/agora/Agora/Governor.hs index 81540af..88fc009 100644 --- a/agora/Agora/Governor.hs +++ b/agora/Agora/Governor.hs @@ -49,7 +49,7 @@ import Plutarch.Extra.IsData ( EnumIsData (EnumIsData), PlutusTypeEnumData, ) -import Plutarch.Extra.TermCont (pletFieldsC) +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pletFieldsC) import Plutarch.Lift (PConstantDecl, PUnsafeLiftDecl (PLifted)) import PlutusLedgerApi.V1 (TxOutRef) import PlutusLedgerApi.V1.Value (AssetClass) diff --git a/agora/Agora/Governor/Scripts.hs b/agora/Agora/Governor/Scripts.hs index bb3ca81..a11af86 100644 --- a/agora/Agora/Governor/Scripts.hs +++ b/agora/Agora/Governor/Scripts.hs @@ -64,9 +64,10 @@ import Plutarch.Api.V2 ( ) import Plutarch.Extra.AssetClass (passetClass, passetClassValueOf) import Plutarch.Extra.Field (pletAll, pletAllC) -import Plutarch.Extra.List (pfirstJust, pmapMaybe, pmsort) +import "liqwid-plutarch-extra" Plutarch.Extra.List (pfindJust, pmapMaybe) import Plutarch.Extra.Map (pkeys, ptryLookup) import Plutarch.Extra.Maybe (passertPJust, pjust, pmaybe, pmaybeData, pnothing) +import Plutarch.Extra.Ord (psort) import Plutarch.Extra.Record (mkRecordConstr, (.&), (.=)) import Plutarch.Extra.ScriptContext ( pfindTxInByTxOutRef, @@ -76,7 +77,7 @@ import Plutarch.Extra.ScriptContext ( pscriptHashFromAddress, pvalueSpent, ) -import Plutarch.Extra.TermCont ( +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont ( pguardC, pletC, pletFieldsC, @@ -145,7 +146,7 @@ governorPolicy initialSpend = let governorOutputDatum = passertPJust # "Governor output should present" - #$ pfirstJust + #$ pfindJust # plam ( flip (pletFields @'["value", "datum"]) $ \txOutF -> let isGovernorUTxO = @@ -298,7 +299,7 @@ governorValidator as = pletC $ passertPJust # "Own output should present" - #$ pfirstJust + #$ pfindJust # plam ( flip pletAll $ \outputF -> let gstSymbol = pconstant $ governorSTSymbol as @@ -412,7 +413,7 @@ governorValidator as = let stakeInputDatum = passertPJust # "Stake input should present" - #$ pfirstJust + #$ pfindJust # plam ((getStakeDatum #) . (pfield @"resolved" #)) # pfromData txInfoF.inputs @@ -435,7 +436,7 @@ governorValidator as = let proposalOutputDatum = passertPJust # "Proposal output should present" - #$ pfirstJust + #$ pfindJust # getProposalDatum # pfromData txInfoF.outputs @@ -472,7 +473,7 @@ governorValidator as = let stakeOutputDatum = passertPJust # "Output stake should be presented" - #$ pfirstJust + #$ pfindJust # getStakeDatum # pfromData txInfoF.outputs @@ -507,7 +508,7 @@ governorValidator as = let proposalInputDatum = passertPJust # "Proposal input not found" - #$ pfirstJust + #$ pfindJust # plam ((getProposalDatum #) . (pfield @"resolved" #)) # pfromData txInfoF.inputs @@ -584,7 +585,7 @@ governorValidator as = -- The sorted hashes of all the GAT receivers. actualReceivers = - pmsort + psort #$ pmapMaybe # getReceiverScriptHash # pfromData txInfoF.outputs diff --git a/agora/Agora/Proposal.hs b/agora/Agora/Proposal.hs index ef53cbd..526cd62 100644 --- a/agora/Agora/Proposal.hs +++ b/agora/Agora/Proposal.hs @@ -78,10 +78,10 @@ import Plutarch.Extra.IsData ( PlutusTypeEnumData, ProductIsData (ProductIsData), ) -import Plutarch.Extra.List (pfirstJust) +import "liqwid-plutarch-extra" Plutarch.Extra.List (pfindJust) import Plutarch.Extra.Map qualified as PM import Plutarch.Extra.Maybe (pfromJust) -import Plutarch.Extra.TermCont (pguardC, pletC, pmatchC) +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pguardC, pletC, pmatchC) import Plutarch.Lift ( DerivePConstantViaNewtype (DerivePConstantViaNewtype), PConstantDecl, @@ -941,7 +941,7 @@ pneutralOption = phoistAcyclic $ (PAssocMap.pnull # el) (pcon $ PJust rt) (pcon PNothing) - in pfromJust #$ pfirstJust # f # l + in pfromJust #$ pfindJust # f # l {- | Return true if the thresholds are valid. diff --git a/agora/Agora/Proposal/Scripts.hs b/agora/Agora/Proposal/Scripts.hs index 68309fb..2562d39 100644 --- a/agora/Agora/Proposal/Scripts.hs +++ b/agora/Agora/Proposal/Scripts.hs @@ -40,7 +40,6 @@ import Agora.Stake ( ) import Agora.Utils ( plistEqualsBy, - pltAsData, ) import Plutarch.Api.V1 (PCredential) import Plutarch.Api.V1.AssocMap (plookup) @@ -57,7 +56,7 @@ import Plutarch.Extra.AssetClass (passetClass, passetClassValueOf) import Plutarch.Extra.Category (PCategory (pidentity), PSemigroupoid ((#>>>))) import Plutarch.Extra.Comonad (pextract) import Plutarch.Extra.Field (pletAll, pletAllC) -import Plutarch.Extra.List (pfirstJust, pisUniq', pmergeBy, pmsort) +import "liqwid-plutarch-extra" Plutarch.Extra.List (pfindJust) import Plutarch.Extra.Map (pupdate) import Plutarch.Extra.Maybe ( passertPJust, @@ -66,6 +65,7 @@ import Plutarch.Extra.Maybe ( pmaybe, pnothing, ) +import Plutarch.Extra.Ord (pallUnique, pfromOrdBy, psort, ptryMergeBy) import Plutarch.Extra.Record (mkRecordConstr, (.&), (.=)) import Plutarch.Extra.ScriptContext ( pfindTxInByTxOutRef, @@ -73,7 +73,7 @@ import Plutarch.Extra.ScriptContext ( pisTokenSpent, ptryFromOutputDatum, ) -import Plutarch.Extra.TermCont ( +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont ( pguardC, pletC, pletFieldsC, @@ -262,7 +262,7 @@ proposalValidator as maximumCosigners = pletC $ passertPJust # "Own output should be present" - #$ pfirstJust + #$ pfindJust # plam ( flip pletAll $ \outputF -> let pstSymbol = pconstant $ proposalSTSymbol as @@ -366,7 +366,7 @@ proposalValidator as maximumCosigners = \ctxF -> pcon $ ctxF - { orderedOwners = pmsort # ctxF.orderedOwners + { orderedOwners = psort # ctxF.orderedOwners } initialCtx = pcon $ PWitnessMultipleStakeContext 0 pnil @@ -396,13 +396,13 @@ proposalValidator as maximumCosigners = ((PSpendSingleStakeContext :--> PUnit) :--> PUnit) <- pletC $ let stakeInput = - passertPJust # "Stake input should present" #$ pfirstJust + passertPJust # "Stake input should present" #$ pfindJust # ((pfield @"resolved" @_ @PTxInInfo) #>>> getStakeDatum) # txInfoF.inputs stakeOutput = passertPJust # "Stake output should present" - #$ pfirstJust # getStakeDatum # txInfoF.outputs + #$ pfindJust # getStakeDatum # txInfoF.outputs ctx = pcon $ PSpendSingleStakeContext stakeInput stakeOutput in plam (# ctx) @@ -437,15 +437,16 @@ proposalValidator as maximumCosigners = -- signatures will be ordered. updatedSigs <- pletC $ - pmergeBy # pltAsData + ptryMergeBy # (pfromOrdBy # plam pfromData) # newSigs # proposalInputDatumF.cosigners pguardC "Less cosigners than maximum limit" $ plength # updatedSigs #< pconstant maximumCosigners - pguardC "Cosigners are unique" $ - pisUniq' # updatedSigs + -- assuming sigs are sorted + PJust cosUnique <- pmatchC $ pallUnique #$ pmap # plam pfromData # updatedSigs + pguardC "Cosigners are unique" cosUnique pguardC "All new cosigners are witnessed by their Stake datums" $ -- Also, this ensures that the cosigners field in the output diff --git a/agora/Agora/Proposal/Time.hs b/agora/Agora/Proposal/Time.hs index efb4db5..b36df38 100644 --- a/agora/Agora/Proposal/Time.hs +++ b/agora/Agora/Proposal/Time.hs @@ -47,7 +47,7 @@ import Plutarch.DataRepr ( import Plutarch.Extra.Applicative (PApply (pliftA2)) import Plutarch.Extra.Field (pletAll, pletAllC) import Plutarch.Extra.Maybe (pjust, pmaybe, pnothing) -import Plutarch.Extra.TermCont (pmatchC) +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pmatchC) import Plutarch.Extra.Time ( PCurrentTime (PCurrentTime), pisCurrentTimeWithin, diff --git a/agora/Agora/Stake.hs b/agora/Agora/Stake.hs index db0f1b5..d40c983 100644 --- a/agora/Agora/Stake.hs +++ b/agora/Agora/Stake.hs @@ -65,7 +65,6 @@ import Plutarch.Extra.IsData ( PlutusTypeDataList, ProductIsData (ProductIsData), ) -import Plutarch.Extra.List (pnotNull) import Plutarch.Extra.Sum (PSum (PSum)) import Plutarch.Extra.Traversable (pfoldMap) import Plutarch.Lift (PConstantDecl, PUnsafeLiftDecl (PLifted)) @@ -376,7 +375,7 @@ deriving via pstakeLocked :: forall (s :: S). Term s (PStakeDatum :--> PBool) pstakeLocked = phoistAcyclic $ plam $ \stakeDatum -> - pnotNull #$ pfield @"lockedBy" @(PBuiltinList _) # pto stakeDatum + pnot #$ pnull #$ pfield @"lockedBy" @(PBuiltinList _) # pto stakeDatum {- | Get the number of *alive* proposals that were created by the given stake. diff --git a/agora/Agora/Stake/Redeemers.hs b/agora/Agora/Stake/Redeemers.hs index f9ff776..d179876 100644 --- a/agora/Agora/Stake/Redeemers.hs +++ b/agora/Agora/Stake/Redeemers.hs @@ -32,7 +32,7 @@ import Plutarch.Api.V2 (PMaybeData) import Plutarch.Extra.Field (pletAllC) import Plutarch.Extra.Maybe (pdjust, pdnothing, pmaybeData) import Plutarch.Extra.Record (mkRecordConstr, (.&), (.=)) -import Plutarch.Extra.TermCont (pguardC, pletC, pmatchC) +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pguardC, pletC, pmatchC) import Plutarch.Extra.Value (pgeqByClass, pgeqByClass') import Plutarch.Numeric.Additive (AdditiveMonoid (zero), AdditiveSemigroup ((+))) import Plutarch.SafeMoney (pdiscreteValue) diff --git a/agora/Agora/Stake/Scripts.hs b/agora/Agora/Stake/Scripts.hs index bc3e60f..530063b 100644 --- a/agora/Agora/Stake/Scripts.hs +++ b/agora/Agora/Stake/Scripts.hs @@ -76,7 +76,7 @@ import Plutarch.Extra.AssetClass ( ) import Plutarch.Extra.Bind (PBind ((#>>=))) import Plutarch.Extra.Field (pletAllC) -import Plutarch.Extra.List (pfirstJust) +import "liqwid-plutarch-extra" Plutarch.Extra.List (pfindJust) import Plutarch.Extra.Maybe ( passertPJust, pjust, @@ -89,7 +89,7 @@ import Plutarch.Extra.ScriptContext ( pfromOutputDatum, pvalueSpent, ) -import Plutarch.Extra.TermCont ( +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont ( pguardC, pletC, pletFieldsC, @@ -324,7 +324,7 @@ mkStakeValidator let -- Look for the output stake. stakeOutput = - pfirstJust + pfindJust # plam ( \output -> unTermCont $ do outputF <- @@ -409,7 +409,7 @@ mkStakeValidator (pjust # ref) pnothing - proposalRef = pfirstJust # f # txInfoF.inputs + proposalRef = pfindJust # f # txInfoF.inputs in pif pstMinted (pcon PNewProposal) $ pmaybe # pcon PNoProposal diff --git a/agora/Agora/Treasury.hs b/agora/Agora/Treasury.hs index 410f3fc..b9085da 100644 --- a/agora/Agora/Treasury.hs +++ b/agora/Agora/Treasury.hs @@ -15,7 +15,7 @@ module Agora.Treasury ( import Agora.AuthorityToken (singleAuthorityTokenBurned) import Plutarch.Api.V1.Value (PValue) import Plutarch.Api.V2 (PScriptPurpose (PSpending), PValidator) -import Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC, pmatchC) +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pguardC, pletC, pletFieldsC, pmatchC) import Plutarch.TryFrom () import PlutusLedgerApi.V1.Value (CurrencySymbol) diff --git a/agora/Agora/Utils.hs b/agora/Agora/Utils.hs index 70fc3d0..31e9c32 100644 --- a/agora/Agora/Utils.hs +++ b/agora/Agora/Utils.hs @@ -26,7 +26,7 @@ module Agora.Utils ( import Plutarch.Api.V1 (PPOSIXTime, PTokenName, PValidatorHash) import Plutarch.Api.V2 (PScriptHash) -import Plutarch.Extra.TermCont (pmatchC) +import "liqwid-plutarch-extra" Plutarch.Extra.TermCont (pmatchC) import Plutarch.Extra.Time (PCurrentTime (PCurrentTime)) import Plutarch.List (puncons) import Plutarch.Unsafe (punsafeCoerce) diff --git a/flake.lock b/flake.lock index 2425382..0a1bfd8 100644 --- a/flake.lock +++ b/flake.lock @@ -7106,11 +7106,11 @@ "nixpkgs-2205": "nixpkgs-2205_8" }, "locked": { - "lastModified": 1660314706, - "narHash": "sha256-RpFZJXYHAZZ5TNdxTfcHw39Uz7uQ+nSn/yYHweyL4qA=", + "lastModified": 1660580223, + "narHash": "sha256-r1i92rrUjSBdnQZpHLxeCAtVGMHYqKQHm05mzddIte8=", "owner": "Liqwid-Labs", "repo": "liqwid-nix", - "rev": "a103351651ecb17aef96d94419baf43cc7a1fc93", + "rev": "fa1eeba35b37ac2551a00798dffdf053879699c3", "type": "github" }, "original": { @@ -7156,11 +7156,11 @@ "plutarch-quickcheck": "plutarch-quickcheck" }, "locked": { - "lastModified": 1662479424, - "narHash": "sha256-961woBkTSZn0gV070cI96U7I1a1nuWcXYh+ivRtqbRU=", + "lastModified": 1663768725, + "narHash": "sha256-Wz1gerQdn5jE60yiah6v2U4ODjMS53HpY81UMtml43o=", "owner": "Liqwid-Labs", "repo": "liqwid-plutarch-extra", - "rev": "37365afb68c1241df6ea026cb9a69185fd8f1781", + "rev": "2bb728876b0e7f92636758f87608ad98a4b935b5", "type": "github" }, "original": { @@ -7212,11 +7212,11 @@ "plutarch-quickcheck": "plutarch-quickcheck_3" }, "locked": { - "lastModified": 1661992545, - "narHash": "sha256-9kHddGZu1LgrIn1lb6DFo5vbIw5bywWrb3EDn/LrU08=", + "lastModified": 1663707854, + "narHash": "sha256-7RPYWixfoVJuUyIHu3Bo+bqv35oXNjWge062UIPvWOA=", "owner": "Liqwid-Labs", "repo": "liqwid-plutarch-extra", - "rev": "fb573f7e4754abd0c280e979c51db495d9517e67", + "rev": "60207f6812a79f4b9ce0b3a22e5db4fa2981ec02", "type": "github" }, "original": { @@ -9221,11 +9221,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1660672087, - "narHash": "sha256-uX5EkXd93LRccal7P/U97PPzLUQF32RySyg48CjgeIA=", + "lastModified": 1663696179, + "narHash": "sha256-vjsfJKxW+z2t2RrYJ9gs71m48kX97+p+fpCHVmH3xxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce7b4fd5a67118b869abe57803ccd7e7a4ff6a28", + "rev": "d4717ad12898f9c36f9b9538da0ca9df175ee05e", "type": "github" }, "original": { @@ -9348,11 +9348,11 @@ }, "nixpkgs-latest_17": { "locked": { - "lastModified": 1660672087, - "narHash": "sha256-uX5EkXd93LRccal7P/U97PPzLUQF32RySyg48CjgeIA=", + "lastModified": 1663696179, + "narHash": "sha256-vjsfJKxW+z2t2RrYJ9gs71m48kX97+p+fpCHVmH3xxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce7b4fd5a67118b869abe57803ccd7e7a4ff6a28", + "rev": "d4717ad12898f9c36f9b9538da0ca9df175ee05e", "type": "github" }, "original": { @@ -11362,11 +11362,11 @@ "secp256k1-haskell": "secp256k1-haskell" }, "locked": { - "lastModified": 1660670400, - "narHash": "sha256-EoPMfaFCXzcHIiUYprCR51yxLb5mlsfuIJ29adBeyEU=", + "lastModified": 1663242420, + "narHash": "sha256-r6UVl3pBdJnectz8NDUexh3rY/4XcEqd9ILU+m/jVH8=", "owner": "Plutonomicon", "repo": "plutarch-plutus", - "rev": "f0805033ec7ad83643ba3c90902673ba6e5b90c3", + "rev": "67d38e6e14b762eb5a48b884bb96f89687d1a62d", "type": "github" }, "original": { @@ -11413,11 +11413,11 @@ "plutarch": "plutarch_2" }, "locked": { - "lastModified": 1660709756, - "narHash": "sha256-L9S9UYtpeTVGFmKNj8c/H3i17Jx8asCiW43xblN5nBo=", + "lastModified": 1663679353, + "narHash": "sha256-CK+hgOoU9qARRnaUlxlh9ZBWb0G6d8F0VslAbXd8mIM=", "owner": "Liqwid-Labs", "repo": "plutarch-context-builder", - "rev": "cc91cd134ce01e280df3b0ce09a25ede54dbf9b6", + "rev": "3bc59acb11264c4fa43c95fa615a4dbf69e0f981", "type": "github" }, "original": { @@ -11460,11 +11460,11 @@ "plutarch": "plutarch_6" }, "locked": { - "lastModified": 1663071373, - "narHash": "sha256-/qchzXZUDAjdD3efD53QVwiqk/o6MFQT4IDyndE06ec=", + "lastModified": 1663679353, + "narHash": "sha256-CK+hgOoU9qARRnaUlxlh9ZBWb0G6d8F0VslAbXd8mIM=", "owner": "Liqwid-Labs", "repo": "plutarch-context-builder", - "rev": "ad1ff6d1714dcdee75d7ce3f772960048fd2b07f", + "rev": "3bc59acb11264c4fa43c95fa615a4dbf69e0f981", "type": "github" }, "original": { @@ -11517,11 +11517,11 @@ "plutarch": "plutarch_10" }, "locked": { - "lastModified": 1660709756, - "narHash": "sha256-L9S9UYtpeTVGFmKNj8c/H3i17Jx8asCiW43xblN5nBo=", + "lastModified": 1663679353, + "narHash": "sha256-CK+hgOoU9qARRnaUlxlh9ZBWb0G6d8F0VslAbXd8mIM=", "owner": "Liqwid-Labs", "repo": "plutarch-context-builder", - "rev": "cc91cd134ce01e280df3b0ce09a25ede54dbf9b6", + "rev": "3bc59acb11264c4fa43c95fa615a4dbf69e0f981", "type": "github" }, "original": { @@ -11569,11 +11569,11 @@ "plutarch": "plutarch_3" }, "locked": { - "lastModified": 1659450964, - "narHash": "sha256-jkxeMZ5ZjEl94MG5jWC+ogeh8m5sCpR7FX2Srtedvc4=", + "lastModified": 1661989108, + "narHash": "sha256-4oNo5hjyo7oRJiyNC9k16Z2u1ZkyyrbdFJEvBsDtfCQ=", "owner": "liqwid-labs", "repo": "plutarch-numeric", - "rev": "65a1a5dec3836cf4e3c793bf780a4ee84b0a9331", + "rev": "031a524347f6b5bda46f744e8a32aa05fb9d902e", "type": "github" }, "original": { @@ -11616,11 +11616,11 @@ "plutarch": "plutarch_7" }, "locked": { - "lastModified": 1659450964, - "narHash": "sha256-jkxeMZ5ZjEl94MG5jWC+ogeh8m5sCpR7FX2Srtedvc4=", + "lastModified": 1661989108, + "narHash": "sha256-4oNo5hjyo7oRJiyNC9k16Z2u1ZkyyrbdFJEvBsDtfCQ=", "owner": "Liqwid-Labs", "repo": "plutarch-numeric", - "rev": "65a1a5dec3836cf4e3c793bf780a4ee84b0a9331", + "rev": "031a524347f6b5bda46f744e8a32aa05fb9d902e", "type": "github" }, "original": { @@ -11673,11 +11673,11 @@ "plutarch": "plutarch_11" }, "locked": { - "lastModified": 1659450964, - "narHash": "sha256-jkxeMZ5ZjEl94MG5jWC+ogeh8m5sCpR7FX2Srtedvc4=", + "lastModified": 1661989108, + "narHash": "sha256-4oNo5hjyo7oRJiyNC9k16Z2u1ZkyyrbdFJEvBsDtfCQ=", "owner": "liqwid-labs", "repo": "plutarch-numeric", - "rev": "65a1a5dec3836cf4e3c793bf780a4ee84b0a9331", + "rev": "031a524347f6b5bda46f744e8a32aa05fb9d902e", "type": "github" }, "original": { @@ -11725,11 +11725,11 @@ "plutarch": "plutarch_14" }, "locked": { - "lastModified": 1659450964, - "narHash": "sha256-jkxeMZ5ZjEl94MG5jWC+ogeh8m5sCpR7FX2Srtedvc4=", + "lastModified": 1661989108, + "narHash": "sha256-4oNo5hjyo7oRJiyNC9k16Z2u1ZkyyrbdFJEvBsDtfCQ=", "owner": "Liqwid-Labs", "repo": "plutarch-numeric", - "rev": "65a1a5dec3836cf4e3c793bf780a4ee84b0a9331", + "rev": "031a524347f6b5bda46f744e8a32aa05fb9d902e", "type": "github" }, "original": { @@ -11778,11 +11778,11 @@ "plutarch": "plutarch_4" }, "locked": { - "lastModified": 1660591493, - "narHash": "sha256-kKku1VDx+KI/+uCAVJITmSpjYEQUEUyFYXulzqRCJQc=", + "lastModified": 1662396899, + "narHash": "sha256-viJ8K/KiIIIZNFMPwTaMCFL0f8Z0NtTtTylvK52ZBfc=", "owner": "liqwid-labs", "repo": "plutarch-quickcheck", - "rev": "6388a7b3312273e80026b8ba6daee7504347b00f", + "rev": "e68e42f3522e47bd0f2a4dd408adf04ba37e11d3", "type": "github" }, "original": { @@ -11883,11 +11883,11 @@ "plutarch": "plutarch_12" }, "locked": { - "lastModified": 1660591493, - "narHash": "sha256-kKku1VDx+KI/+uCAVJITmSpjYEQUEUyFYXulzqRCJQc=", + "lastModified": 1662396899, + "narHash": "sha256-viJ8K/KiIIIZNFMPwTaMCFL0f8Z0NtTtTylvK52ZBfc=", "owner": "liqwid-labs", "repo": "plutarch-quickcheck", - "rev": "6388a7b3312273e80026b8ba6daee7504347b00f", + "rev": "e68e42f3522e47bd0f2a4dd408adf04ba37e11d3", "type": "github" }, "original": { @@ -11932,11 +11932,11 @@ "plutarch-numeric": "plutarch-numeric_4" }, "locked": { - "lastModified": 1662130349, - "narHash": "sha256-htwVesPYmr4YPpe8Sfs65U1hueSJAy1IEFiLpEETdSQ=", + "lastModified": 1663761210, + "narHash": "sha256-Ht6knGBmVOaKqCyolOFrZ5QTBHUmZwF8CP13iFmhKdk=", "owner": "Liqwid-Labs", "repo": "plutarch-safe-money", - "rev": "3a4a0301b74478fcc476d0d9b0c1d8718fea6703", + "rev": "a8e987609c56c2f8d9426d9d2356eb9325286770", "type": "github" }, "original": { @@ -11979,17 +11979,17 @@ "plutarch": "plutarch_15" }, "locked": { - "lastModified": 1663152896, - "narHash": "sha256-0iDaw3x2I+AgTGFGQw1CCKh930qnH7tcAudrfgJzyPo=", + "lastModified": 1664028810, + "narHash": "sha256-thMEO1P/ciHjnMFyL0bla781TG5C/nB5EEtebb3Boik=", "owner": "Liqwid-Labs", "repo": "plutarch-script-export", - "rev": "0d0fce14175503550b45d3194c6beebab651f352", + "rev": "4f0da58ba67cdcfe5c7d97e6e27dc00dfb71e657", "type": "github" }, "original": { "owner": "Liqwid-Labs", - "ref": "main", "repo": "plutarch-script-export", + "rev": "4f0da58ba67cdcfe5c7d97e6e27dc00dfb71e657", "type": "github" } }, @@ -12163,11 +12163,11 @@ "secp256k1-haskell": "secp256k1-haskell_13" }, "locked": { - "lastModified": 1661965997, - "narHash": "sha256-BFWpV7mpYoCCovyyUh5hraenjLI2bIaUS6oSKrNE2e4=", + "lastModified": 1663242420, + "narHash": "sha256-r6UVl3pBdJnectz8NDUexh3rY/4XcEqd9ILU+m/jVH8=", "owner": "Plutonomicon", "repo": "plutarch-plutus", - "rev": "a8888d9a42cd2cdc6bcc6a4399aaa27ff5266798", + "rev": "67d38e6e14b762eb5a48b884bb96f89687d1a62d", "type": "github" }, "original": { @@ -12250,49 +12250,6 @@ "protolude": "protolude_15", "secp256k1-haskell": "secp256k1-haskell_15" }, - "locked": { - "lastModified": 1659381657, - "narHash": "sha256-W0EWY0DV2idbIeqtJnShVHQ83exME8TK2GYQGbVpz8A=", - "owner": "Plutonomicon", - "repo": "plutarch-plutus", - "rev": "45b7c77a9ee9bd6c7dc25ddebcc3d12c58c4c3a2", - "type": "github" - }, - "original": { - "owner": "Plutonomicon", - "ref": "staging", - "repo": "plutarch-plutus", - "type": "github" - } - }, - "plutarch_16": { - "inputs": { - "cardano-base": "cardano-base_16", - "cardano-crypto": "cardano-crypto_16", - "cardano-prelude": "cardano-prelude_16", - "emanote": [ - "plutarch-script-export", - "plutarch", - "haskell-nix", - "nixpkgs-unstable" - ], - "flat": "flat_16", - "haskell-language-server": "haskell-language-server_31", - "haskell-nix": "haskell-nix_31", - "haskell-nix-extra-hackage": "haskell-nix-extra-hackage_16", - "hercules-ci-effects": "hercules-ci-effects_16", - "iohk-nix": "iohk-nix_31", - "nixpkgs": [ - "plutarch-script-export", - "plutarch", - "haskell-nix", - "nixpkgs-unstable" - ], - "nixpkgs-latest": "nixpkgs-latest_32", - "plutus": "plutus_16", - "protolude": "protolude_16", - "secp256k1-haskell": "secp256k1-haskell_16" - }, "locked": { "lastModified": 1660670400, "narHash": "sha256-EoPMfaFCXzcHIiUYprCR51yxLb5mlsfuIJ29adBeyEU=", @@ -12470,11 +12427,11 @@ "secp256k1-haskell": "secp256k1-haskell_5" }, "locked": { - "lastModified": 1661965997, - "narHash": "sha256-BFWpV7mpYoCCovyyUh5hraenjLI2bIaUS6oSKrNE2e4=", + "lastModified": 1663242420, + "narHash": "sha256-r6UVl3pBdJnectz8NDUexh3rY/4XcEqd9ILU+m/jVH8=", "owner": "Plutonomicon", "repo": "plutarch-plutus", - "rev": "a8888d9a42cd2cdc6bcc6a4399aaa27ff5266798", + "rev": "67d38e6e14b762eb5a48b884bb96f89687d1a62d", "type": "github" }, "original": { @@ -12644,11 +12601,11 @@ "secp256k1-haskell": "secp256k1-haskell_9" }, "locked": { - "lastModified": 1660670400, - "narHash": "sha256-EoPMfaFCXzcHIiUYprCR51yxLb5mlsfuIJ29adBeyEU=", + "lastModified": 1663242420, + "narHash": "sha256-r6UVl3pBdJnectz8NDUexh3rY/4XcEqd9ILU+m/jVH8=", "owner": "Plutonomicon", "repo": "plutarch-plutus", - "rev": "f0805033ec7ad83643ba3c90902673ba6e5b90c3", + "rev": "67d38e6e14b762eb5a48b884bb96f89687d1a62d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 01deac0..6dfcebd 100644 --- a/flake.nix +++ b/flake.nix @@ -34,8 +34,7 @@ plutarch-context-builder.url = "github:Liqwid-Labs/plutarch-context-builder?ref=main"; plutarch-script-export.url = - "github:Liqwid-Labs/plutarch-script-export?ref=main"; - + "github:Liqwid-Labs/plutarch-script-export?rev=4f0da58ba67cdcfe5c7d97e6e27dc00dfb71e657"; liqwid-nix.url = "github:Liqwid-Labs/liqwid-nix?ref=main"; };