From c878672c0e48e3f5048927dffd662d88020952ed Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Wed, 11 Sep 2024 23:07:46 -0300 Subject: [PATCH 01/20] feat: add ci for build and zemu test --- .github/workflows/main.yml | 54 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..5251ad40 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,54 @@ +name: Build +on: + workflow_dispatch: + push: + pull_request: + branches: + - main + - develop + - master # for safety reasons + - dev # for safety reasons + +jobs: + configure: + runs-on: ${{ github.repository_owner == 'zondax' && 'zondax-runners' || 'ubuntu-latest' }} + outputs: + uid_gid: ${{ steps.get-user.outputs.uid_gid }} + steps: + - id: get-user + run: echo "uid_gid=$(id -u):$(id -g)" >> $GITHUB_OUTPUT + + build_ledger: + runs-on: ${{ github.repository_owner == 'zondax' && 'zondax-runners' || 'ubuntu-latest' }} + steps: + - 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 + - name: Install rust + uses: actions-rs/toolchain@v1 + with: + toolchain: nightly-2023-11-10 + - name: Checkout + uses: actions/checkout@v4 + with: + submodules: true + - name: Install node + uses: actions/setup-node@v4 + with: + node-version: 18 + - name: Install yarn and yalc + run: | + npm install -g yarn + npm install -g yalc + - name: Checkout ironfish repo + run: git clone https://github.com/iron-fish/ironfish.git + - name: Build ironfish + run: | + cd ironfish + yarn install + cd ironfish-rust-nodejs + yalc publish \ No newline at end of file From 9f65daf81ef77451ecfa4a77d8da72f30843aa3b Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 09:05:18 -0300 Subject: [PATCH 02/20] feat: complete build process --- .github/workflows/main.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5251ad40..5c40e3ac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,6 +44,10 @@ jobs: run: | npm install -g yarn npm install -g yalc + - name: Install cargo ledger and deps + run: | + cargo install cargo-ledger + cargo ledger setup - name: Checkout ironfish repo run: git clone https://github.com/iron-fish/ironfish.git - name: Build ironfish @@ -51,4 +55,7 @@ jobs: cd ironfish yarn install cd ironfish-rust-nodejs - yalc publish \ No newline at end of file + yalc publish + - name: Build app + run: | + make build \ No newline at end of file From 0e4bc59980175c39a33804dddea50dd0cf2ea5c2 Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 09:16:43 -0300 Subject: [PATCH 03/20] feat: wip ci --- .github/workflows/main.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5c40e3ac..9ea9fe0d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,6 +32,7 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: nightly-2023-11-10 + components: rust-src - name: Checkout uses: actions/checkout@v4 with: @@ -49,7 +50,9 @@ jobs: cargo install cargo-ledger cargo ledger setup - name: Checkout ironfish repo - run: git clone https://github.com/iron-fish/ironfish.git + run: | + git clone https://github.com/iron-fish/ironfish.git + git checkout feat/hughy/make-test-witness - name: Build ironfish run: | cd ironfish @@ -58,4 +61,14 @@ jobs: yalc publish - name: Build app run: | - make build \ No newline at end of file + make build + - name: Install zemu deps + run: | + cd js + yalc add @ironfish/rust-nodejs + cd ../tests_zemu + yalc add @ironfish/rust-nodejs + cd .. + make zemu_install + - name: Run tests + run: make zemu_test \ No newline at end of file From bd48c4a807233c9b2effdec644b4090e48064f1c Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 09:16:55 -0300 Subject: [PATCH 04/20] feat: remove python checks --- .github/workflows/python_tests_checks.yml | 44 ----------------------- 1 file changed, 44 deletions(-) delete mode 100644 .github/workflows/python_tests_checks.yml diff --git a/.github/workflows/python_tests_checks.yml b/.github/workflows/python_tests_checks.yml deleted file mode 100644 index b6f76625..00000000 --- a/.github/workflows/python_tests_checks.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Checks on the Python tests - -# This workflow performs some checks on the Python client used by the Ironfish tests -# It is there to help us maintain a level of quality in our codebase and does not have to be kept on forked -# applications. - -on: - workflow_dispatch: - push: - branches: - - master - - main - - develop - pull_request: - -jobs: - - lint: - name: Ironfish client linting - runs-on: ubuntu-latest - steps: - - name: Clone - uses: actions/checkout@v3 - - name: Installing PIP dependencies - run: | - pip install pylint - pip install --extra-index-url https://test.pypi.org/simple/ -r tests/requirements.txt - - name: Lint Python code - run: | - pylint --rc tests/setup.cfg tests/application_client/ - - mypy: - name: Type checking - runs-on: ubuntu-latest - steps: - - name: Clone - uses: actions/checkout@v3 - - name: Installing PIP dependencies - run: | - pip install mypy - pip install --extra-index-url https://test.pypi.org/simple/ -r tests/requirements.txt - - name: Mypy type checking - run: | - mypy tests/application_client/ From f11a344c4ccb21d877baff76638e90aef281a906 Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 09:22:48 -0300 Subject: [PATCH 05/20] fix: branch checkout --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9ea9fe0d..8e0a1ada 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,7 +52,7 @@ jobs: - name: Checkout ironfish repo run: | git clone https://github.com/iron-fish/ironfish.git - git checkout feat/hughy/make-test-witness + git checkout origin/feat/hughy/make-test-witness - name: Build ironfish run: | cd ironfish From e3e351c8cd0d21a6cd92ecd692ef7f8963ef1cc9 Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 09:27:12 -0300 Subject: [PATCH 06/20] fix: branch checkout --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8e0a1ada..26497408 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,7 +52,8 @@ jobs: - name: Checkout ironfish repo run: | git clone https://github.com/iron-fish/ironfish.git - git checkout origin/feat/hughy/make-test-witness + git fetch --all + git checkout -b feat/hughy/make-test-witness origin/feat/hughy/make-test-witness - name: Build ironfish run: | cd ironfish From 5c405a3a52ab37e0469d4242faeba8b7d1f599f2 Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 09:33:51 -0300 Subject: [PATCH 07/20] fix: branch checkout --- .github/workflows/main.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 26497408..e09178c1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,20 +49,17 @@ jobs: run: | cargo install cargo-ledger cargo ledger setup - - name: Checkout ironfish repo + - name: Checkout and build ironfish repo run: | git clone https://github.com/iron-fish/ironfish.git + cd ironfish git fetch --all git checkout -b feat/hughy/make-test-witness origin/feat/hughy/make-test-witness - - name: Build ironfish - run: | - cd ironfish yarn install cd ironfish-rust-nodejs yalc publish - name: Build app - run: | - make build + run: make build - name: Install zemu deps run: | cd js From 7ad7401d7a52e8bccdad00ddb47bf387af1268a9 Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 09:42:03 -0300 Subject: [PATCH 08/20] fix: install llvm --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e09178c1..dfee5877 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,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 + clang gcc-arm-none-eabi gcc-multilib llvm-dev llvm-runtime llvm - name: Install rust uses: actions-rs/toolchain@v1 with: From 0f0ddfc8d7f69df28ef9640369be68b1cfbf3d65 Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 09:57:00 -0300 Subject: [PATCH 09/20] fix: install llvm --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dfee5877..4841f3c9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,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-runtime llvm + clang gcc-arm-none-eabi gcc-multilib llvm-18 llvm-18-dev llvm-18-tools clang-18 - name: Install rust uses: actions-rs/toolchain@v1 with: From 88e3407d162ed442f0cd99c90a8dc6427e89c01a Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 09:57:38 -0300 Subject: [PATCH 10/20] fix: install llvm --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4841f3c9..aba15b88 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,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-18 llvm-18-dev llvm-18-tools clang-18 + clang gcc-arm-none-eabi gcc-multilib llvm-18 llvm-18-dev llvm-18-tools - name: Install rust uses: actions-rs/toolchain@v1 with: From eb10ecd358367d3645f4421eeef718ea1ca4b646 Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 10:01:04 -0300 Subject: [PATCH 11/20] fix: install llvm --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aba15b88..8b383694 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,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-18 llvm-18-dev llvm-18-tools + clang gcc-arm-none-eabi gcc-multilib llvm-dev llvm-runtime llvm llvm-tools - name: Install rust uses: actions-rs/toolchain@v1 with: From 858d3add125b9a1212718362988fee14d2515bdf Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 10:05:03 -0300 Subject: [PATCH 12/20] fix: install llvm --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8b383694..4aff4fc4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,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-runtime llvm llvm-tools + clang gcc-arm-none-eabi gcc-multilib llvm-dev llvm - name: Install rust uses: actions-rs/toolchain@v1 with: From 132bd0f7fb8e3b2313eaaf84d8f76ed339e5364b Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 10:15:15 -0300 Subject: [PATCH 13/20] fix: install ledgerwallet --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4aff4fc4..64609744 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,10 +45,11 @@ jobs: run: | npm install -g yarn npm install -g yalc - - name: Install cargo ledger and deps + - name: Install ledger deps run: | cargo install cargo-ledger cargo ledger setup + pip install ledgerwallet - name: Checkout and build ironfish repo run: | git clone https://github.com/iron-fish/ironfish.git From 43188ac00fdca243506f193158b2a785e7fd3be9 Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 10:26:06 -0300 Subject: [PATCH 14/20] fix: path --- .github/workflows/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 64609744..23e0487c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,6 +33,9 @@ jobs: 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: @@ -60,7 +63,9 @@ jobs: cd ironfish-rust-nodejs yalc publish - name: Build app - run: make build + run: | + export PATH=/home/runner/.local/bin:$PATH + make build - name: Install zemu deps run: | cd js From 576ea4a303b1872b8eebc2479e18a4260dc1876a Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 10:50:52 -0300 Subject: [PATCH 15/20] fix --- .github/workflows/main.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 23e0487c..ccc9e276 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,10 +44,9 @@ jobs: uses: actions/setup-node@v4 with: node-version: 18 - - name: Install yarn and yalc + - name: Install yarn run: | npm install -g yarn - npm install -g yalc - name: Install ledger deps run: | cargo install cargo-ledger @@ -60,8 +59,7 @@ jobs: git fetch --all git checkout -b feat/hughy/make-test-witness origin/feat/hughy/make-test-witness yarn install - cd ironfish-rust-nodejs - yalc publish + yarn link - name: Build app run: | export PATH=/home/runner/.local/bin:$PATH @@ -69,9 +67,9 @@ jobs: - name: Install zemu deps run: | cd js - yalc add @ironfish/rust-nodejs + yarn link @ironfish/rust-nodejs cd ../tests_zemu - yalc add @ironfish/rust-nodejs + yarn link @ironfish/rust-nodejs cd .. make zemu_install - name: Run tests From cca6c3f20701d5963881d40f852f41c0ec00fa07 Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 10:59:55 -0300 Subject: [PATCH 16/20] fix --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ccc9e276..cf33accc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -59,6 +59,7 @@ jobs: git fetch --all git checkout -b feat/hughy/make-test-witness origin/feat/hughy/make-test-witness yarn install + cd ironfish-rust-nodejs yarn link - name: Build app run: | From dd7a743f3033f6747949432c3a49303f43ae5b02 Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 11:08:15 -0300 Subject: [PATCH 17/20] fix --- .github/workflows/main.yml | 2 ++ tests_zemu/package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cf33accc..dbbf5c3c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -68,8 +68,10 @@ jobs: - name: Install zemu deps run: | cd js + yarn unlink @ironfish/rust-nodejs yarn link @ironfish/rust-nodejs cd ../tests_zemu + yarn unlink @ironfish/rust-nodejs yarn link @ironfish/rust-nodejs cd .. make zemu_install diff --git a/tests_zemu/package.json b/tests_zemu/package.json index 18de84f0..92d98450 100644 --- a/tests_zemu/package.json +++ b/tests_zemu/package.json @@ -24,7 +24,7 @@ "upgrade": "bunx npm-check-updates -i" }, "dependencies": { - "@ironfish/rust-nodejs": "file:../../../otros/ironfish/ironfish-rust-nodejs", + "@ironfish/rust-nodejs": "../../../otros/ironfish/ironfish-rust-nodejs", "@ironfish/sdk": "^2.5.0", "@zondax/ledger-ironfish": "../js", "@zondax/zemu": "^0.50.2" From 1b741047e9bc5aa3579c1052d0928ba831958107 Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 11:24:49 -0300 Subject: [PATCH 18/20] feat: add ironfish submodule --- .gitmodules | 3 +++ ironfish | 1 + 2 files changed, 4 insertions(+) create mode 160000 ironfish diff --git a/.gitmodules b/.gitmodules index 7348bd73..6288de1d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "js"] path = js url = https://github.com/Zondax/ledger-ironfish-js +[submodule "ironfish"] + path = ironfish + url = https://github.com/iron-fish/ironfish diff --git a/ironfish b/ironfish new file mode 160000 index 00000000..5c87a001 --- /dev/null +++ b/ironfish @@ -0,0 +1 @@ +Subproject commit 5c87a00178a99505b23fc4bfae67162a1d9677cd From 573aaeb68a46b7068e4f39c7240edb287dbb7021 Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 11:25:01 -0300 Subject: [PATCH 19/20] link local ironfish submodule --- Makefile | 10 ++++++++- js | 2 +- tests_zemu/package.json | 2 +- tests_zemu/yarn.lock | 46 +++++++++++++++++++++++++++++++++++++++-- 4 files changed, 55 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 20d6d4d7..df2a546c 100644 --- a/Makefile +++ b/Makefile @@ -27,8 +27,16 @@ zemu_install_js_link: endif +zemu_install_ironfish_link: + cd ironfish && yarn unlink || true + cd $(TESTS_ZEMU_DIR) && yarn unlink @ironfish/rust-nodejs || true + cd $(TESTS_JS_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 + cd $(TESTS_JS_DIR) && yarn link @ironfish/rust-nodejs || true .PHONY: zemu_install -zemu_install: zemu_install_js_link +zemu_install: zemu_install_ironfish_link zemu_install_js_link # and now install everything cd $(TESTS_ZEMU_DIR) && yarn install diff --git a/js b/js index 8c22a0fa..36e0256b 160000 --- a/js +++ b/js @@ -1 +1 @@ -Subproject commit 8c22a0faf2b2d6ef8c3b4f0cccf86ed8f6da5412 +Subproject commit 36e0256be9861415957379326657744341fe43ba diff --git a/tests_zemu/package.json b/tests_zemu/package.json index 92d98450..84821f44 100644 --- a/tests_zemu/package.json +++ b/tests_zemu/package.json @@ -24,7 +24,7 @@ "upgrade": "bunx npm-check-updates -i" }, "dependencies": { - "@ironfish/rust-nodejs": "../../../otros/ironfish/ironfish-rust-nodejs", + "@ironfish/rust-nodejs": "../ironfish/ironfish-rust-nodejs", "@ironfish/sdk": "^2.5.0", "@zondax/ledger-ironfish": "../js", "@zondax/zemu": "^0.50.2" diff --git a/tests_zemu/yarn.lock b/tests_zemu/yarn.lock index 7591fc43..45e81b30 100644 --- a/tests_zemu/yarn.lock +++ b/tests_zemu/yarn.lock @@ -496,8 +496,51 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570" integrity sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew== -"@ironfish/rust-nodejs@2.5.0", "@ironfish/rust-nodejs@file:../../../otros/ironfish/ironfish-rust-nodejs": +"@ironfish/rust-nodejs-darwin-arm64@2.5.0": version "2.5.0" + resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-darwin-arm64/-/rust-nodejs-darwin-arm64-2.5.0.tgz#671ea59c493fb0befaa85f105bece644971b24b7" + integrity sha512-xNnD+9wZRVTFNSDEe0W6qnFlxDW6vIwI3J6N0bziDRJ+A3I5+Zzgb79LYmd+79TEGs2Zv87Il8G3INu/ahcR7w== + +"@ironfish/rust-nodejs-darwin-x64@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-darwin-x64/-/rust-nodejs-darwin-x64-2.5.0.tgz#a5fd4683c63b873a6a56281f65cdf002394783a1" + integrity sha512-K8MA3vYooGAecfQyYbSVSNz+QOFBowRixw8hKZAMnVp9skjGjnxQDdK/dhWbvsFT594Z3zNb0ZDLgcI55vM97w== + +"@ironfish/rust-nodejs-linux-arm64-gnu@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-linux-arm64-gnu/-/rust-nodejs-linux-arm64-gnu-2.5.0.tgz#1860dc9727ef938c44d70e34d1b976df390ae835" + integrity sha512-gbrbB6OFGRB206Iq3chR4k5zGKIykmo+0v49N7h3/q/c/HU5BUOxISOFhQVABr4nkIOB+PuL1LGQ0ypWOhHH9g== + +"@ironfish/rust-nodejs-linux-arm64-musl@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-linux-arm64-musl/-/rust-nodejs-linux-arm64-musl-2.5.0.tgz#3260c77313c791e754b9010a1b75fed028ee9fbb" + integrity sha512-AJKZp2BZBTDCesEZImd7eQ6nM9ByHAyHJXrBnjUzciCj61PqcjNremg8eYX3J1l8U1NDm5thyVU9K43Rb7aLLA== + +"@ironfish/rust-nodejs-linux-x64-gnu@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-linux-x64-gnu/-/rust-nodejs-linux-x64-gnu-2.5.0.tgz#b491fd725b7078dcfb5f5af4a62800eb61f3ef6f" + integrity sha512-AL3HuehgC3Z2g3FZPmlMT4lWVcqlCSSC4J+ydREXugMc7q4o2kw4ggW9BeJyf56gXvzlLB3TwbzGQvRYWuRFtw== + +"@ironfish/rust-nodejs-linux-x64-musl@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-linux-x64-musl/-/rust-nodejs-linux-x64-musl-2.5.0.tgz#5cf346d134c61c88b2cb1a547b46e26510c01aea" + integrity sha512-qI0Pykpyrp8kIo08DVr6aXHEUOXPq7DnAcg2qpaK5+LJSvSVNnui8H6Z24HIm0utXm55ekaZYm5vYRdSSLqtnQ== + +"@ironfish/rust-nodejs-win32-x64-msvc@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-win32-x64-msvc/-/rust-nodejs-win32-x64-msvc-2.5.0.tgz#f354bca49b03b9c14b67016e1b8a72342837a674" + integrity sha512-uduXZ56usjwmDF0f0ubhb2drXorjlgpaULJstWEe0AyiohRxx22UAGJaAKRwuP1/ETurMyPJ4WsnMmKW2E4DoQ== + +"@ironfish/rust-nodejs@../../../otros/ironfish/ironfish-rust-nodejs", "@ironfish/rust-nodejs@2.5.0": + version "2.5.0" + optionalDependencies: + "@ironfish/rust-nodejs-darwin-arm64" "2.5.0" + "@ironfish/rust-nodejs-darwin-x64" "2.5.0" + "@ironfish/rust-nodejs-linux-arm64-gnu" "2.5.0" + "@ironfish/rust-nodejs-linux-arm64-musl" "2.5.0" + "@ironfish/rust-nodejs-linux-x64-gnu" "2.5.0" + "@ironfish/rust-nodejs-linux-x64-musl" "2.5.0" + "@ironfish/rust-nodejs-win32-x64-msvc" "2.5.0" "@ironfish/sdk@^2.5.0": version "2.5.0" @@ -1425,7 +1468,6 @@ "@zondax/ledger-ironfish@../js": version "0.0.0" dependencies: - "@ironfish/rust-nodejs" "file:../../../../../../Library/Caches/Yarn/v6/npm-@zondax-ledger-ironfish-0.0.0-2140b009-22cd-4404-8a96-d84e7efa8c61-1726092072851/otros/ironfish/ironfish-rust-nodejs" "@zondax/ledger-js" "^0.2.1" "@zondax/ledger-js@^0.2.1": From 8d3ad761b82c0596582d72df77181022c628d2ec Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 12 Sep 2024 11:28:03 -0300 Subject: [PATCH 20/20] fix: ci --- .github/workflows/main.yml | 21 ++--------------- tests_zemu/yarn.lock | 46 ++------------------------------------ 2 files changed, 4 insertions(+), 63 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dbbf5c3c..258bbe54 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,28 +52,11 @@ jobs: cargo install cargo-ledger cargo ledger setup pip install ledgerwallet - - name: Checkout and build ironfish repo - run: | - git clone https://github.com/iron-fish/ironfish.git - cd ironfish - git fetch --all - git checkout -b feat/hughy/make-test-witness origin/feat/hughy/make-test-witness - yarn install - cd ironfish-rust-nodejs - yarn link - name: Build app run: | export PATH=/home/runner/.local/bin:$PATH make build - name: Install zemu deps - run: | - cd js - yarn unlink @ironfish/rust-nodejs - yarn link @ironfish/rust-nodejs - cd ../tests_zemu - yarn unlink @ironfish/rust-nodejs - yarn link @ironfish/rust-nodejs - cd .. - make zemu_install + run: make zemu_install - name: Run tests - run: make zemu_test \ No newline at end of file + run: make zemu_test diff --git a/tests_zemu/yarn.lock b/tests_zemu/yarn.lock index 45e81b30..06fa21fe 100644 --- a/tests_zemu/yarn.lock +++ b/tests_zemu/yarn.lock @@ -496,51 +496,8 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570" integrity sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew== -"@ironfish/rust-nodejs-darwin-arm64@2.5.0": +"@ironfish/rust-nodejs@../ironfish/ironfish-rust-nodejs", "@ironfish/rust-nodejs@2.5.0": version "2.5.0" - resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-darwin-arm64/-/rust-nodejs-darwin-arm64-2.5.0.tgz#671ea59c493fb0befaa85f105bece644971b24b7" - integrity sha512-xNnD+9wZRVTFNSDEe0W6qnFlxDW6vIwI3J6N0bziDRJ+A3I5+Zzgb79LYmd+79TEGs2Zv87Il8G3INu/ahcR7w== - -"@ironfish/rust-nodejs-darwin-x64@2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-darwin-x64/-/rust-nodejs-darwin-x64-2.5.0.tgz#a5fd4683c63b873a6a56281f65cdf002394783a1" - integrity sha512-K8MA3vYooGAecfQyYbSVSNz+QOFBowRixw8hKZAMnVp9skjGjnxQDdK/dhWbvsFT594Z3zNb0ZDLgcI55vM97w== - -"@ironfish/rust-nodejs-linux-arm64-gnu@2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-linux-arm64-gnu/-/rust-nodejs-linux-arm64-gnu-2.5.0.tgz#1860dc9727ef938c44d70e34d1b976df390ae835" - integrity sha512-gbrbB6OFGRB206Iq3chR4k5zGKIykmo+0v49N7h3/q/c/HU5BUOxISOFhQVABr4nkIOB+PuL1LGQ0ypWOhHH9g== - -"@ironfish/rust-nodejs-linux-arm64-musl@2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-linux-arm64-musl/-/rust-nodejs-linux-arm64-musl-2.5.0.tgz#3260c77313c791e754b9010a1b75fed028ee9fbb" - integrity sha512-AJKZp2BZBTDCesEZImd7eQ6nM9ByHAyHJXrBnjUzciCj61PqcjNremg8eYX3J1l8U1NDm5thyVU9K43Rb7aLLA== - -"@ironfish/rust-nodejs-linux-x64-gnu@2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-linux-x64-gnu/-/rust-nodejs-linux-x64-gnu-2.5.0.tgz#b491fd725b7078dcfb5f5af4a62800eb61f3ef6f" - integrity sha512-AL3HuehgC3Z2g3FZPmlMT4lWVcqlCSSC4J+ydREXugMc7q4o2kw4ggW9BeJyf56gXvzlLB3TwbzGQvRYWuRFtw== - -"@ironfish/rust-nodejs-linux-x64-musl@2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-linux-x64-musl/-/rust-nodejs-linux-x64-musl-2.5.0.tgz#5cf346d134c61c88b2cb1a547b46e26510c01aea" - integrity sha512-qI0Pykpyrp8kIo08DVr6aXHEUOXPq7DnAcg2qpaK5+LJSvSVNnui8H6Z24HIm0utXm55ekaZYm5vYRdSSLqtnQ== - -"@ironfish/rust-nodejs-win32-x64-msvc@2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@ironfish/rust-nodejs-win32-x64-msvc/-/rust-nodejs-win32-x64-msvc-2.5.0.tgz#f354bca49b03b9c14b67016e1b8a72342837a674" - integrity sha512-uduXZ56usjwmDF0f0ubhb2drXorjlgpaULJstWEe0AyiohRxx22UAGJaAKRwuP1/ETurMyPJ4WsnMmKW2E4DoQ== - -"@ironfish/rust-nodejs@../../../otros/ironfish/ironfish-rust-nodejs", "@ironfish/rust-nodejs@2.5.0": - version "2.5.0" - optionalDependencies: - "@ironfish/rust-nodejs-darwin-arm64" "2.5.0" - "@ironfish/rust-nodejs-darwin-x64" "2.5.0" - "@ironfish/rust-nodejs-linux-arm64-gnu" "2.5.0" - "@ironfish/rust-nodejs-linux-arm64-musl" "2.5.0" - "@ironfish/rust-nodejs-linux-x64-gnu" "2.5.0" - "@ironfish/rust-nodejs-linux-x64-musl" "2.5.0" - "@ironfish/rust-nodejs-win32-x64-msvc" "2.5.0" "@ironfish/sdk@^2.5.0": version "2.5.0" @@ -1468,6 +1425,7 @@ "@zondax/ledger-ironfish@../js": version "0.0.0" dependencies: + "@ironfish/rust-nodejs" "../ironfish/ironfish-rust-nodejs" "@zondax/ledger-js" "^0.2.1" "@zondax/ledger-js@^0.2.1":