Use new SDK

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "alamgu-async-block"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -9,13 +9,6 @@ edition = "2018"
 arrayvec = { version = "0.7.2", default-features = false }
 ledger-log = { git = "https://github.com/alamgu/ledger-log" }
 pin-project = "1.0.10"
-nanos_sdk = { git = "https://github.com/LedgerHQ/ledger-nanos-sdk.git" }
-nanos_ui = { git = "https://github.com/LedgerHQ/ledger-nanos-ui.git" }
+ledger_device_sdk = "1.4.3"
+ledger_secure_sdk_sys = "1.1.0"
 ledger-parser-combinators = { git = "https://github.com/alamgu/ledger-parser-combinators", branch="async-split-take-2" }
-
-[patch."https://github.com/LedgerHQ/ledger-nanos-sdk.git".nanos_sdk]
-git = "https://github.com/alamgu/ledger-nanos-sdk.git"
-branch = "relocating-loader-w-fixes"
-[patch."https://github.com/LedgerHQ/ledger-nanos-ui.git".nanos_ui]
-git = "https://github.com/obsidiansystems/ledger-nanos-ui"
-branch = "dn-make-from-pub"

src/lib.rs

@@ -84,14 +84,14 @@ use core::future::Future;
 use core::pin::Pin;
 use ledger_log::*;
 use ledger_parser_combinators::async_parser::{reject, Readable, UnwrappableReadable};
-use nanos_sdk::bindings::*;
-use nanos_sdk::io;
+use ledger_secure_sdk_sys::*;
+use ledger_device_sdk::io;
 
 use core::cell::{Ref, RefCell, RefMut};
 use core::convert::TryFrom;
 use core::convert::TryInto;
 use core::task::*;
-use nanos_sdk::io::Reply; //, BorrowMutError};
+use ledger_device_sdk::io::Reply; //, BorrowMutError};
 
 pub mod prompts;
 
@@ -453,7 +453,7 @@ pub fn poll_with_trivial_context<Fut: Future + ?Sized>(
     f: Pin<&mut Fut>,
 ) -> core::task::Poll<Fut::Output> {
     let waker =
-        unsafe { Waker::from_raw(RawWaker::new(&(), nanos_sdk::pic_rs(&RAW_WAKER_VTABLE))) };
+        unsafe { Waker::from_raw(RawWaker::new(&(), pic_rs(&RAW_WAKER_VTABLE))) };
     let mut ctxd = Context::from_waker(&waker);
     let r = f.poll(&mut ctxd);
     core::mem::forget(ctxd);
@@ -469,7 +469,7 @@ fn sha256_hash(data: &[u8]) -> [u8; 32] {
         let mut hasher = cx_sha256_s::default();
         cx_sha256_init_no_throw(&mut hasher);
         let hasher_ref = &mut hasher as *mut cx_sha256_s as *mut cx_hash_t;
-        cx_hash_update(hasher_ref, data.as_ptr(), data.len() as u32);
+        cx_hash_update(hasher_ref, data.as_ptr(), data.len());
         cx_hash_final(hasher_ref, rv.as_mut_ptr());
     }
     rv

src/prompts.rs

@@ -3,10 +3,10 @@ use arrayvec::ArrayString;
 use core::fmt::{Arguments, Error, Write};
 use core::str::from_utf8;
 
-use nanos_sdk::buttons::*;
-use nanos_ui::bagls::*;
-use nanos_ui::layout::*;
-use nanos_ui::ui::clear_screen;
+use ledger_device_sdk::buttons::*;
+use ledger_device_sdk::ui::bagls::*;
+use ledger_device_sdk::ui::layout::*;
+use ledger_device_sdk::ui::gadgets::{clear_screen, get_event};
 
 #[derive(Clone, Debug)]
 pub struct PromptQueue {
@@ -170,7 +170,7 @@ impl PromptQueue {
 
             // let buttons_evt = self.io.next_button().await;
             loop {
-                if let Some(buttons_evt) = nanos_ui::ui::get_event(&mut buttons) {
+                if let Some(buttons_evt) = get_event(&mut buttons) {
                     // {
                     match (state.clone(), buttons_evt) {
                         (PromptingState::Prompts, ButtonEvent::LeftButtonRelease) => {