Skip to content

Commit 1c4e89e

Browse files
committed
Merge remote-tracking branch 'upstream/master' into fix-plutus-list-serialization
2 parents 6733358 + 6cbacd5 commit 1c4e89e

File tree

17 files changed

+1893
-445
lines changed

17 files changed

+1893
-445
lines changed

.github/workflows/pr-checks.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
types: [submitted]
66

77
jobs:
8-
test:
8+
test-and-build:
99
if: github.event.review && (github.event.review.state == 'approved' || contains(github.event.review.body, '/check'))
1010
runs-on: ubuntu-latest
1111
steps:
@@ -24,6 +24,11 @@ jobs:
2424
${{ runner.os }}-build-${{ env.cache-name }}-
2525
${{ runner.os }}-build-
2626
${{ runner.os }}-
27+
- name: prepare-rust
28+
run: |
29+
rustup install stable
30+
rustup target add wasm32-unknown-unknown --toolchain stable
31+
curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
2732
- name: install
2833
run: |
2934
npm install
@@ -33,3 +38,6 @@ jobs:
3338
- name: rust:build-nodejs
3439
run: |
3540
npm run rust:build-nodejs
41+
- name: rust:build-browser
42+
run: |
43+
npm run rust:build-browser

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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "cardano-serialization-lib",
3-
"version": "9.1.0",
3+
"version": "9.1.2",
44
"description": "(De)serialization functions for the Cardano blockchain along with related utility functions",
55
"scripts": {
6-
"rust:build-nodejs": "rimraf ./rust/pkg && cd rust; wasm-pack build --target=nodejs; wasm-pack pack; cd .. && npm run js:flowgen",
7-
"rust:build-browser": "rimraf ./rust/pkg && cd rust; wasm-pack build --target=browser; wasm-pack pack; cd .. && npm run js:flowgen",
8-
"rust:build-web": "rimraf ./rust/pkg && cd rust; wasm-pack build --target=web; wasm-pack pack; cd .. && npm run js:flowgen",
9-
"rust:build-asm": "rimraf ./rust/pkg && cd rust; wasm-pack build --target=browser --release; wasm-pack pack && npm run asm:build && npm run js:flowgen",
6+
"rust:build-nodejs": "(rimraf ./rust/pkg && cd rust; wasm-pack build --target=nodejs; wasm-pack pack) && npm run js:flowgen",
7+
"rust:build-browser": "(rimraf ./rust/pkg && cd rust; wasm-pack build --target=browser; wasm-pack pack) && npm run js:flowgen",
8+
"rust:build-web": "(rimraf ./rust/pkg && cd rust; wasm-pack build --target=web; wasm-pack pack) && npm run js:flowgen",
9+
"rust:build-asm": "(rimraf ./rust/pkg && cd rust; wasm-pack build --target=browser; wasm-pack pack) && npm run asm:build && npm run js:flowgen",
1010
"rust:publish": "cd rust && cargo publish && cd ../",
1111
"asm:build": "./binaryen/bin/wasm2js ./rust/pkg/cardano_serialization_lib_bg.wasm --output ./rust/pkg/cardano_serialization_lib.asm.js && node ./scripts/wasm-to-asm",
12-
"rust:test": "cd rust; cargo test; cd ..",
12+
"rust:test": "(cd rust; cargo test)",
1313
"js:flowgen": "flowgen ./rust/pkg/cardano_serialization_lib.d.ts -o ./rust/pkg/cardano_serialization_lib.js.flow --add-flow-header",
1414
"js:prepublish": "npm run rust:test && rimraf ./publish && cp -r ./rust/pkg ./publish && cp README.md publish/ && cp LICENSE publish/",
1515
"js:publish-nodejs": "npm run rust:build-nodejs && npm run js:prepublish && node ./scripts/publish-helper -nodejs && cd publish && npm publish --access public",

rust/Cargo.lock

Lines changed: 67 additions & 6 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cardano-serialization-lib"
3-
version = "9.1.0"
3+
version = "9.1.2"
44
edition = "2018"
55
authors = ["EMURGO"]
66
license = "MIT"
@@ -30,6 +30,8 @@ num-bigint = "0.4.0"
3030
# feature or this one
3131
clear_on_drop = { version = "0.2", features = ["no_cc"] }
3232
itertools = "0.10.1"
33+
getrandom = { version = "0.2.3", features = ["js"] }
34+
rand = "0.8.4"
3335

3436
# non-wasm
3537
[target.'cfg(not(all(target_arch = "wasm32", not(target_os = "emscripten"))))'.dependencies]

0 commit comments

Comments
 (0)