Merge branch 'development' into dev-merge

* development: (72 commits) fix: reinsert transactions from failed block (tari-project#4675) fix: stray clippy error (tari-project#4685) fix(wallet): mark mined_height as null when pending outputs are cancelled (tari-project#4686) chore: updated dependancies (tari-project#4684) fix(p2p): remove DETACH flag usage (tari-project#4682) fix(comms): simplify and remove possibility of deadlock from pipelines and substream close (tari-project#4676) feat(ci): add default CI and FFI testing with custom dispatch (tari-project#4672) chore: remove broken test (tari-project#4678) fix: fix potential race condition between add_block and sync (tari-project#4677) fix deadlock (tari-project#4674) fix: add burn funds command to console wallet (see issue tari-project#4547) (tari-project#4655) v0.38.3 fix: fee estimate (tari-project#4656) fix(comms/messaging): fix possible deadlock in outbound pipeline (tari-project#4657) fix: replace Luhn checksum with DammSum (tari-project#4639) fix(core/sync): handle deadline timeouts by changing peer (tari-project#4649) fix(ci): libtor build on Ubuntu (tari-project#4644) chore: fix log (tari-project#4634) v0.38.2 fix(comms/rpc): detect early close in all cases (tari-project#4647) ...
sdbondi · Sep 16, 2022 · 2772ec4 · 2772ec4
2 parents 0fd3256 + 8030364
commit 2772ec4
Show file tree

Hide file tree

Showing 242 changed files with 4,919 additions and 4,345 deletions.
diff --git a/.github/wip_integration_tests.yml b/.github/wip_integration_tests.yml
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -1,11 +1,9 @@
 ---
-# Runs daily
----
-name: Security audit
+name: Security audit - daily
 
-on:
+'on':
   schedule:
-    - cron: "43 05 * * *"
+    - cron: '43 05 * * *'
 
 jobs:
   security_audit:

diff --git a/.github/workflows/base_node_binaries.json b/.github/workflows/base_node_binaries.json
@@ -43,7 +43,8 @@
     "target": "x86_64-pc-windows-msvc",
     "cross": false,
     "target_cpu": "x86-64",
-    "features": "safe"
+    "features": "safe",
+    "flags": "--workspace --exclude tari_libtor"
   },
   {
     "name": "windows-arm64",

diff --git a/.github/workflows/base_node_binaries.yml b/.github/workflows/base_node_binaries.yml
@@ -187,7 +187,7 @@ jobs:
         with:
           use-cross: ${{ matrix.builds.cross }}
           command: build
-          args: --release --target ${{ matrix.builds.target }} --features ${{ matrix.builds.features }} ${{ matrix.builds.target_bins }} --locked
+          args: --release --target ${{ matrix.builds.target }} --features ${{ matrix.builds.features }} ${{ matrix.builds.target_bins }} ${{ matrix.builds.flags }} --locked
 
       - name: Copy binaries to folder for zipping
         shell: bash

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,7 +1,7 @@
 ---
 name: CI
 
-on:
+'on':
   workflow_dispatch:
   push:
     branches:
@@ -24,7 +24,8 @@ env:
 jobs:
   clippy:
     name: clippy
-    runs-on: [ self-hosted, ubuntu18.04-high-cpu ]
+    #runs-on: [ self-hosted, ubuntu18.04-high-cpu ]
+    runs-on: [ ubuntu-20.04 ]
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -36,19 +37,8 @@ jobs:
           override: true
       - name: ubuntu dependencies
         run: |
-          sudo apt-get update && \
-          sudo apt-get -y install \
-          build-essential \
-          libgtk-3-dev \
-          libwebkit2gtk-4.0-dev \
-          libsoup2.4-dev \
-          curl \
-          wget \
-          libappindicator3-dev \
-          patchelf \
-          librsvg2-dev \
-          libprotobuf-dev \
-          protobuf-compiler
+          sudo apt-get update
+          sudo bash scripts/install_ubuntu_dependencies.sh
       - name: cargo fmt
         uses: actions-rs/cargo@v1
         with:
@@ -78,19 +68,8 @@ jobs:
           override: true
       - name: ubuntu dependencies
         run: |
-          sudo apt-get update && \
-          sudo apt-get -y install \
-          build-essential \
-          libgtk-3-dev \
-          libwebkit2gtk-4.0-dev \
-          libsoup2.4-dev \
-          curl \
-          wget \
-          libappindicator3-dev \
-          patchelf \
-          librsvg2-dev \
-          libprotobuf-dev \
-          protobuf-compiler
+          sudo apt-get update
+          sudo bash scripts/install_ubuntu_dependencies.sh
       - name: cargo check
         uses: actions-rs/cargo@v1
         with:
@@ -116,19 +95,8 @@ jobs:
       - uses: Swatinem/rust-cache@v1
       - name: ubuntu dependencies
         run: |
-          sudo apt-get update && \
-          sudo apt-get -y install \
-          build-essential \
-          libgtk-3-dev \
-          libwebkit2gtk-4.0-dev \
-          libsoup2.4-dev \
-          curl \
-          wget \
-          libappindicator3-dev \
-          patchelf \
-          librsvg2-dev \
-          libprotobuf-dev \
-          protobuf-compiler
+          sudo apt-get update
+          sudo bash scripts/install_ubuntu_dependencies.sh
       - name: rustup show
         run: |
           rustup show
@@ -167,19 +135,8 @@ jobs:
           toolchain: ${{ env.toolchain }}
       - name: ubuntu dependencies
         run: |
-          sudo apt-get update && \
-          sudo apt-get -y install \
-          build-essential \
-          libgtk-3-dev \
-          libwebkit2gtk-4.0-dev \
-          libsoup2.4-dev \
-          curl \
-          wget \
-          libappindicator3-dev \
-          patchelf \
-          librsvg2-dev \
-          libprotobuf-dev \
-          protobuf-compiler
+          sudo apt-get update
+          sudo bash scripts/install_ubuntu_dependencies.sh
       - name: test key manager wasm
         run: |
           npm install -g wasm-pack
@@ -196,9 +153,10 @@ jobs:
         with:
           command: test
           args: -v --all-features --release
+
   # Allows other workflows to know the PR number
   artifacts:
-    name: test
+    name: pr_2_artifact
     runs-on: [ ubuntu-20.04 ]
     steps:
       - name: Save the PR number in an artifact