Revert "Merge pull request #1105 from input-output-hk/ghc96"

This reverts commit d700a98, reversing changes made to ba04f39.
cardano-scaling · Oct 19, 2023 · e4ff5e1 · e4ff5e1
1 parent deb7505
commit e4ff5e1
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,9 +19,6 @@ changes.
 
 - Persist network messages on disk in order to gracefully handle crashes
 
-- **BREAKING** Changes to Hydra scripts due to upgrading our toolchain to
-  GHC 9.6.2.
-
 ## [0.13.0] - 2023-10-03
 
 - **BREAKING** Update to plutus 1.9. This changes the script hashes.

diff --git a/hydra-node/test/Hydra/JSONSchema.hs b/hydra-node/test/Hydra/JSONSchema.hs
@@ -195,7 +195,7 @@ ensureSystemRequirements =
     version <-
       try (readProcessWithExitCode "check-jsonschema" ["--version"] mempty) >>= \case
         Right (exitCode, out, _) ->
-          pure (List.last (List.words out) <$ if exitCode == ExitSuccess then pure () else Left "")
+          pure (List.last (List.words out) <$ guard (exitCode == ExitSuccess))
         Left (err :: IOError)
           | ioeGetErrorType err == OtherError ->
               pure (Left "Make sure check-jsonschema is installed and in $PATH")

diff --git a/hydra-plutus/scripts/mHead.plutus b/hydra-plutus/scripts/mHead.plutus
@@ -1,5 +1,5 @@
 {
     "type": "PlutusScriptV2",
-    "description": "hydra-mHead-0.13.0-129-g05471bc4b",
-    "cborHex": "590ffd590ffa010000333232332232323232332232332232323232323232323232323232323232222225335325335323333573466e1c0052002212200223333573466e1c0092000212200123263202233573803e04004003e6aae74dd500189980a249034d303600533533301222333573466e3c008004068064c04c004cc040044c054d40048800884cc090894cd4004406c884d4008894cd4ccd5cd19b880014800007c0784c01800c4078004405c4c8cc02ccc044c0552401034d3031003233025225335001101b22153355335333573466e3cd402888008d4008880080780744ccd5cd19b873500a22001350022200101e01d101d101e1300400100133300d3010120012350012200235500122222222222200c32323232323301033016301a491034d30320032333573466e1ccc05ccc048c894cd400484c00c004520003233223223002001302d2253350011003221330063500222001300400130012200230012200123300122337000040029000198091980c91199ab9a3371e004002042040a0040306038a00e00203e03c66e01400920023301033016301a4901034d3033003323223002001302a225335001102022135002225335333573466e3c00801c0940904c0580044c01800d4004d5401088004cc040c8cc044cc06d2401034d30340032333573466e1d401000408007ccc03c4488c88c008004c0b0894cd4004400c884cc018008c0100054004cc05094cd4ccc06888ccd5cd19b8f00200102202150030012153350011301f491034d3038002213500222533500315335333573466e1c00520020250241025130234901034d3038002213025491034d3038001301e491034d30370050011333012301512001235001220013300500c50063301033013253233350021301e491034d3132002130020012153353301700150092130030011301f491034d3035002533530210012133019301d491034d31320032333573466e3c00800408808540104c079241034d313200333012301512001235001220023300500c500633016301a491034d3035003301032333573466e3cd5401088800c00407c0794004c94cd4ccd5cd19b8f35001220023500b2200201f01e1333573466e1cd400488004d402c8800407c0784078d5400c8880084c0600184d5400488800454ccd4d54004880084c065241034d31300021301a4901034d313000215335325335330130025005213002001150253300f23333333574800246646464666ae68cdc3a8012400c46666aae7d40088c0b04888800c940ac09c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8cccd5cd19b875013480108cccd55cfa8099281e11999aab9f50122503d233335573ea0244a07c46666aae7d4048940fc8cccd55cfa8091282011999aab9f501225041233335573ea0244a08446666aae7cd5d128099299a998090099aba1501b215335301235742a03442a66a607c6ae854068854cd4c050d5d0a80d10a99a980a1aba1501a215335304135742a03442a66a660300846ae85406884c12c48888ccccccc01002c02802402001c01801454124541205411c5411854114541105410c9410c0fc0f80f40f00ec0e80e40e08cccd5cd19b875014480088cccd55cfa80a1281e91999aab9f50092503e233335573ea0124a07e46666aae7d4024941008cccd55cf9aba2500a25335300e35742a03242a66a660220246ae854038854cd4c0f0d5d0a80710a99a981e9aba1500e213046122223333001008007006005150441504315042150412504103d03c03b03a03923333573466e1d40552000233335573ea02a4a07c46666aae7d401c940fc8cccd55cfa8039282011999aab9f500725041233335573e6ae89402094cd4c03cd5d0a80d10a99a998090099aba1500c215335303d35742a01842a66a646666666ae900048ccc8cd5cd19b8735573aa0029000119191999aab9f50022504c233335573ea0044a09a46666aae7cd5d128019299a991999999aba40012333233573466e1cd55cea800a40004646666aae7d4004941508cccd55cf9aba2500225335304e35742a0064260ae0022a0aa4a0aa0a20a026aae7940084dd500112828827128281282812828128280261aba15005215335301d35742a00a4260a26609e0040022a09e2a09c4a09c09409209026ae8940044d55cf280109baa002250480452504725047250472504704335742a01842608e24444666600401000e00c00a2a08a2a0882a0862a0844a08407c07a0780760744a07a07407207026ae8940044d5d1280089aba2500f135744a00226ae8940044d5d1280611999999aba40012333233573466e1cd55cea800a40004646666aae7d4004940e48cccd55cf9aba2500225335300835742a0064260780022a0744a07406c06a26aae7940084dd50011281b0199281a9281a9281a9281a81891999999aba400125034250342503423035375a0044a06806046446666666ae90004940d4940d48c00cdd60011281a9281a818981a911999aab9f001230360302533530043574200442a66a60086ae8800c84c0e0cd40c4008004540d8540d40c494cd4c0a800484c0cc004540c44d5d1280089aba25001135744a00226ae8940044d5d1280089aba25002135573ca00426aae7540044dd500101212813128131281312813011100090a9999a800911111109811249034d3039001301b491034d3039002222132123330010040030023301111223223002001302e225335001100322133006002300400100322221301f4901034d3039001301a491034d30390015335330010075002130184901034d31310022135002225335003133028002001221301e4901034d313100223500122222222222233355301612001223500222223500422335002200825335333573466e3c00405c0c00bc4cd40c8cc0e801401802040200a80284d400488008c8cccd5cd19b8735573a0029000119191919191919910919800801801191999ab9a3370e6aae74005200023232323232323232323232323232323232323232323232323232323333332222221233333333333300100701200600500400e00d00c00300a0020083300d2323333573466e1cd55ce800a4000464646466442466002006004604c00460280026ae84d5d128011aba15001135573c004464c6408c66ae7010c110110dd5000806198068070051998083ae500f00933301075ca01e0106601aeb8010ccc041d710008011aba135744a0206ae85403cd5d0a8079aba1500f35742a01e6ae85403cd5d0a8079aba1500f35742a01e6ae85403cd5d0a8079aba1500f2322300237580026076446666aae7c00480d88cd40d4c010d5d080118019aba20020372323333573466e1cd55ce800a4000464646464646464646666444424666600200a008006004646666ae68cdc39aab9d001480008c8c8c8cc8848cc00400c008c090008cc02808c004d5d09aba2500235742a00226aae780088c98c8108cd5ce01f8200201baa00433300d75ca01800664646666ae68cdc3800a4008464244460040086ae84d55cf00191999ab9a3370e0049001119091118008021bae357426aae780108cccd5cd19b87003480008488800c8c98c8114cd5ce0210218218210209aab9d00137540046600aeb8004d5d09aba2500535742a0086ae854010d5d0a8021119191999ab9a3370e0029000119182198030009aba135573c00646666ae68cdc3801240044a084464c6408266ae700f80fc0fc0f8d55ce8009baa001135744a00226ae8940044d55cf00111931901c19ab9c0350360363754002266002eb9d69119118011bab00130392233335573e002406846466a06866078600c6aae754004c014d55cf280098021aba200313574200406a26ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aab9e00223263202833573804a04c04c6ea8008c8c8cccd5cd19b87001480188c848888c010014c8c8cccd5cd19b870014803084888888800c8c8c8c8cccd5cd19b87005480288488888880108cccd5cd19b87006480208c8c8cc8848888888cc004024020dd70011bad001357426ae894010d5d0a80191999ab9a3370e00e900311919199109111111198010048041bae002375c0026ae84d5d128031aba1500523333573466e1c021200423232332212222222330060090083013002375c0026ae84d5d128041aba1500723333573466e1c0252002232321222222230070083013001357426aae7802c8cccd5cd19b8700a480008c8c848888888c014020c050004d5d09aab9e00c23263203533573806406606606406206005e05c26aae780144d55cf00209aab9e00302a35573a0026ea8d5d09aab9e00323333573466e1c0092004232321222230020053009001357426aae780108cccd5cd19b87003480088c8c848888c004014c024004d5d09aab9e00523333573466e1c0112000232122223003005375c6ae84d55cf00311931901619ab9c02902a02a02902802735573a0026ea8004d5d09aba2500535742a0084646666ae68cdc39aab9d001480008c8c8c8cc0a4c8cccd5cd19b8735573a002900011bae357426aae780088c98c80accd5ce0140148149baa002375a0026ae84d5d128011aba15001135573c004464c6404c66ae7008c090090dd5000919191999ab9a3370e0029001119191919191999110911998008028020019bad003375a0046eb4004d5d09aba2500335742a0046ae8540084d5d1280089aab9e00323333573466e1c00920002323212230020033007001357426aae780108c98c809ccd5ce0120128128121aab9d0013754002464646666ae68cdc3800a400446424460020066eb8d5d09aab9e00323333573466e1c00920002321223002003375c6ae84d55cf00211931901319ab9c02302402402335573a0026ea80044d55cf00111931901019ab9c01d01e01e375400220382602a9210350543500301c22112225335001100222133005002333553007120010050040012233335500222230023370000290011000800a4000603444a66a00220204426a00444a66a666ae68cdc78012450b4879647261486561645631000150141333573466e1c0052002015014130060032253350021001100f222300330020012223355003002001232230020013017225335001100e2215335300500213004001100f232235001222222222222300e00230162253350011501522135002225335333573466e3c00801c0440404c0680044c01800cc0508844894cd40044040884cd4044c010008cd54c0184800401000488c008004800488c88c008004c04c894cd400454048884d4008894cd4cc02000801c4c05c0044c01800c8d400488cccd40048c98c8040cd5ce249024c680000e20012326320103357389201024c680000e2326320103357389201024c680000e2253350011006133573800400a46a002444444444444010464c6401466ae700040204880084880048ccccccd5d200092804928049280492804918051bae002005122002122122330010040034910350543100120014988848cc00400c0088488c00800c44880048848cc00400c0088c8c00400488cc00cc0080080052211c9bad424d8a3bc67f63acfe1b015b551e84a14d7d8818204089a021b50048811c00a8a1475bd29c02c0e3ff02a2fc83607425cd9b94eaa9f2a3056ab10001"
+    "description": "hydra-mHead-0.12.0-155-gc53558de2",
+    "cborHex": "590ffe590ffb010000333232332232323232332232332232323232323232323232323232323232222225335325335323333573466e1c0052002212200223333573466e1c0092000212200123263202233573803e04004003e6aae74dd500189980a249034d303600533533301222333573466e3c008004068064c04c004cc040044c054d40048800884cc090894cd4004406c884d4008894cd4ccd5cd19b880014800007c0784c01800c4078004405c4c8cc02ccc044c0552401034d3031003233025225335001101b22153355335333573466e3cd402888008d4008880080780744ccd5cd19b873500a22001350022200101e01d101d101e1300400100133300d3010120012350012200235500122222222222200c32323232323301033016301a491034d30320032333573466e1ccc05ccc048c894cd400484c00c004520003233223223002001302d2253350011003221330063500222001300400130012200230012200123300122337000040029000198091980c91199ab9a3371e004002042040a0040306038a00e00203e03c66e01400920023301033016301a4901034d3033003323223002001302a225335001102022135002225335333573466e3c00801c0940904c0580044c01800d4004d5401088004cc040c8cc044cc06d2401034d30340032333573466e1d401000408007ccc03c4488c88c008004c0b0894cd4004400c884cc018008c0100054004cc05094cd4ccc06888ccd5cd19b8f00200102202150030012153350011301f491034d3038002213500222533500315335333573466e1c00520020250241025130234901034d3038002213025491034d3038001301e491034d30370050011333012301512001235001220013300500c50063301033013253233350021301e491034d3132002130020012153353301700150092130030011301f491034d3035002533530210012133019301d491034d31320032333573466e3c00800408808540104c079241034d313200333012301512001235001220023300500c500633016301a491034d3035003301032333573466e3cd5401088800c00407c0794004c94cd4ccd5cd19b8f35001220023500b2200201f01e1333573466e1cd400488004d402c8800407c0784078d5400c8880084c0600184d5400488800454ccd4d54004880084c065241034d31300021301a4901034d313000215335325335330130025005213002001150253300f23333333574800246646464666ae68cdc3a8012400c46666aae7d40088c0b04888800c940ac09c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8cccd5cd19b875013480108cccd55cfa8099281e11999aab9f50122503d233335573ea0244a07c46666aae7d4048940fc8cccd55cfa8091282011999aab9f501225041233335573ea0244a08446666aae7cd5d128099299a998098091aba1501b215335301235742a03442a66a607c6ae854068854cd4c050d5d0a80d10a99a980a1aba1501a215335304135742a03442a66a660320846ae85406884c12c48888ccccccc01002c02802402001c01801454124541205411c5411854114541105410c9410c0fc0f80f40f00ec0e80e40e08cccd5cd19b875014480088cccd55cfa80a1281e91999aab9f50092503e233335573ea0124a07e46666aae7d4024941008cccd55cf9aba2500a25335300e35742a03242a66a660240226ae854038854cd4c0f0d5d0a80710a99a981e9aba1500e213046122223333001008007006005150441504315042150412504103d03c03b03a03923333573466e1d40552000233335573ea02a4a07c46666aae7d401c940fc8cccd55cfa8039282011999aab9f500725041233335573e6ae89402094cd4c03cd5d0a80d10a99a998098091aba1500c215335303d35742a01842a66a646666666ae900048ccc8cd5cd19b8735573aa0029000119191999aab9f50022504c233335573ea0044a09a46666aae7cd5d128019299a991999999aba40012333233573466e1cd55cea800a40004646666aae7d4004941508cccd55cf9aba2500225335304e35742a0064260ae0022a0aa4a0aa0a20a026aae7940084dd500112828827128281282812828128280261aba15005215335301d35742a00a4260a26609e0040022a09e2a09c4a09c09409209026ae8940044d55cf280109baa002250480452504725047250472504704335742a01842608e24444666600401000e00c00a2a08a2a0882a0862a0844a08407c07a0780760744a07a07407207026ae8940044d5d1280089aba2500f135744a00226ae8940044d5d1280611999999aba40012333233573466e1cd55cea800a40004646666aae7d4004940e48cccd55cf9aba2500225335300835742a0064260780022a0744a07406c06a26aae7940084dd50011281b0199281a9281a9281a9281a81891999999aba400125034250342503423035375a0044a0680604a66a60560024260680022a06446446666666ae90004940d0940d08c00cdd60011281a1281a018181a111999aab9f0012303502f2533530043574200442a66a60086ae8800c84c0dccd40c0008004540d4540d00c04d5d1280089aba25001135744a00226ae8940044d5d1280089aba25002135573ca00426aae7540044dd500101212813128131281312813011100090a9999a800911111109811249034d3039001301b491034d3039002222132123330010040030023301111223223002001302e225335001100322133006002300400100322221301f4901034d3039001301a491034d30390015335330010075002130184901034d31310022135002225335003133028002001221301e4901034d313100223500122222222222233355301612001223500222223500422335002200825335333573466e3c00405c0c00bc4cd40c8cc0e801401802040200a80284d400488008c8cccd5cd19b8735573a0029000119191919191919910919800801801191999ab9a3370e6aae74005200023232323232323232323232323232323232323232323232323232323333332222221233333333333300100701200600500400e00d00c00300a002008330102323333573466e1cd55ce800a4000464646466442466002006004604c00460260026ae84d5d128011aba15001135573c004464c6408c66ae7010c110110dd500080619808006805199807bae00e00933300f75c01c01066020eb8010ccc03dd710008011aba135744a0206ae85403cd5d0a8079aba1500f35742a01e6ae85403cd5d0a8079aba1500f35742a01e6ae85403cd5d0a8079aba1500f2323333573466e1cd55ce800a4000464646464646464646666444424666600200a008006004646666ae68cdc39aab9d001480008c8c8c8cc8848cc00400c008c094008cc028090004d5d09aba2500235742a00226aae780088c98c810ccd5ce0200208209baa00433300d75c01800664646666ae68cdc3800a4008464244460040086ae84d55cf00191999ab9a3370e0049001119091118008021bae357426aae780108cccd5cd19b87003480008488800c8c98c8118cd5ce0218220220218211aab9d00137540046600aeb8004d5d09aba2500535742a0086ae854010d5d0a8021119191999ab9a3370e0029000119182218030009aba135573c00646666ae68cdc3801240044a086464c6408466ae700fc1001000fcd55ce8009baa001135744a00226ae8940044d55cf00111931901c99ab9c03603703737540024666004eb9d68009119118011bab001303a2233335573e002406a46466a06a6607a600c6aae754004c014d55cf280098021aba200313574200406c464460046eb0004c0e088cccd55cf8009019919a81918021aba100230033574400406826ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aab9e00223263202833573804a04c04c6ea8008c8c8cccd5cd19b87001480188c848888c010014c8c8cccd5cd19b870014803084888888800c8c8c8c8cccd5cd19b87005480288488888880108cccd5cd19b87006480208c8c8cc8848888888cc004024020dd70011bad001357426ae894010d5d0a80191999ab9a3370e00e900311919199109111111198010048041bae002375c0026ae84d5d128031aba1500523333573466e1c021200423232332212222222330060090083013002375c0026ae84d5d128041aba1500723333573466e1c0252002232321222222230070083013001357426aae7802c8cccd5cd19b8700a480008c8c848888888c014020c050004d5d09aab9e00c23263203533573806406606606406206005e05c26aae780144d55cf00209aab9e00302a35573a0026ea8d5d09aab9e00323333573466e1c0092004232321222230020053009001357426aae780108cccd5cd19b87003480088c8c848888c004014c024004d5d09aab9e00523333573466e1c0112000232122223003005375c6ae84d55cf00311931901619ab9c02902a02a02902802735573a0026ea8004d5d09aba2500535742a0084646666ae68cdc39aab9d001480008c8c8c8cc0a4c8cccd5cd19b8735573a002900011bae357426aae780088c98c80accd5ce0140148149baa002375a0026ae84d5d128011aba15001135573c004464c6404c66ae7008c090090dd5000919191999ab9a3370e0029001119191919191999110911998008028020019bad003375a0046eb4004d5d09aba2500335742a0046ae8540084d5d1280089aab9e00323333573466e1c00920002323212230020033007001357426aae780108c98c809ccd5ce0120128128121aab9d0013754002464646666ae68cdc3800a400446424460020066eb8d5d09aab9e00323333573466e1c00920002321223002003375c6ae84d55cf00211931901319ab9c02302402402335573a0026ea80044d55cf00111931901019ab9c01d01e01e375400220382602a92010350543500301c22112225335001100222133005002333553007120010050040012233335500222230023370000290011000800a4000603444a66a00220204426a00444a66a666ae68cdc78012450b4879647261486561645631000150141333573466e1c0052002015014130060032253350021001100f222300330020012223355003002001232230020013017225335001100e2215335300500213004001100f232235001222222222222300e00230162253350011501522135002225335333573466e3c00801c0440404c0680044c01800cc0508844894cd40044040884cd4044c010008cd54c0184800401000488c008004800488c88c008004c04c894cd400454048884d4008894cd4cc02000801c4c05c0044c01800c8d400488cccd40048c98c8040cd5ce249024c680000e20012326320103357389201024c680000e2326320103357389201024c680000e2253350011006133573800400a46a002444444444444010464c6401466ae700040204880084880048ccccccd5d200092804928049280492804918051bae002005122002122122330010040034910350543100120014988848cc00400c0088488c00800c44880048848cc00400c0088c8c00400488cc00cc0080080052211ceaf589de11c6c805af24b759e7794d62661d3db4ade79594892ebaec0048811ce35bdf32cd3806596150c1cbab6ab5456bd957b36019ed2746bf481d0001"
 }