From c305c201a3ae6909d707d19cfcf82029f165c4e6 Mon Sep 17 00:00:00 2001 From: Hao Date: Wed, 22 Jan 2025 22:19:25 +1100 Subject: [PATCH] Return assets to initiator if cancelled at the stage of initiated --- .../src/escrow/aiken-workspace-v2/aiken.lock | 2 +- .../src/escrow/aiken-workspace-v2/aiken.toml | 2 +- .../src/escrow/aiken-workspace-v2/plutus.json | 13 ++++++++----- .../escrow/aiken-workspace-v2/validators/escrow.ak | 12 ++++++++++-- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/packages/mesh-contract/src/escrow/aiken-workspace-v2/aiken.lock b/packages/mesh-contract/src/escrow/aiken-workspace-v2/aiken.lock index d3bf5d2b8..4f72b7b7d 100644 --- a/packages/mesh-contract/src/escrow/aiken-workspace-v2/aiken.lock +++ b/packages/mesh-contract/src/escrow/aiken-workspace-v2/aiken.lock @@ -24,4 +24,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@v2" = [{ secs_since_epoch = 1725600556, nanos_since_epoch = 331308000 }, "d79382d2b6ecb3aee9b0755c31d8a5bbafe88a7b3706d7fb8a52fd4d05818501"] +"aiken-lang/stdlib@v2" = [{ secs_since_epoch = 1737543807, nanos_since_epoch = 537547209 }, "25c8d0802b8266feca04b47933382c5dee3cadb422208a5d3810d9d2df108c2e"] diff --git a/packages/mesh-contract/src/escrow/aiken-workspace-v2/aiken.toml b/packages/mesh-contract/src/escrow/aiken-workspace-v2/aiken.toml index 8fcc1c176..16f48fea3 100644 --- a/packages/mesh-contract/src/escrow/aiken-workspace-v2/aiken.toml +++ b/packages/mesh-contract/src/escrow/aiken-workspace-v2/aiken.toml @@ -1,6 +1,6 @@ name = "meshjs/escrow" version = "0.0.0" -compiler = "v1.1.0" +compiler = "v1.1.9" plutus = "v3" license = "Apache-2.0" description = "Aiken contracts for project 'meshjs/escrow'" diff --git a/packages/mesh-contract/src/escrow/aiken-workspace-v2/plutus.json b/packages/mesh-contract/src/escrow/aiken-workspace-v2/plutus.json index 44751ade4..d2a0904fb 100644 --- a/packages/mesh-contract/src/escrow/aiken-workspace-v2/plutus.json +++ b/packages/mesh-contract/src/escrow/aiken-workspace-v2/plutus.json @@ -6,7 +6,7 @@ "plutusVersion": "v3", "compiler": { "name": "Aiken", - "version": "v1.1.0+unknown" + "version": "v1.1.9+2217206" }, "license": "Apache-2.0" }, @@ -25,13 +25,16 @@ "$ref": "#/definitions/escrow~1EscrowRedeemer" } }, - "compiledCode": "590d2301010032323232323232253330023232323232533233008300130093754004264646464646464646464a666024600e002264646464a666032603800426601200626601000244a6660360042a01026464660186eacc070008894ccc07c0084c014c0880184c8c8c8c010c094014dd698100011bae301e0013021002375c6034002603a0042c6eacc068004c068008c060004c050dd50068a99980918058008a99980a980a1baa00d1500216153330123003001153330153014375401a2a0042c2c60246ea80304c8c8c8c8c8c8c8c94ccc060c034c064dd500089919191919191919191919192999812180c80509919191919191929998171818801899299981798190018992999816980f18171baa00113232533302f302030303754002264a666060604a60626ea800c4c8c8c8c94ccc0dcc0e80084cc09c00c4cc098004894ccc0e40084cc05801c4c94ccc0dccdd780419ba548008cc0ec018cc0ecdd30021981d8091981d9ba60114bd7008008a50330173756603c60706ea802ccc064dd5980f181c1baa301e30383754018603402026464660546eacc0e8008894ccc0f40084c014c1000184c8c8c8c010c10c014dd6981f0011bae303c001303f002375c607000260760042c6eacc0e0004c0e0008c0d8004c0c8dd50018b181a18189baa001163010303037540066064605e6ea800458c038c0b8dd5180a18171baa00216303000216302f0023758605c605e0046eb0c0b4004cc0acdd39980200b007198159ba73300501400e4bd701bab302b302c002302a0013026375403e2646464a66604e604001a264646464a66605c60620062a66605c004264a666058603a605a6ea80044c8cc03400454ccc0b4c088c0b8dd50008992999817181198179baa00113300901a375c606660606ea800458c01cc0c8c0bcdd500089919191919191919299981a9815181b1baa001132325333037302c303837540022a66606e6466002002660786ea400ccc0f0c0f4c0e8dd500125eb80894ccc0f0004528099299981d1980a8131bae303f00214a2266006006002607e0022a66606e00a200829405280b18080029bae303a303737540022c601c00c660286601e040004602e6eacc0e0c0e400ccc04ccc03807c010c058dd5981b801981b000981b000981a801181980098179baa0013031302e37540022c601a605a6ea8c04cc0b4dd50008b0b18178011bac302e302f0023758605a002660566e9ccc010058038cc0acdd39980280a00725eb804c8c8c8c94ccc0b8c0c400c54ccc0b80084c94ccc0b0c074c0b4dd50008992999816981318171baa001132323232323232325333038303b00213302800713302700522533303a00213302a00513302900322533303c0021323232533303c3031303d375400226464a66607c6066607e6ea800454ccc0f8c8cc004004cc10cdd480199821982218209baa0024bd701129998218008a5113253330413301c02d375c608c0042660060060022940c11800454ccc0f801440105280a5016301700b375c6082607c6ea800458c054034cc06ccc05809c020c078028cc068cc05409802cc0740144c8c8cc0b4dd5981e8011129998200010980298218030991919180218230029bad3041002375c607e00260840046eb8c0ec004c0f80084c8c8cc0acdd5981d80111299981f0010980298208030991919180218220029bad303f002375c607a00260800046eb8c0e4004c0f000858dd5981c800981c801181b800981b8011bab303500130350023033001302f37540022c6062605c6ea800458c034c0b4dd5180998169baa0011616302f0023758605c605e0046eb0c0b4004cc0acdd39980200b007198159ba73300501400e4bd701192999814180e98149baa001130123302c302d302a375400297ae014c103d87a800030123029375400244646600200200644a66605800229404c94ccc0a8cdc79bae302f00200414a2266006006002605e00244646600200200644a666056002297adef6c6013322533302a3375e602a60586ea80080144cc034004dd5980918161baa0021001302d00133002002302e001223300400223375e602260506ea8c038c0a0dd50008011119801801119baf30103027375400200444646600200200644a666050002297ae0132325333027300500213302b00233004004001133004004001302c002302a001223253330233018001132323232533302a302d00213301a00313301900122533302c00215008132323301d3756605a00444a6660600042600a606600c26464646008606c00a6eb4c0c4008dd7181780098190011bae302b001302e002163756605600260560046052002604a6ea800c54ccc08cc0700044c8c8c8c8c8c8c8c94ccc0b8c0c40084cc07801c4cc074014894ccc0c00084cc0800144cc07c00c894ccc0c8008540384c8c8cc08cdd5981980111299981b00109802981c80309919191802181e0029bad3037002375c606a00260700046eb8c0c4004c0d00084c8c8cc084dd5981880111299981a00109802981b80309919191802181d0029bad3035002375c6066002606c0046eb8c0bc004c0c800858dd598178009817801181680098168011bab302b001302b0023029001302537540062c60466ea800888c8cc004004c8cc00400400c894ccc09c00452f5c0264666444646600200200644a66605a00220062646605e6e9ccc0bcdd4803198179816000998179816800a5eb80cc00c00cc0c4008c0bc004dd718130009bab302700133003003302b002302900122533302600114a2264a6660486466e24dd698038009991192999814181098149baa0011480004dd6981698151baa0013253330283021302937540022980103d87a8000132330010013756605c60566ea8008894ccc0b4004530103d87a8000132323232533302e337220100042a66605c66e3c0200084c060cc0c8dd4000a5eb80530103d87a8000133006006003375a605e0066eb8c0b4008c0c4008c0bc004c8cc004004024894ccc0b00045300103d87a8000132323232533302d337220100042a66605a66e3c0200084c05ccc0c4dd3000a5eb80530103d87a80001330060060033756605c0066eb8c0b0008c0c0008c0b8004dd718080009bae300d001375860520042660060060022940c0a40048c090c094c09400488c8ccc00400400c0088894ccc09400840044c8ccc010010c0a400ccccc020008dd718120009bab3025001222325333027533302a00114a229405300103d87a8000130113302b374c00297ae032333001001003002222533302c0021001132333004004303000333223233001001005225333031001133032337606ea4010dd4001a5eb7bdb1804c8c8c8c94ccc0c8cdc800400109981b19bb037520106ea001c01454ccc0c8cdc780400109929998199814181a1baa001133037337606ea4024c0e0c0d4dd5000802080219299981998140008a60103d87a80001301d33037375000297ae03370000e00226606c66ec0dd48011ba800133006006003375a60660066eb8c0c4008c0d4008c0cc004dd718158009bad302c001302e00230270022323300100100222533302200114bd6f7b6300999119191999804001801000911319190011919198008008019129998148008a4c264a6660540022a66604e60086eb4c0a4c0b000852616132323232533302b337206eb8c0b0010dd718160018a9998159804000899803803998178018010b0b1bad302c003302f003302d002302c002302c001233302430190014a0944dd598120019bae3022002302400133002002302500122223233001001005225333024001133025337606ea4014dd300225eb7bdb1804c8c8c8c94ccc094cdc800480109981499bb037520126e9802001454ccc094cdc78048010992999813180d98139baa00113302a337606ea4028c0acc0a0dd5000802080219980380480400089981499bb037520046e98004cc01801800cdd598130019bae302400230280023026001301b375402a600860366ea8c004c06cdd5180f180d9baa0022301e301f00116323300100100722533301c00114c0103d87a800013232533301b3375e600c603a6ea80080484c014cc07c0092f5c02660080080026040004603c0026e9520002301b001375860326034603460346034603460340046eb0c060004c060c060008dd6180b00098091baa00d370e900211191980080080191198018009801001112999807980218081baa00213232323253330163019002133007003132325333015300a00113232533301a301d002132325333019300e00113232533301e302100213300f0011500416301f001301b37540062a66603260240022646464646464a666044604a0042a0102c6eb4c08c004c08c008dd6981080098108011bad301f001301b37540062c60326ea80085401058c06c004c05cdd50018a99980a98070008a99980c180b9baa003150021616301537540042a00a2c602e002602e004602a00260226ea80085888c94ccc03cc0100044c8c94ccc050c05c0085401058dd7180a80098089baa0031533300f300800113232533301430170021500416375c602a00260226ea800c58c03cdd50011b8748000c03cc040008c038004c028dd50011b874800858c02cc030008c028004c028008c020004c010dd50008a4c26cacae6955ceaab9e5573eae815d0aba21", - "hash": "6e95d24ab0579b9e44c7cd1c801e1527c63124cef086d39443696b6b" + "compiledCode": "590d3e01010032323232323232253330023232323232533233008300130093754004264664464646464646464a666024600e002264646464a666032603800426601200626601000244a66603600401026464660186eacc070008894ccc07c0084c014c0880184c8c8c8c010c094014dd698100011bae301e0013021002375c6034002603a0042c6eacc068004c068008c060004c050dd50068a99980918058008a99980a980a1baa00d00216153330123003001153330153014375401a0042c2c60246ea80304c8c8c8c8c8c8c8c94ccc060c034c064dd500089919191919191919191919191919192999813980e0010991991191919192999818981a0010992999819181a8020992999818181098189baa001132325333032302330333754002264a666066605060686ea800c4c8c8c8c94ccc0e8c0f40084cc0a800c4cc0a4004894ccc0f00084cc04c01c4c94ccc0e8cdd780419ba548008cc0f8018cc0f8dd30021981f0091981f1ba60114bd7008008a503301b3756604260766ea802ccc068dd59810981d9baa3021303b3754018603a020264646605a6eacc0f4008894ccc1000084c014c10c0184c8c8c8c010c118014dd698208011bae303f0013042002375c6076002607c0042c6eacc0ec004c0ec008c0e4004c0d4dd50018b181b981a1baa00116301430333754006606a60646ea800458c048c0c4dd5180b98189baa002163033003163032001375860620046eb0c0c0c0c4004cc0b8dd39980380c008998171ba7330080170114bd7018168009bab302d302e001302937540442a66604e6040004264646464a66605c60620042a66605c006264a666058603a605a6ea80044c8cc01c00454ccc0b4c088c0b8dd50008991991192999818981318191baa00113253330323300e01e375c606e60686ea80084004528198099980880f001980a8010b180b00118198009bab30333034001302f37540022646464666444646464a66606c6056606e6ea80044c8c94ccc0e0c0b4c0e4dd50008a99981c19198008009981e9ba90033303d303e303b375400497ae022533303d00114a026644a6660786603005000429444cc010010004dd7181f80098200008a99981c00288020a5014a02c603a00a6eb8c0ecc0e0dd50008b180d8029980b1980a010801180c1bab3039303a0053301533013020003301700230350033756606a004606a002606a0026068002605e6ea8004c0c4c0b8dd50008b180718169baa3013302d37540022c2c605e0026eb0c0b8008dd618169817000998159ba73300401500e3302b374e6600a02801c97ae0132323232533302e30310021533302e003132533302c301d302d3754002264a66605a604c605c6ea80044c8c8c8c8c8c8c8c94ccc0e0c0ec0084cc0a001c4cc09c014894ccc0e80084cc0a80144cc0a400c894ccc0f00084c8c8c94ccc0f0c0c4c0f4dd500089919299981f1819981f9baa0011533303e323300100133043375200666086608860826ea80092f5c044a66608600229444cc894ccc108cc0780b80084cc0100100045281bae304500130460011533303e005100414a0294058c08c02cdd71820981f1baa00116302100d3301c3301a027008301e00a3301b3301902600b301d005132323302d3756607a00444a6660800042600a608600c26464646008608c00a6eb4c104008dd7181f80098210011bae303b001303e002132323302b3756607600444a66607c0042600a608200c26464646008608800a6eb4c0fc008dd7181e80098200011bae3039001303c00216375660720026072004606e002606e0046eacc0d4004c0d4008c0cc004c0bcdd50008b181898171baa00116300e302d37546026605a6ea80045858c0bc004dd618170011bac302d302e0013302b374e6600802a01c660566e9ccc0140500392f5c04464a666052603c002264646464a666060606600426604000626603e00244a66606400401026464660466eacc0cc008894ccc0d80084c014c0e40184c8c8c8c010c0f0014dd6981b8011bae30350013038002375c606200260680042c6eacc0c4004c0c4008c0bc004c0acdd50018a999814981100089919191919191919299981a181b80109981200389981180291299981b00109981300289981280191299981c00100709919198149bab303900222533303c00213005303f006132323230043042005375a607a0046eb8c0ec004c0f8008dd7181b800981d00109919198139bab303700222533303a00213005303d006132323230043040005375a60760046eb8c0e4004c0f0008dd7181a800981c0010b1bab3035001303500230330013033002375660620026062004605e00260566ea800c58c0a4dd500118131baa02022323300100100322533302b00114a026644a66605466e3c0080145288998020020009bae302d001302e001223300400223375e602260506ea8c038c0a0dd50008011119801801119baf30103027375400200444646600200200644a666050002297ae0133225333027300500213302b00233004004001133004004001302a001302b00122323300100100322533302700114bd6f7b63009991299981319baf30113028375400400a26600e0026eacc038c0a0dd500108009814800998010011815000911919980080080180111129998138010800899199802002181580199998050011bae30260013756604e00244464a666052a66605800229445280a60103d87a8000130133302d374c00297ae032333001001003002222533302e0021001132332233300600630340053233001001005225333033001133034337606ea4010dd4001a5eb7bdb1804c8ccc8894ccc0d0cdc800400189981c19bb037520106ea001c01454ccc0d0cdc7804001899299981a9815181b1baa001133039337606ea4024c0e8c0dcdd5000801080119299981a98150008a60103d87a80001301f33039375000297ae03370000e00426607066ec0dd48019ba800233006006001375c60640026eb4c0cc004c0dc008c0d4004dd718168009bad302e00130300023029002223233001001323300100100322533302600114bd7009919991119198008008019129998160008801899198171ba73302e375200c6605c60560026605c605800297ae0330030033030002302e001375c604a0026eacc098004cc00c00cc0a8008c0a0004894ccc09400452889991299981219b89375a600e004664464a66604e604060506ea8004520001375a605860526ea8004c94ccc09cc080c0a0dd50008a6103d87a8000132330010013756605a60546ea8008894ccc0b0004530103d87a8000132333222533302d337220100062a66605a66e3c02000c4c05ccc0c4dd400125eb80530103d87a8000133006006001375c60560026eb4c0b0004c0c0008c0b8004c8cc004004024894ccc0ac0045300103d87a8000132333222533302c337220100062a66605866e3c02000c4c058cc0c0dd300125eb80530103d87a8000133006006001375c60540026eacc0ac004c0bc008c0b4004dd718078011bae300c00213300400400114a06eb0c09c004c0a00048c08cc090c0900048c8cc004004008894ccc08800452f5bded8c026644646466660100060046464006646600200200644a66605200229309929998150008a99981398021bad3029302c0021498584c8c8cccc88894ccc0b4cdc80020010a9998169805001899804804998188028008b0b1bae302a002375a60560046eb8c0a8004c0bc00cc0b4008c0b0008c0b00048ccc090c064005282512226375660480066eb8c088008c090004cc008008c0940048888c8cc004004014894ccc0900044cc094cdd81ba9005374c00897adef6c6013233322253330253372001200626605266ec0dd48049ba6008005153330253371e012006264a66604c6036604e6ea80044cc0a8cdd81ba900a302b30283754002004200466600e01201000426605266ec0dd48019ba600233006006001375c60460026eacc090004c0a0008c0980048c94ccc070c044c074dd500089803198101810980f1baa0014bd700a6103d87a80003006301d3754002600860366ea8c004c06cdd5180f180d9baa0022301e301f00116323300100100622533301c00114c103d87a800013322533301b3375e600c603a6ea80080484c014cc07c0092f5c0266008008002603c002603e0026e9520002301b001375860326034603460346034603460340066eb0c060008dd6180b801180b980b80098091baa00c370e900211191980080080191198018009801001112999807980218081baa0021323232325333016301900213300700313253330143009001132325333019301c0021325333017300c00113232533301c301f00213300d00100b16301d001301937540042a66602e60200022646464646464a666040604600401e2c6eb4c084004c084008dd6980f800980f8011bad301d001301937540042c602e6ea800458c068004c058dd50010a99980a18068008a99980b980b1baa0020061616301437540022c602e002602e004602a00260226ea80085888c94ccc03cc0100044c8c94ccc050c05c00801058dd7180a80098089baa0031533300f3008001132325333014301700200416375c602a00260226ea800c58c03cdd50011b8748000c038004c038c03c004c028dd50011b874800858c02cc03000cc028008c024008c024004c010dd50008a4c26cacae6955ceaab9e5573eae815d0aba21", + "hash": "65f421b9c27242c31b60abd8911cca590ab37f1b6d9b86cffdb5c947" }, { "title": "escrow.escrow.else", - "compiledCode": "590d2301010032323232323232253330023232323232533233008300130093754004264646464646464646464a666024600e002264646464a666032603800426601200626601000244a6660360042a01026464660186eacc070008894ccc07c0084c014c0880184c8c8c8c010c094014dd698100011bae301e0013021002375c6034002603a0042c6eacc068004c068008c060004c050dd50068a99980918058008a99980a980a1baa00d1500216153330123003001153330153014375401a2a0042c2c60246ea80304c8c8c8c8c8c8c8c94ccc060c034c064dd500089919191919191919191919192999812180c80509919191919191929998171818801899299981798190018992999816980f18171baa00113232533302f302030303754002264a666060604a60626ea800c4c8c8c8c94ccc0dcc0e80084cc09c00c4cc098004894ccc0e40084cc05801c4c94ccc0dccdd780419ba548008cc0ec018cc0ecdd30021981d8091981d9ba60114bd7008008a50330173756603c60706ea802ccc064dd5980f181c1baa301e30383754018603402026464660546eacc0e8008894ccc0f40084c014c1000184c8c8c8c010c10c014dd6981f0011bae303c001303f002375c607000260760042c6eacc0e0004c0e0008c0d8004c0c8dd50018b181a18189baa001163010303037540066064605e6ea800458c038c0b8dd5180a18171baa00216303000216302f0023758605c605e0046eb0c0b4004cc0acdd39980200b007198159ba73300501400e4bd701bab302b302c002302a0013026375403e2646464a66604e604001a264646464a66605c60620062a66605c004264a666058603a605a6ea80044c8cc03400454ccc0b4c088c0b8dd50008992999817181198179baa00113300901a375c606660606ea800458c01cc0c8c0bcdd500089919191919191919299981a9815181b1baa001132325333037302c303837540022a66606e6466002002660786ea400ccc0f0c0f4c0e8dd500125eb80894ccc0f0004528099299981d1980a8131bae303f00214a2266006006002607e0022a66606e00a200829405280b18080029bae303a303737540022c601c00c660286601e040004602e6eacc0e0c0e400ccc04ccc03807c010c058dd5981b801981b000981b000981a801181980098179baa0013031302e37540022c601a605a6ea8c04cc0b4dd50008b0b18178011bac302e302f0023758605a002660566e9ccc010058038cc0acdd39980280a00725eb804c8c8c8c94ccc0b8c0c400c54ccc0b80084c94ccc0b0c074c0b4dd50008992999816981318171baa001132323232323232325333038303b00213302800713302700522533303a00213302a00513302900322533303c0021323232533303c3031303d375400226464a66607c6066607e6ea800454ccc0f8c8cc004004cc10cdd480199821982218209baa0024bd701129998218008a5113253330413301c02d375c608c0042660060060022940c11800454ccc0f801440105280a5016301700b375c6082607c6ea800458c054034cc06ccc05809c020c078028cc068cc05409802cc0740144c8c8cc0b4dd5981e8011129998200010980298218030991919180218230029bad3041002375c607e00260840046eb8c0ec004c0f80084c8c8cc0acdd5981d80111299981f0010980298208030991919180218220029bad303f002375c607a00260800046eb8c0e4004c0f000858dd5981c800981c801181b800981b8011bab303500130350023033001302f37540022c6062605c6ea800458c034c0b4dd5180998169baa0011616302f0023758605c605e0046eb0c0b4004cc0acdd39980200b007198159ba73300501400e4bd701192999814180e98149baa001130123302c302d302a375400297ae014c103d87a800030123029375400244646600200200644a66605800229404c94ccc0a8cdc79bae302f00200414a2266006006002605e00244646600200200644a666056002297adef6c6013322533302a3375e602a60586ea80080144cc034004dd5980918161baa0021001302d00133002002302e001223300400223375e602260506ea8c038c0a0dd50008011119801801119baf30103027375400200444646600200200644a666050002297ae0132325333027300500213302b00233004004001133004004001302c002302a001223253330233018001132323232533302a302d00213301a00313301900122533302c00215008132323301d3756605a00444a6660600042600a606600c26464646008606c00a6eb4c0c4008dd7181780098190011bae302b001302e002163756605600260560046052002604a6ea800c54ccc08cc0700044c8c8c8c8c8c8c8c94ccc0b8c0c40084cc07801c4cc074014894ccc0c00084cc0800144cc07c00c894ccc0c8008540384c8c8cc08cdd5981980111299981b00109802981c80309919191802181e0029bad3037002375c606a00260700046eb8c0c4004c0d00084c8c8cc084dd5981880111299981a00109802981b80309919191802181d0029bad3035002375c6066002606c0046eb8c0bc004c0c800858dd598178009817801181680098168011bab302b001302b0023029001302537540062c60466ea800888c8cc004004c8cc00400400c894ccc09c00452f5c0264666444646600200200644a66605a00220062646605e6e9ccc0bcdd4803198179816000998179816800a5eb80cc00c00cc0c4008c0bc004dd718130009bab302700133003003302b002302900122533302600114a2264a6660486466e24dd698038009991192999814181098149baa0011480004dd6981698151baa0013253330283021302937540022980103d87a8000132330010013756605c60566ea8008894ccc0b4004530103d87a8000132323232533302e337220100042a66605c66e3c0200084c060cc0c8dd4000a5eb80530103d87a8000133006006003375a605e0066eb8c0b4008c0c4008c0bc004c8cc004004024894ccc0b00045300103d87a8000132323232533302d337220100042a66605a66e3c0200084c05ccc0c4dd3000a5eb80530103d87a80001330060060033756605c0066eb8c0b0008c0c0008c0b8004dd718080009bae300d001375860520042660060060022940c0a40048c090c094c09400488c8ccc00400400c0088894ccc09400840044c8ccc010010c0a400ccccc020008dd718120009bab3025001222325333027533302a00114a229405300103d87a8000130113302b374c00297ae032333001001003002222533302c0021001132333004004303000333223233001001005225333031001133032337606ea4010dd4001a5eb7bdb1804c8c8c8c94ccc0c8cdc800400109981b19bb037520106ea001c01454ccc0c8cdc780400109929998199814181a1baa001133037337606ea4024c0e0c0d4dd5000802080219299981998140008a60103d87a80001301d33037375000297ae03370000e00226606c66ec0dd48011ba800133006006003375a60660066eb8c0c4008c0d4008c0cc004dd718158009bad302c001302e00230270022323300100100222533302200114bd6f7b6300999119191999804001801000911319190011919198008008019129998148008a4c264a6660540022a66604e60086eb4c0a4c0b000852616132323232533302b337206eb8c0b0010dd718160018a9998159804000899803803998178018010b0b1bad302c003302f003302d002302c002302c001233302430190014a0944dd598120019bae3022002302400133002002302500122223233001001005225333024001133025337606ea4014dd300225eb7bdb1804c8c8c8c94ccc094cdc800480109981499bb037520126e9802001454ccc094cdc78048010992999813180d98139baa00113302a337606ea4028c0acc0a0dd5000802080219980380480400089981499bb037520046e98004cc01801800cdd598130019bae302400230280023026001301b375402a600860366ea8c004c06cdd5180f180d9baa0022301e301f00116323300100100722533301c00114c0103d87a800013232533301b3375e600c603a6ea80080484c014cc07c0092f5c02660080080026040004603c0026e9520002301b001375860326034603460346034603460340046eb0c060004c060c060008dd6180b00098091baa00d370e900211191980080080191198018009801001112999807980218081baa00213232323253330163019002133007003132325333015300a00113232533301a301d002132325333019300e00113232533301e302100213300f0011500416301f001301b37540062a66603260240022646464646464a666044604a0042a0102c6eb4c08c004c08c008dd6981080098108011bad301f001301b37540062c60326ea80085401058c06c004c05cdd50018a99980a98070008a99980c180b9baa003150021616301537540042a00a2c602e002602e004602a00260226ea80085888c94ccc03cc0100044c8c94ccc050c05c0085401058dd7180a80098089baa0031533300f300800113232533301430170021500416375c602a00260226ea800c58c03cdd50011b8748000c03cc040008c038004c028dd50011b874800858c02cc030008c028004c028008c020004c010dd50008a4c26cacae6955ceaab9e5573eae815d0aba21", - "hash": "6e95d24ab0579b9e44c7cd1c801e1527c63124cef086d39443696b6b" + "redeemer": { + "schema": {} + }, + "compiledCode": "590d3e01010032323232323232253330023232323232533233008300130093754004264664464646464646464a666024600e002264646464a666032603800426601200626601000244a66603600401026464660186eacc070008894ccc07c0084c014c0880184c8c8c8c010c094014dd698100011bae301e0013021002375c6034002603a0042c6eacc068004c068008c060004c050dd50068a99980918058008a99980a980a1baa00d00216153330123003001153330153014375401a0042c2c60246ea80304c8c8c8c8c8c8c8c94ccc060c034c064dd500089919191919191919191919191919192999813980e0010991991191919192999818981a0010992999819181a8020992999818181098189baa001132325333032302330333754002264a666066605060686ea800c4c8c8c8c94ccc0e8c0f40084cc0a800c4cc0a4004894ccc0f00084cc04c01c4c94ccc0e8cdd780419ba548008cc0f8018cc0f8dd30021981f0091981f1ba60114bd7008008a503301b3756604260766ea802ccc068dd59810981d9baa3021303b3754018603a020264646605a6eacc0f4008894ccc1000084c014c10c0184c8c8c8c010c118014dd698208011bae303f0013042002375c6076002607c0042c6eacc0ec004c0ec008c0e4004c0d4dd50018b181b981a1baa00116301430333754006606a60646ea800458c048c0c4dd5180b98189baa002163033003163032001375860620046eb0c0c0c0c4004cc0b8dd39980380c008998171ba7330080170114bd7018168009bab302d302e001302937540442a66604e6040004264646464a66605c60620042a66605c006264a666058603a605a6ea80044c8cc01c00454ccc0b4c088c0b8dd50008991991192999818981318191baa00113253330323300e01e375c606e60686ea80084004528198099980880f001980a8010b180b00118198009bab30333034001302f37540022646464666444646464a66606c6056606e6ea80044c8c94ccc0e0c0b4c0e4dd50008a99981c19198008009981e9ba90033303d303e303b375400497ae022533303d00114a026644a6660786603005000429444cc010010004dd7181f80098200008a99981c00288020a5014a02c603a00a6eb8c0ecc0e0dd50008b180d8029980b1980a010801180c1bab3039303a0053301533013020003301700230350033756606a004606a002606a0026068002605e6ea8004c0c4c0b8dd50008b180718169baa3013302d37540022c2c605e0026eb0c0b8008dd618169817000998159ba73300401500e3302b374e6600a02801c97ae0132323232533302e30310021533302e003132533302c301d302d3754002264a66605a604c605c6ea80044c8c8c8c8c8c8c8c94ccc0e0c0ec0084cc0a001c4cc09c014894ccc0e80084cc0a80144cc0a400c894ccc0f00084c8c8c94ccc0f0c0c4c0f4dd500089919299981f1819981f9baa0011533303e323300100133043375200666086608860826ea80092f5c044a66608600229444cc894ccc108cc0780b80084cc0100100045281bae304500130460011533303e005100414a0294058c08c02cdd71820981f1baa00116302100d3301c3301a027008301e00a3301b3301902600b301d005132323302d3756607a00444a6660800042600a608600c26464646008608c00a6eb4c104008dd7181f80098210011bae303b001303e002132323302b3756607600444a66607c0042600a608200c26464646008608800a6eb4c0fc008dd7181e80098200011bae3039001303c00216375660720026072004606e002606e0046eacc0d4004c0d4008c0cc004c0bcdd50008b181898171baa00116300e302d37546026605a6ea80045858c0bc004dd618170011bac302d302e0013302b374e6600802a01c660566e9ccc0140500392f5c04464a666052603c002264646464a666060606600426604000626603e00244a66606400401026464660466eacc0cc008894ccc0d80084c014c0e40184c8c8c8c010c0f0014dd6981b8011bae30350013038002375c606200260680042c6eacc0c4004c0c4008c0bc004c0acdd50018a999814981100089919191919191919299981a181b80109981200389981180291299981b00109981300289981280191299981c00100709919198149bab303900222533303c00213005303f006132323230043042005375a607a0046eb8c0ec004c0f8008dd7181b800981d00109919198139bab303700222533303a00213005303d006132323230043040005375a60760046eb8c0e4004c0f0008dd7181a800981c0010b1bab3035001303500230330013033002375660620026062004605e00260566ea800c58c0a4dd500118131baa02022323300100100322533302b00114a026644a66605466e3c0080145288998020020009bae302d001302e001223300400223375e602260506ea8c038c0a0dd50008011119801801119baf30103027375400200444646600200200644a666050002297ae0133225333027300500213302b00233004004001133004004001302a001302b00122323300100100322533302700114bd6f7b63009991299981319baf30113028375400400a26600e0026eacc038c0a0dd500108009814800998010011815000911919980080080180111129998138010800899199802002181580199998050011bae30260013756604e00244464a666052a66605800229445280a60103d87a8000130133302d374c00297ae032333001001003002222533302e0021001132332233300600630340053233001001005225333033001133034337606ea4010dd4001a5eb7bdb1804c8ccc8894ccc0d0cdc800400189981c19bb037520106ea001c01454ccc0d0cdc7804001899299981a9815181b1baa001133039337606ea4024c0e8c0dcdd5000801080119299981a98150008a60103d87a80001301f33039375000297ae03370000e00426607066ec0dd48019ba800233006006001375c60640026eb4c0cc004c0dc008c0d4004dd718168009bad302e00130300023029002223233001001323300100100322533302600114bd7009919991119198008008019129998160008801899198171ba73302e375200c6605c60560026605c605800297ae0330030033030002302e001375c604a0026eacc098004cc00c00cc0a8008c0a0004894ccc09400452889991299981219b89375a600e004664464a66604e604060506ea8004520001375a605860526ea8004c94ccc09cc080c0a0dd50008a6103d87a8000132330010013756605a60546ea8008894ccc0b0004530103d87a8000132333222533302d337220100062a66605a66e3c02000c4c05ccc0c4dd400125eb80530103d87a8000133006006001375c60560026eb4c0b0004c0c0008c0b8004c8cc004004024894ccc0ac0045300103d87a8000132333222533302c337220100062a66605866e3c02000c4c058cc0c0dd300125eb80530103d87a8000133006006001375c60540026eacc0ac004c0bc008c0b4004dd718078011bae300c00213300400400114a06eb0c09c004c0a00048c08cc090c0900048c8cc004004008894ccc08800452f5bded8c026644646466660100060046464006646600200200644a66605200229309929998150008a99981398021bad3029302c0021498584c8c8cccc88894ccc0b4cdc80020010a9998169805001899804804998188028008b0b1bae302a002375a60560046eb8c0a8004c0bc00cc0b4008c0b0008c0b00048ccc090c064005282512226375660480066eb8c088008c090004cc008008c0940048888c8cc004004014894ccc0900044cc094cdd81ba9005374c00897adef6c6013233322253330253372001200626605266ec0dd48049ba6008005153330253371e012006264a66604c6036604e6ea80044cc0a8cdd81ba900a302b30283754002004200466600e01201000426605266ec0dd48019ba600233006006001375c60460026eacc090004c0a0008c0980048c94ccc070c044c074dd500089803198101810980f1baa0014bd700a6103d87a80003006301d3754002600860366ea8c004c06cdd5180f180d9baa0022301e301f00116323300100100622533301c00114c103d87a800013322533301b3375e600c603a6ea80080484c014cc07c0092f5c0266008008002603c002603e0026e9520002301b001375860326034603460346034603460340066eb0c060008dd6180b801180b980b80098091baa00c370e900211191980080080191198018009801001112999807980218081baa0021323232325333016301900213300700313253330143009001132325333019301c0021325333017300c00113232533301c301f00213300d00100b16301d001301937540042a66602e60200022646464646464a666040604600401e2c6eb4c084004c084008dd6980f800980f8011bad301d001301937540042c602e6ea800458c068004c058dd50010a99980a18068008a99980b980b1baa0020061616301437540022c602e002602e004602a00260226ea80085888c94ccc03cc0100044c8c94ccc050c05c00801058dd7180a80098089baa0031533300f3008001132325333014301700200416375c602a00260226ea800c58c03cdd50011b8748000c038004c038c03c004c028dd50011b874800858c02cc03000cc028008c024008c024004c010dd50008a4c26cacae6955ceaab9e5573eae815d0aba21", + "hash": "65f421b9c27242c31b60abd8911cca590ab37f1b6d9b86cffdb5c947" } ], "definitions": { diff --git a/packages/mesh-contract/src/escrow/aiken-workspace-v2/validators/escrow.ak b/packages/mesh-contract/src/escrow/aiken-workspace-v2/validators/escrow.ak index 560925ecd..cf6046289 100644 --- a/packages/mesh-contract/src/escrow/aiken-workspace-v2/validators/escrow.ak +++ b/packages/mesh-contract/src/escrow/aiken-workspace-v2/validators/escrow.ak @@ -67,9 +67,17 @@ validator escrow { expect InlineDatum(raw_input_datum) = input.output.datum expect input_datum: EscrowDatum = raw_input_datum when input_datum is { - Initiation { initiator, .. } -> { + Initiation { initiator, initiator_assets } -> { expect Some(pub_key) = address_pub_key(initiator) - key_signed(extra_signatories, pub_key) + let is_initiator_signed = key_signed(extra_signatories, pub_key) + + let initiator_received = get_all_value_to(outputs, initiator) + let is_initiator_received_value = + value_geq( + initiator_received, + initiator_assets |> from_asset_list(), + ) + is_initiator_signed && is_initiator_received_value } ActiveEscrow {