From 7dfa84819553e959a40bd7928a31cbca20f6ecbe Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Fri, 27 Sep 2024 16:58:01 -0300 Subject: [PATCH 1/3] feat: update ledger sdk to latest version (#64) * feat: update ledger sdk to latest version * feat: remove useless function * fix: ci * feat: use correct commit * feat: use correct commit * feat: fix issue * feat: use correct version of sdk * feat: adjust makefiles to build apps using docker * fix: warning * feat: update ref * fix * feat: adjust ci --- .github/workflows/main.yml | 27 ++++++++----------------- app/Cargo.lock | 12 +++++------ app/Cargo.toml | 2 +- app/Makefile | 8 ++++---- app/src/app_ui/run_action.rs | 39 ++++-------------------------------- deps/ledger-zxlib | 2 +- 6 files changed, 24 insertions(+), 66 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4ad64c04..f2a87287 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,18 +18,12 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get install -y curl protobuf-compiler build-essential git wget unzip python3 python3-pip \ - libssl-dev libffi-dev libreadline-dev zlib1g-dev libbz2-dev libsqlite3-dev libncurses5-dev \ - libgdbm-dev libnss3-dev liblzma-dev libxml2-dev libxmlsec1-dev libffi-dev libyaml-dev \ - clang gcc-arm-none-eabi gcc-multilib llvm-dev llvm jq + sudo apt-get install -y curl build-essential git wget unzip - name: Install rust uses: actions-rs/toolchain@v1 with: toolchain: nightly-2023-11-10 components: rust-src - - uses: actions/setup-python@v5 - with: - python-version: "3.12" - name: Checkout uses: actions/checkout@v4 with: @@ -39,19 +33,14 @@ jobs: with: node-version: 18 - name: Install yarn - run: | - npm install -g yarn - - name: Install ledger deps - run: | - cargo install cargo-ledger - cargo ledger setup - pip install ledgerwallet + run: npm install -g yarn + - name: Run rust tests + run: make rust_tests - name: Build app run: | export PATH=/home/runner/.local/bin:$PATH + sudo rm -rf app/target make all - - name: Run rust tests - run: make rust_tests - name: Install zemu deps run: make zemu_install - name: Run tests @@ -67,7 +56,7 @@ jobs: sudo apt-get install -y curl protobuf-compiler build-essential git wget unzip python3 python3-pip \ libssl-dev libffi-dev libreadline-dev zlib1g-dev libbz2-dev libsqlite3-dev libncurses5-dev \ libgdbm-dev libnss3-dev liblzma-dev libxml2-dev libxmlsec1-dev libffi-dev libyaml-dev \ - clang gcc-arm-none-eabi gcc-multilib llvm-dev llvm jq + clang gcc-arm-none-eabi gcc-multilib llvm-dev llvm jq libc6-dev - name: Install rust uses: actions-rs/toolchain@v1 with: @@ -129,7 +118,7 @@ jobs: sudo apt-get install -y curl protobuf-compiler build-essential git wget unzip python3 python3-pip \ libssl-dev libffi-dev libreadline-dev zlib1g-dev libbz2-dev libsqlite3-dev libncurses5-dev \ libgdbm-dev libnss3-dev liblzma-dev libxml2-dev libxmlsec1-dev libffi-dev libyaml-dev \ - clang gcc-arm-none-eabi gcc-multilib llvm-dev llvm jq + clang gcc-arm-none-eabi gcc-multilib llvm-dev llvm jq libc6-dev - name: Install rust uses: actions-rs/toolchain@v1 with: @@ -191,7 +180,7 @@ jobs: sudo apt-get install -y curl protobuf-compiler build-essential git wget unzip python3 python3-pip \ libssl-dev libffi-dev libreadline-dev zlib1g-dev libbz2-dev libsqlite3-dev libncurses5-dev \ libgdbm-dev libnss3-dev liblzma-dev libxml2-dev libxmlsec1-dev libffi-dev libyaml-dev \ - clang gcc-arm-none-eabi gcc-multilib llvm-dev llvm jq + clang gcc-arm-none-eabi gcc-multilib llvm-dev llvm jq libc6-dev - name: Install rust uses: actions-rs/toolchain@v1 with: diff --git a/app/Cargo.lock b/app/Cargo.lock index 4e6bd859..577679cd 100644 --- a/app/Cargo.lock +++ b/app/Cargo.lock @@ -841,7 +841,7 @@ dependencies = [ [[package]] name = "include_gif" version = "1.2.0" -source = "git+https://github.com/Zondax/ledger-device-rust-sdk?rev=04d487441b806506bf0bb16a87e2aa378d956c2b#04d487441b806506bf0bb16a87e2aa378d956c2b" +source = "git+https://github.com/Zondax/ledger-device-rust-sdk?rev=9408c1ffc278a363e1903b4cc0b765a31c4eeace#9408c1ffc278a363e1903b4cc0b765a31c4eeace" dependencies = [ "flate2", "image", @@ -978,11 +978,11 @@ dependencies = [ [[package]] name = "ledger_device_sdk" -version = "1.15.0" -source = "git+https://github.com/Zondax/ledger-device-rust-sdk?rev=04d487441b806506bf0bb16a87e2aa378d956c2b#04d487441b806506bf0bb16a87e2aa378d956c2b" +version = "1.17.0" +source = "git+https://github.com/Zondax/ledger-device-rust-sdk?rev=9408c1ffc278a363e1903b4cc0b765a31c4eeace#9408c1ffc278a363e1903b4cc0b765a31c4eeace" dependencies = [ "const-zero", - "include_gif 1.2.0 (git+https://github.com/Zondax/ledger-device-rust-sdk?rev=04d487441b806506bf0bb16a87e2aa378d956c2b)", + "include_gif 1.2.0 (git+https://github.com/Zondax/ledger-device-rust-sdk?rev=9408c1ffc278a363e1903b4cc0b765a31c4eeace)", "ledger_secure_sdk_sys", "num-traits", "numtoa", @@ -992,8 +992,8 @@ dependencies = [ [[package]] name = "ledger_secure_sdk_sys" -version = "1.4.4" -source = "git+https://github.com/Zondax/ledger-device-rust-sdk?rev=04d487441b806506bf0bb16a87e2aa378d956c2b#04d487441b806506bf0bb16a87e2aa378d956c2b" +version = "1.5.0" +source = "git+https://github.com/Zondax/ledger-device-rust-sdk?rev=9408c1ffc278a363e1903b4cc0b765a31c4eeace#9408c1ffc278a363e1903b4cc0b765a31c4eeace" dependencies = [ "bindgen", "cc", diff --git a/app/Cargo.toml b/app/Cargo.toml index 1144828c..d0438396 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml @@ -9,7 +9,7 @@ test = false path = "bin-app/app.rs" [dependencies] -ledger_device_sdk = { git = "https://github.com/Zondax/ledger-device-rust-sdk", rev = "04d487441b806506bf0bb16a87e2aa378d956c2b", optional = true } +ledger_device_sdk = { git = "https://github.com/Zondax/ledger-device-rust-sdk", rev = "9408c1ffc278a363e1903b4cc0b765a31c4eeace", optional = true } # ledger_device_sdk = { version="1.14.0" , optional = true} # ledger_device_sdk = { path="../../ledger-device-rust-sdk/ledger_device_sdk" , optional = true} include_gif = "1.2.0" diff --git a/app/Makefile b/app/Makefile index 443e35ca..68e7b225 100644 --- a/app/Makefile +++ b/app/Makefile @@ -88,23 +88,23 @@ include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.side_loading .PHONY: buildX buildX: - APPVERSION_STR=$(APPVERSION_STR) PRODUCTION_BUILD=$(PRODUCTION_BUILD) RUSTFLAGS="-C opt-level=s" cargo +nightly-2023-11-10 ledger build nanox + BOLOS_SDK= APPVERSION_STR=$(APPVERSION_STR) PRODUCTION_BUILD=$(PRODUCTION_BUILD) RUSTFLAGS="-C opt-level=s" cargo +nightly-2023-11-10 ledger build nanox FOLDER=nanox make post-build .PHONY: buildS2 buildS2: - APPVERSION_STR=$(APPVERSION_STR) PRODUCTION_BUILD=$(PRODUCTION_BUILD) RUSTFLAGS="-C opt-level=s" cargo +nightly-2023-11-10 ledger build nanosplus + BOLOS_SDK= APPVERSION_STR=$(APPVERSION_STR) PRODUCTION_BUILD=$(PRODUCTION_BUILD) RUSTFLAGS="-C opt-level=s" cargo +nightly-2023-11-10 ledger build nanosplus FOLDER=nanosplus make post-build .PHONY: buildST buildST: - APPVERSION_STR=$(APPVERSION_STR) PRODUCTION_BUILD=$(PRODUCTION_BUILD) RUSTFLAGS="-C opt-level=z" cargo +nightly-2023-11-10 ledger build stax + BOLOS_SDK= APPVERSION_STR=$(APPVERSION_STR) PRODUCTION_BUILD=$(PRODUCTION_BUILD) RUSTFLAGS="-C opt-level=z" cargo +nightly-2023-11-10 ledger build stax FOLDER=stax make post-build .PHONY: buildFL buildFL: - APPVERSION_STR=$(APPVERSION_STR) PRODUCTION_BUILD=$(PRODUCTION_BUILD) RUSTFLAGS="-C opt-level=z" cargo +nightly-2023-11-10 ledger build flex + BOLOS_SDK= APPVERSION_STR=$(APPVERSION_STR) PRODUCTION_BUILD=$(PRODUCTION_BUILD) RUSTFLAGS="-C opt-level=z" cargo +nightly-2023-11-10 ledger build flex FOLDER=flex make post-build diff --git a/app/src/app_ui/run_action.rs b/app/src/app_ui/run_action.rs index bf3ea1cd..4499d826 100644 --- a/app/src/app_ui/run_action.rs +++ b/app/src/app_ui/run_action.rs @@ -25,45 +25,13 @@ use ledger_device_sdk::ui::{ }; #[cfg(any(target_os = "stax", target_os = "flex"))] -use ledger_device_sdk::nbgl::{Field, NbglChoice, NbglGlyph, NbglReview, TransactionType}; +use ledger_device_sdk::nbgl::{Field, NbglGlyph, NbglReview, TransactionType}; use crate::bolos::app_canary; use crate::utils::int_to_str; #[cfg(any(target_os = "stax", target_os = "flex"))] use include_gif::include_gif; -#[inline(never)] -pub fn ui_run_action<'a>(review_message: &'a [&'a str]) -> Result { - #[cfg(not(any(target_os = "stax", target_os = "flex")))] - { - let fields: [Field; 0] = []; - - let my_review = MultiFieldReview::new( - &fields, - review_message, - Some(&EYE), - "Approve", - Some(&VALIDATE_14), - "Reject", - Some(&CROSSMARK), - ); - - Ok(my_review.show()) - } - - #[cfg(any(target_os = "stax", target_os = "flex"))] - { - #[cfg(target_os = "stax")] - const FERRIS: NbglGlyph = NbglGlyph::from_include(include_gif!("stax_icon.gif", NBGL)); - #[cfg(target_os = "flex")] - const FERRIS: NbglGlyph = NbglGlyph::from_include(include_gif!("flex_icon.gif", NBGL)); - - Ok(NbglChoice::new() - .glyph(&FERRIS) - .show(review_message[0], "", "Approve", "Reject")) - } -} - #[inline(never)] pub fn ui_review_transaction<'a>( transaction: &'a Transaction<'a>, @@ -124,7 +92,7 @@ pub fn ui_review_transaction<'a>( .titles("Review", "Transaction", "Approve Transaction?") .glyph(&FERRIS); - Ok(review.show(&fields, false)) + Ok(review.show(&fields)) } } @@ -425,9 +393,10 @@ pub fn ui_review<'a>( let mut review = NbglReview::new() .tx_type(TransactionType::Operation) + .light() .titles(title, _subtitle, _finish_title) .glyph(&ICON); - Ok(review.show(&fields, true)) + Ok(review.show(&fields)) } } diff --git a/deps/ledger-zxlib b/deps/ledger-zxlib index b7813b44..b15dd41c 160000 --- a/deps/ledger-zxlib +++ b/deps/ledger-zxlib @@ -1 +1 @@ -Subproject commit b7813b4472c49efa07336e19e81d75f86ce63df9 +Subproject commit b15dd41cf9d5ea5f2c9dd94d52b8b87045979c86 From ab0e0d706719ecaa0dc0ec843801c862214af937 Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Fri, 27 Sep 2024 21:38:32 -0300 Subject: [PATCH 2/3] feat: remove ironfish local submodule and use npmjs package (#36) * feat: remove submodule * feat: use ironfish nodejs rust from npmjs * feat: remove command * fix: replace missing functions * feat: update * wip * wip * wip * wip * feat: update ref * fix * fix commitments * fix * fix * fix * fix --- .gitmodules | 5 +-- Makefile | 15 --------- ironfish | 1 - js | 2 +- tests_zemu/package.json | 4 +-- tests_zemu/tests/dkg.test.ts | 46 ++++++++++++++-------------- tests_zemu/tests/utils.ts | 8 ++--- tests_zemu/yarn.lock | 59 +++++++++++++++++++++++++++++++----- 8 files changed, 83 insertions(+), 57 deletions(-) delete mode 160000 ironfish diff --git a/.gitmodules b/.gitmodules index acf0c656..8750ae7a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,9 @@ [submodule "js"] path = js url = https://github.com/Zondax/ledger-ironfish-js -[submodule "ironfish"] - path = ironfish - url = https://github.com/iron-fish/ironfish [submodule "deps/ledger-zxlib"] path = deps/ledger-zxlib url = https://github.com/Zondax/ledger-zxlib [submodule "deps/ledger-secure-sdk"] path = deps/ledger-secure-sdk - url = https://github.com/LedgerHQ/ledger-secure-sdk.git + url = https://github.com/LedgerHQ/ledger-secure-sdk.git \ No newline at end of file diff --git a/Makefile b/Makefile index 8c28fe25..d47e8f04 100644 --- a/Makefile +++ b/Makefile @@ -16,21 +16,6 @@ default: COIN=$(COIN) $(MAKE) -C app $@ endif - - -zemu_install_ironfish_link: - cd ironfish && yarn unlink || true - cd $(TESTS_ZEMU_DIR) && yarn unlink @ironfish/rust-nodejs || true - # Now build and link - cd ironfish && yarn install && cd ironfish-rust-nodejs && yarn link || true - cd $(TESTS_ZEMU_DIR) && yarn link @ironfish/rust-nodejs || true - -# Redefine zemu_install, as we still need to compile the ironfish package locally -.PHONY: zemu_install -zemu_install: zemu_install_ironfish_link zemu_install_js_link - # and now install everything - cd $(TESTS_ZEMU_DIR) && yarn install - # Copy files quickly from a source to a folder with a regular expresions # In some cases, when something change in the screens for some command, it changes for each participant. # This makes it hard and tedious to update each participant snapshots (one per test run). diff --git a/ironfish b/ironfish deleted file mode 160000 index 5c87a001..00000000 --- a/ironfish +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5c87a00178a99505b23fc4bfae67162a1d9677cd diff --git a/js b/js index 52e1ce2e..90e349a8 160000 --- a/js +++ b/js @@ -1 +1 @@ -Subproject commit 52e1ce2e2f81475e8601cba52b50333c7efd33d3 +Subproject commit 90e349a840c18702456eb225fd8f22bfd6b5ee65 diff --git a/tests_zemu/package.json b/tests_zemu/package.json index 84821f44..7408902a 100644 --- a/tests_zemu/package.json +++ b/tests_zemu/package.json @@ -24,8 +24,8 @@ "upgrade": "bunx npm-check-updates -i" }, "dependencies": { - "@ironfish/rust-nodejs": "../ironfish/ironfish-rust-nodejs", - "@ironfish/sdk": "^2.5.0", + "@ironfish/rust-nodejs": "^2.7.0", + "@ironfish/sdk": "^2.7.0", "@zondax/ledger-ironfish": "../js", "@zondax/zemu": "^0.50.2" }, diff --git a/tests_zemu/tests/dkg.test.ts b/tests_zemu/tests/dkg.test.ts index bb73224b..7c5929fb 100644 --- a/tests_zemu/tests/dkg.test.ts +++ b/tests_zemu/tests/dkg.test.ts @@ -21,7 +21,7 @@ import { isValidPublicAddress, multisig, UnsignedTransaction, verifyTransactions import { Transaction } from '@ironfish/sdk' import { buildTx, minimizeRound3Inputs } from './utils' import { TModel } from '@zondax/zemu/dist/types' -import aggregateRawSignatureShares = multisig.aggregateRawSignatureShares +import aggregateSignatureShares = multisig.aggregateSignatureShares jest.setTimeout(4500000) @@ -383,10 +383,14 @@ describe.each(models)('DKG', function (m) { return result }) - commitments.push(result.commitments.toString('hex')) + commitments.push( + multisig.SigningCommitment.fromRaw(identities[i], result.commitments, unsignedTx.hash(), identities) + .serialize() + .toString('hex'), + ) } - const signingPackageHex = unsignedTx.signingPackageFromRaw(identities, commitments) + const signingPackageHex = unsignedTx.signingPackage(commitments) const signingPackage = new multisig.SigningPackage(Buffer.from(signingPackageHex, 'hex')) for (let i = 0; i < participants; i++) { @@ -402,16 +406,12 @@ describe.each(models)('DKG', function (m) { return result }) - signatures.push(result.signature.toString('hex')) + signatures.push( + multisig.SignatureShare.fromFrost(result.signature, Buffer.from(identities[i], 'hex')).serialize().toString('hex'), + ) } - let signedTxRaw = aggregateRawSignatureShares( - identities, - publicPackages[0], - unsignedTxRaw.toString('hex'), - signingPackage.frostSigningPackage().toString('hex'), - signatures, - ) + let signedTxRaw = aggregateSignatureShares(publicPackages[0], signingPackageHex, signatures) expect(verifyTransactions([signedTxRaw])).toBeTruthy() const signedTx = new Transaction(signedTxRaw) @@ -568,10 +568,10 @@ describe.each(models)('DKG', function (m) { return result.publicAddress.toString('hex') }) - let publicPackages = await runMethod(m, globalSims, 0, async (sim: Zemu, app: IronfishApp) => { + let publicPackage = await runMethod(m, globalSims, 0, async (sim: Zemu, app: IronfishApp) => { let result = await app.dkgGetPublicPackage() - return result.publicPackage + return result.publicPackage.toString('hex') }) for (let i = 0; i < participants; i++) { @@ -615,10 +615,14 @@ describe.each(models)('DKG', function (m) { return result }) - commitments.push(result.commitments.toString('hex')) + commitments.push( + multisig.SigningCommitment.fromRaw(identities[i], result.commitments, unsignedTx.hash(), identities) + .serialize() + .toString('hex'), + ) } - const signingPackageHex = unsignedTx.signingPackageFromRaw(identities, commitments) + const signingPackageHex = unsignedTx.signingPackage(commitments) const signingPackage = new multisig.SigningPackage(Buffer.from(signingPackageHex, 'hex')) for (let i = 0; i < participants; i++) { @@ -634,7 +638,9 @@ describe.each(models)('DKG', function (m) { return result }) - signatures.push(result.signature.toString('hex')) + signatures.push( + multisig.SignatureShare.fromFrost(result.signature, Buffer.from(identities[i], 'hex')).serialize().toString('hex'), + ) } // Attempt to sign again. It should fail as the tx hash is cleaned @@ -650,13 +656,7 @@ describe.each(models)('DKG', function (m) { ).rejects.toThrow() } - let signedTxRaw = aggregateRawSignatureShares( - identities, - publicPackages.toString('hex'), - unsignedTxRaw.toString('hex'), - signingPackage.frostSigningPackage().toString('hex'), - signatures, - ) + let signedTxRaw = aggregateSignatureShares(publicPackage, signingPackageHex, signatures) expect(verifyTransactions([signedTxRaw])).toBeTruthy() const signedTx = new Transaction(signedTxRaw) diff --git a/tests_zemu/tests/utils.ts b/tests_zemu/tests/utils.ts index 891409f9..c471bdfd 100644 --- a/tests_zemu/tests/utils.ts +++ b/tests_zemu/tests/utils.ts @@ -1,8 +1,8 @@ -import { Asset, LATEST_TRANSACTION_VERSION, Note, Transaction, makeTestWitness } from '@ironfish/rust-nodejs' +import { Asset, LATEST_TRANSACTION_VERSION, Note, Transaction } from '@ironfish/rust-nodejs' import { deserializePublicPackage, deserializeRound2CombinedPublicPackage } from '@ironfish/rust-nodejs' +import { devUtils, Note as NoteSDK } from '@ironfish/sdk' export const buildTx = (publicAddress: string, viewKeys: any, proofKey: any) => { - console.log('here') // create raw/proposed transaction let in_note = new Note(publicAddress, BigInt(42), Buffer.from(''), Asset.nativeId(), publicAddress) let out_note = new Note(publicAddress, BigInt(40), Buffer.from(''), Asset.nativeId(), publicAddress) @@ -11,10 +11,10 @@ export const buildTx = (publicAddress: string, viewKeys: any, proofKey: any) => let value = BigInt(5) let mint_out_note = new Note(publicAddress, value, Buffer.from(''), asset.id(), publicAddress) - let witness = makeTestWitness(in_note) + let witness = devUtils.makeFakeWitness(new NoteSDK(in_note.serialize())) let transaction = new Transaction(LATEST_TRANSACTION_VERSION) - transaction.spendNative(in_note, witness) + transaction.spend(in_note, witness) transaction.output(out_note) transaction.mint(asset, value) transaction.output(mint_out_note) diff --git a/tests_zemu/yarn.lock b/tests_zemu/yarn.lock index 1a981403..b162f015 100644 --- a/tests_zemu/yarn.lock +++ b/tests_zemu/yarn.lock @@ -496,17 +496,62 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570" integrity sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew== -"@ironfish/rust-nodejs@../ironfish/ironfish-rust-nodejs", "@ironfish/rust-nodejs@2.5.0": - version "2.5.0" +"@ironfish/rust-nodejs-darwin-arm64@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-darwin-arm64/-/rust-nodejs-darwin-arm64-2.7.0.tgz#a817d1183622b10ca58d58526cbf68d002f9af9e" + integrity sha512-Ct60f7lh6tVOReun/LZKRdEZ9jZuXYIz/sHNbxc5DAAcmi3L+lZVwASm6tfXu2FrU9NtTjA2Fke7n8UJqq5feQ== + +"@ironfish/rust-nodejs-darwin-x64@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-darwin-x64/-/rust-nodejs-darwin-x64-2.7.0.tgz#0f71693bac4f3bedf02e3fb21ee82301c1ebeff7" + integrity sha512-TOWeYcwSc/tpj95BuRND0fg0BbuxSL9bl67VvAD6buQxsQcHstTIBfsKtd8wBcF8VHMTCz81MqAgycMmClufCA== + +"@ironfish/rust-nodejs-linux-arm64-gnu@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-linux-arm64-gnu/-/rust-nodejs-linux-arm64-gnu-2.7.0.tgz#1fb7288c60fe2468e5857315fe1deb0b0157332f" + integrity sha512-srWt/PxQhPihIIXu1vgq4wtiPRj0B9n1ORMnw+TcmcUOFWvHFL0mkVKSbl1qnpaeV1SWIkRXpn65vfIUF5/k1A== + +"@ironfish/rust-nodejs-linux-arm64-musl@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-linux-arm64-musl/-/rust-nodejs-linux-arm64-musl-2.7.0.tgz#9e084c986be60e1c944be7127380f1f3b01a74ff" + integrity sha512-k1eIZ1eDszKkGnVJn9LME609EBqRdIwpiM5/Akeq+MA26IjV8HwgkNtU0myRfqfdg8Q3qHwqGoXD9ICZEnXlsw== + +"@ironfish/rust-nodejs-linux-x64-gnu@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-linux-x64-gnu/-/rust-nodejs-linux-x64-gnu-2.7.0.tgz#d9a68a525df3e3ea25fb5e282c8ee4549c11e7fe" + integrity sha512-RTe+UwwGjVhM9n7OH89lUr1TJ91vKu68rwrpDMMI4deylf9tPv5S0yFeKE16yZnuifzQYq6Ayvg2U4B/ZU8E3A== + +"@ironfish/rust-nodejs-linux-x64-musl@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-linux-x64-musl/-/rust-nodejs-linux-x64-musl-2.7.0.tgz#9be614b098b6e8bc0578bfb4226ae7b2ef5748a2" + integrity sha512-sbMvHXG6XsAptS3Z60qwiK5w4m4Rumptcs2k5hFQyuVFOZ9Efn33L8nZbpOGjuOhfOGFEifjcA3CTjjS7wtOnw== + +"@ironfish/rust-nodejs-win32-x64-msvc@2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-win32-x64-msvc/-/rust-nodejs-win32-x64-msvc-2.7.0.tgz#8f987eeb2ebaac25a2864f4a630c9667b899a48e" + integrity sha512-2WYKHhjYI4P0qq9vdgp+WD3mlmYWpkYbDjPElhlTttxRsRs2QGY9KV2BRAqc+Y81Ci7uYDarj8mmjBOORwmq+A== -"@ironfish/sdk@^2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@ironfish/sdk/-/sdk-2.5.0.tgz#75722d2cd06de6d042b87e2dc7a3e9b8b4e947f6" - integrity sha512-CebC1Ob4RYl24e05/sP9XiJ2sSsYEBI5JXuk+niEKAYp/LEytgL36XpVuILKMQmzyS9eZ4XXkoSDiSAjgaLIow== +"@ironfish/rust-nodejs@2.7.0", "@ironfish/rust-nodejs@^2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs/-/rust-nodejs-2.7.0.tgz#6b56f3b1375cb2670411d5a7d647c2e1788f3cee" + integrity sha512-jJRblJa3XxIiPCnPHvJhXKoB+QMbAoHqsHsIPTRPQIGk9cFuAhoFpgQT0RIw103JjXMNSwYOXOi3iPpwGxzMZQ== + optionalDependencies: + "@ironfish/rust-nodejs-darwin-arm64" "2.7.0" + "@ironfish/rust-nodejs-darwin-x64" "2.7.0" + "@ironfish/rust-nodejs-linux-arm64-gnu" "2.7.0" + "@ironfish/rust-nodejs-linux-arm64-musl" "2.7.0" + "@ironfish/rust-nodejs-linux-x64-gnu" "2.7.0" + "@ironfish/rust-nodejs-linux-x64-musl" "2.7.0" + "@ironfish/rust-nodejs-win32-x64-msvc" "2.7.0" + +"@ironfish/sdk@^2.7.0": + version "2.7.0" + resolved "https://registry.yarnpkg.com/@ironfish/sdk/-/sdk-2.7.0.tgz#ffaa75f5d09c447d350aa0904f3d3cd1d7e1ac92" + integrity sha512-dPz0fKSD/bo/PwoOWErcaNx85oSaxehHPLK2hiWBVfnncvYqQ4yESYYNw+FfWIFhbTUgRQ+HXViw9sR0+7eXcQ== dependencies: "@ethersproject/bignumber" "5.7.0" "@fast-csv/format" "4.3.5" - "@ironfish/rust-nodejs" "2.5.0" + "@ironfish/rust-nodejs" "2.7.0" "@napi-rs/blake-hash" "1.3.3" axios "1.7.2" bech32 "2.0.0" From 1060c0ff8322acdf27fe4f999e6e312c12baa6c2 Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Fri, 27 Sep 2024 23:42:33 -0300 Subject: [PATCH 3/3] feat: bump version --- app/Makefile.version | 2 +- tests_zemu/tests/basic.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Makefile.version b/app/Makefile.version index b7b9ccea..45073748 100644 --- a/app/Makefile.version +++ b/app/Makefile.version @@ -3,4 +3,4 @@ APPVERSION_M=0 # This is the minor version APPVERSION_N=5 # This is the patch version -APPVERSION_P=0 +APPVERSION_P=1 diff --git a/tests_zemu/tests/basic.test.ts b/tests_zemu/tests/basic.test.ts index 91bc2280..07f8d394 100644 --- a/tests_zemu/tests/basic.test.ts +++ b/tests_zemu/tests/basic.test.ts @@ -59,7 +59,7 @@ describe('Basic', function () { expect(resp.testMode).toBe(false) expect(resp.major).toBe(0) expect(resp.minor).toBe(5) - expect(resp.patch).toBe(0) + expect(resp.patch).toBe(1) } finally { await sim.close() }