PLT-7583 Consolided validator experiments into proposed new validator…

… for production.
input-output-hk · Dec 9, 2023 · 1f3cc77 · 1f3cc77
1 parent d438fa3
commit 1f3cc77
Show file tree

Hide file tree

Showing 18 changed files with 774 additions and 2,603 deletions.
diff --git a/marlowe-plutus/app/Benchmark/Marlowe.hs b/marlowe-plutus/app/Benchmark/Marlowe.hs
@@ -24,7 +24,7 @@ import Control.Monad.Writer (runWriterT)
 import Data.Bifunctor (bimap)
 import Data.Either.Extras (unsafeFromEither)
 import Data.List (isSuffixOf)
-import Language.Marlowe.Core.V1.Semantics (MarloweData)
+import Language.Marlowe.Plutus.Semantics (MarloweData)
 import Language.Marlowe.Scripts.Types (MarloweInput)
 import Paths_marlowe_plutus (getDataDir)
 import PlutusCore.Executable.AstIO (fromNamedDeBruijnUPLC)

diff --git a/marlowe-plutus/app/Benchmark/Marlowe/Semantics.hs b/marlowe-plutus/app/Benchmark/Marlowe/Semantics.hs
@@ -25,19 +25,11 @@ import Benchmark.Marlowe.Util (
   updateScriptHash,
  )
 import Data.Bifunctor (second)
-#ifdef VALIDATOR_EXPERIMENT
-import Language.Marlowe.Plutus.Experiment.Script (
+import Language.Marlowe.Plutus.Script (
   marloweValidator,
   marloweValidatorBytes,
   marloweValidatorHash,
  )
-#else
-import Language.Marlowe.Plutus.Semantics (
-  marloweValidator,
-  marloweValidatorBytes,
-  marloweValidatorHash,
- )
-#endif
 import PlutusLedgerApi.V2 (
   Credential (PubKeyCredential, ScriptCredential),
   ExBudget (ExBudget),

diff --git a/marlowe-plutus/charli3/Language/Marlowe/Plutus/Charli3.hs b/marlowe-plutus/charli3/Language/Marlowe/Plutus/Charli3.hs
@@ -36,7 +36,7 @@ module Language.Marlowe.Plutus.Charli3 (
 ) where
 
 import Language.Marlowe.Plutus (hashScript)
-import Language.Marlowe.Plutus.Semantics (marloweValidatorHash)
+import Language.Marlowe.Plutus.Script (marloweValidatorHash)
 import PlutusCore.Version (plcVersion100)
 import PlutusLedgerApi.V1.Address (scriptHashAddress)
 import PlutusLedgerApi.V1.Value (adaSymbol, getValue, valueOf)
@@ -58,8 +58,8 @@ import PlutusTx (CompiledCode)
 
 import PlutusTx.Prelude as PlutusTxPrelude
 
-import qualified Language.Marlowe.Core.V1.Semantics.Types as V1
-import qualified Language.Marlowe.Scripts.Types as V1.Scripts
+import qualified Language.Marlowe.Plutus.ScriptTypes as V1.Scripts
+import qualified Language.Marlowe.Plutus.Semantics.Types as V1
 import qualified OracleFeed as C3
 import qualified PlutusLedgerApi.V2 as PV2
 import qualified PlutusTx

diff --git a/marlowe-plutus/charli3/Main.hs b/marlowe-plutus/charli3/Main.hs
@@ -11,8 +11,8 @@ import Cardano.Binary (serialize')
 
 import qualified Data.ByteString as BS (writeFile)
 import qualified Data.ByteString.Base16 as B16 (encode)
-import qualified Language.Marlowe.Core.V1.Semantics.Types as V1
 import qualified Language.Marlowe.Plutus.Charli3 as Charli3 (validatorBytes, validatorHash)
+import qualified Language.Marlowe.Plutus.Semantics.Types as V1
 import qualified Options.Applicative as O
 
 -- | The command-line arguments.

diff --git a/marlowe-plutus/marlowe-plutus.cabal b/marlowe-plutus/marlowe-plutus.cabal
@@ -74,18 +74,6 @@ flag check-duplicate-bindings
   default:     True
   manual:      False
 
-flag plutus-asdata
-  description:
-    DANGER: Use alternative implementation relying on `PlutusTx.asData`.
-
-  default:     False
-  manual:      True
-
-flag validator-experiment
-  description: DANGER: Use the experimental, unaudited validator.
-  default:     False
-  manual:      True
-
 common lang
   default-language:   Haskell2010
   default-extensions:
@@ -136,7 +124,6 @@ library
     , cardano-crypto-class
     , flat
     , lens
-    , marlowe-cardano ==0.2.1.0
     , newtype-generics
     , plutus-core ==1.15.0.0
     , plutus-ledger-api ==1.15.0.0
@@ -146,23 +133,15 @@ library
 
   exposed-modules:
     Language.Marlowe.Plutus
-    Language.Marlowe.Plutus.AsData.ScriptTypes
-    Language.Marlowe.Plutus.AsData.Semantics
-    Language.Marlowe.Plutus.AsData.Semantics.Types
-    Language.Marlowe.Plutus.AsData.Semantics.Types.Address
-    Language.Marlowe.Plutus.Experiment.Script
-    Language.Marlowe.Plutus.Experiment.ScriptTypes
-    Language.Marlowe.Plutus.Experiment.Semantics
-    Language.Marlowe.Plutus.Experiment.Semantics.Types
-    Language.Marlowe.Plutus.Experiment.Semantics.Types.Address
     Language.Marlowe.Plutus.OpenRoles
     Language.Marlowe.Plutus.RolePayout
     Language.Marlowe.Plutus.RoleTokens
     Language.Marlowe.Plutus.RoleTokens.Types
+    Language.Marlowe.Plutus.Script
+    Language.Marlowe.Plutus.ScriptTypes
     Language.Marlowe.Plutus.Semantics
-
-  if flag(plutus-asdata)
-    cpp-options: -DPLUTUS_ASDATA
+    Language.Marlowe.Plutus.Semantics.Types
+    Language.Marlowe.Plutus.Semantics.Types.Address
 
 executable marlowe-validators
   import:         lang
@@ -198,9 +177,6 @@ executable marlowe-validators
 
   ghc-options:    -threaded
 
-  if flag(validator-experiment)
-    cpp-options: -DVALIDATOR_EXPERIMENT
-
 executable marlowe-minting-validator
   import:         lang
   hs-source-dirs: mint
@@ -295,7 +271,6 @@ executable marlowe-charli3
     , base16-bytestring
     , bytestring
     , cardano-binary
-    , marlowe-cardano ==0.2.1.0
     , marlowe-plutus
     , optparse-applicative
     , oracle-feed