From 61aae8fab386f8586687a6154ac3c98b732c546c Mon Sep 17 00:00:00 2001 From: Daniel Firth Date: Tue, 24 Sep 2024 12:42:38 +0000 Subject: [PATCH] ghc 9.10 --- cabal.project | 42 ++++++++++++++++++++++++++++ flake.nix | 12 ++++---- hydra-plutus/scripts/mHead.plutus | 5 ---- hydra-plutus/scripts/vCommit.plutus | 5 ---- hydra-plutus/scripts/vDeposit.plutus | 5 ---- hydra-plutus/scripts/vHead.plutus | 5 ---- hydra-plutus/scripts/vInitial.plutus | 5 ---- hydra-tx/src/Hydra/Tx/Crypto.hs | 2 +- nix/hydra/shell.nix | 3 -- 9 files changed, 49 insertions(+), 35 deletions(-) delete mode 100644 hydra-plutus/scripts/mHead.plutus delete mode 100644 hydra-plutus/scripts/vCommit.plutus delete mode 100644 hydra-plutus/scripts/vDeposit.plutus delete mode 100644 hydra-plutus/scripts/vHead.plutus delete mode 100644 hydra-plutus/scripts/vInitial.plutus diff --git a/cabal.project b/cabal.project index 3814e557398..6c734ae8568 100644 --- a/cabal.project +++ b/cabal.project @@ -48,3 +48,45 @@ allow-newer: plutus-core allow-newer: plutus-tx allow-newer: plutus-ledger-api allow-newer: prettyprinter-configurable + +source-repository-package + type: git + location: https://github.com/locallycompact/plutus + tag: 393809cf734dfbbedd0a3b9aae5fd1b7d7812ef1 + subdir: + plutus-core + plutus-ledger-api + plutus-tx + plutus-tx-plugin + --sha256: sha256-GXYA6HNLUDfID8HMDKPhxaXEp+1okESqA01xSt8zLoY= + +source-repository-package + type: git + location: https://github.com/locallycompact/websockets + tag: a0ec91c7ec6861ac576259f63692c216177eee78 + --sha256: sha256-fSOKbwTDd8zC7xDa+poTNf6F8DfSrApqgHrSod1Ejkc= + +source-repository-package + type: git + location: https://github.com/erikd/ekg-wai + tag: 37620ea26f703ff65c61cbe0e22c545d85bd817a + --sha256: sha256-R+kBg6ckOOFnVn3qMBmnF57VzWqM2B36AdSjBzs75h0= + +source-repository-package + type: git + location: https://github.com/ysangkok/openapi3 + tag: a41903b6c548dc5c7c9d070cc4d4851799a9c866 + --sha256: sha256-EowHNo1Y4G27SAf/b2V4eBr1RIgNcvn7LgjCZpB1bU8= + +source-repository-package + type: git + location: https://github.com/IntersectMBO/ouroboros-consensus + tag: 0ea6deb139d7dd4a08e63e234e1a45bbb9cac44d + --sha256: sha256-aIG0UimMklmHXjqqjpY3Dg3c7PDpSgs4nlfcSSxyv9w= + subdir: + ouroboros-consensus + ouroboros-consensus-cardano + ouroboros-consensus-diffusion + ouroboros-consensus-protocol + sop-extras + strict-sop-core diff --git a/flake.nix b/flake.nix index ed45774f036..7f97096696f 100644 --- a/flake.nix +++ b/flake.nix @@ -42,7 +42,7 @@ ]; perSystem = { pkgs, config, lib, system, ... }: let - compiler = "ghc966"; + compiler = "ghc9101"; # nixpkgs enhanced with haskell.nix and crypto libs as used by iohk @@ -64,16 +64,16 @@ inputs.nix-npm-buildpackage.overlays.default # Specific versions of tools we require (final: prev: { - apply-refact = pkgs.haskell-nix.tool compiler "apply-refact" "0.14.0.0"; + #apply-refact = pkgs.haskell-nix.tool compiler "apply-refact" "0.14.0.0"; cabal-fmt = pkgs.haskell-nix.tool compiler "cabal-fmt" "0.1.9"; - cabal-install = pkgs.haskell-nix.cabal-install.${compiler}; - cabal-plan = pkgs.haskell-nix.tool compiler "cabal-plan" "0.7.3.0"; - fourmolu = pkgs.haskell-nix.tool compiler "fourmolu" "0.14.1.0"; + cabal-install = pkgs.haskell-nix.tool compiler "cabal-install" "3.12.1.0"; + cabal-plan = pkgs.haskell-nix.tool compiler "cabal-plan" "0.7.4.0"; + fourmolu = pkgs.haskell-nix.tool compiler "fourmolu" "0.16.2.0"; haskell-language-server = pkgs.haskell-nix.tool compiler "haskell-language-server" rec { src = inputs.hls; cabalProject = builtins.readFile (src + "/cabal.project"); }; - hlint = pkgs.haskell-nix.tool compiler "hlint" "3.8"; +# hlint = pkgs.haskell-nix.tool compiler "hlint" "3.8"; cardano-cli = inputs.cardano-node.packages.${system}.cardano-cli; cardano-node = inputs.cardano-node.packages.${system}.cardano-node; mithril-client-cli = inputs.mithril.packages.${system}.mithril-client-cli; diff --git a/hydra-plutus/scripts/mHead.plutus b/hydra-plutus/scripts/mHead.plutus deleted file mode 100644 index a6d0ed31067..00000000000 --- a/hydra-plutus/scripts/mHead.plutus +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "PlutusScriptV2", - "description": "hydra-mHead-0.19.0-21-gfd1be023e", - "cborHex": "5911635911600100003332323233223322323233223232323232323232323232222225335325335323232325335333573400203a0382244002264a66a666ae6800407807444880084c07d24103505431003370e900100199b8748000008d55cf0011aab9d0013754006266014921034d30360053353330082232333573400203803666e3c008004c024004c02cd40048800884cc074894cd40044070884d4008894cd4c8ccd5cd00081081019b88001480004c01800c407c004406054cc8d4cc02d241034d303100323301e225335001101c22153353500a2235004223253353335734002048046264666ae68004094090cdc3802001081199b8f004002101f130040010013301d225335001101a22133501b350022200230040013500122222222222200c15332323232323235330114901034d30320032333573400204204066e1cc94cd4ccc04088c8ccd5cd00081201199b8f00200150073013008213002001148000c8cc88c88c008004c098894cd4004400c884d400888cc020004c01800cc00488008c004880048cc00488cdc0001000a400066e0000520021325335330124901034d3033003302422533500110222213500222325335333573400205004e2602c0042600e00866e3c00801cd54014880044c94cd54cc8d4cc0512401034d30340032333573400204804666e1c010cc0184488c88c008004c0a0894cd4004400c884cc018008c0100040044cc06494cd4ccc04c88c8ccd5cd00081381319b8f002001004001215335001130264901034d303800221350022253350031533532333573400205405266e1c005200210291302a491034d303800221302c491034d30380013025491034d303700001330252253350011022221335023350022200130040010011021153353301825333500115016215335301b00121330164901034d31320032333573400204c04a66e3c0040144c0952401034d31320021501733025225335001102222133502335002220023004001001133013491034d303500533532333573400204604466e3cc01088800c0084d4c01088800888d403c88c94cd4ccd5cd000813813099199ab9a0010280273370e008004204c66e3c010008408440844084cc01803802040814018c00488800554ccd4d54008880085404c854cd4cccccc05c00488c94c8c8c8c8c8cd4ccd5cd0030138130a99a9999aab9f0072502123232302433025002001357440126ae840200a484d4004894cd4c014008854cd4cccd55cf80112812919191814198148010009aba20043574200605a426a00244a66a66a01601800442a66a6666aae7c008940a48c8c8c0b0cc0b4008004d5d10021aba10030312135001225335302900221533533335573e0044a05a4646460600046ae88010d5d080181a90a99a9999998160009119299a999ab9a0010370361533533335573e0044a0624646460686606a0040026ae88010d5d080181c909a80091299a9999998190011119299a999ab9a00103d03c1533533335573e0044a06e4646460740046ae88010d5d080181f90a99a981a80090981c8008a81b8a81b0a81b19b8748000008940d0940d0940d0940d0854cd4cccd55cf8011281a91919181c0011aba20043574200607a42a66a603000242606e660720060022a06a2a0682a0662a0602a06066e1d20000022502e2502e2502e2502e21302f12222333300200f00b0070051300e4984c035261300c4984c02526130084984c01526130044984c00526130014988c94c8cd4ccd5cd0010148140a99a9999aab9f00925023232323026002357440166ae840280ac854cd4cccccc08800488c94cd4ccd5cd0008168160a99a9999aab9f0022502723232302a3302b002001357440086ae8400c0bc84d4004894cd4c09c008854cd4cccd55cf80112815919191817198178010009aba200435742006066426a00244a66a66a02202400442a66a6666aae7c008940bc8c8c8c0c8cc0cc008004d5d10021aba10030372135001225335301300221533533335573e0044a06646464606c6606e0040026ae88010d5d080181d909a80091299a980c00110a99a9999aab9f0022503723232303a002357440086ae8400c0fc854cd4c0d400484c0e448ccccc004040030020010008540dc540d8540d4540c8540c4540b8540b4540a8540a45409854098cdc3a40000044a0484a0484a0484a04842604a24444600200a260049309800a4c260029311929919a999ab9a00202b02a1533533335573e0164a04a4646460500046ae88034d5d080601690a99a9999998120009119299a999ab9a00102f02e1533533335573e0044a0524646460586605a0040026ae88010d5d0801818909a80091299a981480110a99a9999aab9f0022502d23232303033031002001357440086ae8400c0d484d400488c94cd4cc00405400c854cd4cccd55cf8019281911919181a9981b0010009aba200535742008074426a00244a66a602c00442a66a6666aae7c008940d88c8c8c0e4cc0e8008004d5d10021aba100303e2135001225335301b00221533533335573e0044a07446464607a6607c0040026ae88010d5d0801821109a80091299a980f80110a99a9999aab9f0022503e23232304133042002001357440086ae8400c11884d4004894cd4c0f8008854cd4cccd55cf80112821119191822998230010009aba200435742006094426a00244a66a608400442a66a6666aae7c008941188c8c8c124cc128008004d5d10021aba100304e21350012253353301904600221533533335573e0044a09446464609a0046ae88010d5d080182910a99a98168009098260919999999980081080e00c00a0080060040020010a8250a8248a8240a8228a8220a8208a8200a81e8a81e0a81c8a81c0a81a8a81a0a8188a81828098a8160a8158a8140a81419b87480000089409894098940989409884c09c48888c0100144c00926130014984c00526232533533357340020580562604c244440062a04a66e1d200600c3370e900200519b87480080208cccccc07800488c94cd4ccd5cd0008148140a99a9999aab9f00225023232323026002357440086ae8400c0ac854cd4c01800484c0940045408c5408854088cdc3a40000044a0404a0404a0404a040466666603a00244a0404a03e4a03e460400024a03e264464466666603e00244a0444a0420044a0424a0426050446666aae7c004801494cd4c010d5d080110a99a98021aba2003213024335027002001150221325022300335744004052603a0424a66a603400242603c0022a03866e1d2000002250192501925019250192153333500121501515014222213212333001004003002330071122322300200130292253350011003221330060023004001003215015130204901034d3039002150142335500122337000029001240002a66a660020100062603a9201034d313100221533500110022213021491034d3131002233020225335001101d22132533535003222235004223350022502223253353335734002054052260486604a00c00e2a04666e3c00403884cd40800040084004c010004d40048888888888880284c0280084064d4004880084060c8c8c8c94cd4ccd5cd00080e00d89919191991091980080180119191919299a999ab9a001023022132323232323232323232332333233333233323332222222222221233333333333300100d00c00b00a009008007006005004003002330032323232325335333573400206c06a26644246600200600460306ae84008c018d5d09aba200213037490103505431003370e90000011aab9e00235573a0026ea8004d5d08081aba100e330030013574201a464646464a66a666ae680040d40d04c8c8c8cccc888848cccc00401401000c008c8c8c8c94cd4ccd5cd00081e01d89991091980080180118101aba10023300501f357426ae880084c0f5240103505431003370e90000011aab9e00235573a0026ea8d5d080298049aba1003323232325335333573400207807622444006264a66a666ae680040f40f04c84888c004010dd71aba10031325335333573400207c07a264244460040086ae840104c0fd24103505431003370e900200219b874800800ccdc3a40000046aae78008d55ce8009baa3574200466002eb8d5d09aba200222323232325335333573400207a0782a06c264a66a666ae680040f80f44c0e0c01cd5d08018981fa4903505431003370e900000199b8748008008d55cf0011aab9d00137540026ae88004d5d10010981b24903505431003370e90000011aab9e00235573a0026ea8004c004d5d080598009aba100a3002300275a6ae84020d5d08039aba10063300175c6ae840148c88c008dd60009819111999aab9f0012030233502f30043574200460066ae880080ccd5d08019980090009aba10022322300237560026062446666aae7c00480bc8c8cd40bccc0b4dd71aab9d001300535573c00260086ae8800cd5d08010191aba1357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d10010981224903505431003370e90000011aab9e00235573a0026ea8d5d080299191919299a999ab9a001023022132122223003005375c6ae840084c94cd4ccd5cd00081201189909111180080298031aba10031325335333573400204a04826424444600400a60106ae840104c94cd4ccd5cd00081301289909111180200299191919299a999ab9a00102a029132122222223005008300d35742004264a66a666ae680040ac0a84c848888888c01c020c038d5d0801899299a999ab9a00102c02b133221222222233006009008300f357420086eb8d5d09aba20041325335333573400205a0582664424444444660040120106eb8d5d08029bae357426ae880144c94cd4ccd5cd0008170168999109111111198008048041bae3574200c6eb4d5d09aba20061325335333573400205e05c224444444008264a66a666ae680040c00bc44888888800c4c0c524103505431003370e900600419b874802801ccdc3a401000c66e1d20060053370e900200219b874800800ccdc3a40000046aae78008d55ce8009baa3574200a2604e920103505431003370e900300299b8748010010cdc3a400400666e1d200000235573c0046aae74004dd51aba13574400a464646464a66a666ae6800408c0884cc07cc8c8c8c94cd4ccd5cd00081381309bae357420042605092103505431003370e90000011aab9e00235573a0026ea8d5d08011bad357426ae880084c09124103505431003370e90000011aab9e00235573a0026ea80048c8c8c8c94cd4ccd5cd000811010899091180100198031aba10021325335333573400204604426466644424466600200a0080066eb4d5d08021bad357420026eb4d5d09aba20013574400626048920103505431003370e900100199b8748000008d55cf0011aab9d0013754002464646464a66a666ae680040840804c8488c00800cdd71aba10021325335333573400204404226424460020066eb8d5d080189811a48103505431003370e900100199b8748000008d55cf0011aab9d00137540022603a920103505431003370e90000011aab9e00235573a0026ea80045261301949103505435003015225335001101322135002223253353335734002032030264666ae68004068064cdc3801240042600e00866e3c00922010b48796472614865616456310022322300200130162253350011500e22135002225335330080020071301300113006003235001223233335002250022001250022500213263357389201024c68000152253350011011133573800402046a0024444444444440102601c921034d3132001300d491034d3039001300c491034d31300023223002001300e225335001100d2215335300500213004001100e2333333002001225005250042500425004230050012222223333333574800c4646600e6aae74004d55cf0009baa00723005375600e460086eb001c8c00cdd6803918011bae007010212230020031122001221233001003002221233001003002122002122122330010040031220021220012326335738002004240024646002002460044660040040029111ce26c832c57c191eb502b221e27e61ed5e1305a478ec3f91def82661d0048811c96f0ab4f51eed1ea3afd02878d176b4da85a9a4213298bfe0a753abe0001" -} diff --git a/hydra-plutus/scripts/vCommit.plutus b/hydra-plutus/scripts/vCommit.plutus deleted file mode 100644 index 0dabb612a7f..00000000000 --- a/hydra-plutus/scripts/vCommit.plutus +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "PlutusScriptV2", - "description": "hydra-vCommit-0.19.0-21-gfd1be023e", - "cborHex": "59076e59076b010000323233223322323232323323232322222533533300430050033232325335333573466e1d2000002011010112200115335333573466e1d200200201101011220021300c00b35573c0046aae74004dd5001199191919191191919299a999ab9a3370e900000100b80b099910919800801801191919299a999ab9a3370e900000100d00c899191919191919191919199999999999911111111111091999999999998008068060058050048040038030028020018011980e1191919299a999ab9a3370e900000101401389991091980080180118109aba10013016357426ae880044c08c088d55cf0011aab9d00137540026ae8402cd5d08051980e0091aba100933301675ca02a6ae84020ccc059d7280a9aba10073574200c6ae84014d5d08021980e3ae357420066ae84008ccc059d710009aba1001357426ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba20011301501435573c0046aae74004dd51aba10013232325335333573466e1d200000201a019132122223003005375c6ae8400454cd4ccd5cd19b87480080080680644c848888c004014c04cd5d08008a99a999ab9a3370e900200100d00c89909111180100298049aba100115335333573466e1d200600201a0191321222230040053232325335333573466e1d200000201d01c132122222223005008300c357420022a66a666ae68cdc3a400400403a03826424444444600e01060186ae8400454cd4ccd5cd19b87480100080740704cc8848888888cc018024020c030d5d08009bae357426ae8800454cd4ccd5cd19b87480180080740704cc8848888888cc008024020dd71aba1001375c6ae84d5d10008a99a999ab9a3370e900400100e80e0999109111111198008048041bae357420026eb4d5d09aba200115335333573466e1d200a00201d01c11222222200415335333573466e1d200c00201d01c1122222220031301801735573c0046aae74004dd51aba10011301501435573c0046aae74004dd51aba135744002260240226aae78008d55ce8009baa0013223232325335333573466e1d200000201701613232333322221233330010050040030023232325335333573466e1d200000201c01b133221233001003002300c35742002660140166ae84d5d10008980b80b1aab9e00235573a0026ea8d5d0801999805bae500a35742004646464a66a666ae68cdc3a4000004038036224440062a66a666ae68cdc3a4004004038036264244460020086eb8d5d08008a99a999ab9a3370e900200100e00d899091118010021aba10011301701635573c0046aae74004dd51aba10013300775c6ae84d5d10009aba200135744002260240226aae78008d55ce8009baa001223232325335333573466e1d2002002017016112200115335333573466e1d20000020170161321223002003300535742002260240226aae78008d55ce8009baa00123232325335333573466e1d200000201501413212230020033005357420022a66a666ae68cdc3a400400402a02826466644424466600200a0080066eb4d5d08011bad357420026eb4d5d09aba2001357440022602001e6aae78008d55ce8009baa00123232325335333573466e1d20000020140131321223002003375c6ae8400454cd4ccd5cd19b874800800805004c4c8488c00400cdd71aba10011300f00e35573c0046aae74004dd5000899800bae75a4464460046eac004c05088cccd55cf800900a91919a80a9991091980080180118031aab9d001300535573c00260086ae8800cd5d08010070008a4c26012920103505435003223232325335333573466e1d200000200e00d13233322212333001004003002375c6ae84008c018d5d08009bae357426ae88004d5d1000898048041aab9e00235573a0026ea8004c0048c8c8c94cd4ccd5cd19b87480000080340304cc8848cc00400c008c018d5d08009bae357426ae880044c02001cd55cf0011aab9d0013754002464460046eb0004c03488cccd55cf8009007119a80698021aba100230033574400400e4646464a66a666ae68cdc3a4000004016014266442466002006004646464a66a666ae68cdc3a400000401c01a26eb8d5d0800898048041aab9e00235573a0026ea8d5d08009bad357426ae880044c018014d55cf0011aab9d001375400292103505431003232222350032223232533500713300a49010343303100300135300900622222222222200813300a49010343303200300235533535300900622222222222200a1300b491035054380022100222220033013225335001101022135002225335333573466e3c0080200540504c0480044c01800cc048894cd4004403c884d4008894cd4ccd5cd19b8f0020070140131301200113006003235001220022253350011008133573800400e464c66ae7000400848004c01c894cd40044010884d4008894cd4ccd5cd19b8f00200c0090081333573466e1c004cdc0a4000900100480409803001980311299a80088019109a80111299a999ab9a3371e00401601000e2666ae68cdc3a400400201000e2600c006244004244002244004244244660020080069110b4879647261486561645631002323001001230022330020020011" -} diff --git a/hydra-plutus/scripts/vDeposit.plutus b/hydra-plutus/scripts/vDeposit.plutus deleted file mode 100644 index ca0de940df7..00000000000 --- a/hydra-plutus/scripts/vDeposit.plutus +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "PlutusScriptV2", - "description": "hydra-vDeposit-0.19.0-21-gfd1be023e", - "cborHex": "590bae590bab0100003233223332223233223232323232323232323232323232323232323232323232323232323232323232222533533322253353232325335333573466e1d2000002031030112200215335333573466e1d20020020310301321223001003375a6ae840044c05c060d55cf0011aab9d001375400a205a6442a66a6a6a6aa00444444444444400a4400444a666a00442660109210344303400333573466e24004d401c8880080c80cc4c061241034430330013018491034430330013300549010344303500333573466e3cdc9180d99a8048009aa8011111111111110051b923023302030273500422200103002f102f13500122002225335001102d1335738004058646464a66a666ae68cdc3a400000405c05a264646464a66a666ae68cdc3a4000004064062264666444246660020080060046eb8d5d08011bad35742002600a6ae84d5d10009aba20011301801935573c0046aae74004dd51aba1002300b23232325335333573466e1d20000020320311332212330010030023013357420026eb8d5d09aba20011301801935573c0046aae74004dd50008980a00a9aab9e00235573a0026ea800cc8c8c94cd4ccd5cd19b87480000080b80b44cc8848cc00400c008c8c8c94cd4ccd5cd19b87480000080c40c04c8c8c8c8c8c8c8c8c8c8cccccccccccc88888888888848cccccccccccc00403403002c02802402001c01801401000c008cc06006cd5d08059980c00d9aba100a3301801e35742012666048eb9408cd5d08041998123ae50233574200e660300346ae84018ccc09007dd69aba10053232325335333573466e1d200000203e03d1332212330010030023232325335333573466e1d20000020410401332212330010030023301d75a6ae84004c070d5d09aba20011302702835573c0046aae74004dd51aba10013232325335333573466e1d20000020410401332212330010030023301d75a6ae84004c070d5d09aba20011302702835573c0046aae74004dd51aba1357440022604804a6aae78008d55ce8009baa3574200866030eb8d5d080199981200c80a9aba100233302475c02a6ae84004c074d5d09aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae880044c05c060d55cf0011aab9d00137546ae84004c030d5d09aba20011301401535573c0046aae74004dd5000880c89808a481035054350033028221225335333573466e24009200002b02a10251533500110252213350260023353006120013370200890010008900090009191919299a999ab9a3370e900000101481408140a99a999ab9a3370e90010010148140814898078081aab9e00235573a0026ea800488c8c8c94cd4ccd5cd19b87480000080a40a04488800854cd4ccd5cd19b87480080080a40a04c84888c00c010c014d5d08008a99a999ab9a3370e900200101481408911000898078081aab9e00235573a0026ea80048c88c008dd60009812911999aab9f0012021233502030043574200460066ae880080408c8c8c94cd4ccd5cd19b87480000080980944c848888c00c014dd71aba100115335333573466e1d20020020260251321222230010053007357420022a66a666ae68cdc3a400800404c04a26424444600400a60146ae8400454cd4ccd5cd19b87480180080980944c848888c010014c014d5d0800898060069aab9e00235573a0026ea80048c8c8c94cd4ccd5cd19b87480000080940904c848888888c014020c024d5d08008a99a999ab9a3370e900100101281209909111111180380418049aba100115335333573466e1d20040020250241332212222222330060090083009357420026eb8d5d09aba200115335333573466e1d2006002025024133221222222233002009008375c6ae84004dd71aba1357440022a66a666ae68cdc3a401000404a0482664424444444660020120106eb8d5d08009bad357426ae8800454cd4ccd5cd19b874802800809409044888888801054cd4ccd5cd19b874803000809409044888888800c4c02c030d55cf0011aab9d00137540024646464a66a666ae68cdc3a4000004048046266442466002006004600a6ae84004c01cd5d09aba20011300a00b35573c0046aae74004dd50009191919299a999ab9a3370e900000101181109991091980080180118029aba1001375a6ae84d5d1000898048051aab9e00235573a0026ea80048c8c8c94cd4ccd5cd19b87480000080880844dd71aba10011300800935573c0046aae74004dd5000991191919299a999ab9a3370e90000010110108991919999111091999800802802001801191919299a999ab9a3370e900000101381309991091980080180118061aba10013300a00b357426ae880044c034038d55cf0011aab9d00137546ae8400cccc035d728061aba10023232325335333573466e1d20000020270261122200315335333573466e1d200200202702613212223001004375c6ae8400454cd4ccd5cd19b874801000809c0984c84888c008010d5d0800898068071aab9e00235573a0026ea8d5d080099803bae357426ae88004d5d10009aba20011300800935573c0046aae74004dd500091191919299a999ab9a3370e900100101101088910008a99a999ab9a3370e9000001011010899091180100198029aba10011300800935573c0046aae74004dd50009191919299a999ab9a3370e900000101000f899091180100198029aba100115335333573466e1d200200202001f132333222122333001005004003375a6ae84008dd69aba1001375a6ae84d5d10009aba20011300600735573c0046aae74004dd50009191919299a999ab9a3370e900000100f80f09909118010019bae357420022a66a666ae68cdc3a400400403e03c26424460020066eb8d5d0800898028031aab9e00235573a0026ea80048c98cd5ce000802a49035054310013300175ceb488c88c008dd5800980d111999aab9f001201623233501633221233001003002300635573a002600a6aae78004c010d5d10019aba1002005120013016225335001100b221337146eccd40088888cdd2a400066ae80d401088cdd2a400066ae80c02c008cd5d019806119a800919ba548000cd5d018068009bb100f2223374a900119aba0375000666ae80dd400119aba037500026ec4044004dd880699aba033300c75266018ea48dd400080199aba05333500213374a90001bb100b213374a900219aba000137620184266e9520023357406ea4004dd880619aba03300a7520026ec402cc0100048cd40048cdd2a400066ae80dd48009bb100423374a900119aba037520026ec4010894cd400484cdd2a400066ae80c00c004dd8802099ba548008dd8801a4c446446e98c008004c05088cd40052f5bded8c0446a0044466ae80cdd8180400118038009803001980891299a800898011801806110a99a800880111098031803802980811299a8008805910a99a800880191099a8071980380200118030009807911299a8010800910a99a801880219110a999a998088028010a801899a807801198040038008a801899a80600119802800801980711299a80088019109a8011119b8a001300600348810035003222001350022220023500122200333230010012212323330022300222230030042300222230020042300222230010042353300400400335003001122223330042533500113350060070072215335001133500800300922153233353300d00500315001133300800333500b00500c002150011333006002233500b00500100122253350011335008335008003002300600932221533353300d00600215003133300800233500b0060050011500313350083350080030023006001222532335002130014988854c8ccd4cc03801c00c540044c011261500113330070022300633500c0070010012335009300333500900400a30070021220021221223300100400332223500222350022235005223500222533353300b00600215335333573466e1c01400404003c403854cd4ccd5cd19b8900500101000f100c100d13300b00600213300b006002225335333573466e3c00800401c018401454cd4ccd5cd19b91002001007006100310041222003122200212220011220021220012323001001230022330020020011" -} diff --git a/hydra-plutus/scripts/vHead.plutus b/hydra-plutus/scripts/vHead.plutus deleted file mode 100644 index 7c8b8562d32..00000000000 --- a/hydra-plutus/scripts/vHead.plutus +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "PlutusScriptV2", - "description": "hydra-vHead-0.19.0-21-gfd1be023e", - "cborHex": "5929b25929af0100003232332233322232332232323232323322323232323233223232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232333322223232323232323232323232323232323232323232323232323232323232323232222533532323253233335004323232323221533333350091306a49884c1ad261306a498c8c8c8c8c8c8854cd4c069403454cd54cd4ccd5cd19b8735303200f222222222006500208c0108b01108c011335738921034831330008b01153355335333573466e25402cd402088888888801422c04230044230044cd5ce249034833310008b01153353350012533533300f50063333301750045003500c353033010222222222004353033010222222222003001108d011335738921034833390008c012253355335333573466e3cd4c0d004488888888800cc09c2200423804234044ccc041401cccccc0614014cdc0a80224004a01a6a6068022444444444008002004211a02211c02266ae71241034834300008d01153353302100f50031533553353323223002001308f01225335001108f012215335333573466e3c01400824404240044240044c010005403140104230044cd5ce2481034833380008b0115335353535500d222222222222005220012253335002215335333573466e24005402823c0423804423c044cd5ce249034833320008e011505515055153355335333501d07a500933508501500c5004108c011335738921034833360008b01153355335333573466e1cc19d4024c1a140282300422c0454cd4ccd5cd19b8735303200f222222222001500708c0108b01108c0113357389201034833340008b0115335333573466e1cd4c0c803c888888888004cdc02803a8030460084580884600899ab9c4901034833350008b011533533301c3308001500a5005330800135303200f2222222220075006330800135303200f2222222220095003153353302f5335303f00f21353500122001222200310860135533535500d22222222222200a1306402c2210022222003108c01133573892010248340008b01108b01108b01108b01108b01108b01108b01108b01108b01108b01108b0113500622222222200613500522222222200913500422222222200213500322222222200813500222222222200713500122222222200121306b498884d4028894cd4ccc06cd4008888888888888020d4014888888888024d4014888888888020c854cd54cd4ccd5cd19b8f302333501700550013500622222222200408a0108901108a011335738921034834310008901153355335333573466e3cd401888888888800cc08cc8cd4060014004cd40a0015400422804224044228044cd5ce24810348343200089011353535003222222222222005220022253335002215335333573466e24004d402488888888800423004234044234044cd5ce249034834330008c01150691506910890110890113500222222222222200a10880113530290062222222220021353028005222222222008135302700422222222200515335355001222222222222004130484988854cd40044008884c131261350022200213064498888c8c8c8854c8cccccd402c540048540084d4028894cc8d54cd4ccd5cd19b8f35303100d22222001302c35500122200308a0108901108a0113357389201034831370008901153355335333573466e1d200035303100d2222200208a0108901108a01133573892010348323000089011533533301a3307e35303100d2222200400a3307e35303100d2222200300b3307e35303100d222220050091533553353302953353500322222222222200a108401221306b0013232333074076002305200135004222222222222009355001222001108a01133573892103483139000890115335533530085335303d00d213535001220012222003108401108a011335738921034831360008901153355335333573466e1cd54004888008c1ac02822804224044228044cd5ce249034831380008901153353301f00d00913018003108901108901108901108901108901108901130063500222222222222200c108801215002215002221500315333333500a13500922533533301a3500222222222222200800700832153353301e00c0081533533077302b50013022335016306750013500322222222222200a10890113357389201034831350008801108801133004082013500222222222222200c10870121306c4984c1ad2621306c49884c1b126221306d498c2180488c894cd4004400c884d4008894cd4cc11402c0044cc020c018c12400400c4cc02001c00cc22004894cd4004400c884cd420c04008c010004c21404894cd40044ccc10c1fd200007f221323500322350032322253353303e350052222004353530400112200122220041007153353304700d005133304c3003304b005337009001001000899982600200119983b03c0009a802911100198468091299a800880191099a844008011802000980200098420091299a8008841809109a80111299a999ab9a3371e00400e1100210e02260d00022600c0066464646442a666666a010260d2931919191910a99a980ba8050a99aa99a999ab9a3371266e04d4d4d5402888888888888801488004894ccd400884004541bc541bcd4d4d5402888888888888801488008894ccd400884004541b8541b9401022404220044224044cd5ce2481034832320008801153355335333573466e1cd4c0bc030888888888004c8d403488d4d4d400888888888888801488004894ccd400884cdc00008030a8380a83828020448084400884480899ab9c4901034832330008801153353301e00c5003153355335333573466e1cd4c0bc030888888888019400822404220044224044cd5ce24810348313300088011533553335001153355335333573466e1d20005002089010880115335333573466e1d200035302f00c22222222200508901088011333573466e3cd4c0bc030888888888010d40188888800422404220044220044220044224044cd5ce248103483238000880121533533300c5006333330145004500335303000d22222222200535303000d22222222200435303000d222222222003001108a011335738920103483239000890122153355335333573466e3cd4c0c403888888888800cc0902140422c04228044ccc035401cccccc0554014cdc0a802240046a606201c44444444400a6a606201c444444444008002004211402211602266ae71241034833300008a01153355335533535302f00c22222222200210890122108a01108901133573892010348323600088011533553353302c5335303c00c21353500122001222200310830135533535500a22222222222200a13061029221002222200310890113357389201024834000880113330193307d35302f00c22222222200850053307d35302f00c22222222200750043307d35302f00c2222222220095003108801108801108801108801108801108801108801108801135004222220021350032222200513500222222003135001222220041306949884c1a92632322153353330173307b350042222200450063307b350042222200335302e00a222220033307b5003500532153355335333573466e1cd4c0bc02c88888008cdc024004a0061100210e02211002266ae7124010348323100087011533533300a500733333012500650033500222200235302f00b222220013021500135002222003153355335330275335303b00b2135350012200122220031082013330700723553355008130600282210022222003306f500110880113357389201024834000870113301d00b5004108701108701108701133501435001222001533550071305f49103505439002210011086011350022222200213500122222005221306b4984d4c0a4014888880144d4c0a0010888880104d4d400c880088888888888880284d40088800888c894cd54cd4ccd5cd19b87300d004300e001082010810113002335500b00400110810110820113357389201034831320008101308201225335001108201221533535002223350072222223335734666e54020cdc51bb3375200c66e28dd99ba8005337146eccdd400219b8a37666ea400cdd99ba900200108c0108b01001130040011083013232325335333573466e1d20000020800107f1332212330010030023232325335333573466e1d200000208301082011323232323232323232323333333333332222222222221233333333333300100d00c00b00a0090080070060050040030023306605b35742016660cc0b66ae84028cc198178d5d08049998313ae5061357420106660c4eb94184d5d08039983302d1aba100633306205f75a6ae84014c8c8c94cd4ccd5cd19b87480000082400423c044cc8848cc00400c008c8c8c94cd4ccd5cd19b874800000824c04248044cc8848cc00400c008cc179d69aba1001305d357426ae880044c1ac1a8d55cf0011aab9d00137546ae84004c8c8c94cd4ccd5cd19b874800000824c04248044cc8848cc00400c008cc179d69aba1001305d357426ae880044c1ac1a8d55cf0011aab9d00137546ae84d5d1000898340339aab9e00235573a0026ea8d5d0802198333ae357420066660c40b20ac6ae84008ccc189d702b1aba1001305d357426ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba20011305b05a35573c0046aae74004dd51aba1001304c357426ae880044c16015cd55cf0011aab9d0013754006646464a66a666ae68cdc3a40000040fe0fc224444440082a66a666ae68cdc3a40040040fe0fc2642444444600400e646464a66a666ae68cdc3a4000004104021020226466644424666002008006004660b8eb8d5d08011bad357420026eb4d5d09aba200135744002260b40b26aae78008d55ce8009baa357420022a66a666ae68cdc3a40080040fe0fc2642444444600a00e646464a66a666ae68cdc3a40000041040210202224440062a66a666ae68cdc3a4004004104021020226424446004008660b6eb8d5d08008a99a999ab9a3370e90020010410084080899910911198008028021982dbae357420026eb8d5d09aba20011305a05935573c0046aae74004dd51aba100115335333573466e1d200600207f07e132122222230030073232325335333573466e1d2000002082010810113212230020033305b75c6ae8400454cd4ccd5cd19b874800800820804204044cc88488cc00401000ccc16dd71aba1001375c6ae84d5d10008982d02c9aab9e00235573a0026ea8d5d08008a99a999ab9a3370e900400103f83f089111110030a99a999ab9a3370e900500103f83f099910911111198008040039bad357420026eb4d5d09aba20011305705635573c0046aae74004dd5001991919299a999ab9a3370e900000103f03e899191999815182b1aba10033305905a357420046eb8d5d080098279aba1357440026ae88004d5d10008a99a999ab9a3370e900100103f03e89813991919299a999ab9a3370e900000104080840008991919199998191bae35742008660ba0bc6ae8400cc168d5d08011bad357420026eb8d5d09aba2001357440026ae88004d5d10008982c82c1aab9e00235573a0026ea8d5d08008a99a999ab9a3370e900200103f03e89815191919299a999ab9a3370e9000001040808400089919191919191919999999981a9bae35742010660c20c46ae8401cc178d5d08031bad3574200a6eb4d5d08021bae357420066eb8d5d080119830bae357420026eb4d5d09aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d10008982c82c1aab9e00235573a0026ea8d5d08008a99a999ab9a3370e900300103f03e88148982b02a9aab9e00235573a0026ea800c40604c14d2410350543500330792211225335002107522153350031077221335078330730040023355300812001003001120012222212333330010060050040030023077225335001148000884cdc024004600800260ec44a66a0022900011099b8048008c010004cc1d4884894cd4ccd5cd19b89002480001dc1d841c454cd400441c4884cd41c8008cd4c01848004cdc0802240040022400246a002444444444444a66a601c01020fe266ae71241035530310007e30732253350011073223213500322300300130772253350011300600322135002225335333573466e1d200000107b07a13006003107a22235003223500422350052253355335333500a067006005153353302a0040031330670020011078107810791335738920102483200078330712212225335002153350011074221075221533500310752215335330070040021333530091200100700300110771200122232330742253350011300348000884d4008894cd4ccd5cd19b8f002009078077130073370201c60180022600c0060084a66a666ae68cdc380099b8048008c0140081c81c441c84cd5ce24810348313400071306f225335001148000884cdc024004600800260dc44a66a00220084426a0044466e00004c01800c88c8d400c894cd4c01cd40088888888888880104c98cd5ce24902483600056232215335001153353002300b30063500522222222222200c10731335738921024835000722213263357389210248370005b30732253350011072221533533063005002107513004001306f225335001106922135002223232330772253350011003221335072002300400100230070043302d00735001222200348000c1ac894cd40044194884cd4198008c010004c1a8894cd40044190884cd4194008c0100048dc91801000983411299a800881191099b8a37666a004444466e9520003357406a0084466e952000335740601600466ae80cc0308cd40048cdd2a400066ae80c034004dd880791119ba548008cd5d01ba80033357406ea0008cd5d01ba800137620220026ec4034cd5d0199809ba95012003335740a666a004266e95200037620164266e9520043357400026ec403084cdd2a400466ae80dd48009bb100c33574066014ea4004dd88059802000919a800919ba548000cd5d01ba90013762008466e9520023357406ea4004dd880211299a8009099ba548000cd5d018018009bb100413374a90011bb1003498cc190884894cd4ccd5cd19b8900248000198194400454cd40044180884cd4c01848004cdc080224004002240026444666660060a44600c0026660060a44666ae68cdc3a40000020ca0c802a004002446464464446600600400260d0444a66a0042600a002442a66a006260100084426a00844646a00a44a66a6602200a0042a66a6601a00800226601801000c20e22a66a6020008266018010014266006a66a602000220d8266a0d600e0d800c60e2444a66a00220e24426a00444a66a602800226600e00c0062a66a6602a0120042a66a660220100022660200186660f0444a66a00420024426600a00266a0e800400600c00620ea26600e66a0de00800c00660cc44a66a00220cc4426a00444a66a60100022600c00620d260ca44a66a00220ca4426a00444a66a600e0022600c00620d092103505438003061225335001106122135002225335333573466e1d200000106506413006003106423724602e602860ac00244666ae68cdc79bb3333004752a0060046eccccc011d4a80180082f82f099800ba923750002446446e98c008004c17c88cd40052f5bded8c0446a0044466ae80cdd8180400118038009803001991299a9802180580090a9999a8009080089801a4c44442600e9310980224c2600493119319ab9c49010248330004132253353003300a001215333350012130044984c00d26222213007498840044c00926232633573892010248330004032233333301e00122532335333573466e1d200000305d05c1533533335573e0044a09246094660a46ae8400cd5d1001821909a80091299a980400110a99a9999aab9f0022504d2304e33056357420066ae8800c11c84d4004894cd4cc08c090008854cd4cccd55cf80112828918291982d1aba100335744006096426a00244a66a605400442a66a6666aae7c008941548c8c8c160008d5d10021aba100304f215335302b001213057333301500b0070030011300e4984c035261300c4984c02526130084984c01526130044984c0052613001498c894cd4ccd5cd19b874800801017817454cd4cccd55cf801928251191918268011aba20053574200808842a66a66666604600244a66a666ae68cdc3a40000040c20c02a66a6666aae7c004941348c138cc158d5d08011aba20020472135001225335302600221533533335573e0044a0a2460a4660b46ae8400cd5d1001825909a80091299a9981381400110a99a9999aab9f00225055230563305e357420066ae8800c13c84d4004894cd4c050008854cd4cccd55cf8011282c9182d198311aba1003357440060a6426a00244a66a606600442a66a6666aae7c008941748c8c8c180008d5d10021aba1003057215335303400121305f3333302100f00b0070030011505d1505c1505b15058150571505415053150501504f1504c1504c2504b2504b2504b2504b21304c3009001130034984c0092613002498c894cd4ccd5cd19b874801001017817454cd4cccd55cf801928251191918268011aba20053574200808842a66a66666604600244a66a666ae68cdc3a40000040c20c02a66a6666aae7c004941348c138cc158d5d08011aba20020472135001225335302600221533533335573e0044a0a2460a4660b46ae8400cd5d1001825909a80091299a9981381400110a99a9999aab9f00225055230563305e357420066ae8800c13c84d4004894cd4c050008854cd4cccd55cf8011282c9182d198311aba1003357440060a6426a00244a66a606600442a66a6666aae7c008941748c178cc198d5d08019aba20030572135001225335303700221533533335573e0044a0c2460c4660d46ae8400cd5d100182d909a80091299a981d00110a99a9999aab9f00225065230663306e357420066ae8800c17c84d4004894cd4c0f8008854cd4cccd55cf8011283491835198391aba1003357440060c6426a00244a66a6607e08400442a66a6666aae7c008941b48c8c8c1c0008d5d10021aba1003067215335304500121306f33333333303001f01b01701300f00b0070030011506d1506c1506b15068150671506415063150601505f1505c1505b15058150571505415053150501504f1504c1504c2504b2504b2504b2504b21304c300c001130034984c009261300249894cd4ccd5cd19b874801800c1741704c12402054120941189411894118941188cccccc074004894cd4ccd5cd19b874800000816c16854cd4cccd55cf800928239191918250011aba20033574200408242a66a603e0024260920022a08e2a08c2a08c4a08a4a08a4a08a4a08a424444600800a24444006444424444666600401000e00c00a424444600200a4444444442466666666600201401201000e00c00a00800600444444246666600200c00a008006004644a66a6a6a002440044444444444440142600493110a99a998029a80111110021a9a98038019100091110020980d0010980224c464c66ae7124010348313100038223500222350032232335005233500425335333573466e3c0080041641605400c416081608cd4010816094cd4ccd5cd19b8f002001059058150031058153350032153350022133500223350022335002233500223304a002001205b2335002205b23304a00200122205b222335004205b2225335333573466e1c01800c17817454cd4ccd5cd19b8700500205e05d13300f004001105d105d10561533500121056105622333573466e1c00800414414094cd4c008004840044c98cd5ce24810248380003523500122350022222222222223333500d20112011201123305f2253350011504a22135002225335350022235009225335333573466e3c01000819c1984ccd5cd19b8700300106706610661304f0041300600300d5037304d2253350011300230030472215335001100222130063007005304c225335001104622153350011003221335049330070040023006001304b222533500210012215335003100432221533353304c00500215003133504a0023300800700115003133504700233005001003304a2253350011005221335002223714002600800244666ae68cdc3a4004600a660060046a00244440060920904644a66aa66a600400242606c0022a068426609844a66a002208c44264a66a6a00644a66a666ae68cdc3a40040020a20a02607a0042a0784266a092002004200260080020022086609244a66a0022a0684426a00444a66a666ae68cdc78010038268260981c80089803001a45003046225335001148000884cdc02400460080024a66a646466666601400444a66a666ae68cdc3a400000409008e2a66a6666aae7c004940d08c0d4cc0f4d5d08011aba200202e2135001225335300b00221533533335573e0044a07046072660826ae8400cd5d1001819109a80091299a980500110a99a9999aab9f0022503c23232303f002357440086ae8400c0d8854cd4c04c00484c0f8ccc04001c00c004540f0540ec540e8540dc540d8540cc540cc940c8940c8940c8940c8c0108cccccc028004894cd4ccd5cd19b874800000812011c54cd4cccd55cf8009281a1181a9981e9aba10023574400405c426a00244a66a601800442a66a6666aae7c008940e08c8c8c0ec008d5d10021aba1003032215335300f00121303a123300100400215038150371503615033150332503225032250322503230090012135001222002103e22212333001004003002232233333300800122503125030002250302503030442233335573e0024606207e4a66a60086ae84008854cd4c010d5d100190981999a8200010008a818899281898019aba200202a25335300300121302e0011502c2333333004001225335333573466e1d20000020420411533533335573e0024a05c4605e6606e6ae84008d5d1001014109a80091299a99999980480111299a999ab9a3370e90000010238230a99a9999aab9f00125033232323036002357440066ae840080b4854cd4c02800484c0d4004540cc540c8540c8940c4940c4940c4940c4854cd4cccd55cf8011281911919181a8011aba20043574200605842a66a6014002426068660920060022a0642a0622a0602a05a2a05a4a0584a0584a0584a058466666600600244a0584a0564a0564a05646058002466666600400244a0564a0544a054460560024a0544444446666666ae900188c8cc01cd55ce8009aab9e001375400e4600a6eac01c8c010dd6003918019bad00723002375c00e0504a666a6a0024444004264c66ae712410248390002221001213263357389210348313000023303c22533500110362213350373500222330340023302923370490008008009802000899319ab9c4901034833330001f2326335738921034833370001f200123232325335333573466e1d200000203a039103915335333573466e1d200200203a039103a1301201135573c0046aae74004dd500091191919299a999ab9a3370e900000101d01c889110010a99a999ab9a3370e900100101d01c8990911180180218029aba100115335333573466e1d200400203a039112220011301201135573c0046aae74004dd50009191919299a999ab9a3370e900000101c01b8990911118018029bae357420022a66a666ae68cdc3a400400407006e26424444600200a600e6ae8400454cd4ccd5cd19b87480100080e00dc4c848888c008014c028d5d08008a99a999ab9a3370e900300101c01b89909111180200298029aba10011301000f35573c0046aae74004dd50009191919299a999ab9a3370e900000101b81b09909111111180280418049aba100115335333573466e1d20020020370361321222222230070083009357420022a66a666ae68cdc3a400800406e06c26644244444446600c01201060126ae84004dd71aba1357440022a66a666ae68cdc3a400c00406e06c2664424444444660040120106eb8d5d08009bae357426ae8800454cd4ccd5cd19b87480200080dc0d84cc8848888888cc004024020dd71aba1001375a6ae84d5d10008a99a999ab9a3370e900500101b81b0891111110020a99a999ab9a3370e900600101b81b089111111001898078071aab9e00235573a0026ea80048c8c8c94cd4ccd5cd19b87480000080d80d44cc8848cc00400c008c014d5d080098039aba1357440022601c01a6aae78008d55ce8009baa00123232325335333573466e1d20000020350341330363005357420026eb4d5d09aba20011300d00c35573c0046aae74004dd50009191919299a999ab9a3370e900000101a01989bae35742002260180166aae78008d55ce8009baa0013223232325335333573466e1d200000203403313232333322221233330010050040030023232325335333573466e1d2000002039038133221233001003002300c35742002660140166ae84d5d1000898088081aab9e00235573a0026ea8d5d0801999805bae500a35742004646464a66a666ae68cdc3a4000004072070224440062a66a666ae68cdc3a4004004072070264244460020086eb8d5d08008a99a999ab9a3370e900200101c81c099091118010021aba10011301101035573c0046aae74004dd51aba10013300775c6ae84d5d10009aba200135744002260180166aae78008d55ce8009baa001223232325335333573466e1d20020020340331501f15335333573466e1d200000203403313020300535742002260180166aae78008d55ce8009baa00123232325335333573466e1d200000203203113212230020033005357420022a66a666ae68cdc3a400400406406226466644424466600200a0080066eb4d5d08011bad357420026eb4d5d09aba200135744002260140126aae78008d55ce8009baa00123232325335333573466e1d20000020310301321223002003375c6ae8400454cd4ccd5cd19b87480080080c40c04c8488c00400cdd71aba10011300900835573c0046aae74004dd5000899800bae75a4464460046eac004c0bc88cccd55cf800901511919a8151981298031aab9d001300535573c00260086ae8800cd5d080100a9191919299a999ab9a3370e900000101701689bad357420022600c00a6aae78008d55ce8009baa0014910350543100232633573800201e464460046eb0004c0a888cccd55cf8009012919a81218021aba100230033574400402046eb8004c09c894cd4004520002213370090011802000981311299a8008a400044266e0120023004001132633573892103483434000093024225335001148000884cdc0240046008002604644a66a002203a44266a0044444660220260066008002604444a66a00220424426a00444a66a666ae68cdc7a450b4879647261486561645631000020260251333573466e1d2002001026025130060033021225335001148000884cdc0240046008002264c66ae712410348323700004132633573892103483235000031326335738921034832340000223263357389210248310000212001301b225335001101522133500222223300900b00330040012322230033009333500b00a002001301b225335001101522133501635002223301300233008233350012330094800000488cc0280080048cc0240052000001300400123223002001301a2253350011014221335015350022233012002300700130040012233700004002424460040062244002602a44a66a002201e44266a0206a004446601a004666a0024601400244666a01401200400246016002600800244666ae68cdc780100080a00989911119191980c91299a800880191099a80a0011802000980100218029980c11299a800880911099299a9a80191911801005980f11299a800880f1109a80111299a99808001003881089803001899a80a00180088009802000801180b91299a800880891099a8091a8011119198080019800804180e91299a80089aa8078019109a80111299a998078010040891119801005002098030019802000980991299a800880691099a8071a801111980580118050009802000980911299a800880611099a8069a801111980500118048009802000980891299a800880591099a8061a80111198048011aa8038009802000909111801802089091118008021109198008018011a8019110009a8011110011a800911001999180080091091919980111801111180180211801111180100211801111180080211a998020020019a801800891111998021299a800899a803003803910a99a800899a804001804910a99199a998068028018a800899980400199a8058028060010a8008999803001119a805802800800911299a800899a80419a804001801180300499110a999a998068030010a801899980400119a8058030028008a801899a80419a804001801180300091129919a80109800a4c442a64666a6601c00e0062a00226008930a80089998038011180319a806003800800919a804980199a80480200518038010910010910911980080200199111a9a80111001111a9a80191001112999a998038020010a99a999ab9a3370e00600201801620142a66a666ae68cdc48018008060058804080489980380200109980380200111299a999ab9a3371e00400200e00c200a2a66a666ae68cdc8801000803803080188020911001891100109110008910010910009109198008018011191800800918011198010010009" -} diff --git a/hydra-plutus/scripts/vInitial.plutus b/hydra-plutus/scripts/vInitial.plutus deleted file mode 100644 index 74530a6f65d..00000000000 --- a/hydra-plutus/scripts/vInitial.plutus +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "PlutusScriptV2", - "description": "hydra-vInitial-0.19.0-21-gfd1be023e", - "cborHex": "590f82590f7f0100003323233223322323233223232323232323232323233223232323232323232323232323232323223323232323232323222225335333004375c006646464a66a666ae68cdc3a400000406406222440042a66a666ae68cdc3a40040040640622642446002006660100126ae840044c090034d55cf0011aab9d0013754004646464a66a666ae68cdc3a4000004064062266442466002006004646464a66a666ae68cdc3a400000406a0682646464646464646464646666666666664444444444442466666666666600201a01801601401201000e00c00a0080060046602a4646464a66a666ae68cdc3a400000408608426644246600200600460346ae84004c06cd5d09aba20011303501e35573c0046aae74004dd50009aba100b357420146602a02e6ae84024ccc071d7280d9aba100833301c75ca0366ae8401cd5d08031aba1005357420086602aeb8d5d08019aba100233301c75c40026ae84004d5d09aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae880044c09c040d55cf0011aab9d00137546ae84004c8c8c94cd4ccd5cd19b87480000080d40d04c848888c00c014dd71aba100115335333573466e1d2002002035034132122223001005300c357420022a66a666ae68cdc3a400800406a06826424444600400a601c6ae8400454cd4ccd5cd19b87480180080d40d04c848888c010014c8c8c94cd4ccd5cd19b87480000080e00dc4c848888888c014020c044d5d08008a99a999ab9a3370e900100101c01b89909111111180380418089aba100115335333573466e1d20040020380371332212222222330060090083011357420026eb8d5d09aba200115335333573466e1d2006002038037133221222222233002009008375c6ae84004dd71aba1357440022a66a666ae68cdc3a401000407006e2664424444444660020120106eb8d5d08009bad357426ae8800454cd4ccd5cd19b87480280080e00dc44888888801054cd4ccd5cd19b87480300080e00dc44888888800c4c0a804cd55cf0011aab9d00137546ae840044c09c040d55cf0011aab9d00137546ae84d5d1000898120069aab9e00235573a0026ea800440944c0852410350543500232230023758002605e446666aae7c00480c08cd40bcc010d5d080118019aba200202023232325335333573466e1d200000202d02c1330273232325335333573466e1d200000203002f1375c6ae840044c08802cd55cf0011aab9d00137546ae84004dd69aba1357440022603e0106aae78008d55ce8009baa0013223232325335333573466e1d200000202d02c13232333322221233330010050040030023232325335333573466e1d2000002032031133221233001003002300c35742002660140166ae84d5d1000898120069aab9e00235573a0026ea8d5d08019998063ae500b35742004646464a66a666ae68cdc3a4000004064062224440062a66a666ae68cdc3a4004004064062264244460020086eb8d5d08008a99a999ab9a3370e9002001019018899091118010021aba10011302400d35573c0046aae74004dd51aba10013300775c6ae84d5d10009aba2001357440022603e0106aae78008d55ce8009baa001223232325335333573466e1d200200202d02c1502815335333573466e1d200000202d02c130293005357420022603e0106aae78008d55ce8009baa00123232325335333573466e1d200000202b02a13212230020033005357420022a66a666ae68cdc3a400400405605426466644424466600200a0080066eb4d5d08011bad357420026eb4d5d09aba2001357440022603a00c6aae78008d55ce8009baa00123232325335333573466e1d200000202a0291321223002003375c6ae8400454cd4ccd5cd19b87480080080a80a44c8488c00400cdd71aba10011301c00535573c0046aae74004dd5000a481035054310013300175ceb488c88c008dd58009814911999aab9f001202a23233502a3302c300635573a002600a6aae78004c010d5d10019aba100201a3323232323222322253350021330084910349303100300330093500122002323232215332353300d4910349303300323230213301a00200133301801a5004332323223002001303922533500110032213335006220023013301200230040013500122001321233001002037301801a5002323017301f3301000b0015005153353300d49010349303400302333035500135500422002153353300d490103493133003302b35500422001009153353300d491034930320032323233039225335001103622153353005002103913004001002302d00230303550062222222222220045335330362253350011502f221350022253353303100200f130340011300600350032153350011302549103493036002213500222533500315335333573466e1d200200103703610021302949010349303600221302b491034930360013024491034930350013300d490103493134003030300e50051031103110311330352253350011035221335036325335355009222222222222300d00c210011302849103493135003039225335001150322213500222533533033002008130370041300600330040010011030153353500322350022222222222223333500d2021202120212330422253350011503b221350022253353303c002007130400041300600300d21300a30090011031153353300b006500113020491034931320022135002225335003153335002130244910349303900215335333333015001225335333573466e1d20000020350341533533335573e0024a06246064660726ae84008d5d1001014109a80091299aa99a980c80110981a8008a81990a99a9999aab9f00225035230363303d357420066ae8800c0b084d4004894cd4cccccc0780088940e4940e0070940e0940e0854cd4cccd55cf8011281c91919181e0011aba20043574200606042a66a603e002426076246660020100080042a0722a0702a06e2a0682a0662a0602a0604a05e4a05e4a05e4a05e426a002444660740040022604a92010349313100213025490103493130002213026491034931320013500122002302e225335001102b22135002225335333573466e3c00801c0c00bc4c03c0044c01800c8d4004880048d4004888800c894cd4004409c4cd5ce00101311a800911111111111004111981491299a800881491099299a9a80191111a8021119a801128161299a999ab9a3371e00201c0620602605a6606800a00c2a0584266a058002004200260080026a002444444444444014002604a44a66a00220444426a00444a66a666ae68cdc7a4410b4879647261486561645631000020270261333573466e1c004cdc0a40009001013813098030019812111999aab9f0012301f025253353333330053574200444a66a666ae68cdc3a400000404a0482a66a6666aae7c004940848c088cc0a4d5d08011aba2002018213500122533533333300a002225335333573466e1d200000202a0291533533335573e0024a04c4604e6605c6ae84008d5d100100e909a80091299a99999980780111299a999ab9a3370e90000010178170a99a9999aab9f0012502b23232302e002357440066ae84008088854cd4c04400484c0b4004540ac540a8540a8940a4940a4940a4940a4854cd4cccd55cf801128151191918168011aba20043574200604242a66a66666602200244a0584a0564a056460580024a056426058660540060022a0542a0522a0502a04a2a04a4a0484a0484a0484a04842a66a6666aae7c008940948c8c8c0a0008d5d10021aba100301c215335300b001213027123300100400215025150241502315020150202501f2501f2501f2501f21533530043574400642604266a04c0040022a03e264a03e60066ae880080548cccccc0080048940749407094070940708c074004888888ccccccd5d2003119198039aab9d00135573c0026ea801c8c014dd5803918021bac00723003375a00e460046eb801c05d4060c080894cd40044080884ccc01401c008c0100048c888c00ccc014008004c080894cd40044080884cd4084d400888cc094008cc098894cd40044098884cd409cd400888cc0ac008ccd40048cc0392000001223300f00200123300e00148000c010004004c01000488c010ccd401405400800488cdc0001000980e11299a800880e11099a80e9a8011119810801199a8009180480091199a80480c80100091805000980200089911119191981091299a800880191099a8110011802000980100218029981011299a800881011099299a9a80191911801005981311299a80088121109a80111299a99808001003881389803001899a81100180088009802000801180f91299a800880f91099a8101a8011119198128019800804181291299a80089aa8090019109a80111299a998078010040891119801005002098030019802000980d91299a800880d91099a80e1a801111981000118068009802000980d11299a800880d11099a80d9a801111980f80118060009802000980c91299a800880c91099a80d1a801111980f0011aa8050009802000980c11299a800880c11099a80c9a801110009802000980b91299a800880a911909a801911801800980d91299a800898030019109a80111299a999a80091980624000002446601a004002466018002900009803001880e11199ab9a33710004002026028424446006008224244460020086026446a00244a66a0042a66a0022026442600e921034930370022153350031300749103493038002213500422350042253353301437666a006444466e9520003357406a0084466e952000335740602a00466ae80cc0588cd40048cdd2a400066ae80c05c004dd880c91119ba548008cd5d01ba80033357406ea0008cd5d01ba800137620360026ec405ccd5d019980b3a93301675246ea000400ccd5d02999a801099ba548000dd880a9099ba548010cd5d00009bb1016213374a900119aba037520026ec4058cd5d01980a3a9001376202a0022a66a66026008004260186603c00e00a20342034464c66ae70004008480048cd40048cdd2a400066ae80dd48009bb100423374a900119aba037520026ec4010894cd400484cdd2a400066ae80c00c004dd8802099ba548008dd8801a4c446446e98c008004c03c88cd40052f5bded8c0446a0044466ae80cdd8180400118038009803001911a801111a80191299a999ab9a3371e00800401c01a2666ae68cdc3801800807006880691199ab9a3371e004002012010442466002006004424460040062244002600e44a66a002200e44266a0100046008002600c44a66a0022008446426a006446006002601444a66a0022600c0064426a00444a66a666ae68cdc3a40000020180162600c00620162440042440022440042442446600200800644246600200600446460020024600446600400400291011c6e49fd742e0774d92ddda1dceb4476be25c5f6b22aa90cc9e3a0b9740001" -} diff --git a/hydra-tx/src/Hydra/Tx/Crypto.hs b/hydra-tx/src/Hydra/Tx/Crypto.hs index b98ca7a3730..6c310221766 100644 --- a/hydra-tx/src/Hydra/Tx/Crypto.hs +++ b/hydra-tx/src/Hydra/Tx/Crypto.hs @@ -91,7 +91,7 @@ instance Key HydraKey where -- Hydra verification key, which can be used to 'verify' signed messages. newtype VerificationKey HydraKey = HydraVerificationKey (VerKeyDSIGN Ed25519DSIGN) - deriving stock (Eq, Show, Ord) + deriving stock (Eq, Show) deriving newtype (ToCBOR, FromCBOR) deriving anyclass (SerialiseAsCBOR) diff --git a/nix/hydra/shell.nix b/nix/hydra/shell.nix index 67d4b8eec61..bfe03f63d15 100644 --- a/nix/hydra/shell.nix +++ b/nix/hydra/shell.nix @@ -12,8 +12,6 @@ let buildInputs = [ # For running automatic refactoring with hlint - pkgs.apply-refact - pkgs.cabal-fmt pkgs.cabal-install # Handy tool to debug the cabal build plan pkgs.cabal-plan @@ -28,7 +26,6 @@ let # For plotting results of hydra-cluster benchmarks pkgs.gnuplot pkgs.haskell-language-server - pkgs.hlint pkgs.haskellPackages.hspec-discover # The interactive Glasgow Haskell Compiler as a Daemon pkgs.haskellPackages.ghcid