Merge remote-tracking branch 'origin/main' into st-gpu-miner

tari-project · Aug 29, 2024 · 0397185 · 0397185
2 parents 02a8db9 + 79558b1
commit 0397185
Show file tree

Hide file tree

Showing 131 changed files with 4,663 additions and 1,557 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -124,3 +124,48 @@ jobs:
         working-directory: ./src-tauri
         run: |
           cargo check --release --all-targets --workspace --locked
+
+  tauri-build:
+    name: tauri-build
+    runs-on: [ ubuntu-latest ]
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: install dependencies (linux)
+        run: |
+          sudo apt-get update
+          sudo apt-get install --no-install-recommends --assume-yes \
+            libwebkit2gtk-4.0-dev \
+            libappindicator3-dev \
+            librsvg2-dev \
+            patchelf \
+            libprotobuf-dev \
+            protobuf-compiler
+
+      - name: Node.js setup
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+          cache: 'npm'
+
+      - name: Install dependencies (node)
+        run: |
+          npm --version
+          npm install
+
+      - name: toolchain
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: cache cargo files and outputs
+        if: ${{ ( startsWith(runner.environment,'github-hosted') ) && ( ! startsWith(github.ref, 'refs/tags/v') ) }}
+        uses: swatinem/rust-cache@v2
+        with:
+          workspaces: './src-tauri -> target'
+
+      - name: cargo tauri build
+        working-directory: ./src-tauri
+        run: |
+          cargo install tauri-cli
+          cargo tauri --version
+          cargo tauri build --ci --bundles deb
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -0,0 +1,19 @@
+name: Lint
+on: pull_request
+
+jobs:
+    run-linters:
+        name: Run linters
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Check out Git repository
+              uses: actions/checkout@v4
+            - name: Set up Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: lts/*
+            - name: Install Node.js dependencies
+              run: npm ci
+            - name: check lint/prettier errors
+              run: npm run lint
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v20.17.0
diff --git a/.updater/latest.json b/.updater/latest.json
@@ -1,19 +1,19 @@
 {
-  "version": "0.1.34",
+  "version": "0.1.39",
   "notes": "Tari Universe - See the assets to download this version and install",
-  "pub_date": "2024-08-20T17:02:46.979Z",
+  "pub_date": "2024-08-27T14:10:59.918Z",
   "platforms": {
     "darwin-aarch64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFl6OWpHN1ZMcXA3QTQxT0pFT0lQbGlKVUtOSVdNSTgvRHRDTzE0UHRnVzJRdHRrRTRqM2M2R2ppZ2J1dVBQbzl1VXppOTZYZFpUZGtaTkQwSWFMakFrPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI0MTcyODAwCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6ClBhR29EL2hkRVhZMlM3ZHVwYTVubjdXNFVhcms4bXc2YjdtMWNkWi80NGJPcGx3VFdaZS9ENUphUS9YV1lpWFNPQy9ZanZDQS8wak0yaDJMdjdnUURnPT0K",
-      "url": "https://github.com/tari-project/universe/releases/download/tari_universe-v0.1.34/Tari.Universe_universal.app.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFlPV2dZQjdCRS90cFAzVTJ0RXkyZDJLU01ZQmVRdHYrY1ZtcDFzdkdvN0dHSXhPcnJhVGU5UFdiakpYYWhFTlpvVXVKUGVzenc0eXlHU21pdWtFTXdnPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI0NzY3NTcyCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CkNGMTdadk15RGt6VGVkTWUyTnVLbXg0UzIxVkFKaFowQUJDNEJxUHhBbXoxeU50MEJkUFRKQk5OUEp4MFhyQXJtVXpMTllzYklHZUtlTjZUNmtkL0JnPT0K",
+      "url": "https://github.com/tari-project/universe/releases/download/tari_universe-v0.1.39/Tari.Universe_universal.app.tar.gz"
     },
     "darwin-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFl6OWpHN1ZMcXA3QTQxT0pFT0lQbGlKVUtOSVdNSTgvRHRDTzE0UHRnVzJRdHRrRTRqM2M2R2ppZ2J1dVBQbzl1VXppOTZYZFpUZGtaTkQwSWFMakFrPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI0MTcyODAwCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6ClBhR29EL2hkRVhZMlM3ZHVwYTVubjdXNFVhcms4bXc2YjdtMWNkWi80NGJPcGx3VFdaZS9ENUphUS9YV1lpWFNPQy9ZanZDQS8wak0yaDJMdjdnUURnPT0K",
-      "url": "https://github.com/tari-project/universe/releases/download/tari_universe-v0.1.34/Tari.Universe_universal.app.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFlPV2dZQjdCRS90cFAzVTJ0RXkyZDJLU01ZQmVRdHYrY1ZtcDFzdkdvN0dHSXhPcnJhVGU5UFdiakpYYWhFTlpvVXVKUGVzenc0eXlHU21pdWtFTXdnPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI0NzY3NTcyCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CkNGMTdadk15RGt6VGVkTWUyTnVLbXg0UzIxVkFKaFowQUJDNEJxUHhBbXoxeU50MEJkUFRKQk5OUEp4MFhyQXJtVXpMTllzYklHZUtlTjZUNmtkL0JnPT0K",
+      "url": "https://github.com/tari-project/universe/releases/download/tari_universe-v0.1.39/Tari.Universe_universal.app.tar.gz"
     },
     "windows-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGNnZ0FFVG81a0x3OWNVUzA4c0t5N0Z2QXhWY1JnbUtlRVF5Q09sVnloVThIcERLZ3JZb2E4S1JyN3ZScFpVeXhoTk1TcUwyVC9GblQyd0hyTVNrSWdJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI0MTczMzYyCWZpbGU6VGFyaSBVbml2ZXJzZV8wLjEuMzRfeDY0X2VuLVVTLm1zaS56aXAKNkVvMkZaODZTY3JqcEdwK082SUEyam80Sm9TYVlRZTkxQXY2cE1MTzFHbVlnQ1RiNXVORTRlUnJYYkRHeWlDUWdhUkNVWU1ld2dmangzQzQwYVlOQnc9PQo=",
-      "url": "https://github.com/tari-project/universe/releases/download/tari_universe-v0.1.34/Tari.Universe_0.1.34_x64_en-US.msi.zip"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFpQd2tRZTFKcEhmVCs3TFJkb3ExVWg0VlBjNVZYTGVTbHJtdGo0WmhSZThOdW1ZT1M5UHRWNDk0VHNkeWV1d014ZlVoelg4Q3h0N0p2djdlZVMrMUE0PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI0NzY3ODU1CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjEuMzlfeDY0X2VuLVVTLm1zaS56aXAKNUNVNjZUaVljV2JmSGhHaXlmcmtyYWQzZUp6RTMxM2RzZFEzRWI0VENzdzlvS2NIUXp5QnoxUzRWbTRwZnhJK0VTdTcxU2Nrcjk1c0I5Q2NpemxGRFE9PQo=",
+      "url": "https://github.com/tari-project/universe/releases/download/tari_universe-v0.1.39/Tari.Universe_0.1.39_x64_en-US.msi.zip"
     }
   }
 }
diff --git a/eslint.config.js b/eslint.config.js
@@ -4,6 +4,7 @@ import react from 'eslint-plugin-react';
 import hooksPlugin from 'eslint-plugin-react-hooks';
 
 import prettierConfig from 'eslint-config-prettier';
+import prettierPluginConfig from 'eslint-plugin-prettier/recommended';
 import globals from 'globals';
 
 import tsParser from '@typescript-eslint/parser';
@@ -13,6 +14,9 @@ export default [
     react.configs.flat['jsx-runtime'],
     eslint.configs.recommended,
     ...tseslint.configs.recommended,
+    ...tseslint.configs.stylistic,
+    prettierConfig,
+    prettierPluginConfig,
     {
         settings: {
             react: {
@@ -38,5 +42,4 @@ export default [
             '@typescript-eslint/no-unused-vars': 'warn',
         },
     },
-    prettierConfig,
 ];
diff --git a/index.html b/index.html
@@ -31,7 +31,7 @@
               ASSETS_PATH: '/assets/',
             },
             () => {
-              init();
+              setTimeout(init, 1000); // added a timeout so it doesn't flash the canvas before the splash screen loads
             }
         );
       }
@@ -40,8 +40,7 @@
         glApp.init();
         time = performance.now() / 1000;
         window.addEventListener('resize', onResize);
-        glApp.properties.cameraOffsetX = (348 + 36) / window.innerWidth; // 348 is sidebar width with some padding
-        glApp.properties.resultAnimationSpeed = 2;
+        glApp.properties.cameraOffsetX = (348 + 16) / window.innerWidth; // 348 is sidebar width with some padding
         onResize();
         animate();
       }
@@ -63,6 +62,16 @@
       function update(dt) {
         glApp.render(dt);
       }
+
+      document.addEventListener('contextmenu', e => {
+        if (window.location.hostname !== 'tauri.localhost') {
+          return;
+        }
+        e.preventDefault();
+        return false;
+      }, { capture: true })
+
+
       document.addEventListener("DOMContentLoaded", preload);
     </script>
   </main>