From 5ec991d83a4a6ca4274e61d683e3e90407d5a039 Mon Sep 17 00:00:00 2001 From: alessandrokonrad Date: Sun, 25 Sep 2022 23:11:17 +0200 Subject: [PATCH 01/10] fixed error handling in eval raw --- crates/uplc/src/tx.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/uplc/src/tx.rs b/crates/uplc/src/tx.rs index 8996efd0..1030742d 100644 --- a/crates/uplc/src/tx.rs +++ b/crates/uplc/src/tx.rs @@ -116,7 +116,7 @@ pub fn eval_phase_two_raw( .iter() .map(|r| r.encode_fragment().unwrap()) .collect()), - Err(_) => Err(Error::NoRedeemers), + Err(err) => Err(err), } } // MultiEraTx::AlonzoCompatible(tx, _) => match eval_tx(&tx, &utxos, &sc) { From e817b39e4c74e0136efa22edf00928f6a193238a Mon Sep 17 00:00:00 2001 From: rvcas Date: Mon, 26 Sep 2022 09:59:28 -0400 Subject: [PATCH 02/10] Release 0.0.14 aiken@0.0.14 uplc@0.0.14 Generated by cargo-workspaces --- Cargo.lock | 4 ++-- crates/cli/Cargo.toml | 4 ++-- crates/uplc/Cargo.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 32cf5b85..057e4f46 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "aiken" -version = "0.0.13" +version = "0.0.14" dependencies = [ "anyhow", "clap", @@ -674,7 +674,7 @@ checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" [[package]] name = "uplc" -version = "0.0.13" +version = "0.0.14" dependencies = [ "anyhow", "cryptoxide", diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 6208b13a..10e29dd3 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aiken" description = "Cardano smart contract language and toolchain" -version = "0.0.13" +version = "0.0.14" edition = "2021" repository = "https://github.com/txpipe/aiken" homepage = "https://github.com/txpipe/aiken" @@ -21,4 +21,4 @@ pallas-primitives = "0.14.0-alpha.3" pallas-traverse = "0.14.0-alpha.3" serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.85" -uplc = { path = '../uplc', version = "0.0.13" } +uplc = { path = '../uplc', version = "0.0.14" } diff --git a/crates/uplc/Cargo.toml b/crates/uplc/Cargo.toml index a3a4131a..2075b727 100644 --- a/crates/uplc/Cargo.toml +++ b/crates/uplc/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "uplc" description = "Utilities for working with Untyped Plutus Core" -version = "0.0.13" +version = "0.0.14" edition = "2021" repository = "https://github.com/txpipe/aiken/crates/uplc" homepage = "https://github.com/txpipe/aiken" From c42b75def813b3d87ad08981f4943589091d3913 Mon Sep 17 00:00:00 2001 From: Ch1n3du Date: Mon, 26 Sep 2022 14:24:16 +0100 Subject: [PATCH 03/10] feat: Added skeleton and gh action for mdbook --- .github/workflows/mdbook.yml | 30 ++++++++++++++++++++++++++++++ book/book.toml | 6 ++++++ book/src/SUMMARY.md | 3 +++ book/src/chapter_1.md | 1 + 4 files changed, 40 insertions(+) create mode 100644 .github/workflows/mdbook.yml create mode 100644 book/book.toml create mode 100644 book/src/SUMMARY.md create mode 100644 book/src/chapter_1.md diff --git a/.github/workflows/mdbook.yml b/.github/workflows/mdbook.yml new file mode 100644 index 00000000..4a4fbf37 --- /dev/null +++ b/.github/workflows/mdbook.yml @@ -0,0 +1,30 @@ +name: github pages + +on: + push: + branches: + - main + pull_request: + +jobs: + deploy: + runs-on: ubuntu-20.04 + concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + steps: + - uses: actions/checkout@v2 + + - name: Setup mdBook + uses: peaceiris/actions-mdbook@v1 + with: + mdbook-version: '0.4.10' + # mdbook-version: 'latest' + + - run: mdbook build + + - name: Deploy + uses: peaceiris/actions-gh-pages@v3 + if: ${{ github.ref == 'refs/heads/main' }} + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./book \ No newline at end of file diff --git a/book/book.toml b/book/book.toml new file mode 100644 index 00000000..7d9bc99d --- /dev/null +++ b/book/book.toml @@ -0,0 +1,6 @@ +[book] +authors = ["Ch1n3du"] +language = "en" +multilingual = false +src = "src" +title = "The Aiken Programming Language" diff --git a/book/src/SUMMARY.md b/book/src/SUMMARY.md new file mode 100644 index 00000000..7390c828 --- /dev/null +++ b/book/src/SUMMARY.md @@ -0,0 +1,3 @@ +# Summary + +- [Chapter 1](./chapter_1.md) diff --git a/book/src/chapter_1.md b/book/src/chapter_1.md new file mode 100644 index 00000000..b743fda3 --- /dev/null +++ b/book/src/chapter_1.md @@ -0,0 +1 @@ +# Chapter 1 From 71dbb3ad442e4fe68d094099e87168bc54799518 Mon Sep 17 00:00:00 2001 From: Ch1n3du Date: Mon, 26 Sep 2022 14:31:21 +0100 Subject: [PATCH 04/10] chore: Fixed some ci issues --- .github/workflows/{mdbook.yml => deploy_book.yml} | 1 + book/.gitignore | 1 + 2 files changed, 2 insertions(+) rename .github/workflows/{mdbook.yml => deploy_book.yml} (96%) create mode 100644 book/.gitignore diff --git a/.github/workflows/mdbook.yml b/.github/workflows/deploy_book.yml similarity index 96% rename from .github/workflows/mdbook.yml rename to .github/workflows/deploy_book.yml index 4a4fbf37..5d5b74e2 100644 --- a/.github/workflows/mdbook.yml +++ b/.github/workflows/deploy_book.yml @@ -20,6 +20,7 @@ jobs: mdbook-version: '0.4.10' # mdbook-version: 'latest' + - run: cd ./book - run: mdbook build - name: Deploy diff --git a/book/.gitignore b/book/.gitignore new file mode 100644 index 00000000..7585238e --- /dev/null +++ b/book/.gitignore @@ -0,0 +1 @@ +book From 393d6f91b322a3c504c66408324458dff0fa3847 Mon Sep 17 00:00:00 2001 From: Ch1n3du Date: Mon, 26 Sep 2022 14:33:46 +0100 Subject: [PATCH 05/10] chore: Fixed some ci issues --- .github/workflows/deploy_book.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/deploy_book.yml b/.github/workflows/deploy_book.yml index 5d5b74e2..81884c3f 100644 --- a/.github/workflows/deploy_book.yml +++ b/.github/workflows/deploy_book.yml @@ -20,7 +20,6 @@ jobs: mdbook-version: '0.4.10' # mdbook-version: 'latest' - - run: cd ./book - run: mdbook build - name: Deploy @@ -28,4 +27,4 @@ jobs: if: ${{ github.ref == 'refs/heads/main' }} with: github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./book \ No newline at end of file + publish_dir: ./src/book \ No newline at end of file From d7c9fa0fd181115f30408f504a92d5570fce55af Mon Sep 17 00:00:00 2001 From: Ch1n3du Date: Mon, 26 Sep 2022 14:36:33 +0100 Subject: [PATCH 06/10] chore: Fixed some ci issues --- .github/workflows/deploy_book.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/deploy_book.yml b/.github/workflows/deploy_book.yml index 81884c3f..c8251c75 100644 --- a/.github/workflows/deploy_book.yml +++ b/.github/workflows/deploy_book.yml @@ -17,8 +17,7 @@ jobs: - name: Setup mdBook uses: peaceiris/actions-mdbook@v1 with: - mdbook-version: '0.4.10' - # mdbook-version: 'latest' + mdbook-version: 'latest' - run: mdbook build From af9474edf990b3cc83e28b48462c340835748faf Mon Sep 17 00:00:00 2001 From: Ch1n3du Date: Mon, 26 Sep 2022 14:39:48 +0100 Subject: [PATCH 07/10] chore: Fixed some ci issues --- .github/workflows/deploy_book.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy_book.yml b/.github/workflows/deploy_book.yml index c8251c75..2e991bc5 100644 --- a/.github/workflows/deploy_book.yml +++ b/.github/workflows/deploy_book.yml @@ -4,7 +4,10 @@ on: push: branches: - main + - book pull_request: + branches: + - main jobs: deploy: @@ -26,4 +29,4 @@ jobs: if: ${{ github.ref == 'refs/heads/main' }} with: github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./src/book \ No newline at end of file + publish_dir: ./book \ No newline at end of file From 8f8cae2775c3cc64cadf6096aba326549bef5591 Mon Sep 17 00:00:00 2001 From: Ch1n3du Date: Mon, 26 Sep 2022 14:40:42 +0100 Subject: [PATCH 08/10] chore: Fixed some ci issues --- .github/workflows/deploy_book.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/deploy_book.yml b/.github/workflows/deploy_book.yml index 2e991bc5..d201cef5 100644 --- a/.github/workflows/deploy_book.yml +++ b/.github/workflows/deploy_book.yml @@ -6,8 +6,6 @@ on: - main - book pull_request: - branches: - - main jobs: deploy: From 828b945c8e0abfced5b2f5e06e52fc36ee8bb8ec Mon Sep 17 00:00:00 2001 From: Ch1n3du Date: Mon, 26 Sep 2022 14:45:38 +0100 Subject: [PATCH 09/10] chore: Fixed some ci issues --- .github/workflows/deploy_book.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy_book.yml b/.github/workflows/deploy_book.yml index d201cef5..0660047e 100644 --- a/.github/workflows/deploy_book.yml +++ b/.github/workflows/deploy_book.yml @@ -20,6 +20,7 @@ jobs: with: mdbook-version: 'latest' + - run: ls - run: mdbook build - name: Deploy From 2a360ced3d6fb05eac0fb37bdaab13611b26ed01 Mon Sep 17 00:00:00 2001 From: Ch1n3du Date: Mon, 26 Sep 2022 14:55:48 +0100 Subject: [PATCH 10/10] chore: Fixed some ci issues --- .github/workflows/deploy_book.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/deploy_book.yml b/.github/workflows/deploy_book.yml index 0660047e..4068ec43 100644 --- a/.github/workflows/deploy_book.yml +++ b/.github/workflows/deploy_book.yml @@ -20,8 +20,7 @@ jobs: with: mdbook-version: 'latest' - - run: ls - - run: mdbook build + - run: cd book && mdbook build - name: Deploy uses: peaceiris/actions-gh-pages@v3