Skip to content

Commit 9958453

Browse files
committed
Feat #19: Bump to latest Atlas commit to use upstreamed types/utilities
1 parent c5734e3 commit 9958453

File tree

3 files changed

+4
-28
lines changed

3 files changed

+4
-28
lines changed

cabal.project

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ package strict-containers
3131
source-repository-package
3232
type: git
3333
location: https://github.com/geniusyield/atlas
34-
tag: 44b235ac4f4337dd2b2488b4f79f33a987f2be72
35-
--sha256: sha256-EL7o0yYJIC8KvH0kZ9J0n+h/+w4GI4hCz39QyDA7Udg=
34+
tag: 79c634c4dd3d16df2c1322469158859ad0652092
35+
--sha256: sha256-AHHELuBFEM6p12VIf1P81ziEIb/xeaTL5Trfowqzzkc=
3636

3737
source-repository-package
3838
type: git

geniusyield-dex-api.cabal

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ library
7878

7979
-- Cardano libraries which are not on hackage. Their version is pinned in @cabal.project@ file or derived from other related dependencies.
8080
build-depends:
81-
, cardano-api
8281
, plutus-core
8382
, plutus-ledger-api
8483
, plutus-tx

src/GeniusYield/Scripts/Dex/PartialOrderConfig.hs

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,20 @@ module GeniusYield.Scripts.Dex.PartialOrderConfig (
2121
-- * Address
2222
partialOrderConfigAddr,
2323
partialOrderConfigPlutusAddr,
24-
25-
-- * Helpers
26-
mintingPolicyIdFromCurrencySymbol,
2724
) where
2825

29-
import Cardano.Api qualified as Api
30-
import Data.Text (pack)
3126
import GHC.Generics (Generic)
3227
import GeniusYield.Scripts.Dex.PartialOrderConfig.Internal (PartialOrderConfigDatum (..))
3328
import GeniusYield.Types
3429
import PlutusCore.Version (plcVersion100)
3530
import PlutusLedgerApi.V1 qualified as Plutus
36-
import PlutusLedgerApi.V1.Value (AssetClass, CurrencySymbol (..))
31+
import PlutusLedgerApi.V1.Value (AssetClass)
3732
import PlutusTx (
3833
BuiltinData,
3934
FromData (fromBuiltinData),
4035
ToData (toBuiltinData),
4136
)
4237
import PlutusTx qualified
43-
import PlutusTx.Builtins.Internal (BuiltinByteString (..))
4438

4539
class HasPartialOrderConfigScript a where
4640
getPartialOrderConfigValidator a PlutusTx.CompiledCode (AssetClass BuiltinData BuiltinData BuiltinData ())
@@ -77,7 +71,7 @@ instance ToData (PartialOrderConfigInfoF Plutus.Address) where
7771
PartialOrderConfigDatum
7872
{ pocdSignatories = pubKeyHashToPlutus <$> pociSignatories,
7973
pocdReqSignatories = pociReqSignatories,
80-
pocdNftSymbol = mintingPolicyIdCurrencySymbol pociNftSymbol,
74+
pocdNftSymbol = mintingPolicyIdToCurrencySymbol pociNftSymbol,
8175
pocdFeeAddr = pociFeeAddr,
8276
pocdMakerFeeFlat = pociMakerFeeFlat,
8377
pocdMakerFeeRatio = rationalToPlutus pociMakerFeeRatio,
@@ -121,20 +115,3 @@ partialOrderConfigAddr script nid ac =
121115

122116
partialOrderConfigPlutusAddr HasPartialOrderConfigScript a a GYAssetClass Plutus.Address
123117
partialOrderConfigPlutusAddr script ac = addressToPlutus $ partialOrderConfigAddr script GYMainnet ac
124-
125-
-- TODO: move to Atlas!
126-
mintingPolicyIdFromCurrencySymbol CurrencySymbol Either PlutusToCardanoError GYMintingPolicyId
127-
mintingPolicyIdFromCurrencySymbol cs =
128-
let
129-
BuiltinByteString bs = unCurrencySymbol cs
130-
in
131-
case Api.deserialiseFromRawBytes Api.AsPolicyId bs of
132-
Left e
133-
Left $
134-
DeserialiseRawBytesError $
135-
pack $
136-
"mintingPolicyIdFromCurrencySymbol: "
137-
<> show cs
138-
<> ", error: "
139-
<> show e
140-
Right pid Right $ mintingPolicyIdFromApi pid

0 commit comments

Comments
 (0)