BuiltinByteString literals aren't UTF8 encoded.

IntersectMBO · Nov 12, 2024 · 0f08f16 · 0f08f16
1 parent c23a4d8
commit 0f08f16
Show file tree

Hide file tree

Showing 48 changed files with 334 additions and 187 deletions.
diff --git a/.hlint.yaml b/.hlint.yaml
@@ -27,3 +27,4 @@
 - ignore: {name: Use first, within: [UntypedPlutusCore.Evaluation.Machine.Cek]}
 - ignore: {name: Redundant if, within: [PlutusLedgerApi.V1.Value, PlutusLedgerApi.V1.Data.Value]}
 - ignore: {name: Replace case with maybe, within: [PlutusLedgerApi.V1.Value, PlutusLedgerApi.V1.Data.Value]}
+- ignore: {name: Use bimap, within: [PlutusTx.Builtins.HasOpaque]}
diff --git a/...ion/builtin/semantics/bls12_381_G1_scalarMul/mul-neg-one/mul-neg-one.uplc.budget.expected b/...ion/builtin/semantics/bls12_381_G1_scalarMul/mul-neg-one/mul-neg-one.uplc.budget.expected
@@ -0,0 +1,2 @@
+({cpu: 76521974
+| mem: 618})
diff --git a/...evaluation/builtin/semantics/bls12_381_G1_scalarMul/mul-neg-one/mul-neg-one.uplc.expected b/...evaluation/builtin/semantics/bls12_381_G1_scalarMul/mul-neg-one/mul-neg-one.uplc.expected
@@ -0,0 +1,7 @@
+(program
+  1.0.0
+  (con
+    bls12_381_G1_element
+    0x8bd61864f519748032551e42e0ac417fd828f079454e3e3c9891c5c29ed7f10bdecc046854e3931cb7002779bd76d71f
+  )
+)
diff --git a/...ases/uplc/evaluation/builtin/semantics/replicateByte/case-07/case-07.uplc.budget.expected b/...ases/uplc/evaluation/builtin/semantics/replicateByte/case-07/case-07.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 260294
-| mem: 601})
+({cpu: 260453
+| mem: 602})
diff --git a/...ases/uplc/evaluation/builtin/semantics/replicateByte/case-09/case-09.uplc.budget.expected b/...ases/uplc/evaluation/builtin/semantics/replicateByte/case-09/case-09.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 423110
-| mem: 1625})
+({cpu: 260453
+| mem: 602})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-11/case-11.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-11/case-11.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-12/case-12.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-12/case-12.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-13/case-13.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-13/case-13.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-14/case-14.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-14/case-14.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-15/case-15.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-15/case-15.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-16/case-16.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-16/case-16.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-17/case-17.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-17/case-17.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-18/case-18.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-18/case-18.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-20/case-20.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-20/case-20.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-21/case-21.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-21/case-21.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-22/case-22.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-22/case-22.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-23/case-23.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-23/case-23.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-24/case-24.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-24/case-24.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-25/case-25.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-25/case-25.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-26/case-26.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-26/case-26.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-27/case-27.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-27/case-27.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-29/case-29.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-29/case-29.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-30/case-30.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-30/case-30.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 430941
+({cpu: 562877
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-31/case-31.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-31/case-31.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 430941
+({cpu: 562877
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-32/case-32.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-32/case-32.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 732509
+({cpu: 1769149
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-33/case-33.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-33/case-33.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 732509
+({cpu: 1769149
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-34/case-34.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-34/case-34.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 808086
+({cpu: 958870
 | mem: 1402})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-35/case-35.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-35/case-35.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 808086
+({cpu: 958870
 | mem: 1402})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-36/case-36.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-36/case-36.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-37/case-37.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-37/case-37.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 412093
+({cpu: 487485
 | mem: 801})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-38/case-38.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-38/case-38.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 449789
+({cpu: 638269
 | mem: 806})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-39/case-39.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-39/case-39.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 940022
+({cpu: 1486614
 | mem: 1412})
diff --git a/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-40/case-40.uplc.budget.expected b/...st-cases/uplc/evaluation/builtin/semantics/writeBits/case-40/case-40.uplc.budget.expected
@@ -1,2 +1,2 @@
-({cpu: 449789
+({cpu: 638269
 | mem: 806})
diff --git a/plutus-core/cost-model/test/TH.hs b/plutus-core/cost-model/test/TH.hs
@@ -3,17 +3,14 @@
    restrictions.
 -}
 
-{-# LANGUAGE TemplateHaskell #-}
-
-module TH (genTest)
-where
+module TH (genTest) where
 
 import Data.Char (toUpper)
 import Language.Haskell.TH
 
 toUpper1 :: String -> String
 toUpper1 []     = error "empty string in toUpper1"
-toUpper1 (c:cs) = (toUpper c):cs
+toUpper1 (c:cs) = toUpper c : cs
 
 mkIterApp :: Exp -> [Exp] -> Exp
 mkIterApp = foldl AppE

diff --git a/plutus-tx-plugin/plutus-tx-plugin.cabal b/plutus-tx-plugin/plutus-tx-plugin.cabal
@@ -124,6 +124,7 @@ test-suite plutus-tx-plugin-tests
     Budget.Spec
     Budget.WithGHCOptimisations
     Budget.WithoutGHCOptimisations
+    ByteStringLiterals.Spec
     IntegerLiterals.NoStrict.NegativeLiterals.Spec
     IntegerLiterals.NoStrict.NoNegativeLiterals.Spec
     IntegerLiterals.Strict.NegativeLiterals.Spec