diff --git a/README.md b/README.md index 508ca31..1ef9175 100644 --- a/README.md +++ b/README.md @@ -2,20 +2,16 @@ A Lightning Hardware Wallet based on [Validating Lightning Signer](https://gitlab.com/lightning-signer/validating-lightning-signer) -### set CFLAGS +### build factory -Before building the sphinx-key esp software, run this: +`cd factory` -`export CFLAGS=-fno-pic` - -### find your esp GCC - -Find the path to your `riscv32-esp-elf-gcc` binary within the `.embuild` dir: - -`export CC=$PWD/.embuild/espressif/tools/riscv32-esp-elf/esp-2021r2-patch3-8.4.0/riscv32-esp-elf/bin/riscv32-esp-elf-gcc` +`cargo build --release` ### build +`cd ../sphinx-key` + The wifi SSID and password needs to be in env to build the firmware. SSID must be at least 6 characters, and PASS must be at least 8 characters. `SSID=sphinx-1 PASS=sphinx-1234 cargo build` diff --git a/factory/.cargo/config.toml b/factory/.cargo/config.toml index 33f5399..548a46d 100644 --- a/factory/.cargo/config.toml +++ b/factory/.cargo/config.toml @@ -1,8 +1,4 @@ [build] -# Uncomment the relevant target for your chip here (ESP32, ESP32-S2, ESP32-S3 or ESP32-C3) -#target = "xtensa-esp32-espidf" -#target = "xtensa-esp32s2-espidf" -#target = "xtensa-esp32s3-espidf" target = "riscv32imc-esp-espidf" [target.xtensa-esp32-espidf] @@ -29,6 +25,6 @@ build-std-features = ["panic_immediate_abort"] # Required for older ESP-IDF vers [env] # Note: these variables are not used when using pio builder # Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF stable (v4.4) -ESP_IDF_VERSION = { value = "release/v4.4" } +ESP_IDF_VERSION = { value = "tag:v4.4.2" } # Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF master (mainline) #ESP_IDF_VERSION = { value = "master" } diff --git a/sphinx-key/.cargo/config.toml b/sphinx-key/.cargo/config.toml index 564686d..6d4c078 100644 --- a/sphinx-key/.cargo/config.toml +++ b/sphinx-key/.cargo/config.toml @@ -29,8 +29,8 @@ build-std-features = ["panic_immediate_abort"] # Required for older ESP-IDF vers [env] # Note: these variables are not used when using pio builder # Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF stable (v4.4) -ESP_IDF_VERSION = { value = "release/v4.4" } +ESP_IDF_VERSION = { value = "tag:v4.4.2" } # Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF master (mainline) #ESP_IDF_VERSION = { value = "master" } -CC = { value = "../factory/.embuild/espressif/tools/riscv32-esp-elf/esp-2021r2-patch4-8.4.0/riscv32-esp-elf/bin/riscv32-esp-elf-gcc", relative = true } +CC = { value = "../factory/.embuild/espressif/tools/riscv32-esp-elf/esp-2021r2-patch3-8.4.0/riscv32-esp-elf/bin/riscv32-esp-elf-gcc", relative = true } CFLAGS = { value = "-fno-pic" } diff --git a/sphinx-key/Cargo.lock b/sphinx-key/Cargo.lock index 0ed5ee9..47ff1be 100644 --- a/sphinx-key/Cargo.lock +++ b/sphinx-key/Cargo.lock @@ -1885,9 +1885,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" dependencies = [ "itoa", "ryu", @@ -1989,13 +1989,14 @@ dependencies = [ [[package]] name = "sphinx-glyph" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0527b300544e9fe193611f1be1f76e3b25f5ceab4217347429c2912b60093e" +checksum = "dbab7d4a5119f6040006784cee5117aabf8654588620e58a01b66732bb307671" dependencies = [ "anyhow", "rmp-serde", "serde", + "serde_json", "sphinx-auther", ]