Skip to content

Commit

Permalink
Merge pull request #764 from input-output-hk/PLT-8147
Browse files Browse the repository at this point in the history
PLT-8147 PLT-8806 Plutus latest validators.
  • Loading branch information
bwbush authored Nov 28, 2023
2 parents 68316e5 + 2d86b0b commit cd48a11
Show file tree
Hide file tree
Showing 10 changed files with 272 additions and 75 deletions.
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### Fixed

- The `marlowe-cli transaction find-published` now reports correct information on the open-role validator.
2 changes: 1 addition & 1 deletion marlowe-cli/src/Language/Marlowe/CLI/Transaction.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1235,7 +1235,7 @@ findMarloweScriptsRefs
findMarloweScriptsRefs queryCtx publishingStrategy printStats = do
marloweValidator <- readMarloweValidator @_ @lang
payoutValidator <- readRolePayoutValidator @_ @lang
openRoleValidator <- readRolePayoutValidator @_ @lang
openRoleValidator <- readOpenRoleValidator @_ @lang
let marloweHash = hashScript $ PS.toScript marloweValidator
payoutHash = hashScript $ PS.toScript payoutValidator
openRoleHash = hashScript $ PS.toScript openRoleValidator
Expand Down
20 changes: 10 additions & 10 deletions marlowe-cli/tests/Spec/Analysis.hs
Original file line number Diff line number Diff line change
Expand Up @@ -194,17 +194,17 @@ expected False =
A..= A.object
[ "Memory"
A..= A.object
[ "Actual" A..= (18668386 :: Integer)
, "Invalid" A..= True
[ "Actual" A..= (12394112 :: Integer)
, "Invalid" A..= False
, "Maximum" A..= (14000000 :: Integer)
, "Percentage" A..= (100 * 18668386 / 14000000 :: Double)
, "Percentage" A..= (100 * 12394112 / 14000000 :: Double)
]
, "Steps"
A..= A.object
[ "Actual" A..= (4791520395 :: Integer)
[ "Actual" A..= (3230247457 :: Integer)
, "Invalid" A..= False
, "Maximum" A..= (10000000000 :: Integer)
, "Percentage" A..= (100 * 4791520395 / 10000000000 :: Double)
, "Percentage" A..= (100 * 3230247457 / 10000000000 :: Double)
]
]
]
Expand All @@ -214,17 +214,17 @@ expected True =
A..= A.object
[ "Memory"
A..= A.object
[ "Actual" A..= (21383160 :: Integer)
, "Invalid" A..= True
[ "Actual" A..= (13563828 :: Integer)
, "Invalid" A..= False
, "Maximum" A..= (14000000 :: Integer)
, "Percentage" A..= (100 * 21383160 / 14000000 :: Double)
, "Percentage" A..= (100 * 13563828 / 14000000 :: Double)
]
, "Steps"
A..= A.object
[ "Actual" A..= (5616132494 :: Integer)
[ "Actual" A..= (3628849926 :: Integer)
, "Invalid" A..= False
, "Maximum" A..= (10000000000 :: Integer)
, "Percentage" A..= (100 * 5616132494 / 10000000000 :: Double)
, "Percentage" A..= (100 * 3628849926 / 10000000000 :: Double)
]
]
]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### Added

- Published Marlowe validators compiled under plutus-1.15.0.0.
306 changes: 248 additions & 58 deletions marlowe-runtime/src/Language/Marlowe/Runtime/Core/ScriptRegistry.hs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion marlowe/scripts/marlowe-rolepayout.plutus
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"type": "PlutusScriptV2", "description": "", "cborHex": "590a48590a450100003232332232323232323232323232323232323322323232323232323232323233223232322323222323232533500110261326320263357389210350543500026323232350032232323335530151200135018501723500122333553018120013501b501a2350012233350012330354800000488cc0d80080048cc0d400520000013300f002001323500122222222222233355302112001335025223355302212001235001223355032002335530251200123500122335503500233350012330464800000488cc11c0080048cc11800520000013301d002001502c2350012235001222200300c350042200233501d335501f00233501d335501f0014800940794078cccd5cd19b8735573aa0089000119910919800801801191919191919191919191919191999ab9a3370e6aae754031200023333333333332222222222221233333333333300100d00c00b00a00900800700600500400300233502402535742a01866a04804a6ae85402ccd4090098d5d0a805199aa8143ae502735742a012666aa050eb9409cd5d0a80419a8120181aba150073335502803175a6ae854018c8c8c8cccd5cd19b8735573aa00490001199109198008018011919191999ab9a3370e6aae754009200023322123300100300233503b75a6ae854008c0f0d5d09aba2500223263203e33573807e07c07826aae7940044dd50009aba150023232323333573466e1cd55cea8012400046644246600200600466a076eb4d5d0a801181e1aba135744a004464c6407c66ae700fc0f80f04d55cf280089baa001357426ae8940088c98c80e8cd5ce01d81d01c09aab9e5001137540026ae854014cd4091d71aba150043335502802d200135742a006666aa050eb88004d5d0a80118179aba135744a004464c6406c66ae700dc0d80d04d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135744a00226ae8940044d5d1280089aba25001135573ca00226ea8004d5d0a802180f9aba135744a008464c6405066ae700a40a0098cccd5cd19b8735573a6ea80152000202723263202733573805004e04a6666ae68cdc39aab9d5006480008cd5406cdd71aba15006375c6ae84d5d1280311931901319ab9c027026024135573ca00226ea80044d55cf280089baa001223355300712001235001223355017002333500123355300b1200123500122335501b00235500d0010012233355500800e00200123355300b1200123500122335501b00235500c001001333555003009002001111222333553004120015012335530071200123500122335501700235500900133355300412001223500222533533355300c12001323350112233350032200200200135001220011233001225335002102a1001027235001223300a002005006100313350160040035013001335530071200123500122323355018003300100532001355028225335001135500a003221350022253353300c002008112223300200a0041300600300232001355021221122253350011002221330050023335530071200100500400111212223003004112122230010043200135501e221122533500115010221335011300400233553006120010040013200135501d221122253350011350032200122133350052200230040023335530071200100500400122333573466e3c00800407006c448cc004894cd40084004406c06848cd400888ccd400c88008008004d40048800448848cc00400c00848c88c008dd6000990009aa80c911999aab9f0012500a233500930043574200460066ae880080548c8c8cccd5cd19b8735573aa004900011991091980080180118069aba150023005357426ae8940088c98c8054cd5ce00b00a80989aab9e5001137540024646464646666ae68cdc39aab9d5004480008cccc888848cccc00401401000c008c8c8c8cccd5cd19b8735573aa0049000119910919800801801180b1aba15002335010015357426ae8940088c98c8068cd5ce00d80d00c09aab9e5001137540026ae854010ccd54021d728039aba150033232323333573466e1d4005200423212223002004357426aae79400c8cccd5cd19b875002480088c84888c004010dd71aba135573ca00846666ae68cdc3a801a400042444006464c6403866ae700740700680640604d55cea80089baa00135742a00466a018eb8d5d09aba2500223263201633573802e02c02826ae8940044d5d1280089aab9e500113754002266aa002eb9d6889119118011bab00132001355016223233335573e0044a010466a00e66aa012600c6aae754008c014d55cf280118021aba20030131357420022244004244244660020080062244246600200600424464646666ae68cdc3a800a40004642446004006600a6ae84d55cf280191999ab9a3370ea0049001109100091931900819ab9c01101000e00d135573aa00226ea80048c8c8cccd5cd19b875001480188c848888c010014c01cd5d09aab9e500323333573466e1d400920042321222230020053009357426aae7940108cccd5cd19b875003480088c848888c004014c01cd5d09aab9e500523333573466e1d40112000232122223003005375c6ae84d55cf280311931900819ab9c01101000e00d00c00b135573aa00226ea80048c8c8cccd5cd19b8735573aa004900011991091980080180118029aba15002375a6ae84d5d1280111931900619ab9c00d00c00a135573ca00226ea80048c8cccd5cd19b8735573aa002900011bae357426aae7940088c98c8028cd5ce00580500409baa001232323232323333573466e1d4005200c21222222200323333573466e1d4009200a21222222200423333573466e1d400d2008233221222222233001009008375c6ae854014dd69aba135744a00a46666ae68cdc3a8022400c4664424444444660040120106eb8d5d0a8039bae357426ae89401c8cccd5cd19b875005480108cc8848888888cc018024020c030d5d0a8049bae357426ae8940248cccd5cd19b875006480088c848888888c01c020c034d5d09aab9e500b23333573466e1d401d2000232122222223005008300e357426aae7940308c98c804ccd5ce00a00980880800780700680600589aab9d5004135573ca00626aae7940084d55cf280089baa0012323232323333573466e1d400520022333222122333001005004003375a6ae854010dd69aba15003375a6ae84d5d1280191999ab9a3370ea0049000119091180100198041aba135573ca00c464c6401866ae700340300280244d55cea80189aba25001135573ca00226ea80048c8c8cccd5cd19b875001480088c8488c00400cdd71aba135573ca00646666ae68cdc3a8012400046424460040066eb8d5d09aab9e500423263200933573801401200e00c26aae7540044dd500089119191999ab9a3370ea00290021091100091999ab9a3370ea00490011190911180180218031aba135573ca00846666ae68cdc3a801a400042444004464c6401466ae7002c02802001c0184d55cea80089baa0012323333573466e1d40052002200923333573466e1d40092000200923263200633573800e00c00800626aae74dd5000a4c24002921035054310022333573466e2400800401000c48800848800488cdc0001000889191800800911980198010010009"}
{"type": "PlutusScriptV2", "description": "", "cborHex": "59091159090e0100003233223233223233223232323232323232322225323353232323235003223230143300d3350153301a0033350153301a00248008058058004d400c88d4008888888888888c064030c8cccd5cd19b8748000d55ce800919191919191919191919910919800801801191999ab9a3370e90001aab9d001232323232323232323232323232323232323232323232323323233323333323332332332222222222221233333333333300100d00c00b00a0090080070060050040030023300400101c3300400101a2323333573466e1d200035573a0024646464664424660020060046052004600e0026ae84d5d10011aba100135573c0044c05c6ea8004cc00c00405c8c8cccd5cd19b8748000d55ce8009191919191919191919999111091999800802802001801191999ab9a3370e90001aab9d001232323233221233001003002303100233006030001357426ae88008d5d08009aab9e00226037375400e66601eeb94030014c8c8cccd5cd19b87480100048c84888c008010d5d09aab9e00323333573466e1d200200223212223001004375c6ae84d55cf00211999ab9a3370e9000001909110019301d01c81c1aab9d001375400666002eb800888c8c8cccd5cd19b87480000048c8488c00800cc014d5d09aab9e00323333573466e1d200200221220012603a03935573a0026ea8004d5d09aba2002357420026ae88008d5d08009aba2002357420026aae78008980b4dd50009998023ae500101433300475ca002024266006eb9d69980080f00799980180fbad00d323333573466e1d200035573a0024646464646466442466002006004646666ae68cdc3a40006aae740048c8c8c8cc8848cc00400c008cc01dd680118030009aba1357440046ae84004d55cf001130191baa004323333573466e1d200035573a0024646464664424660020060046600eeb4008c018004d5d09aba2002357420026aae78008980c8dd50019191999ab9a3370e9001000902291999ab9a3370e90000011022930198191aab9d37540024464646666ae68cdc3a40080024244400246666ae68cdc3a400400446424446006008600c6ae84d55cf00211999ab9a3370e9000001909110011301a81a0199aab9d00137540026ae84d5d10011aba100135573c0044c0566ea802ccc005d7004919118011bac00130402233335573e0024078466a07660086ae84008c00cd5d100101699980100e0008031998013ae00100420012232230023756002607e446666aae7c00480ec8c8cd40eccc100c018d55ce80098029aab9e0013004357440066ae840080b0c07c004d5d09aba2002357420026ae88008d5d08009aba2002357420026ae88008d5d08009aba2002357420026ae88008d5d08009aba2002357420026ae88008d5d08009aba2002357420026ae88008d5d08009aba2002357420026aae780089803cdd50041800803919191999ab9a3370e900300091909111180200298029aba135573c00646666ae68cdc3a400800446424444600400a600e6ae84d55cf00211999ab9a3370e900100191909111180080298051aba135573c00a46666ae68cdc3a400000846424444600600a6eb8d5d09aab9e0062601301201101035573a0026ea80048c8c8cccd5cd19b874803000484888888800c8cccd5cd19b87480280088488888880108cccd5cd19b874802000c8c8c8c8cc8848888888cc004024020dd70011bad001357426ae88008d5d08009aab9e00523333573466e1d2006004232323233221222222233002009008375c0046eb8004d5d09aba2002357420026aae780188cccd5cd19b87480100148c8c8c8cc8848888888cc018024020c030008dd70009aba1357440046ae84004d55cf00391999ab9a3370e900100311909111111180380418051aba135573c01046666ae68cdc3a400000e46424444444600a01060166ae84d55cf0049300a80a0098090088080079aab9d0013754002464646666ae68cdc3a40040024646464646466644424466600200a0080066eb4010dd68011bad001357426ae88008d5d08009aba2002357420026aae7800c8cccd5cd19b87480000088c8488c00800cc018d5d09aab9e0042600f00e35573a0026ea80048c8c8cccd5cd19b87480080048c8488c00400cdd71aba135573c00646666ae68cdc3a400000446424460040066eb8d5d09aab9e0042600e00d35573a0026ea80048c8cccd5cd19b8748000d55ce80091919191991091980080180118038011bad001357426ae88008d5d08009aab9e0022600b37540024646666ae68cdc3a40006aae740048dd71aba135573c0044c0146ea8004d5d09aba2002357420026aae7800898010dd50029999ab9a3370e90001aab9d375400a40084c004646666ae68cdc3a40006aae740048c8c8c8cc064dd70011bae001357426ae88008d5d08009aab9e00226002375400a9308008b09000980891299a80088061109a80111191807198041a80111110018009803001911801999a802802001000980791299a800880511099a8059a8011119809001199a8009180500091199a80500480100091805800980200091199ab9a3371e00400201801626444464646602644a66a002200644266a01e00460080026004008600a6602444a66a002201a44264a66a6a00646446004016603044a66a002202c4426a00444a66a6602000400e20322600c006266a01e00600220026008002004602244a66a002201844266a01a6a00444646602a0066002010602e44a66a00226aa02e0064426a00444a66a6601e00401022444660040140082600c0066008002601a44a66a002201044266a0126a004446602000460240026008002601844a66a002200e44266a0106a004446601e00460220026008002601644a66a002200c44266a00e6a004446601c0046aa01e0026008002601444a66a002200a44266a00c6a004446601a0046602044a66a002201644266a0186a0044466026004666a002466e0120000012233700004002466e01200000130040010013004001300922533500110072232135003223003001300d2253350011300600322135002223335001253353300e480000044c01c010403c894cd4cc03c0080044c020014404094cd4cc038005200013007004100f1220021221223300100400322333573466e2400800401000c4880084880048848cc00400c00884888c00c0104484888c0040108c8c00400488cc00cc008008005"}
2 changes: 1 addition & 1 deletion marlowe/scripts/marlowe-semantics.plutus

Large diffs are not rendered by default.

Loading

0 comments on commit cd48a11

Please sign in to comment.