chore: merge development into feature dan

.circleci/config.yml

@@ -12,7 +12,7 @@ commands:
           command: node -v
       - run:
           name: npm ci
-          command: cd integration_tests && npm ci
+          command: cd clients/nodejs/base_node_grpc_client && npm install && cd ../wallet_grpc_client && npm install && cd ../../../integration_tests && npm install
       - run:
           name: Check formatting
           command: cd integration_tests && npm run check-fmt
@@ -54,7 +54,7 @@ commands:
           command: node -v
       - run:
           name: npm ci
-          command: cd integration_tests && npm ci
+          command: cd clients/nodejs/base_node_grpc_client && npm install && cd ../wallet_grpc_client && npm install && cd ../../../integration_tests && npm install
       - run:
           name: Check eslint
           command: cd integration_tests && npm run lint

.github/workflows/coverage.yml

@@ -1,65 +1,54 @@
 ---
 name: Source Coverage
 
-on:
-  workflow_dispatch:
+'on':
   push:
     branches:
       - development
       - ci-coverage-*
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
 
 env:
   toolchain: nightly-2022-05-01
 
 jobs:
   coverage:
-    name: test and generate cov
+    name: test and generate coverage
     runs-on: [ self-hosted, ubuntu18.04-high-mem ]
     steps:
+      - name: checkout source code
+        uses: actions/checkout@v3
+
       - name: ubuntu dependencies
         run: |
-          sudo apt-get update && \
-          sudo apt-get -y install \
-            openssl \
-            libssl-dev \
-            pkg-config \
-            libsqlite3-dev \
-            clang-10 \
-            git \
-            cmake \
-            libc++-dev \
-            libc++abi-dev \
-            libprotobuf-dev \
-            protobuf-compiler \
-            libncurses5-dev \
-            libncursesw5-dev \
-            zip \
-            build-essential \
-            libgtk-3-dev \
-            libwebkit2gtk-4.0-dev \
-            libsoup2.4-dev \
-            curl \
-            wget \
-            libappindicator3-dev \
-            patchelf \
-            librsvg2-dev
-      - name: checkout
-        uses: actions/checkout@v2
+          sudo apt-get update
+          sudo bash scripts/install_ubuntu_dependencies.sh
+
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly
           override: true
           components: llvm-tools-preview
-      - uses: actions-rs/cargo@v1
+
+      - name: cache cargo files and outputs
+        uses: Swatinem/rust-cache@v2
         with:
-          command: test
-          args: --all-features --no-fail-fast
+          cache-on-failure: true
+
+      - uses: actions-rs/cargo@v1
         env:
           RUSTFLAGS: "-C instrument-coverage"
           RUSTDOCFLAGS: "-C instrument-coverage"
           LLVM_PROFILE_FILE: "coverage_data-%p-%m.profraw"
-      - id: coverage
-        name: Prepare coverage data
+        with:
+          command: test
+          args: --all-features --no-fail-fast
+
+      - name: prepare coverage data
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
         run: |
@@ -72,13 +61,15 @@ jobs:
              --vcs-branch $GITHUB_REF_NAME \
              --service-name github \
              --service-job-id ${GITHUB_RUN_ID}
-      - id: archive-coverage
-        name: archive-coverage
+
+      - name: archive coverage data
         uses: actions/upload-artifact@v3
         with:
           path: target/coveralls_coverage.json
           name: coveralls-coverage
+
       - name: Coveralls upload
+        continue-on-error: true
         uses: toshke/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/integration_tests.yml

@@ -120,7 +120,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: lts/erbium
           cache: 'npm'
           cache-dependency-path: integration_tests/package-lock.json
 

.gitignore

@@ -60,4 +60,5 @@ buildtools/Output/
 
 clients/base_node_grpc_client/package-lock.json
 clients/validator_node_grpc_client/package-lock.json
-clients/wallet_grpc_client/package-lock.json
+clients/wallet_grpc_client/package-lock.json
+pie/

applications/tari_app_grpc/Cargo.toml

@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
 description = "This crate is to provide a single source for all cross application grpc files and conversions to and from tari::core"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "0.38.4"
+version = "0.38.5"
 edition = "2018"
 
 [dependencies]

applications/tari_app_grpc/src/conversions/transaction_input.rs

@@ -114,10 +114,7 @@ impl TryFrom<TransactionInput> for grpc::TransactionInput {
                     .commitment()
                     .map_err(|_| "Non-compact Transaction input should contain commitment".to_string())?
                     .to_vec(),
-                hash: input
-                    .canonical_hash()
-                    .map_err(|_| "Non-compact Transaction input should be able to be hashed".to_string())?
-                    .to_vec(),
+                hash: input.canonical_hash().to_vec(),
 
                 script: input
                     .script()

applications/tari_app_utilities/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tari_app_utilities"
-version = "0.38.4"
+version = "0.38.5"
 authors = ["The Tari Development Community"]
 edition = "2018"
 license = "BSD-3-Clause"

applications/tari_base_node/Cargo.toml

@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
 description = "The tari full base node implementation"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "0.38.4"
+version = "0.38.5"
 edition = "2018"
 
 [dependencies]