From 4ec6fa642ff04802149f8682a1c51cb37af25278 Mon Sep 17 00:00:00 2001 From: Shannon Tenner Date: Thu, 21 Nov 2024 13:11:57 +0200 Subject: [PATCH 1/3] wip: update ci runs for v2 --- .github/workflows/ci.yml | 358 ++++++++++------------------- .github/workflows/ci_i18n.yml | 70 ++++++ public/locales/af/mining-view.json | 2 +- src/App/App.tsx | 15 +- src/hooks/app/useShuttingDown.ts | 8 +- src/hooks/app/useSystemTray.ts | 15 +- src/store/useAirdropStore.ts | 2 +- src/utils/systray.ts | 30 +-- 8 files changed, 222 insertions(+), 278 deletions(-) create mode 100644 .github/workflows/ci_i18n.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64fe2be1a..3d2938f94 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,246 +1,126 @@ --- -name: CI +name: CI runs 'on': - workflow_dispatch: - push: - branches: - - "ci-*" - pull_request: - types: - - opened - - reopened - - synchronize - merge_group: + workflow_dispatch: + push: + branches: + - 'ci-*' + pull_request: + types: + - opened + - reopened + - synchronize + merge_group: concurrency: - # https://docs.github.com/en/actions/examples/using-concurrency-expressions-and-a-test-matrix - group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' - cancel-in-progress: ${{ !startsWith(github.ref, 'refs/tags/v') || github.ref != 'refs/heads/development' || github.ref != 'refs/heads/nextnet' || github.ref != 'refs/heads/stagenet' }} - -permissions: {} + # https://docs.github.com/en/actions/examples/using-concurrency-expressions-and-a-test-matrix + group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' + cancel-in-progress: ${{ !startsWith(github.ref, 'refs/tags/v') || github.ref != 'refs/heads/development' || github.ref != 'refs/heads/nextnet' || github.ref != 'refs/heads/stagenet' }} jobs: - clippy: - name: clippy - runs-on: [ ubuntu-latest ] - steps: - - name: checkout - uses: actions/checkout@v4 - - - name: created empty dist dir - run: | - mkdir dist - - - name: install dependencies (linux) - if: startsWith(runner.os,'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: toolchain - uses: dtolnay/rust-toolchain@stable - with: - components: clippy, rustfmt - - - 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 format - working-directory: ./src-tauri - run: | - cargo fmt --all -- --check - - - name: clippy check (with lints) - working-directory: ./src-tauri - env: - AIRDROP_BASE_URL: http://localhost:4000 - AIRDROP_API_BASE_URL: http://localhost:3004 - AIRDROP_TWITTER_AUTH_URL: http://localhost:3004/auth/twitter - run: | - cargo install cargo-lints - cargo lints clippy --all-targets --all-features - - machete: - name: machete - runs-on: [ ubuntu-latest ] - steps: - - name: checkout - uses: actions/checkout@v4 - - - name: toolchain - uses: dtolnay/rust-toolchain@stable - with: - components: clippy, rustfmt - - - 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 machete - working-directory: ./src-tauri - run: | - cargo install cargo-machete - cargo machete - - cargo-check: - name: cargo-check - runs-on: [ ubuntu-latest ] - steps: - - name: checkout - uses: actions/checkout@v4 - - - name: install dependencies (linux) - if: startsWith(runner.os,'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: toolchain - uses: dtolnay/rust-toolchain@stable - with: - components: clippy, rustfmt - - - 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 check - working-directory: ./src-tauri - run: | - cargo check --release --all-targets --workspace --locked - - file-licenses: - # disable for now - if: ${{ false }} - name: file-licenses - runs-on: [ ubuntu-latest ] - steps: - - name: checkout - uses: actions/checkout@v4 - - name: install ripgrep - run: | - # https://github.com/BurntSushi/ripgrep/releases/download/14.1.1/ripgrep_14.1.1-1_amd64.deb.sha256 - wget -v https://github.com/BurntSushi/ripgrep/releases/download/14.1.1/ripgrep_14.1.1-1_amd64.deb - sudo dpkg -i ripgrep_14.1.1-1_amd64.deb - rg --version || exit 1 - - name: run the license check - run: ./scripts/file_license_check.sh - - i18n-checks: - name: i18n-checks - runs-on: [ ubuntu-latest ] - steps: - - name: checkout - uses: actions/checkout@v4 - - - name: install jsonlint - run: | - sudo apt-get update - sudo apt-get install --no-install-recommends --assume-yes \ - python3-demjson - - - name: basic jsonlint - run: | - find public -iname '*.json' -print0 | \ - xargs -0 -n1 jsonlint -v - - - name: setup folder for logs - run: | - mkdir -p ${{ runner.temp }}/i18n_logs - - - name: i18n compare - continue-on-error: true - working-directory: ./public/locales - run: | - python3 ../../scripts/i18n_checker.py \ - compare --en-locale-path en \ - --base-path . \ - --search-path .. \ - --output-dir ${{ runner.temp }}/i18n_logs - - - name: i18n unused - continue-on-error: true - working-directory: ./public/locales - run: | - python3 ../../scripts/i18n_checker.py \ - unused --en-locale-path en \ - --base-path . \ - --search-path .. \ - --output-dir ${{ runner.temp }}/i18n_logs - - - name: Artifact upload for i18n checks - uses: actions/upload-artifact@v4 - with: - name: i18n-logs - path: ${{ runner.temp }}/i18n_logs - - 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: install dependencies (linux/OpenCL) - run: | - sudo apt-get install --no-install-recommends --assume-yes \ - opencl-headers \ - ocl-icd-opencl-dev - - - 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 --version "^2" - cargo tauri --version - cargo tauri build --ci --bundles deb + cargo-checks: + name: cargo checks (fmt, clippy, check) + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: create empty dist dir + run: | + mkdir dist + - name: install dependencies (linux) + run: | + sudo apt-get update + sudo apt-get install --no-install-recommends --assume-yes \ + libwebkit2gtk-4.1-dev \ + libappindicator3-dev \ + librsvg2-dev \ + patchelf \ + libprotobuf-dev \ + protobuf-compiler + + - name: install dependencies (linux/OpenCL) + run: | + sudo apt-get install --no-install-recommends --assume-yes \ + opencl-headers \ + ocl-icd-opencl-dev + + - uses: dtolnay/rust-toolchain@stable + with: + components: clippy, rustfmt + - uses: swatinem/rust-cache@v2.7.5 + with: + workspaces: './src-tauri -> target' + + - name: cargo format + working-directory: ./src-tauri + run: | + cargo fmt --all -- --check + + - name: clippy lint + working-directory: ./src-tauri + env: + AIRDROP_BASE_URL: http://localhost:4000 + AIRDROP_API_BASE_URL: http://localhost:3004 + AIRDROP_TWITTER_AUTH_URL: http://localhost:3004/auth/twitter + run: | + cargo install cargo-lints + cargo lints clippy --all-targets --all-features + - name: cargo check + working-directory: ./src-tauri + run: | + cargo check --release --all-targets --workspace + + machete: + name: machete + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + - uses: swatinem/rust-cache@v2.7.5 + with: + workspaces: './src-tauri -> target' + + - name: cargo machete + working-directory: ./src-tauri + run: | + cargo install cargo-machete + cargo machete + + tauri-test-build: + strategy: + fail-fast: true + name: tauri-build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: install dependencies (linux) + run: | + sudo apt-get update + sudo apt-get install --no-install-recommends --assume-yes \ + libwebkit2gtk-4.1-dev \ + libappindicator3-dev \ + librsvg2-dev \ + patchelf \ + libprotobuf-dev \ + protobuf-compiler + + - name: install dependencies (linux/OpenCL) + run: | + sudo apt-get install --no-install-recommends --assume-yes \ + opencl-headers \ + ocl-icd-opencl-dev + + - uses: actions/setup-node@v4 + with: + node-version: lts/* + cache: 'npm' + - name: Install dependencies (node) + run: npm ci + - uses: dtolnay/rust-toolchain@stable + - uses: swatinem/rust-cache@v2.7.5 + with: + workspaces: './src-tauri -> target' + - name: test tauri build + run: | + npm install tauri-cli@latest + npm run tauri build -- --ci --bundles deb diff --git a/.github/workflows/ci_i18n.yml b/.github/workflows/ci_i18n.yml new file mode 100644 index 000000000..44efbffd2 --- /dev/null +++ b/.github/workflows/ci_i18n.yml @@ -0,0 +1,70 @@ +--- +name: i18n Checks + +'on': + workflow_dispatch: + push: + branches: + - 'ci-*' + pull_request: + types: + - opened + - reopened + - synchronize + merge_group: + +concurrency: + # https://docs.github.com/en/actions/examples/using-concurrency-expressions-and-a-test-matrix + group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' + cancel-in-progress: ${{ !startsWith(github.ref, 'refs/tags/v') || github.ref != 'refs/heads/development' || github.ref != 'refs/heads/nextnet' || github.ref != 'refs/heads/stagenet' }} + +permissions: {} + +jobs: + i18n-checks: + name: i18n-checks + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v4 + + - name: install jsonlint + run: | + sudo apt-get update + sudo apt-get install --no-install-recommends --assume-yes \ + python3-demjson + + - name: basic jsonlint + run: | + find public -iname '*.json' -print0 | \ + xargs -0 -n1 jsonlint -v + + - name: setup folder for logs + run: | + mkdir -p ${{ runner.temp }}/i18n_logs + + - name: i18n compare + continue-on-error: true + working-directory: ./public/locales + run: | + python3 ../../scripts/i18n_checker.py \ + compare --en-locale-path en \ + --base-path . \ + --search-path .. \ + --output-dir ${{ runner.temp }}/i18n_logs + + - name: i18n unused + continue-on-error: true + working-directory: ./public/locales + run: | + python3 ../../scripts/i18n_checker.py \ + unused --en-locale-path en \ + --base-path . \ + --search-path .. \ + --output-dir ${{ runner.temp }}/i18n_logs + + - name: Artifact upload for i18n checks + uses: actions/upload-artifact@v4 + with: + name: i18n-logs + path: ${{ runner.temp }}/i18n_logs diff --git a/public/locales/af/mining-view.json b/public/locales/af/mining-view.json index d1d7f76e5..2c01e3a81 100644 --- a/public/locales/af/mining-view.json +++ b/public/locales/af/mining-view.json @@ -8,8 +8,8 @@ "estimated-earnings": "Geskatte verdienste", "floor": "Vloer", "gpu-hashrate": "GPU Hashrate", - "gpu-usage": "GPU Usage", "gpu-power": "GPU Krag", + "gpu-usage": "GPU Usage", "mining-button-text": { "cancel-mining": "Kanselleer myn", "changing-mode": "Verander modus", diff --git a/src/App/App.tsx b/src/App/App.tsx index 9817bfa4b..7e6aee8d4 100644 --- a/src/App/App.tsx +++ b/src/App/App.tsx @@ -2,6 +2,7 @@ import { LazyMotion, domMax, MotionConfig } from 'framer-motion'; import { useAppStateStore } from '@app/store/appStateStore'; import { useShuttingDown } from '@app/hooks'; +import { useEffect, useRef } from 'react'; import ShuttingDownScreen from '../containers/phase/ShuttingDownScreen/ShuttingDownScreen.tsx'; import FloatingElements from '../containers/floating/FloatingElements.tsx'; import MainView from '../containers/main/MainView.tsx'; @@ -16,6 +17,16 @@ import AppContent from './AppContent'; export default function App() { const isShuttingDown = useShuttingDown(); const isSettingUp = useAppStateStore((s) => s.isSettingUp); + const hasCompletedSetup = useRef(false); + + useEffect(() => { + if (!isSettingUp) { + hasCompletedSetup.current = true; + } + }, [isSettingUp]); + + const showSetup = isSettingUp && !hasCompletedSetup.current && !isShuttingDown; + return ( @@ -30,8 +41,8 @@ export default function App() { - {isSettingUp ? : null} - {isShuttingDown || isSettingUp ? null : } + {showSetup ? : null} + {isShuttingDown || showSetup ? null : } {isShuttingDown ? : null} diff --git a/src/hooks/app/useShuttingDown.ts b/src/hooks/app/useShuttingDown.ts index 62d469da9..db1788a51 100644 --- a/src/hooks/app/useShuttingDown.ts +++ b/src/hooks/app/useShuttingDown.ts @@ -1,3 +1,4 @@ +import { tray } from '@app/utils'; import { useEffect, useState } from 'react'; import { getCurrentWebviewWindow } from '@tauri-apps/api/webviewWindow'; import { resetAllStores } from '@app/store/create.ts'; @@ -8,7 +9,8 @@ export function useShuttingDown() { useEffect(() => { const ul = appWindow.onCloseRequested(async (event) => { - if (!isShuttingDown && !event.isPreventDefault()) { + if (!isShuttingDown) { + event.preventDefault(); setIsShuttingDown(true); } }); @@ -19,8 +21,10 @@ export function useShuttingDown() { useEffect(() => { if (isShuttingDown) { - setTimeout(async () => { + setTimeout(() => { + tray?.close(); resetAllStores(); + appWindow.close(); }, 250); } }, [isShuttingDown]); diff --git a/src/hooks/app/useSystemTray.ts b/src/hooks/app/useSystemTray.ts index 9676f64a0..b712af82a 100644 --- a/src/hooks/app/useSystemTray.ts +++ b/src/hooks/app/useSystemTray.ts @@ -1,12 +1,5 @@ import { MinerMetrics } from '@app/types/app-status'; -import { - menu, - CPU_HASH_ITEM_ID, - GPU_HASH_ITEM_ID, - CPU_USAGE_ITEM_ID, - GPU_USAGE_ITEM_ID, - EARNINGS_ITEM_ID, -} from '@app/utils'; +import { menu, CPU_HASH_ITEM_ID, GPU_HASH_ITEM_ID, EARNINGS_ITEM_ID } from '@app/utils'; import { listen } from '@tauri-apps/api/event'; import { useCallback, useEffect, useMemo, useState } from 'react'; @@ -35,20 +28,14 @@ export function useUpdateSystemTray() { const { cpu, gpu } = metrics || {}; const cpu_h = cpu?.mining?.hash_rate || 0; const gpu_h = gpu?.mining?.hash_rate || 0; - const cpu_u = cpu?.hardware?.[0]?.parameters?.usage_percentage || 0; // use 1st for now - const gpu_u = gpu?.hardware?.[0]?.parameters?.usage_percentage || 0; const cpuHashItemText = `CPU Hashrate: ${cpu_h ? `${formatHashrate(cpu_h)}` : '-'}`; const gpuHashItemText = `GPU Hashrate: ${gpu_h ? `${formatHashrate(gpu_h)}` : '-'}`; - const cpuUsageItemText = `CPU Usage: ${cpu_u ? `${cpu_u}%` : '-'}`; - const gpuUsageItemText = `GPU Usage: ${gpu_u ? `${gpu_u}%` : '-'}`; const estEarningsItemText = `Est earning: ${totalEarningsFormatted !== '0' ? totalEarningsFormatted : '-'} tXTM/day`; return [ { itemId: CPU_HASH_ITEM_ID, itemText: cpuHashItemText }, { itemId: GPU_HASH_ITEM_ID, itemText: gpuHashItemText }, - { itemId: CPU_USAGE_ITEM_ID, itemText: cpuUsageItemText }, - { itemId: GPU_USAGE_ITEM_ID, itemText: gpuUsageItemText }, { itemId: EARNINGS_ITEM_ID, itemText: estEarningsItemText }, ]; }, [metrics, totalEarningsFormatted]); diff --git a/src/store/useAirdropStore.ts b/src/store/useAirdropStore.ts index b0efc0542..ab815a46a 100644 --- a/src/store/useAirdropStore.ts +++ b/src/store/useAirdropStore.ts @@ -1,7 +1,7 @@ +import * as Sentry from '@sentry/react'; import { createWithEqualityFn as create } from 'zustand/traditional'; import { persist } from 'zustand/middleware'; import { invoke } from '@tauri-apps/api/core'; -import * as Sentry from '@sentry/react'; import { useMiningStore } from './useMiningStore'; export const GIFT_GEMS = 5000; diff --git a/src/utils/systray.ts b/src/utils/systray.ts index bcc83eed8..d3a2c9513 100644 --- a/src/utils/systray.ts +++ b/src/utils/systray.ts @@ -10,8 +10,6 @@ const darkIconPath = 'icons/icon.png'; export const CPU_HASH_ITEM_ID = 'cpu_hashrate'; export const GPU_HASH_ITEM_ID = 'gpu_hashrate'; -export const CPU_USAGE_ITEM_ID = 'cpu_usage'; -export const GPU_USAGE_ITEM_ID = 'gpu_usage'; export const EARNINGS_ITEM_ID = 'estimated_earning'; const prefersDarkMode = () => window.matchMedia('(prefers-color-scheme: dark)').matches; @@ -42,17 +40,6 @@ const dynamicItems = [ enabled: false, }, separator, - { - id: CPU_USAGE_ITEM_ID, - text: `CPU usage: -`, - enabled: false, - }, - { - id: GPU_USAGE_ITEM_ID, - text: `GPU usage: -`, - enabled: false, - }, - separator, { id: EARNINGS_ITEM_ID, text: `Est earning: -`, @@ -60,15 +47,20 @@ const dynamicItems = [ }, ] as MenuItemOptions[]; -export const menu = await Menu.new({ - id: TRAY_MENU_ID, - items: [about, separator, ...dynamicItems, separator, minimize], -}); - -export const tray = await TrayIcon.getById(TRAY_ID); +let tray: TrayIcon | null; +let menu: Menu; export async function initSystray() { + menu = await Menu.new({ + id: TRAY_MENU_ID, + items: [about, separator, ...dynamicItems, separator, minimize], + }); + + tray = await TrayIcon.getById(TRAY_ID); + await tray?.setIcon(icon); if (menu) { await tray?.setMenu(menu); } } + +export { tray, menu }; From d965d8f8f8457950ef49cd7e5a72739ad8a9d84a Mon Sep 17 00:00:00 2001 From: Shannon Tenner Date: Thu, 21 Nov 2024 13:15:04 +0200 Subject: [PATCH 2/3] fix cli pkg name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d2938f94..033fa53f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -122,5 +122,5 @@ jobs: workspaces: './src-tauri -> target' - name: test tauri build run: | - npm install tauri-cli@latest + npm install @tauri-apps/cli@latest npm run tauri build -- --ci --bundles deb From 36b7e00192392cd88689c30f416b4b6e27459ff9 Mon Sep 17 00:00:00 2001 From: Shannon Tenner Date: Thu, 21 Nov 2024 13:38:51 +0200 Subject: [PATCH 3/3] ci: update cargo.toml | use cargo build | lints --- .github/workflows/ci.yml | 8 +- .../workflows/{ci_i18n.yml => pr_i18n.yml} | 2 +- src-tauri/Cargo.lock | 647 +++++++++--------- src-tauri/Cargo.toml | 14 +- .../CustomPowerLevelsDialog.tsx | 8 +- .../CustomPowerLevelsDialogContainer.tsx | 2 +- .../CustomPowerLevels/RangeInput.tsx | 12 - src/store/useAppConfigStore.ts | 2 +- src/store/useMiningStore.ts | 4 +- 9 files changed, 357 insertions(+), 342 deletions(-) rename .github/workflows/{ci_i18n.yml => pr_i18n.yml} (98%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 033fa53f2..3e60f03ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,7 +120,9 @@ jobs: - uses: swatinem/rust-cache@v2.7.5 with: workspaces: './src-tauri -> target' - - name: test tauri build + - name: cargo tauri build + working-directory: ./src-tauri run: | - npm install @tauri-apps/cli@latest - npm run tauri build -- --ci --bundles deb + cargo install tauri-cli --version "^2" --locked + cargo tauri --version + cargo tauri build --ci --bundles deb diff --git a/.github/workflows/ci_i18n.yml b/.github/workflows/pr_i18n.yml similarity index 98% rename from .github/workflows/ci_i18n.yml rename to .github/workflows/pr_i18n.yml index 44efbffd2..c132b6e3e 100644 --- a/.github/workflows/ci_i18n.yml +++ b/.github/workflows/pr_i18n.yml @@ -1,5 +1,5 @@ --- -name: i18n Checks +name: PR - i18n Checks 'on': workflow_dispatch: diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 18f777475..6de1e3d72 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -310,7 +310,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -350,7 +350,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -367,7 +367,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -381,7 +381,7 @@ dependencies = [ "crc32fast", "futures-lite", "pin-project 1.1.7", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-util 0.7.12", ] @@ -422,7 +422,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f012b8cc0c850f34117ec8252a44418f2e34a2cf501de89e29b241ae5f79471" dependencies = [ "dirs 4.0.0", - "thiserror", + "thiserror 1.0.69", "winreg 0.10.1", ] @@ -434,9 +434,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.7.7" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", "axum-core", @@ -445,7 +445,7 @@ dependencies = [ "http", "http-body", "http-body-util", - "itoa 1.0.11", + "itoa 1.0.13", "matchit", "memchr", "mime", @@ -453,7 +453,7 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tower 0.5.1", "tower-layer", "tower-service", @@ -474,7 +474,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tower-layer", "tower-service", ] @@ -500,7 +500,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978e81a45367d2409ecd33369a45dda2e9a3ca516153ec194de1fbda4b9fb79d" dependencies = [ - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -636,9 +636,9 @@ dependencies = [ [[package]] name = "borsh" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5327f6c99920069d1fe374aa743be1af0031dea9f250852cdf1ae6a0861ee24" +checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03" dependencies = [ "borsh-derive", "cfg_aliases 0.2.1", @@ -646,15 +646,15 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10aedd8f1a81a8aafbfde924b0e3061cd6fedd6f6bbcfc6a76e6fd426d7bfe26" +checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244" dependencies = [ "once_cell", "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -707,9 +707,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" +checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" [[package]] name = "byteorder" @@ -770,7 +770,7 @@ dependencies = [ "glib", "libc", "once_cell", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -813,7 +813,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -828,9 +828,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.37" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "jobserver", "libc", @@ -975,9 +975,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", "clap_derive", @@ -985,9 +985,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", @@ -997,11 +997,11 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.37" +version = "4.5.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11611dca53440593f38e6b25ec629de50b14cdfa63adc0fb856115a2c6d97595" +checksum = "d9647a559c112175f17cf724dc72d3645680a883c58481332779192b0d8e7a01" dependencies = [ - "clap 4.5.20", + "clap 4.5.21", ] [[package]] @@ -1013,14 +1013,14 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "clap_mangen" @@ -1028,7 +1028,7 @@ version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbae9cbfdc5d4fa8711c09bd7b83f644cb48281ac35bf97af3e47b0675864bdf" dependencies = [ - "clap 4.5.20", + "clap 4.5.21", "roff", ] @@ -1111,6 +1111,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "cookie" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" +dependencies = [ + "time", + "version_check", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -1172,9 +1182,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6" dependencies = [ "libc", ] @@ -1308,17 +1318,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "ctor" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1356,7 +1366,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1380,7 +1390,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1391,7 +1401,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1454,7 +1464,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1467,7 +1477,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1493,9 +1503,9 @@ dependencies = [ [[package]] name = "diesel" -version = "2.2.4" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "158fe8e2e68695bd615d7e4f3227c0727b151330d3e253b525086c348d055d5e" +checksum = "cbf9649c05e0a9dbd6d0b0b8301db5182b972d0fd02f0a7c6736cf632d7c0fd5" dependencies = [ "bigdecimal", "chrono", @@ -1519,7 +1529,7 @@ dependencies = [ "dsl_auto_type", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1539,7 +1549,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" dependencies = [ - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1629,7 +1639,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1652,7 +1662,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1681,7 +1691,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1719,9 +1729,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embed-resource" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e24052d7be71f0efb50c201557f6fe7d237cfd5a64fd5bcd7fd8fe32dbbffa" +checksum = "b68b6f9f63a0b6a38bc447d4ce84e2b388f3ec95c99c641c8ff0dd3ef89a6379" dependencies = [ "cc", "memchr", @@ -1767,7 +1777,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1788,7 +1798,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -1923,23 +1933,14 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", ] -[[package]] -name = "fluent-uri" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "fnv" version = "1.0.7" @@ -1973,7 +1974,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2098,7 +2099,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2322,7 +2323,7 @@ dependencies = [ "once_cell", "pin-project-lite", "smallvec", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2358,7 +2359,7 @@ dependencies = [ "memchr", "once_cell", "smallvec", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2372,7 +2373,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -2473,14 +2474,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes 1.8.0", @@ -2576,7 +2577,7 @@ dependencies = [ "once_cell", "radix_trie", "rand 0.8.5", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -2599,11 +2600,12 @@ dependencies = [ "idna 0.5.0", "ipnet", "once_cell", + "openssl", "rand 0.8.5", "ring", "rustls", "rustls-pemfile", - "thiserror", + "thiserror 1.0.69", "time", "tinyvec", "tokio", @@ -2628,7 +2630,7 @@ dependencies = [ "rand 0.8.5", "resolv-conf", "smallvec", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -2695,7 +2697,7 @@ checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes 1.8.0", "fnv", - "itoa 1.0.11", + "itoa 1.0.13", ] [[package]] @@ -2741,9 +2743,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes 1.8.0", "futures-channel", @@ -2753,7 +2755,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.11", + "itoa 1.0.13", "pin-project-lite", "smallvec", "tokio", @@ -2974,7 +2976,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -3046,13 +3048,13 @@ dependencies = [ [[package]] name = "impl-trait-for-tuples" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" +checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.89", ] [[package]] @@ -3207,9 +3209,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "javascriptcore-rs" @@ -3245,7 +3247,7 @@ dependencies = [ "combine", "jni-sys", "log", - "thiserror", + "thiserror 1.0.69", "walkdir", "windows-sys 0.45.0", ] @@ -3274,39 +3276,16 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "json-patch" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" -dependencies = [ - "jsonptr 0.4.7", - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "json-patch" version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08" dependencies = [ - "jsonptr 0.6.3", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "jsonptr" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" -dependencies = [ - "fluent-uri", + "jsonptr", "serde", "serde_json", + "thiserror 1.0.69", ] [[package]] @@ -3364,7 +3343,7 @@ dependencies = [ "linux-keyutils", "log", "security-framework 2.11.1", - "security-framework 3.0.0", + "security-framework 3.0.1", "windows-sys 0.59.0", ] @@ -3413,9 +3392,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.162" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "liblmdb-sys" @@ -3568,7 +3547,7 @@ dependencies = [ "serde-value", "serde_json", "serde_yaml", - "thiserror", + "thiserror 1.0.69", "thread-id", "typemap-ors", "winapi", @@ -3779,7 +3758,7 @@ dependencies = [ "procfs-core", "scroll", "tempfile", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3796,7 +3775,7 @@ dependencies = [ "parking_lot", "polling", "scroll", - "thiserror", + "thiserror 1.0.69", "uds", ] @@ -3808,7 +3787,7 @@ checksum = "d7c4f23f835dbe67e44ddf884d3802ff549ca5948bf60e9fd70e9a13c96324d1" dependencies = [ "crash-handler", "minidumper", - "thiserror", + "thiserror 1.0.69", "uuid", ] @@ -3836,8 +3815,8 @@ dependencies = [ [[package]] name = "minotari_app_grpc" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "argon2", "base64 0.13.1", @@ -3857,7 +3836,7 @@ dependencies = [ "tari_max_size", "tari_script", "tari_utilities", - "thiserror", + "thiserror 1.0.69", "tokio", "tonic", "tonic-build", @@ -3866,8 +3845,8 @@ dependencies = [ [[package]] name = "minotari_ledger_wallet_common" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "bs58 0.5.1", ] @@ -3875,7 +3854,7 @@ dependencies = [ [[package]] name = "minotari_node_grpc_client" version = "0.1.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "minotari_app_grpc", ] @@ -3883,11 +3862,11 @@ dependencies = [ [[package]] name = "minotari_wallet_grpc_client" version = "0.1.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "minotari_app_grpc", "tari_common_types", - "thiserror", + "thiserror 1.0.69", "tonic", ] @@ -3916,7 +3895,7 @@ dependencies = [ "hex-literal", "sealed", "serde", - "thiserror", + "thiserror 1.0.69", "tiny-keccak", ] @@ -3936,7 +3915,7 @@ dependencies = [ "once_cell", "png", "serde", - "thiserror", + "thiserror 1.0.69", "windows-sys 0.59.0", ] @@ -4024,7 +4003,7 @@ dependencies = [ "ndk-sys", "num_enum", "raw-window-handle", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4143,7 +4122,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4153,7 +4132,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ "arrayvec", - "itoa 1.0.11", + "itoa 1.0.13", ] [[package]] @@ -4192,7 +4171,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4205,7 +4184,7 @@ dependencies = [ "libloading 0.8.5", "nvml-wrapper-sys", "static_assertions", - "thiserror", + "thiserror 1.0.69", "wrapcenum-derive", ] @@ -4472,9 +4451,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "open" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" +checksum = "3ecd52f0b8d15c40ce4820aa251ed5de032e5d91fab27f7db2f40d42a8bdf69c" dependencies = [ "is-wsl", "libc", @@ -4504,7 +4483,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4598,28 +4577,29 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.12" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" +checksum = "8be4817d39f3272f69c59fe05d0535ae6456c2dc2fa1ba02910296c7e0a5c590" dependencies = [ "arrayvec", "bitvec", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive", + "rustversion", "serde", ] [[package]] name = "parity-scale-codec-derive" -version = "3.6.12" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" +checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b" dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.89", ] [[package]] @@ -4814,7 +4794,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -4850,7 +4830,7 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dfa808155f59afafc457bd1a3835cb35d827f4387238099faa673447a656bfb" dependencies = [ - "clap 4.5.20", + "clap 4.5.21", "clap_complete", "clap_mangen", "include-lines", @@ -4895,7 +4875,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5041,7 +5021,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5062,7 +5042,7 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ - "thiserror", + "thiserror 1.0.69", "toml 0.5.11", ] @@ -5116,9 +5096,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "307e3004becf10f5a6e0d59d20f3cd28231b0e0827a96cd3e0ce6d14bc1e4bb3" dependencies = [ "unicode-ident", ] @@ -5192,7 +5172,7 @@ dependencies = [ "prost 0.13.3", "prost-types 0.13.3", "regex", - "syn 2.0.87", + "syn 2.0.89", "tempfile", ] @@ -5219,7 +5199,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5257,9 +5237,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" dependencies = [ "bytes 1.8.0", "pin-project-lite", @@ -5268,26 +5248,29 @@ dependencies = [ "rustc-hash", "rustls", "socket2", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", ] [[package]] name = "quinn-proto" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes 1.8.0", + "getrandom 0.2.15", "rand 0.8.5", "ring", "rustc-hash", "rustls", + "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.3", "tinyvec", "tracing", + "web-time", ] [[package]] @@ -5429,7 +5412,7 @@ checksum = "9abb8f2aa3432700c2b64a67406ac0da4956d78991f50559509cecc2b6abf249" dependencies = [ "bitflags 1.3.2", "libc", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5508,7 +5491,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom 0.2.15", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5525,9 +5508,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -5576,7 +5559,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "system-configuration", "tokio", "tokio-native-tls", @@ -5652,9 +5635,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.39" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", @@ -5665,9 +5648,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.16" +version = "0.23.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" +checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e" dependencies = [ "log", "once_cell", @@ -5692,6 +5675,9 @@ name = "rustls-pki-types" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +dependencies = [ + "web-time", +] [[package]] name = "rustls-webpki" @@ -5737,9 +5723,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -5777,7 +5763,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5803,7 +5789,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5815,7 +5801,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -5833,9 +5819,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d0283c0a4a22a0f1b0e4edca251aa20b92fc96eaa09b84bec052f9415e9d71" +checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" dependencies = [ "bitflags 2.6.0", "core-foundation 0.10.0", @@ -5846,9 +5832,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -5982,7 +5968,7 @@ checksum = "c1356f9564dba35a7269402415ed1f3d6598a8ed51e62e8d8e75da1b4361b3f5" dependencies = [ "minidumper-child", "sentry", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6008,7 +5994,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "time", "url", "uuid", @@ -6016,9 +6002,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -6046,13 +6032,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6063,16 +6049,16 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ - "itoa 1.0.11", + "itoa 1.0.13", "memchr", "ryu", "serde", @@ -6086,7 +6072,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6105,7 +6091,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.11", + "itoa 1.0.13", "ryu", "serde", ] @@ -6137,7 +6123,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6147,7 +6133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ "indexmap 2.6.0", - "itoa 1.0.11", + "itoa 1.0.13", "ryu", "serde", "unsafe-libyaml", @@ -6256,7 +6242,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", "num-traits", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -6289,7 +6275,7 @@ checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6525,9 +6511,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.87" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -6542,9 +6528,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] @@ -6569,7 +6555,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6631,9 +6617,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.30.5" +version = "0.30.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63f1f6b2017cc33d7f6fc9c6186a2c0f5dfc985899a7b4fe9e64985c17533db3" +checksum = "6682a07cf5bab0b8a2bd20d0a542917ab928b5edb75ebd4eda6b05cbaab872da" dependencies = [ "bitflags 2.6.0", "cocoa", @@ -6676,7 +6662,7 @@ checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -6730,6 +6716,8 @@ dependencies = [ "flate2", "futures-lite", "futures-util", + "hickory-client", + "hickory-proto", "jsonwebtoken", "keyring", "libsqlite3-sys", @@ -6768,7 +6756,7 @@ dependencies = [ "tauri-plugin-shell", "tauri-plugin-single-instance", "tauri-plugin-updater", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-util 0.7.12", "winreg 0.52.0", @@ -6799,8 +6787,8 @@ dependencies = [ [[package]] name = "tari_common" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "anyhow", "config", @@ -6817,28 +6805,28 @@ dependencies = [ "structopt", "tari_features", "tempfile", - "thiserror", + "thiserror 1.0.69", "toml 0.5.11", ] [[package]] name = "tari_common_sqlite" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "diesel", "diesel_migrations", "log", "serde", "tari_utilities", - "thiserror", + "thiserror 1.0.69", "tokio", ] [[package]] name = "tari_common_types" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "base64 0.21.7", "bitflags 2.6.0", @@ -6858,13 +6846,13 @@ dependencies = [ "tari_common", "tari_crypto", "tari_utilities", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "tari_comms" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "anyhow", "async-trait", @@ -6895,7 +6883,7 @@ dependencies = [ "tari_shutdown", "tari_storage", "tari_utilities", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-util 0.6.10", @@ -6907,8 +6895,8 @@ dependencies = [ [[package]] name = "tari_comms_dht" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "anyhow", "bitflags 2.6.0", @@ -6934,7 +6922,7 @@ dependencies = [ "tari_shutdown", "tari_storage", "tari_utilities", - "thiserror", + "thiserror 1.0.69", "tokio", "tower 0.4.13", "zeroize", @@ -6942,8 +6930,8 @@ dependencies = [ [[package]] name = "tari_comms_rpc_macros" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "proc-macro2", "quote", @@ -6952,9 +6940,10 @@ dependencies = [ [[package]] name = "tari_core" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ + "anyhow", "async-trait", "bincode", "bitflags 2.6.0", @@ -6970,6 +6959,7 @@ dependencies = [ "fs2", "futures 0.3.31", "hex", + "hickory-client", "integer-encoding", "lmdb-zero", "log", @@ -7011,7 +7001,7 @@ dependencies = [ "tari_storage", "tari_test_utils", "tari_utilities", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "zeroize", @@ -7043,13 +7033,13 @@ dependencies = [ [[package]] name = "tari_features" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" [[package]] name = "tari_hashing" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "borsh", "digest", @@ -7058,8 +7048,8 @@ dependencies = [ [[package]] name = "tari_key_manager" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "argon2", "async-trait", @@ -7084,26 +7074,26 @@ dependencies = [ "tari_crypto", "tari_service_framework", "tari_utilities", - "thiserror", + "thiserror 1.0.69", "tokio", "zeroize", ] [[package]] name = "tari_max_size" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "borsh", "serde", "tari_utilities", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "tari_mmr" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "borsh", "digest", @@ -7111,13 +7101,13 @@ dependencies = [ "serde", "tari_crypto", "tari_utilities", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "tari_p2p" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "anyhow", "fs2", @@ -7138,7 +7128,7 @@ dependencies = [ "tari_shutdown", "tari_storage", "tari_utilities", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tower 0.4.13", @@ -7147,8 +7137,8 @@ dependencies = [ [[package]] name = "tari_script" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "blake2", "borsh", @@ -7160,48 +7150,48 @@ dependencies = [ "tari_crypto", "tari_max_size", "tari_utilities", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "tari_service_framework" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "anyhow", "async-trait", "futures 0.3.31", "log", "tari_shutdown", - "thiserror", + "thiserror 1.0.69", "tokio", "tower-service", ] [[package]] name = "tari_shutdown" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "futures 0.3.31", ] [[package]] name = "tari_storage" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "bincode", "lmdb-zero", "log", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "tari_test_utils" -version = "1.8.0-pre.0" -source = "git+https://github.com/tari-project/tari.git?branch=development#a2aa20e46760384982f7631c200c9196cf1bbb31" +version = "1.9.0-pre.0" +source = "git+https://github.com/tari-project/tari.git?branch=development#0610bcceb5debb91484191f6178e2591db123263" dependencies = [ "futures 0.3.31", "rand 0.8.5", @@ -7232,9 +7222,9 @@ dependencies = [ [[package]] name = "tauri" -version = "2.0.6" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3889b392db6d32a105d3757230ea0220090b8f94c90d3e60b6c5eb91178ab1b" +checksum = "e545de0a2dfe296fa67db208266cd397c5a55ae782da77973ef4c4fac90e9f2c" dependencies = [ "anyhow", "bytes 1.8.0", @@ -7270,7 +7260,7 @@ dependencies = [ "tauri-runtime", "tauri-runtime-wry", "tauri-utils", - "thiserror", + "thiserror 2.0.3", "tokio", "tray-icon", "url", @@ -7284,16 +7274,16 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f96827ccfb1aa40d55d0ded79562d18ba18566657a553f992a982d755148376" +checksum = "7bd2a4bcfaf5fb9f4be72520eefcb61ae565038f8ccba2a497d8c28f463b8c01" dependencies = [ "anyhow", "cargo_toml", "dirs 5.0.1", "glob", "heck 0.5.0", - "json-patch 3.0.1", + "json-patch", "schemars", "semver", "serde", @@ -7307,14 +7297,14 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947f16f47becd9e9cd39b74ee337fd1981574d78819be18e4384d85e5a0b82f" +checksum = "bf79faeecf301d3e969b1fae977039edb77a4c1f25cc0a961be298b54bff97cf" dependencies = [ "base64 0.22.1", "brotli", "ico", - "json-patch 2.0.0", + "json-patch", "plist", "png", "proc-macro2", @@ -7323,9 +7313,9 @@ dependencies = [ "serde", "serde_json", "sha2", - "syn 2.0.87", + "syn 2.0.89", "tauri-utils", - "thiserror", + "thiserror 2.0.3", "time", "url", "uuid", @@ -7334,23 +7324,23 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd1c8d4a66799d3438747c3a79705cd665a95d6f24cb5f315413ff7a981fe2a" +checksum = "c52027c8c5afb83166dacddc092ee8fff50772f9646d461d8c33ee887e447a03" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "tauri-codegen", "tauri-utils", ] [[package]] name = "tauri-plugin" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa4e6c94cb1d635f65a770c69e23de1bc054b0e4c554fa037a7cc7676333d39" +checksum = "e753f2a30933a9bbf0a202fa47d7cc4a3401f06e8d6dcc53b79aa62954828c79" dependencies = [ "anyhow", "glob", @@ -7378,7 +7368,7 @@ dependencies = [ "sys-locale", "tauri", "tauri-plugin", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -7394,7 +7384,7 @@ dependencies = [ "serde", "tauri", "tauri-plugin", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -7414,7 +7404,7 @@ dependencies = [ "shared_child", "tauri", "tauri-plugin", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -7428,7 +7418,7 @@ dependencies = [ "serde", "serde_json", "tauri", - "thiserror", + "thiserror 1.0.69", "windows-sys 0.59.0", "zbus", ] @@ -7455,7 +7445,7 @@ dependencies = [ "tauri", "tauri-plugin", "tempfile", - "thiserror", + "thiserror 1.0.69", "time", "tokio", "url", @@ -7465,9 +7455,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ef7363e7229ac8d04e8a5d405670dbd43dde8fc4bc3bc56105c35452d03784" +checksum = "cce18d43f80d4aba3aa8a0c953bbe835f3d0f2370aca75e8dbb14bd4bab27958" dependencies = [ "dpi", "gtk", @@ -7477,16 +7467,16 @@ dependencies = [ "serde", "serde_json", "tauri-utils", - "thiserror", + "thiserror 2.0.3", "url", "windows 0.58.0", ] [[package]] name = "tauri-runtime-wry" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62fa2068e8498ad007b54d5773d03d57c3ff6dd96f8c8ce58beff44d0d5e0d30" +checksum = "9f442a38863e10129ffe2cec7bd09c2dcf8a098a3a27801a476a304d5bb991d2" dependencies = [ "gtk", "http", @@ -7510,9 +7500,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc65d6f5c54e56b66258948a6d9e47a82ea41f4b5a7612bfbdd1634c2913ed0" +checksum = "9271a88f99b4adea0dc71d0baca4505475a0bbd139fb135f62958721aaa8fe54" dependencies = [ "aes-gcm", "brotli", @@ -7522,8 +7512,9 @@ dependencies = [ "getrandom 0.2.15", "glob", "html5ever", + "http", "infer", - "json-patch 2.0.0", + "json-patch", "kuchikiki", "log", "memchr", @@ -7539,7 +7530,7 @@ dependencies = [ "serde_with", "serialize-to-javascript", "swift-rs", - "thiserror", + "thiserror 2.0.3", "toml 0.8.19", "url", "urlpattern", @@ -7598,22 +7589,42 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.68" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +dependencies = [ + "thiserror-impl 2.0.3", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "thiserror-impl", + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] name = "thiserror-impl" -version = "1.0.68" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -7653,7 +7664,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", - "itoa 1.0.11", + "itoa 1.0.13", "num-conv", "powerfmt", "serde", @@ -7737,7 +7748,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -7924,7 +7935,7 @@ dependencies = [ "prost-build 0.13.3", "prost-types 0.13.3", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -7994,7 +8005,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -8033,7 +8044,7 @@ dependencies = [ "once_cell", "png", "serde", - "thiserror", + "thiserror 1.0.69", "windows-sys 0.59.0", ] @@ -8160,9 +8171,9 @@ checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -8396,7 +8407,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "wasm-bindgen-shared", ] @@ -8430,7 +8441,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8549,7 +8560,7 @@ checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -8558,7 +8569,7 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3a3e2eeb58f82361c93f9777014668eb3d07e7d174ee4c819575a9208011886" dependencies = [ - "thiserror", + "thiserror 1.0.69", "windows 0.58.0", "windows-core 0.58.0", ] @@ -8707,7 +8718,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -8718,7 +8729,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -8729,7 +8740,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -8740,7 +8751,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -9061,7 +9072,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -9078,12 +9089,13 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "wry" -version = "0.46.3" +version = "0.47.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd5cdf57c66813d97601181349c63b96994b3074fc3d7a31a8cce96e968e3bbd" +checksum = "61ce51277d65170f6379d8cda935c80e3c2d1f0ff712a123c8bddb11b31a4b73" dependencies = [ "base64 0.22.1", "block2", + "cookie", "crossbeam-channel", "dpi", "dunce", @@ -9107,7 +9119,8 @@ dependencies = [ "sha2", "soup3", "tao-macros", - "thiserror", + "thiserror 1.0.69", + "url", "webkit2gtk", "webkit2gtk-sys", "webview2-com", @@ -9179,9 +9192,9 @@ dependencies = [ [[package]] name = "yamux" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31b5e376a8b012bee9c423acdbb835fc34d45001cfa3106236a624e4b738028" +checksum = "17610762a1207ee816c6fadc29220904753648aba0a9ed61c7b8336e80a559c4" dependencies = [ "futures 0.3.31", "log", @@ -9222,7 +9235,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "synstructure 0.13.1", ] @@ -9273,7 +9286,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "zvariant_utils", ] @@ -9306,7 +9319,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -9326,7 +9339,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "synstructure 0.13.1", ] @@ -9347,7 +9360,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -9369,7 +9382,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] [[package]] @@ -9394,7 +9407,7 @@ dependencies = [ "pbkdf2", "rand 0.8.5", "sha1", - "thiserror", + "thiserror 1.0.69", "time", "zeroize", "zopfli", @@ -9465,7 +9478,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", "zvariant_utils", ] @@ -9477,5 +9490,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.89", ] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 1c5f5fbf2..f00bc941f 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -60,6 +60,11 @@ tari_common_types = { git = "https://github.com/tari-project/tari.git", branch = tari_core = { git = "https://github.com/tari-project/tari.git", branch = "development", features = [ "transactions", ] } +hickory-client = { version = "=0.25.0-alpha.2", features = [ + "dns-over-rustls", + "dnssec-openssl", +] } +hickory-proto = { version = "=0.25.0-alpha.2" } tari_crypto = "0.21.0" tari_key_manager = { git = "https://github.com/tari-project/tari.git", branch = "development" } tari_shutdown = { git = "https://github.com/tari-project/tari.git", branch = "development" } @@ -107,4 +112,11 @@ release-ci = ["tauri/custom-protocol"] release-ci-beta = ["tauri/custom-protocol"] [package.metadata.cargo-machete] -ignored = ["log4rs", "xz2", "libsqlite3-sys", "minotari_wallet_grpc_client"] +ignored = [ + "log4rs", + "xz2", + "libsqlite3-sys", + "minotari_wallet_grpc_client", + "hickory-client", + "hickory-proto", +] diff --git a/src/containers/main/SideBar/Miner/components/CustomPowerLevels/CustomPowerLevelsDialog.tsx b/src/containers/main/SideBar/Miner/components/CustomPowerLevels/CustomPowerLevelsDialog.tsx index 05b7e15c2..852654274 100644 --- a/src/containers/main/SideBar/Miner/components/CustomPowerLevels/CustomPowerLevelsDialog.tsx +++ b/src/containers/main/SideBar/Miner/components/CustomPowerLevels/CustomPowerLevelsDialog.tsx @@ -1,7 +1,7 @@ import { Typography } from '@app/components/elements/Typography'; import { useMiningStore } from '@app/store/useMiningStore'; -import { invoke } from '@tauri-apps/api/core'; -import React, { useCallback, useEffect, useMemo, useState } from 'react'; + +import React, { useCallback, useEffect, useState } from 'react'; import { GpuThreads, MaxConsumptionLevels } from '@app/types/app-status'; import { RangeInputComponent } from './RangeInput'; import { useAppConfigStore } from '@app/store/useAppConfigStore'; @@ -87,7 +87,7 @@ export function CustomPowerLevelsDialog({ const changeMiningMode = useMiningStore((s) => s.changeMiningMode); const isChangingMode = useMiningStore((s) => s.isChangingMode); - const { control, handleSubmit, setValue, getValues } = useForm({ + const { control, handleSubmit, setValue } = useForm({ defaultValues: { [FormFields.CPU]: resolveCpuInitialThreads(configCpuLevels, mode, maxAvailableThreads), [FormFields.GPUS]: resolveGpuInitialThreads(configGpuLevels, mode, maxAvailableThreads), @@ -156,7 +156,7 @@ export function CustomPowerLevelsDialog({ key={gpu.id} control={control} name={`${FormFields.GPUS}.${index}.gpu_name`} - render={({ field }) => ( + render={({ field: _field }) => ( { if (!maxThreads) { fetchMaxThreads(); } - }, [maxThreads]); + }, [fetchMaxThreads, maxThreads]); return ( diff --git a/src/store/useAppConfigStore.ts b/src/store/useAppConfigStore.ts index c05428cf1..7d285e925 100644 --- a/src/store/useAppConfigStore.ts +++ b/src/store/useAppConfigStore.ts @@ -222,7 +222,7 @@ export const useAppConfigStore = create()((set, getState) = const { mode, customGpuLevels, customCpuLevels } = params; const prevMode = useAppConfigStore.getState().mode; set({ mode, custom_max_cpu_usage: customCpuLevels, custom_max_gpu_usage: customGpuLevels }); - console.log('Setting mode', mode, customCpuLevels, customGpuLevels); + console.info('Setting mode', mode, customCpuLevels, customGpuLevels); invoke('set_mode', { mode, customCpuUsage: customCpuLevels, diff --git a/src/store/useMiningStore.ts b/src/store/useMiningStore.ts index 00aefe73e..7718e978a 100644 --- a/src/store/useMiningStore.ts +++ b/src/store/useMiningStore.ts @@ -147,7 +147,7 @@ export const useMiningStore = create()((set, getState) => ({ set({ isChangingMode: true }); if (state.cpu.mining.is_mining || state.gpu.mining.is_mining) { - console.log('Pausing mining...'); + console.info('Pausing mining...'); await state.pauseMining(); } try { @@ -159,7 +159,7 @@ export const useMiningStore = create()((set, getState) => ({ }); console.info(`Mode changed to ${mode}`); if (state.miningInitiated) { - console.log('Restarting mining...'); + console.info('Restarting mining...'); await state.startMining(); } } catch (e) {