Merge branch 'feat/more-bindings' into feat/more-uniffi-impls

Author: DaughterOfMars

.github/workflows/ci.yml

@@ -2,12 +2,16 @@ name: CI
 
 on:
   push:
-    branches: [main]
+    branches: [develop]
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
   workflow_dispatch:
   schedule: [cron: "40 1 * * *"]
 
+concurrency:
+  group: ci-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
+
 permissions:
   contents: read
 

crates/iota-graphql-client/src/pagination.rs

@@ -3,8 +3,8 @@
 
 use crate::query_types::PageInfo;
 
-#[derive(Clone, Debug)]
 /// A page of items returned by the GraphQL server.
+#[derive(Clone, Debug)]
 pub struct Page<T> {
     /// Information about the page, such as the cursor and whether there are
     /// more pages.

crates/iota-graphql-client/src/query_types/object.rs

@@ -2,9 +2,7 @@
 // Modifications Copyright (c) 2025 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use iota_types::ObjectId;
-
-use crate::query_types::{Address, Base64, MoveObjectContents, PageInfo, schema};
+use crate::query_types::{Address, Base64, MoveObjectContents, ObjectId, PageInfo, schema};
 
 // ===========================================================================
 // Object(s) Queries

crates/iota-sdk-ffi/Cargo.toml

@@ -15,7 +15,7 @@ crate-type = ["lib", "cdylib"]
 base64ct = { version = "1.6.0", features = ["alloc", "std"] }
 derive_more = { version = "2.0", features = ["from", "deref"] }
 rand = "0.8"
-serde_json = { version = "1.0.95" }
+serde_json = "1.0.95"
 tokio = { version = "1.36.0", features = ["time"] }
 uniffi = { version = "0.29", features = ["cli", "tokio"] }
 

crates/iota-sdk-ffi/README.md

@@ -1,4 +1,4 @@
-# IOTA SDK Bindings
+# IOTA SDK FFI
 
 This crate can generate bindings for various languages (Go, Kotlin, Python, etc.) using [UniFFI](https://github.com/mozilla/uniffi-rs).
 

crates/iota-sdk-ffi/src/error.rs

@@ -5,15 +5,15 @@ use std::fmt;
 
 use uniffi::Error;
 
-pub type Result<T, E = BindingsSdkError> = std::result::Result<T, E>;
+pub type Result<T, E = SdkFfiError> = std::result::Result<T, E>;
 
 #[derive(Debug, Error)]
 #[uniffi(flat_error)]
-pub enum BindingsSdkError {
+pub enum SdkFfiError {
     Generic(String),
 }
 
-impl BindingsSdkError {
+impl SdkFfiError {
     pub fn new<E: std::error::Error>(err: E) -> Self {
         Self::Generic(err.to_string())
     }
@@ -23,16 +23,16 @@ impl BindingsSdkError {
     }
 }
 
-impl fmt::Display for BindingsSdkError {
+impl fmt::Display for SdkFfiError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::Generic(e) => write!(f, "{e}"),
         }
     }
 }
 
-impl<E: std::error::Error> From<E> for BindingsSdkError {
-    fn from(e: E) -> BindingsSdkError {
+impl<E: std::error::Error> From<E> for SdkFfiError {
+    fn from(e: E) -> SdkFfiError {
         Self::new(e)
     }
 }

crates/iota-sdk-ffi/src/faucet.rs

@@ -4,7 +4,7 @@
 use std::sync::Arc;
 
 use crate::{
-    error::{BindingsSdkError, Result},
+    error::{Result, SdkFfiError},
     types::address::Address,
 };
 
@@ -47,10 +47,7 @@ impl FaucetClient {
     /// request and not wait until the token is received. Use
     /// `request_and_wait` to wait for the token.
     pub async fn request(&self, address: &Address) -> Result<Option<String>> {
-        self.0
-            .request(**address)
-            .await
-            .map_err(BindingsSdkError::custom)
+        self.0.request(**address).await.map_err(SdkFfiError::custom)
     }
 
     /// Request gas from the faucet and wait until the request is completed and
@@ -65,7 +62,7 @@ impl FaucetClient {
             .0
             .request_and_wait(**address)
             .await
-            .map_err(BindingsSdkError::custom)?
+            .map_err(SdkFfiError::custom)?
             .map(Into::into)
             .map(Arc::new))
     }
@@ -78,7 +75,7 @@ impl FaucetClient {
             .0
             .request_status(id)
             .await
-            .map_err(BindingsSdkError::custom)?
+            .map_err(SdkFfiError::custom)?
             .map(Into::into)
             .map(Arc::new))
     }

crates/iota-sdk-types/Makefile

@@ -18,7 +18,7 @@ test:
 # --all-features
 .PHONY: wasm
 wasm:
-	RUSTFLAGS='--cfg getrandom_backend="wasm_js"' CC=clang wasm-pack test --node --all-features
+	CC=clang wasm-pack test -r --node --all-features
 
 %:
 	$(MAKE) -C ../.. $@

crates/iota-sdk-types/src/lib.rs

@@ -196,7 +196,7 @@ macro_rules! def_is {
 }
 
 #[macro_export]
-macro_rules! def_is_as_opt {
+macro_rules! def_is_as_into_opt {
     ($($variant:ident => $inner:ty),* $(,)?) => {
         paste::paste! {$(
         #[inline]
@@ -206,10 +206,7 @@ macro_rules! def_is_as_opt {
 
         #[inline]
         pub fn [< as_ $variant:snake >](&self) -> &$inner {
-            let Self::$variant(inner) = self else {
-                panic!("not a {}", stringify!($variant));
-            };
-            inner
+            self.[< as_ $variant:snake _opt >]().expect(&format!("not a {}", stringify!($variant)))
         }
 
         #[inline]
@@ -221,17 +218,23 @@ macro_rules! def_is_as_opt {
             }
         }
 
+        #[inline]
+        pub fn [< into_ $variant:snake _opt >](self) -> Option<$inner> {
+            if let Self::$variant(inner) = self {
+                Some(inner)
+            } else {
+                None
+            }
+        }
+
         #[inline]
         pub fn [< into_ $variant:snake >](self) -> $inner {
-            let Self::$variant(inner) = self else {
-                panic!("not a {}", stringify!($variant));
-            };
-            inner
+            self.[< into_ $variant:snake _opt >]().expect(&format!("not a {}", stringify!($variant)))
         }
         )*}
     };
     ($($variant:ident),* $(,)?) => {
-        $crate::def_is_as_opt!{$($variant => $variant,)*}
+        $crate::def_is_as_into_opt!{$($variant => $variant,)*}
     };
 }
 

crates/iota-sdk-types/src/object.rs

@@ -145,7 +145,7 @@ pub enum ObjectData {
 }
 
 impl ObjectData {
-    crate::def_is_as_opt!(Struct => MoveStruct, Package => MovePackage);
+    crate::def_is_as_into_opt!(Struct => MoveStruct, Package => MovePackage);
 }
 
 /// A move package
@@ -292,7 +292,6 @@ pub struct MoveStruct {
         serde(with = "::serde_with::As::<serialization::BinaryMoveStructType>")
     )]
     pub type_: StructTag,
-
     /// Number that increases each time a tx takes this object as a mutable
     /// input This is a lamport timestamp, not a sequentially increasing
     /// version
@@ -319,7 +318,7 @@ pub enum ObjectType {
 impl ObjectType {
     crate::def_is!(Package);
 
-    crate::def_is_as_opt!(Struct => StructTag);
+    crate::def_is_as_into_opt!(Struct => StructTag);
 }
 
 /// An object on the IOTA blockchain