Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Babbage: Era mapping #2618

Merged
merged 3 commits into from
Jan 19, 2022
Merged

Babbage: Era mapping #2618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5daff74
babbage Tx
goolord Jan 6, 2022
62259c5
polymorphize Alonzo/TxInfo
goolord Jan 6, 2022
59f8a5d
generalize alonzo rules
goolord Jan 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions eras/alonzo/impl/src/Cardano/Ledger/Alonzo/PlutusScriptApi.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ module Cardano.Ledger.Alonzo.PlutusScriptApi
where

import Cardano.Binary (FromCBOR (..), ToCBOR (..))
import Cardano.Ledger.Address (Addr)
import Cardano.Ledger.Alonzo.Data (getPlutusData)
import Cardano.Ledger.Alonzo.Language (Language (..))
import Cardano.Ledger.Alonzo.Scripts (CostModel (..), ExUnits (..))
Expand All @@ -33,7 +34,6 @@ import Cardano.Ledger.Alonzo.Tx
indexedRdmrs,
txdats',
)
import qualified Cardano.Ledger.Alonzo.TxBody as Alonzo (TxBody (..), TxOut (..), vldt')
import Cardano.Ledger.Alonzo.TxInfo
( FailureDescription (..),
ScriptResult (..),
Expand All @@ -48,6 +48,7 @@ import qualified Cardano.Ledger.Core as Core
import Cardano.Ledger.Credential (Credential (ScriptHashObj))
import qualified Cardano.Ledger.Crypto as CC (Crypto)
import Cardano.Ledger.Era (Era (..))
import Cardano.Ledger.Keys (KeyHash, KeyRole (Witness))
import Cardano.Ledger.Mary.Value (PolicyID (..))
import qualified Cardano.Ledger.Mary.Value as Mary (Value (..))
import Cardano.Ledger.Shelley.Delegation.Certificates (DCert (..))
Expand All @@ -61,6 +62,7 @@ import Cardano.Ledger.Shelley.TxBody
)
import Cardano.Ledger.Shelley.UTxO (UTxO (..), getScriptHash, scriptCred)
import Cardano.Ledger.ShelleyMA.Timelocks (evalTimelock)
import Cardano.Ledger.ShelleyMA.TxBody (ValidityInterval)
import Cardano.Ledger.TxIn (TxIn (..))
import Cardano.Slotting.EpochInfo (EpochInfo)
import Cardano.Slotting.Time (SystemStart)
Expand Down Expand Up @@ -150,8 +152,6 @@ collectTwoPhaseScriptInputs ::
forall era tx.
( Era era,
Core.Script era ~ AlonzoScript.Script era,
Core.TxOut era ~ Alonzo.TxOut era,
Core.TxBody era ~ Alonzo.TxBody era,
Core.Value era ~ Mary.Value (Crypto era),
HasField "datahash" (Core.TxOut era) (StrictMaybe (DataHash (Crypto era))),
HasField "_costmdls" (Core.PParams era) (Map.Map Language CostModel),
Expand All @@ -160,7 +160,11 @@ collectTwoPhaseScriptInputs ::
HasField "certs" (Core.TxBody era) (StrictSeq (DCert (Crypto era))),
HasField "inputs" (Core.TxBody era) (Set (TxIn (Crypto era))),
HasField "body" tx (Core.TxBody era),
HasField "wits" tx (TxWitness era)
HasField "wits" tx (TxWitness era),
HasField "address" (Core.TxOut era) (Addr (Crypto era)),
HasField "mint" (Core.TxBody era) (Mary.Value (Crypto era)),
HasField "reqSignerHashes" (Core.TxBody era) (Set (KeyHash 'Witness (Crypto era))),
HasField "vldt" (Core.TxBody era) ValidityInterval
) =>
EpochInfo Identity ->
SystemStart ->
Expand Down Expand Up @@ -227,17 +231,17 @@ language (AlonzoScript.TimelockScript _) = Nothing
evalScripts ::
forall era tx.
( Era era,
Alonzo.TxBody era ~ Core.TxBody era,
Show (AlonzoScript.Script era),
HasField "body" tx (Core.TxBody era),
HasField "wits" tx (TxWitness era)
HasField "wits" tx (TxWitness era),
HasField "vldt" (Core.TxBody era) ValidityInterval
) =>
tx ->
[(AlonzoScript.Script era, [Data era], ExUnits, CostModel)] ->
ScriptResult
evalScripts _tx [] = Passes
evalScripts tx ((AlonzoScript.TimelockScript timelock, _, _, _) : rest) =
lift (evalTimelock vhks (Alonzo.vldt' (getField @"body" tx)) timelock)
lift (evalTimelock vhks (getField @"vldt" (getField @"body" tx)) timelock)
`andResult` evalScripts tx rest
where
vhks = Set.map witKeyHash (txwitsVKey' (getField @"wits" tx))
Expand Down
62 changes: 40 additions & 22 deletions eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Rules/Utxo.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,11 @@ import Cardano.Ledger.Address
getNetwork,
getRwdNetwork,
)
import Cardano.Ledger.Alonzo.Data (dataHashSize)
import Cardano.Ledger.Alonzo.Data (DataHash, dataHashSize)
import Cardano.Ledger.Alonzo.Rules.Utxos (UTXOS, UtxosPredicateFailure)
import Cardano.Ledger.Alonzo.Scripts (ExUnits (..), Prices, pointWiseExUnits)
import Cardano.Ledger.Alonzo.Tx (ValidatedTx (..), minfee, totExUnits)
import qualified Cardano.Ledger.Alonzo.Tx as Alonzo (ValidatedTx)
import Cardano.Ledger.Alonzo.TxBody
( TxOut (..),
txnetworkid',
)
import qualified Cardano.Ledger.Alonzo.TxBody as Alonzo (TxBody, TxOut)
import qualified Cardano.Ledger.Alonzo.TxSeq as Alonzo (TxSeq)
import Cardano.Ledger.Alonzo.TxWitness (TxWitness (txrdmrs'), nullRedeemers)
import Cardano.Ledger.BaseTypes
Expand All @@ -47,15 +42,14 @@ import Cardano.Ledger.Credential (Credential (..))
import qualified Cardano.Ledger.Crypto as CC
import Cardano.Ledger.Era (Crypto, Era, ValidateScript (..))
import qualified Cardano.Ledger.Era as Era
import qualified Cardano.Ledger.Mary.Value as Alonzo (Value)
import Cardano.Ledger.Rules.ValidationMode ((?!#))
import Cardano.Ledger.Shelley.Constraints
( UsesPParams,
)
import qualified Cardano.Ledger.Shelley.LedgerState as Shelley
import qualified Cardano.Ledger.Shelley.Rules.Utxo as Shelley
import Cardano.Ledger.Shelley.Tx (TxIn)
import Cardano.Ledger.Shelley.TxBody (unWdrl)
import Cardano.Ledger.Shelley.TxBody (DCert, Wdrl, unWdrl)
import Cardano.Ledger.Shelley.UTxO
( UTxO (..),
balance,
Expand Down Expand Up @@ -89,6 +83,7 @@ import qualified Data.Compact.SplitMap as SplitMap
import Data.Foldable (foldl', toList)
import qualified Data.Map.Strict as Map
import Data.Ratio ((%))
import Data.Sequence.Strict (StrictSeq)
import Data.Set (Set)
import qualified Data.Set as Set
import Data.Typeable (Typeable)
Expand All @@ -99,7 +94,12 @@ import Numeric.Natural (Natural)

-- | Compute an estimate of the size of storing one UTxO entry.
-- This function implements the UTxO entry size estimate done by scaledMinDeposit in the ShelleyMA era
utxoEntrySize :: Era era => TxOut era -> Integer
utxoEntrySize ::
( Era era,
HasField "datahash" (Core.TxOut era) (StrictMaybe (DataHash c))
) =>
Core.TxOut era ->
Integer
utxoEntrySize txout = utxoEntrySizeWithoutVal + Val.size v + dataHashSize dh
where
v = getField @"value" txout
Expand Down Expand Up @@ -227,7 +227,7 @@ isKeyHashAddr (AddrBootstrap _) = True
isKeyHashAddr (Addr _ (KeyHashObj _) _) = True
isKeyHashAddr _ = False

vKeyLocked :: Era era => TxOut era -> Bool
vKeyLocked :: (HasField "address" (Core.TxOut era) (Addr (Crypto era))) => Core.TxOut era -> Bool
vKeyLocked txout = isKeyHashAddr (getField @"address" txout)

-- | feesOK is a predicate with several parts. Some parts only apply in special circumstances.
Expand All @@ -244,7 +244,6 @@ feesOK ::
forall era.
( Era era,
ValidateScript era, -- isTwoPhaseScriptAddress
Core.TxOut era ~ Alonzo.TxOut era, -- balance requires this,
Core.Tx era ~ Alonzo.ValidatedTx era,
Core.Witnesses era ~ TxWitness era,
HasField
Expand All @@ -254,7 +253,8 @@ feesOK ::
HasField "_minfeeA" (Core.PParams era) Natural,
HasField "_minfeeB" (Core.PParams era) Natural,
HasField "_prices" (Core.PParams era) Prices,
HasField "_collateralPercentage" (Core.PParams era) Natural
HasField "_collateralPercentage" (Core.PParams era) Natural,
HasField "address" (Core.TxOut era) (Addr (Crypto era))
) =>
Core.PParams era ->
Core.Tx era ->
Expand Down Expand Up @@ -302,6 +302,9 @@ utxoTransition ::
Signal (Core.EraRule "UTXOS" era) ~ Core.Tx era,
-- We leave Core.PParams abstract
UsesPParams era,
Core.ChainData (Core.Value era),
Core.ChainData (Core.TxOut era),
Core.ChainData (Core.TxBody era),
HasField "_minfeeA" (Core.PParams era) Natural,
HasField "_minfeeB" (Core.PParams era) Natural,
HasField "_keyDeposit" (Core.PParams era) Coin,
Expand All @@ -313,13 +316,19 @@ utxoTransition ::
HasField "_maxValSize" (Core.PParams era) Natural,
HasField "_collateralPercentage" (Core.PParams era) Natural,
HasField "_maxCollateralInputs" (Core.PParams era) Natural,
-- We fix Core.Tx, Core.Value, Core.TxBody, and Core.TxOut
Core.Tx era ~ Alonzo.ValidatedTx era,
Core.TxOut era ~ Alonzo.TxOut era,
Core.Value era ~ Alonzo.Value (Crypto era),
Core.TxBody era ~ Alonzo.TxBody era,
Core.Witnesses era ~ TxWitness era,
Era.TxSeq era ~ Alonzo.TxSeq era
Era.TxSeq era ~ Alonzo.TxSeq era,
HasField "vldt" (Core.TxBody era) ValidityInterval,
HasField "inputs" (Core.TxBody era) (Set (TxIn (Crypto era))),
HasField "collateral" (Core.TxBody era) (Set (TxIn (Crypto era))),
HasField "mint" (Core.TxBody era) (Core.Value era),
HasField "wdrls" (Core.TxBody era) (Wdrl (Crypto era)),
HasField "certs" (Core.TxBody era) (StrictSeq (DCert (Crypto era))),
HasField "datahash" (Core.TxOut era) (StrictMaybe (DataHash (Crypto era))),
ToCBOR (Core.Value era),
HasField "txnetworkid" (Core.TxBody era) (StrictMaybe Network),
HasField "address" (Core.TxOut era) (Addr (Crypto era))
) =>
TransitionRule (AlonzoUTXO era)
utxoTransition = do
Expand Down Expand Up @@ -430,7 +439,7 @@ utxoTransition = do
(Set.fromList wdrlsWrongNetwork)

{- txnetworkid txb = NetworkId -}
case txnetworkid' txb of
case getField @"txnetworkid" txb of
SNothing -> pure ()
SJust bid -> ni == bid ?!# WrongNetworkInTxBody ni bid

Expand Down Expand Up @@ -464,6 +473,10 @@ instance
State (Core.EraRule "UTXOS" era) ~ Shelley.UTxOState era,
Signal (Core.EraRule "UTXOS" era) ~ ValidatedTx era,
-- We leave Core.PParams abstract
ToCBOR (Core.Value era),
Core.ChainData (Core.Value era),
Core.ChainData (Core.TxOut era),
Core.ChainData (Core.TxBody era),
UsesPParams era,
HasField "_keyDeposit" (Core.PParams era) Coin,
HasField "_minfeeA" (Core.PParams era) Natural,
Expand All @@ -477,11 +490,16 @@ instance
HasField "_maxValSize" (Core.PParams era) Natural,
HasField "_collateralPercentage" (Core.PParams era) Natural,
HasField "_maxCollateralInputs" (Core.PParams era) Natural,
-- We fix Core.Value, Core.TxBody, and Core.TxOut
Core.Value era ~ Alonzo.Value (Crypto era),
Core.TxBody era ~ Alonzo.TxBody era,
HasField "txnetworkid" (Core.TxBody era) (StrictMaybe Network),
HasField "certs" (Core.TxBody era) (StrictSeq (DCert (Crypto era))),
HasField "collateral" (Core.TxBody era) (Set (TxIn (Crypto era))),
HasField "datahash" (Core.TxOut era) (StrictMaybe (DataHash (Crypto era))),
HasField "address" (Core.TxOut era) (Addr (Crypto era)),
HasField "inputs" (Core.TxBody era) (Set (TxIn (Crypto era))),
HasField "mint" (Core.TxBody era) (Core.Value era),
HasField "vldt" (Core.TxBody era) ValidityInterval,
HasField "wdrls" (Core.TxBody era) (Wdrl (Crypto era)),
Core.Witnesses era ~ TxWitness era,
Core.TxOut era ~ Alonzo.TxOut era,
Era.TxSeq era ~ Alonzo.TxSeq era,
Core.Tx era ~ Alonzo.ValidatedTx era
) =>
Expand Down
Loading