Merge branch 'development' into comms-peer-manager-signed-peers

* development:
  fix: allow 0-conf in blockchain db (tari-project#3680)
  test: fix cucumber WalletQuery.feature (tari-project#3677)
  test: fix `wait for` step (tari-project#3673)
  perf(comms)!: optimise connection establishment (tari-project#3658)
  fix: remove noise negotiation for debugging on bad wire mode (tari-project#3657)
  feat: add follow on checkpoint (tari-project#3676)
  ci: fix tari collectibles build (tari-project#3670)
  feat: example to generate vanity node_ids (tari-project#3654)
  fix: prefer configured seeds over dns seeds (tari-project#3662)
  docs: update RFC-0230_HTLC to use TariScript (tari-project#3622)
  feat: add invoke write method to proxy (tari-project#3667)
  ci: add tauri build (tari-project#3669)
  test: fix cucumber metadata signature (tari-project#3665)
  feat: add asset proxy (tari-project#3659)
  test: fix cucumber (tari-project#3660)

.circleci/config.yml

@@ -34,6 +34,9 @@ commands:
       - run:
           name: Build stratum_transcoder
           command: cargo build --release --bin tari_stratum_transcoder
+      - run:
+          name: Build validator node
+          command: cargo build --release --bin tari_validator_node
       - run:
           name: Run cucumber scenarios
           no_output_timeout: 20m
@@ -82,6 +85,9 @@ commands:
       - run:
           name: Build stratum_transcoder
           command: cargo build --release --bin tari_stratum_transcoder
+      - run:
+          name: Build validator node
+          command: cargo build --release --bin tari_validator_node
       # Below step requires NodeJS v12 to run correctly, see explanation in WalletFFI.feature
       - run:
           name: Run FFI wallet library cucumber scenarios

.github/workflows/base_node_binaries.yml

@@ -17,6 +17,7 @@ on:
 
 env:
   TBN_FILENAME: "tari_base_node"
+#  PROTOC: protoc
 
 jobs:
   builds:
@@ -84,7 +85,16 @@ jobs:
             protobuf-compiler \
             libncurses5-dev \
             libncursesw5-dev \
-            zip
+            zip \
+            build-essential \
+            libgtk-3-dev \
+            libwebkit2gtk-4.0-dev \
+            libsoup2.4-dev \
+            curl \
+            wget \
+            libappindicator3-dev \
+            patchelf \
+            librsvg2-dev
       #        sudo apt-get -y upgrade
       - name: Install macOS dependencies
         if: startsWith(runner.os,'macOS')
@@ -132,6 +142,12 @@ jobs:
             target
           key: ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
 
+      - name: Compile react (collectibles)
+        run: |
+          cd applications/tari_collectibles/web-app
+          npm install
+          npm run build
+
       - name: Build binaries
         env:
           RUSTFLAGS: "-C target_cpu=${{ matrix.target_cpu }}"
@@ -142,6 +158,19 @@ jobs:
           #cargo build --release --bin tari_base_node --features ${{ matrix.features}}
           cargo build --release
 
+#      - name: Build tauri apps
+#        env:
+#          RUSTFLAGS: "-C target_cpu=${{ matrix.target_cpu }}"
+#        run: |
+#          echo "Cache Key: ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}"
+#          cd applications/tari_collectibles
+#          npm install
+#          cd web-app
+#          npm install
+#          cd ..
+#          npm run tauri build
+
+      #  - name: Prepare Archives
         #  - name: Prepare Archives
         #    shell: bash
         #    run: |
@@ -170,6 +199,8 @@ jobs:
           cp -v "$GITHUB_WORKSPACE/target/release/tari_console_wallet${TBN_EXT}" .
           cp -v "$GITHUB_WORKSPACE/target/release/tari_merge_mining_proxy${TBN_EXT}" .
           cp -v "$GITHUB_WORKSPACE/target/release/tari_mining_node${TBN_EXT}" .
+          cp -v "$GITHUB_WORKSPACE/target/release/tari_validator_node${TBN_EXT}" .
+          cp -v "$GITHUB_WORKSPACE/target/release/tari_collectibles${TBN_EXT}" .
 
       - name: Build the macos pkg
         if: startsWith(runner.os,'macOS')

.github/workflows/ci.yml

@@ -4,9 +4,11 @@ on:
       - development
       - main
       - ci-*
-      - validator-node
   pull_request:
-    types: [opened, reopened]
+    types:
+      - opened
+      - reopened
+      - synchronize
 
 name: CI
 
@@ -16,25 +18,33 @@ env:
   toolchain: nightly-2021-09-18
 
 jobs:
-  fmt:
-    name: fmt
+  clippy:
+    name: clippy
     runs-on: ubuntu-18.04
     steps:
       - name: ubuntu dependencies
         run: |
           sudo apt-get update && \
           sudo apt-get -y install \
-            libssl-dev \
-            openssl \
-            libsqlite3-dev \
-            pkg-config \
-            git \
-            cmake \
-            zip \
-            libc++-dev \
-            libc++abi-dev \
-            libprotobuf-dev \
-            protobuf-compiler
+          libssl-dev \
+          openssl \
+          libsqlite3-dev \
+          pkg-config \
+          git \
+          cmake \
+          zip \
+          libc++-dev \
+          libc++abi-dev \
+          libprotobuf-dev \
+          protobuf-compiler \
+          libwebkit2gtk-4.0-dev \
+          build-essential \
+          curl \
+          wget \
+          libgtk-3-dev \
+          libappindicator3-dev \
+          patchelf \
+          librsvg2-dev
       - name: checkout
         uses: actions/checkout@v2
       - name: toolchain
@@ -69,10 +79,17 @@ jobs:
         run: |
           sudo apt-get update && \
           sudo apt-get -y install \
-            build-essential \
-            libgtk-3-dev \
-            libwebkit2gtk-4.0-dev \
-            libsoup2.4-dev
+          build-essential \
+          libgtk-3-dev \
+          libwebkit2gtk-4.0-dev \
+          libsoup2.4-dev \
+          curl \
+          wget \
+          libappindicator3-dev \
+          patchelf \
+          librsvg2-dev \
+          libprotobuf-dev \
+          protobuf-compiler
       - name: checkout
         uses: actions/checkout@v2
       - name: Caching
@@ -83,22 +100,12 @@ jobs:
             ~/.cargo/git
             target
           key: ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-${{ hashFiles('**/Cargo.lock') }}
-      - 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
-
       - name: toolchain
         uses: actions-rs/toolchain@v1
         with:
           toolchain: ${{ env.toolchain }}
           components: clippy, rustfmt
           override: true
-
       - name: cargo test
         uses: actions-rs/cargo@v1
         with: