Merge branch 'main' into lang

.github/workflows/deploy_book.yml

@@ -0,0 +1,30 @@
+name: github pages
+
+on:
+  push:
+    branches:
+      - main
+      - book
+  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: 'latest'
+
+      - run: cd book && 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

Cargo.lock

@@ -24,7 +24,7 @@ dependencies = [
 
 [[package]]
 name = "aiken"
-version = "0.0.13"
+version = "0.0.14"
 dependencies = [
  "anyhow",
  "clap",
@@ -849,7 +849,7 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
 [[package]]
 name = "uplc"
-version = "0.0.13"
+version = "0.0.14"
 dependencies = [
  "anyhow",
  "cryptoxide",

book/.gitignore

@@ -0,0 +1 @@
+book

book/book.toml

@@ -0,0 +1,6 @@
+[book]
+authors = ["Ch1n3du"]
+language = "en"
+multilingual = false
+src = "src"
+title = "The Aiken Programming Language"

book/src/SUMMARY.md

@@ -0,0 +1,3 @@
+# Summary
+
+- [Chapter 1](./chapter_1.md)

book/src/chapter_1.md

@@ -0,0 +1 @@
+# Chapter 1

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" }

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"

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