build fixes / improvements

Zondax · Apr 4, 2024 · 9a9a35f · 9a9a35f
1 parent 85f53e2
commit 9a9a35f
Show file tree

Hide file tree

Showing 15 changed files with 1,068 additions and 265 deletions.
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2020 Zondax AG
+   Copyright 2018-2024 Zondax AG
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/Makefile b/Makefile
@@ -40,6 +40,15 @@ zcashtools_test: zcashtools_build
 
 zemu_install: zcashtools_build
 
+update:
+#	cd app/rust && cargo update
+	cd zcashtools && cargo update
+	cd zcashtools/neon/native && cargo update
+	git submodule update --init --remote
+
+shell:
+	poetry install --no-root && poetry shell
+
 test_all:
 	make zemu_install
 	make zcashtools_test

diff --git a/app/rust/.cargo/.package-cache-mutate b/app/rust/.cargo/.package-cache-mutate
diff --git a/app/rust/Cargo.lock b/app/rust/Cargo.lock
diff --git a/app/rust/Cargo.toml b/app/rust/Cargo.toml
@@ -10,16 +10,16 @@ name = "rslib"
 crate-type = ["staticlib"]
 
 [dependencies]
-jubjub = { version = "0.9", default-features = false }
-rand = { version = "0.7", default-features = false }
-blake2b_simd = { version = "0.5", default-features = false }
-blake2s_simd = { version = "0.5", default-features = false }
+jubjub = { version = "0.10", default-features = false }
+rand = { version = "0.8", default-features = false }
+blake2b_simd = { version = "1", default-features = false }
+blake2s_simd = { version = "1", default-features = false }
 binary-ff1 = { version = "0.1.0", default-features = false }
 aes = { version = "0.3", default-features = false }
 byteorder = { version = "1", default-features = false }
-hex = { version = "0.4.2", default-features = false }
-nom = { version = "5.1.1", default-features = false }
-group = { version = "0.12", default-features = false }
+hex = { version = "0.4", default-features = false }
+nom = { version = "7", default-features = false }
+group = { version = "0.13", default-features = false }
 
 [dependencies.chacha20poly1305]
 version = "0.5.1"

diff --git a/deps/ledger-zxlib b/deps/ledger-zxlib
diff --git a/js/package.json b/js/package.json
@@ -46,7 +46,7 @@
     "jest-serial-runner": "^1.2.0",
     "prettier": "^3.2.4",
     "secp256k1": "^5.0.0",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.3"
   },
   "scripts": {
     "build": "babel src --out-dir dist && yarn build:types",
+0 −1		app/ui/view_nano.c
+1 −1		dockerized_build.mk
+1 −0		include/zxformat.h
+17 −17		include/zxversion.h
+30 −0		scripts/yearLookup.py
+236 −1		src/timeutils.c
+77 −7		src/zxformat.c