From d13a4d6813313e6f14d495ed5ef9af6b4fabf209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= <balvarez@boxfish.studio>
Date: Thu, 3 Aug 2023 12:37:37 +0200
Subject: [PATCH 1/3] chore: bump version to 1.7.3-beta-1

---
 packages/desktop/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index c364070a5b4..838c6d9d6d9 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,7 +1,7 @@
 {
     "name": "desktop",
     "productName": "Firefly",
-    "version": "1.7.2",
+    "version": "1.7.3-beta-1",
     "description": "Official IOTA wallet on desktop",
     "main": "public/build/main.js",
     "repository": "git@github.com:iotaledger/firefly.git",

From d4bf403d3102bcd425038cd2bbf6b342ff8c3a7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bego=C3=B1a=20=C3=81lvarez=20de=20la=20Cruz?=
 <balvarez@boxfish.studio>
Date: Thu, 3 Aug 2023 14:57:17 +0200
Subject: [PATCH 2/3] chore: upgrade bindings (#7281)

* chore: upgrade dependencies

* Update migrate_stronghold_snapshot_v2_to_v3

* feat: apply bindings updates

* fix: add missing actor destroy

* chore: update walletrs

* fix: bindings migration error regex

* chore: update bindings to latest commit hash in firefly-desktop branch

* chore: update bindings to latest commit hash in firefly-desktop branch

* fix: macos build (#7303)

* chore: fix building dmg on macos

* fix: macos ci build

* test: try python2 command for python 2.x

* fix: error string

---------

Co-authored-by: Thibault Martinez <thibault@iota.org>
---
 .github/workflows/build-desktop.yml           |  42 +-
 packages/backend/Cargo.lock                   | 431 +++++++++--
 packages/backend/Cargo.toml                   |   3 +-
 packages/backend/bindings/node/index.ts       |  11 +-
 .../backend/bindings/node/native/Cargo.lock   | 684 ++++++++++--------
 .../backend/bindings/node/native/Cargo.toml   |   2 +-
 .../backend/bindings/node/native/src/lib.rs   |  10 +-
 packages/shared/lib/stronghold.ts             |   2 +-
 .../shared/routes/login/views/EnterPin.svelte |  10 +-
 patches/dmg-builder+22.9.1.patch              |  14 +
 10 files changed, 821 insertions(+), 388 deletions(-)
 create mode 100644 patches/dmg-builder+22.9.1.patch

diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index 7a351916915..e2b2776063c 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -46,7 +46,7 @@ jobs:
         needs: [setup]
         strategy:
             matrix:
-                os: [ubuntu-20.04, macos-11, windows-latest]
+                os: [ubuntu-20.04, macos-13, windows-latest]
             fail-fast: false
         env:
             VERSION: ${{ needs.setup.outputs.version }}
@@ -60,11 +60,16 @@ jobs:
               with:
                   node-version: 14.x
 
-            - name: Set up Python 2.x (macOS)
-              uses: actions/setup-python@v2
-              if: matrix.os == 'macos-11'
+            - name: Set up Python 3.10
+              uses: actions/setup-python@v4
+              with:
+                python-version: '3.10'
+
+            - name: Select Xcode
+              uses: maxim-lobanov/setup-xcode@v1
+              if: matrix.os == 'macos-13'
               with:
-                  python-version: '2.x'
+                xcode-version: 'latest-stable'
 
             - name: Install Rust toolchain
               uses: actions-rs/toolchain@v1
@@ -106,10 +111,6 @@ jobs:
               working-directory: packages/backend/bindings/node/native
               if: matrix.os == 'windows-latest'
 
-            - name: Set deployment target (macOS)
-              run: echo "MACOSX_DEPLOYMENT_TARGET=10.12" >> $GITHUB_ENV
-              if: matrix.os == 'macos-11'
-
             - name: Install required packages (Linux)
               run: |
                   sudo apt update
@@ -136,12 +137,11 @@ jobs:
               env:
                   SENTRY_DSN: ${{ secrets.SENTRY_DSN_PROD_BACKEND }}
                   SENTRY_ENVIRONMENT: ${{ env.STAGE }}
-                  NODE_GYP_FORCE_PYTHON: '2.7.18'
 
             - name: Install Sentry CLI
               # Yarn has issues putting binaries in the PATH on Windows
               run: npm i -g @sentry/cli
-              if: ${{ startsWith(github.ref, 'refs/tags/desktop') && matrix.os != 'macos-11' }}
+              if: ${{ startsWith(github.ref, 'refs/tags/desktop') && matrix.os != 'macos-13' }}
 
             #    - name: Strip backend debug info and upload to Sentry (Linux)
             #      run: |
@@ -181,6 +181,18 @@ jobs:
                   SENTRY_DSN: ${{ secrets.SENTRY_DSN_PROD_DESKTOP }}
                   SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
+            - name: Set up Python 2.x (macOS)
+              if: matrix.os == 'macos-13'
+              run: |
+                wget https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg -O ${{ runner.temp }}/python.pkg
+                sudo installer -pkg ${{ runner.temp }}/python.pkg -target / -verbose
+            
+            - name: Test Python 2.x (macOS)
+              if: matrix.os == 'macos-13'
+              run: |
+                which python2
+                python2 --version
+
             - name: Build Electron app (macOS)
               run: yarn compile:${STAGE}:mac
               env:
@@ -189,7 +201,7 @@ jobs:
                   FIREFLY_APPLE_ID: ${{ secrets.APPLE_ID }}
                   FIREFLY_APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
               working-directory: packages/desktop
-              if: matrix.os == 'macos-11'
+              if: matrix.os == 'macos-13'
 
             - name: Build Electron app (Windows)
               run: yarn compile:${env:STAGE}:win
@@ -228,7 +240,7 @@ jobs:
             - name: Compute checksums (macOS)
               run: for i in `ls | grep 'firefly-desktop*'` ; do shasum -a 256 $i | awk {'print $1'} > $i.sha256 ; done
               working-directory: packages/desktop/out
-              if: matrix.os == 'macos-11'
+              if: matrix.os == 'macos-13'
 
             - name: Compute checksums (Windows)
               run: Get-ChildItem "." -Filter firefly-desktop* | Foreach-Object { $(Get-FileHash -Path $_.FullName -Algorithm SHA256).Hash | Set-Content ($_.FullName + '.sha256') }
@@ -267,7 +279,7 @@ jobs:
             - name: Downloading artifacts
               uses: actions/download-artifact@v2
               with:
-                  name: firefly-desktop-macos-11
+                  name: firefly-desktop-macos-13
                   path: assets
 
             - name: Downloading artifacts
@@ -367,4 +379,4 @@ jobs:
               env:
                   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
                   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-                  AWS_DEFAULT_REGION: eu-central-1
+                  AWS_DEFAULT_REGION: eu-central-1
\ No newline at end of file
diff --git a/packages/backend/Cargo.lock b/packages/backend/Cargo.lock
index 1121bee6938..497fdc58506 100644
--- a/packages/backend/Cargo.lock
+++ b/packages/backend/Cargo.lock
@@ -47,6 +47,17 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "ahash"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "once_cell",
+ "version_check",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "0.7.20"
@@ -56,6 +67,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "allocator-api2"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -102,7 +119,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
 dependencies = [
  "proc-macro2 1.0.56",
  "quote 1.0.26",
- "syn 2.0.15",
+ "syn 2.0.16",
 ]
 
 [[package]]
@@ -165,6 +182,12 @@ dependencies = [
  "rustc-demangle",
 ]
 
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -177,6 +200,12 @@ version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
 
+[[package]]
+name = "base64ct"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
 [[package]]
 name = "bech32"
 version = "0.7.3"
@@ -312,9 +341,9 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.59.2"
+version = "0.65.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
+checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
 dependencies = [
  "bitflags",
  "cexpr",
@@ -322,11 +351,13 @@ dependencies = [
  "lazy_static",
  "lazycell",
  "peeking_take_while",
+ "prettyplease",
  "proc-macro2 1.0.56",
  "quote 1.0.26",
  "regex",
  "rustc-hash",
  "shlex",
+ "syn 2.0.16",
 ]
 
 [[package]]
@@ -579,6 +610,12 @@ dependencies = [
  "yaml-rust",
 ]
 
+[[package]]
+name = "const-oid"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747"
+
 [[package]]
 name = "const-random"
 version = "0.1.15"
@@ -782,6 +819,18 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
+[[package]]
+name = "crypto-bigint"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15"
+dependencies = [
+ "generic-array",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -846,6 +895,34 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "curve25519-dalek"
+version = "4.0.0-rc.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436ace70fc06e06f7f689d2624dc4e2f0ea666efb5aa704215f7249ae6e047a7"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "digest 0.10.6",
+ "fiat-crypto",
+ "platforms",
+ "rustc_version",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
+dependencies = [
+ "proc-macro2 1.0.56",
+ "quote 1.0.26",
+ "syn 2.0.16",
+]
+
 [[package]]
 name = "cxx"
 version = "1.0.94"
@@ -870,7 +947,7 @@ dependencies = [
  "proc-macro2 1.0.56",
  "quote 1.0.26",
  "scratch",
- "syn 2.0.15",
+ "syn 2.0.16",
 ]
 
 [[package]]
@@ -887,7 +964,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
 dependencies = [
  "proc-macro2 1.0.56",
  "quote 1.0.26",
- "syn 2.0.15",
+ "syn 2.0.16",
 ]
 
 [[package]]
@@ -911,6 +988,17 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "der"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468",
+ "zeroize",
+]
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -927,6 +1015,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
 dependencies = [
  "block-buffer 0.10.4",
+ "const-oid",
  "crypto-common",
  "subtle",
 ]
@@ -952,13 +1041,38 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "ecdsa"
+version = "0.16.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428"
+dependencies = [
+ "der",
+ "digest 0.10.6",
+ "elliptic-curve",
+ "rfc6979",
+ "serdect",
+ "signature 2.1.0",
+ "spki",
+]
+
 [[package]]
 name = "ed25519"
 version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
 dependencies = [
- "signature",
+ "signature 1.6.4",
+]
+
+[[package]]
+name = "ed25519"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fb04eee5d9d907f29e80ee6b0e78f7e2c82342c63e3580d8c4f69d9d5aad963"
+dependencies = [
+ "serde 1.0.160",
+ "signature 2.1.0",
 ]
 
 [[package]]
@@ -967,8 +1081,8 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
 dependencies = [
- "curve25519-dalek",
- "ed25519",
+ "curve25519-dalek 3.2.0",
+ "ed25519 1.5.3",
  "sha2 0.9.9",
  "zeroize",
 ]
@@ -979,7 +1093,7 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a128b76af6dd4b427e34a6fd43dc78dbfe73672ec41ff615a2414c1a0ad0409"
 dependencies = [
- "curve25519-dalek",
+ "curve25519-dalek 3.2.0",
  "hex",
  "rand_core 0.5.1",
  "sha2 0.9.9",
@@ -992,20 +1106,57 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6"
 dependencies = [
- "curve25519-dalek",
- "hashbrown",
+ "curve25519-dalek 3.2.0",
+ "hashbrown 0.12.3",
  "hex",
  "rand_core 0.6.4",
  "sha2 0.9.9",
  "zeroize",
 ]
 
+[[package]]
+name = "ed25519-zebra"
+version = "4.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb0d653b2c06ec7ec1b4c570bb4eac748035d6f44dd14e5fd9e7e2549938488"
+dependencies = [
+ "curve25519-dalek 4.0.0-rc.3",
+ "ed25519 2.2.1",
+ "hashbrown 0.14.0",
+ "hex",
+ "rand_core 0.6.4",
+ "serde 1.0.160",
+ "sha2 0.10.6",
+ "zeroize",
+]
+
 [[package]]
 name = "either"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
+[[package]]
+name = "elliptic-curve"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "digest 0.10.6",
+ "ff",
+ "generic-array",
+ "group",
+ "pem-rfc7468",
+ "pkcs8",
+ "rand_core 0.6.4",
+ "sec1",
+ "serdect",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.32"
@@ -1073,6 +1224,22 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "fiat-crypto"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
+
 [[package]]
 name = "firefly-actor-system"
 version = "0.1.0"
@@ -1171,7 +1338,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2 1.0.56",
  "quote 1.0.26",
- "syn 2.0.15",
+ "syn 2.0.16",
 ]
 
 [[package]]
@@ -1212,6 +1379,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
+ "zeroize",
 ]
 
 [[package]]
@@ -1262,6 +1430,17 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "h2"
 version = "0.3.18"
@@ -1296,6 +1475,16 @@ dependencies = [
  "ahash 0.7.6",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+dependencies = [
+ "ahash 0.8.3",
+ "allocator-api2",
+]
+
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
@@ -1483,7 +1672,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
- "hashbrown",
+ "hashbrown 0.12.3",
 ]
 
 [[package]]
@@ -1552,7 +1741,7 @@ dependencies = [
 [[package]]
 name = "iota-client"
 version = "1.1.1"
-source = "git+ssh://git@github.com/thibault-martinez/iota.rs-private?rev=33354cdcb8aa5a3f595989cfdd70016be409c8d4#33354cdcb8aa5a3f595989cfdd70016be409c8d4"
+source = "git+https://github.com/iotaledger/iota.rs?rev=f3e3fba11a2a0a21dc62df5c612414856cfceeb0#f3e3fba11a2a0a21dc62df5c612414856cfceeb0"
 dependencies = [
  "async-trait",
  "bee-common 0.5.0",
@@ -1561,7 +1750,7 @@ dependencies = [
  "bee-rest-api",
  "futures",
  "hex",
- "iota-crypto 0.17.1",
+ "iota-crypto 0.23.0",
  "log",
  "num_cpus",
  "once_cell",
@@ -1656,6 +1845,21 @@ name = "iota-crypto"
 version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92cdfcd73d2b8a67b913789ecd7fc06c68254f68cd2b24cc3f0419c7f8fe6bbe"
+dependencies = [
+ "autocfg",
+ "blake2 0.10.6",
+ "digest 0.10.6",
+ "ed25519-zebra 3.1.0",
+ "num-traits 0.2.15",
+ "serde 1.0.160",
+ "zeroize",
+]
+
+[[package]]
+name = "iota-crypto"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5d5a986d972c3a703d48ced24fdc0bf16fb2d02959ff4b152fa77b9132f6fb0"
 dependencies = [
  "aead",
  "autocfg",
@@ -1663,15 +1867,17 @@ dependencies = [
  "blake2 0.10.6",
  "chacha20poly1305",
  "cipher",
- "curve25519-dalek",
+ "curve25519-dalek 3.2.0",
  "digest 0.10.6",
- "ed25519-zebra 3.1.0",
+ "ed25519-zebra 4.0.1",
  "generic-array",
  "getrandom 0.2.9",
  "hkdf",
  "hmac 0.12.1",
- "num-traits 0.2.15",
+ "iterator-sorted",
+ "k256",
  "pbkdf2",
+ "rand 0.8.5",
  "scrypt",
  "serde 1.0.160",
  "sha2 0.10.6",
@@ -1714,7 +1920,7 @@ dependencies = [
 [[package]]
 name = "iota-wallet"
 version = "0.2.0"
-source = "git+ssh://git@github.com/thibault-martinez/wallet.rs-private?branch=stronghold-fix-base-669395#1b046c51f93f5e817c97d0fde02fdc8c70fc5e35"
+source = "git+https://github.com/iotaledger/wallet.rs?rev=ebcbc04319d11ec973da5d8d6d775e54577f116d#ebcbc04319d11ec973da5d8d6d775e54577f116d"
 dependencies = [
  "async-trait",
  "backtrace",
@@ -1726,7 +1932,7 @@ dependencies = [
  "hex",
  "iota-client 1.1.1",
  "iota-core",
- "iota-crypto 0.17.1",
+ "iota-crypto 0.23.0",
  "iota-ledger",
  "iota_stronghold",
  "log",
@@ -1748,12 +1954,12 @@ dependencies = [
 [[package]]
 name = "iota_stronghold"
 version = "0.4.1"
-source = "git+ssh://git@github.com/semenov-vladyslav/stronghold.rs?branch=snapshot-v3age-zeroize-v0.4.1#36127e69de3eec9103998b9a5855426855202153"
+source = "git+https://github.com/iotaledger/stronghold.rs?branch=0.4.2#ee80428d7e344a8f2d30ea9ab16e0f98915b35c1"
 dependencies = [
  "anyhow",
  "bincode",
  "futures",
- "iota-crypto 0.17.1",
+ "iota-crypto 0.23.0",
  "riker",
  "serde 1.0.160",
  "stronghold-utils",
@@ -1768,6 +1974,12 @@ version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
 
+[[package]]
+name = "iterator-sorted"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d101775d2bc8f99f4ac18bf29b9ed70c0dd138b9a1e88d7b80179470cbbe8bd2"
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -1801,6 +2013,20 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "k256"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
+dependencies = [
+ "cfg-if 1.0.0",
+ "ecdsa",
+ "elliptic-curve",
+ "once_cell",
+ "serdect",
+ "sha2 0.10.6",
+]
+
 [[package]]
 name = "keccak"
 version = "0.1.3"
@@ -1877,9 +2103,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.141"
+version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "libloading"
@@ -1893,8 +2119,8 @@ dependencies = [
 
 [[package]]
 name = "librocksdb-sys"
-version = "6.20.3"
-source = "git+https://github.com/iotaledger/rust-rocksdb?rev=89eeb926c50288666b85e4f491df912040fcdbaf#89eeb926c50288666b85e4f491df912040fcdbaf"
+version = "0.11.0+8.3.2"
+source = "git+https://github.com/rust-rocksdb/rust-rocksdb?rev=c62c8c248d84cd1dfb2f48b078ee4f6d55f9dc69#c62c8c248d84cd1dfb2f48b078ee4f6d55f9dc69"
 dependencies = [
  "bindgen",
  "bzip2-sys",
@@ -1902,6 +2128,7 @@ dependencies = [
  "glob",
  "libc",
  "libz-sys",
+ "lz4-sys",
 ]
 
 [[package]]
@@ -1962,6 +2189,16 @@ dependencies = [
  "serde 1.0.160",
 ]
 
+[[package]]
+name = "lz4-sys"
+version = "1.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "match_cfg"
 version = "0.1.0"
@@ -2037,7 +2274,7 @@ dependencies = [
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -2178,6 +2415,15 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.2.0"
@@ -2206,12 +2452,28 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
 [[package]]
 name = "pkg-config"
 version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
 
+[[package]]
+name = "platforms"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
+
 [[package]]
 name = "plotters"
 version = "0.3.4"
@@ -2263,6 +2525,16 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
+[[package]]
+name = "prettyplease"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9825a04601d60621feed79c4e6b56d65db77cdca55cef43b46b0de1096d1c282"
+dependencies = [
+ "proc-macro2 1.0.56",
+ "syn 2.0.16",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -2498,6 +2770,16 @@ dependencies = [
  "winreg",
 ]
 
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac 0.12.1",
+ "subtle",
+]
+
 [[package]]
 name = "riker"
 version = "0.4.2"
@@ -2547,8 +2829,8 @@ dependencies = [
 
 [[package]]
 name = "rocksdb"
-version = "0.17.0"
-source = "git+https://github.com/iotaledger/rust-rocksdb?rev=89eeb926c50288666b85e4f491df912040fcdbaf#89eeb926c50288666b85e4f491df912040fcdbaf"
+version = "0.21.0"
+source = "git+https://github.com/rust-rocksdb/rust-rocksdb?rev=c62c8c248d84cd1dfb2f48b078ee4f6d55f9dc69#c62c8c248d84cd1dfb2f48b078ee4f6d55f9dc69"
 dependencies = [
  "libc",
  "librocksdb-sys",
@@ -2702,6 +2984,21 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct",
+ "der",
+ "generic-array",
+ "pkcs8",
+ "serdect",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "semver"
 version = "1.0.17"
@@ -2834,7 +3131,7 @@ checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
 dependencies = [
  "proc-macro2 1.0.56",
  "quote 1.0.26",
- "syn 2.0.15",
+ "syn 2.0.16",
 ]
 
 [[package]]
@@ -2856,7 +3153,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
 dependencies = [
  "proc-macro2 1.0.56",
  "quote 1.0.26",
- "syn 2.0.15",
+ "syn 2.0.16",
 ]
 
 [[package]]
@@ -2880,6 +3177,16 @@ dependencies = [
  "serde 1.0.160",
 ]
 
+[[package]]
+name = "serdect"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177"
+dependencies = [
+ "base16ct",
+ "serde 1.0.160",
+]
+
 [[package]]
 name = "sha-1"
 version = "0.9.8"
@@ -2941,6 +3248,16 @@ version = "1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 
+[[package]]
+name = "signature"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+dependencies = [
+ "digest 0.10.6",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.8"
@@ -3005,6 +3322,16 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
+[[package]]
+name = "spki"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -3014,7 +3341,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 [[package]]
 name = "stronghold-derive"
 version = "0.2.0"
-source = "git+ssh://git@github.com/semenov-vladyslav/stronghold.rs?branch=snapshot-v3age-zeroize-v0.4.1#36127e69de3eec9103998b9a5855426855202153"
+source = "git+https://github.com/iotaledger/stronghold.rs?branch=0.4.2#ee80428d7e344a8f2d30ea9ab16e0f98915b35c1"
 dependencies = [
  "proc-macro2 1.0.56",
  "quote 1.0.26",
@@ -3024,7 +3351,7 @@ dependencies = [
 [[package]]
 name = "stronghold-runtime"
 version = "0.3.0"
-source = "git+ssh://git@github.com/semenov-vladyslav/stronghold.rs?branch=snapshot-v3age-zeroize-v0.4.1#36127e69de3eec9103998b9a5855426855202153"
+source = "git+https://github.com/iotaledger/stronghold.rs?branch=0.4.2#ee80428d7e344a8f2d30ea9ab16e0f98915b35c1"
 dependencies = [
  "libsodium-sys",
  "serde 1.0.160",
@@ -3033,7 +3360,7 @@ dependencies = [
 [[package]]
 name = "stronghold-utils"
 version = "0.3.0"
-source = "git+ssh://git@github.com/semenov-vladyslav/stronghold.rs?branch=snapshot-v3age-zeroize-v0.4.1#36127e69de3eec9103998b9a5855426855202153"
+source = "git+https://github.com/iotaledger/stronghold.rs?branch=0.4.2#ee80428d7e344a8f2d30ea9ab16e0f98915b35c1"
 dependencies = [
  "futures",
  "rand 0.8.5",
@@ -3044,12 +3371,12 @@ dependencies = [
 [[package]]
 name = "stronghold_engine"
 version = "0.4.0"
-source = "git+ssh://git@github.com/semenov-vladyslav/stronghold.rs?branch=snapshot-v3age-zeroize-v0.4.1#36127e69de3eec9103998b9a5855426855202153"
+source = "git+https://github.com/iotaledger/stronghold.rs?branch=0.4.2#ee80428d7e344a8f2d30ea9ab16e0f98915b35c1"
 dependencies = [
  "anyhow",
  "dirs-next",
  "hex",
- "iota-crypto 0.17.1",
+ "iota-crypto 0.23.0",
  "once_cell",
  "paste",
  "serde 1.0.160",
@@ -3088,9 +3415,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.15"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
 dependencies = [
  "proc-macro2 1.0.56",
  "quote 1.0.26",
@@ -3144,7 +3471,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
  "proc-macro2 1.0.56",
  "quote 1.0.26",
- "syn 2.0.15",
+ "syn 2.0.16",
 ]
 
 [[package]]
@@ -3223,11 +3550,12 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.27.0"
+version = "1.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
+checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
 dependencies = [
  "autocfg",
+ "backtrace",
  "bytes",
  "libc",
  "mio",
@@ -3235,18 +3563,18 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio-macros",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2 1.0.56",
  "quote 1.0.26",
- "syn 2.0.15",
+ "syn 2.0.16",
 ]
 
 [[package]]
@@ -3689,6 +4017,15 @@ dependencies = [
  "windows-targets 0.42.2",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.0",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -3838,7 +4175,7 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f"
 dependencies = [
- "curve25519-dalek",
+ "curve25519-dalek 3.2.0",
  "rand_core 0.5.1",
  "zeroize",
 ]
@@ -3870,5 +4207,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2 1.0.56",
  "quote 1.0.26",
- "syn 2.0.15",
+ "syn 2.0.16",
 ]
diff --git a/packages/backend/Cargo.toml b/packages/backend/Cargo.toml
index a1e94b8c1ec..e6000f1329a 100644
--- a/packages/backend/Cargo.toml
+++ b/packages/backend/Cargo.toml
@@ -9,8 +9,7 @@ exclude = ["/bindings", "/api-wrapper"]
 tokio = { version = "1.28.0", default-features = false }
 once_cell = { version = "1.8.0", default-features = false }
 
-# iota-wallet = { git = "https://github.com/iotaledger/wallet.rs", rev = "669395ab70400153d94433508ae3367b0c870218", default-features = false, features = ["stronghold", "ledger-nano", "ledger-nano-simulator", "participation"] }
-iota-wallet = { git = "ssh://git@github.com/thibault-martinez/wallet.rs-private", branch = "stronghold-fix-base-669395", default-features = false, features = ["stronghold", "ledger-nano", "ledger-nano-simulator", "participation"] }
+iota-wallet = { git = "https://github.com/iotaledger/wallet.rs", rev = "ebcbc04319d11ec973da5d8d6d775e54577f116d", default-features = false, features = ["stronghold", "ledger-nano", "ledger-nano-simulator", "participation"] }
 serde = { version = "1.0.130", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.68", default-features = false }
 riker = "0.4.2"
diff --git a/packages/backend/bindings/node/index.ts b/packages/backend/bindings/node/index.ts
index 4b9b00db6a4..9ad8d7feac6 100644
--- a/packages/backend/bindings/node/index.ts
+++ b/packages/backend/bindings/node/index.ts
@@ -134,7 +134,16 @@ export function migrateStrongholdSnapshotV2ToV3(
     newPath: string,
     newPassword: string
 ): void {
-    addon.migrateStrongholdSnapshotV2ToV3(currentPath, currentPassword, newPath, newPassword)
+    const snapshotSaltV2 = 'wallet.rs'
+    const snapshotRoundsV2 = 100
+    addon.migrateStrongholdSnapshotV2ToV3(
+        currentPath,
+        currentPassword,
+        snapshotSaltV2,
+        snapshotRoundsV2,
+        newPath,
+        newPassword
+    )
 }
 
 export const api = {
diff --git a/packages/backend/bindings/node/native/Cargo.lock b/packages/backend/bindings/node/native/Cargo.lock
index 0a90c127358..32785871dff 100644
--- a/packages/backend/bindings/node/native/Cargo.lock
+++ b/packages/backend/bindings/node/native/Cargo.lock
@@ -47,6 +47,17 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "ahash"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "once_cell",
+ "version_check",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "0.7.20"
@@ -56,6 +67,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "allocator-api2"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -165,6 +182,12 @@ dependencies = [
  "rustc-demangle",
 ]
 
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -177,6 +200,12 @@ version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
 
+[[package]]
+name = "base64ct"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
 [[package]]
 name = "bech32"
 version = "0.7.3"
@@ -312,9 +341,9 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.59.2"
+version = "0.65.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
+checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
 dependencies = [
  "bitflags",
  "cexpr",
@@ -322,11 +351,13 @@ dependencies = [
  "lazy_static",
  "lazycell",
  "peeking_take_while",
+ "prettyplease",
  "proc-macro2 1.0.56",
  "quote 1.0.26",
  "regex",
  "rustc-hash",
  "shlex",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -500,12 +531,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "chunked_transfer"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cca491388666e04d7248af3f60f0c40cfb0991c72205595d7c396e3510207d1a"
-
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -585,6 +610,12 @@ dependencies = [
  "yaml-rust",
 ]
 
+[[package]]
+name = "const-oid"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747"
+
 [[package]]
 name = "const-random"
 version = "0.1.15"
@@ -607,16 +638,6 @@ dependencies = [
  "tiny-keccak",
 ]
 
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.4"
@@ -798,6 +819,18 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
+[[package]]
+name = "crypto-bigint"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15"
+dependencies = [
+ "generic-array",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -828,12 +861,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "cslice"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697c714f50560202b1f4e2e09cd50a421881c83e9025db75d15f276616f04f40"
-
 [[package]]
 name = "csv"
 version = "1.2.1"
@@ -868,6 +895,34 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "curve25519-dalek"
+version = "4.0.0-rc.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436ace70fc06e06f7f689d2624dc4e2f0ea666efb5aa704215f7249ae6e047a7"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "digest 0.10.6",
+ "fiat-crypto",
+ "platforms",
+ "rustc_version",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
+dependencies = [
+ "proc-macro2 1.0.56",
+ "quote 1.0.26",
+ "syn 2.0.15",
+]
+
 [[package]]
 name = "cxx"
 version = "1.0.94"
@@ -933,6 +988,17 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "der"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468",
+ "zeroize",
+]
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -949,6 +1015,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
 dependencies = [
  "block-buffer 0.10.4",
+ "const-oid",
  "crypto-common",
  "subtle",
 ]
@@ -974,13 +1041,38 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "ecdsa"
+version = "0.16.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428"
+dependencies = [
+ "der",
+ "digest 0.10.6",
+ "elliptic-curve",
+ "rfc6979",
+ "serdect",
+ "signature 2.1.0",
+ "spki",
+]
+
 [[package]]
 name = "ed25519"
 version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
 dependencies = [
- "signature",
+ "signature 1.6.4",
+]
+
+[[package]]
+name = "ed25519"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fb04eee5d9d907f29e80ee6b0e78f7e2c82342c63e3580d8c4f69d9d5aad963"
+dependencies = [
+ "serde 1.0.160",
+ "signature 2.1.0",
 ]
 
 [[package]]
@@ -989,8 +1081,8 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
 dependencies = [
- "curve25519-dalek",
- "ed25519",
+ "curve25519-dalek 3.2.0",
+ "ed25519 1.5.3",
  "sha2 0.9.9",
  "zeroize",
 ]
@@ -1001,7 +1093,7 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a128b76af6dd4b427e34a6fd43dc78dbfe73672ec41ff615a2414c1a0ad0409"
 dependencies = [
- "curve25519-dalek",
+ "curve25519-dalek 3.2.0",
  "hex",
  "rand_core 0.5.1",
  "sha2 0.9.9",
@@ -1014,20 +1106,57 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6"
 dependencies = [
- "curve25519-dalek",
- "hashbrown",
+ "curve25519-dalek 3.2.0",
+ "hashbrown 0.12.3",
  "hex",
  "rand_core 0.6.4",
  "sha2 0.9.9",
  "zeroize",
 ]
 
+[[package]]
+name = "ed25519-zebra"
+version = "4.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb0d653b2c06ec7ec1b4c570bb4eac748035d6f44dd14e5fd9e7e2549938488"
+dependencies = [
+ "curve25519-dalek 4.0.0-rc.3",
+ "ed25519 2.2.1",
+ "hashbrown 0.14.0",
+ "hex",
+ "rand_core 0.6.4",
+ "serde 1.0.160",
+ "sha2 0.10.6",
+ "zeroize",
+]
+
 [[package]]
 name = "either"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
+[[package]]
+name = "elliptic-curve"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "digest 0.10.6",
+ "ff",
+ "generic-array",
+ "group",
+ "pem-rfc7468",
+ "pkcs8",
+ "rand_core 0.6.4",
+ "sec1",
+ "serdect",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.32"
@@ -1057,27 +1186,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "errno"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "event-listener"
 version = "2.5.3"
@@ -1106,15 +1214,6 @@ dependencies = [
  "synstructure",
 ]
 
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
 [[package]]
 name = "fern"
 version = "0.6.2"
@@ -1125,6 +1224,22 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "fiat-crypto"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
+
 [[package]]
 name = "firefly-actor-system"
 version = "0.1.0"
@@ -1156,21 +1271,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.1.0"
@@ -1278,6 +1378,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
+ "zeroize",
 ]
 
 [[package]]
@@ -1328,6 +1429,17 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "h2"
 version = "0.3.18"
@@ -1362,6 +1474,16 @@ dependencies = [
  "ahash 0.7.6",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+dependencies = [
+ "ahash 0.8.3",
+ "allocator-api2",
+]
+
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
@@ -1380,12 +1502,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
-
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -1555,7 +1671,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
- "hashbrown",
+ "hashbrown 0.12.3",
 ]
 
 [[package]]
@@ -1577,26 +1693,6 @@ dependencies = [
  "bytes",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
-dependencies = [
- "hermit-abi 0.3.1",
- "libc",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "iota-bundle-miner"
 version = "0.1.0-alpha.0"
@@ -1638,13 +1734,13 @@ dependencies = [
  "serde_json",
  "slip10",
  "tokio",
- "ureq 2.6.2",
+ "ureq",
 ]
 
 [[package]]
 name = "iota-client"
 version = "1.1.1"
-source = "git+ssh://git@github.com/thibault-martinez/iota.rs-private?rev=33354cdcb8aa5a3f595989cfdd70016be409c8d4#33354cdcb8aa5a3f595989cfdd70016be409c8d4"
+source = "git+https://github.com/iotaledger/iota.rs?rev=f3e3fba11a2a0a21dc62df5c612414856cfceeb0#f3e3fba11a2a0a21dc62df5c612414856cfceeb0"
 dependencies = [
  "async-trait",
  "bee-common 0.5.0",
@@ -1653,7 +1749,7 @@ dependencies = [
  "bee-rest-api",
  "futures",
  "hex",
- "iota-crypto 0.17.1",
+ "iota-crypto 0.23.0",
  "log",
  "num_cpus",
  "once_cell",
@@ -1664,7 +1760,7 @@ dependencies = [
  "serde_json",
  "thiserror",
  "tokio",
- "ureq 2.6.2",
+ "ureq",
  "url",
  "zeroize",
 ]
@@ -1748,6 +1844,21 @@ name = "iota-crypto"
 version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92cdfcd73d2b8a67b913789ecd7fc06c68254f68cd2b24cc3f0419c7f8fe6bbe"
+dependencies = [
+ "autocfg",
+ "blake2 0.10.6",
+ "digest 0.10.6",
+ "ed25519-zebra 3.1.0",
+ "num-traits 0.2.15",
+ "serde 1.0.160",
+ "zeroize",
+]
+
+[[package]]
+name = "iota-crypto"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5d5a986d972c3a703d48ced24fdc0bf16fb2d02959ff4b152fa77b9132f6fb0"
 dependencies = [
  "aead",
  "autocfg",
@@ -1755,15 +1866,17 @@ dependencies = [
  "blake2 0.10.6",
  "chacha20poly1305",
  "cipher",
- "curve25519-dalek",
+ "curve25519-dalek 3.2.0",
  "digest 0.10.6",
- "ed25519-zebra 3.1.0",
+ "ed25519-zebra 4.0.1",
  "generic-array",
  "getrandom 0.2.9",
  "hkdf",
  "hmac 0.12.1",
- "num-traits 0.2.15",
+ "iterator-sorted",
+ "k256",
  "pbkdf2",
+ "rand 0.8.5",
  "scrypt",
  "serde 1.0.160",
  "sha2 0.10.6",
@@ -1806,7 +1919,7 @@ dependencies = [
 [[package]]
 name = "iota-wallet"
 version = "0.2.0"
-source = "git+ssh://git@github.com/thibault-martinez/wallet.rs-private?branch=stronghold-fix-base-669395#1b046c51f93f5e817c97d0fde02fdc8c70fc5e35"
+source = "git+https://github.com/iotaledger/wallet.rs?rev=ebcbc04319d11ec973da5d8d6d775e54577f116d#ebcbc04319d11ec973da5d8d6d775e54577f116d"
 dependencies = [
  "async-trait",
  "backtrace",
@@ -1818,7 +1931,7 @@ dependencies = [
  "hex",
  "iota-client 1.1.1",
  "iota-core",
- "iota-crypto 0.17.1",
+ "iota-crypto 0.23.0",
  "iota-ledger",
  "iota_stronghold",
  "log",
@@ -1840,12 +1953,12 @@ dependencies = [
 [[package]]
 name = "iota_stronghold"
 version = "0.4.1"
-source = "git+ssh://git@github.com/semenov-vladyslav/stronghold.rs?branch=snapshot-v3age-zeroize-v0.4.1#36127e69de3eec9103998b9a5855426855202153"
+source = "git+https://github.com/iotaledger/stronghold.rs?branch=0.4.2#ee80428d7e344a8f2d30ea9ab16e0f98915b35c1"
 dependencies = [
  "anyhow",
  "bincode",
  "futures",
- "iota-crypto 0.17.1",
+ "iota-crypto 0.23.0",
  "riker",
  "serde 1.0.160",
  "stronghold-utils",
@@ -1860,6 +1973,12 @@ version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
 
+[[package]]
+name = "iterator-sorted"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d101775d2bc8f99f4ac18bf29b9ed70c0dd138b9a1e88d7b80179470cbbe8bd2"
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -1893,6 +2012,20 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "k256"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
+dependencies = [
+ "cfg-if 1.0.0",
+ "ecdsa",
+ "elliptic-curve",
+ "once_cell",
+ "serdect",
+ "sha2 0.10.6",
+]
+
 [[package]]
 name = "keccak"
 version = "0.1.3"
@@ -1969,9 +2102,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.142"
+version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "libloading"
@@ -1985,8 +2118,8 @@ dependencies = [
 
 [[package]]
 name = "librocksdb-sys"
-version = "6.20.3"
-source = "git+https://github.com/iotaledger/rust-rocksdb?rev=89eeb926c50288666b85e4f491df912040fcdbaf#89eeb926c50288666b85e4f491df912040fcdbaf"
+version = "0.11.0+8.3.2"
+source = "git+https://github.com/rust-rocksdb/rust-rocksdb?rev=c62c8c248d84cd1dfb2f48b078ee4f6d55f9dc69#c62c8c248d84cd1dfb2f48b078ee4f6d55f9dc69"
 dependencies = [
  "bindgen",
  "bzip2-sys",
@@ -1994,6 +2127,7 @@ dependencies = [
  "glob",
  "libc",
  "libz-sys",
+ "lz4-sys",
 ]
 
 [[package]]
@@ -2044,12 +2178,6 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b085a4f2cde5781fc4b1717f2e86c62f5cda49de7ba99a7c2eae02b61c9064c"
-
 [[package]]
 name = "log"
 version = "0.4.17"
@@ -2060,6 +2188,16 @@ dependencies = [
  "serde 1.0.160",
 ]
 
+[[package]]
+name = "lz4-sys"
+version = "1.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "match_cfg"
 version = "0.1.0"
@@ -2147,65 +2285,43 @@ dependencies = [
  "bytes",
 ]
 
-[[package]]
-name = "native-tls"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
 [[package]]
 name = "neon"
-version = "0.5.3"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed5c7d2adba1e3aeae2dd4a5e2897c198893b053c6aff8b36a252f28e146bb73"
+checksum = "28e15415261d880aed48122e917a45e87bb82cf0260bb6db48bbab44b7464373"
 dependencies = [
- "cslice",
  "neon-build",
  "neon-runtime",
  "semver 0.9.0",
  "smallvec",
- "winapi",
 ]
 
 [[package]]
 name = "neon-build"
-version = "0.5.3"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "705d33783a2af324a7096bda033cf0c7d62aaca586a49caf99a20df613ac8ee0"
+checksum = "8bac98a702e71804af3dacfde41edde4a16076a7bbe889ae61e56e18c5b1c811"
 dependencies = [
- "cfg-if 0.1.10",
  "neon-sys",
- "ureq 1.5.5",
 ]
 
 [[package]]
 name = "neon-runtime"
-version = "0.5.3"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb521d36f95abdcf13d9079315fbebfc294209ca1a4bf72bbd42cffd28f27719"
+checksum = "4676720fa8bb32c64c3d9f49c47a47289239ec46b4bdb66d0913cc512cb0daca"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "neon-sys",
  "smallvec",
 ]
 
 [[package]]
 name = "neon-sys"
-version = "0.5.3"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40aa4682d8f719e4944b1f9460c2f9620731de14910794f22da681e2c4ac294e"
+checksum = "a5ebc923308ac557184455b4aaa749470554cbac70eb4daa8b18cdc16bef7df6"
 dependencies = [
  "cc",
  "regex",
@@ -2332,50 +2448,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
-[[package]]
-name = "openssl"
-version = "0.10.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e30d8bc91859781f0a943411186324d580f2bbeb71b452fe91ae344806af3f1"
-dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2 1.0.56",
- "quote 1.0.26",
- "syn 2.0.15",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.85"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d3d193fb1488ad46ffe3aaabc912cc931d02ee8518fe2959aea8ef52718b0c0"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "paste"
 version = "1.0.12"
@@ -2398,6 +2470,15 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.2.0"
@@ -2426,12 +2507,28 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
 [[package]]
 name = "pkg-config"
 version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
 
+[[package]]
+name = "platforms"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
+
 [[package]]
 name = "plotters"
 version = "0.3.4"
@@ -2483,6 +2580,16 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
+[[package]]
+name = "prettyplease"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058"
+dependencies = [
+ "proc-macro2 1.0.56",
+ "syn 2.0.15",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -2531,15 +2638,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "qstring"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e"
-dependencies = [
- "percent-encoding",
-]
-
 [[package]]
 name = "quote"
 version = "0.6.13"
@@ -2660,15 +2758,6 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags",
-]
-
 [[package]]
 name = "redox_users"
 version = "0.4.3"
@@ -2676,7 +2765,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
  "getrandom 0.2.9",
- "redox_syscall 0.2.16",
+ "redox_syscall",
  "thiserror",
 ]
 
@@ -2736,6 +2825,16 @@ dependencies = [
  "winreg",
 ]
 
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac 0.12.1",
+ "subtle",
+]
+
 [[package]]
 name = "riker"
 version = "0.4.2"
@@ -2785,8 +2884,8 @@ dependencies = [
 
 [[package]]
 name = "rocksdb"
-version = "0.17.0"
-source = "git+https://github.com/iotaledger/rust-rocksdb?rev=89eeb926c50288666b85e4f491df912040fcdbaf#89eeb926c50288666b85e4f491df912040fcdbaf"
+version = "0.21.0"
+source = "git+https://github.com/rust-rocksdb/rust-rocksdb?rev=c62c8c248d84cd1dfb2f48b078ee4f6d55f9dc69#c62c8c248d84cd1dfb2f48b078ee4f6d55f9dc69"
 dependencies = [
  "libc",
  "librocksdb-sys",
@@ -2839,20 +2938,6 @@ dependencies = [
  "semver 1.0.17",
 ]
 
-[[package]]
-name = "rustix"
-version = "0.37.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79bef90eb6d984c72722595b5b1348ab39275a5e5123faca6863bf07d75a4e0"
-dependencies = [
- "bitflags",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "rustls"
 version = "0.19.1"
@@ -2911,15 +2996,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "schannel"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
-dependencies = [
- "windows-sys 0.42.0",
-]
-
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -2964,26 +3040,18 @@ dependencies = [
 ]
 
 [[package]]
-name = "security-framework"
-version = "2.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.8.0"
+name = "sec1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
 dependencies = [
- "core-foundation-sys",
- "libc",
+ "base16ct",
+ "der",
+ "generic-array",
+ "pkcs8",
+ "serdect",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
@@ -3179,6 +3247,16 @@ dependencies = [
  "serde 1.0.160",
 ]
 
+[[package]]
+name = "serdect"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177"
+dependencies = [
+ "base16ct",
+ "serde 1.0.160",
+]
+
 [[package]]
 name = "sha-1"
 version = "0.9.8"
@@ -3240,6 +3318,16 @@ version = "1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 
+[[package]]
+name = "signature"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+dependencies = [
+ "digest 0.10.6",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.8"
@@ -3310,6 +3398,16 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
+[[package]]
+name = "spki"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -3319,7 +3417,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 [[package]]
 name = "stronghold-derive"
 version = "0.2.0"
-source = "git+ssh://git@github.com/semenov-vladyslav/stronghold.rs?branch=snapshot-v3age-zeroize-v0.4.1#36127e69de3eec9103998b9a5855426855202153"
+source = "git+https://github.com/iotaledger/stronghold.rs?branch=0.4.2#ee80428d7e344a8f2d30ea9ab16e0f98915b35c1"
 dependencies = [
  "proc-macro2 1.0.56",
  "quote 1.0.26",
@@ -3329,7 +3427,7 @@ dependencies = [
 [[package]]
 name = "stronghold-runtime"
 version = "0.3.0"
-source = "git+ssh://git@github.com/semenov-vladyslav/stronghold.rs?branch=snapshot-v3age-zeroize-v0.4.1#36127e69de3eec9103998b9a5855426855202153"
+source = "git+https://github.com/iotaledger/stronghold.rs?branch=0.4.2#ee80428d7e344a8f2d30ea9ab16e0f98915b35c1"
 dependencies = [
  "libsodium-sys",
  "serde 1.0.160",
@@ -3338,7 +3436,7 @@ dependencies = [
 [[package]]
 name = "stronghold-utils"
 version = "0.3.0"
-source = "git+ssh://git@github.com/semenov-vladyslav/stronghold.rs?branch=snapshot-v3age-zeroize-v0.4.1#36127e69de3eec9103998b9a5855426855202153"
+source = "git+https://github.com/iotaledger/stronghold.rs?branch=0.4.2#ee80428d7e344a8f2d30ea9ab16e0f98915b35c1"
 dependencies = [
  "futures",
  "rand 0.8.5",
@@ -3349,12 +3447,12 @@ dependencies = [
 [[package]]
 name = "stronghold_engine"
 version = "0.4.0"
-source = "git+ssh://git@github.com/semenov-vladyslav/stronghold.rs?branch=snapshot-v3age-zeroize-v0.4.1#36127e69de3eec9103998b9a5855426855202153"
+source = "git+https://github.com/iotaledger/stronghold.rs?branch=0.4.2#ee80428d7e344a8f2d30ea9ab16e0f98915b35c1"
 dependencies = [
  "anyhow",
  "dirs-next",
  "hex",
- "iota-crypto 0.17.1",
+ "iota-crypto 0.23.0",
  "once_cell",
  "paste",
  "serde 1.0.160",
@@ -3414,19 +3512,6 @@ dependencies = [
  "unicode-xid 0.2.4",
 ]
 
-[[package]]
-name = "tempfile"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
-dependencies = [
- "cfg-if 1.0.0",
- "fastrand",
- "redox_syscall 0.3.5",
- "rustix",
- "windows-sys 0.45.0",
-]
-
 [[package]]
 name = "termcolor"
 version = "1.2.0"
@@ -3541,11 +3626,12 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.27.0"
+version = "1.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
+checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
 dependencies = [
  "autocfg",
+ "backtrace",
  "bytes",
  "libc",
  "mio",
@@ -3553,14 +3639,14 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio-macros",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2 1.0.56",
  "quote 1.0.26",
@@ -3748,21 +3834,6 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
-[[package]]
-name = "ureq"
-version = "1.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b8b063c2d59218ae09f22b53c42eaad0d53516457905f5235ca4bc9e99daa71"
-dependencies = [
- "base64 0.13.1",
- "chunked_transfer",
- "log",
- "native-tls",
- "once_cell",
- "qstring",
- "url",
-]
-
 [[package]]
 name = "ureq"
 version = "2.6.2"
@@ -4013,21 +4084,6 @@ dependencies = [
  "windows-targets 0.48.0",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
@@ -4195,7 +4251,7 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f"
 dependencies = [
- "curve25519-dalek",
+ "curve25519-dalek 3.2.0",
  "rand_core 0.5.1",
  "zeroize",
 ]
diff --git a/packages/backend/bindings/node/native/Cargo.toml b/packages/backend/bindings/node/native/Cargo.toml
index bfa9d8aa02f..380478defab 100644
--- a/packages/backend/bindings/node/native/Cargo.toml
+++ b/packages/backend/bindings/node/native/Cargo.toml
@@ -15,7 +15,7 @@ crate-type = ["cdylib"]
 neon-build = "0.10.1"
 
 [dependencies]
-iota-wallet = { git = "ssh://git@github.com/thibault-martinez/wallet.rs-private", branch = "stronghold-fix-base-669395", default-features = false, features = ["stronghold", "ledger-nano", "ledger-nano-simulator", "participation"] }
+iota-wallet = { git = "https://github.com/iotaledger/wallet.rs", rev = "ebcbc04319d11ec973da5d8d6d775e54577f116d", default-features = false, features = ["stronghold", "ledger-nano", "ledger-nano-simulator", "participation"] }
 futures = { version = "0.3.17", default-features = false }
 neon = "0.10.1"
 serde_json = { version = "1.0.68", default-features = false }
diff --git a/packages/backend/bindings/node/native/src/lib.rs b/packages/backend/bindings/node/native/src/lib.rs
index dd72a28f0c4..b632fc30aad 100644
--- a/packages/backend/bindings/node/native/src/lib.rs
+++ b/packages/backend/bindings/node/native/src/lib.rs
@@ -177,20 +177,24 @@ pub fn init_logger(mut cx: FunctionContext) -> JsResult<JsUndefined> {
 pub fn migrate_stronghold_snapshot_v2_to_v3(mut cx: FunctionContext) -> JsResult<JsUndefined> {
     let current_path = cx.argument::<JsString>(0)?.value();
     let current_password = cx.argument::<JsString>(1)?.value();
+    let salt = cx.argument::<JsString>(2)?.value();
+    let rounds = cx.argument::<JsNumber>(3)?.value();
     let new_path = cx
-        .argument_opt(2)
+        .argument_opt(4)
         .map(|opt| opt.downcast_or_throw::<JsString, _>(&mut cx))
         .transpose()?
         .map(|opt| opt.value());
     let new_password = cx
-        .argument_opt(3)
+        .argument_opt(5)
         .map(|opt| opt.downcast_or_throw::<JsString, _>(&mut cx))
         .transpose()?
         .map(|opt| opt.value());
 
-    AccountManager::migrate_stronghold_v2_to_v3(
+    AccountManager::migrate_stronghold_snapshot_v2_to_v3(
         &current_path,
         &current_password,
+        &salt,
+        rounds as u32,
         new_path.as_ref(),
         new_password.as_deref(),
     )
diff --git a/packages/shared/lib/stronghold.ts b/packages/shared/lib/stronghold.ts
index bba35fa663c..94b667ab7c6 100644
--- a/packages/shared/lib/stronghold.ts
+++ b/packages/shared/lib/stronghold.ts
@@ -15,7 +15,7 @@ import { Profile, ProfileType } from '@lib/typings/profile'
 
 export const STRONGHOLD_VERSION = 3
 
-export const STRONGHOLD_VERSION_ERROR = 'snapshot::ReadError: UnsupportedVersion { expected: [3, 0], found: [2, 0] }'
+export const STRONGHOLD_VERSION_ERROR = 'unsupported snapshot version, migration required'
 
 export const STRONGHOLD_DECRYPTION_ERROR = 'Failed to decrypt snapshot: incorrect password or corrupt data'
 
diff --git a/packages/shared/routes/login/views/EnterPin.svelte b/packages/shared/routes/login/views/EnterPin.svelte
index bf758d6e490..87e9b1456b1 100644
--- a/packages/shared/routes/login/views/EnterPin.svelte
+++ b/packages/shared/routes/login/views/EnterPin.svelte
@@ -1,18 +1,19 @@
 <script lang="typescript">
+    import { Locale } from '@core/i18n'
+    import { mobile, needsToAcceptLatestPrivacyPolicy, needsToAcceptLatestTos } from '@lib/app'
+    import { isStrongholdOutdated } from '@lib/stronghold'
+    import { destroyActor } from '@lib/wallet'
     import { Icon, Pin, Profile, Text, TextHint } from 'shared/components'
     import { initAppSettings, isAwareOfCrashReporting } from 'shared/lib/appSettings'
     import { ongoingSnapshot, openSnapshotPopup } from 'shared/lib/migration'
     import { showAppNotification } from 'shared/lib/notifications'
     import { Platform } from 'shared/lib/platform'
     import { openPopup, popupState } from 'shared/lib/popup'
-    import { activeProfile, clearActiveProfile } from 'shared/lib/profile'
-    import { isStrongholdOutdated } from '@lib/stronghold'
+    import { activeProfile, activeProfileId, clearActiveProfile } from 'shared/lib/profile'
     import { validatePinFormat } from 'shared/lib/utils'
     import { api, getProfileDataPath, initialise } from 'shared/lib/wallet'
     import { createEventDispatcher, onDestroy } from 'svelte'
-    import { Locale } from '@core/i18n'
     import { get } from 'svelte/store'
-    import { mobile, needsToAcceptLatestPrivacyPolicy, needsToAcceptLatestTos } from '@lib/app'
 
     export let locale: Locale
 
@@ -143,6 +144,7 @@
 
     function handleBackClick() {
         if (!hasReachedMaxAttempts) {
+            destroyActor($activeProfileId)
             clearActiveProfile()
             dispatch('previous')
         }
diff --git a/patches/dmg-builder+22.9.1.patch b/patches/dmg-builder+22.9.1.patch
new file mode 100644
index 00000000000..015d3546dd1
--- /dev/null
+++ b/patches/dmg-builder+22.9.1.patch
@@ -0,0 +1,14 @@
+diff --git a/node_modules/dmg-builder/out/dmg.js b/node_modules/dmg-builder/out/dmg.js
+index ad0bb2e..e3e9769 100644
+--- a/node_modules/dmg-builder/out/dmg.js
++++ b/node_modules/dmg-builder/out/dmg.js
+@@ -389,7 +389,8 @@ async function customizeDmg(volumePath, specification, packager, backgroundFile)
+   const asyncTaskManager = new (_builderUtil().AsyncTaskManager)(packager.info.cancellationToken);
+   env.iconLocations = await computeDmgEntries(specification, volumePath, packager, asyncTaskManager);
+   await asyncTaskManager.awaitTasks();
+-  await (0, _builderUtil().exec)("/usr/bin/python", [path.join((0, _dmgUtil().getDmgVendorPath)(), "dmgbuild/core.py")], {
++  const pythonPath = (await (0, _builderUtil().exec)("which", ["python2"])).trim();
++  await (0, _builderUtil().exec)(pythonPath, [path.join((0, _dmgUtil().getDmgVendorPath)(), "dmgbuild/core.py")], {
+     cwd: (0, _dmgUtil().getDmgVendorPath)(),
+     env
+   });

From 81321fcfa6cf01b9dc971fb1c3ac629ae4137f25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= <balvarez@boxfish.studio>
Date: Thu, 17 Aug 2023 16:27:49 +0200
Subject: [PATCH 3/3] chore: bump version to 1.7.3

---
 packages/desktop/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 838c6d9d6d9..c44cf9b6173 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,7 +1,7 @@
 {
     "name": "desktop",
     "productName": "Firefly",
-    "version": "1.7.3-beta-1",
+    "version": "1.7.3",
     "description": "Official IOTA wallet on desktop",
     "main": "public/build/main.js",
     "repository": "git@github.com:iotaledger/firefly.git",