Skip to content

Commit d4ef04b

Browse files
joe-pjoe-p
committed
wip: working bool, array segfault
See mozilla/uniffi-rs#2649
1 parent 32edda4 commit d4ef04b

File tree

15 files changed

+1792
-82
lines changed

15 files changed

+1792
-82
lines changed

‎crates/algokit_utils_ffi/src/abi/abi_type/address.rs‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
use algokit_abi::ABIType as RustABIType;
22

3+
use crate::abi::abi_value::ABIValue;
4+
35
use super::{ABIType, FfiToRustABIType};
46

57
#[derive(uniffi::Object, Clone)]
@@ -23,8 +25,19 @@ impl From<RustABIType> for ABIAddress {
2325

2426
impl FfiToRustABIType for ABIAddress {
2527
fn to_rust_abi_type(&self) -> RustABIType {
26-
(*self).clone().into()
28+
self.clone().into()
2729
}
2830
}
2931

30-
impl ABIType for ABIAddress {}
32+
#[uniffi::export]
33+
impl ABIType for ABIAddress {
34+
fn decoode(&self, data: &[u8]) -> ABIValue {
35+
let rust_abi_type = self.to_rust_abi_type();
36+
ABIValue::from(rust_abi_type.decode(data).unwrap())
37+
}
38+
39+
fn encode(&self, value: ABIValue) -> Vec<u8> {
40+
let rust_abi_type = self.to_rust_abi_type();
41+
rust_abi_type.encode(&value.into()).unwrap()
42+
}
43+
}

‎crates/algokit_utils_ffi/src/abi/abi_type/bool.rs‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
use algokit_abi::ABIType as RustABIType;
22

3+
use crate::abi::abi_value::ABIValue;
4+
35
use super::{ABIType, FfiToRustABIType};
46

57
#[derive(uniffi::Object, Clone)]
@@ -23,8 +25,28 @@ impl From<RustABIType> for ABIBool {
2325

2426
impl FfiToRustABIType for ABIBool {
2527
fn to_rust_abi_type(&self) -> RustABIType {
26-
(*self).clone().into()
28+
self.clone().into()
29+
}
30+
}
31+
32+
#[uniffi::export]
33+
impl ABIBool {
34+
#[allow(clippy::new_without_default)]
35+
#[uniffi::constructor]
36+
pub fn new() -> Self {
37+
ABIBool {}
2738
}
2839
}
2940

30-
impl ABIType for ABIBool {}
41+
#[uniffi::export]
42+
impl ABIType for ABIBool {
43+
fn decoode(&self, data: &[u8]) -> ABIValue {
44+
let rust_abi_type = self.to_rust_abi_type();
45+
ABIValue::from(rust_abi_type.decode(data).unwrap())
46+
}
47+
48+
fn encode(&self, value: ABIValue) -> Vec<u8> {
49+
let rust_abi_type = self.to_rust_abi_type();
50+
rust_abi_type.encode(&value.into()).unwrap()
51+
}
52+
}

‎crates/algokit_utils_ffi/src/abi/abi_type/byte.rs‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
use crate::abi::abi_value::ABIValue;
2+
13
use super::{ABIType, FfiToRustABIType};
24
use algokit_abi::ABIType as RustABIType;
35

@@ -22,8 +24,19 @@ impl From<RustABIType> for ABIByte {
2224

2325
impl FfiToRustABIType for ABIByte {
2426
fn to_rust_abi_type(&self) -> RustABIType {
25-
(*self).clone().into()
27+
self.clone().into()
2628
}
2729
}
2830

29-
impl ABIType for ABIByte {}
31+
#[uniffi::export]
32+
impl ABIType for ABIByte {
33+
fn decoode(&self, data: &[u8]) -> ABIValue {
34+
let rust_abi_type = self.to_rust_abi_type();
35+
ABIValue::from(rust_abi_type.decode(data).unwrap())
36+
}
37+
38+
fn encode(&self, value: ABIValue) -> Vec<u8> {
39+
let rust_abi_type = self.to_rust_abi_type();
40+
rust_abi_type.encode(&value.into()).unwrap()
41+
}
42+
}

‎crates/algokit_utils_ffi/src/abi/abi_type/dynamic_array.rs‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ use std::sync::Arc;
22

33
use algokit_abi::ABIType as RustABIType;
44

5+
use crate::abi::abi_value::ABIValue;
6+
57
use super::{ABIType, FfiToRustABIType, RustToFfiABIType};
68

79
#[derive(uniffi::Object, Clone)]
@@ -29,8 +31,34 @@ impl From<RustABIType> for ABIDynamicArray {
2931

3032
impl FfiToRustABIType for ABIDynamicArray {
3133
fn to_rust_abi_type(&self) -> RustABIType {
32-
(*self).clone().into()
34+
eprintln!("DEBUGPRINT[43]: dynamic_array.rs:34 (before let cloned = self.clone();)");
35+
let cloned = self.clone();
36+
eprintln!("DEBUGPRINT[44]: dynamic_array.rs:35 (after let cloned = self.clone();)");
37+
38+
eprintln!("DEBUGPRINT[46]: dynamic_array.rs:38 (before cloned.into())");
39+
let res = cloned.into();
40+
eprintln!("DEBUGPRINT[47]: dynamic_array.rs:39 (after cloned.into())");
41+
res
3342
}
3443
}
3544

36-
impl ABIType for ABIDynamicArray {}
45+
#[uniffi::export]
46+
impl ABIType for ABIDynamicArray {
47+
fn decoode(&self, data: &[u8]) -> ABIValue {
48+
let rust_abi_type = self.to_rust_abi_type();
49+
ABIValue::from(rust_abi_type.decode(data).unwrap())
50+
}
51+
52+
fn encode(&self, value: ABIValue) -> Vec<u8> {
53+
let rust_abi_type = self.to_rust_abi_type();
54+
rust_abi_type.encode(&value.into()).unwrap()
55+
}
56+
}
57+
58+
#[uniffi::export]
59+
impl ABIDynamicArray {
60+
#[uniffi::constructor]
61+
pub fn new(element_type: Arc<dyn ABIType>) -> Self {
62+
ABIDynamicArray { element_type }
63+
}
64+
}

‎crates/algokit_utils_ffi/src/abi/abi_type/mod.rs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,11 @@ impl RustToFfiABIType for RustABIType {
4949
}
5050
}
5151

52+
// NOTE: Exported traits cannot have default implementations, so we must implement in each ABIType
53+
// See https://github.com/mozilla/uniffi-rs/pull/2598
5254
#[uniffi::export]
5355
pub trait ABIType: Send + Sync + FfiToRustABIType {
54-
fn decoode(&self, data: &[u8]) -> ABIValue {
55-
let rust_abi_type = self.to_rust_abi_type();
56-
ABIValue::from(rust_abi_type.decode(data).unwrap())
57-
}
56+
fn decoode(&self, data: &[u8]) -> ABIValue;
5857

59-
fn encode(&self, value: ABIValue) -> Vec<u8> {
60-
let rust_abi_type = self.to_rust_abi_type();
61-
rust_abi_type.encode(&value.into()).unwrap()
62-
}
58+
fn encode(&self, value: ABIValue) -> Vec<u8>;
6359
}

‎crates/algokit_utils_ffi/src/abi/abi_type/static_array.rs‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ use std::sync::Arc;
22

33
use algokit_abi::ABIType as RustABIType;
44

5+
use crate::abi::abi_value::ABIValue;
6+
57
use super::{ABIType, FfiToRustABIType, RustToFfiABIType};
68

79
#[derive(uniffi::Object, Clone)]
@@ -34,8 +36,19 @@ impl From<RustABIType> for ABIStaticArray {
3436

3537
impl FfiToRustABIType for ABIStaticArray {
3638
fn to_rust_abi_type(&self) -> RustABIType {
37-
(*self).clone().into()
39+
self.clone().into()
3840
}
3941
}
4042

41-
impl ABIType for ABIStaticArray {}
43+
#[uniffi::export]
44+
impl ABIType for ABIStaticArray {
45+
fn decoode(&self, data: &[u8]) -> ABIValue {
46+
let rust_abi_type = self.to_rust_abi_type();
47+
ABIValue::from(rust_abi_type.decode(data).unwrap())
48+
}
49+
50+
fn encode(&self, value: ABIValue) -> Vec<u8> {
51+
let rust_abi_type = self.to_rust_abi_type();
52+
rust_abi_type.encode(&value.into()).unwrap()
53+
}
54+
}

‎crates/algokit_utils_ffi/src/abi/abi_type/string.rs‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
use algokit_abi::ABIType as RustABIType;
22

3+
use crate::abi::abi_value::ABIValue;
4+
35
use super::{ABIType, FfiToRustABIType};
46

57
#[derive(uniffi::Object, Clone)]
@@ -23,8 +25,19 @@ impl From<RustABIType> for ABIString {
2325

2426
impl FfiToRustABIType for ABIString {
2527
fn to_rust_abi_type(&self) -> RustABIType {
26-
(*self).clone().into()
28+
self.clone().into()
2729
}
2830
}
2931

30-
impl ABIType for ABIString {}
32+
#[uniffi::export]
33+
impl ABIType for ABIString {
34+
fn decoode(&self, data: &[u8]) -> ABIValue {
35+
let rust_abi_type = self.to_rust_abi_type();
36+
ABIValue::from(rust_abi_type.decode(data).unwrap())
37+
}
38+
39+
fn encode(&self, value: ABIValue) -> Vec<u8> {
40+
let rust_abi_type = self.to_rust_abi_type();
41+
rust_abi_type.encode(&value.into()).unwrap()
42+
}
43+
}

‎crates/algokit_utils_ffi/src/abi/abi_type/tuple.rs‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ use std::sync::Arc;
22

33
use algokit_abi::ABIType as RustABIType;
44

5+
use crate::abi::abi_value::ABIValue;
6+
57
use super::RustToFfiABIType;
68
use super::{ABIType, FfiToRustABIType};
79

@@ -12,12 +14,10 @@ pub struct ABITuple {
1214

1315
impl FfiToRustABIType for ABITuple {
1416
fn to_rust_abi_type(&self) -> RustABIType {
15-
(*self).clone().into()
17+
self.clone().into()
1618
}
1719
}
1820

19-
impl ABIType for ABITuple {}
20-
2121
impl From<ABITuple> for RustABIType {
2222
fn from(value: ABITuple) -> Self {
2323
let rust_components = value
@@ -42,3 +42,16 @@ impl From<RustABIType> for ABITuple {
4242
}
4343
}
4444
}
45+
46+
#[uniffi::export]
47+
impl ABIType for ABITuple {
48+
fn decoode(&self, data: &[u8]) -> ABIValue {
49+
let rust_abi_type = self.to_rust_abi_type();
50+
ABIValue::from(rust_abi_type.decode(data).unwrap())
51+
}
52+
53+
fn encode(&self, value: ABIValue) -> Vec<u8> {
54+
let rust_abi_type = self.to_rust_abi_type();
55+
rust_abi_type.encode(&value.into()).unwrap()
56+
}
57+
}

‎crates/algokit_utils_ffi/src/abi/abi_type/ufixed.rs‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
use algokit_abi::abi_type::BitSize;
22
use algokit_abi::{ABIType as RustABIType, abi_type::Precision};
33

4+
use crate::abi::abi_value::ABIValue;
5+
46
use super::{ABIType, FfiToRustABIType};
57

68
#[derive(uniffi::Object, Clone)]
@@ -33,8 +35,19 @@ impl From<RustABIType> for ABIUfixed {
3335

3436
impl FfiToRustABIType for ABIUfixed {
3537
fn to_rust_abi_type(&self) -> RustABIType {
36-
(*self).clone().into()
38+
self.clone().into()
3739
}
3840
}
3941

40-
impl ABIType for ABIUfixed {}
42+
#[uniffi::export]
43+
impl ABIType for ABIUfixed {
44+
fn decoode(&self, data: &[u8]) -> ABIValue {
45+
let rust_abi_type = self.to_rust_abi_type();
46+
ABIValue::from(rust_abi_type.decode(data).unwrap())
47+
}
48+
49+
fn encode(&self, value: ABIValue) -> Vec<u8> {
50+
let rust_abi_type = self.to_rust_abi_type();
51+
rust_abi_type.encode(&value.into()).unwrap()
52+
}
53+
}

‎crates/algokit_utils_ffi/src/abi/abi_type/uint.rs‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
use algokit_abi::ABIType as RustABIType;
22
use algokit_abi::abi_type::BitSize;
33

4+
use crate::abi::abi_value::ABIValue;
5+
46
use super::{ABIType, FfiToRustABIType};
57

68
#[derive(uniffi::Object, Clone)]
@@ -28,8 +30,19 @@ impl From<RustABIType> for ABIUint {
2830

2931
impl FfiToRustABIType for ABIUint {
3032
fn to_rust_abi_type(&self) -> RustABIType {
31-
(*self).clone().into()
33+
self.clone().into()
3234
}
3335
}
3436

35-
impl ABIType for ABIUint {}
37+
#[uniffi::export]
38+
impl ABIType for ABIUint {
39+
fn decoode(&self, data: &[u8]) -> ABIValue {
40+
let rust_abi_type = self.to_rust_abi_type();
41+
ABIValue::from(rust_abi_type.decode(data).unwrap())
42+
}
43+
44+
fn encode(&self, value: ABIValue) -> Vec<u8> {
45+
let rust_abi_type = self.to_rust_abi_type();
46+
rust_abi_type.encode(&value.into()).unwrap()
47+
}
48+
}

0 commit comments

Comments
 (0)