From 49e39657b3a42d89d9f6671481efdcef153b3aa7 Mon Sep 17 00:00:00 2001 From: Daniel Firth Date: Mon, 30 Sep 2024 10:17:47 +0000 Subject: [PATCH] Match function names from plutus-script-utils --- CHANGELOG.md | 2 ++ .../src/Hydra/Plutus/Extras.hs | 13 +++++------ hydra-plutus/scripts/mHead.plutus | 4 ++-- hydra-plutus/scripts/vCommit.plutus | 4 ++-- hydra-plutus/scripts/vInitial.plutus | 4 ++-- hydra-plutus/src/Hydra/Contract/Commit.hs | 4 ++-- hydra-plutus/src/Hydra/Contract/Deposit.hs | 4 ++-- hydra-plutus/src/Hydra/Contract/Hash.hs | 4 ++-- hydra-plutus/src/Hydra/Contract/Head.hs | 4 ++-- hydra-plutus/src/Hydra/Contract/HeadTokens.hs | 4 ++-- hydra-plutus/src/Hydra/Contract/Initial.hs | 4 ++-- .../Plutus/Codec/CBOR/Encoding/Validator.hs | 22 +++++++++---------- plutus-merkle-tree/bench/Validators.hs | 6 ++--- 13 files changed, 40 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38352480f18..dc3a1b13bd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ changes. - Tested with `cardano-node 9.2.0` and `cardano-cli 9.4.1.0`. +- **BREAKING** Plutus Scripts changed due to renaming. + ## [0.19.0] - 2024-09-13 - Tested with `cardano-node 9.1.1` and `cardano-cli 9.2.1.0` diff --git a/hydra-plutus-extras/src/Hydra/Plutus/Extras.hs b/hydra-plutus-extras/src/Hydra/Plutus/Extras.hs index 3ac01ce0b38..c95c5c096c0 100644 --- a/hydra-plutus-extras/src/Hydra/Plutus/Extras.hs +++ b/hydra-plutus-extras/src/Hydra/Plutus/Extras.hs @@ -28,34 +28,33 @@ type ValidatorType = BuiltinData -> BuiltinData -> BuiltinData -> BuiltinUnit -- | Wrap a typed validator to get the basic `ValidatorType` signature which can -- be passed to `PlutusTx.compile`. --- REVIEW: There might be better ways to name this than "wrap" -wrapValidator :: +mkUntypedValidator :: (UnsafeFromData datum, UnsafeFromData redeemer, UnsafeFromData context) => (datum -> redeemer -> context -> Bool) -> ValidatorType -wrapValidator f d r c = +mkUntypedValidator f d r c = check $ f datum redeemer context where datum = unsafeFromBuiltinData d redeemer = unsafeFromBuiltinData r context = unsafeFromBuiltinData c -{-# INLINEABLE wrapValidator #-} +{-# INLINEABLE mkUntypedValidator #-} -- | Signature of an untyped minting policy script. type MintingPolicyType = BuiltinData -> BuiltinData -> BuiltinUnit -- | Wrap a typed minting policy to get the basic `MintingPolicyType` signature -- which can be passed to `PlutusTx.compile`. -wrapMintingPolicy :: +mkUntypedMintingPolicy :: (UnsafeFromData redeemer, UnsafeFromData context) => (redeemer -> context -> Bool) -> MintingPolicyType -wrapMintingPolicy f r c = +mkUntypedMintingPolicy f r c = check $ f redeemer context where redeemer = unsafeFromBuiltinData r context = unsafeFromBuiltinData c -{-# INLINEABLE wrapMintingPolicy #-} +{-# INLINEABLE mkUntypedMintingPolicy #-} -- * Similar utilities as plutus-ledger diff --git a/hydra-plutus/scripts/mHead.plutus b/hydra-plutus/scripts/mHead.plutus index 2830a9434b7..7c1f36fb165 100644 --- a/hydra-plutus/scripts/mHead.plutus +++ b/hydra-plutus/scripts/mHead.plutus @@ -1,5 +1,5 @@ { "type": "PlutusScriptV2", - "description": "hydra-mHead-0.18.1-27-g5d6d4b00e", - "cborHex": "5911635911600100003332323233223322323233223232323232323232323232222225335325335323232325335333573400203a0382244002264a66a666ae6800407807444880084c07d24103505431003370e900100199b8748000008d55cf0011aab9d0013754006266014921034d30360053353330082232333573400203803666e3c008004c024004c02cd40048800884cc074894cd40044070884d4008894cd4c8ccd5cd00081081019b88001480004c01800c407c004406054cc8d4cc02d241034d303100323301e225335001101c22153353500a2235004223253353335734002048046264666ae68004094090cdc3802001081199b8f004002101f130040010013301d225335001101a22133501b350022200230040013500122222222222200c15332323232323235330114901034d30320032333573400204204066e1cc94cd4ccc04088c8ccd5cd00081201199b8f00200150073013008213002001148000c8cc88c88c008004c098894cd4004400c884d400888cc020004c01800cc00488008c004880048cc00488cdc0001000a400066e0000520021325335330124901034d3033003302422533500110222213500222325335333573400205004e2602c0042600e00866e3c00801cd54014880044c94cd54cc8d4cc0512401034d30340032333573400204804666e1c010cc0184488c88c008004c0a0894cd4004400c884cc018008c0100040044cc06494cd4ccc04c88c8ccd5cd00081381319b8f002001004001215335001130264901034d303800221350022253350031533532333573400205405266e1c005200210291302a491034d303800221302c491034d30380013025491034d303700001330252253350011022221335023350022200130040010011021153353301825333500115016215335301b00121330164901034d31320032333573400204c04a66e3c0040144c0952401034d31320021501733025225335001102222133502335002220023004001001133013491034d303500533532333573400204604466e3cc01088800c0084d4c01088800888d403c88c94cd4ccd5cd000813813099199ab9a0010280273370e008004204c66e3c010008408440844084cc01803802040814018c00488800554d5400888ccd400854054854cd4cccccc06400488c94c8c8c8c8c8cd4ccd5cd0030148140a99a9999aab9f0072502323232302633027002001357440126ae840200ac84d4004894cd4c014008854cd4cccd55cf80112813919191815198158010009aba20043574200605e426a00244a66a66a01601800442a66a6666aae7c008940ac8c8c8c0b8cc0bc008004d5d10021aba10030332135001225335302b00221533533335573e0044a05e4646460640046ae88010d5d080181b90a99a9999998170009119299a999ab9a0010390381533533335573e0044a06646464606c6606e0040026ae88010d5d080181d909a80091299a99999981a0011119299a999ab9a00103f03e1533533335573e0044a0724646460780046ae88010d5d080182090a99a981b80090981d8008a81c8a81c0a81c19b8748000008940d8940d8940d8940d8854cd4cccd55cf8011281b91919181d0011aba20043574200607e42a66a6030002426072660760060022a06e2a06c2a06a2a0642a06466e1d20000022503025030250302503021303112222333300200f00b0070051300e4984c035261300c4984c02526130084984c01526130044984c00526130014988c94c8cd4ccd5cd0010158150a99a9999aab9f00925025232323028002357440166ae840280b4854cd4cccccc09000488c94cd4ccd5cd0008178170a99a9999aab9f0022502923232302c3302d002001357440086ae8400c0c484d4004894cd4c0a4008854cd4cccd55cf80112816919191818198188010009aba20043574200606a426a00244a66a66a02202400442a66a6666aae7c008940c48c8c8c0d0cc0d4008004d5d10021aba10030392135001225335301300221533533335573e0044a06a464646070660720040026ae88010d5d080181e909a80091299a980c00110a99a9999aab9f0022503923232303c002357440086ae8400c104854cd4c0dc00484c0ec48ccccc004040030020010008540e4540e0540dc540d0540cc540c0540bc540b0540ac540a0540a0cdc3a40000044a04c4a04c4a04c4a04c42604e24444600200a260049309800a4c260029311929919a999ab9a00202d02c1533533335573e0164a04e4646460540046ae88034d5d080601790a99a9999998130009119299a999ab9a0010310301533533335573e0044a05646464605c6605e0040026ae88010d5d0801819909a80091299a981580110a99a9999aab9f0022502f23232303233033002001357440086ae8400c0dc84d400488c94cd4cc00405400c854cd4cccd55cf8019281a11919181b9981c0010009aba200535742008078426a00244a66a602c00442a66a6666aae7c008940e08c8c8c0eccc0f0008004d5d10021aba10030402135001225335301b00221533533335573e0044a07846464607e660800040026ae88010d5d0801822109a80091299a980f80110a99a9999aab9f0022504023232304333044002001357440086ae8400c12084d4004894cd4c100008854cd4cccd55cf80112822119191823998240010009aba200435742006098426a00244a66a608800442a66a6666aae7c008941208c8c8c12ccc130008004d5d10021aba100305021350012253353301904800221533533335573e0044a09846464609e0046ae88010d5d080182a10a99a98168009098270919999999980081080e00c00a0080060040020010a8260a8258a8250a8238a8230a8218a8210a81f8a81f0a81d8a81d0a81b8a81b0a8198a81928098a8170a8168a8150a81519b8748000008940a0940a0940a0940a084c0a448888c0100144c00926130014984c005262325335333573400205c05a26050244440062a04e66e1d200600c3370e900200519b87480080208cccccc08000488c94cd4ccd5cd0008158150a99a9999aab9f00225025232323028002357440086ae8400c0b4854cd4c01800484c09c004540945409054090cdc3a40000044a0444a0444a0444a044466666603e00244a0444a0424a042460440024a042264464466666604200244a0484a0460044a0464a0466054446666aae7c004801494cd4c010d5d080110a99a98021aba2003213026335029002001150241325024300335744004056603e0464a66a60380024260400022a03c66e1d20000022501b2501b2501b2501b21533335001215017150162222132123330010040030023300911223223002001302b2253350011003221330060023004001003215017130224901034d3039002150162335500122337000029001240002a66a660020100062603a9201034d313100221533500110022213021491034d3131002233020225335001101d22132533535003222235004223350022502223253353335734002054052260486604a00c00e2a04666e3c00403884cd40800040084004c010004d40048888888888880284c0280084064d4004880084060c8c8c8c94cd4ccd5cd00080e00d89919191991091980080180119191919299a999ab9a001023022132323232323232323232332333233333233323332222222222221233333333333300100d00c00b00a009008007006005004003002330032323232325335333573400206c06a26644246600200600460306ae84008c018d5d09aba200213037490103505431003370e90000011aab9e00235573a0026ea8004d5d08081aba100e330030013574201a464646464a66a666ae680040d40d04c8c8c8cccc888848cccc00401401000c008c8c8c8c94cd4ccd5cd00081e01d89991091980080180118101aba10023300501f357426ae880084c0f5240103505431003370e90000011aab9e00235573a0026ea8d5d080298049aba1003323232325335333573400207807622444006264a66a666ae680040f40f04c84888c004010dd71aba10031325335333573400207c07a264244460040086ae840104c0fd24103505431003370e900200219b874800800ccdc3a40000046aae78008d55ce8009baa3574200466002eb8d5d09aba200222323232325335333573400207a0782a06c264a66a666ae680040f80f44c0e0c01cd5d08018981fa4903505431003370e900000199b8748008008d55cf0011aab9d00137540026ae88004d5d10010981b24903505431003370e90000011aab9e00235573a0026ea8004c004d5d080598009aba100a3002300275a6ae84020d5d08039aba10063300175c6ae840148c88c008dd60009819111999aab9f0012030233502f30043574200460066ae880080ccd5d08019980090009aba10022322300237560026062446666aae7c00480bc8c8cd40bccc0b4dd71aab9d001300535573c00260086ae8800cd5d08010191aba1357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d10010981224903505431003370e90000011aab9e00235573a0026ea8d5d080299191919299a999ab9a001023022132122223003005375c6ae840084c94cd4ccd5cd00081201189909111180080298031aba10031325335333573400204a04826424444600400a60106ae840104c94cd4ccd5cd00081301289909111180200299191919299a999ab9a00102a029132122222223005008300d35742004264a66a666ae680040ac0a84c848888888c01c020c038d5d0801899299a999ab9a00102c02b133221222222233006009008300f357420086eb8d5d09aba20041325335333573400205a0582664424444444660040120106eb8d5d08029bae357426ae880144c94cd4ccd5cd0008170168999109111111198008048041bae3574200c6eb4d5d09aba20061325335333573400205e05c224444444008264a66a666ae680040c00bc44888888800c4c0c524103505431003370e900600419b874802801ccdc3a401000c66e1d20060053370e900200219b874800800ccdc3a40000046aae78008d55ce8009baa3574200a2604e920103505431003370e900300299b8748010010cdc3a400400666e1d200000235573c0046aae74004dd51aba13574400a464646464a66a666ae6800408c0884cc07cc8c8c8c94cd4ccd5cd00081381309bae357420042605092103505431003370e90000011aab9e00235573a0026ea8d5d08011bad357426ae880084c09124103505431003370e90000011aab9e00235573a0026ea80048c8c8c8c94cd4ccd5cd000811010899091180100198031aba10021325335333573400204604426466644424466600200a0080066eb4d5d08021bad357420026eb4d5d09aba20013574400626048920103505431003370e900100199b8748000008d55cf0011aab9d0013754002464646464a66a666ae680040840804c8488c00800cdd71aba10021325335333573400204404226424460020066eb8d5d080189811a48103505431003370e900100199b8748000008d55cf0011aab9d00137540022603a920103505431003370e90000011aab9e00235573a0026ea80045261301949103505435003015225335001101322135002223253353335734002032030264666ae68004068064cdc3801240042600e00866e3c00922010b48796472614865616456310022322300200130162253350011500e22135002225335330080020071301300113006003235001223233335002250022001250022500213263357389201024c68000152253350011011133573800402046a0024444444444440102601c921034d3132001300d491034d3039001300c491034d31300023223002001300e225335001100d2215335300500213004001100e2333333002001225005250042500425004230050012222223333333574800c4646600e6aae74004d55cf0009baa00723005375600e460086eb001c8c00cdd6803918011bae007010212230020031122001221233001003002221233001003002122002122122330010040031220021220012326335738002004240024646002002460044660040040029111c2fac819a1f4f14e29639d1414220d2a18b6abd6b8e444d88d0dda8ff0048811c2ee477c60839936be49a50030690865b5bed4db8cd2f05bf255ac6800001" + "description": "hydra-mHead-0.19.0-43-g3848c86ad", + "cborHex": "5911635911600100003332332232323322323233223232323232323232323232222225335325335323232325335333573400203e03c2244002264a66a666ae6800408007c44880084c07524103505431003370e900100199b8748000008d55cf0011aab9d0013754006266014921034d30360053353330082232333573400203c03a66e3c008004c024004c02cd40048800884cc074894cd40044078884d4008894cd4c8ccd5cd00081181119b88001480004c01800c4084004406854cc8d4cc02d241034d303100323301e225335001101e22153353500a223500422325335333573400204c04a264666ae6800409c098cdc3802001081299b8f0040021021130040010013301d225335001101a22133501b350022200230040013500122222222222200c15332323232323235330114901034d30320032333573400204604466e1cc94cd4ccc04088c8ccd5cd00081301299b8f00200150073013008213002001148000c8cc88c88c008004c098894cd4004400c884d400888cc020004c01800cc00488008c004880048cc00488cdc0001000a400066e0000520021325335330124901034d303300330242253350011024221350022232533533357340020540522602c0042600e00866e3c00801cd54014880044c94cd54cc8d4cc0512401034d30340032333573400204c04a66e1c010cc0184488c88c008004c0a0894cd4004400c884cc018008c0100040044cc06494cd4ccc04c88c8ccd5cd00081481419b8f002001004001215335001130244901034d303800221350022253350031533532333573400205805666e1c0052002102b13028491034d303800221302a491034d30380013023491034d303700001330252253350011022221335023350022200130040010011023153353301825333500115016215335301b00121330164901034d31320032333573400205004e66e3c0040144c08d2401034d31320021501733025225335001102222133502335002220023004001001133013491034d303500533532333573400204a04866e3cc01088800c0084d4c01088800888d403c88c94cd4ccd5cd000814814099199ab9a00102a0293370e008004205066e3c010008408c408c408ccc01803802040894018c00488800554d5400888ccd400854054854cd4cccccc06400488c94c8c8c8c8c8cd4ccd5cd0030158150a99a9999aab9f0072502323232302633027002001357440126ae840200a484d4004894cd4c014008854cd4cccd55cf80112813919191815198158010009aba20043574200605a426a00244a66a66a01601800442a66a6666aae7c008940ac8c8c8c0b8cc0bc008004d5d10021aba10030312135001225335302b00221533533335573e0044a05e4646460640046ae88010d5d080181a90a99a9999998170009119299a999ab9a00103b03a1533533335573e0044a06646464606c6606e0040026ae88010d5d080181c909a80091299a99999981a0011119299a999ab9a0010410401533533335573e0044a0724646460780046ae88010d5d080181f90a99a981b80090981d8008a81c8a81c0a81c19b8748000008940d8940d8940d8940d8854cd4cccd55cf8011281b91919181d0011aba20043574200607a42a66a6030002426072660760060022a06e2a06c2a06a2a0642a06466e1d20000022503025030250302503021303112222333300200f00b0070051300e4984c035261300c4984c02526130084984c01526130044984c00526130014988c94c8cd4ccd5cd0010168160a99a9999aab9f00925025232323028002357440166ae840280ac854cd4cccccc09000488c94cd4ccd5cd0008188180a99a9999aab9f0022502923232302c3302d002001357440086ae8400c0bc84d4004894cd4c0a4008854cd4cccd55cf80112816919191818198188010009aba200435742006066426a00244a66a66a02202400442a66a6666aae7c008940c48c8c8c0d0cc0d4008004d5d10021aba10030372135001225335301300221533533335573e0044a06a464646070660720040026ae88010d5d080181d909a80091299a980c00110a99a9999aab9f0022503923232303c002357440086ae8400c0fc854cd4c0dc00484c0ec48ccccc004040030020010008540e4540e0540dc540d0540cc540c0540bc540b0540ac540a0540a0cdc3a40000044a04c4a04c4a04c4a04c42604e24444600200a260049309800a4c260029311929919a999ab9a00202f02e1533533335573e0164a04e4646460540046ae88034d5d080601690a99a9999998130009119299a999ab9a0010330321533533335573e0044a05646464605c6605e0040026ae88010d5d0801818909a80091299a981580110a99a9999aab9f0022502f23232303233033002001357440086ae8400c0d484d400488c94cd4cc00405400c854cd4cccd55cf8019281a11919181b9981c0010009aba200535742008074426a00244a66a602c00442a66a6666aae7c008940e08c8c8c0eccc0f0008004d5d10021aba100303e2135001225335301b00221533533335573e0044a07846464607e660800040026ae88010d5d0801821109a80091299a980f80110a99a9999aab9f0022504023232304333044002001357440086ae8400c11884d4004894cd4c100008854cd4cccd55cf80112822119191823998240010009aba200435742006094426a00244a66a608800442a66a6666aae7c008941208c8c8c12ccc130008004d5d10021aba100304e21350012253353301904800221533533335573e0044a09846464609e0046ae88010d5d080182910a99a98168009098270919999999980081080e00c00a0080060040020010a8260a8258a8250a8238a8230a8218a8210a81f8a81f0a81d8a81d0a81b8a81b0a8198a81928098a8170a8168a8150a81519b8748000008940a0940a0940a0940a084c0a448888c0100144c00926130014984c005262325335333573400206005e26050244440062a04e66e1d200600c3370e900200519b87480080208cccccc08000488c94cd4ccd5cd0008168160a99a9999aab9f00225025232323028002357440086ae8400c0ac854cd4c01800484c09c004540945409054090cdc3a40000044a0444a0444a0444a044466666603e00244a0444a0424a042460440024a042264464466666604200244a0484a0460044a0464a0466054446666aae7c004801494cd4c010d5d080110a99a98021aba2003213026335029002001150241325024300335744004052603e0464a66a60380024260400022a03c66e1d20000022501b2501b2501b2501b21533335001215017150162222132123330010040030023300911223223002001302b2253350011003221330060023004001003215017130204901034d3039002150162335500122337000029001240002a66a66002010006260369201034d31310022153350011002221301f491034d3131002233020225335001101d22132533535003222235004223350022502223253353335734002058056260486604a00c00e2a04666e3c00403884cd40800040084004c010004d40048888888888880284c028008406cd4004880084068c8c8c8c94cd4ccd5cd00080f00e89919191991091980080180119191919299a999ab9a001025024132323232323232323232332333233333233323332222222222221233333333333300100d00c00b00a009008007006005004003002330032323232325335333573400207006e26644246600200600460306ae84008c018d5d09aba200213035490103505431003370e90000011aab9e00235573a0026ea8004d5d08081aba100e330030013574201a464646464a66a666ae680040dc0d84c8c8c8cccc888848cccc00401401000c008c8c8c8c94cd4ccd5cd00081f01e89991091980080180118101aba10023300501f357426ae880084c0ed240103505431003370e90000011aab9e00235573a0026ea8d5d080298049aba1003323232325335333573400207c07a22444006264a66a666ae680040fc0f84c84888c004010dd71aba10031325335333573400208007e264244460040086ae840104c0f524103505431003370e900200219b874800800ccdc3a40000046aae78008d55ce8009baa3574200466002eb8d5d09aba200222323232325335333573400207e07c2a06c264a66a666ae680041000fc4c0e0c01cd5d08018981ea4903505431003370e900000199b8748008008d55cf0011aab9d00137540026ae88004d5d10010981a24903505431003370e90000011aab9e00235573a0026ea8004c004d5d080598009aba100a3002300275a6ae84020d5d08039aba10063300175c6ae840148c88c008dd60009819111999aab9f0012030233502f30043574200460066ae880080c4d5d08019980090009aba10022322300237560026062446666aae7c00480bc8c8cd40bccc0b4dd71aab9d001300535573c00260086ae8800cd5d08010181aba1357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d10010981124903505431003370e90000011aab9e00235573a0026ea8d5d080299191919299a999ab9a001025024132122223003005375c6ae840084c94cd4ccd5cd00081301289909111180080298031aba10031325335333573400204e04c26424444600400a60106ae840104c94cd4ccd5cd00081401389909111180200299191919299a999ab9a00102c02b132122222223005008300d35742004264a66a666ae680040b40b04c848888888c01c020c038d5d0801899299a999ab9a00102e02d133221222222233006009008300f357420086eb8d5d09aba20041325335333573400205e05c2664424444444660040120106eb8d5d08029bae357426ae880144c94cd4ccd5cd0008180178999109111111198008048041bae3574200c6eb4d5d09aba200613253353335734002062060224444444008264a66a666ae680040c80c444888888800c4c0bd24103505431003370e900600419b874802801ccdc3a401000c66e1d20060053370e900200219b874800800ccdc3a40000046aae78008d55ce8009baa3574200a2604a920103505431003370e900300299b8748010010cdc3a400400666e1d200000235573c0046aae74004dd51aba13574400a464646464a66a666ae680040940904cc07cc8c8c8c94cd4ccd5cd00081481409bae357420042604c92103505431003370e90000011aab9e00235573a0026ea8d5d08011bad357426ae880084c08924103505431003370e90000011aab9e00235573a0026ea80048c8c8c8c94cd4ccd5cd000812011899091180100198031aba10021325335333573400204a04826466644424466600200a0080066eb4d5d08021bad357420026eb4d5d09aba20013574400626044920103505431003370e900100199b8748000008d55cf0011aab9d0013754002464646464a66a666ae6800408c0884c8488c00800cdd71aba10021325335333573400204804626424460020066eb8d5d080189810a48103505431003370e900100199b8748000008d55cf0011aab9d001375400226036920103505431003370e90000011aab9e00235573a0026ea80045261301749103505435003015225335001101522135002223253353335734002036034264666ae6800407006ccdc3801240042600e00866e3c00922010b48796472614865616456310022322300200130162253350011500e22135002225335330080020071301300113006003235001223233335002250022001250022500213263357389201024c68000132253350011013133573800402446a00244444444444401026018921034d3132001300b491034d3039001300a491034d31300023223002001300e225335001100f221533530050021300400110102333333002001225005250042500425004230050012222223333333574800c4646600e6aae74004d55cf0009baa00723005375600e460086eb001c8c00cdd6803918011bae00700e212230020031122001221233001003002221233001003002122002122122330010040032326335738002004240022440042440024646002002460044660040040029111cd08c4d074d2155de1d5127a718fc61a7acbc8648b6032b3d0571f2090048811c2ee477c60839936be49a50030690865b5bed4db8cd2f05bf255ac6800001" } diff --git a/hydra-plutus/scripts/vCommit.plutus b/hydra-plutus/scripts/vCommit.plutus index fe6650bee67..1a1ebb22705 100644 --- a/hydra-plutus/scripts/vCommit.plutus +++ b/hydra-plutus/scripts/vCommit.plutus @@ -1,5 +1,5 @@ { "type": "PlutusScriptV2", - "description": "hydra-vCommit-0.17.0-348-gd8c94a18c3", - "cborHex": "5906cc5906c9010000323233223322323232323323232322222533533300430050033232325333573466e1d2000002112200115333573466e1d200200211220021300c00b35573c0046aae74004dd50011991919191911919192999ab9a3370e90000010999109198008018011919192999ab9a3370e9000001099191919191919191919199999999999911111111111091999999999998008068060058050048040038030028020018011980e11919192999ab9a3370e900000109991091980080180118109aba10013016357426ae880044c08c088d55cf0011aab9d00137540026ae8402cd5d08051980e0091aba100933301675ca02a6ae84020ccc059d7280a9aba10073574200c6ae84014d5d08021980e3ae357420066ae84008ccc059d710009aba1001357426ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba20011301501435573c0046aae74004dd51aba10013232325333573466e1d2000002132122223003005375c6ae8400454ccd5cd19b87480080084c848888c004014c04cd5d08008a999ab9a3370e900200109909111180100298049aba100115333573466e1d20060021321222230040053232325333573466e1d2000002132122222223005008300c357420022a666ae68cdc3a400400426424444444600e01060186ae8400454ccd5cd19b87480100084cc8848888888cc018024020c030d5d08009bae357426ae8800454ccd5cd19b87480180084cc8848888888cc008024020dd71aba1001375c6ae84d5d10008a999ab9a3370e90040010999109111111198008048041bae357420026eb4d5d09aba200115333573466e1d200a00211222222200415333573466e1d200c0021122222220031301801735573c0046aae74004dd51aba10011301501435573c0046aae74004dd51aba135744002260240226aae78008d55ce8009baa0013223232325333573466e1d200000213232333322221233330010050040030023232325333573466e1d2000002133221233001003002300c35742002660140166ae84d5d10008980b80b1aab9e00235573a0026ea8d5d0801999805bae500a35742004646464a666ae68cdc3a4000004224440062a666ae68cdc3a4004004264244460020086eb8d5d08008a999ab9a3370e9002001099091118010021aba10011301701635573c0046aae74004dd51aba10013300775c6ae84d5d10009aba200135744002260240226aae78008d55ce8009baa001223232325333573466e1d2002002112200115333573466e1d20000021321223002003300535742002260240226aae78008d55ce8009baa00123232325333573466e1d200000213212230020033005357420022a666ae68cdc3a400400426466644424466600200a0080066eb4d5d08011bad357420026eb4d5d09aba2001357440022602001e6aae78008d55ce8009baa00123232325333573466e1d20000021321223002003375c6ae8400454ccd5cd19b87480080084c8488c00400cdd71aba10011300f00e35573c0046aae74004dd5000899800bae75a4464460046eac004c05088cccd55cf800900a91919a80a9991091980080180118031aab9d001300535573c00260086ae8800cd5d08010070008a4c2601292103505435003223232325333573466e1d200000213233322212333001004003002375c6ae84008c018d5d08009bae357426ae88004d5d1000898048041aab9e00235573a0026ea8004c0048c8c8c94ccd5cd19b87480000084cc8848cc00400c008c018d5d08009bae357426ae880044c02001cd55cf0011aab9d0013754002464460046eb0004c03488cccd55cf8009007119a80698021aba100230033574400400e4646464a666ae68cdc3a4000004266442466002006004646464a666ae68cdc3a400000426eb8d5d0800898048041aab9e00235573a0026ea8d5d08009bad357426ae880044c018014d55cf0011aab9d001375400292103505431003232222350032223232533500713300a49010343303100300135300900622222222222200813300a49010343303200300235533535300900622222222222200a1300b491035054380022100222220033013225335001101022135002225333573466e3c0080204c0480044c01800cc048894cd4004403c884d4008894ccd5cd19b8f0020071301200113006003235001220022253350011008133573800400e464c66ae7000400848004c01c894cd40044010884d4008894ccd5cd19b8f00200c1333573466e1d2001001009008130060033006225335001100322135002225333573466e3c00802c4ccd5cd19b874800800402001c4c01800c488008488004488008488488cc00401000d22010b4879647261486561645631002323001001230022330020020011" + "description": "hydra-vCommit-0.19.0-43-g3848c86ad", + "cborHex": "5906cc5906c9010000323322323322323232323323232322222533533300430050033232325333573466e1d2000002112200115333573466e1d200200211220021300c00b35573c0046aae74004dd50011991919191911919192999ab9a3370e90000010999109198008018011919192999ab9a3370e9000001099191919191919191919199999999999911111111111091999999999998008068060058050048040038030028020018011980e11919192999ab9a3370e900000109991091980080180118109aba10013016357426ae880044c08c088d55cf0011aab9d00137540026ae8402cd5d08051980e0091aba100933301675ca02a6ae84020ccc059d7280a9aba10073574200c6ae84014d5d08021980e3ae357420066ae84008ccc059d710009aba1001357426ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba20011301501435573c0046aae74004dd51aba10013232325333573466e1d2000002132122223003005375c6ae8400454ccd5cd19b87480080084c848888c004014c04cd5d08008a999ab9a3370e900200109909111180100298049aba100115333573466e1d20060021321222230040053232325333573466e1d2000002132122222223005008300c357420022a666ae68cdc3a400400426424444444600e01060186ae8400454ccd5cd19b87480100084cc8848888888cc018024020c030d5d08009bae357426ae8800454ccd5cd19b87480180084cc8848888888cc008024020dd71aba1001375c6ae84d5d10008a999ab9a3370e90040010999109111111198008048041bae357420026eb4d5d09aba200115333573466e1d200a00211222222200415333573466e1d200c0021122222220031301801735573c0046aae74004dd51aba10011301501435573c0046aae74004dd51aba135744002260240226aae78008d55ce8009baa0013223232325333573466e1d200000213232333322221233330010050040030023232325333573466e1d2000002133221233001003002300c35742002660140166ae84d5d10008980b80b1aab9e00235573a0026ea8d5d0801999805bae500a35742004646464a666ae68cdc3a4000004224440062a666ae68cdc3a4004004264244460020086eb8d5d08008a999ab9a3370e9002001099091118010021aba10011301701635573c0046aae74004dd51aba10013300775c6ae84d5d10009aba200135744002260240226aae78008d55ce8009baa001223232325333573466e1d2002002112200115333573466e1d20000021321223002003300535742002260240226aae78008d55ce8009baa00123232325333573466e1d200000213212230020033005357420022a666ae68cdc3a400400426466644424466600200a0080066eb4d5d08011bad357420026eb4d5d09aba2001357440022602001e6aae78008d55ce8009baa00123232325333573466e1d20000021321223002003375c6ae8400454ccd5cd19b87480080084c8488c00400cdd71aba10011300f00e35573c0046aae74004dd5000899800bae75a4464460046eac004c05088cccd55cf800900991919a8099991091980080180118031aab9d001300535573c00260086ae8800cd5d08010070008a4c2601292103505435003223232325333573466e1d200000213233322212333001004003002375c6ae84008c018d5d08009bae357426ae88004d5d1000898048041aab9e00235573a0026ea8004c0048c8c8c94ccd5cd19b87480000084cc8848cc00400c008c018d5d08009bae357426ae880044c02001cd55cf0011aab9d0013754002464460046eb0004c03488cccd55cf8009006119a80598021aba100230033574400400e4646464a666ae68cdc3a4000004266442466002006004646464a666ae68cdc3a400000426eb8d5d0800898048041aab9e00235573a0026ea8d5d08009bad357426ae880044c018014d55cf0011aab9d001375400292103505431003232222350032223232533500713300a49010343303100300135300900622222222222200813300a49010343303200300235533535300900622222222222200a1300b491035054380022100222220033013225335001101322135002225333573466e3c0080204c0480044c01800cc048894cd40044048884d4008894ccd5cd19b8f002007130120011300600323500122002225335001100b1335738004014464c66ae7000400848004c01c894cd4004401c884d4008894ccd5cd19b8f00200a1333573466e1d200100100c00b130060033006225335001100622135002225333573466e3c0080244ccd5cd19b874800800402c0284c01800c488008488488cc00401000d22010b4879647261486561645631001220021220012323001001230022330020020011" } diff --git a/hydra-plutus/scripts/vInitial.plutus b/hydra-plutus/scripts/vInitial.plutus index 8eefd92b352..667e942ee42 100644 --- a/hydra-plutus/scripts/vInitial.plutus +++ b/hydra-plutus/scripts/vInitial.plutus @@ -1,5 +1,5 @@ { "type": "PlutusScriptV2", - "description": "hydra-vInitial-0.17.0-348-gd8c94a18c3", - "cborHex": "590ed4590ed10100003323233223322323233223232323232323232323233223232323232323232323232323232323223323232323232323222225335333004375c006646464a666ae68cdc3a400000422440042a666ae68cdc3a40040042642446002006660100126ae840044c090034d55cf0011aab9d0013754004646464a666ae68cdc3a4000004266442466002006004646464a666ae68cdc3a40000042646464646464646464646666666666664444444444442466666666666600201a01801601401201000e00c00a0080060046602a4646464a666ae68cdc3a400000426644246600200600460346ae84004c06cd5d09aba20011303501e35573c0046aae74004dd50009aba100b357420146602a02e6ae84024ccc071d7280d9aba100833301c75ca0366ae8401cd5d08031aba1005357420086602aeb8d5d08019aba100233301c75c40026ae84004d5d09aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae880044c09c040d55cf0011aab9d00137546ae84004c8c8c94ccd5cd19b87480000084c848888c00c014dd71aba100115333573466e1d2002002132122223001005300c357420022a666ae68cdc3a400800426424444600400a601c6ae8400454ccd5cd19b87480180084c848888c010014c8c8c94ccd5cd19b87480000084c848888888c014020c044d5d08008a999ab9a3370e900100109909111111180380418089aba100115333573466e1d20040021332212222222330060090083011357420026eb8d5d09aba200115333573466e1d2006002133221222222233002009008375c6ae84004dd71aba1357440022a666ae68cdc3a40100042664424444444660020120106eb8d5d08009bad357426ae8800454ccd5cd19b874802800844888888801054ccd5cd19b874803000844888888800c4c0a804cd55cf0011aab9d00137546ae840044c09c040d55cf0011aab9d00137546ae84d5d1000898120069aab9e00235573a0026ea800440984c0852410350543500232230023758002605e446666aae7c00480c08cd40bcc010d5d080118019aba200202023232325333573466e1d20000021330273232325333573466e1d20000021375c6ae840044c08802cd55cf0011aab9d00137546ae84004dd69aba1357440022603e0106aae78008d55ce8009baa0013223232325333573466e1d200000213232333322221233330010050040030023232325333573466e1d2000002133221233001003002300c35742002660140166ae84d5d1000898120069aab9e00235573a0026ea8d5d08019998063ae500b35742004646464a666ae68cdc3a4000004224440062a666ae68cdc3a4004004264244460020086eb8d5d08008a999ab9a3370e9002001099091118010021aba10011302400d35573c0046aae74004dd51aba10013300775c6ae84d5d10009aba2001357440022603e0106aae78008d55ce8009baa001223232325333573466e1d20020021502815333573466e1d2000002130293005357420022603e0106aae78008d55ce8009baa00123232325333573466e1d200000213212230020033005357420022a666ae68cdc3a400400426466644424466600200a0080066eb4d5d08011bad357420026eb4d5d09aba2001357440022603a00c6aae78008d55ce8009baa00123232325333573466e1d20000021321223002003375c6ae8400454ccd5cd19b87480080084c8488c00400cdd71aba10011301c00535573c0046aae74004dd5000a49035054310013300175ceb488c88c008dd58009814911999aab9f001202a23233502a3302c300635573a002600a6aae78004c010d5d10019aba100201a3323232323222322253350021330084910349303100300330093500122002323232215332353300d4910349303300323230213301a00200133301801a5004332323223002001303922533500110032213335006220023013301200230040013500122001321233001002037301801a5002323017301f3301000b0015005153353300d49010349303400302333035500135500422002153353300d490103493133003302b35500422001009153353300d491034930320032323233039225335001103622153353005002103913004001002302d00230303550062222222222220045335330362253350011502f221350022253353303100200f130340011300600350032153350011302549103493036002213500222533500315333573466e1d20020011002130294910349303600221302b491034930360013024491034930350013300d490103493134003030300e50051031103110311330352253350011035221335036325355009222222222222335300d00c210011303449103493135003039225335001150322213500222533533033002008130370041300600330040010011030153353500322350022222222222223333500d2021202120212330422253350011503b221350022253353303c002007130400041300600300d21300a30090011031153353300b006500113020491034931320022135002225335003153335002130244910349303900215335333333015001225333573466e1d20000021533533335573e0024a06246064660726ae84008d5d1001014109a80091299aa99a980c80110981a8008a81990a99a9999aab9f00225035230363303d357420066ae8800c0b084d4004894cd4cccccc0780088940e4940e0070940e0940e0854cd4cccd55cf8011281c91919181e0011aba20043574200606042a66a603e002426076246660020100080042a0722a0702a06e2a0682a0662a0602a0604a05e4a05e4a05e4a05e426a002444660740040022604a9210349313100213025490103493130002213026491034931320013500122002302e225335001102b22135002225333573466e3c00801c4c03c0044c01800c8d4004880048d4004888800c894cd4004409c4cd5ce00101311a800911111111111004111981491299a800881491099299a9a80191111a8021119a8011281612999ab9a3371e00201c2605a6606800a00c2a0584266a058002004200260080026a002444444444444014002604a44a66a00220444426a00444a666ae68cdc7a450b4879647261486561645631000021333573466e1d20010010270261300600330242233335573e0024603e04a4a66a66666600a6ae84008894ccd5cd19b874800000854cd4cccd55cf8009281091811198149aba100235744004030426a00244a66a66666601400444a666ae68cdc3a40000042a66a6666aae7c004940988c09ccc0b8d5d08011aba200201d213500122533533333300f002225333573466e1d20000021533533335573e0024a05646464605c0046ae8800cd5d080101110a99a98088009098168008a8158a8150a8151281492814928149281490a99a9999aab9f0022502a23232302d002357440086ae8400c084854cd4cccccc0440048940b0940ac940ac8c0b0004940ac84c0b0cc0a800c004540a8540a4540a0540945409494090940909409094090854cd4cccd55cf801128129191918140011aba20043574200603842a66a601600242604e24660020080042a04a2a0482a0462a0402a0404a03e4a03e4a03e4a03e42a66a60086ae8800c84c084cd40980080045407c4c9407cc00cd5d100100a919999980100091280e9280e1280e1280e1180e8009111111999999aba40062323300735573a0026aae78004dd5003918029bab00723004375800e460066eb401c8c008dd700380ba80c181011299a8008810110999802803801180200091911180199802801000981011299a800881011099a8109a80111198128011981311299a800881311099a8139a8011119815801199a80091980724000002446601e00400246601c002900018020008009802000911802199a80280a8010009119b80002001301c225335001101c22133501d3500222330210023335001230090012233350090190020012300a00130040011322223232330212253350011003221335022002300400130020043005330202253350011020221325335350032322300200b302622533500110242213500222533533010002007102713006003133502200300110013004001002301f225335001101f22133502035002223233025003300100830252253350011355012003221350022253353300f002008112223300200a004130060033004001301b225335001101b22133501c350022233020002300d0013004001301a225335001101a22133501b35002223301f002300c00130040013019225335001101922133501a35002223301e00235500a00130040013018225335001101822133501935002220013004001301722533500110152232135003223003001301b2253350011300600322135002322253335001230043300d4800000488c014cc0380080048c010cc0340052000233500113005002101b22333573466e2000800404c05084888c00c0104484888c004010c04c88d4004894cd400854cd4004404c884c01d241034930370022153350031300749103493038002213500422350042253353301437666a006444466e9520003357406a0084466e952000335740602a00466ae80cc0588cd40048cdd2a400066ae80c05c004dd880d11119ba548008cd5d01ba80033357406ea0008cd5d01ba800137620380026ec4060cd5d019980aba93301575246ea000400ccd5d02999a801099ba548000dd880b1099ba548010cd5d00009bb1017213374a900119aba037520026ec405ccd5d01980a3a9001376202c0022a66a66026008004260186603c00e00a20342034464c66ae70004008480048cd40048cdd2a400066ae80dd48009bb100523374a900119aba037520026ec4014894cd400484cdd2a400066ae80c00c004dd8802899ba548008dd8802111911ba6300200130102253350011376400a4426a0044466ae80cdd8180400118038009803001a4c446a004446a00644a666ae68cdc78020010999ab9a3370e00600201c01a201a44666ae68cdc7801000804804110919800801801109118010018891000980391299a800880391099a8040011802000980311299a8008802111909a801911801800980511299a800898030019109a801112999ab9a3370e900000089803001880589100109100089100109109119800802001910919800801801119180080091801119801001000a451c2043a9f1a685bcf491413a5f139ee42e335157c8c6bc8d9e4018669d0001" + "description": "hydra-vInitial-0.19.0-43-g3848c86ad", + "cborHex": "590ed4590ed10100003323233223322323233223232323232323232323233223232323232323232323232323232323223323232323232323222225335333004375c006646464a666ae68cdc3a400000422440042a666ae68cdc3a40040042642446002006660100126ae840044c090034d55cf0011aab9d0013754004646464a666ae68cdc3a4000004266442466002006004646464a666ae68cdc3a40000042646464646464646464646666666666664444444444442466666666666600201a01801601401201000e00c00a0080060046602a4646464a666ae68cdc3a400000426644246600200600460346ae84004c06cd5d09aba20011303501e35573c0046aae74004dd50009aba100b357420146602a02e6ae84024ccc071d7280d9aba100833301c75ca0366ae8401cd5d08031aba1005357420086602aeb8d5d08019aba100233301c75c40026ae84004d5d09aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae880044c09c040d55cf0011aab9d00137546ae84004c8c8c94ccd5cd19b87480000084c848888c00c014dd71aba100115333573466e1d2002002132122223001005300c357420022a666ae68cdc3a400800426424444600400a601c6ae8400454ccd5cd19b87480180084c848888c010014c8c8c94ccd5cd19b87480000084c848888888c014020c044d5d08008a999ab9a3370e900100109909111111180380418089aba100115333573466e1d20040021332212222222330060090083011357420026eb8d5d09aba200115333573466e1d2006002133221222222233002009008375c6ae84004dd71aba1357440022a666ae68cdc3a40100042664424444444660020120106eb8d5d08009bad357426ae8800454ccd5cd19b874802800844888888801054ccd5cd19b874803000844888888800c4c0a804cd55cf0011aab9d00137546ae840044c09c040d55cf0011aab9d00137546ae84d5d1000898120069aab9e00235573a0026ea800440984c0852410350543500232230023758002605e446666aae7c00480b88cd40b4c010d5d080118019aba200202023232325333573466e1d20000021330273232325333573466e1d20000021375c6ae840044c08802cd55cf0011aab9d00137546ae84004dd69aba1357440022603e0106aae78008d55ce8009baa0013223232325333573466e1d200000213232333322221233330010050040030023232325333573466e1d2000002133221233001003002300c35742002660140166ae84d5d1000898120069aab9e00235573a0026ea8d5d08019998063ae500b35742004646464a666ae68cdc3a4000004224440062a666ae68cdc3a4004004264244460020086eb8d5d08008a999ab9a3370e9002001099091118010021aba10011302400d35573c0046aae74004dd51aba10013300775c6ae84d5d10009aba2001357440022603e0106aae78008d55ce8009baa001223232325333573466e1d20020021502815333573466e1d2000002130293005357420022603e0106aae78008d55ce8009baa00123232325333573466e1d200000213212230020033005357420022a666ae68cdc3a400400426466644424466600200a0080066eb4d5d08011bad357420026eb4d5d09aba2001357440022603a00c6aae78008d55ce8009baa00123232325333573466e1d20000021321223002003375c6ae8400454ccd5cd19b87480080084c8488c00400cdd71aba10011301c00535573c0046aae74004dd5000a49035054310013300175ceb488c88c008dd58009814911999aab9f00120282323350283302c300635573a002600a6aae78004c010d5d10019aba100201a3323232323222322253350021330084910349303100300330093500122002323232215332353300d4910349303300323230213301a00200133301801a5004332323223002001303922533500110032213335006220023013301200230040013500122001321233001002035301801a5002323017301f3301000b0015005153353300d49010349303400302333035500135500422002153353300d490103493133003302b35500422001009153353300d491034930320032323233039225335001103822153353005002103b13004001002302d00230303550062222222222220045335330362253350011502f221350022253353303100200f130340011300600350032153350011302549103493036002213500222533500315333573466e1d20020011002130294910349303600221302b491034930360013024491034930350013300d490103493134003030300e50051033103310331330352253350011033221335034325355009222222222222335300d00c210011303449103493135003039225335001150322213500222533533033002008130370041300600330040010011032153353500322350022222222222223333500d2021202120212330422253350011503b221350022253353303c002007130400041300600300d21300a3009001102f153353300b006500113020491034931320022135002225335003153335002130244910349303900215335333333015001225333573466e1d20000021533533335573e0024a06246064660726ae84008d5d1001014109a80091299aa99a980c80110981a8008a81990a99a9999aab9f00225035230363303d357420066ae8800c0b084d4004894cd4cccccc0780088940e4940e0070940e0940e0854cd4cccd55cf8011281c91919181e0011aba20043574200606042a66a603e002426076246660020100080042a0722a0702a06e2a0682a0662a0602a0604a05e4a05e4a05e4a05e426a002444660740040022604a9210349313100213025490103493130002213026491034931320013500122002302e225335001102d22135002225333573466e3c00801c4c03c0044c01800c8d4004880048d4004888800c894cd400440a44cd5ce00101411a800911111111111004111981491299a800881391099299a9a80191111a8021119a8011281612999ab9a3371e00201c2605a6606800a00c2a0584266a054002004200260080026a002444444444444014002604a44a66a00220484426a00444a666ae68cdc7a450b4879647261486561645631000021333573466e1d20010010290281300600330242233335573e0024603e0464a66a66666600a6ae84008894ccd5cd19b874800000854cd4cccd55cf8009281091811198149aba100235744004030426a00244a66a66666601400444a666ae68cdc3a40000042a66a6666aae7c004940988c09ccc0b8d5d08011aba200201d213500122533533333300f002225333573466e1d20000021533533335573e0024a05646464605c0046ae8800cd5d080101110a99a98088009098168008a8158a8150a8151281492814928149281490a99a9999aab9f0022502a23232302d002357440086ae8400c084854cd4cccccc0440048940b0940ac940ac8c0b0004940ac84c0b0cc0a800c004540a8540a4540a0540945409494090940909409094090854cd4cccd55cf801128129191918140011aba20043574200603842a66a601600242604e24660020080042a04a2a0482a0462a0402a0404a03e4a03e4a03e4a03e42a66a60086ae8800c84c084cd40900080045407c4c9407cc00cd5d100100a919999980100091280e9280e1280e1280e1180e8009111111999999aba40062323300735573a0026aae78004dd5003918029bab00723004375800e460066eb401c8c008dd700380ba80c181011299a800880f110999802803801180200091911180199802801000981011299a800880f11099a80f9a80111198128011981311299a800881211099a8129a8011119815801199a80091980724000002446601e00400246601c002900018020008009802000911802199a80280a8010009119b80002001301c225335001101a22133501b3500222330210023335001230090012233350090190020012300a0013004001132222323233021225335001100322133502000230040013002004300533020225335001101e221325335350032322300200b302622533500110262213500222533533010002007102913006003133502000300110013004001002301f225335001101d22133501e35002223233025003300100830252253350011355012003221350022253353300f002008112223300200a004130060033004001301b225335001101922133501a350022233020002300d0013004001301a225335001101822133501935002223301f002300c00130040013019225335001101722133501835002223301e00235500a00130040013018225335001101622133501735002220013004001301722533500110172232135003223003001301b2253350011300600322135002322253335001230043300d4800000488c014cc0380080048c010cc0340052000233500113005002101d22333573466e2000800405405884888c00c0104484888c004010c04c88d4004894cd400854cd40044054884c01d241034930370022153350031300749103493038002213500422350042253353301437666a006444466e9520003357406a0084466e952000335740602a00466ae80cc0588cd40048cdd2a400066ae80c05c004dd880d11119ba548008cd5d01ba80033357406ea0008cd5d01ba800137620380026ec4060cd5d019980aba93301575246ea000400ccd5d02999a801099ba548000dd880b1099ba548010cd5d00009bb1017213374a900119aba037520026ec405ccd5d01980a3a9001376202c0022a66a66026008004260186603c00e00a20382038464c66ae70004008480048cd40048cdd2a400066ae80dd48009bb100523374a900119aba037520026ec4014894cd400484cdd2a400066ae80c00c004dd8802899ba548008dd8802111911ba6300200130102253350011376400a4426a0044466ae80cdd8180400118038009803001a4c446a004446a00644a666ae68cdc78020010999ab9a3370e00600202001e201e44666ae68cdc7801000805805110919800801801109118010018891000980391299a800880291099a8030011802000980311299a8008803111909a801911801800980511299a800898030019109a801112999ab9a3370e900000089803001880689100109109119800802001891001091000910919800801801119180080091801119801001000a451c187ae86376f0acb38df9da73271bef525aed468dcd1771f0e98cee880001" } diff --git a/hydra-plutus/src/Hydra/Contract/Commit.hs b/hydra-plutus/src/Hydra/Contract/Commit.hs index 93ef8beef17..be1032d5f84 100644 --- a/hydra-plutus/src/Hydra/Contract/Commit.hs +++ b/hydra-plutus/src/Hydra/Contract/Commit.hs @@ -19,7 +19,7 @@ import Hydra.Cardano.Api.Network (Network) import Hydra.Contract.CommitError (CommitError (..), errorCode) import Hydra.Contract.Util (hasST, mustBurnST) import Hydra.Data.Party (Party) -import Hydra.Plutus.Extras (ValidatorType, scriptValidatorHash, wrapValidator) +import Hydra.Plutus.Extras (ValidatorType, mkUntypedValidator, scriptValidatorHash) import Hydra.ScriptContext (ScriptContext (..), TxInfo (..)) import PlutusLedgerApi.V2 ( CurrencySymbol, @@ -111,7 +111,7 @@ compiledValidator :: CompiledCode ValidatorType compiledValidator = $$(PlutusTx.compile [||wrap validator||]) where - wrap = wrapValidator @DatumType @RedeemerType + wrap = mkUntypedValidator @DatumType @RedeemerType validatorScript :: SerialisedScript validatorScript = serialiseCompiledCode compiledValidator diff --git a/hydra-plutus/src/Hydra/Contract/Deposit.hs b/hydra-plutus/src/Hydra/Contract/Deposit.hs index b3ccb39d85e..7f2d5b694c2 100644 --- a/hydra-plutus/src/Hydra/Contract/Deposit.hs +++ b/hydra-plutus/src/Hydra/Contract/Deposit.hs @@ -22,7 +22,7 @@ import Hydra.Contract.DepositError ( ) import Hydra.Contract.Error (errorCode) import Hydra.Contract.Head (hashPreSerializedCommits, hashTxOuts) -import Hydra.Plutus.Extras (ValidatorType, scriptValidatorHash, wrapValidator) +import Hydra.Plutus.Extras (ValidatorType, mkUntypedValidator, scriptValidatorHash) import PlutusLedgerApi.V2 ( CurrencySymbol, Datum (Datum), @@ -91,7 +91,7 @@ compiledValidator :: CompiledCode ValidatorType compiledValidator = $$(PlutusTx.compile [||wrap validator||]) where - wrap = wrapValidator @DepositDatum @DepositRedeemer + wrap = mkUntypedValidator @DepositDatum @DepositRedeemer validatorScript :: SerialisedScript validatorScript = serialiseCompiledCode compiledValidator diff --git a/hydra-plutus/src/Hydra/Contract/Hash.hs b/hydra-plutus/src/Hydra/Contract/Hash.hs index f50e98af354..f7e8c0c2c18 100644 --- a/hydra-plutus/src/Hydra/Contract/Hash.hs +++ b/hydra-plutus/src/Hydra/Contract/Hash.hs @@ -14,7 +14,7 @@ import PlutusTx.Prelude import Hydra.Prelude qualified as Haskell import Hydra.Cardano.Api (PlutusScriptVersion (PlutusScriptV2)) -import Hydra.Plutus.Extras (ValidatorType, scriptValidatorHash, wrapValidator) +import Hydra.Plutus.Extras (ValidatorType, mkUntypedValidator, scriptValidatorHash) import PlutusLedgerApi.Common (SerialisedScript, serialiseCompiledCode) import PlutusLedgerApi.V2 ( Datum (Datum), @@ -54,7 +54,7 @@ compiledValidator :: CompiledCode ValidatorType compiledValidator = $$(PlutusTx.compile [||wrap validator||]) where - wrap = wrapValidator @DatumType @RedeemerType + wrap = mkUntypedValidator @DatumType @RedeemerType validatorScript :: SerialisedScript validatorScript = serialiseCompiledCode compiledValidator diff --git a/hydra-plutus/src/Hydra/Contract/Head.hs b/hydra-plutus/src/Hydra/Contract/Head.hs index 0196714b6c3..3b3f5543cc0 100644 --- a/hydra-plutus/src/Hydra/Contract/Head.hs +++ b/hydra-plutus/src/Hydra/Contract/Head.hs @@ -19,7 +19,7 @@ import Hydra.Contract.HeadState (CloseRedeemer (..), ClosedDatum (..), ContestRe import Hydra.Contract.Util (hasST, mustBurnAllHeadTokens, mustNotMintOrBurn, (===)) import Hydra.Data.ContestationPeriod (ContestationPeriod, addContestationPeriod, milliseconds) import Hydra.Data.Party (Party (vkey)) -import Hydra.Plutus.Extras (ValidatorType, scriptValidatorHash, wrapValidator) +import Hydra.Plutus.Extras (ValidatorType, mkUntypedValidator, scriptValidatorHash) import PlutusLedgerApi.Common (SerialisedScript, serialiseCompiledCode) import PlutusLedgerApi.V1.Time (fromMilliSeconds) import PlutusLedgerApi.V1.Value (valueOf) @@ -687,7 +687,7 @@ compiledValidator :: CompiledCode ValidatorType compiledValidator = $$(PlutusTx.compile [||wrap headValidator||]) where - wrap = wrapValidator @DatumType @RedeemerType + wrap = mkUntypedValidator @DatumType @RedeemerType validatorScript :: SerialisedScript validatorScript = serialiseCompiledCode compiledValidator diff --git a/hydra-plutus/src/Hydra/Contract/HeadTokens.hs b/hydra-plutus/src/Hydra/Contract/HeadTokens.hs index 30113a3c2d7..cdb215215cd 100644 --- a/hydra-plutus/src/Hydra/Contract/HeadTokens.hs +++ b/hydra-plutus/src/Hydra/Contract/HeadTokens.hs @@ -30,7 +30,7 @@ import Hydra.Contract.HeadTokensError (HeadTokensError (..), errorCode) import Hydra.Contract.Initial qualified as Initial import Hydra.Contract.MintAction (MintAction (Burn, Mint)) import Hydra.Contract.Util (hasST) -import Hydra.Plutus.Extras (MintingPolicyType, wrapMintingPolicy) +import Hydra.Plutus.Extras (MintingPolicyType, mkUntypedMintingPolicy) import Hydra.ScriptContext (ScriptContext (..), TxInfo (txInfoInputs, txInfoMint), ownCurrencySymbol, scriptOutputsAt) import PlutusCore.Core (plcVersion100) import PlutusLedgerApi.V2 ( @@ -179,7 +179,7 @@ validateTokensBurning context = -- | Raw minting policy code where the 'TxOutRef' is still a parameter. unappliedMintingPolicy :: CompiledCode (TxOutRef -> MintingPolicyType) unappliedMintingPolicy = - $$(PlutusTx.compile [||\vInitial vHead ref -> wrapMintingPolicy (validate vInitial vHead ref)||]) + $$(PlutusTx.compile [||\vInitial vHead ref -> mkUntypedMintingPolicy (validate vInitial vHead ref)||]) `PlutusTx.unsafeApplyCode` PlutusTx.liftCode plcVersion100 Initial.validatorHash `PlutusTx.unsafeApplyCode` PlutusTx.liftCode plcVersion100 Head.validatorHash diff --git a/hydra-plutus/src/Hydra/Contract/Initial.hs b/hydra-plutus/src/Hydra/Contract/Initial.hs index df74dc4f603..7064f6c304e 100644 --- a/hydra-plutus/src/Hydra/Contract/Initial.hs +++ b/hydra-plutus/src/Hydra/Contract/Initial.hs @@ -17,7 +17,7 @@ import Hydra.Contract.Commit qualified as Commit import Hydra.Contract.Error (errorCode) import Hydra.Contract.InitialError (InitialError (..)) import Hydra.Contract.Util (mustBurnST) -import Hydra.Plutus.Extras (ValidatorType, scriptValidatorHash, wrapValidator) +import Hydra.Plutus.Extras (ValidatorType, mkUntypedValidator, scriptValidatorHash) import Hydra.ScriptContext ( ScriptContext (..), TxInfo (txInfoMint, txInfoSignatories), @@ -181,7 +181,7 @@ compiledValidator = $$(PlutusTx.compile [||wrap . validator||]) `PlutusTx.unsafeApplyCode` PlutusTx.liftCode plcVersion100 Commit.validatorHash where - wrap = wrapValidator @DatumType @RedeemerType + wrap = mkUntypedValidator @DatumType @RedeemerType validatorScript :: SerialisedScript validatorScript = serialiseCompiledCode compiledValidator diff --git a/plutus-cbor/exe/encoding-cost/Plutus/Codec/CBOR/Encoding/Validator.hs b/plutus-cbor/exe/encoding-cost/Plutus/Codec/CBOR/Encoding/Validator.hs index e759c98a772..d75156510e5 100644 --- a/plutus-cbor/exe/encoding-cost/Plutus/Codec/CBOR/Encoding/Validator.hs +++ b/plutus-cbor/exe/encoding-cost/Plutus/Codec/CBOR/Encoding/Validator.hs @@ -32,7 +32,7 @@ import PlutusLedgerApi.V1 ( Value (..), ) -import Hydra.Plutus.Extras (wrapValidator) +import Hydra.Plutus.Extras (mkUntypedValidator) import PlutusLedgerApi.Common (SerialisedScript, serialiseCompiledCode) import PlutusTx qualified as Plutus @@ -48,12 +48,12 @@ encodeIntegerValidator :: ValidatorKind -> SerialisedScript encodeIntegerValidator = \case BaselineValidator -> serialiseCompiledCode - $$(Plutus.compile [||wrapValidator $ \() (_ :: Integer) (_ :: ScriptContext) -> True||]) + $$(Plutus.compile [||mkUntypedValidator $ \() (_ :: Integer) (_ :: ScriptContext) -> True||]) RealValidator -> serialiseCompiledCode $$( Plutus.compile [|| - wrapValidator $ \() a (_ :: ScriptContext) -> + mkUntypedValidator $ \() a (_ :: ScriptContext) -> let bytes = encodingToBuiltinByteString (encodeInteger a) in lengthOfByteString bytes > 0 ||] @@ -63,12 +63,12 @@ encodeByteStringValidator :: ValidatorKind -> SerialisedScript encodeByteStringValidator = \case BaselineValidator -> serialiseCompiledCode - $$(Plutus.compile [||wrapValidator $ \() (_ :: BuiltinByteString) (_ :: ScriptContext) -> True||]) + $$(Plutus.compile [||mkUntypedValidator $ \() (_ :: BuiltinByteString) (_ :: ScriptContext) -> True||]) RealValidator -> serialiseCompiledCode $$( Plutus.compile [|| - wrapValidator $ \() a (_ :: ScriptContext) -> + mkUntypedValidator $ \() a (_ :: ScriptContext) -> let bytes = encodingToBuiltinByteString (encodeByteString a) in lengthOfByteString bytes > 0 ||] @@ -78,12 +78,12 @@ encodeListValidator :: ValidatorKind -> SerialisedScript encodeListValidator = \case BaselineValidator -> serialiseCompiledCode - $$(Plutus.compile [||wrapValidator $ \() (_ :: [BuiltinByteString]) (_ :: ScriptContext) -> True||]) + $$(Plutus.compile [||mkUntypedValidator $ \() (_ :: [BuiltinByteString]) (_ :: ScriptContext) -> True||]) RealValidator -> serialiseCompiledCode $$( Plutus.compile [|| - wrapValidator $ \() xs (_ :: ScriptContext) -> + mkUntypedValidator $ \() xs (_ :: ScriptContext) -> let bytes = encodingToBuiltinByteString $ encodeList encodeByteString xs @@ -95,12 +95,12 @@ encodeTxOutValidator :: ValidatorKind -> SerialisedScript encodeTxOutValidator = \case BaselineValidator -> serialiseCompiledCode - $$(Plutus.compile [||wrapValidator $ \() (_ :: TxOut) (_ :: ScriptContext) -> True||]) + $$(Plutus.compile [||mkUntypedValidator $ \() (_ :: TxOut) (_ :: ScriptContext) -> True||]) RealValidator -> serialiseCompiledCode $$( Plutus.compile [|| - wrapValidator $ \() o (_ :: ScriptContext) -> + mkUntypedValidator $ \() o (_ :: ScriptContext) -> let bytes = encodingToBuiltinByteString (encodeTxOut o) in lengthOfByteString bytes > 0 ||] @@ -110,12 +110,12 @@ encodeTxOutsValidator :: ValidatorKind -> SerialisedScript encodeTxOutsValidator = \case BaselineValidator -> serialiseCompiledCode - $$(Plutus.compile [||wrapValidator $ \() (_ :: [TxOut]) (_ :: ScriptContext) -> True||]) + $$(Plutus.compile [||mkUntypedValidator $ \() (_ :: [TxOut]) (_ :: ScriptContext) -> True||]) RealValidator -> serialiseCompiledCode $$( Plutus.compile [|| - wrapValidator $ \() xs (_ :: ScriptContext) -> + mkUntypedValidator $ \() xs (_ :: ScriptContext) -> let bytes = encodingToBuiltinByteString (encodeList encodeTxOut xs) in lengthOfByteString bytes > 0 ||] diff --git a/plutus-merkle-tree/bench/Validators.hs b/plutus-merkle-tree/bench/Validators.hs index 5d8eb0c7788..48b1a1f38bc 100644 --- a/plutus-merkle-tree/bench/Validators.hs +++ b/plutus-merkle-tree/bench/Validators.hs @@ -9,7 +9,7 @@ module Validators where import PlutusTx.Prelude -import Hydra.Plutus.Extras (wrapValidator) +import Hydra.Plutus.Extras (mkUntypedValidator) import Plutus.MerkleTree qualified as MT import PlutusLedgerApi.Common (SerialisedScript, serialiseCompiledCode) import PlutusLedgerApi.V2 (ScriptContext) @@ -21,7 +21,7 @@ merkleTreeMemberValidator = serialiseCompiledCode $$( Plutus.compile [|| - wrapValidator $ + mkUntypedValidator $ \() (e, root, proof) (_ :: ScriptContext) -> MT.member e root proof ||] @@ -34,7 +34,7 @@ merkleTreeBuilderValidator = serialiseCompiledCode $$( Plutus.compile [|| - wrapValidator $ + mkUntypedValidator $ \() (utxos, root) (_ :: ScriptContext) -> MT.rootHash (MT.fromList utxos) == root ||]