CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## v1.0.16-alpha - 2023-08-24
+## v1.0.16-alpha - 2023-08-22
 
 ### Removed
 

CONTRIBUTING.md

@@ -71,36 +71,14 @@
 
    Want to give some financial support? Have a look at the ways to sponsor below for more details.
 
-   - [rvcas](https://github.com/sponsors/rvcas)
+   - [rvcas](https://github.com/sponsors/rvcas/)
-   - [microproofs](https://github.com/sponsors/microproofs)
+   - [microproofs](https://github.com/sponsors/microproofs/)
-   - [ktorz](https://github.com/sponsors/KtorZ)
 
    Want to support with crypto?
 
    - Our Ada address is `addr1q83nlzwu4zjeu927m8t24xa68upgmwgt5w29ww5ka695hc5rez2r4q7gcvj7z0ma6d88w3j220szsqk05sn43ghcsn4szvuklq`
    - Our Ada handle is `$aiken_lang`
 
-## Releasing
-
-To be able to create a release you need to be on the [maintainers](https://github.com/orgs/aiken-lang/teams/maintainers) team.
-This means that only core team members can create releases. We have a
-[github action](https://github.com/aiken-lang/aiken/blob/main/.github/workflows/release.yml) for creating the binaries and a github release.
-The process follows these steps:
-
-1. `cargo release --execute`
-2. After a release is created by the github action fill in the release notes. Try to tag contributors so that they show up in the release.
-3. Screenshot the result of `aikup` and post on twitter saying "We've just released vx.x.x". [example](https://twitter.com/aiken_eng/status/1693084816931987930?s=20)
-
-> `cargo release` takes arguments and flags to tell it how to bump the version number. Examples include `cargo release 1.0.16-alpha` and `cargo release major`.
->
-> The root `Cargo.toml` in the repo contains this configuration for `cargo release`:
->
-> ```toml
-> [workspace.metadata.release]
-> shared-version = true
-> tag-name = "v{{version}}"
-> ```
-
 ## About Issues
 
 ### :bug: How To Report A Bug

Cargo.lock

@@ -81,7 +81,7 @@ dependencies = [
 
 [[package]]
 name = "aiken-lang"
-version = "1.0.16-alpha"
+version = "1.0.15-alpha"
 dependencies = [
  "chumsky",
  "hex",
@@ -102,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "aiken-lsp"
-version = "1.0.16-alpha"
+version = "1.0.15-alpha"
 dependencies = [
  "aiken-lang",
  "aiken-project",
@@ -123,7 +123,7 @@ dependencies = [
 
 [[package]]
 name = "aiken-project"
-version = "1.0.16-alpha"
+version = "1.0.15-alpha"
 dependencies = [
  "aiken-lang",
  "askama",
@@ -858,7 +858,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flat-rs"
-version = "1.0.16-alpha"
+version = "1.0.15-alpha"
 dependencies = [
  "anyhow",
  "proptest",
@@ -2992,7 +2992,7 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
 [[package]]
 name = "uplc"
-version = "1.0.16-alpha"
+version = "1.0.15-alpha"
 dependencies = [
  "anyhow",
  "cryptoxide",

Cargo.toml

@@ -1,6 +1,5 @@
 [workspace]
 members = ["crates/*"]
-resolver = "2"
 
 [profile.release]
 strip = true

crates/aiken-lang/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "aiken-lang"
 description = "The Aiken compiler"
-version = "1.0.16-alpha"
+version = "1.0.15-alpha"
 edition = "2021"
 repository = "https://github.com/aiken-lang/aiken"
 homepage = "https://github.com/aiken-lang/aiken"
@@ -24,7 +24,7 @@ owo-colors = { version = "3.5.0", features = ["supports-colors"] }
 strum = "0.24.1"
 thiserror = "1.0.39"
 vec1 = "1.10.1"
-uplc = { path = '../uplc', version = "1.0.16-alpha" }
+uplc = { path = '../uplc', version = "1.0.15-alpha" }
 num-bigint = "0.4.3"
 
 [target.'cfg(not(target_family="wasm"))'.dependencies]

crates/aiken-lsp/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aiken-lsp"
-version = "1.0.16-alpha"
+version = "1.0.15-alpha"
 edition = "2021"
 description = "Cardano smart contract language and toolchain"
 repository = "https://github.com/aiken-lang/aiken"
@@ -24,5 +24,5 @@ tracing = "0.1.37"
 url = "2.3.1"
 urlencoding = "2.1.2"
 
-aiken-lang = { path = '../aiken-lang', version = "1.0.16-alpha" }
+aiken-lang = { path = '../aiken-lang', version = "1.0.15-alpha" }
-aiken-project = { path = '../aiken-project', version = "1.0.16-alpha" }
+aiken-project = { path = '../aiken-project', version = "1.0.15-alpha" }

crates/aiken-project/Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "aiken-project"
 description = "Aiken project utilities"
-version = "1.0.16-alpha"
+version = "1.0.15-alpha"
 edition = "2021"
 repository = "https://github.com/aiken-lang/aiken/crates/project"
 homepage = "https://github.com/aiken-lang/aiken"
 license = "Apache-2.0"
 authors = [
-  "Lucas Rosa <x@rvcas.dev>",
+    "Lucas Rosa <x@rvcas.dev>",
-  "Kasey White <kwhitemsg@gmail.com>",
+    "Kasey White <kwhitemsg@gmail.com>",
-  "KtorZ <matthias.benkort@gmail.com>",
+    "KtorZ <matthias.benkort@gmail.com>",
 ]
 rust-version = "1.66.1"
 
@@ -42,8 +42,9 @@ toml = "0.7.2"
 walkdir = "2.3.2"
 zip = "0.6.4"
 
-aiken-lang = { path = "../aiken-lang", version = "1.0.16-alpha" }
+aiken-lang = { path = "../aiken-lang", version = "1.0.15-alpha" }
-uplc = { path = '../uplc', version = "1.0.16-alpha" }
+uplc = { path = '../uplc', version = "1.0.15-alpha" }
+
 
 [dev-dependencies]
 proptest = "1.1.0"

crates/aiken/Cargo.toml

@@ -6,22 +6,13 @@ edition = "2021"
 repository = "https://github.com/aiken-lang/aiken"
 homepage = "https://github.com/aiken-lang/aiken"
 license = "Apache-2.0"
-authors = [
+authors = ["Lucas Rosa <x@rvcas.dev>", "Kasey White <kwhitemsg@gmail.com>", "KtorZ <matthias.benkort@gmail.com>"]
-  "Lucas Rosa <x@rvcas.dev>",
-  "Kasey White <kwhitemsg@gmail.com>",
-  "KtorZ <matthias.benkort@gmail.com>",
-]
 rust-version = "1.66.1"
 build = "build.rs"
 
 [dependencies]
 anyhow = "1.0.69"
-clap = { version = "4.1.8", features = [
+clap = { version = "4.1.8", features = ["derive", "wrap_help", "unicode", "string"] }
-  "derive",
-  "wrap_help",
-  "unicode",
-  "string",
-] }
 hex = "0.4.3"
 ignore = "0.4.20"
 indoc = "2.0"
@@ -36,10 +27,10 @@ regex = "1.7.1"
 serde_json = "1.0.94"
 thiserror = "1.0.39"
 
-aiken-lang = { path = "../aiken-lang", version = "1.0.16-alpha" }
+aiken-lang = { path = "../aiken-lang", version = "1.0.15-alpha" }
-aiken-lsp = { path = "../aiken-lsp", version = "1.0.16-alpha" }
+aiken-lsp = { path = "../aiken-lsp", version = "1.0.15-alpha" }
-aiken-project = { path = '../aiken-project', version = "1.0.16-alpha" }
+aiken-project = { path = '../aiken-project', version = "1.0.15-alpha" }
-uplc = { path = '../uplc', version = "1.0.16-alpha" }
+uplc = { path = '../uplc', version = "1.0.15-alpha" }
 clap_complete = "4.3.2"
 inquire = "0.6.2"
 num-bigint = "0.4.3"

crates/aiken/src/cmd/new.rs

@@ -98,12 +98,12 @@ fn print_success_message(package_name: &PackageName) {
 
 fn create_lib(root: &Path, package_name: &PackageName) -> miette::Result<()> {
     let lib = root.join("lib").join(&package_name.repo);
-    fs::create_dir_all(lib).into_diagnostic()
+    fs::create_dir_all(&lib).into_diagnostic()
 }
 
 fn create_validators(root: &Path) -> miette::Result<()> {
     let validators = root.join("validators");
-    fs::create_dir_all(validators).into_diagnostic()
+    fs::create_dir_all(&validators).into_diagnostic()
 }
 
 fn readme(root: &Path, project_name: &str) -> miette::Result<()> {

crates/flat-rs/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "flat-rs"
 description = "Flat codec"
-version = "1.0.16-alpha"
+version = "1.0.15-alpha"
 edition = "2021"
 repository = "https://github.com/aiken-lang/aiken/crates/flat"
 homepage = "https://github.com/aiken-lang/aiken"

crates/uplc/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "uplc"
 description = "Utilities for working with Untyped Plutus Core"
-version = "1.0.16-alpha"
+version = "1.0.15-alpha"
 edition = "2021"
 repository = "https://github.com/aiken-lang/aiken/crates/uplc"
 homepage = "https://github.com/aiken-lang/aiken"
@@ -33,7 +33,7 @@ serde_json = "1.0.94"
 strum = "0.24.1"
 strum_macros = "0.24.3"
 thiserror = "1.0.39"
-flat-rs = { path = "../flat-rs", version = "1.0.16-alpha" }
+flat-rs = { path = "../flat-rs", version = "1.0.15-alpha" }
 
 [target.'cfg(not(target_family="wasm"))'.dependencies]
 secp256k1 = { version = "0.26.0" }

crates/uplc/src/builder.rs

@@ -378,4 +378,27 @@ impl Term<Name> {
                     .lambda(CONSTR_GET_FIELD),
             )
     }
+
+    pub fn assert_on_list(self) -> Self {
+        self.lambda(EXPECT_ON_LIST)
+            .apply(Term::var(EXPECT_ON_LIST).apply(Term::var(EXPECT_ON_LIST)))
+            .lambda(EXPECT_ON_LIST)
+            .apply(
+                Term::var("__list_to_check")
+                    .delayed_choose_list(
+                        Term::unit(),
+                        Term::var("__check_with")
+                            .apply(Term::head_list().apply(Term::var("__list_to_check")))
+                            .choose_unit(
+                                Term::var(EXPECT_ON_LIST)
+                                    .apply(Term::var(EXPECT_ON_LIST))
+                                    .apply(Term::tail_list().apply(Term::var("__list_to_check")))
+                                    .apply(Term::var("__check_with")),
+                            ),
+                    )
+                    .lambda("__check_with")
+                    .lambda("__list_to_check")
+                    .lambda(EXPECT_ON_LIST),
+            )
+    }
 }