From f18dc7600a6170afadc71e3b8a2260a79792f8e8 Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Thu, 4 Jun 2026 18:34:26 +0000 Subject: [PATCH 1/8] Add optional deps --- packages/evm/package.json | 4 ++++ pnpm-lock.yaml | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/packages/evm/package.json b/packages/evm/package.json index bd99e1d9b..beaa3adbc 100644 --- a/packages/evm/package.json +++ b/packages/evm/package.json @@ -31,5 +31,9 @@ "aarch64-unknown-linux-gnu", "x86_64-unknown-linux-gnu" ] + }, + "optionalDependencies": { + "@mainsail/evm-linux-arm64-gnu": "0.0.1-rc.9", + "@mainsail/evm-linux-x64-gnu": "0.0.1-rc.9" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6db4aafe9..7f3c227aa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2044,6 +2044,13 @@ importers: '@napi-rs/cli': specifier: 3.6.2 version: 3.6.2(@emnapi/core@1.4.5)(@emnapi/runtime@1.4.5)(@types/node@25.7.0)(node-addon-api@8.5.0) + optionalDependencies: + '@mainsail/evm-linux-arm64-gnu': + specifier: 0.0.1-rc.9 + version: 0.0.1-rc.9 + '@mainsail/evm-linux-x64-gnu': + specifier: 0.0.1-rc.9 + version: 0.0.1-rc.9 packages/evm-api-worker: dependencies: @@ -4843,6 +4850,20 @@ packages: cpu: [x64] os: [win32] + '@mainsail/evm-linux-arm64-gnu@0.0.1-rc.9': + resolution: {integrity: sha512-wvw2dTP/UBSw2LXgr2+A61fH12bfrMYp/6Ocse5UP6gODHDPh9clyJ5pHIpEkMNXiOeXXfXi7BvlH/M1VhqgQA==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + libc: [glibc] + + '@mainsail/evm-linux-x64-gnu@0.0.1-rc.9': + resolution: {integrity: sha512-dUD5zCcXMcXa/aBoD/avVOH3qryg4SFRxKLALDigg04qn1LCe9dvpIC59ba5Ok7phQp63CMdfcPctqAfNh8sPw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + libc: [glibc] + '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3': resolution: {integrity: sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==} cpu: [arm64] @@ -11972,6 +11993,12 @@ snapshots: '@lmdb/lmdb-win32-x64@3.5.4': optional: true + '@mainsail/evm-linux-arm64-gnu@0.0.1-rc.9': + optional: true + + '@mainsail/evm-linux-x64-gnu@0.0.1-rc.9': + optional: true + '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3': optional: true From 3de16ec29b40f15277aafd4309ff30e3858ef590 Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Thu, 4 Jun 2026 18:35:40 +0000 Subject: [PATCH 2/8] Update evm optionalDeps on version update --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fad6c900f..6e6867660 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "references": "node ./scripts/references/update-references.js", "release": "lerna run release --concurrency=1", "release:native": "bash ./scripts/publish-evm-native.sh", - "release:prepare": "lerna run release:prepare --scope=@mainsail/evm", + "version:evm": "lerna run release:prepare --scope=@mainsail/evm", "setup": "pnpm install && pnpm run build", "sort": "sort-package-json \"package.json\" \"packages/*/package.json\"", "sort:dry": "sort-package-json --check \"package.json\" \"packages/*/package.json\"", @@ -45,7 +45,7 @@ "test:unit": "lerna run test --parallel --no-bail", "test:unit:coverage": "lerna run test:coverage --parallel", "test:unit:merge": "bash scripts/development/create-lcov-report.sh", - "version": "lerna version --no-git-tag-version --yes", + "version": "lerna version --no-git-tag-version --yes && pnpm run version:evm", "workflows:unit": "node scripts/generate-unit-workflow.js" }, "devDependencies": { From 944b981416f66a6233be7552d324dff0748c3c2f Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Fri, 5 Jun 2026 09:38:09 +0000 Subject: [PATCH 3/8] Version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6e6867660..38d201f35 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "test:unit": "lerna run test --parallel --no-bail", "test:unit:coverage": "lerna run test:coverage --parallel", "test:unit:merge": "bash scripts/development/create-lcov-report.sh", - "version": "lerna version --no-git-tag-version --yes && pnpm run version:evm", + "version": "lerna version --no-git-tag-version --yes", "workflows:unit": "node scripts/generate-unit-workflow.js" }, "devDependencies": { From f46a10492c7a5ce25117a7518ad14d0993ae4d8b Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Fri, 5 Jun 2026 09:40:51 +0000 Subject: [PATCH 4/8] Reorder --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 38d201f35..698092115 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "references": "node ./scripts/references/update-references.js", "release": "lerna run release --concurrency=1", "release:native": "bash ./scripts/publish-evm-native.sh", - "version:evm": "lerna run release:prepare --scope=@mainsail/evm", "setup": "pnpm install && pnpm run build", "sort": "sort-package-json \"package.json\" \"packages/*/package.json\"", "sort:dry": "sort-package-json --check \"package.json\" \"packages/*/package.json\"", @@ -46,6 +45,7 @@ "test:unit:coverage": "lerna run test:coverage --parallel", "test:unit:merge": "bash scripts/development/create-lcov-report.sh", "version": "lerna version --no-git-tag-version --yes", + "version:evm": "lerna run release:prepare --scope=@mainsail/evm", "workflows:unit": "node scripts/generate-unit-workflow.js" }, "devDependencies": { From 9ad5a3c485ae8989233ab1fc77dc2e83fbe0b018 Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Fri, 5 Jun 2026 09:42:59 +0000 Subject: [PATCH 5/8] Version script --- package.json | 3 ++- scripts/version.sh | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100755 scripts/version.sh diff --git a/package.json b/package.json index 698092115..4175ac70b 100644 --- a/package.json +++ b/package.json @@ -44,8 +44,9 @@ "test:unit": "lerna run test --parallel --no-bail", "test:unit:coverage": "lerna run test:coverage --parallel", "test:unit:merge": "bash scripts/development/create-lcov-report.sh", - "version": "lerna version --no-git-tag-version --yes", + "version": "bash ./scripts/version.sh", "version:evm": "lerna run release:prepare --scope=@mainsail/evm", + "version:ts": "lerna version --no-git-tag-version --yes", "workflows:unit": "node scripts/generate-unit-workflow.js" }, "devDependencies": { diff --git a/scripts/version.sh b/scripts/version.sh new file mode 100755 index 000000000..a836fcf31 --- /dev/null +++ b/scripts/version.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -e + +# Run the TypeScript version bump, forwarding any arguments (e.g. major/minor/patch). +pnpm run version:ts "$@" + +# Prepare the EVM native package release. +pnpm run version:evm From 5aedb9fe396ee8f0b169a96235e19b27f32e8167 Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Fri, 5 Jun 2026 09:51:11 +0000 Subject: [PATCH 6/8] Update version --- package.json | 4 +--- scripts/version.sh | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4175ac70b..1637e6b6d 100644 --- a/package.json +++ b/package.json @@ -44,9 +44,7 @@ "test:unit": "lerna run test --parallel --no-bail", "test:unit:coverage": "lerna run test:coverage --parallel", "test:unit:merge": "bash scripts/development/create-lcov-report.sh", - "version": "bash ./scripts/version.sh", - "version:evm": "lerna run release:prepare --scope=@mainsail/evm", - "version:ts": "lerna version --no-git-tag-version --yes", + "version:update": "bash ./scripts/version.sh", "workflows:unit": "node scripts/generate-unit-workflow.js" }, "devDependencies": { diff --git a/scripts/version.sh b/scripts/version.sh index a836fcf31..bde85ea36 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -3,7 +3,7 @@ set -e # Run the TypeScript version bump, forwarding any arguments (e.g. major/minor/patch). -pnpm run version:ts "$@" +npx lerna version --no-git-tag-version --yes "$@" # Prepare the EVM native package release. -pnpm run version:evm +npx lerna run release:prepare --scope=@mainsail/evm From c6e2c147b30b27a07a59402d8f1f90fbc5e1f6ba Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Fri, 5 Jun 2026 09:52:29 +0000 Subject: [PATCH 7/8] Remove prepare release --- .github/workflows/publish-evm.yml | 3 --- .github/workflows/publish-rc.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.github/workflows/publish-evm.yml b/.github/workflows/publish-evm.yml index 6052fb89c..414b35945 100644 --- a/.github/workflows/publish-evm.yml +++ b/.github/workflows/publish-evm.yml @@ -132,9 +132,6 @@ jobs: run: ls -R ./npm shell: bash - - name: Prepare release - run: pnpm run release:prepare && pnpm install --lockfile-only - - name: Publish native to NPM run: pnpm run release:native -- --publish-branch=evm --tag=evm --no-git-checks env: diff --git a/.github/workflows/publish-rc.yml b/.github/workflows/publish-rc.yml index bbc803fc8..c61059f81 100644 --- a/.github/workflows/publish-rc.yml +++ b/.github/workflows/publish-rc.yml @@ -132,9 +132,6 @@ jobs: run: ls -R ./npm shell: bash - - name: Prepare release - run: pnpm run release:prepare && pnpm install --lockfile-only - - name: Publish native to NPM run: pnpm run release:native -- --publish-branch=develop --tag=rc --no-git-checks env: From bb57820176d7cd2fe604718b05ea313f7a4610aa Mon Sep 17 00:00:00 2001 From: sebastijankuzner <58827427+sebastijankuzner@users.noreply.github.com> Date: Fri, 5 Jun 2026 10:01:46 +0000 Subject: [PATCH 8/8] style: resolve style guide violations [ci-lint-fix] --- packages/evm/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/evm/package.json b/packages/evm/package.json index beaa3adbc..fc824fe43 100644 --- a/packages/evm/package.json +++ b/packages/evm/package.json @@ -22,6 +22,10 @@ "devDependencies": { "@napi-rs/cli": "3.6.2" }, + "optionalDependencies": { + "@mainsail/evm-linux-arm64-gnu": "0.0.1-rc.9", + "@mainsail/evm-linux-x64-gnu": "0.0.1-rc.9" + }, "engines": { "node": ">=24" }, @@ -31,9 +35,5 @@ "aarch64-unknown-linux-gnu", "x86_64-unknown-linux-gnu" ] - }, - "optionalDependencies": { - "@mainsail/evm-linux-arm64-gnu": "0.0.1-rc.9", - "@mainsail/evm-linux-x64-gnu": "0.0.1-rc.9" } }