Skip to content

Commit fb79f26

Browse files
committed
Merge remote-tracking branch 'origin/master' into witness-builder
# Conflicts: # rust/pkg/cardano_serialization_lib.js.flow # rust/src/plutus.rs
2 parents 9180f8b + 3c958de commit fb79f26

16 files changed

+1863
-805
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Cardano Serialization Lib
22

3-
This is a library for serialization & deserialization of data structures used in Cardano's Haskell implementation of Shelley along with useful utility functions.
3+
This is a library, written in Rust, for serialization & deserialization of data structures used in Cardano's Haskell implementation of Alonzo along with useful utility functions.
44

55
##### NPM packages
66

README.rst

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Cardano Serialization Lib
22
=========================
33

44
This is a library for serialization & deserialization of data structures
5-
used in Cardano’s Haskell implementation of Shelley along with useful
5+
used in Cardano’s Haskell implementation of Alonzo along with useful
66
utility functions.
77

88
How can I use this library
@@ -63,11 +63,14 @@ Original binary specifications
6363

6464
Here are the location of the original `CDDL`_ specifications:
6565

66-
- Byron: `link`_
66+
- Alonzo:
67+
`link <https://github.com/input-output-hk/cardano-ledger/tree/master/eras/alonzo/test-suite/cddl-files>`__
6768
- Shelley:
68-
`link <https://github.com/input-output-hk/cardano-ledger-specs/tree/master/shelley/chain-and-ledger/shelley-spec-ledger-test/cddl-files>`__
69+
`link <https://github.com/input-output-hk/cardano-ledger/tree/master/eras/shelley/test-suite/cddl-files>`__
6970
- Mary:
70-
`link <https://github.com/input-output-hk/cardano-ledger-specs/tree/master/shelley-ma/shelley-ma-test/cddl-files>`__
71+
`link <https://github.com/input-output-hk/cardano-ledger/tree/master/eras/shelley-ma/test-suite/cddl-files>`__
72+
- Byron:
73+
`link <https://github.com/input-output-hk/cardano-ledger/tree/master/eras/byron/cddl-spec>`__
7174

7275
Building
7376
--------

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cardano-serialization-lib",
3-
"version": "9.1.2",
3+
"version": "10.0.0-beta.9",
44
"description": "(De)serialization functions for the Cardano blockchain along with related utility functions",
55
"scripts": {
66
"rust:build-nodejs": "(rimraf ./rust/pkg && cd rust; wasm-pack build --target=nodejs; wasm-pack pack) && npm run js:flowgen",

rust/Cargo.lock

Lines changed: 13 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name = "cardano-serialization-lib"
3-
version = "9.1.2"
3+
version = "10.0.0-beta.9"
44
edition = "2018"
55
authors = ["EMURGO"]
66
license = "MIT"
77
description = "(De)serialization functions for the Cardano blockchain along with related utility functions"
8-
documentation = "https://docs.cardano.org/projects/cardano-serialization-lib/en/latest/"
8+
documentation = "https://docs.cardano.org/cardano-components/cardano-serialization-lib"
99
repository = "https://github.com/Emurgo/cardano-serialization-lib"
1010
exclude = [
1111
"pkg/*",
@@ -40,7 +40,7 @@ noop_proc_macro = "0.3.0"
4040

4141
# wasm
4242
[target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies]
43-
wasm-bindgen = "=0.2.74"
43+
wasm-bindgen = "=0.2.78"
4444
rand_os = { version = "0.1", features = ["wasm-bindgen"] }
4545
js-sys = "=0.3.51"
4646

0 commit comments

Comments
 (0)