Merge branch 'development' into core-sync-latency-based-peer-switch

* development: (28 commits)
  fix(wallet): fix aggressive disconnects in wallet connectivity (tari-project#3807)
  chore: honor decimals in ERC20 (tari-project#3809)
  chore: add icons to applications (tari-project#3812)
  fix: daily test (tari-project#3815)
  ci: improvements to macos pkg (tari-project#3824)
  ci: cargo test speedups (tari-project#3843)
  feat: add persistence of transaction cancellation reason to wallet db (tari-project#3842)
  fix: update RFC links and README (tari-project#3675) (tari-project#3839)
  chore: change NodeIdentity debug (tari-project#3817)
  fix(dan): include state_root in node hash (tari-project#3836)
  feat(cli): resize terminal height (tari-project#3838)
  feat(validator-node): initial state sync implementation (partial) (tari-project#3826)
  feat: update console wallet tui (tari-project#3837)
  feat: resize base node terminal on startup (tari-project#3827)
  feat(wallet): add grpc method for setting base node (tari-project#3828)
  chore(deps): bump follow-redirects from 1.14.5 to 1.14.8 in /applications/tari_web_extension_example (tari-project#3832)
  chore(deps): bump follow-redirects from 1.14.7 to 1.14.8 in /applications/tari_collectibles/web-app (tari-project#3833)
  chore(deps): bump follow-redirects from 1.14.5 to 1.14.8 in /applications/tari_web_extension (tari-project#3834)
  chore(deps): bump follow-redirects from 1.14.7 to 1.14.8 in /applications/launchpad/gui-vue (tari-project#3831)
  chore(deps): bump follow-redirects from 1.14.4 to 1.14.8 in /integration_tests (tari-project#3829)
  ...

.github/workflows/base_node_binaries.yml

@@ -20,7 +20,7 @@ env:
 
 jobs:
   builds:
-    name: Build and deploy tari_base_node
+    name: Build and upload Binaries
     strategy:
       fail-fast: false
       matrix:
@@ -94,6 +94,7 @@ jobs:
             libappindicator3-dev \
             patchelf \
             librsvg2-dev
+
       - name: Install macOS dependencies
         if: startsWith(runner.os,'macOS')
         run: brew install cmake zip coreutils automake autoconf
@@ -141,6 +142,9 @@ jobs:
             ~/.cargo/git
             target
           key: ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-cargo-build-target-
+            ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-
 
       - name: Compile launchpad GUI
         run: |
@@ -154,6 +158,12 @@ jobs:
           npm install
           npm run build
 
+      - name: Info - Pre-Compile Space Check for Nix
+        if: "!startsWith(runner.os,'Windows')"
+        shell: bash
+        run: |
+          df -h
+
       - name: Build rust binaries
         env:
           RUSTFLAGS: "-C target_cpu=${{ matrix.target_cpu }}"
@@ -162,6 +172,12 @@ jobs:
           echo "Cache Key: ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}"
           cargo build --release
 
+      - name: Info - Post-Compile Space Check for Nix
+        if: "!startsWith(runner.os,'Windows')"
+        shell: bash
+        run: |
+          df -h
+
       - name: Copy binaries to folder for zipping
         shell: bash
         run: |
@@ -185,8 +201,9 @@ jobs:
           cp -v "$GITHUB_WORKSPACE/target/release/tari_launchpad${TBN_EXT}" .
           cp -v "$GITHUB_WORKSPACE/applications/tari_base_node/${PLATFORM_SPECIFIC_DIR}/runtime/start_tor${SHELL_EXT}" .
 
-      - name: Build the macos pkg
+      - name: Build the macOS pkg
         if: startsWith(runner.os,'macOS')
+        continue-on-error: true
         env:
           MACOS_KEYCHAIN_PASS: ${{ secrets.MACOS_KEYCHAIN_PASS }}
           MACOS_APPLICATION_ID: ${{ secrets.MACOS_APPLICATION_ID }}
@@ -206,10 +223,19 @@ jobs:
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $MACOS_KEYCHAIN_PASS build.keychain
           cd buildtools
           ./create_osx_install_zip.sh unused nozip
-          FILES=("tari_base_node" "tari_console_wallet" "tari_mining_node" "tari_merge_mining_proxy")
+          FILES=(
+            "tari_base_node"
+            "tari_console_wallet"
+            "tari_mining_node"
+            "tari_merge_mining_proxy"
+            "tari_validator_node"
+            "tari_collectibles"
+            "tari_launchpad"
+          )
           for FILE in "${FILES[@]}"; do
             codesign --force -s "Developer ID Application: $MACOS_APPLICATION_ID" "/tmp/tari_testnet/runtime/$FILE" -v
             codesign --verify --deep --display --verbose=4 "/tmp/tari_testnet/runtime/$FILE"
+            cp -vf "/tmp/tari_testnet/runtime/$FILE" "$GITHUB_WORKSPACE${{ env.TBN_DIST }}"
           done
           pkgbuild --root /tmp/tari_testnet \
           --identifier "com.tarilabs.pkg" \
@@ -218,23 +244,25 @@ jobs:
           --scripts "/tmp/tari_testnet/scripts" \
           --sign "Developer ID Installer: $MACOS_INSTALLER_ID" \
           "${{ github.workspace }}${{ env.TBN_DIST }}/tari-${{ env.VERSION }}.pkg"
-      - name: Artifact macos pkg
+
+      - name: Artifact upload for macOS pkg
         if: startsWith(runner.os,'macOS')
+        continue-on-error: true
         uses: actions/upload-artifact@v2
         with:
           name: tari-${{ env.VERSION }}.pkg
           path: "${{ github.workspace }}${{ env.TBN_DIST }}/tari-${{ env.VERSION }}.pkg"
 
       # unlike inno script studio, iscc.exe doesn't run the [precompile] step generate_config.bat
-      - name: Build the windows installer
+      - name: Build the Windows installer
         shell: cmd
         if: startsWith(runner.os,'Windows')
         run: |
           cd buildtools
           call generate_config.bat
           "%programfiles(x86)%\Inno Setup 6\iscc.exe" "/DMyAppVersion=${{ env.VERSION }}-${{ env.VSHA_SHORT }}-release" "windows_inno_installer.iss"
 
-      - name: Upload artifact for Windows installer
+      - name: Artifact upload for Windows installer
         uses: actions/upload-artifact@v2
         if: startsWith(runner.os,'Windows')
         with:
@@ -255,14 +283,14 @@ jobs:
           ${SHARUN} --check "${{ env.BINFILE }}.zip.sha256"
           #rm -f "${BINFILE}"
 
-      - name: Artifact archive
+      - name: Artifact upload for Archive
         uses: actions/upload-artifact@v2
         with:
           #name: ${{ env.TBN_FILENAME }}-${{ env.VERSION }}-${{ env.VSHA_SHORT }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}
           name: tari_binary_archive-${{ matrix.os }}-${{ matrix.target_cpu }}
           path: "${{ github.workspace }}${{ env.TBN_DIST }}/${{ env.BINFILE }}.zip*"
 
-      - name: Artifact miner
+      - name: Artifact upload for Miner
         uses: actions/upload-artifact@v2
         with:
           name: tari_mining_node-${{ matrix.os }}-${{ matrix.target_cpu }}

.github/workflows/ci.yml

@@ -24,17 +24,13 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: caching
-        uses: actions/cache@v2
+      - name: toolchain
+        uses: actions-rs/toolchain@v1
         with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-clippy-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-clippy-
-            ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-
+          toolchain: ${{ env.toolchain }}
+          components: clippy, rustfmt
+          override: true
+      - uses: Swatinem/rust-cache@v1
       - name: ubuntu dependencies
         run: |
           sudo apt-get update && \
@@ -63,12 +59,6 @@ jobs:
           cd applications/launchpad/gui-vue
           npm ci
           npm run build
-      - name: toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: ${{ env.toolchain }}
-          components: clippy, rustfmt
-          override: true
       - name: cargo fmt
         uses: actions-rs/cargo@v1
         with:
@@ -85,17 +75,13 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: caching
-        uses: actions/cache@v2
+      - name: toolchain
+        uses: actions-rs/toolchain@v1
         with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-build-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-build-
-            ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-
+          toolchain: ${{ env.toolchain }}
+          profile: minimal
+          override: true
+      - uses: Swatinem/rust-cache@v1
       - name: ubuntu dependencies
         run: |
           sudo apt-get update && \
@@ -116,12 +102,6 @@ jobs:
           cd applications/launchpad/gui-vue
           npm ci
           npm run build
-      - name: toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: ${{ env.toolchain }}
-          components: clippy, rustfmt
-          override: true
       - name: cargo check
         uses: actions-rs/cargo@v1
         with:
@@ -133,17 +113,13 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: caching
-        uses: actions/cache@v2
+      - name: toolchain
+        uses: actions-rs/toolchain@v1
         with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-${{ runner.cpu-model }}-stable-build-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ runner.cpu-model }}-stable-build-
-            ${{ runner.os }}-${{ runner.cpu-model }}-stable-
+          toolchain: stable
+          profile: minimal
+          override: true
+      - uses: Swatinem/rust-cache@v1
       - name: ubuntu dependencies
         run: |
           sudo apt-get update && \
@@ -164,12 +140,6 @@ jobs:
           cd applications/launchpad/gui-vue
           npm ci
           npm run build
-      - name: toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          override: true
       - name: rustup show
         run: |
           rustup show
@@ -180,22 +150,16 @@ jobs:
           args: --release --all-targets
   test:
     name: test
-    needs: build
+    # needs: build
     runs-on: ubuntu-18.04
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: caching
-        uses: actions/cache@v2
+      - name: toolchain
+        uses: actions-rs/toolchain@v1
         with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-test-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-test-
-            ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-
+          toolchain: ${{ env.toolchain }}
+      - uses: Swatinem/rust-cache@v1
       - name: ubuntu dependencies
         run: |
           sudo apt-get update && \
@@ -216,12 +180,12 @@ jobs:
           cd applications/launchpad/gui-vue
           npm ci
           npm run build
-      - name: toolchain
-        uses: actions-rs/toolchain@v1
+      - name: cargo test compile
+        uses: actions-rs/cargo@v1
         with:
-          toolchain: ${{ env.toolchain }}
+          command: test
+          args: --no-run --locked
       - name: cargo test
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --release --all-targets