Skip to content

Commit

Permalink
updates ironfish to use latest ironfish-frost changes, etc. (#5369)
Browse files Browse the repository at this point in the history
* wip

* adds helper functions to deserialize round2 public packages

deserialize_round2_combined_public_package takes a serialized
'CombinedPublicPackage' from dkg round2 and returns an object containing an
array of round2 public packages with all fields available as strings

* dirty upgrade to frost no-std

* fixes errors and warnings from error formatting

throws FrostLibErrors using new_with_source to give error messages

updates decryption test for new decryption error message

* uses decrypt_legacy to decrypt legacy account exports

we've updated encryption/decryption in the ironfish-frost crate and changed the
structure of encrypted data

older account exports cannot be decrypted with the current 'decrypt' method and
must use 'decrypt_legacy' instead

defines 'decrypt_legacy_data' on ParticipantSecret and updates account
decryption to try decrypting with that method if the first decryption attempt
fails

* updates ironfish-frost dependency to latest commit on main

* fixes rust lint in multisig.rs, removes commented-out code

* broadens cargo vet audit policy for reddsa

* updates cargo vet with exemptions and audits for new dependencies

* updates ironfish-frost in Cargo.lock for allocation fix

* uses default features from ironfish-frost

* bubbles up errors as napi errors in multisig.rs instead of unwrapping

* refactors derive_account_keys to return a result

* removes unwrap uses

* avoids mapping FrostLibErrors unnecessarily

---------

Co-authored-by: Mat <[email protected]>
  • Loading branch information
hughy and mat-if authored Sep 13, 2024
1 parent d8cfd5b commit 5ea1113
Show file tree
Hide file tree
Showing 18 changed files with 405 additions and 242 deletions.
110 changes: 65 additions & 45 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ironfish-rust-nodejs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ base64 = "0.13.0"
fish_hash = "0.3.0"
ironfish = { path = "../ironfish-rust" }
ironfish-frost = { git = "https://github.com/iron-fish/ironfish-frost.git", branch = "main" }
napi = { version = "2.13.2", features = ["napi6"] }
napi-derive = "2.13.0"
napi = { version = "2.14.4", features = ["napi6"] }
napi-derive = "2.14.6"
jubjub = { git = "https://github.com/iron-fish/jubjub.git", branch = "blstrs", features = ["multiply-many"] }
rand = "0.8.5"
num_cpus = "1.16.0"
Expand Down
Loading

0 comments on commit 5ea1113

Please sign in to comment.