Data-backed map for Plutus Tx

plutus-benchmark/marlowe/src/PlutusBenchmark/Marlowe/Core/V1/Semantics.hs

@@ -113,8 +113,8 @@ import PlutusTx.Prelude (AdditiveGroup ((-)), AdditiveSemigroup ((+)), Bool (..)
                          not, otherwise, reverse, snd, ($), (&&), (++), (||))
 
 import PlutusLedgerApi.V2 qualified as Val
-import PlutusTx.AssocMap qualified as Map
 import PlutusTx.Builtins qualified as Builtins
+import PlutusTx.DataMap qualified as Map
 import Prelude qualified as Haskell
 
 
@@ -322,19 +322,20 @@ evalObservation env state obs = let
 
 -- | Pick the first account with money in it.
 refundOne :: Accounts -> Maybe ((Party, Token, Integer), Accounts)
-refundOne accounts = case Map.toList accounts of
-    [] -> Nothing
-    -- SCP-5126: The return value of this function differs from
-    -- Isabelle semantics in that it returns the least-recently
-    -- added account-token combination rather than the first
-    -- lexicographically ordered one. Also, the sequence
-    -- `Map.fromList . tail . Map.toList` preserves the
-    -- invariants of order and non-duplication.
-    ((accId, token), balance) : rest ->
-        if balance > 0
-        then Just ((accId, token, balance), Map.fromList rest)
-        else refundOne (Map.fromList rest)
-
+refundOne accounts =
+    if Map.null accounts
+        then Nothing
+        else
+            -- SCP-5126: The return value of this function differs from
+            -- Isabelle semantics in that it returns the least-recently
+            -- added account-token combination rather than the first
+            -- lexicographically ordered one. Also, the sequence
+            -- `Map.fromList . tail . Map.toList` preserves the
+            -- invariants of order and non-duplication.
+            let (((accId, token), balance), rest) = Map.unsafeUncons accounts
+             in if balance > 0
+                    then Just ((accId, token, balance), rest)
+                    else refundOne rest
 
 -- | Obtains the amount of money available an account.
 moneyInAccount :: AccountId -> Token -> Accounts -> Integer

plutus-benchmark/marlowe/src/PlutusBenchmark/Marlowe/Core/V1/Semantics/Types.hs

@@ -43,7 +43,7 @@ import GHC.Generics (Generic)
 import PlutusBenchmark.Marlowe.Core.V1.Semantics.Types.Address (Network)
 import PlutusLedgerApi.V2 (CurrencySymbol, POSIXTime (..), TokenName)
 import PlutusTx.AsData (asData)
-import PlutusTx.AssocMap (Map)
+import PlutusTx.DataMap (Map)
 import PlutusTx.IsData (FromData, ToData, UnsafeFromData, makeIsDataIndexed, unstableMakeIsData)
 import PlutusTx.Lift (makeLift)
 import PlutusTx.Prelude (Bool (..), BuiltinByteString, Eq (..), Integer, Ord ((<=), (>=)), any,
@@ -52,7 +52,7 @@ import PlutusTx.Prelude (Bool (..), BuiltinByteString, Eq (..), Integer, Ord ((<
 import PlutusLedgerApi.V1.Value qualified as Val
 import PlutusLedgerApi.V2 qualified as Ledger (Address (..), Credential (..), PubKeyHash (..),
                                                ScriptHash (..), StakingCredential (..))
-import PlutusTx.AssocMap qualified as Map
+import PlutusTx.DataMap qualified as Map
 import Prelude qualified as Haskell
 
 deriving stock instance Data POSIXTime

plutus-benchmark/marlowe/src/PlutusBenchmark/Marlowe/Scripts/Semantics.hs

@@ -68,10 +68,9 @@ import PlutusTx.Plugin ()
 import PlutusTx.Prelude as PlutusTxPrelude (AdditiveGroup ((-)), AdditiveMonoid (zero),
                                             AdditiveSemigroup ((+)), Bool (..), BuiltinByteString,
                                             BuiltinData, BuiltinString, Enum (fromEnum), Eq (..),
-                                            Functor (fmap), Integer, Maybe (..), Ord ((>)),
-                                            Semigroup ((<>)), all, any, check, elem, filter, find,
-                                            foldMap, null, otherwise, snd, toBuiltin, ($), (&&),
-                                            (.), (/=), (||))
+                                            Functor (fmap), Maybe (..), Ord ((>)), Semigroup ((<>)),
+                                            all, any, check, filter, find, foldMap, null, otherwise,
+                                            snd, toBuiltin, ($), (&&), (.), (/=), (||))
 
 import Cardano.Crypto.Hash qualified as Hash
 import Data.ByteString qualified as BS
@@ -82,6 +81,7 @@ import PlutusLedgerApi.V1.Value qualified as Val
 import PlutusLedgerApi.V2 qualified as Ledger (Address (Address))
 import PlutusTx qualified
 import PlutusTx.AssocMap qualified as AssocMap
+import PlutusTx.DataMap qualified as Map
 import PlutusTx.Trace (traceError, traceIfFalse)
 import Prelude qualified as Haskell
 
@@ -265,29 +265,16 @@ mkMarloweValidator
     -- Check a state for the correct value, positive accounts, and no duplicates.
     checkState :: BuiltinString -> Val.Value -> State -> Bool
     checkState tag expected State{..} =
-      let
-        positiveBalance :: (a, Integer) -> Bool
-        positiveBalance (_, balance) = balance > 0
-        noDuplicates :: Eq k => AssocMap.Map k v -> Bool
-        noDuplicates am =
-          let
-            test [] = True           -- An empty list has no duplicates.
-            test (x : xs)            -- Look for a duplicate of the head in the tail.
-              | elem x xs = False    -- A duplicate is present.
-              | otherwise = test xs  -- Continue searching for a duplicate.
-          in
-            test $ AssocMap.keys am
-      in
            -- [Marlowe-Cardano Specification: "Constraint 5. Input value from script".]
            -- and/or
            -- [Marlowe-Cardano Specification: "Constraint 18. Final balance."]
            traceIfFalse ("v"  <> tag) (totalBalance accounts == expected)
            -- [Marlowe-Cardano Specification: "Constraint 13. Positive balances".]
-        && traceIfFalse ("b"  <> tag) (all positiveBalance $ AssocMap.toList accounts)
+        && traceIfFalse ("b"  <> tag) (Map.all (> 0) accounts)
            -- [Marlowe-Cardano Specification: "Constraint 19. No duplicates".]
-        && traceIfFalse ("ea" <> tag) (noDuplicates accounts)
-        && traceIfFalse ("ec" <> tag) (noDuplicates choices)
-        && traceIfFalse ("eb" <> tag) (noDuplicates boundValues)
+        && traceIfFalse ("ea" <> tag) (Map.noDuplicateKeys accounts)
+        && traceIfFalse ("ec" <> tag) (Map.noDuplicateKeys choices)
+        && traceIfFalse ("eb" <> tag) (Map.noDuplicateKeys boundValues)
 
     -- Look up the Datum hash for specific data.
     findDatumHash' :: PlutusTx.ToData o => o -> Maybe DatumHash

plutus-benchmark/marlowe/test/role-payout/9.6/0004000402010401030101030100040000010104020201030001000204020401.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 215190496
-| mem: 740280})
+({cpu: 216800496
+| mem: 747280})

plutus-benchmark/marlowe/test/role-payout/9.6/0100000100010000000001000100010101000101000001000000010000010000.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 318563258
-| mem: 1148984})
+({cpu: 321921258
+| mem: 1163584})

plutus-benchmark/marlowe/test/role-payout/9.6/0101000100000101010000010101000100010101000001000001000000010101.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 233064631
-| mem: 813142})
+({cpu: 235778631
+| mem: 824942})

plutus-benchmark/marlowe/test/role-payout/9.6/01dcc372ea619cb9f23c45b17b9a0a8a16b7ca0e04093ef8ecce291667a99a4c.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 193813161
-| mem: 665714})
+({cpu: 195607161
+| mem: 673514})

plutus-benchmark/marlowe/test/role-payout/9.6/0201020201020000020000010201020001020200000002010200000101010100.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 215630084
-| mem: 741820})
+({cpu: 217332084
+| mem: 749220})

plutus-benchmark/marlowe/test/role-payout/9.6/0202010002010100020102020102020001010101020102010001010101000100.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 198410174
-| mem: 675264})
+({cpu: 199606174
+| mem: 680464})

plutus-benchmark/marlowe/test/role-payout/9.6/0303020000020001010201060303040208070100050401080304020801030001.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 196916597
-| mem: 670062})
+({cpu: 198112597
+| mem: 675262})

plutus-benchmark/marlowe/test/role-payout/9.6/031d56d71454e2c4216ffaa275c4a8b3eb631109559d0e56f44ea8489f57ba97.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 242350272
-| mem: 842458})
+({cpu: 244512272
+| mem: 851858})

plutus-benchmark/marlowe/test/role-payout/9.6/03d730a62332c51c7b70c16c64da72dd1c3ea36c26b41cd1a1e00d39fda3d6cc.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 231983448
-| mem: 807632})
+({cpu: 234099448
+| mem: 816832})

plutus-benchmark/marlowe/test/role-payout/9.6/0403020000030204010000030001000202010101000304030001040404030100.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 212366629
-| mem: 731700})
+({cpu: 214114629
+| mem: 739300})

plutus-benchmark/marlowe/test/role-payout/9.6/0405010105020401010304080005050800040301010800080207080704020206.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 228876366
-| mem: 790180})
+({cpu: 230486366
+| mem: 797180})

plutus-benchmark/marlowe/test/role-payout/9.6/041a2c3b111139201a3a2c173c392b170e16370d300f2d28342d0f2f0e182e01.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 237522811
-| mem: 833156})
+({cpu: 239684811
+| mem: 842556})

plutus-benchmark/marlowe/test/role-payout/9.6/04f592afc6e57c633b9c55246e7c82e87258f04e2fb910c37d8e2417e9db46e5.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 271106152
-| mem: 953580})
+({cpu: 274464152
+| mem: 968180})

plutus-benchmark/marlowe/test/role-payout/9.6/057ebc80922f16a5f4bf13e985bf586b8cff37a2f6fe0f3ce842178c16981027.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 194025187
-| mem: 663336})
+({cpu: 195267187
+| mem: 668736})

plutus-benchmark/marlowe/test/role-payout/9.6/06317060a8e488b1219c9dae427f9ce27918a9e09ee8ac424afa33ca923f7954.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 211186829
-| mem: 726696})
+({cpu: 213348829
+| mem: 736096})

plutus-benchmark/marlowe/test/role-payout/9.6/07658a6c898ad6d624c37df1e49e909c2e9349ba7f4c0a6be5f166fe239bfcae.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 195543413
-| mem: 663662})
+({cpu: 197337413
+| mem: 671462})

plutus-benchmark/marlowe/test/role-payout/9.6/0bdca1cb8fa7e38e09062557b82490714052e84e2054e913092cd84ac071b961.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 231957108
-| mem: 816128})
+({cpu: 233659108
+| mem: 823528})

plutus-benchmark/marlowe/test/role-payout/9.6/0c9d3634aeae7038f839a1262d1a8bc724dc77af9426459417a56ec73240f0e0.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 208852885
-| mem: 721874})
+({cpu: 211152885
+| mem: 731874})

plutus-benchmark/marlowe/test/role-payout/9.6/0d0f01050a0a0a0b0b050d0404090e0d0506000d0a041003040e0f100e0a0408.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 210080867
-| mem: 737000})
+({cpu: 212334867
+| mem: 746800})

plutus-benchmark/marlowe/test/role-payout/9.6/0dbb692d2bf22d25eeceac461cfebf616f54003077a8473abc0457f18e025960.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 236972199
-| mem: 830902})
+({cpu: 240100199
+| mem: 844502})

plutus-benchmark/marlowe/test/role-payout/9.6/0e00171d0f1e1f14070d0a00091f07101808021d081e1b120219081312081e15.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 197071500
-| mem: 677660})
+({cpu: 198359500
+| mem: 683260})

plutus-benchmark/marlowe/test/role-payout/9.6/0e72f62b0f922e31a2340baccc768104025400cf7fdd7dae62fbba5fc770936d.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 221821467
-| mem: 767608})
+({cpu: 223983467
+| mem: 777008})

plutus-benchmark/marlowe/test/role-payout/9.6/0e97c9d9417354d9460f2eb35018d3904b7b035af16ab299258adab93be0911a.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 215190496
-| mem: 740280})
+({cpu: 216800496
+| mem: 747280})

plutus-benchmark/marlowe/test/role-payout/9.6/0f010d040810040b10020e040f0e030b0a0d100f0c080c0c05000d04100c100f.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 229625754
-| mem: 799928})
+({cpu: 231235754
+| mem: 806928})

plutus-benchmark/marlowe/test/role-payout/9.6/1138a04a83edc0579053f9ffa9394b41df38230121fbecebee8c039776a88c0c.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 201406281
-| mem: 686966})
+({cpu: 203108281
+| mem: 694366})

plutus-benchmark/marlowe/test/role-payout/9.6/121a0a1b12030616111f02121a0e070716090a0e031c071419121f141409031d.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 198198210
-| mem: 677642})
+({cpu: 199946210
+| mem: 685242})

plutus-benchmark/marlowe/test/role-payout/9.6/159e5a1bf16fe984b5569be7011b61b5e98f5d2839ca7e1b34c7f2afc7ffb58e.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 197821685
-| mem: 673962})
+({cpu: 199017685
+| mem: 679162})

plutus-benchmark/marlowe/test/role-payout/9.6/195f522b596360690d04586a2563470f2214163435331a6622311f7323433f1c.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 192531548
-| mem: 658134})
+({cpu: 193773548
+| mem: 663534})

plutus-benchmark/marlowe/test/role-payout/9.6/1a20b465d48a585ffd622bd8dc26a498a3c12f930ab4feab3a5064cfb3bc536a.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 218883854
-| mem: 752828})
+({cpu: 220585854
+| mem: 760228})

plutus-benchmark/marlowe/test/role-payout/9.6/211e1b6c10260c4620074d2e372c260d38643a3d605f63772524034f0a4a7632.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 206252520
-| mem: 706212})
+({cpu: 207448520
+| mem: 711412})

plutus-benchmark/marlowe/test/role-payout/9.6/21a1426fb3fb3019d5dc93f210152e90b0a6e740ef509b1cdd423395f010e0ca.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 223621194
-| mem: 779702})
+({cpu: 225783194
+| mem: 789102})

plutus-benchmark/marlowe/test/role-payout/9.6/224ce46046fab9a17be4197622825f45cc0c59a6bd1604405148e43768c487ef.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 201406281
-| mem: 686966})
+({cpu: 203108281
+| mem: 694366})

plutus-benchmark/marlowe/test/role-payout/9.6/332c2b1c11383d1b373e1315201f1128010e0e1518332f273f141b23243f2a07.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 188734988
-| mem: 647508})
+({cpu: 190022988
+| mem: 653108})

plutus-benchmark/marlowe/test/role-payout/9.6/3565ee025317e065e8555eef288080276716366769aad89e03389f5ec4ce26d7.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 211833524
-| mem: 731194})
+({cpu: 213581524
+| mem: 738794})

plutus-benchmark/marlowe/test/role-payout/9.6/3569299fc986f5354d02e627a9eaa48ab46d5af52722307a0af72bae87e256dc.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 194025125
-| mem: 663336})
+({cpu: 195267125
+| mem: 668736})

plutus-benchmark/marlowe/test/role-payout/9.6/36866914aa07cf62ef36cf2cd64c7f240e3371e27bb9fff5464301678e809c40.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 194025125
-| mem: 663336})
+({cpu: 195267125
+| mem: 668736})

plutus-benchmark/marlowe/test/role-payout/9.6/371c10d2526fc0f09dbe9ed59e44dcd949270b27dc42035addd7ff9f7e0d05e7.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 233147796
-| mem: 807900})
+({cpu: 235171796
+| mem: 816700})

plutus-benchmark/marlowe/test/role-payout/9.6/3897ef714bba3e6821495b706c75f8d64264c3fdaa58a3826c808b5a768c303d.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 204935205
-| mem: 705448})
+({cpu: 206683205
+| mem: 713048})

plutus-benchmark/marlowe/test/role-payout/9.6/4121d88f14387d33ac5e1329618068e3848445cdd66b29e5ba382be2e02a174a.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 232567113
-| mem: 815654})
+({cpu: 235189113
+| mem: 827054})

plutus-benchmark/marlowe/test/role-payout/9.6/4299c7fcf093a5dbfe114c188e32ca199b571a7c25cb7f766bf49f12dab308be.eval.golden

@@ -1,2 +1,2 @@
-({cpu: 215190496
-| mem: 740280})
+({cpu: 216800496
+| mem: 747280})