Manager addresses fix (#50)

* updated scripts

* replaced managerPkh with mangerAddress in datums

src/Fundraising/Create.purs

@@ -31,7 +31,7 @@ import MintingPolicy.NftMinting as NFT
 import MintingPolicy.NftRedeemer (PNftRedeemer(..))
 import MintingPolicy.VerTokenMinting as VerToken
 import MintingPolicy.VerTokenRedeemers (PVerTokenRedeemer(..))
-import Protocol.Datum (_protocolFee, _minDuration, _maxDuration, _minAmount, _maxAmount, _managerPkh)
+import Protocol.Datum (_protocolFee, _minDuration, _maxDuration, _minAmount, _maxAmount, _managerAddress)
 import Protocol.Models (PFundriseConfig(..))
 import Protocol.ProtocolScriptInfo (ProtocolScriptInfo(..), getProtocolScriptInfo)
 import Protocol.Redeemer (PProtocolRedeemer(..))
@@ -94,7 +94,7 @@ contract protocolData (CreateFundraisingParams { title, amount, duration }) = do
       , frAmount: targetAmount
       , frDeadline: deadline
       , frFee: view _protocolFee protocolInfo.pDatum
-      , managerPkh: view _managerPkh protocolInfo.pDatum
+      , managerAddress: view _managerAddress protocolInfo.pDatum
       }
 
   let

src/Fundraising/Datum.purs

@@ -2,7 +2,7 @@ module Fundraising.Datum where
 
 import Ctl.Internal.FromData
 
-import Contract.Address (PaymentPubKeyHash)
+import Contract.Address (Address, PaymentPubKeyHash)
 import Contract.PlutusData (class HasPlutusSchema, type (:+), type (:=), type (@@), I, PNil, Z, genericToData)
 import Contract.Prelude (class Generic, class Show)
 import Contract.Time (POSIXTime)
@@ -23,7 +23,7 @@ newtype PFundraisingDatum = PFundraisingDatum
   , frAmount :: BigInt -- amount to raise in Lovelace
   , frDeadline :: POSIXTime
   , frFee :: BigInt -- percentage
-  , managerPkh :: PaymentPubKeyHash
+  , managerAddress :: Address
   }
 
 derive instance Generic PFundraisingDatum _
@@ -48,8 +48,8 @@ instance
               := I POSIXTime
               :+ "frFee"
               := I BigInt
-              :+ "managerPkh"
-              := I PaymentPubKeyHash
+              :+ "managerAddress"
+              := I Address
               :+ PNil
           )
         @@ Z

src/Fundraising/ReceiveFunds.purs

@@ -23,7 +23,6 @@ import Fundraising.Calculations (calcFee)
 import Fundraising.Datum (PFundraisingDatum(..))
 import Fundraising.FundraisingScriptInfo (FundraisingScriptInfo(..), getFundraisingScriptInfo, makeFundraising)
 import Fundraising.Models (Fundraising(..))
-import Shared.OwnCredentials (OwnCredentials(..), getOwnCreds)
 import Fundraising.Redeemer (PFundraisingRedeemer(..))
 import Fundraising.UserData (FundraisingData(..))
 import MintingPolicy.NftMinting as NFT
@@ -32,6 +31,7 @@ import MintingPolicy.VerTokenMinting as VerToken
 import Protocol.UserData (ProtocolData, dataToProtocol)
 import Shared.MinAda (minAda)
 import Shared.NetworkData (NetworkParams)
+import Shared.OwnCredentials (OwnCredentials(..), getOwnCreds, getPkhSkhFromAddress)
 import Shared.RunContract (runContractWithResult)
 import Shared.Utxo (checkTokenInUTxO)
 
@@ -41,7 +41,6 @@ runReceiveFunds onComplete onError pData networkParams fundraisingData =
 
 contract :: ProtocolData -> FundraisingData -> Contract Unit
 contract pData (FundraisingData fundraisingData) = do
-  -- TODO: use mustPayToPubKeyAddress for managerPkh (need stake key hash)
   logInfo' "Running receive funds"
   protocol <- dataToProtocol pData
   let threadTokenCurrency = fundraisingData.frThreadTokenCurrency
@@ -53,7 +52,7 @@ contract pData (FundraisingData fundraisingData) = do
   let
     currentFunds = frInfo.frValue
     (PFundraisingDatum currentDatum) = frInfo.frDatum
-    managerPkh = currentDatum.managerPkh
+  managerPkh /\ managerSkh <- getPkhSkhFromAddress currentDatum.managerAddress
   now <- currentTime
   let donatedAmount = Value.valueOf currentFunds adaSymbol adaToken - minAda - minAda
   when (now <= currentDatum.frDeadline && donatedAmount < currentDatum.frAmount)
@@ -87,7 +86,7 @@ contract pData (FundraisingData fundraisingData) = do
           (Redeemer $ toData $ PBurnNft fr.verTokenName)
           verTokenToBurnValue
         <> Constraints.mustPayToPubKeyAddress creds.ownPkh creds.ownSkh amountToReceiver
-        <> Constraints.mustPayToPubKey managerPkh (Value.lovelaceValueOf feeByFundraising)
+        <> Constraints.mustPayToPubKeyAddress managerPkh managerSkh (Value.lovelaceValueOf feeByFundraising)
         <> Constraints.mustValidateIn (from now)
         <> Constraints.mustReferenceOutput (fst frInfo.frScriptRef)
 

src/Info/AppInfo.purs

@@ -7,12 +7,12 @@ import Contract.Log (logInfo')
 import Contract.Monad (Contract, liftContractM)
 import Contract.Utxos (utxosAt)
 import Ctl.Internal.Plutus.Types.Transaction (UtxoMap)
-import Shared.OwnCredentials (getOwnUserInfo)
 import Info.UserData (AppInfo(..))
 import Protocol.Models (Protocol)
 import Protocol.ProtocolScript (getProtocolValidatorHash)
 import Protocol.UserData (ProtocolData, dataToProtocol, getConfigFromProtocolDatum)
 import Shared.NetworkData (NetworkParams)
+import Shared.OwnCredentials (getOwnUserInfo, getPkhSkhFromAddress)
 import Shared.RunContract (runContractWithResult)
 import Shared.Utxo (UtxoTuple, extractDatumFromUTxO, getUtxoByNFT)
 
@@ -32,7 +32,7 @@ appInfoContract protocolData = do
   protocolUtxo <- getProtocolUtxo protocol utxos
   protocolDatum <- liftContractM "Impossible to get Protocol Datum" $ extractDatumFromUTxO protocolUtxo
   logInfo' $ "Current datum: " <> show protocolDatum
-  let managerPkh = unwrap >>> _.managerPkh $ protocolDatum
+  managerPkh /\ _ <- getPkhSkhFromAddress (unwrap protocolDatum).managerAddress
   userInfo <- getOwnUserInfo managerPkh
 
   let

src/Protocol/CloseProtocol.purs

@@ -2,6 +2,7 @@ module Protocol.CloseProtocol where
 
 import Contract.Prelude
 
+import Config.Protocol (mapToProtocolData, readProtocolConfig)
 import Contract.Address (getWalletAddressesWithNetworkTag)
 import Contract.BalanceTxConstraints (BalanceTxConstraintsBuilder, mustSendChangeToAddress)
 import Contract.Log (logInfo')
@@ -13,17 +14,16 @@ import Contract.TxConstraints as Constraints
 import Contract.Value as Value
 import Data.Array as Array
 import Data.BigInt (fromInt)
+import Effect.Aff (launchAff_)
 import Effect.Exception (throw)
-import Shared.OwnCredentials (OwnCredentials(..), getOwnCreds)
 import MintingPolicy.NftMinting as NFT
 import MintingPolicy.NftRedeemer (PNftRedeemer(..))
 import Protocol.Models (Protocol(..))
 import Protocol.ProtocolScriptInfo (ProtocolScriptInfo(..), getProtocolScriptInfo)
 import Protocol.Redeemer (PProtocolRedeemer(PCloseProtocol))
 import Protocol.UserData (ProtocolData, dataToProtocol)
 import Shared.KeyWalletConfig (testnetKeyWalletConfig)
-import Config.Protocol (mapToProtocolData, readProtocolConfig)
-import Effect.Aff (launchAff_)
+import Shared.OwnCredentials (OwnCredentials(..), getOwnCreds, getPkhSkhFromAddress)
 
 runCloseProtocol :: Effect Unit
 runCloseProtocol = do
@@ -36,7 +36,7 @@ contract protocolData = do
   logInfo' "Running closeProtocol"
   protocol@(Protocol { protocolCurrency, protocolTokenName }) <- dataToProtocol protocolData
   (ProtocolScriptInfo protocolInfo) <- getProtocolScriptInfo protocol
-  let managerPkh = (unwrap protocolInfo.pDatum).managerPkh
+  managerPkh /\ _ <- getPkhSkhFromAddress (unwrap protocolInfo.pDatum).managerAddress
   (OwnCredentials creds) <- getOwnCreds
   when (managerPkh /= creds.ownPkh) $ liftEffect $ throw "current user doesn't have permissions to close protocol"
   let nftOref = (unwrap protocolInfo.pDatum).tokenOriginRef

src/Protocol/Datum.purs

@@ -1,7 +1,7 @@
 module Protocol.Datum where
 
 import Ctl.Internal.FromData
-import Contract.Address (PaymentPubKeyHash)
+import Contract.Address (Address)
 import Contract.PlutusData (class HasPlutusSchema, type (:+), type (:=), type (@@), I, PNil, Z, genericToData)
 import Contract.Prelude (class Generic, class Show)
 import Ctl.Internal.ToData (class ToData)
@@ -20,7 +20,7 @@ newtype PProtocolDatum = PProtocolDatum
   , minDuration :: BigInt
   , maxDuration :: BigInt
   , protocolFee :: BigInt -- the percentage 
-  , managerPkh :: PaymentPubKeyHash
+  , managerAddress :: Address
   , tokenOriginRef :: TransactionInput
   }
 
@@ -39,8 +39,8 @@ _maxDuration = _Newtype <<< prop (Proxy :: Proxy "maxDuration")
 _protocolFee :: Lens' PProtocolDatum BigInt
 _protocolFee = _Newtype <<< prop (Proxy :: Proxy "protocolFee")
 
-_managerPkh :: Lens' PProtocolDatum PaymentPubKeyHash
-_managerPkh = _Newtype <<< prop (Proxy :: Proxy "managerPkh")
+_managerAddress :: Lens' PProtocolDatum Address
+_managerAddress = _Newtype <<< prop (Proxy :: Proxy "managerAddress")
 
 _tokenOriginRef :: Lens' PProtocolDatum TransactionInput
 _tokenOriginRef = _Newtype <<< prop (Proxy :: Proxy "tokenOriginRef")
@@ -65,8 +65,8 @@ instance
               := I BigInt
               :+ "protocolFee"
               := I BigInt
-              :+ "managerPkh"
-              := I PaymentPubKeyHash
+              :+ "managerAddress"
+              := I Address
               :+ "tokenOriginRef"
               := I TransactionInput
               :+ PNil

src/Protocol/StartProtocol.purs

@@ -82,7 +82,7 @@ startProtocol params@(ProtocolConfigParams { minAmountParam, maxAmountParam, min
       , minDuration: minDurationParam
       , maxDuration: maxDurationParam
       , protocolFee: protocolFeeParam
-      , managerPkh: ownPkh
+      , managerAddress: ownAddress
       , tokenOriginRef: oref
       }
     nftValue = Value.singleton cs tn one

src/Protocol/UpdateProtocol.purs

@@ -18,13 +18,14 @@ import Data.Array (head) as Array
 import Data.Lens (view)
 import Effect.Aff (launchAff_)
 import Effect.Exception (throw)
-import Protocol.Datum (PProtocolDatum(..), _managerPkh, _tokenOriginRef)
+import Protocol.Datum (PProtocolDatum(..), _managerAddress, _tokenOriginRef)
 import Protocol.Models (PProtocolConfig(..))
 import Protocol.ProtocolScriptInfo (ProtocolScriptInfo(..), getProtocolScriptInfo)
 import Protocol.Redeemer (PProtocolRedeemer(..))
 import Protocol.UserData (ProtocolConfigParams, ProtocolData, dataToProtocol, getConfigFromProtocolDatum, mapToProtocolConfig)
 import Shared.Config (mapToProtocolConfigParams, readDonatPoolConfig)
 import Shared.KeyWalletConfig (testnetKeyWalletConfig)
+import Shared.OwnCredentials (getPkhSkhFromAddress)
 import Shared.Utxo (getNonCollateralUtxo)
 
 runUpdateProtocol :: Effect Unit
@@ -46,7 +47,7 @@ contract protocolData protocolConfigParams = do
   ownAddress <- liftedM "Failed to get own address" $ Array.head <$> getWalletAddresses
   walletUtxo <- utxosAt ownAddress >>= getNonCollateralUtxo
 
-  let manager = view _managerPkh protocolInfo.pDatum
+  manager /\ _ <- getPkhSkhFromAddress $ view _managerAddress protocolInfo.pDatum
   when (manager /= ownPkh) $ liftEffect $ throw "Current user doesn't have permissions to update protocol"
 
   let protocolConfig = mapToProtocolConfig protocolConfigParams
@@ -96,6 +97,6 @@ makeDatum currentDatum (PProtocolConfig { minAmount, maxAmount, minDuration, max
     , minDuration: minDuration
     , maxDuration: maxDuration
     , protocolFee: protocolFee
-    , managerPkh: view _managerPkh currentDatum
+    , managerAddress: view _managerAddress currentDatum
     , tokenOriginRef: view _tokenOriginRef currentDatum
     }

src/Shared/OwnCredentials.purs

@@ -2,13 +2,27 @@ module Shared.OwnCredentials where
 
 import Contract.Prelude
 
-import Contract.Address (addressWithNetworkTagToBech32, AddressWithNetworkTag, PaymentPubKeyHash, StakePubKeyHash, getWalletAddressesWithNetworkTag, ownPaymentPubKeysHashes, ownStakePubKeysHashes)
+import Contract.Address
+  ( Address
+  , AddressWithNetworkTag
+  , PaymentPubKeyHash(..)
+  , PubKeyHash
+  , StakePubKeyHash(..)
+  , addressWithNetworkTagToBech32
+  , getWalletAddressesWithNetworkTag
+  , ownPaymentPubKeysHashes
+  , ownStakePubKeysHashes
+  , toPubKeyHash
+  , toStakingCredential
+  )
+import Contract.Credential (Credential(..), StakingCredential(..))
 import Contract.Log (logInfo')
 import Contract.Monad (Contract, liftContractM, liftedM)
 import Contract.Transaction (TransactionInput, TransactionOutputWithRefScript)
 import Contract.Utxos (utxosAt)
 import Data.Array as Array
 import Data.Map as Map
+import Effect.Exception (throw)
 import Info.UserData (UserInfo(..))
 import Shared.Utxo (UtxoTuple, getNonCollateralUtxo)
 
@@ -51,4 +65,18 @@ getOwnPkhAndAddress = do
   ownPkh <- liftContractM "Impossible to get own PaymentPubkeyHash" $ Array.head ownHashes
   logInfo' $ "Own Payment pkh is: " <> show ownPkh
   ownAddressWithNetworkTag <- liftedM "Failed to get own address" $ Array.head <$> getWalletAddressesWithNetworkTag
-  pure $ (ownPkh /\ ownAddressWithNetworkTag)
+  pure $ (ownPkh /\ ownAddressWithNetworkTag)
+
+getPkhSkhFromAddress :: Address -> Contract (PaymentPubKeyHash /\ StakePubKeyHash)
+getPkhSkhFromAddress address = do
+  pkh <- liftContractM "Impossible to extract payment pkh from script address" $ toPubKeyHash address
+  stakingCreds <- liftContractM "Staking creds missed from provided address" $ toStakingCredential address
+  skh <- case stakingCreds of
+    StakingHash creds -> liftContractM "Impossible to extract staking pkh" $ pkhFromCreds creds
+    _ -> liftEffect $ throw "Unexpected staking credentials"
+  pure (PaymentPubKeyHash pkh /\ StakePubKeyHash skh)
+  where
+  pkhFromCreds :: Credential -> Maybe PubKeyHash
+  pkhFromCreds creds = case creds of
+    PubKeyCredential pkh -> Just pkh
+    _ -> Nothing