From 3521a8c921e2f90e7d32dd835fef247b33b5541d Mon Sep 17 00:00:00 2001 From: KtorZ Date: Sun, 25 Aug 2024 17:12:36 +0200 Subject: [PATCH] Start adjusting acceptance tests to the new Plutus V3 syntax. --- examples/acceptance_tests/054/aiken.lock | 2 +- examples/acceptance_tests/055/aiken.lock | 2 +- examples/acceptance_tests/061/aiken.lock | 2 +- examples/acceptance_tests/063/aiken.lock | 2 +- examples/acceptance_tests/067/aiken.lock | 2 +- examples/acceptance_tests/068/aiken.lock | 2 +- examples/acceptance_tests/069/aiken.lock | 2 +- examples/acceptance_tests/070/aiken.lock | 2 +- examples/acceptance_tests/071/aiken.toml | 3 +- .../acceptance_tests/071/validators/spend.ak | 48 ++++++++----------- examples/acceptance_tests/072/aiken.lock | 2 +- examples/acceptance_tests/073/aiken.lock | 2 +- examples/acceptance_tests/074/aiken.lock | 2 +- examples/acceptance_tests/077/aiken.toml | 3 +- .../acceptance_tests/077/validators/spend.ak | 16 +++---- .../acceptance_tests/077/validators/spend2.ak | 19 +++++--- .../acceptance_tests/079/validators/foo.ak | 4 +- examples/acceptance_tests/082/aiken.lock | 2 +- examples/acceptance_tests/083/aiken.lock | 2 +- examples/acceptance_tests/084/aiken.lock | 2 +- examples/acceptance_tests/087/aiken.lock | 2 +- examples/acceptance_tests/088/aiken.lock | 2 +- examples/acceptance_tests/099/aiken.lock | 2 +- examples/acceptance_tests/101/aiken.lock | 4 +- examples/acceptance_tests/102/aiken.lock | 2 +- examples/acceptance_tests/104/aiken.lock | 4 +- examples/acceptance_tests/104/plutus.json | 23 +++++++-- .../acceptance_tests/104/validators/tests.ak | 8 ++-- 28 files changed, 88 insertions(+), 80 deletions(-) diff --git a/examples/acceptance_tests/054/aiken.lock b/examples/acceptance_tests/054/aiken.lock index ab10346d..b7148ea2 100644 --- a/examples/acceptance_tests/054/aiken.lock +++ b/examples/acceptance_tests/054/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158433, nanos_since_epoch = 380614000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596650, nanos_since_epoch = 294733000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/055/aiken.lock b/examples/acceptance_tests/055/aiken.lock index ea1d982e..f9af5e0e 100644 --- a/examples/acceptance_tests/055/aiken.lock +++ b/examples/acceptance_tests/055/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158435, nanos_since_epoch = 363713000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596651, nanos_since_epoch = 984539000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/061/aiken.lock b/examples/acceptance_tests/061/aiken.lock index e97629d8..9e34f1aa 100644 --- a/examples/acceptance_tests/061/aiken.lock +++ b/examples/acceptance_tests/061/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158434, nanos_since_epoch = 837171000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596658, nanos_since_epoch = 893017000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/063/aiken.lock b/examples/acceptance_tests/063/aiken.lock index dfc444cc..f2d9b2c4 100644 --- a/examples/acceptance_tests/063/aiken.lock +++ b/examples/acceptance_tests/063/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158435, nanos_since_epoch = 367316000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596651, nanos_since_epoch = 968695000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/067/aiken.lock b/examples/acceptance_tests/067/aiken.lock index 7025114f..3450439d 100644 --- a/examples/acceptance_tests/067/aiken.lock +++ b/examples/acceptance_tests/067/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158436, nanos_since_epoch = 571367000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596660, nanos_since_epoch = 748574000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/068/aiken.lock b/examples/acceptance_tests/068/aiken.lock index 673e5077..27ea9023 100644 --- a/examples/acceptance_tests/068/aiken.lock +++ b/examples/acceptance_tests/068/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158436, nanos_since_epoch = 551807000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596659, nanos_since_epoch = 760789000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/069/aiken.lock b/examples/acceptance_tests/069/aiken.lock index bef9546a..2c1d46e2 100644 --- a/examples/acceptance_tests/069/aiken.lock +++ b/examples/acceptance_tests/069/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158435, nanos_since_epoch = 941669000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596660, nanos_since_epoch = 681097000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/070/aiken.lock b/examples/acceptance_tests/070/aiken.lock index de287192..0d8de9c9 100644 --- a/examples/acceptance_tests/070/aiken.lock +++ b/examples/acceptance_tests/070/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158437, nanos_since_epoch = 43333000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596647, nanos_since_epoch = 155791000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/071/aiken.toml b/examples/acceptance_tests/071/aiken.toml index 1acf73dc..f6bcb889 100644 --- a/examples/acceptance_tests/071/aiken.toml +++ b/examples/acceptance_tests/071/aiken.toml @@ -1,7 +1,8 @@ name = "aiken-lang/acceptance_test_071" +plutusVersion = "v3" version = "0.0.0" [[dependencies]] name = 'aiken-lang/stdlib' -version = 'main' +version = 'v2' source = 'github' diff --git a/examples/acceptance_tests/071/validators/spend.ak b/examples/acceptance_tests/071/validators/spend.ak index 368a2d5a..0c38d12e 100644 --- a/examples/acceptance_tests/071/validators/spend.ak +++ b/examples/acceptance_tests/071/validators/spend.ak @@ -1,16 +1,16 @@ -use aiken/hash.{Blake2b_224, Hash} use aiken/interval.{Finite} use aiken/list use aiken/option -use aiken/transaction.{ - Datum, InlineDatum, Input, Mint, Output, OutputReference, ScriptContext, Spend, - Transaction, TransactionId, ValidityRange, +use cardano/assets.{ + AssetName, PolicyId, Value, add, flatten, from_asset, negate, quantity_of, } -use aiken/transaction/credential.{ +use cardano/credential.{ Address, Script, ScriptCredential, VerificationKey, VerificationKeyCredential, } -use aiken/transaction/value.{ - AssetName, PolicyId, Value, add, flatten, from_asset, negate, quantity_of, +use cardano/hash.{Blake2b_224, Hash} +use cardano/transaction.{ + Datum, InlineDatum, Input, Output, OutputReference, Transaction, + TransactionId, ValidityRange, } // Datum/Redeemer pool @@ -45,13 +45,13 @@ pub type CurrencySymbol { asset_name: AssetName, } -pub fn get_output(ctx: ScriptContext, address: Address) -> Option { - list.find(ctx.transaction.outputs, fn(output) { output.address == address }) +pub fn get_output(transaction: Transaction, address: Address) -> Option { + list.find(transaction.outputs, fn(output) { output.address == address }) } -pub fn get_input(ctx: ScriptContext, address: Address) -> Option { +pub fn get_input(transaction: Transaction, address: Address) -> Option { list.find( - ctx.transaction.inputs, + transaction.inputs, fn(input) { input.output.address == address }, ) } @@ -64,48 +64,40 @@ pub fn scripthash_address(scripthash: ByteArray) { } pub fn validate_pool_deposit( - ctx: ScriptContext, + transaction: Transaction, output_reference: OutputReference, datum: PoolDatum, redeemer: PoolDepositRedeemer, ) -> Bool { let validator_address = scripthash_address(#"ff") - expect Some(pool_output) = get_output(ctx, validator_address) - expect Some(pool_input) = get_input(ctx, validator_address) + expect Some(pool_output) = get_output(transaction, validator_address) + expect Some(pool_input) = get_input(transaction, validator_address) True } pub fn validate_pool_borrow( - ctx: ScriptContext, + transaction: Transaction, output_reference: OutputReference, datum: PoolDatum, redeemer: PoolBorrowRedeemer, ) -> Bool { let validator_address = scripthash_address(#"ff") - expect Some(pool_output) = get_output(ctx, validator_address) - expect Some(pool_input) = get_input(ctx, validator_address) + expect Some(pool_output) = get_output(transaction, validator_address) + expect Some(pool_input) = get_input(transaction, validator_address) True } validator { - fn pool_contract(datum: PoolDatum, redeemer: PoolRedeemer, ctx: ScriptContext) { + spend(datum: PoolDatum, redeemer: PoolRedeemer, output_ref: OutputReference, transaction: Transaction) { when redeemer.action is { PoolWithdraw(_) -> True PoolDeposit(pool_deposit_redeemer) -> - when ctx.purpose is { - Spend(output_ref) -> - validate_pool_deposit(ctx, output_ref, datum, pool_deposit_redeemer) - _ -> False - } + validate_pool_deposit(transaction, output_ref, datum, pool_deposit_redeemer) PoolBorrow(pool_borrow_redeemer) -> - when ctx.purpose is { - Spend(output_ref) -> - validate_pool_borrow(ctx, output_ref, datum, pool_borrow_redeemer) - _ -> False - } + validate_pool_borrow(transaction, output_ref, datum, pool_borrow_redeemer) } } } diff --git a/examples/acceptance_tests/072/aiken.lock b/examples/acceptance_tests/072/aiken.lock index a26c777c..066bafb7 100644 --- a/examples/acceptance_tests/072/aiken.lock +++ b/examples/acceptance_tests/072/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158434, nanos_since_epoch = 466737000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596656, nanos_since_epoch = 683898000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/073/aiken.lock b/examples/acceptance_tests/073/aiken.lock index ebd1a468..56b8c59e 100644 --- a/examples/acceptance_tests/073/aiken.lock +++ b/examples/acceptance_tests/073/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158432, nanos_since_epoch = 54533000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596654, nanos_since_epoch = 513356000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/074/aiken.lock b/examples/acceptance_tests/074/aiken.lock index 71a198e4..1f850b5d 100644 --- a/examples/acceptance_tests/074/aiken.lock +++ b/examples/acceptance_tests/074/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158437, nanos_since_epoch = 127361000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596654, nanos_since_epoch = 519690000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/077/aiken.toml b/examples/acceptance_tests/077/aiken.toml index 2175d45e..f9f4ad3c 100644 --- a/examples/acceptance_tests/077/aiken.toml +++ b/examples/acceptance_tests/077/aiken.toml @@ -1,7 +1,8 @@ name = "aiken-lang/acceptance_test_077" +plutusVersion = "v3" version = "0.0.0" [[dependencies]] name = 'aiken-lang/stdlib' -version = 'main' +version = 'v2' source = 'github' diff --git a/examples/acceptance_tests/077/validators/spend.ak b/examples/acceptance_tests/077/validators/spend.ak index 0902e6a9..582177e5 100644 --- a/examples/acceptance_tests/077/validators/spend.ak +++ b/examples/acceptance_tests/077/validators/spend.ak @@ -1,8 +1,7 @@ -use aiken/dict -use aiken/list.{find, foldr} -use aiken/transaction.{Input, - OutputReference, ScriptContext, Spend, Transaction} as tx -use aiken/transaction/value.{add, zero} +use aiken/collection/dict +use aiken/collection/list.{find, foldr} +use cardano/transaction.{Input, OutputReference, Transaction} as tx +use cardano/transaction/assets.{add, zero} type Action { Mint @@ -10,14 +9,11 @@ type Action { } validator(token_name: ByteArray, utxo_ref: OutputReference) { - fn gift_card(rdmr: Action, ctx: ScriptContext) -> Bool { - let ScriptContext { transaction, purpose } = ctx - expect tx.Mint(policy_id) = purpose + mint(rdmr: Action, policy_id: PolicyId, transaction: Transaction) -> Bool { let Transaction { inputs, mint, .. } = transaction expect [Pair(asset_name, amount)] = mint - |> value.from_minted_value - |> value.tokens(policy_id) + |> assets.tokens(policy_id) |> dict.to_pairs() when rdmr is { Mint -> { diff --git a/examples/acceptance_tests/077/validators/spend2.ak b/examples/acceptance_tests/077/validators/spend2.ak index 1e84d996..c5b00759 100644 --- a/examples/acceptance_tests/077/validators/spend2.ak +++ b/examples/acceptance_tests/077/validators/spend2.ak @@ -1,15 +1,20 @@ -use aiken/list -use aiken/transaction.{Output, ScriptContext} +use aiken/collection/list +use cardano/transaction.{Output, Transaction} validator { - fn backtrace(_datum: Void, _redeemer: Void, context: ScriptContext) -> Bool { - expect Some(_) = list.find(context.transaction.outputs, fn(_) { True }) - let _ = find_stuff(context) + spend( + _datum: Void, + _redeemer: Void, + _ref: Data, + transaction: Transaction, + ) -> Bool { + expect Some(_) = list.find(transaction.outputs, fn(_) { True }) + let _ = find_stuff(transaction) True } } -fn find_stuff(context: ScriptContext) -> Output { - expect Some(stuff) = list.find(context.transaction.outputs, fn(_) { True }) +fn find_stuff(transaction: Transaction) -> Output { + expect Some(stuff) = list.find(transaction.outputs, fn(_) { True }) stuff } diff --git a/examples/acceptance_tests/079/validators/foo.ak b/examples/acceptance_tests/079/validators/foo.ak index 0889e994..a4827bed 100644 --- a/examples/acceptance_tests/079/validators/foo.ak +++ b/examples/acceptance_tests/079/validators/foo.ak @@ -1,9 +1,9 @@ validator { - fn spend(datum: Int, redeemer: Int, _context: Data) { + fn spend(datum: Int, redeemer: Int, _ref: Data, _transaction: Data) { datum + redeemer == 42 } - fn mint(redeemer: Int, _context: Data) { + fn mint(redeemer: Int, _policy: ByteArray, _transaction: Data) { redeemer == 42 } } diff --git a/examples/acceptance_tests/082/aiken.lock b/examples/acceptance_tests/082/aiken.lock index 46af44a9..375c9257 100644 --- a/examples/acceptance_tests/082/aiken.lock +++ b/examples/acceptance_tests/082/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158431, nanos_since_epoch = 785683000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596649, nanos_since_epoch = 139799000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/083/aiken.lock b/examples/acceptance_tests/083/aiken.lock index 55a88468..133e4e65 100644 --- a/examples/acceptance_tests/083/aiken.lock +++ b/examples/acceptance_tests/083/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158433, nanos_since_epoch = 377116000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596646, nanos_since_epoch = 924702000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/084/aiken.lock b/examples/acceptance_tests/084/aiken.lock index 3df326f9..455c4b77 100644 --- a/examples/acceptance_tests/084/aiken.lock +++ b/examples/acceptance_tests/084/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158433, nanos_since_epoch = 339674000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596647, nanos_since_epoch = 226716000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/087/aiken.lock b/examples/acceptance_tests/087/aiken.lock index c422013d..6efd55bd 100644 --- a/examples/acceptance_tests/087/aiken.lock +++ b/examples/acceptance_tests/087/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158435, nanos_since_epoch = 341686000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596654, nanos_since_epoch = 519706000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/088/aiken.lock b/examples/acceptance_tests/088/aiken.lock index bf6a6289..87cf662c 100644 --- a/examples/acceptance_tests/088/aiken.lock +++ b/examples/acceptance_tests/088/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158431, nanos_since_epoch = 948979000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596656, nanos_since_epoch = 683917000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/099/aiken.lock b/examples/acceptance_tests/099/aiken.lock index 58c9fa00..7b43a664 100644 --- a/examples/acceptance_tests/099/aiken.lock +++ b/examples/acceptance_tests/099/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158436, nanos_since_epoch = 95704000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596652, nanos_since_epoch = 132897000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/101/aiken.lock b/examples/acceptance_tests/101/aiken.lock index da2cd68d..9d239801 100644 --- a/examples/acceptance_tests/101/aiken.lock +++ b/examples/acceptance_tests/101/aiken.lock @@ -24,5 +24,5 @@ requirements = [] source = "github" [etags] -"aiken-lang/fuzz@main" = [{ secs_since_epoch = 1723158434, nanos_since_epoch = 581622000 }, "24d601fa19a2002318495bbb8562b9677563ca1b5c03126d6b093a65df076bef"] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158434, nanos_since_epoch = 474753000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/fuzz@main" = [{ secs_since_epoch = 1724596654, nanos_since_epoch = 381692000 }, "24d601fa19a2002318495bbb8562b9677563ca1b5c03126d6b093a65df076bef"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596653, nanos_since_epoch = 898649000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/102/aiken.lock b/examples/acceptance_tests/102/aiken.lock index 460ae0a3..4137280f 100644 --- a/examples/acceptance_tests/102/aiken.lock +++ b/examples/acceptance_tests/102/aiken.lock @@ -13,4 +13,4 @@ requirements = [] source = "github" [etags] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158431, nanos_since_epoch = 792706000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724596646, nanos_since_epoch = 86095000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/104/aiken.lock b/examples/acceptance_tests/104/aiken.lock index 952e6b14..e92c9c18 100644 --- a/examples/acceptance_tests/104/aiken.lock +++ b/examples/acceptance_tests/104/aiken.lock @@ -24,5 +24,5 @@ requirements = [] source = "github" [etags] -"aiken-lang/fuzz@main" = [{ secs_since_epoch = 1723158432, nanos_since_epoch = 675720000 }, "24d601fa19a2002318495bbb8562b9677563ca1b5c03126d6b093a65df076bef"] -"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1723158432, nanos_since_epoch = 474723000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] +"aiken-lang/fuzz@main" = [{ secs_since_epoch = 1724597285, nanos_since_epoch = 266243000 }, "24d601fa19a2002318495bbb8562b9677563ca1b5c03126d6b093a65df076bef"] +"aiken-lang/stdlib@main" = [{ secs_since_epoch = 1724597284, nanos_since_epoch = 808906000 }, "5e58899446492a704d0927a43299139856bef746e697b55895ba34206fa28452"] diff --git a/examples/acceptance_tests/104/plutus.json b/examples/acceptance_tests/104/plutus.json index ddb8f0bd..f0ded790 100644 --- a/examples/acceptance_tests/104/plutus.json +++ b/examples/acceptance_tests/104/plutus.json @@ -6,15 +6,15 @@ "plutusVersion": "v2", "compiler": { "name": "Aiken", - "version": "v1.0.31-alpha+6e4a16d" + "version": "v1.0.31-alpha+0c9ea19" }, "license": "Apache-2.0" }, "validators": [ { - "title": "tests.foo_3", + "title": "tests.foo_3.mint", "redeemer": { - "title": "_data", + "title": "_redeemer", "schema": { "$ref": "#/definitions/Data" } @@ -27,8 +27,21 @@ } } ], - "compiledCode": "582401000032323222253330043370e6eb4c018c014dd5001a400429309b2b2b9a5573cae841", - "hash": "047dafbc61fb4a550a28398bde3680c48ff2000cf1022efc883124cd" + "compiledCode": "58670100003232323232225333003323232323253330083370e900018049baa0011323370e6eb4c030c02cdd5004240046eb8c02cc028dd500089931bad300b300a375400e6014601600460120026012004600e002600a6ea8004526136565734aae7555cf2ba15745", + "hash": "8d14659c82f8f0a1281c561b563283c30c43546d4215c9acafa78edf" + }, + { + "title": "tests.foo_3.else", + "parameters": [ + { + "title": "th_arg", + "schema": { + "$ref": "#/definitions/tests~1Foo" + } + } + ], + "compiledCode": "58670100003232323232225333003323232323253330083370e900018049baa0011323370e6eb4c030c02cdd5004240046eb8c02cc028dd500089931bad300b300a375400e6014601600460120026012004600e002600a6ea8004526136565734aae7555cf2ba15745", + "hash": "8d14659c82f8f0a1281c561b563283c30c43546d4215c9acafa78edf" } ], "definitions": { diff --git a/examples/acceptance_tests/104/validators/tests.ak b/examples/acceptance_tests/104/validators/tests.ak index f8f3582e..5f756930 100644 --- a/examples/acceptance_tests/104/validators/tests.ak +++ b/examples/acceptance_tests/104/validators/tests.ak @@ -1,6 +1,6 @@ use aiken/fuzz -type Foo { +pub type Foo { a0: Int, a1: Bool, } @@ -17,8 +17,8 @@ fn foo_2(Foo { a0, a1 } as foo) -> Int { } } -validator(Foo { a0, .. }: Foo) { - fn foo_3(_data, _redeemer) { +validator foo_3(Foo { a0, .. }: Foo) { + mint(_redeemer, _policy_, _tx) { a0 == 1 } } @@ -32,7 +32,7 @@ test example_2() { } test example_3() { - foo_3(Foo { a0: 1, a1: False }, "", "") + foo_3_mint(Foo { a0: 1, a1: False }, "", "", "") } test example_4() {