Merge branch 'evgenii/conway_certs' into tszwai/add_inputs_from_and_c…

…hange

# Conflicts:
#	rust/src/tx_builder.rs

.github/workflows/sonarqube.yml

@@ -0,0 +1,26 @@
+name: SonarQube Checks
+
+on:
+  # Trigger analysis when pushing to your main branches, and when creating a pull request.
+  push:
+    branches:
+      - main
+      - master
+      - develop
+      - 'releases/**'
+  pull_request:
+      types: [opened, synchronize, reopened]
+
+jobs:
+  sonarqube:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        # Disabling shallow clone is recommended for improving relevancy of reporting
+        fetch-depth: 0
+    - name: SonarQube Scan
+      uses: sonarsource/sonarqube-scan-action@master
+      env:
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}

.gitignore

@@ -7,5 +7,5 @@ rust/.idea
 binaryen/
 rust/json-gen/target
 rust/json-gen/output
-rust/json-gen/schema
+rust/json-gen/schemas
 .DS_Store

build-and-test.sh

@@ -1 +1 @@
-. test.sh && npm run rust:build-nodejs
+. test.sh && npm run rust:build-nodejs

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cardano-serialization-lib",
-  "version": "11.5.0",
+  "version": "12.0.0-alpha.28",
   "description": "(De)serialization functions for the Cardano blockchain along with related utility functions",
   "scripts": {
     "rust:build-nodejs": "(rimraf ./rust/pkg && cd rust; wasm-pack build --target=nodejs; cd ..; npm run js:ts-json-gen; cd rust; wasm-pack pack) && npm run js:flowgen",
@@ -36,7 +36,7 @@
   "devDependencies": {
     "flowgen": "1.21.0",
     "husky": "4.2.5",
-    "json-schema-to-typescript": "^10.1.5",
+    "json-schema-to-typescript": "^13.1.1",
     "rimraf": "3.0.2"
   }
 }

release.sh

@@ -13,4 +13,4 @@ echo "Preparing ${RELEASE_TYPE} release"
 && npm run js:publish-nodejs:${RELEASE_TYPE} \
 && npm run js:publish-browser:${RELEASE_TYPE} \
 && npm run js:publish-asm:${RELEASE_TYPE} \
-&& (cd rust; cargo publish --allow-dirty)
+&& (cd rust; cargo publish --allow-dirty)

rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cardano-serialization-lib"
-version = "11.5.0"
+version = "12.0.0-alpha.28"
 edition = "2018"
 authors = ["EMURGO"]
 license = "MIT"
@@ -24,8 +24,8 @@ digest = "^0.9"
 bech32 = "0.7.2"
 hex = "0.4.0"
 cfg-if = "1"
-linked-hash-map = "0.5.3"
-serde_json = "1.0.57"
+hashlink = "0.9.0"
+serde_json = { version = "1.0.114", features = ["arbitrary_precision"] }
 num-bigint = "0.4.0"
 num-integer = "0.1.45"
 # The default can't be compiled to wasm, so it's necessary to use either the 'nightly'
@@ -35,6 +35,9 @@ itertools = "0.10.1"
 rand = "0.8.4"
 schemars = "0.8.8"
 serde = { version = "1.0", features = ["derive"] }
+num-derive = "0.4.0"
+num-traits = "0.2.16"
+num = "0.4.1"
 
 # non-wasm
 [target.'cfg(not(all(target_arch = "wasm32", not(target_os = "emscripten"))))'.dependencies]
@@ -45,7 +48,7 @@ getrandom = "0.2.3"
 # wasm
 [target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies]
 serde-wasm-bindgen = "0.4.5"
-wasm-bindgen = "=0.2.87"
+wasm-bindgen = "=0.2.90"
 rand_os = { version = "0.1", features = ["wasm-bindgen"] }
 js-sys = "0.3.51"
 getrandom = { version = "0.2.3", features = ["js"] }