Merge remote-tracking branch 'upstream/main' into dev and updated translations

Author: ronickg

.sqlx/query-864efa77c492e3809b2502e3564eed0a613d7cc152c02fcd3b1fa32e8409b8d7.json

@@ -1,16 +1,8 @@
 # Sage Wallet
 
-The sagest wallet for the Chia blockchain.
+A high-performance light wallet that offers users the ability to connect directly to peers on the Chia blockchain or to a trusted full node. Key features include WalletConnect for integration with decentralized applications (dApps) and DeFi services, support for Chia offer files, and compatibility with Chia's standards for NFTs and Asset Tokens (CATs). This wallet also facilitates the creation, viewing, and management of NFTs, the minting of new tokens, and the management of Decentralized Identifiers (DIDs). Sage Wallet is designed for ease of use, security, and future extensibility. It is currently available in beta, so it should be used with caution.
 
-Sage is:
-
-1. A high-performance light wallet that can connect directly to peers on the Chia network.
-2. Built upon the reliable foundation of [chia_rs](https://github.com/Chia-Network/chia_rs), [clvm_rs](https://github.com/Chia-Network/clvm_rs), and the [Chia Wallet SDK](https://github.com/xch-dev/chia-wallet-sdk).
-3. Designed with maintainability and future extensibility in mind from the beginning.
-
-## Disclaimer
-
-Sage is still in beta testing and isn't guaranteed to be stable, so it should be used with caution. Please make sure you backup your keys and don't put too much XCH in mainnet wallets.
+Sage is built upon the reliable foundation of [chia_rs](https://github.com/Chia-Network/chia_rs), [clvm_rs](https://github.com/Chia-Network/clvm_rs), and the [Chia Wallet SDK](https://github.com/xch-dev/chia-wallet-sdk). It's designed with maintainability and future extensibility in mind from the beginning.
 
 ## Installation
 
@@ -22,14 +14,16 @@ If you want to build from source, see the [Development](#development) section fo
 
 This is an open source project, and we welcome pull requests to improve any part of the wallet.
 
-The frontend is currently written in TypeScript with [React](https://react.dev/) and [Material UI](https://mui.com/), and can be found in the `src` directory.
+The frontend is currently written in TypeScript with [React](https://react.dev/) and [Shadcn UI](https://ui.shadcn.com/), and can be found in the `src` directory.
 
-The backend is written in Rust, powered by [Tauri v2](https://v2.tauri.app/). The frontend and backend communicate via serialized commands and events over IPC.
+The backend is written in Rust, powered by [Tauri v2](https://v2.tauri.app/). The frontend and backend communicate via serialized commands and events over IPC. The `src-tauri` directory contains the backend wrapper code, and `crates` is the individual libraries that make up the wallet backend.
 
 Finally, the wallet driver code is written on the backend using the [Chia Wallet SDK](https://github.com/xch-dev/chia-wallet-sdk).
 
 ## Development
 
+### Setting up the environment
+
 These instructions should get you up and running with a source installation.
 
 First, there are some prerequisites:
@@ -45,10 +39,16 @@ Install the frontend dependencies:
 pnpm install
 ```
 
-You can run the app in development mode with:
+### Starting the app
+
+You can run the app with:
 
 ```bash
+# For development purposes:
 pnpm tauri dev
+
+# If you need optimizations:
+pnpm tauri dev --release
 ```
 
 And build the application with:
@@ -63,3 +63,15 @@ You can also run the app in the iOS or Android simulator, though it may take som
 pnpm tauri ios dev
 pnpm tauri android dev
 ```
+
+### Testing
+
+Currently, only the wallet driver code has tests. These can be run with:
+
+```bash
+RUST_LOG=debug,sqlx=off cargo t -p sage-wallet
+```
+
+The `sqlx=off` portion gets rid of noisy log spam from SQLx.
+
+Most of the tests for the underlying coin spend implementations live in the Wallet SDK repo.

.sqlx/query-d6843923b016d591d12131ddd71ccbedb934d85bd953f25c176dec8bdf1afccd.json

@@ -1,6 +1,6 @@
 [package]
 name = "sage-api"
-version = "0.8.3"
+version = "0.8.6"
 edition = "2021"
 license = "Apache-2.0"
 description = "API definitions for the Sage wallet."

Cargo.lock

@@ -3,6 +3,8 @@ use specta::Type;
 
 use crate::{Amount, OfferRecord, OfferSummary, SpendBundleJson, TransactionSummary};
 
+use super::TransactionResponse;
+
 #[derive(Debug, Clone, Serialize, Deserialize, Type)]
 pub struct MakeOffer {
     pub requested_assets: Assets,
@@ -88,3 +90,13 @@ pub struct DeleteOffer {
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, Type)]
 pub struct DeleteOfferResponse {}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Type)]
+pub struct CancelOffer {
+    pub offer_id: String,
+    pub fee: Amount,
+    #[serde(default)]
+    pub auto_submit: bool,
+}
+
+pub type CancelOfferResponse = TransactionResponse;

README.md

@@ -1,6 +1,6 @@
 [package]
 name = "sage-cli"
-version = "0.8.3"
+version = "0.8.6"
 edition = "2021"
 license = "Apache-2.0"
 description = "A CLI and RPC for Sage wallet."

crates/sage-api/Cargo.toml

@@ -111,6 +111,7 @@ routes!(
     get_offers await: GetOffers = "/get_offers",
     get_offer await: GetOffer = "/get_offer",
     delete_offer await: DeleteOffer = "/delete_offer",
+    cancel_offer await: CancelOffer = "/cancel_offer",
 
     get_peers await: GetPeers = "/get_peers",
     remove_peer await: RemovePeer = "/remove_peer",
@@ -132,11 +133,7 @@ async fn start_rpc(path: PathBuf) -> Result<()> {
     let mut app = Sage::new(&path);
     let mut receiver = app.initialize().await?;
 
-    tokio::spawn(async move {
-        while let Some(message) = receiver.recv().await {
-            println!("{message:?}");
-        }
-    });
+    tokio::spawn(async move { while let Some(_message) = receiver.recv().await {} });
 
     let addr: SocketAddr = ([127, 0, 0, 1], app.config.rpc.server_port).into();
     info!("RPC server is listening at {addr}");

crates/sage-api/src/requests/offers.rs

@@ -1,6 +1,6 @@
 [package]
 name = "sage-config"
-version = "0.8.3"
+version = "0.8.6"
 edition = "2021"
 license = "Apache-2.0"
 description = "Configuration for the Sage wallet."

crates/sage-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sage-database"
-version = "0.8.3"
+version = "0.8.6"
 edition = "2021"
 license = "Apache-2.0"
 description = "The SQLite database for Sage."