Merge branch 'validator-node' into development

# Conflicts: # applications/tari_app_grpc/src/conversions/output_features.rs # applications/tari_app_grpc/src/conversions/transaction.rs # applications/tari_app_grpc/src/conversions/transaction_output.rs # applications/tari_app_grpc/src/conversions/unblinded_output.rs # applications/tari_console_wallet/src/automation/commands.rs # applications/tari_console_wallet/src/automation/error.rs # applications/tari_console_wallet/src/grpc/wallet_grpc_server.rs # base_layer/core/src/chain_storage/async_db.rs # base_layer/core/src/chain_storage/blockchain_database.rs # base_layer/core/src/proto/transaction.rs # base_layer/core/src/transactions/transaction/mod.rs # base_layer/core/src/transactions/transaction/output_features.rs # base_layer/core/src/transactions/transaction/transaction.rs # base_layer/core/src/transactions/transaction/transaction_input.rs # base_layer/core/src/transactions/transaction/transaction_kernel.rs # base_layer/core/src/transactions/transaction/transaction_output.rs # base_layer/core/src/transactions/transaction_protocol/recipient.rs # base_layer/core/src/validation/block_validators/async_validator.rs # base_layer/core/src/validation/block_validators/test.rs # base_layer/core/src/validation/helpers.rs # base_layer/core/tests/mempool.rs # base_layer/wallet/src/output_manager_service/handle.rs # base_layer/wallet/src/output_manager_service/service.rs # base_layer/wallet/src/output_manager_service/storage/database/mod.rs # base_layer/wallet/src/output_manager_service/storage/models.rs # base_layer/wallet/src/output_manager_service/storage/sqlite_db/mod.rs # base_layer/wallet/src/output_manager_service/storage/sqlite_db/output_sql.rs # base_layer/wallet/src/transaction_service/protocols/transaction_send_protocol.rs # base_layer/wallet/src/transaction_service/tasks/send_finalized_transaction.rs # base_layer/wallet/tests/support/comms_rpc.rs # base_layer/wallet/tests/transaction_service/service.rs
sdbondi · Dec 10, 2021 · 2f8bc35 · 2f8bc35
2 parents e4bace6 + 5ec2975
commit 2f8bc35
Show file tree

Hide file tree

Showing 638 changed files with 138,020 additions and 2,349 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -38,6 +38,7 @@ commands:
           name: Run cucumber scenarios
           no_output_timeout: 20m
           command: cd integration_tests && mkdir -p cucumber_output && node_modules/.bin/cucumber-js --profile "ci" --tags "@critical and not @long-running and not @broken and not @wallet-ffi" --format json:cucumber_output/tests.cucumber --exit --retry 3 --retry-tag-filter "@flaky and not @broken"
+          when: always
       - run:
           name: Generate report
           command: cd integration_tests && node ./generate_report.js
@@ -63,6 +64,9 @@ commands:
       - run:
           name: Build base node
           command: cargo build --release --bin tari_base_node
+      - run:
+          name: Build validator node
+          command: cargo build --release --bin tari_validator_node
       - run:
           name: Build wallet
           command: cargo build --release --bin tari_console_wallet

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,8 +4,9 @@ on:
       - development
       - main
       - ci-*
+      - validator-node
   pull_request:
-    types: [opened, synchronize, reopened]
+    types: [opened, reopened]
 
 name: CI
 
@@ -15,8 +16,8 @@ env:
   toolchain: nightly-2021-09-18
 
 jobs:
-  clippy:
-    name: clippy
+  fmt:
+    name: fmt
     runs-on: ubuntu-18.04
     steps:
       - name: ubuntu dependencies
@@ -64,6 +65,14 @@ jobs:
     name: test
     runs-on: ubuntu-18.04
     steps:
+      - 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: checkout
         uses: actions/checkout@v2
       - name: Caching
@@ -78,17 +87,10 @@ jobs:
         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
+            build-essential \
+            libgtk-3-dev \
+            libwebkit2gtk-4.0-dev \
+            libsoup2.4-dev
 
       - name: toolchain
         uses: actions-rs/toolchain@v1

diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,4 @@ node_modules
 
 # ignore output files from windows ISS
 buildtools/Output/
+/applications/tari_collectibles/src-tauri/data
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,3 +44,4 @@ node_modules

		# ignore output files from windows ISS
		buildtools/Output/
		/applications/tari_collectibles/src-tauri/data