Merge pull request #342 from Foundation-Devices/jeandudey/sft-2271-up…

…grade-to-foundation-rs

SFT-2271: Upgrade to foundation-rs

extmod/foundation-rust/Cargo.toml

@@ -24,14 +24,14 @@ default-features = false
 version = "1"
 default-features = false
 
-[dependencies.ur]
-git = "https://github.com/Foundation-Devices/ur-rs"
-branch = "dev"
+[dependencies.foundation-ur]
+git = "https://github.com/Foundation-Devices/foundation-rs"
+branch = "main"
 default-features = false
 
-[dependencies.ur-foundation]
-git = "https://github.com/Foundation-Devices/rust-ur-foundation"
-branch = "dev-v0.1.0"
+[dependencies.foundation-urtypes]
+git = "https://github.com/Foundation-Devices/foundation-rs"
+branch = "main"
 default-features = false
 
 [target.'cfg(target_arch = "arm")'.dependencies.cortex-m]

extmod/foundation-rust/include/foundation.h

@@ -74,11 +74,6 @@
  */
 #define UR_NETWORK_TESTNET 1
 
-/**
- * Maximum number of components that a `crypto-keypath` can have.
- */
-#define UR_MAX_PATH_COMPONENTS 4
-
 typedef enum {
   BTC,
 } UR_CoinType;
@@ -441,7 +436,7 @@ bool ur_decode_single_part(const uint8_t *ur,
  * # Parameters
  *
  * - `value` is the uniform resource to encode.
- * - `max_fragment_len` is the maximum fragment length in bytes.
+ * - `max_chars` is the maximum fragment length in bytes.
  *
  * # Safety
  *

extmod/foundation-rust/src/ur/decoder.rs

@@ -5,13 +5,13 @@
 
 use core::{fmt, slice, str};
 
-use ur::UR;
-use ur_foundation::{ur, ur::decoder::Error};
-
-use crate::ur::{
-    max_fragment_len, max_message_len, registry::UR_Value, UR_Error,
+use foundation_ur::{
+    bytewords, bytewords::Style, decoder::Error, max_fragment_len,
+    HeaplessDecoder, UR,
 };
 
+use crate::ur::{max_message_len, registry::UR_Value, UR_Error, UR_MAX_TYPE};
+
 /// Maximum size of an encoded Uniform Resource.
 ///
 /// This value assumes a QR code of version of 16 with ECC L using
@@ -25,7 +25,7 @@ pub const UR_DECODER_MAX_SEQUENCE_COUNT: usize = 128;
 
 /// Maximum fragment length.
 pub const UR_DECODER_MAX_FRAGMENT_LEN: usize =
-    max_fragment_len(UR_DECODER_MAX_STRING);
+    max_fragment_len(UR_MAX_TYPE, usize::MAX, UR_DECODER_MAX_STRING);
 
 /// Maximum message length that can be decoded.
 pub const UR_DECODER_MAX_MESSAGE_LEN: usize = 24 * 1024;
@@ -49,7 +49,7 @@ pub const UR_DECODER_MAX_UR_TYPE: usize = "crypto-coin-info".len();
 #[used]
 #[cfg_attr(dtcm, link_section = ".dtcm")]
 pub static mut UR_DECODER: UR_Decoder = UR_Decoder {
-    inner: ur::HeaplessDecoder::new_heapless(),
+    inner: HeaplessDecoder::new(),
 };
 
 /// cbindgen:ignore
@@ -62,7 +62,7 @@ static mut UR_DECODER_SINGLE_PART_MESSAGE: heapless::Vec<
 
 /// Uniform Resource decoder.
 pub struct UR_Decoder {
-    inner: ur::HeaplessDecoder<
+    inner: HeaplessDecoder<
         UR_DECODER_MAX_MESSAGE_LEN,
         UR_DECODER_MAX_MIXED_PARTS,
         UR_DECODER_MAX_FRAGMENT_LEN,
@@ -213,11 +213,7 @@ pub unsafe extern "C" fn ur_validate(ur: *const u8, ur_len: usize) -> bool {
             .as_bytewords()
             .expect("Parsed URs shouldn't be in a deserialized variant");
 
-        return ur::bytewords::validate(
-            bytewords,
-            ur::bytewords::Style::Minimal,
-        )
-        .is_ok();
+        return bytewords::validate(bytewords, Style::Minimal).is_ok();
     }
 
     false
@@ -256,11 +252,11 @@ pub unsafe extern "C" fn ur_decode_single_part(
         .resize(UR_DECODER_MAX_SINGLE_PART_MESSAGE_LEN, 0)
         .expect("Message buffer should have the same size as in the constant");
 
-    let result = ur::bytewords::decode_to_slice(
+    let result = bytewords::decode_to_slice(
         ur.as_bytewords()
             .expect("Uniform Resource should contain bytewords"),
         message,
-        ur::bytewords::Style::Minimal,
+        Style::Minimal,
     )
     .map_err(|e| unsafe { UR_Error::other(&e) });