Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions doc/docusaurus/static/code/AuctionMintingPolicy.hs
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,13 @@ import PlutusTx
import PlutusTx.Prelude

import PlutusCore.Version (plcVersion110)
import PlutusLedgerApi.V1.Value (flattenValue)
import PlutusLedgerApi.V3 (PubKeyHash, ScriptContext (..), TxInfo (..), mintValueMinted)
import PlutusLedgerApi.V3
( PubKeyHash
, ScriptContext (..)
, TxInfo (..)
, flattenValue
, mintValueMinted
)
import PlutusLedgerApi.V3.Contexts (ownCurrencySymbol, txSignedBy)

-- BLOCK1
Expand Down
7 changes: 3 additions & 4 deletions doc/docusaurus/static/code/QuickStart.hs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import Data.ByteString.Base16 qualified as Base16
import Data.ByteString.Short qualified as BS
import PlutusLedgerApi.V1.Crypto qualified as Crypto
import PlutusLedgerApi.V1.Time qualified as Time
import PlutusLedgerApi.V1.Value qualified as Value
import PlutusLedgerApi.V3 (serialiseCompiledCode)
import PlutusLedgerApi.V3 (CurrencySymbol (..), serialiseCompiledCode, tokenName)
import PlutusTx.Builtins.HasOpaque (stringToBuiltinByteStringHex)

main :: IO ()
Expand All @@ -32,13 +31,13 @@ main =
)
, apCurrencySymbol =
-- Replace with your desired currency symbol (minting policy hash):
Value.CurrencySymbol
CurrencySymbol
( stringToBuiltinByteStringHex
"00000000000000000000000000000000000000000000000000000000"
)
, apTokenName =
-- Replace with your desired token name:
Value.tokenName "MY_TOKEN"
tokenName "MY_TOKEN"
, apMinBid =
-- Minimal bid in lovelace:
100
Expand Down
5 changes: 2 additions & 3 deletions plutus-benchmark/cardano-loans/src/CardanoLoans/Test.hs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import PlutusTx.Prelude

import CardanoLoans.Validator (LoanDatum (..), LoanRedeemer (..), loanValidatorCode)
import PlutusLedgerApi.V1.Address (pubKeyHashAddress)
import PlutusLedgerApi.V1.Value qualified as Value
import PlutusLedgerApi.V2.Tx qualified as Tx
import PlutusLedgerApi.V3
import PlutusTx.AssocMap qualified as Map
Expand All @@ -35,14 +34,14 @@ testScriptContext =
{ txInfoInputs =
[ TxInInfo
{ txInInfoOutRef = txOutRef
, txInInfoResolved = Tx.pubKeyHashTxOut (Value.lovelaceValue 1000) testBeneficiaryPKH
, txInInfoResolved = Tx.pubKeyHashTxOut (lovelaceValue 1000) testBeneficiaryPKH
}
]
, txInfoReferenceInputs = mempty
, txInfoOutputs =
[ TxOut
{ txOutAddress = pubKeyHashAddress testBeneficiaryPKH
, txOutValue = Value.lovelaceValue 1000
, txOutValue = lovelaceValue 1000
, txOutDatum = NoOutputDatum
, txOutReferenceScript = Nothing
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ module CardanoLoans.Validator
, loanValidatorCode
) where

import PlutusLedgerApi.V1.Value (valueOf)
import PlutusLedgerApi.V3
import PlutusLedgerApi.V3.Contexts (valueSpent)
import PlutusTx
Expand Down
1 change: 0 additions & 1 deletion plutus-benchmark/coop/src/PlutusBenchmark/Coop/Gen.hs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import Data.Set (Set)
import Data.Set qualified as Set
import Data.Traversable (for)
import PlutusLedgerApi.V1.Address (pubKeyHashAddress, scriptHashAddress)
import PlutusLedgerApi.V1.Value
import PlutusLedgerApi.V2 hiding (Map)
import PlutusTx.AssocMap qualified as AssocMap
import PlutusTx.Builtins.HasOpaque (stringToBuiltinByteString)
Expand Down
16 changes: 7 additions & 9 deletions plutus-benchmark/coop/src/PlutusBenchmark/Coop/Scripts.hs
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,9 @@ import PlutusTx.Prelude
import Prelude ()

import PlutusLedgerApi.V1.Interval (contains)
import PlutusLedgerApi.V1.Value
( AssetClass (AssetClass)
, isZero
, unAssetClass
, valueOf
, withCurrencySymbol
)
import PlutusLedgerApi.V1.Value qualified as Value
import PlutusLedgerApi.V2
( Datum
( AssetClass (AssetClass)
, Datum
, Extended (PosInf)
, Interval (Interval, ivTo)
, LedgerBytes (getLedgerBytes)
Expand All @@ -48,7 +41,12 @@ import PlutusLedgerApi.V2
, TxOutRef (TxOutRef, txOutRefId, txOutRefIdx)
, UpperBound (UpperBound)
, Value (Value, getValue)
, isZero
, unAssetClass
, valueOf
, withCurrencySymbol
)
import PlutusLedgerApi.V2 qualified as Value
import PlutusTx.AssocMap qualified as AssocMap
import PlutusTx.Builtins.Internal qualified as BI
import PlutusTx.List (elem, find, foldl, null)
Expand Down
11 changes: 9 additions & 2 deletions plutus-benchmark/coop/src/PlutusBenchmark/Coop/TestContext.hs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,15 @@ module PlutusBenchmark.Coop.TestContext
) where

import PlutusLedgerApi.V1.Address (scriptHashAddress)
import PlutusLedgerApi.V1.Value (AssetClass, CurrencySymbol (..), TokenName (..), assetClass)
import PlutusLedgerApi.V2 (Address, ScriptContext, ScriptHash (..))
import PlutusLedgerApi.V2
( Address
, AssetClass
, CurrencySymbol (..)
, ScriptContext
, ScriptHash (..)
, TokenName (..)
, assetClass
)

import Test.QuickCheck.Gen (Gen (unGen))
import Test.QuickCheck.Random (mkQCGen)
Expand Down
2 changes: 1 addition & 1 deletion plutus-benchmark/coop/src/PlutusBenchmark/Coop/Types.hs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ module PlutusBenchmark.Coop.Types where
import Prelude qualified as HS

import Control.Lens (makeFields)
import PlutusLedgerApi.V1.Value (AssetClass)
import PlutusLedgerApi.V3
( Address
, AssetClass
, CurrencySymbol
, Extended
, LedgerBytes
Expand Down
5 changes: 4 additions & 1 deletion plutus-benchmark/coop/src/PlutusBenchmark/Coop/Utils.hs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ module PlutusBenchmark.Coop.Utils where
import PlutusTx.Prelude
import Prelude ()

import PlutusLedgerApi.V1.Value (Value (Value), flattenValue, valueOf, withCurrencySymbol)
import PlutusLedgerApi.V2
( CurrencySymbol
, Datum (Datum)
Expand All @@ -20,6 +19,10 @@ import PlutusLedgerApi.V2
, TxInfo (TxInfo, txInfoInputs, txInfoMint)
, TxOut (TxOut, txOutValue)
, TxOutRef (TxOutRef)
, Value (Value)
, flattenValue
, valueOf
, withCurrencySymbol
)
import PlutusTx.AssocMap (Map, lookup)
import PlutusTx.AssocMap qualified as AssocMap
Expand Down
2 changes: 1 addition & 1 deletion plutus-benchmark/linear-vesting/src/LinearVesting/Test.hs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import PlutusTx
import PlutusTx.Prelude hiding ((<>))

import LinearVesting.Validator (VestingDatum (..), VestingRedeemer (..), validatorCode)
import PlutusLedgerApi.Data.V3 (assetClass)
import PlutusLedgerApi.Data.V3 qualified as PV3D
import PlutusLedgerApi.Test.ScriptContextBuilder.Builder
( buildScriptContext
Expand All @@ -22,7 +23,6 @@ import PlutusLedgerApi.Test.ScriptContextBuilder.Builder
, withSpendingScript
, withValidRange
)
import PlutusLedgerApi.V1.Data.Value (assetClass)
import PlutusLedgerApi.V3 qualified as PV3
import Prelude ((<>))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ module LinearVesting.Validator
)
where

import PlutusLedgerApi.Data.V3 (Address)
import PlutusLedgerApi.V1.Data.Value (AssetClass)
import PlutusLedgerApi.Data.V3 (Address, AssetClass)
import PlutusTx (CompiledCode, compile, makeIsDataIndexed, makeLift)
import PlutusTx.Bool (Bool (..), not, otherwise)
import PlutusTx.Builtins.HasOpaque ()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ import PlutusLedgerApi.V2
, ScriptHash
, ScriptPurpose (Spending)
, SerialisedScript
, TokenName (TokenName)
, TxInfo (..)
, TxOutRef (TxOutRef)
, UpperBound (UpperBound)
, singleton
)

import PlutusLedgerApi.V1.Value (TokenName (TokenName))
import PlutusTx.AssocMap qualified as AM (empty)

-- | Write a flat UPLC file for a benchmark.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import PlutusBenchmark.Marlowe.Util
, makeOutput
, makeRedeemerMap
)
import PlutusLedgerApi.V1.Value (TokenName (TokenName))
import PlutusLedgerApi.V2
( Credential (PubKeyCredential, ScriptCredential)
, CurrencySymbol (..)
Expand All @@ -35,6 +34,7 @@ import PlutusLedgerApi.V2
, ScriptHash
, ScriptPurpose (Spending)
, SerialisedScript
, TokenName (TokenName)
, TxInfo
( TxInfo
, txInfoDCert
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ import Control.Newtype.Generics (Newtype)
import Data.Data (Data)
import GHC.Generics (Generic)
import PlutusBenchmark.Marlowe.Core.V1.Semantics.Types.Address (Network)
import PlutusLedgerApi.V1.Value qualified as Val
import PlutusLedgerApi.V2 (CurrencySymbol, POSIXTime (..), TokenName)
import PlutusLedgerApi.V2 (CurrencySymbol, POSIXTime (..), TokenName (..))
import PlutusLedgerApi.V2 qualified as Ledger
( Address (..)
, Credential (..)
, PubKeyHash (..)
, ScriptHash (..)
, StakingCredential (..)
, Value
)
import PlutusTx.AsData (asData)
import PlutusTx.AssocMap (Map)
Expand Down Expand Up @@ -77,7 +77,7 @@ type AccountId = Party
type Timeout = POSIXTime

-- | A multi-asset value.
type Money = Val.Value
type Money = Ledger.Value

-- | The name of a choice in a contract.
type ChoiceName = BuiltinByteString
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import PlutusTx.Prelude as PlutusTxPrelude
import Cardano.Crypto.Hash qualified as Hash
import Data.ByteString qualified as BS
import Data.ByteString.Short qualified as SBS
import PlutusLedgerApi.V1.Value qualified as Val
import PlutusLedgerApi.V2 qualified as Val
import PlutusTx qualified

-- | Tag for the Marlowe payout validator.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ import Data.ByteString qualified as BS
import Data.ByteString.Short qualified as SBS
import PlutusCore.Version (plcVersion100)
import PlutusLedgerApi.V1.Address qualified as Address (scriptHashAddress)
import PlutusLedgerApi.V1.Value qualified as Val
import PlutusLedgerApi.V2 qualified as Ledger (Address)
import PlutusLedgerApi.V2 qualified as Val
import PlutusTx qualified
import PlutusTx.AssocMap qualified as AssocMap
import PlutusTx.Builtins qualified as B
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import Cardano.Crypto.Hash qualified as Hash
import Data.ByteString qualified as BS
import Data.ByteString.Short qualified as SBS
import Plinth.Plugin ()
import PlutusLedgerApi.V1.Value qualified as Val
import PlutusLedgerApi.V2
( CurrencySymbol
, ScriptContext (scriptContextTxInfo)
Expand All @@ -28,6 +27,7 @@ import PlutusLedgerApi.V2
, TokenName
, serialiseCompiledCode
)
import PlutusLedgerApi.V2 qualified as Val
import PlutusLedgerApi.V2.Contexts (valueSpent)
import PlutusTx (CompiledCode, unsafeFromBuiltinData)
import PlutusTx qualified
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ import Data.ByteString qualified as BS
import Data.ByteString.Short qualified as SBS
import PlutusCore.Version (plcVersion100)
import PlutusLedgerApi.V1.Address qualified as Address (scriptHashAddress)
import PlutusLedgerApi.V1.Value qualified as Val
import PlutusLedgerApi.V2 qualified as Ledger (Address (Address))
import PlutusLedgerApi.V2 qualified as Val
import PlutusTx qualified
import PlutusTx.AssocMap qualified as AssocMap
import PlutusTx.Trace (traceError, traceIfFalse)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ module PlutusBenchmark.V1.Data.ScriptContexts where
import Plinth.Plugin ()
import PlutusLedgerApi.Data.V1
import PlutusLedgerApi.V1.Data.Address
import PlutusLedgerApi.V1.Data.Value
import PlutusTx qualified
import PlutusTx.Builtins qualified as PlutusTx
import PlutusTx.Data.List qualified as Data.List
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ module PlutusBenchmark.V2.Data.ScriptContexts where
import Plinth.Plugin ()
import PlutusLedgerApi.Data.V2
import PlutusLedgerApi.V1.Data.Address
import PlutusLedgerApi.V1.Data.Value
import PlutusTx qualified
import PlutusTx.BuiltinList qualified as BuiltinList
import PlutusTx.Builtins qualified as PlutusTx
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ module PlutusBenchmark.V2.ScriptContexts where

import Plinth.Plugin ()
import PlutusLedgerApi.V1.Address
import PlutusLedgerApi.V1.Value
import PlutusLedgerApi.V2
import PlutusTx qualified
import PlutusTx.AssocMap qualified as Map
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,20 @@ module PlutusBenchmark.V3.Data.ScriptContexts where
import Plinth.Plugin ()
import PlutusLedgerApi.Data.V1 qualified as PlutusTx
import PlutusLedgerApi.Data.V3
( PubKeyHash (..)
( CurrencySymbol (..)
, PubKeyHash (..)
, Redeemer (..)
, ScriptContext
, TokenName (..)
, TxId (..)
, TxInfo
, TxOut
, Value (..)
, adaSymbol
, adaToken
, always
, assetClass
, assetClassValue
, emptyMintValue
, mintValueMinted
, txInInfoOutRef
Expand Down Expand Up @@ -55,7 +62,6 @@ import PlutusLedgerApi.Data.V3
, pattern VotingScript
)
import PlutusLedgerApi.V1.Data.Address
import PlutusLedgerApi.V1.Data.Value
import PlutusLedgerApi.V3.Data.MintValue (MintValue (..))
import PlutusTx qualified
import PlutusTx.Builtins qualified as PlutusTx
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ module PlutusBenchmark.V3.ScriptContexts where

import Plinth.Plugin ()
import PlutusLedgerApi.V1.Address
import PlutusLedgerApi.V1.Value
import PlutusLedgerApi.V3
( OutputDatum (NoOutputDatum)
, PubKeyHash (..)
Expand All @@ -19,7 +18,12 @@ import PlutusLedgerApi.V3
, TxInfo (..)
, TxOut (..)
, TxOutRef (..)
, Value
, adaSymbol
, adaToken
, always
, assetClass
, assetClassValue
, emptyMintValue
)
import PlutusTx qualified
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### Added

- `PlutusLedgerApi.V2`, `PlutusLedgerApi.V3`, and `PlutusLedgerApi.Data.V1`/`V2`/`V3` re-export the full `Value` API that `PlutusLedgerApi.V1` already exposed (read accessors, `AssetClass`, helpers), and all of these umbrellas (including `V1`) now also expose `geq`, `gt`, `leq`, `lt`, and `withCurrencySymbol`. Reading or comparing a `Value` from these modules no longer requires importing `PlutusLedgerApi.V1.Value` or `PlutusLedgerApi.V1.Data.Value`.
21 changes: 21 additions & 0 deletions plutus-ledger-api/src/PlutusLedgerApi/Data/V1.hs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,27 @@ module PlutusLedgerApi.Data.V1
, adaSymbol
, adaToken
, Lovelace (..)
, AssetClass (..)
, assetClass
, assetClassValue
, assetClassValueOf
, currencySymbol
, currencySymbolValueOf
, flattenValue
, geq
, gt
, isZero
, leq
, lovelaceValue
, lovelaceValueOf
, lt
, scale
, split
, symbols
, tokenName
, unsafeLovelaceValueOf
, valueOf
, withCurrencySymbol

-- *** Time
, POSIXTime (..)
Expand Down
Loading
Loading