merged main and bumped again

radixdlt · Sep 30, 2024 · 6eb57e7 · 6eb57e7
2 parents b33c956 + a12fdc6
commit 6eb57e7
Show file tree

Hide file tree

Showing 43 changed files with 1,000 additions and 323 deletions.
diff --git a/.github/workflows/release-android.yml b/.github/workflows/release-android.yml
@@ -62,7 +62,7 @@ jobs:
       - name: Build and publish Android
         uses: RDXWorks-actions/gradle-build-action@main
         with:
-          arguments: sargon-android:publishAndroidPublicationToGitHubPackagesRepository
+          arguments: sargon-android:publishAndroidReleasePublicationToGitHubPackagesRepository
           build-root-directory: jvm
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml
@@ -46,9 +46,6 @@ jobs:
           target: ${{ matrix.build-target.toolchain }}
           default: 'true'
 
-      - name: Rustc version
-        run: cargo --version --verbose
-
       - name: Set up JDK 17
         uses: RDXWorks-actions/setup-java@v3
         with:
@@ -92,7 +89,7 @@ jobs:
       - name: Publish desktop binaries
         uses: RDXWorks-actions/gradle-build-action@main
         with:
-          arguments: sargon-android:publishDesktopPublicationToGitHubPackagesRepository
+          arguments: sargon-android:publishDesktopReleasePublicationToGitHubPackagesRepository
           build-root-directory: jvm
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: RDXWorks-actions/setup-xcode@master
         with:
-          xcode-version: "15.3.0"
+          xcode-version: "16.0.0"
 
       - name: Install Rust Toolchain for aarch64-apple-darwin
         uses: RDXWorks-actions/toolchain@master

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -178,7 +178,7 @@ jobs:
 
       - uses: RDXWorks-actions/setup-xcode@master
         with:
-          xcode-version: "15.3.0"
+          xcode-version: "16.0.0"
 
       - name: Install Rust Toolchain for aarch64-apple-darwin
         uses: RDXWorks-actions/toolchain@master
@@ -216,9 +216,6 @@ jobs:
           target: x86_64-unknown-linux-gnu
           default: 'true'
 
-      - name: Rustc version
-        run: cargo --version --verbose
-
       - name: Set up JDK 17
         uses: RDXWorks-actions/setup-java@v3
         with:
@@ -252,7 +249,7 @@ jobs:
       - uses: RDXWorks-actions/setup-xcode@master
         with:
           # trying to fix https://github.com/rust-lang/rust/issues/113783
-          xcode-version: "15.3.0"
+          xcode-version: "16.0.0"
 
       - name: Install Rust Toolchain
         uses: RDXWorks-actions/toolchain@master

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,9 @@
 [workspace]
 resolver = "2"
-members = [
-    "crates/sargon",
-]
+members = ["crates/sargon"]
 default-members = ["crates/sargon"]
+
+[profile.release]
+incremental = false
+panic = 'unwind'
+codegen-units = 1
diff --git a/README.md b/README.md
@@ -368,6 +368,40 @@ See [`.github/workflows/release.yml`](.github/workflows/release.yml)
 
 ## Android
 
+### Locally
+In order to build sargon for local development we will leverage the local maven repository. Instead of publishing the package in a maven server, we can publish it locally. 
+
+In order to publish both android and desktop binaries with a simple command run  
+```sh
+cd jvm/
+./gradlew sargon-android:buildForLocalDev  // This builds both sargon-android and sargon-desktop-bins
+```
+This will produce the following message when successfully finished
+```txt
+> Task :sargon-android:buildForLocalDev
+✅ Library is published in maven local with version:
+1.1.19-c74d9cbf-SNAPSHOT
+```
+Note that such local maven builds are in debug mode and have a `-SNAPSHOT` suffix.
+
+Copy the version name to your project but make sure that `mavenLocal()` is included in your project's `settings.gradle` 
+```gradle
+dependencyResolutionManagement {
+    ...
+    repositories {
+        mavenLocal()
+        ...
+    }
+}
+```
+> [!TIP]
+> The libraries that are published in local maven will reside in:
+> ```
+> $HOME/.m2/repository/com/radixdlt/sargon
+> ```
+
+### CD
+
 Two modules are published in [Github's maven](https://github.com/radixdlt/sargon/packages/).
 
 - `sargon-android`

diff --git a/apple/Sources/Sargon/Util/URL+image.swift b/apple/Sources/Sargon/Util/URL+image.swift
@@ -0,0 +1,17 @@
+import Foundation
+import SargonUniFFI
+
+extension URL {
+	public func isVectorImage(type: VectorImageType) -> Bool {
+		imageUrlUtilsIsVectorImage(url: self.absoluteString, imageType: type)
+	}
+
+	public func imageURL(imageServiceURL: URL, size: CGSize) throws -> URL {
+		try imageUrlUtilsMakeImageUrl(
+			url: self.absoluteString,
+			imageServiceUrl: imageServiceURL.absoluteString,
+			width: UInt32(size.width),
+			height: UInt32(size.height)
+		)
+	}
+}
diff --git a/apple/Tests/TestCases/Prelude/ImageURLTests.swift b/apple/Tests/TestCases/Prelude/ImageURLTests.swift
@@ -0,0 +1,37 @@
+@testable import Sargon
+
+import CustomDump
+import Foundation
+import Sargon
+import SargonUniFFI
+import XCTest
+
+final class ImageURLTests: XCTestCase {
+	func test_is_vector_image() {
+		let svgURL = URL(string: "https://svgshare.com/i/U7z.svg")!
+
+		XCTAssert(svgURL.isVectorImage(type: .svg))
+	}
+
+	func test_image_url() throws {
+		let size = CGSize(width: 1024, height: 1024)
+		let imageServiceURL = URL(string: "https://image-service-dev.extratools.works")!
+		let svgURL = URL(string: "https://svgshare.com/i/U7z.svg")!
+
+		XCTAssertEqual(
+			try svgURL.imageURL(imageServiceURL: imageServiceURL, size: size),
+			URL(string: "https://image-service-dev.extratools.works/?imageOrigin=https%3A%2F%2Fsvgshare.com%2Fi%2FU7z.svg&imageSize=1024x1024&format=png")
+		)
+	}
+
+    func test_image_url_with_data_url() throws {
+		let size = CGSize(width: 1024, height: 1024)
+		let imageServiceURL = URL(string: "https://image-service-dev.extratools.works")!
+		let svgDataURL = URL(string: "data:image/svg+xml,%3Csvg%20viewBox%3D%220%200%201000%201000%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%3Cpolygon%20fill%3D%22hsla%2890%2C99%25%2C52%25%2C1%29%22%20points%3D%220%2C%200%2C%201000%2C%201000%2C%200%2C%201000%22%20transform%3D%22scale%28-1%2C1%29%20translate%28-1000%29%22%2F%3E%0A%3Cpolygon%20fill%3D%22hsla%28199%2C90%25%2C64%25%2C1%29%22%20points%3D%221000%2C%201000%2C%201000%2C%200%2C%200%2C%200%22%20transform%3D%22scale%28-1%2C1%29%20translate%28-1000%29%22%2F%3E%0A%3Cpath%20d%3D%22M1000%2C229%20A1000%2C1000%2C0%2C0%2C0%2C229%2C1000%20L1000%2C1000%20z%22%20fill%3D%22hsla%28140%2C98%25%2C61%25%2C1%29%22%2F%3E%0A%3Cpath%20d%3D%22M392%2C500%20L608%2C500%20M500%2C392%20L500%2C608%22%20stroke%3D%22hsla%2847%2C92%25%2C61%25%2C1%29%22%20stroke-width%3D%2272%22%2F%3E%0A%3C%2Fsvg%3E")!
+
+		XCTAssertEqual(
+			try svgDataURL.imageURL(imageServiceURL: imageServiceURL, size: size),
+			URL(string: "https://image-service-dev.extratools.works/?imageOrigin=data%3Aimage%2Fsvg%2Bxml%2C%253Csvg%2520viewBox%253D%25220%25200%25201000%25201000%2522%2520xmlns%253D%2522http%253A%252F%252Fwww.w3.org%252F2000%252Fsvg%2522%253E%250A%253Cpolygon%2520fill%253D%2522hsla%252890%252C99%2525%252C52%2525%252C1%2529%2522%2520points%253D%25220%252C%25200%252C%25201000%252C%25201000%252C%25200%252C%25201000%2522%2520transform%253D%2522scale%2528-1%252C1%2529%2520translate%2528-1000%2529%2522%252F%253E%250A%253Cpolygon%2520fill%253D%2522hsla%2528199%252C90%2525%252C64%2525%252C1%2529%2522%2520points%253D%25221000%252C%25201000%252C%25201000%252C%25200%252C%25200%252C%25200%2522%2520transform%253D%2522scale%2528-1%252C1%2529%2520translate%2528-1000%2529%2522%252F%253E%250A%253Cpath%2520d%253D%2522M1000%252C229%2520A1000%252C1000%252C0%252C0%252C0%252C229%252C1000%2520L1000%252C1000%2520z%2522%2520fill%253D%2522hsla%2528140%252C98%2525%252C61%2525%252C1%2529%2522%252F%253E%250A%253Cpath%2520d%253D%2522M392%252C500%2520L608%252C500%2520M500%252C392%2520L500%252C608%2522%2520stroke%253D%2522hsla%252847%252C92%2525%252C61%2525%252C1%2529%2522%2520stroke-width%253D%252272%2522%252F%253E%250A%253C%252Fsvg%253E&imageSize=1024x1024&format=png")
+		)
+	}
+}
diff --git a/crates/sargon/Cargo.toml b/crates/sargon/Cargo.toml
@@ -1,14 +1,9 @@
 [package]
 name = "sargon"
-version = "1.1.19"
+version = "1.1.23"
 edition = "2021"
 build = "build.rs"
 
-[profile.release]
-incremental = false
-panic = 'unwind'
-codegen-units = 1
-
 [[test]]
 name = "vectors"
 
@@ -75,7 +70,9 @@ strum = { git = "https://github.com/Peternator7/strum/", rev = "f746c3699acf1501
 ] }
 
 sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae" }
-radix-rust = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae", features = ["serde"] }
+radix-rust = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae", features = [
+  "serde",
+] }
 radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae" }
 radix-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae", features = [
   "serde",

diff --git a/crates/sargon/src/core/utils/image_url_utils.rs b/crates/sargon/src/core/utils/image_url_utils.rs
@@ -0,0 +1,120 @@
+use crate::prelude::*;
+use crate::types::*;
+
+pub fn is_vector_image(url: &str, image_type: VectorImageType) -> bool {
+    let parsed_url = match parse_url(url) {
+        Ok(parsed) => parsed,
+        Err(_) => return false,
+    };
+    let query_parameters = parsed_url
+        .query_pairs()
+        .into_owned()
+        .collect::<HashMap<String, String>>();
+    let image_url_string = query_parameters
+        .get("imageOrigin")
+        .map(|s| s.as_str())
+        .unwrap_or(url);
+
+    image_url_string
+        .starts_with(&format!("data:image/{}", image_type.data_url_type()))
+        || image_url_string
+            .to_lowercase()
+            .ends_with(image_type.url_extension())
+}
+
+pub fn make_image_url(
+    url: &str,
+    image_service_url: &str,
+    width: u32,
+    height: u32,
+) -> Result<Url> {
+    const MIN_SIZE: u32 = 64;
+
+    let image_origin = url_encode(url);
+    let image_size =
+        format!("{}x{}", width.max(MIN_SIZE), height.max(MIN_SIZE));
+    let mut query =
+        format!("imageOrigin={}&imageSize={}", image_origin, image_size);
+
+    if is_vector_image(url, VectorImageType::Svg) {
+        query.push_str("&format=png");
+    }
+
+    let mut parsed_image_service_url = parse_url(image_service_url)?;
+    parsed_image_service_url.set_query(Some(&query));
+
+    Ok(parsed_image_service_url)
+}
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+
+    #[test]
+    fn test_is_vector_image() {
+        let svg_url = "https://svgshare.com/i/U7z.svg";
+        let pdf_url = "https://example.com/image.pdf";
+        let svg_data_url = "data:image/svg+xml,%3Csvg%20viewBox%3D%220%200%201000%201000%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%3Cpolygon%20fill%3D%22hsla%2890%2C99%25%2C52%25%2C1%29%22%20points%3D%220%2C%200%2C%201000%2C%201000%2C%200%2C%201000%22%20transform%3D%22scale%28-1%2C1%29%20translate%28-1000%29%22%2F%3E%0A%3Cpolygon%20fill%3D%22hsla%28199%2C90%25%2C64%25%2C1%29%22%20points%3D%221000%2C%201000%2C%201000%2C%200%2C%200%2C%200%22%20transform%3D%22scale%28-1%2C1%29%20translate%28-1000%29%22%2F%3E%0A%3Cpath%20d%3D%22M1000%2C229%20A1000%2C1000%2C0%2C0%2C0%2C229%2C1000%20L1000%2C1000%20z%22%20fill%3D%22hsla%28140%2C98%25%2C61%25%2C1%29%22%2F%3E%0A%3Cpath%20d%3D%22M392%2C500%20L608%2C500%20M500%2C392%20L500%2C608%22%20stroke%3D%22hsla%2847%2C92%25%2C61%25%2C1%29%22%20stroke-width%3D%2272%22%2F%3E%0A%3C%2Fsvg%3E";
+        let pdf_data_url = "data:image/pdf,dummydata";
+
+        assert!(is_vector_image(svg_url, VectorImageType::Svg));
+        assert!(is_vector_image(pdf_url, VectorImageType::Pdf));
+        assert!(is_vector_image(svg_data_url, VectorImageType::Svg));
+        assert!(is_vector_image(pdf_data_url, VectorImageType::Pdf));
+    }
+
+    #[test]
+    fn test_is_vector_image_invalid_url() {
+        let url = "invalid";
+
+        assert_eq!(is_vector_image(url, VectorImageType::sample()), false);
+    }
+
+    #[test]
+    fn test_is_vector_image_with_image_origin_url() {
+        let url = "https://image-service-dev.extratools.works/?imageOrigin=https%3A%2F%2Fsvgshare.com%2Fi%2FU7z.svg&imageSize=1024x1024&format=png";
+
+        assert!(is_vector_image(url, VectorImageType::Svg));
+    }
+
+    #[test]
+    fn test_is_vector_image_with_image_origin_data_url() {
+        let data_url = "https://image-service-dev.extratools.works/?imageOrigin=data%3Aimage%2Fsvg%2Bxml%2C%253Csvg%2520viewBox%253D%25220%25200%25201000%25201000%2522%2520xmlns%253D%2522http%253A%252F%252Fwww.w3.org%252F2000%252Fsvg%2522%253E%250A%253Cpolygon%2520fill%253D%2522hsla%252890%252C99%2525%252C52%2525%252C1%2529%2522%2520points%253D%25220%252C%25200%252C%25201000%252C%25201000%252C%25200%252C%25201000%2522%2520transform%253D%2522scale%2528-1%252C1%2529%2520translate%2528-1000%2529%2522%252F%253E%250A%253Cpolygon%2520fill%253D%2522hsla%2528199%252C90%2525%252C64%2525%252C1%2529%2522%2520points%253D%25221000%252C%25201000%252C%25201000%252C%25200%252C%25200%252C%25200%2522%2520transform%253D%2522scale%2528-1%252C1%2529%2520translate%2528-1000%2529%2522%252F%253E%250A%253Cpath%2520d%253D%2522M1000%252C229%2520A1000%252C1000%252C0%252C0%252C0%252C229%252C1000%2520L1000%252C1000%2520z%2522%2520fill%253D%2522hsla%2528140%252C98%2525%252C61%2525%252C1%2529%2522%252F%253E%250A%253Cpath%2520d%253D%2522M392%252C500%2520L608%252C500%2520M500%252C392%2520L500%252C608%2522%2520stroke%253D%2522hsla%252847%252C92%2525%252C61%2525%252C1%2529%2522%2520stroke-width%253D%252272%2522%252F%253E%250A%253C%252Fsvg%253E&imageSize=1024x1024&format=png";
+
+        assert!(is_vector_image(data_url, VectorImageType::Svg));
+    }
+
+    #[test]
+    fn test_make_image_url_svg_url() {
+        let image_service_url = "https://image-service-dev.extratools.works/";
+        let image_origin_url = "https://svgshare.com/i/U7z.svg";
+
+        pretty_assertions::assert_eq!(
+            make_image_url(image_origin_url, image_service_url, 1024, 1024).unwrap().to_string(),
+            "https://image-service-dev.extratools.works/?imageOrigin=https%3A%2F%2Fsvgshare.com%2Fi%2FU7z.svg&imageSize=1024x1024&format=png".to_string()
+        );
+    }
+
+    #[test]
+    fn test_make_image_url_svg_data_url() {
+        let image_service_url = "https://image-service-dev.extratools.works/";
+        let image_origin_data_url = "data:image/svg+xml,%3Csvg%20viewBox%3D%220%200%201000%201000%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%3Cpolygon%20fill%3D%22hsla%2890%2C99%25%2C52%25%2C1%29%22%20points%3D%220%2C%200%2C%201000%2C%201000%2C%200%2C%201000%22%20transform%3D%22scale%28-1%2C1%29%20translate%28-1000%29%22%2F%3E%0A%3Cpolygon%20fill%3D%22hsla%28199%2C90%25%2C64%25%2C1%29%22%20points%3D%221000%2C%201000%2C%201000%2C%200%2C%200%2C%200%22%20transform%3D%22scale%28-1%2C1%29%20translate%28-1000%29%22%2F%3E%0A%3Cpath%20d%3D%22M1000%2C229%20A1000%2C1000%2C0%2C0%2C0%2C229%2C1000%20L1000%2C1000%20z%22%20fill%3D%22hsla%28140%2C98%25%2C61%25%2C1%29%22%2F%3E%0A%3Cpath%20d%3D%22M392%2C500%20L608%2C500%20M500%2C392%20L500%2C608%22%20stroke%3D%22hsla%2847%2C92%25%2C61%25%2C1%29%22%20stroke-width%3D%2272%22%2F%3E%0A%3C%2Fsvg%3E";
+
+        pretty_assertions::assert_eq!(
+            make_image_url(image_origin_data_url, image_service_url, 1024, 1024).unwrap().to_string(),
+            "https://image-service-dev.extratools.works/?imageOrigin=data%3Aimage%2Fsvg%2Bxml%2C%253Csvg%2520viewBox%253D%25220%25200%25201000%25201000%2522%2520xmlns%253D%2522http%253A%252F%252Fwww.w3.org%252F2000%252Fsvg%2522%253E%250A%253Cpolygon%2520fill%253D%2522hsla%252890%252C99%2525%252C52%2525%252C1%2529%2522%2520points%253D%25220%252C%25200%252C%25201000%252C%25201000%252C%25200%252C%25201000%2522%2520transform%253D%2522scale%2528-1%252C1%2529%2520translate%2528-1000%2529%2522%252F%253E%250A%253Cpolygon%2520fill%253D%2522hsla%2528199%252C90%2525%252C64%2525%252C1%2529%2522%2520points%253D%25221000%252C%25201000%252C%25201000%252C%25200%252C%25200%252C%25200%2522%2520transform%253D%2522scale%2528-1%252C1%2529%2520translate%2528-1000%2529%2522%252F%253E%250A%253Cpath%2520d%253D%2522M1000%252C229%2520A1000%252C1000%252C0%252C0%252C0%252C229%252C1000%2520L1000%252C1000%2520z%2522%2520fill%253D%2522hsla%2528140%252C98%2525%252C61%2525%252C1%2529%2522%252F%253E%250A%253Cpath%2520d%253D%2522M392%252C500%2520L608%252C500%2520M500%252C392%2520L500%252C608%2522%2520stroke%253D%2522hsla%252847%252C92%2525%252C61%2525%252C1%2529%2522%2520stroke-width%253D%252272%2522%252F%253E%250A%253C%252Fsvg%253E&imageSize=1024x1024&format=png".to_string()
+        );
+    }
+
+    #[test]
+    fn test_make_image_url_not_svg() {
+        let image_service_url = "https://image-service-dev.extratools.works/";
+        let image_origin_url = "https://sgo4bmuvgu4t24bvdcfbndmnxigspezdsnzoevon2jb5odru7auq.arweave.net/kZ3AspU1OT1wNRiKFo2Nug0nkyOTcuJVzdJD1w40-Ck";
+
+        pretty_assertions::assert_eq!(
+            make_image_url(image_origin_url, image_service_url, 1024, 1024).unwrap().to_string(),
+            "https://image-service-dev.extratools.works/?imageOrigin=https%3A%2F%2Fsgo4bmuvgu4t24bvdcfbndmnxigspezdsnzoevon2jb5odru7auq.arweave.net%2FkZ3AspU1OT1wNRiKFo2Nug0nkyOTcuJVzdJD1w40-Ck&imageSize=1024x1024".to_string()
+        );
+    }
+}
diff --git a/crates/sargon/src/core/utils/image_url_utils_uniffi_fn.rs b/crates/sargon/src/core/utils/image_url_utils_uniffi_fn.rs
@@ -0,0 +1,55 @@
+use crate::prelude::*;
+use crate::types::*;
+
+#[uniffi::export]
+pub fn image_url_utils_is_vector_image(
+    url: &str,
+    image_type: VectorImageType,
+) -> bool {
+    is_vector_image(url, image_type)
+}
+
+#[uniffi::export]
+pub fn image_url_utils_make_image_url(
+    url: &str,
+    image_service_url: &str,
+    width: u32,
+    height: u32,
+) -> Result<Url> {
+    make_image_url(url, image_service_url, width, height)
+}
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+
+    #[test]
+    fn test_image_url_utils_is_vector_image() {
+        let url = "https://svgshare.com/i/U7z.svg";
+        let image_type = VectorImageType::Svg;
+
+        assert_eq!(
+            is_vector_image(url, image_type),
+            image_url_utils_is_vector_image(&url, image_type)
+        )
+    }
+
+    #[test]
+    fn test_image_url_utils_make_image_url() {
+        let url = "https://svgshare.com/i/U7z.svg";
+        let image_service_url = "https://image-service-dev.extratools.works";
+        let width = 1024;
+        let height = 1024;
+
+        assert_eq!(
+            make_image_url(url, image_service_url, width, height),
+            image_url_utils_make_image_url(
+                url,
+                image_service_url,
+                width,
+                height
+            )
+        )
+    }
+}