One sided payments

.circleci/config.yml

@@ -20,9 +20,6 @@ commands:
       - restore_cache:
           keys:
             - v6-cargo-cache-{{arch}}-{{checksum "rust-version"}}-<<parameters.release>>-{{checksum "Cargo.lock"}}
-      - run:
-          name: Build the project
-          command: cargo build --all --all-features --jobs=3 <<#parameters.release>>--release<</parameters.release>>
       - run:
           name: Cargo fmt
           command: |
@@ -37,6 +34,62 @@ commands:
             - /usr/local/cargo/registry
             - target
           key: v6-cargo-cache-{{arch}}-{{checksum "rust-version"}}-<<parameters.release>>-{{checksum "Cargo.lock"}}
+  build:
+    description: Build
+    parameters:
+      release:
+        description: Set this to true to compile in release mode.
+        type: boolean
+        default: false
+    steps:
+      - run:
+          name: Calculate dependencies
+          command: |
+            rustc --version >rust-version
+            test -e Cargo.lock || cargo generate-lockfile
+      - restore_cache:
+          keys:
+            - v6-cargo-cache-{{arch}}-{{checksum "rust-version"}}-<<parameters.release>>-{{checksum "Cargo.lock"}}
+      - run:
+          name: Cargo fmt
+          command: |
+            TOOLCHAIN=$(cat rust-toolchain)
+            rustup component add --toolchain $TOOLCHAIN rustfmt
+            cargo fmt --all -- --check
+      - run:
+          name: Build
+          command: cargo build --all --all-features --jobs=3 <<#parameters.release>>--release<</parameters.release>>
+      - save_cache:
+          paths:
+            - /usr/local/cargo/registry
+            - target
+          key: v6-cargo-cache-{{arch}}-{{checksum "rust-version"}}-<<parameters.release>>-{{checksum "Cargo.lock"}}
+  clippy:
+    description: cargo clippy
+    steps:
+      - run:
+          name: Calculate dependencies
+          command: |
+            rustc --version >rust-version
+            test -e Cargo.lock || cargo generate-lockfile
+      - restore_cache:
+          keys:
+            - v6-cargo-cache-{{arch}}-{{checksum "rust-version"}}-{{checksum "Cargo.lock"}}
+      - run:
+          name: Cargo fmt
+          command: |
+            TOOLCHAIN=$(cat rust-toolchain)
+            rustup component add --toolchain $TOOLCHAIN rustfmt
+            cargo fmt --all -- --check
+      - run:
+          name: Run clippy
+          command: cargo clippy -- -D warnings
+      - save_cache:
+          paths:
+            - /usr/local/cargo/registry
+            - target
+          key: v6-cargo-cache-{{arch}}-{{checksum "rust-version"}}-{{checksum "Cargo.lock"}}
+
 
 jobs:
   test-docs:
@@ -64,6 +117,23 @@ jobs:
       - test:
           release: true
 
+  build-tari-release:
+    docker:
+      - image: *rust_image
+    resource_class: medium
+    steps:
+      - checkout
+      - build:
+          release: true
+
+  clippy:
+    docker:
+      - image: *rust_image
+    resource_class: medium
+    steps:
+      - checkout
+      - clippy
+
   deploy-docs:
     docker:
       - image: quay.io/tarilabs/git-ssh-client:0.2-alpine
@@ -106,8 +176,6 @@ jobs:
 
             echo "Published."
 
-
-
 workflows:
   version: 2
   workflow:
@@ -122,7 +190,15 @@ workflows:
           filters:
             branches:
               only: development
+      - build-tari-release:
+          filters:
+            branches:
+              ignore: gh-pages
       - test-tari-release:
           filters:
             branches:
               ignore: gh-pages
+      - clippy:
+          filters:
+            branches:
+              ignore: gh-pages

.github/PULL_REQUEST_TEMPLATE.md

@@ -25,6 +25,7 @@
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
 * [ ] I'm merging against the `development` branch.
 * [ ] I ran `cargo-fmt --all` before pushing.
+* [ ] I ran `cargo test` successfully before submitting my PR.
 * [ ] I have squashed my commits into a single commit.
 * [ ] My change requires a change to the documentation.
 * [ ] I have updated the documentation accordingly.

.github/workflows/base_node_binaries.yml

@@ -3,7 +3,9 @@ name: Build Matrix of Binaries
 on:
   push:
     tags:
-      - "v[0-9].[0-9]+.[0-9]+"
+      - "v[0-9]+.[0-9]+.[0-9]+"
+  schedule:
+    - cron: '05 00 * * *'
 
 env:
   TBN_FILENAME: 'tari_base_node'
@@ -32,13 +34,25 @@ jobs:
     - name: Checkout source code
       uses: actions/checkout@v2
 
-    - name: Declare Global Variables
+    - name: Declare Global Variables 4 GHA ${{ github.event_name }}
       id: vars
       shell: bash
       run: |
         echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
         echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
 
+    - name: Default Destination Folder
+      uses: allenevans/set-env@v1.0.0
+      with:
+        overwrite: true
+        S3DESTOVERRIDE: ''
+    - name: Scheduled Destination Folder Override
+      if: ${{ github.event_name == 'schedule' && github.event.schedule == '05 00 * * *' }}
+      uses: allenevans/set-env@v1.0.0
+      with:
+        overwrite: true
+        S3DESTOVERRIDE: 'daily/'
+
     - name: Setup Rust toolchain
       uses: actions-rs/toolchain@v1
       with:
@@ -154,7 +168,7 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         SOURCE: '${{ github.workspace }}${{ env.TBN_DIST }}'
-        DEST_DIR: '${{ env.S3DESTDIR }}/'
+        DEST_DIR: '${{ env.S3DESTOVERRIDE }}${{ env.S3DESTDIR }}/'
         S3CMD: 'cp'
         S3OPTIONS: '--recursive'
         # S3OPTIONS: '--recursive --exclude "*" --include "*.zip*"'

.gitignore

@@ -37,4 +37,6 @@ base_layer/wallet_ffi/build.config
 /base_layer/wallet_ffi/logs/
 base_layer/wallet_ffi/.cargo/config
 
-keys.json
+keys.json
+node_modules
+/integration_tests/temp