Merge pull request #20 from geniusyield/atlas-bump-272

Feat #19: Bump to latest Atlas commit to use upstreamed types/utilities

Author: brunjlar

.github/workflows/haskell.yml

@@ -94,7 +94,7 @@ jobs:
     - name: Update dependencies (cabal)
       run: cabal update
     - name: Install fourmolu
-      run: cabal install fourmolu
+      run: cabal install fourmolu --overwrite-policy=always
     - name: Run checks (fourmolu)
       run: fourmolu --mode check src
     - name: Build dependencies (cabal)

cabal.project

@@ -31,8 +31,8 @@ package strict-containers
 source-repository-package
   type: git
   location: https://github.com/geniusyield/atlas
-  tag: 44b235ac4f4337dd2b2488b4f79f33a987f2be72
-  --sha256: sha256-EL7o0yYJIC8KvH0kZ9J0n+h/+w4GI4hCz39QyDA7Udg=
+  tag: 2bb7431f273dd3b737fab4e7682e9457f3b10894
+  --sha256: sha256-z1jaOWqG3Dj0ZsLLlk4Pz7mOydhni+KOF96Z9suw9uc=
 
 source-repository-package
   type: git

geniusyield-dex-api.cabal

@@ -78,7 +78,6 @@ library
 
   -- Cardano libraries which are not on hackage. Their version is pinned in @cabal.project@ file or derived from other related dependencies.
   build-depends:
-    , cardano-api
     , plutus-core
     , plutus-ledger-api
     , plutus-tx

src/GeniusYield/Scripts/Dex/PartialOrderConfig.hs

@@ -21,26 +21,20 @@ module GeniusYield.Scripts.Dex.PartialOrderConfig (
   -- * Address
   partialOrderConfigAddr,
   partialOrderConfigPlutusAddr,
-
-  -- * Helpers
-  mintingPolicyIdFromCurrencySymbol,
 ) where
 
-import Cardano.Api qualified as Api
-import Data.Text (pack)
 import GHC.Generics (Generic)
 import GeniusYield.Scripts.Dex.PartialOrderConfig.Internal (PartialOrderConfigDatum (..))
 import GeniusYield.Types
 import PlutusCore.Version (plcVersion100)
 import PlutusLedgerApi.V1 qualified as Plutus
-import PlutusLedgerApi.V1.Value (AssetClass, CurrencySymbol (..))
+import PlutusLedgerApi.V1.Value (AssetClass)
 import PlutusTx (
   BuiltinData,
   FromData (fromBuiltinData),
   ToData (toBuiltinData),
  )
 import PlutusTx qualified
-import PlutusTx.Builtins.Internal (BuiltinByteString (..))
 
 class HasPartialOrderConfigScript a where
   getPartialOrderConfigValidator ∷ a → PlutusTx.CompiledCode (AssetClass → BuiltinData → BuiltinData → BuiltinData → ())
@@ -77,7 +71,7 @@ instance ToData (PartialOrderConfigInfoF Plutus.Address) where
       PartialOrderConfigDatum
         { pocdSignatories = pubKeyHashToPlutus <$> pociSignatories,
           pocdReqSignatories = pociReqSignatories,
-          pocdNftSymbol = mintingPolicyIdCurrencySymbol pociNftSymbol,
+          pocdNftSymbol = mintingPolicyIdToCurrencySymbol pociNftSymbol,
           pocdFeeAddr = pociFeeAddr,
           pocdMakerFeeFlat = pociMakerFeeFlat,
           pocdMakerFeeRatio = rationalToPlutus pociMakerFeeRatio,
@@ -121,20 +115,3 @@ partialOrderConfigAddr script nid ac =
 
 partialOrderConfigPlutusAddr ∷ HasPartialOrderConfigScript a ⇒ a → GYAssetClass → Plutus.Address
 partialOrderConfigPlutusAddr script ac = addressToPlutus $ partialOrderConfigAddr script GYMainnet ac
-
--- TODO: move to Atlas!
-mintingPolicyIdFromCurrencySymbol ∷ CurrencySymbol → Either PlutusToCardanoError GYMintingPolicyId
-mintingPolicyIdFromCurrencySymbol cs =
-  let
-    BuiltinByteString bs = unCurrencySymbol cs
-   in
-    case Api.deserialiseFromRawBytes Api.AsPolicyId bs of
-      Left e →
-        Left $
-          DeserialiseRawBytesError $
-            pack $
-              "mintingPolicyIdFromCurrencySymbol: "
-                <> show cs
-                <> ", error: "
-                <> show e
-      Right pid → Right $ mintingPolicyIdFromApi pid