Merge branch 'develop-sync' into develop

obsidiansystems · Mar 15, 2023 · 2053bad · 2053bad
2 parents 29ed819 + f625475
commit 2053bad
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/.cargo/config b/.cargo/config
@@ -9,7 +9,7 @@ rustflags = [
   "-C", "embed-bitcode",
   "--emit=metadata,link,obj,llvm-ir,llvm-bc"
 ]
-runner = "./speculos-wrapper -m nanosp -k 1.0.3 "
+runner = "./speculos-wrapper -m nanosp -a 1 "
 
 [target.nanos]
 rustflags = [
@@ -27,7 +27,7 @@ rustflags = [
   "-C", "embed-bitcode",
   "--emit=metadata,link,obj,llvm-ir,llvm-bc"
 ]
-runner = "./speculos-wrapper -m nanox "
+runner = "./speculos-wrapper -m nanox -a 1 "
 
 [alias]
 tt = "test --features extra_debug"

diff --git a/crate-hashes.json b/crate-hashes.json
@@ -2,11 +2,11 @@
   "alamgu-async-block 0.1.0 (git+https://github.com/alamgu/alamgu-async-block?branch=prompt-queueing#af41c5bb63c9b8f47b1dea0ff3c79410493ce0fa)": "19mf6mnhkdl5d6ncf3sdjlgj9cjr4kd343ihiwm8g5rn9vs5g0g6",
   "enum-init 0.1.0 (git+https://github.com/alamgu/enum-init#5706da92215f1a5816d704229f8924d95d954a77)": "0vh10l6glg4fry3z8am9skdlg2xcs0maqz5f24awwd9vl4ac6fv6",
   "include_gif 0.1.0 (git+https://github.com/LedgerHQ/sdk_include_gif#699d28c6157518c4493899e2eeaa8af08346e5e7)": "185gra3i4s8cbmdhrxk2fyww0l6zlmyf2l04zbkvl9n9b6hd04pl",
-  "ledger-crypto-helpers 0.2.0 (git+https://github.com/alamgu/ledger-crypto-helpers#0deb1ccb31e480ffab0c7c1fa5891db5e69e0f4c)": "1sf1r64kp3d51hj76vsj14xmikbdhj2gvpl3wss554p1z7yyplav",
-  "ledger-log 0.2.0 (git+https://github.com/alamgu/ledger-log#aa326b3078f5a470047b0d13bc2c00cec39e600c)": "016j013zq38zci0dz60y3daz3l7bj3jd5w17r18gpj450jkxkmb6",
+  "ledger-crypto-helpers 0.2.0 (git+https://github.com/alamgu/ledger-crypto-helpers#f8475666069588a4eebe987ecfa50aa6c6e60cf0)": "0gc0k1cwwi37vssrx0a3qgqwqm5v98nr58i03iydak5ypd2hp2dp",
+  "ledger-log 0.2.0 (git+https://github.com/alamgu/ledger-log#a417ebe6a426bbc6f92e92272c944b89765c384d)": "1qg502avfqiy30k17xi8gwwnawx5p53v0rcd3c566s4s5ga746jb",
   "ledger-parser-combinators 0.1.0 (git+https://github.com/alamgu/ledger-parser-combinators?branch=async-split-take-2#2dccafbdaab9332cb209c3bb14f5e594aed2c374)": "0fm0afp0y2lj4drm49ywk0imahps8qh7sffirgvc7fvnbggvvfwz",
   "ledger-prompts-ui 0.1.0 (git+https://github.com/alamgu/ledger-prompts-ui#87c29519a43b5144058c97eb298a5297b342e0be)": "0vvj15z52gn2gc4dlf1afqri4y95w592yhv7iimjhyv3hda863vv",
-  "nanos_sdk 0.2.0 (git+https://github.com/alamgu/ledger-nanos-sdk.git?branch=memory-fixes-pending#100b25ddfb6049f6520d46657cf13a36a3fdeae9)": "04qvp396fs4cwbkx8j03lqzysaiw78mwvqfmzarqrwq4k4qk7izm",
+  "nanos_sdk 0.2.0 (git+https://github.com/alamgu/ledger-nanos-sdk.git?branch=relocating-loader-w-fixes#27c4df41a062cfc5382ef733a7f26aff10d6c6f7)": "0zg82w7xj66caxw6zf1qslz5znfhpjl16ajjc1dn7f5m9h4lfg7c",
   "nanos_ui 0.2.0 (git+https://github.com/obsidiansystems/ledger-nanos-ui?branch=dn-make-from-pub#7d68e90f7a35736a44b8ab9cb620ed4d6cbc4495)": "0qfp96v7ay9a9wy4slcw9fd7qcdml36vs7cycmyskg42mxm0yh6r",
   "testmacro 0.1.0 (git+https://github.com/yhql/testmacro#29a16cb8718d61b67c6c391e60c8347c064e921e)": "0agl46ilx2psfvwvg8iwfmq203xapw435h03qskxqf5dnwhy1kir",
   "trie-enum 0.1.0 (git+https://github.com/alamgu/trie-enum#0dedf0d0a941fc47b830d25d008f5ea42fdd3db4)": "0pcqn250n8ma94zy39blgvx8mxmdk1k6wzz03zs6bb4wfcv1y7pz"

diff --git a/default.nix b/default.nix
@@ -197,8 +197,8 @@ rec {
 
     speculosDeviceFlags = {
       nanos = [ "-m" "nanos" ];
-      nanosplus = [ "-m" "nanosp" "-k" "1.0.3" ];
-      nanox = [ "-m" "nanox" ];
+      nanosplus = [ "-m" "nanosp" "-a" "1" ];
+      nanox = [ "-m" "nanox" "-a" "1" ];
     }.${device} or (throw "Unknown target device: `${device}'");
 
     speculosCmd = [

diff --git a/dep/alamgu/github.json b/dep/alamgu/github.json
@@ -3,6 +3,6 @@
   "repo": "alamgu",
   "branch": "develop",
   "private": false,
-  "rev": "979c9b8998ada1368c9bd6b607fd0574df1a7abe",
-  "sha256": "0p4zpwlc0ryly7rspdsbqmlgbmbyi8921s10f44akkkbwzxf7h8g"
+  "rev": "e12886d0527e5513864581cd19d9c19271ffef14",
+  "sha256": "05a9i8yairrqfipyrk7xadbr0icp2fza7fi2xrqvmfiibyqlgfs8"
 }
diff --git a/run-docker-build.sh b/run-docker-build.sh
@@ -27,8 +27,8 @@ docker run \
 # Run tests
 # The speculos-wrapper need to be invoked from a dir further down, as it refers to "../ts-tests"
 nix-shell -A nanos.rustShell --run "cd $OUT_DIR; ../speculos-wrapper -m nanos ../$OUT_DIR/nanos/$APP_NAME"
-nix-shell -A nanosplus.rustShell --run "cd $OUT_DIR; ../speculos-wrapper -m nanosp -k 1.0.3 ../$OUT_DIR/nanosplus/$APP_NAME"
-nix-shell -A nanox.rustShell --run "cd $OUT_DIR; ../speculos-wrapper -m nanox ../$OUT_DIR/nanox/$APP_NAME"
+nix-shell -A nanosplus.rustShell --run "cd $OUT_DIR; ../speculos-wrapper -m nanosp -a 1 ../$OUT_DIR/nanosplus/$APP_NAME"
+nix-shell -A nanox.rustShell --run "cd $OUT_DIR; ../speculos-wrapper -m nanox -a 1 ../$OUT_DIR/nanox/$APP_NAME"
 
 echo "Tests done!"
 

diff --git a/rust-app/Cargo.lock b/rust-app/Cargo.lock
diff --git a/rust-app/Cargo.toml b/rust-app/Cargo.toml
@@ -43,7 +43,7 @@ path = "bin-src/main.rs"
 
 [patch."https://github.com/LedgerHQ/ledger-nanos-sdk.git".nanos_sdk]
 git = "https://github.com/alamgu/ledger-nanos-sdk.git"
-branch = "memory-fixes-pending"
+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"
@@ -60,6 +60,7 @@ overflow-checks = false
 
 [package.metadata.nanos]
 name = "Alamgu Example"
+api_level = "1"
 path = ["44'/535348'"]
 curve = ["ed25519"]
 flags = "0"

diff --git a/rust-app/build.rs b/rust-app/build.rs
@@ -4,7 +4,7 @@ fn main() {
     let debug_print = std::env::var("CARGO_FEATURE_SPECULOS").is_ok();
     let extra_debug_print = std::env::var("CARGO_FEATURE_EXTRA_DEBUG").is_ok();
     let reloc_size = match (profile.as_str(), debug_print, extra_debug_print) {
-        ("release", false, false) => 3400,
+        ("release", false, false) => 3464,
         (_, _, true) => 1024 * 10,
         _ => 1024 * 7,
     };