Compare commits

..

10 Commits

Author SHA1 Message Date
waalge b9d79a83bb chore: rm unused pub function 2023-08-28 21:56:01 +00:00
waalge fe46f7ba7c fix: rename assert to expect 2023-08-28 21:55:34 +00:00
rvcas 1715496d5b
chore: update resolver in virtual workspace 2023-08-24 15:51:39 -06:00
rvcas 0e7f1597bf
chore: add release instructions in contributing.md 2023-08-24 15:43:26 -06:00
rvcas b075d85b40
chore: Release 2023-08-24 15:05:12 -06:00
rvcas b3494a7f63
chore: fix versions 2023-08-24 15:04:52 -06:00
rvcas a7062ccb88
chore: fix versions 2023-08-24 15:04:19 -06:00
rvcas 747e057d05
fix: tags 2023-08-24 15:00:09 -06:00
KtorZ 379368c530
Fix clippy. 2023-08-22 13:30:30 +02:00
KtorZ 2f0211a7b1
Bump all version manually because cargo workspaces didn't work. 2023-08-22 13:27:10 +02:00
12 changed files with 62 additions and 54 deletions

View File

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

View File

@ -71,14 +71,36 @@
Want to give some financial support? Have a look at the ways to sponsor below for more details.
- [rvcas](https://github.com/sponsors/rvcas/)
- [microproofs](https://github.com/sponsors/microproofs/)
- [rvcas](https://github.com/sponsors/rvcas)
- [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

10
Cargo.lock generated vendored
View File

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

View File

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

View File

@ -1,7 +1,7 @@
[package]
name = "aiken-lang"
description = "The Aiken compiler"
version = "1.0.15-alpha"
version = "1.0.16-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.15-alpha" }
uplc = { path = '../uplc', version = "1.0.16-alpha" }
num-bigint = "0.4.3"
[target.'cfg(not(target_family="wasm"))'.dependencies]

View File

@ -1,6 +1,6 @@
[package]
name = "aiken-lsp"
version = "1.0.15-alpha"
version = "1.0.16-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.15-alpha" }
aiken-project = { path = '../aiken-project', version = "1.0.15-alpha" }
aiken-lang = { path = '../aiken-lang', version = "1.0.16-alpha" }
aiken-project = { path = '../aiken-project', version = "1.0.16-alpha" }

View File

@ -1,7 +1,7 @@
[package]
name = "aiken-project"
description = "Aiken project utilities"
version = "1.0.15-alpha"
version = "1.0.16-alpha"
edition = "2021"
repository = "https://github.com/aiken-lang/aiken/crates/project"
homepage = "https://github.com/aiken-lang/aiken"
@ -42,9 +42,8 @@ toml = "0.7.2"
walkdir = "2.3.2"
zip = "0.6.4"
aiken-lang = { path = "../aiken-lang", version = "1.0.15-alpha" }
uplc = { path = '../uplc', version = "1.0.15-alpha" }
aiken-lang = { path = "../aiken-lang", version = "1.0.16-alpha" }
uplc = { path = '../uplc', version = "1.0.16-alpha" }
[dev-dependencies]
proptest = "1.1.0"

View File

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

View File

@ -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<()> {

View File

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

View File

@ -1,7 +1,7 @@
[package]
name = "uplc"
description = "Utilities for working with Untyped Plutus Core"
version = "1.0.15-alpha"
version = "1.0.16-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.15-alpha" }
flat-rs = { path = "../flat-rs", version = "1.0.16-alpha" }
[target.'cfg(not(target_family="wasm"))'.dependencies]
secp256k1 = { version = "0.26.0" }

View File

@ -378,27 +378,4 @@ 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),
)
}
}