From 128e604802a33c7c09f72dde86da67ac09a3311f Mon Sep 17 00:00:00 2001 From: tenequm Date: Mon, 26 May 2025 13:44:44 +0100 Subject: [PATCH 1/6] chore: trigger ci From 886f6dad2e089a285394629f9f07e3f805fa6c9d Mon Sep 17 00:00:00 2001 From: tenequm Date: Mon, 26 May 2025 14:05:48 +0100 Subject: [PATCH 2/6] ci(fix): set `moon` cli to `1.34.0` version to be used within gha workflows --- .github/workflows/reusable-build-and-test.yml | 4 ++++ .github/workflows/reusable-e2e-tests.yml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/reusable-build-and-test.yml b/.github/workflows/reusable-build-and-test.yml index eec04852d..4dd2cad5d 100644 --- a/.github/workflows/reusable-build-and-test.yml +++ b/.github/workflows/reusable-build-and-test.yml @@ -23,6 +23,7 @@ env: MOON_DEBUG_PROTO_INSTALL: false MOON_CACHE: ${{ inputs.cacheEnabled && 'read-write' || 'off' }} CACHE_VERSION: 2 + MOON_VERSION: '1.34.0' jobs: contracts-build-and-test: name: '[contracts] Build and test' @@ -68,6 +69,7 @@ jobs: with: cache-version: ${{ env.CACHE_VERSION }} cache: ${{ inputs.cacheEnabled }} + moon-version: ${{ env.MOON_VERSION }} - run: cd contracts && yarn install --immutable - run: moon ci :contracts-format - run: moon ci :contracts-lint @@ -272,6 +274,7 @@ jobs: with: cache-version: ${{ env.CACHE_VERSION }} cache: ${{ inputs.cacheEnabled }} + moon-version: ${{ env.MOON_VERSION }} - name: Run command "${{ matrix.command }}" run: ${{ matrix.command }} @@ -347,6 +350,7 @@ jobs: with: cache-version: ${{ env.CACHE_VERSION }} cache: ${{ inputs.cacheEnabled }} + moon-version: ${{ env.MOON_VERSION }} - uses: google-github-actions/auth@v2 id: auth diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index 319f80ca8..590d5ec22 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -33,6 +33,7 @@ env: MOON_CACHE: "${{ inputs.cacheEnabled && 'read-write' || 'off' }}" MOON_COLOR: 2 CACHE_VERSION: 2 + MOON_VERSION: '1.34.0' jobs: setup-report: @@ -251,6 +252,7 @@ jobs: with: cache: ${{ inputs.cacheEnabled }} cache-version: ${{ env.CACHE_VERSION }} + moon-version: ${{ env.MOON_VERSION }} - name: Run tests run: ${{ matrix.command }} From 6345e2a93a40daf39fccd7905c007990a96d69de Mon Sep 17 00:00:00 2001 From: tenequm Date: Mon, 26 May 2025 17:07:24 +0100 Subject: [PATCH 3/6] ci(stash): fix release job dependencies for `stash` --- stash/package.json | 6 +- stash/yarn.lock | 765 ++++++++++++++++++--------------------------- 2 files changed, 304 insertions(+), 467 deletions(-) diff --git a/stash/package.json b/stash/package.json index eb7f79fa5..565bb1bd6 100644 --- a/stash/package.json +++ b/stash/package.json @@ -75,7 +75,7 @@ }, "devDependencies": { "@semantic-release/changelog": "^6.0.3", - "@semantic-release/exec": "^7.0.3", + "@semantic-release/exec": "6", "@semantic-release/git": "^10.0.1", "@types/async": "3.2.15", "@types/big.js": "^6.1.6", @@ -110,8 +110,8 @@ "prettier": "^2.8.6", "pretty-quick": "^3.1.3", "sass": "1.55.0", - "semantic-release": "^24.2.3", - "semantic-release-monorepo": "^8.0.2", + "semantic-release": "22.0.12", + "semantic-release-monorepo": "8.0.2", "shelljs": "^0.8.5", "source-map-support": "^0.5.21", "supertest": "^6.3.3", diff --git a/stash/yarn.lock b/stash/yarn.lock index 2653a4778..7365bef41 100644 --- a/stash/yarn.lock +++ b/stash/yarn.lock @@ -1338,46 +1338,53 @@ __metadata: languageName: node linkType: hard -"@octokit/auth-token@npm:^5.0.0": - version: 5.1.2 - resolution: "@octokit/auth-token@npm:5.1.2" - checksum: 10c0/bd4952571d9c559ede1f6ef8f7756900256d19df0180db04da88886a05484c7e6a4397611422e4804465a82addc8c2daa21d0bb4f450403552ee81041a4046d1 +"@octokit/auth-token@npm:^4.0.0": + version: 4.0.0 + resolution: "@octokit/auth-token@npm:4.0.0" + checksum: 10c0/57acaa6c394c5abab2f74e8e1dcf4e7a16b236f713c77a54b8f08e2d14114de94b37946259e33ec2aab0566b26f724c2b71d2602352b59e541a9854897618f3c languageName: node linkType: hard -"@octokit/core@npm:^6.0.0": - version: 6.1.5 - resolution: "@octokit/core@npm:6.1.5" +"@octokit/core@npm:^5.0.0": + version: 5.2.1 + resolution: "@octokit/core@npm:5.2.1" dependencies: - "@octokit/auth-token": "npm:^5.0.0" - "@octokit/graphql": "npm:^8.2.2" - "@octokit/request": "npm:^9.2.3" - "@octokit/request-error": "npm:^6.1.8" - "@octokit/types": "npm:^14.0.0" - before-after-hook: "npm:^3.0.2" - universal-user-agent: "npm:^7.0.0" - checksum: 10c0/c89ea754cc33da740fdd69fadb971b4b65c89971bba4e8ad545d3ea7aba79759ee3e195c3b72e7df78f14b8b1d392bddc56e7c385d48b5272319ea6a0246ac7c + "@octokit/auth-token": "npm:^4.0.0" + "@octokit/graphql": "npm:^7.1.0" + "@octokit/request": "npm:^8.4.1" + "@octokit/request-error": "npm:^5.1.1" + "@octokit/types": "npm:^13.0.0" + before-after-hook: "npm:^2.2.0" + universal-user-agent: "npm:^6.0.0" + checksum: 10c0/9759c70a6a6477a636f336d717657761243bab0e9d34c4012a8b2d70aafd89ba3d24289fb7e05352999c6ec526fe572b8aff9ad59e90761842fb72fb7d59ed95 languageName: node linkType: hard -"@octokit/endpoint@npm:^10.1.4": - version: 10.1.4 - resolution: "@octokit/endpoint@npm:10.1.4" +"@octokit/endpoint@npm:^9.0.6": + version: 9.0.6 + resolution: "@octokit/endpoint@npm:9.0.6" dependencies: - "@octokit/types": "npm:^14.0.0" - universal-user-agent: "npm:^7.0.2" - checksum: 10c0/bf7cca71a05dc4751df658588e32642e59c98768e7509521226b997ea4837e2d16efd35c391231c76d888226f4daf80e6a9f347dee01a69f490253654dada581 + "@octokit/types": "npm:^13.1.0" + universal-user-agent: "npm:^6.0.0" + checksum: 10c0/8e06197b21869aeb498e0315093ca6fbee12bd1bdcfc1667fcd7d79d827d84f2c5a30702ffd28bba7879780e367d14c30df5b20d47fcaed5de5fdc05f5d4e013 languageName: node linkType: hard -"@octokit/graphql@npm:^8.2.2": - version: 8.2.2 - resolution: "@octokit/graphql@npm:8.2.2" +"@octokit/graphql@npm:^7.1.0": + version: 7.1.1 + resolution: "@octokit/graphql@npm:7.1.1" dependencies: - "@octokit/request": "npm:^9.2.3" - "@octokit/types": "npm:^14.0.0" - universal-user-agent: "npm:^7.0.0" - checksum: 10c0/29cd5af5ed04e416d28798a11907ab861dc73c0af47f8c9c3f4183d81d2e77d88228643825538acc81e7015f78d891f84107929019a673b06a6b38ccea6a24e0 + "@octokit/request": "npm:^8.4.1" + "@octokit/types": "npm:^13.0.0" + universal-user-agent: "npm:^6.0.0" + checksum: 10c0/c27216200f3f4ce7ce2a694fb7ea43f8ea4a807fbee3a423c41ed137dd7948dfc0bbf6ea1656f029a7625c84b583acdef740a7032266d0eff55305c91c3a1ed6 + languageName: node + linkType: hard + +"@octokit/openapi-types@npm:^20.0.0": + version: 20.0.0 + resolution: "@octokit/openapi-types@npm:20.0.0" + checksum: 10c0/5176dcc3b9d182ede3d446750cfa5cf31139624785a73fcf3511e3102a802b4d7cc45e999c27ed91d73fe8b7d718c8c406facb48688926921a71fe603b7db95d languageName: node linkType: hard @@ -1388,72 +1395,75 @@ __metadata: languageName: node linkType: hard -"@octokit/openapi-types@npm:^25.0.0": - version: 25.0.0 - resolution: "@octokit/openapi-types@npm:25.0.0" - checksum: 10c0/59c9e5998e08cecec155b776c93d8f6f88ab1a812add61cc65f3de8f3744201565545eac308083d18c9fa330a4381a27bcd771a311ac0348d3590a00f333f233 +"@octokit/plugin-paginate-rest@npm:^9.0.0": + version: 9.2.2 + resolution: "@octokit/plugin-paginate-rest@npm:9.2.2" + dependencies: + "@octokit/types": "npm:^12.6.0" + peerDependencies: + "@octokit/core": 5 + checksum: 10c0/e9c85b17064fe6b62f9af88dba008f3daef456b1195340ea0831990e9c4dbabe89be950b6e5dc924ebcca18ad1aaa0cf6df7d824dc8be26ce9a55f20336ff815 languageName: node linkType: hard -"@octokit/plugin-paginate-rest@npm:^11.0.0": - version: 11.6.0 - resolution: "@octokit/plugin-paginate-rest@npm:11.6.0" +"@octokit/plugin-retry@npm:^6.0.0": + version: 6.1.0 + resolution: "@octokit/plugin-retry@npm:6.1.0" dependencies: - "@octokit/types": "npm:^13.10.0" + "@octokit/request-error": "npm:^5.0.0" + "@octokit/types": "npm:^13.0.0" + bottleneck: "npm:^2.15.3" peerDependencies: - "@octokit/core": ">=6" - checksum: 10c0/f5c8751a1cd08f972a84d0e0534d1f72c178648c64ec2b57f8d924a04b81cc616338e397fb1400c02d7ffda7b6147835cbdbae07a2673f963217d2d59768daaa + "@octokit/core": 5 + checksum: 10c0/ae8053b317ad462f649a9a1e56d3705d26a99ad0d427c8d9af7775f803cf326791a51c8b8dc5474111e582b0a2e1ecf1aad5e83a3061306fdb4cc1451a6056c5 languageName: node linkType: hard -"@octokit/plugin-retry@npm:^7.0.0": - version: 7.2.1 - resolution: "@octokit/plugin-retry@npm:7.2.1" +"@octokit/plugin-throttling@npm:^8.0.0": + version: 8.2.0 + resolution: "@octokit/plugin-throttling@npm:8.2.0" dependencies: - "@octokit/request-error": "npm:^6.1.8" - "@octokit/types": "npm:^14.0.0" + "@octokit/types": "npm:^12.2.0" bottleneck: "npm:^2.15.3" peerDependencies: - "@octokit/core": ">=6" - checksum: 10c0/0cac8aa32bfe9612cbaba36f51382c69c882ef7927e1deb4b166fe664959887e952205adbf8b9ff461e0128ac3e1bd807ca58e38041a55ddb3214397584f0406 + "@octokit/core": ^5.0.0 + checksum: 10c0/e65de9958ac5f29ba473bb969d25738f7466dad1b64e8181199c71438c06a6333ba655bd5194581a24199ca06fc9a6e752d0a4782b554ef603b0acffe9f8bfbd languageName: node linkType: hard -"@octokit/plugin-throttling@npm:^9.0.0": - version: 9.6.1 - resolution: "@octokit/plugin-throttling@npm:9.6.1" +"@octokit/request-error@npm:^5.0.0, @octokit/request-error@npm:^5.1.1": + version: 5.1.1 + resolution: "@octokit/request-error@npm:5.1.1" dependencies: - "@octokit/types": "npm:^13.7.0" - bottleneck: "npm:^2.15.3" - peerDependencies: - "@octokit/core": ^6.1.3 - checksum: 10c0/f1e533a06891d555eb81327473873c683eb15ba9b9dd73c7aa1fc3f3cec54925bbef55f67b1473fefcda58ec26b2174f1cd50eff4004e7681a41e7cb5b34644c + "@octokit/types": "npm:^13.1.0" + deprecation: "npm:^2.0.0" + once: "npm:^1.4.0" + checksum: 10c0/dc9fc76ea5e4199273e4665ce9ddf345fe8f25578d9999c9a16f276298e61ee6fe0e6f5a6147b91ba3b34fdf5b9e6b7af6ae13d6333175e95b30c574088f7a2d languageName: node linkType: hard -"@octokit/request-error@npm:^6.1.8": - version: 6.1.8 - resolution: "@octokit/request-error@npm:6.1.8" +"@octokit/request@npm:^8.4.1": + version: 8.4.1 + resolution: "@octokit/request@npm:8.4.1" dependencies: - "@octokit/types": "npm:^14.0.0" - checksum: 10c0/02aa5bfebb5b1b9e152558b4a6f4f7dcb149b41538778ffe0fce3395fd0da5c0862311a78e94723435667581b2a58a7cefa458cf7aa19ae2948ae419276f7ee1 + "@octokit/endpoint": "npm:^9.0.6" + "@octokit/request-error": "npm:^5.1.1" + "@octokit/types": "npm:^13.1.0" + universal-user-agent: "npm:^6.0.0" + checksum: 10c0/1a69dcb7336de708a296db9e9a58040e5b284a87495a63112f80eb0007da3fc96a9fadecb9e875fc63cf179c23a0f81031fbef2a6f610a219e45805ead03fcf3 languageName: node linkType: hard -"@octokit/request@npm:^9.2.3": - version: 9.2.3 - resolution: "@octokit/request@npm:9.2.3" +"@octokit/types@npm:^12.2.0, @octokit/types@npm:^12.6.0": + version: 12.6.0 + resolution: "@octokit/types@npm:12.6.0" dependencies: - "@octokit/endpoint": "npm:^10.1.4" - "@octokit/request-error": "npm:^6.1.8" - "@octokit/types": "npm:^14.0.0" - fast-content-type-parse: "npm:^2.0.0" - universal-user-agent: "npm:^7.0.2" - checksum: 10c0/96067fc9a5f30f2faa00f08015309930561c3ea0536b543e1c91c475f965eabc81c48fc27d401681ebdb3f6c1acc5d46eaa69163ab98b0faa08be1c02ea5b684 + "@octokit/openapi-types": "npm:^20.0.0" + checksum: 10c0/0bea58bda46c93287f5a80a0e52bc60e7dc7136b8a38c3569d63d073fb9df4a56acdb9d9bdba9978f37c374a4a6e3e52886ef5b08cace048adb0012cacef942c languageName: node linkType: hard -"@octokit/types@npm:^13.10.0, @octokit/types@npm:^13.7.0": +"@octokit/types@npm:^13.0.0, @octokit/types@npm:^13.1.0": version: 13.10.0 resolution: "@octokit/types@npm:13.10.0" dependencies: @@ -1462,15 +1472,6 @@ __metadata: languageName: node linkType: hard -"@octokit/types@npm:^14.0.0": - version: 14.0.0 - resolution: "@octokit/types@npm:14.0.0" - dependencies: - "@octokit/openapi-types": "npm:^25.0.0" - checksum: 10c0/c82da635fe99f265dbef7bf954d45a23ca7ce9c6fc9a8478c247b5435799e5d0eab3ff42f085785ee0882b2de293cab0ab831b379c66f41d00b78412df850ba4 - languageName: node - linkType: hard - "@paulmillr/qr@npm:^0.2.1": version: 0.2.1 resolution: "@paulmillr/qr@npm:0.2.1" @@ -2323,13 +2324,6 @@ __metadata: languageName: node linkType: hard -"@sec-ant/readable-stream@npm:^0.4.1": - version: 0.4.1 - resolution: "@sec-ant/readable-stream@npm:0.4.1" - checksum: 10c0/64e9e9cf161e848067a5bf60cdc04d18495dc28bb63a8d9f8993e4dd99b91ad34e4b563c85de17d91ffb177ec17a0664991d2e115f6543e73236a906068987af - languageName: node - linkType: hard - "@semantic-release/changelog@npm:^6.0.3": version: 6.0.3 resolution: "@semantic-release/changelog@npm:6.0.3" @@ -2344,21 +2338,20 @@ __metadata: languageName: node linkType: hard -"@semantic-release/commit-analyzer@npm:^13.0.0-beta.1": - version: 13.0.1 - resolution: "@semantic-release/commit-analyzer@npm:13.0.1" +"@semantic-release/commit-analyzer@npm:^11.0.0": + version: 11.1.0 + resolution: "@semantic-release/commit-analyzer@npm:11.1.0" dependencies: - conventional-changelog-angular: "npm:^8.0.0" - conventional-changelog-writer: "npm:^8.0.0" - conventional-commits-filter: "npm:^5.0.0" - conventional-commits-parser: "npm:^6.0.0" + conventional-changelog-angular: "npm:^7.0.0" + conventional-commits-filter: "npm:^4.0.0" + conventional-commits-parser: "npm:^5.0.0" debug: "npm:^4.0.0" - import-from-esm: "npm:^2.0.0" + import-from-esm: "npm:^1.0.3" lodash-es: "npm:^4.17.21" micromatch: "npm:^4.0.2" peerDependencies: semantic-release: ">=20.1.0" - checksum: 10c0/5b8f2a083c1de71b19ee795e45bfa07da08a047a62062df7128fb8a1b885c8137ad8502e75b7f788b7cdb631ac3f4da7a9c4f66b7c622065e4d20a292e4c08ab + checksum: 10c0/f39dd42a69ee2afd13b690489c5d266802041e47b09e36ca7534bb1a4a0069295d51c43f2a180a36369ff9b38c31ef9a4d6ca39c823768279761304f0f5dd7e3 languageName: node linkType: hard @@ -2376,19 +2369,19 @@ __metadata: languageName: node linkType: hard -"@semantic-release/exec@npm:^7.0.3": - version: 7.0.3 - resolution: "@semantic-release/exec@npm:7.0.3" +"@semantic-release/exec@npm:6": + version: 6.0.3 + resolution: "@semantic-release/exec@npm:6.0.3" dependencies: - "@semantic-release/error": "npm:^4.0.0" + "@semantic-release/error": "npm:^3.0.0" aggregate-error: "npm:^3.0.0" debug: "npm:^4.0.0" - execa: "npm:^9.0.0" - lodash-es: "npm:^4.17.21" - parse-json: "npm:^8.0.0" + execa: "npm:^5.0.0" + lodash: "npm:^4.17.4" + parse-json: "npm:^5.0.0" peerDependencies: - semantic-release: ">=24.1.0" - checksum: 10c0/99d2dbed9b9b4427553f746c2b7fafc1f6fdd6cafb1e29a159d666a2b58879fb1cf1ce3d21ad14155ec36a7bdf65d2999ca496b7f1d6a15261e6b82fbc4b1da8 + semantic-release: ">=18.0.0" + checksum: 10c0/87c1f5dcd96e8b51cfa084ff2fd570fa1e2b6368064fba54403797636279e1159b62c199b3e8219d31189acfe8aa6f1b596f6cda6508fd3e1a7e5739c86a1a65 languageName: node linkType: hard @@ -2410,14 +2403,14 @@ __metadata: languageName: node linkType: hard -"@semantic-release/github@npm:^11.0.0": - version: 11.0.1 - resolution: "@semantic-release/github@npm:11.0.1" +"@semantic-release/github@npm:^9.0.0": + version: 9.2.6 + resolution: "@semantic-release/github@npm:9.2.6" dependencies: - "@octokit/core": "npm:^6.0.0" - "@octokit/plugin-paginate-rest": "npm:^11.0.0" - "@octokit/plugin-retry": "npm:^7.0.0" - "@octokit/plugin-throttling": "npm:^9.0.0" + "@octokit/core": "npm:^5.0.0" + "@octokit/plugin-paginate-rest": "npm:^9.0.0" + "@octokit/plugin-retry": "npm:^6.0.0" + "@octokit/plugin-throttling": "npm:^8.0.0" "@semantic-release/error": "npm:^4.0.0" aggregate-error: "npm:^5.0.0" debug: "npm:^4.3.4" @@ -2425,24 +2418,24 @@ __metadata: globby: "npm:^14.0.0" http-proxy-agent: "npm:^7.0.0" https-proxy-agent: "npm:^7.0.0" - issue-parser: "npm:^7.0.0" + issue-parser: "npm:^6.0.0" lodash-es: "npm:^4.17.21" mime: "npm:^4.0.0" p-filter: "npm:^4.0.0" url-join: "npm:^5.0.0" peerDependencies: - semantic-release: ">=24.1.0" - checksum: 10c0/6bcac6f20e6326ddae5085bee1963b5d3fc6571b163e8d31d0485260e51472d2d1a695b6bc4042dcaa1de45c81d0d0c2f82d6cb614abe78af0a6374ef891f76b + semantic-release: ">=20.1.0" + checksum: 10c0/1fd4777d70139c4bf05b59c8585f42df0900f1d257ca532992b317e3876df0855443b65edd9eb8cb9f08affad8a08503c7e616a712507b8310ec5c6aa47c23f7 languageName: node linkType: hard -"@semantic-release/npm@npm:^12.0.0": - version: 12.0.1 - resolution: "@semantic-release/npm@npm:12.0.1" +"@semantic-release/npm@npm:^11.0.0": + version: 11.0.3 + resolution: "@semantic-release/npm@npm:11.0.3" dependencies: "@semantic-release/error": "npm:^4.0.0" aggregate-error: "npm:^5.0.0" - execa: "npm:^9.0.0" + execa: "npm:^8.0.0" fs-extra: "npm:^11.0.0" lodash-es: "npm:^4.17.21" nerf-dart: "npm:^1.0.0" @@ -2455,27 +2448,27 @@ __metadata: tempy: "npm:^3.0.0" peerDependencies: semantic-release: ">=20.1.0" - checksum: 10c0/816d2ed41bd7ef1191c7094ac95c3a9b5b0fc7d58808d0f55d6d8c109e548480032938bd3508295cb7c869ba66f29c3a5976b4ebfd3408f71f999d1b2c66e1a0 + checksum: 10c0/142f396de87ceb42d917b598cb7889b68e3f09b0a97736de8cf7ee48879714bb66efed10520a7a20699493c58b5523ed2925089cd5b59642b045e458101ef13c languageName: node linkType: hard -"@semantic-release/release-notes-generator@npm:^14.0.0-beta.1": - version: 14.0.3 - resolution: "@semantic-release/release-notes-generator@npm:14.0.3" +"@semantic-release/release-notes-generator@npm:^12.0.0": + version: 12.1.0 + resolution: "@semantic-release/release-notes-generator@npm:12.1.0" dependencies: - conventional-changelog-angular: "npm:^8.0.0" - conventional-changelog-writer: "npm:^8.0.0" - conventional-commits-filter: "npm:^5.0.0" - conventional-commits-parser: "npm:^6.0.0" + conventional-changelog-angular: "npm:^7.0.0" + conventional-changelog-writer: "npm:^7.0.0" + conventional-commits-filter: "npm:^4.0.0" + conventional-commits-parser: "npm:^5.0.0" debug: "npm:^4.0.0" get-stream: "npm:^7.0.0" - import-from-esm: "npm:^2.0.0" + import-from-esm: "npm:^1.0.3" into-stream: "npm:^7.0.0" lodash-es: "npm:^4.17.21" - read-package-up: "npm:^11.0.0" + read-pkg-up: "npm:^11.0.0" peerDependencies: semantic-release: ">=20.1.0" - checksum: 10c0/dfe221b8dc05e7f4e8d04c9e37accde1822d0f9e7608d83b0c67ad296cf7218c2f08b2afaf23f4b9d5fbeefb52a9e5bb7842dfb55960b4ee56c74b86cad3e201 + checksum: 10c0/29dee44ee90e6396386ac5187a1e23cd44ad64b7440348ea4e18c7440199007aa7a7d8f158cc773ea142288b2c212b666b77d57b769224e9e7cdcb2ef8978555 languageName: node linkType: hard @@ -2574,13 +2567,6 @@ __metadata: languageName: node linkType: hard -"@sindresorhus/merge-streams@npm:^4.0.0": - version: 4.0.0 - resolution: "@sindresorhus/merge-streams@npm:4.0.0" - checksum: 10c0/482ee543629aa1933b332f811a1ae805a213681ecdd98c042b1c1b89387df63e7812248bb4df3910b02b3cc5589d3d73e4393f30e197c9dde18046ccd471fc6b - languageName: node - linkType: hard - "@socket.io/component-emitter@npm:~3.1.0": version: 3.1.2 resolution: "@socket.io/component-emitter@npm:3.1.2" @@ -3917,6 +3903,18 @@ __metadata: languageName: node linkType: hard +"JSONStream@npm:^1.3.5": + version: 1.3.5 + resolution: "JSONStream@npm:1.3.5" + dependencies: + jsonparse: "npm:^1.2.0" + through: "npm:>=2.2.7 <3" + bin: + JSONStream: ./bin.js + checksum: 10c0/0f54694da32224d57b715385d4a6b668d2117379d1f3223dc758459246cca58fdc4c628b83e8a8883334e454a0a30aa198ede77c788b55537c1844f686a751f2 + languageName: node + linkType: hard + "abbrev@npm:^3.0.0": version: 3.0.1 resolution: "abbrev@npm:3.0.1" @@ -4051,12 +4049,10 @@ __metadata: languageName: node linkType: hard -"ansi-escapes@npm:^7.0.0": - version: 7.0.0 - resolution: "ansi-escapes@npm:7.0.0" - dependencies: - environment: "npm:^1.0.0" - checksum: 10c0/86e51e36fabef18c9c004af0a280573e828900641cea35134a124d2715e0c5a473494ab4ce396614505da77638ae290ff72dd8002d9747d2ee53f5d6bbe336be +"ansi-escapes@npm:^6.2.0": + version: 6.2.1 + resolution: "ansi-escapes@npm:6.2.1" + checksum: 10c0/a2c6f58b044be5f69662ee17073229b492daa2425a7fd99a665db6c22eab6e4ab42752807def7281c1c7acfed48f87f2362dda892f08c2c437f1b39c6b033103 languageName: node linkType: hard @@ -4067,7 +4063,7 @@ __metadata: languageName: node linkType: hard -"ansi-regex@npm:^6.0.1, ansi-regex@npm:^6.1.0": +"ansi-regex@npm:^6.0.1": version: 6.1.0 resolution: "ansi-regex@npm:6.1.0" checksum: 10c0/a91daeddd54746338478eef88af3439a7edf30f8e23196e2d6ed182da9add559c601266dbef01c2efa46a958ad6f1f8b176799657616c702b5b02e799e7fd8dc @@ -4106,10 +4102,10 @@ __metadata: languageName: node linkType: hard -"any-promise@npm:^1.0.0": - version: 1.3.0 - resolution: "any-promise@npm:1.3.0" - checksum: 10c0/60f0298ed34c74fef50daab88e8dab786036ed5a7fad02e012ab57e376e0a0b4b29e83b95ea9b5e7d89df762f5f25119b83e00706ecaccb22cfbacee98d74889 +"ansicolors@npm:~0.3.2": + version: 0.3.2 + resolution: "ansicolors@npm:0.3.2" + checksum: 10c0/e202182895e959c5357db6c60791b2abaade99fcc02221da11a581b26a7f83dc084392bc74e4d3875c22f37b3c9ef48842e896e3bfed394ec278194b8003e0ac languageName: node linkType: hard @@ -4441,10 +4437,10 @@ __metadata: languageName: node linkType: hard -"before-after-hook@npm:^3.0.2": - version: 3.0.2 - resolution: "before-after-hook@npm:3.0.2" - checksum: 10c0/dea640f9e88a1085372c9bcc974b7bf379267490693da92ec102a7d8b515dd1e95f00ef575a146b83ca638104c57406c3427d37bdf082f602dde4b56d05bba14 +"before-after-hook@npm:^2.2.0": + version: 2.2.3 + resolution: "before-after-hook@npm:2.2.3" + checksum: 10c0/0488c4ae12df758ca9d49b3bb27b47fd559677965c52cae7b335784724fb8bf96c42b6e5ba7d7afcbc31facb0e294c3ef717cc41c5bc2f7bd9e76f8b90acd31c languageName: node linkType: hard @@ -4745,6 +4741,18 @@ __metadata: languageName: node linkType: hard +"cardinal@npm:^2.1.1": + version: 2.1.1 + resolution: "cardinal@npm:2.1.1" + dependencies: + ansicolors: "npm:~0.3.2" + redeyed: "npm:~2.1.0" + bin: + cdl: ./bin/cdl.js + checksum: 10c0/0051d0e64c0e1dff480c1aace4c018c48ecca44030533257af3f023107ccdeb061925603af6d73710f0345b0ae0eb57e5241d181d9b5fdb595d45c5418161675 + languageName: node + linkType: hard + "catharsis@npm:^0.9.0": version: 0.9.0 resolution: "catharsis@npm:0.9.0" @@ -4830,7 +4838,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^5.3.0, chalk@npm:^5.4.1": +"chalk@npm:^5.3.0": version: 5.4.1 resolution: "chalk@npm:5.4.1" checksum: 10c0/b23e88132c702f4855ca6d25cb5538b1114343e41472d5263ee8a37cccfccd9c4216d111e1097c6a27830407a1dc81fecdf2a56f2c63033d4dbbd88c10b0dcef @@ -4960,23 +4968,7 @@ __metadata: languageName: node linkType: hard -"cli-highlight@npm:^2.1.11": - version: 2.1.11 - resolution: "cli-highlight@npm:2.1.11" - dependencies: - chalk: "npm:^4.0.0" - highlight.js: "npm:^10.7.1" - mz: "npm:^2.4.0" - parse5: "npm:^5.1.1" - parse5-htmlparser2-tree-adapter: "npm:^6.0.0" - yargs: "npm:^16.0.0" - bin: - highlight: bin/highlight - checksum: 10c0/b5b4af3b968aa9df77eee449a400fbb659cf47c4b03a395370bd98d5554a00afaa5819b41a9a8a1ca0d37b0b896a94e57c65289b37359a25b700b1f56eb04852 - languageName: node - linkType: hard - -"cli-table3@npm:^0.6.5": +"cli-table3@npm:^0.6.3": version: 0.6.5 resolution: "cli-table3@npm:0.6.5" dependencies: @@ -5234,51 +5226,49 @@ __metadata: languageName: node linkType: hard -"conventional-changelog-angular@npm:^8.0.0": - version: 8.0.0 - resolution: "conventional-changelog-angular@npm:8.0.0" +"conventional-changelog-angular@npm:^7.0.0": + version: 7.0.0 + resolution: "conventional-changelog-angular@npm:7.0.0" dependencies: compare-func: "npm:^2.0.0" - checksum: 10c0/743faceab876bb9b9656f2389830d0ccb7c5caf02a629cb495d75c65c43414274728d7059b716d0c7d66fd663f8b978f25d44657148b8bc64ece12952cbfd886 + checksum: 10c0/90e73e25e224059b02951b6703b5f8742dc2a82c1fea62163978e6735fd3ab04350897a8fc6f443ec6b672d6b66e28a0820e833e544a0101f38879e5e6289b7e languageName: node linkType: hard -"conventional-changelog-writer@npm:^8.0.0": - version: 8.0.1 - resolution: "conventional-changelog-writer@npm:8.0.1" +"conventional-changelog-writer@npm:^7.0.0": + version: 7.0.1 + resolution: "conventional-changelog-writer@npm:7.0.1" dependencies: - conventional-commits-filter: "npm:^5.0.0" + conventional-commits-filter: "npm:^4.0.0" handlebars: "npm:^4.7.7" - meow: "npm:^13.0.0" + json-stringify-safe: "npm:^5.0.1" + meow: "npm:^12.0.1" semver: "npm:^7.5.2" + split2: "npm:^4.0.0" bin: - conventional-changelog-writer: dist/cli/index.js - checksum: 10c0/2cd1904f9dc37d1b1ad336fbab3bda8da2f939776adf8acb1bc056c3f7138b925f54bc7ec6bde02a7ac142c9f7e64792eb91a04ab9a22266e286bfc90326c28a + conventional-changelog-writer: cli.mjs + checksum: 10c0/ec51708c33860777f2b85f1df588aed918cab08919146cdfac8f271e31c0caee22c5c50df78e4ce358022e58f65c8de77fd6a5fb529f4bb5ba27c2d1e072750f languageName: node linkType: hard -"conventional-commits-filter@npm:^5.0.0": - version: 5.0.0 - resolution: "conventional-commits-filter@npm:5.0.0" - checksum: 10c0/678900d6c589bbe1739929071ea0ca89c872b9f3cc6974994726eb7a197ca04243e9ea65cae39a55e41fdc20f27fdfc43060588750d828e0efab41f309a42934 +"conventional-commits-filter@npm:^4.0.0": + version: 4.0.0 + resolution: "conventional-commits-filter@npm:4.0.0" + checksum: 10c0/b26ea11ebb38218cb3cbbaf7d68b0f7c3b0eb7ad69afe9c9431d91e784acbebaeda7a095127ae5a7f8b75087d62b44e8e69d63426ff02b49f7dd504755934247 languageName: node linkType: hard -"conventional-commits-parser@npm:^6.0.0": - version: 6.1.0 - resolution: "conventional-commits-parser@npm:6.1.0" +"conventional-commits-parser@npm:^5.0.0": + version: 5.0.0 + resolution: "conventional-commits-parser@npm:5.0.0" dependencies: - meow: "npm:^13.0.0" + JSONStream: "npm:^1.3.5" + is-text-path: "npm:^2.0.0" + meow: "npm:^12.0.1" + split2: "npm:^4.0.0" bin: - conventional-commits-parser: dist/cli/index.js - checksum: 10c0/df68b04a9b52908c47b2aa7fe07c21d295998729e075ef9f949f3ca18245ea031e59c42ace730563163c99db4dc3ce9062e26d9a7234dd7403074acd74605b2e - languageName: node - linkType: hard - -"convert-hrtime@npm:^5.0.0": - version: 5.0.0 - resolution: "convert-hrtime@npm:5.0.0" - checksum: 10c0/2092e51aab205e1141440e84e2a89f8881e68e47c1f8bc168dfd7c67047d8f1db43bac28044bc05749205651fead4e7910f52c7bb6066213480df99e333e9f47 + conventional-commits-parser: cli.mjs + checksum: 10c0/c9e542f4884119a96a6bf3311ff62cdee55762d8547f4c745ae3ebdc50afe4ba7691e165e34827d5cf63283cbd93ab69917afd7922423075b123d5d9a7a82ed2 languageName: node linkType: hard @@ -5341,20 +5331,20 @@ __metadata: languageName: node linkType: hard -"cosmiconfig@npm:^9.0.0": - version: 9.0.0 - resolution: "cosmiconfig@npm:9.0.0" +"cosmiconfig@npm:^8.0.0": + version: 8.3.6 + resolution: "cosmiconfig@npm:8.3.6" dependencies: - env-paths: "npm:^2.2.1" import-fresh: "npm:^3.3.0" js-yaml: "npm:^4.1.0" parse-json: "npm:^5.2.0" + path-type: "npm:^4.0.0" peerDependencies: typescript: ">=4.9.5" peerDependenciesMeta: typescript: optional: true - checksum: 10c0/1c1703be4f02a250b1d6ca3267e408ce16abfe8364193891afc94c2d5c060b69611fdc8d97af74b7e6d5d1aac0ab2fb94d6b079573146bc2d756c2484ce5f0ee + checksum: 10c0/0382a9ed13208f8bfc22ca2f62b364855207dffdb73dc26e150ade78c3093f1cf56172df2dd460c8caf2afa91c0ed4ec8a88c62f8f9cd1cf423d26506aa8797a languageName: node linkType: hard @@ -5692,6 +5682,13 @@ __metadata: languageName: node linkType: hard +"deprecation@npm:^2.0.0": + version: 2.3.1 + resolution: "deprecation@npm:2.3.1" + checksum: 10c0/23d688ba66b74d09b908c40a76179418acbeeb0bfdf218c8075c58ad8d0c315130cb91aa3dffb623aa3a411a3569ce56c6460de6c8d69071c17fe6dd2442f032 + languageName: node + linkType: hard + "destr@npm:^2.0.3": version: 2.0.5 resolution: "destr@npm:2.0.5" @@ -5992,30 +5989,23 @@ __metadata: languageName: node linkType: hard -"env-ci@npm:^11.0.0": - version: 11.1.0 - resolution: "env-ci@npm:11.1.0" +"env-ci@npm:^10.0.0": + version: 10.0.0 + resolution: "env-ci@npm:10.0.0" dependencies: execa: "npm:^8.0.0" java-properties: "npm:^1.0.2" - checksum: 10c0/14f0a597c1fe9ab5585532c01759db62f4c553277b33137d33cb71cdd621833184f182dc67408750973c9f884f5a0d5103fad4f873aabd9e6c4baf65f88bc22a + checksum: 10c0/cce92181b8cf269070c4be447784b806f0c9d380469c8c1ee97bbaebe9dd7b2e3a45377ae51b0ac00c732175378ddfb390de50fe44ae6a797415b137ae22522d languageName: node linkType: hard -"env-paths@npm:^2.2.0, env-paths@npm:^2.2.1": +"env-paths@npm:^2.2.0": version: 2.2.1 resolution: "env-paths@npm:2.2.1" checksum: 10c0/285325677bf00e30845e330eec32894f5105529db97496ee3f598478e50f008c5352a41a30e5e72ec9de8a542b5a570b85699cd63bd2bc646dbcb9f311d83bc4 languageName: node linkType: hard -"environment@npm:^1.0.0": - version: 1.1.0 - resolution: "environment@npm:1.1.0" - checksum: 10c0/fb26434b0b581ab397039e51ff3c92b34924a98b2039dcb47e41b7bca577b9dbf134a8eadb364415c74464b682e2d3afe1a4c0eb9873dc44ea814c5d3103331d - languageName: node - linkType: hard - "err-code@npm:^2.0.2": version: 2.0.3 resolution: "err-code@npm:2.0.3" @@ -6513,7 +6503,7 @@ __metadata: languageName: node linkType: hard -"esprima@npm:^4.0.1": +"esprima@npm:^4.0.1, esprima@npm:~4.0.0": version: 4.0.1 resolution: "esprima@npm:4.0.1" bin: @@ -6731,26 +6721,6 @@ __metadata: languageName: node linkType: hard -"execa@npm:^9.0.0": - version: 9.5.2 - resolution: "execa@npm:9.5.2" - dependencies: - "@sindresorhus/merge-streams": "npm:^4.0.0" - cross-spawn: "npm:^7.0.3" - figures: "npm:^6.1.0" - get-stream: "npm:^9.0.0" - human-signals: "npm:^8.0.0" - is-plain-obj: "npm:^4.1.0" - is-stream: "npm:^4.0.1" - npm-run-path: "npm:^6.0.0" - pretty-ms: "npm:^9.0.0" - signal-exit: "npm:^4.1.0" - strip-final-newline: "npm:^4.0.0" - yoctocolors: "npm:^2.0.0" - checksum: 10c0/94782a6282e03253224406c29068d18f9095cc251a45d1f19ac3d8f2a9db2cbe32fb8ceb039db1451d8fce3531135a6c0c559f76d634f85416268fc4a6995365 - languageName: node - linkType: hard - "exponential-backoff@npm:^3.1.1": version: 3.1.2 resolution: "exponential-backoff@npm:3.1.2" @@ -6824,13 +6794,6 @@ __metadata: languageName: node linkType: hard -"fast-content-type-parse@npm:^2.0.0": - version: 2.0.1 - resolution: "fast-content-type-parse@npm:2.0.1" - checksum: 10c0/e5ff87d75a35ae4cf377df1dca46ec49e7abbdc8513689676ecdef548b94900b50e66e516e64470035d79b9f7010ef15d98c24d8ae803a881363cc59e0715e19 - languageName: node - linkType: hard - "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3": version: 3.1.3 resolution: "fast-deep-equal@npm:3.1.3" @@ -6947,7 +6910,7 @@ __metadata: languageName: node linkType: hard -"figures@npm:^6.0.0, figures@npm:^6.1.0": +"figures@npm:^6.0.0": version: 6.1.0 resolution: "figures@npm:6.1.0" dependencies: @@ -7048,13 +7011,12 @@ __metadata: languageName: node linkType: hard -"find-versions@npm:^6.0.0": - version: 6.0.0 - resolution: "find-versions@npm:6.0.0" +"find-versions@npm:^5.1.0": + version: 5.1.0 + resolution: "find-versions@npm:5.1.0" dependencies: semver-regex: "npm:^4.0.5" - super-regex: "npm:^1.0.0" - checksum: 10c0/1e38da3058f389c8657cd6f47fbcf12412051e7d2d14017594b8ca54ec239d19058f2d9dde80f27415726ab62822e32e3ed0a81141cfc206a3b8c8f0d87a5732 + checksum: 10c0/f1ef79d0850e0bd1eba03def02892d31feccdef75129c14b2a2d1cec563e2c51ad5a01f6a7a2d59ddbf9ecca1014ff8a6353ff2e2885e004f7a81ab1488899d4 languageName: node linkType: hard @@ -7271,13 +7233,6 @@ __metadata: languageName: node linkType: hard -"function-timeout@npm:^1.0.1": - version: 1.0.2 - resolution: "function-timeout@npm:1.0.2" - checksum: 10c0/75d7ac6c83c450b84face2c9d22307b00e10c7376aa3a34c7be260853582c5e4c502904e2f6bf1d4500c4052e748e001388f6bbd9d34ebfdfb6c4fec2169d0ff - languageName: node - linkType: hard - "function.prototype.name@npm:^1.1.6, function.prototype.name@npm:^1.1.8": version: 1.1.8 resolution: "function.prototype.name@npm:1.1.8" @@ -7464,16 +7419,6 @@ __metadata: languageName: node linkType: hard -"get-stream@npm:^9.0.0": - version: 9.0.1 - resolution: "get-stream@npm:9.0.1" - dependencies: - "@sec-ant/readable-stream": "npm:^0.4.1" - is-stream: "npm:^4.0.1" - checksum: 10c0/d70e73857f2eea1826ac570c3a912757dcfbe8a718a033fa0c23e12ac8e7d633195b01710e0559af574cbb5af101009b42df7b6f6b29ceec8dbdf7291931b948 - languageName: node - linkType: hard - "get-symbol-description@npm:^1.1.0": version: 1.1.0 resolution: "get-symbol-description@npm:1.1.0" @@ -7820,13 +7765,6 @@ __metadata: languageName: node linkType: hard -"highlight.js@npm:^10.7.1": - version: 10.7.3 - resolution: "highlight.js@npm:10.7.3" - checksum: 10c0/073837eaf816922427a9005c56c42ad8786473dc042332dfe7901aa065e92bc3d94ebf704975257526482066abb2c8677cc0326559bb8621e046c21c5991c434 - languageName: node - linkType: hard - "hook-std@npm:^3.0.0": version: 3.0.0 resolution: "hook-std@npm:3.0.0" @@ -7955,13 +7893,6 @@ __metadata: languageName: node linkType: hard -"human-signals@npm:^8.0.0": - version: 8.0.1 - resolution: "human-signals@npm:8.0.1" - checksum: 10c0/195ac607108c56253757717242e17cd2e21b29f06c5d2dad362e86c672bf2d096e8a3bbb2601841c376c2301c4ae7cff129e87f740aa4ebff1390c163114c7c4 - languageName: node - linkType: hard - "husky@npm:^8.0.3": version: 8.0.3 resolution: "husky@npm:8.0.3" @@ -8050,13 +7981,13 @@ __metadata: languageName: node linkType: hard -"import-from-esm@npm:^2.0.0": - version: 2.0.0 - resolution: "import-from-esm@npm:2.0.0" +"import-from-esm@npm:^1.0.3, import-from-esm@npm:^1.3.1": + version: 1.3.4 + resolution: "import-from-esm@npm:1.3.4" dependencies: debug: "npm:^4.3.4" import-meta-resolve: "npm:^4.0.0" - checksum: 10c0/6ee85521a1b540927c50f9f16c4f1fc25fa0383c16740483b5ba838d8deea8f5e7a30b6a9f6dff28292589317e679a07da8fa63890a0fd2e549a51e9d28a66fd + checksum: 10c0/fcd42ead421892e1d9dbc90e510f45c7d3b58887c35077cf2318e4aa39b52c07c06e2b54efd16dfe8e712421439c23794d18a5e8956cca237fc90790ed8e2241 languageName: node linkType: hard @@ -8460,13 +8391,6 @@ __metadata: languageName: node linkType: hard -"is-plain-obj@npm:^4.1.0": - version: 4.1.0 - resolution: "is-plain-obj@npm:4.1.0" - checksum: 10c0/32130d651d71d9564dc88ba7e6fda0e91a1010a3694648e9f4f47bb6080438140696d3e3e15c741411d712e47ac9edc1a8a9de1fe76f3487b0d90be06ac9975e - languageName: node - linkType: hard - "is-regex@npm:^1.2.1": version: 1.2.1 resolution: "is-regex@npm:1.2.1" @@ -8516,13 +8440,6 @@ __metadata: languageName: node linkType: hard -"is-stream@npm:^4.0.1": - version: 4.0.1 - resolution: "is-stream@npm:4.0.1" - checksum: 10c0/2706c7f19b851327ba374687bc4a3940805e14ca496dc672b9629e744d143b1ad9c6f1b162dece81c7bfbc0f83b32b61ccc19ad2e05aad2dd7af347408f60c7f - languageName: node - linkType: hard - "is-string@npm:^1.0.7, is-string@npm:^1.1.1": version: 1.1.1 resolution: "is-string@npm:1.1.1" @@ -8544,6 +8461,15 @@ __metadata: languageName: node linkType: hard +"is-text-path@npm:^2.0.0": + version: 2.0.0 + resolution: "is-text-path@npm:2.0.0" + dependencies: + text-extensions: "npm:^2.0.0" + checksum: 10c0/e3c470e1262a3a54aa0fca1c0300b2659a7aed155714be6b643f88822c03bcfa6659b491f7a05c5acd3c1a3d6d42bab47e1bdd35bcc3a25973c4f26b2928bc1a + languageName: node + linkType: hard + "is-typed-array@npm:^1.1.13, is-typed-array@npm:^1.1.14, is-typed-array@npm:^1.1.15, is-typed-array@npm:^1.1.3": version: 1.1.15 resolution: "is-typed-array@npm:1.1.15" @@ -8623,16 +8549,16 @@ __metadata: languageName: node linkType: hard -"issue-parser@npm:^7.0.0": - version: 7.0.1 - resolution: "issue-parser@npm:7.0.1" +"issue-parser@npm:^6.0.0": + version: 6.0.0 + resolution: "issue-parser@npm:6.0.0" dependencies: lodash.capitalize: "npm:^4.2.1" lodash.escaperegexp: "npm:^4.1.2" lodash.isplainobject: "npm:^4.0.6" lodash.isstring: "npm:^4.0.1" lodash.uniqby: "npm:^4.7.0" - checksum: 10c0/1b2dad16081ae423bb96143132701e89aa8f6345ab0a10f692594ddf5699b514adccaaaf24d7c59afc977c447895bdee15fff2dfc9d6015e177f6966b06f5dcb + checksum: 10c0/3bfc48ca5c380061ba3db9bfb0c2a86692c74245a386d8add5eb7cd60022c85f44277692d78914ff0d37cf0da7d1743149516d00175233949c85c056d12e3b49 languageName: node linkType: hard @@ -8878,7 +8804,7 @@ __metadata: languageName: node linkType: hard -"jsonparse@npm:^1.3.1": +"jsonparse@npm:^1.2.0, jsonparse@npm:^1.3.1": version: 1.3.1 resolution: "jsonparse@npm:1.3.1" checksum: 10c0/89bc68080cd0a0e276d4b5ab1b79cacd68f562467008d176dc23e16e97d4efec9e21741d92ba5087a8433526a45a7e6a9d5ef25408696c402ca1cfbc01a90bf0 @@ -9522,38 +9448,37 @@ __metadata: languageName: node linkType: hard -"marked-terminal@npm:^7.0.0": - version: 7.3.0 - resolution: "marked-terminal@npm:7.3.0" +"marked-terminal@npm:^6.0.0": + version: 6.2.0 + resolution: "marked-terminal@npm:6.2.0" dependencies: - ansi-escapes: "npm:^7.0.0" - ansi-regex: "npm:^6.1.0" - chalk: "npm:^5.4.1" - cli-highlight: "npm:^2.1.11" - cli-table3: "npm:^0.6.5" - node-emoji: "npm:^2.2.0" - supports-hyperlinks: "npm:^3.1.0" + ansi-escapes: "npm:^6.2.0" + cardinal: "npm:^2.1.1" + chalk: "npm:^5.3.0" + cli-table3: "npm:^0.6.3" + node-emoji: "npm:^2.1.3" + supports-hyperlinks: "npm:^3.0.0" peerDependencies: - marked: ">=1 <16" - checksum: 10c0/59d23c2ed9488c40856d828f431ae1d5d57426e791bbce8f05ec5a7d3a1f848cdb3b8d8880d76ae45570415f8b48ae459f50bbbd88ece5a31306f1e3de57f021 + marked: ">=1 <12" + checksum: 10c0/72d4093cbb1ee864ced1f88fdb6fb8dbfea56d6aa3d8a1ec401ac51866ff3c32382c3f4642b19f2d808c798efde23b10300b99e3b6475b3f79e41e7741581d54 languageName: node linkType: hard -"marked@npm:^12.0.0": - version: 12.0.2 - resolution: "marked@npm:12.0.2" +"marked@npm:^4.0.10": + version: 4.3.0 + resolution: "marked@npm:4.3.0" bin: marked: bin/marked.js - checksum: 10c0/45ae2e1e3f06b30a5b5f64efc6cde9830c81d1d024fd7668772a3217f1bc0f326e66a6b8970482d9783edf1f581fecac7023a7fa160f2c14dbcc16e064b4eafb + checksum: 10c0/0013463855e31b9c88d8bb2891a611d10ef1dc79f2e3cbff1bf71ba389e04c5971298c886af0be799d7fa9aa4593b086a136062d59f1210b0480b026a8c5dc47 languageName: node linkType: hard -"marked@npm:^4.0.10": - version: 4.3.0 - resolution: "marked@npm:4.3.0" +"marked@npm:^9.0.0": + version: 9.1.6 + resolution: "marked@npm:9.1.6" bin: marked: bin/marked.js - checksum: 10c0/0013463855e31b9c88d8bb2891a611d10ef1dc79f2e3cbff1bf71ba389e04c5971298c886af0be799d7fa9aa4593b086a136062d59f1210b0480b026a8c5dc47 + checksum: 10c0/010bbd33c0f38300259c5d3bf0063deb36bab098d37ac0a3be5a35a65674a4c693427fc6704f486a89f638e9b36c36b8e220a93d47163f4e70e45a1fa8ca7b60 languageName: node linkType: hard @@ -9578,10 +9503,10 @@ __metadata: languageName: node linkType: hard -"meow@npm:^13.0.0": - version: 13.2.0 - resolution: "meow@npm:13.2.0" - checksum: 10c0/d5b339ae314715bcd0b619dd2f8a266891928e21526b4800d49b4fba1cc3fff7e2c1ff5edd3344149fac841bc2306157f858e8c4d5eaee4d52ce52ad925664ce +"meow@npm:^12.0.1": + version: 12.1.1 + resolution: "meow@npm:12.1.1" + checksum: 10c0/a125ca99a32e2306e2f4cbe651a0d27f6eb67918d43a075f6e80b35e9bf372ebf0fc3a9fbc201cbbc9516444b6265fb3c9f80c5b7ebd32f548aa93eb7c28e088 languageName: node linkType: hard @@ -9943,17 +9868,6 @@ __metadata: languageName: node linkType: hard -"mz@npm:^2.4.0": - version: 2.7.0 - resolution: "mz@npm:2.7.0" - dependencies: - any-promise: "npm:^1.0.0" - object-assign: "npm:^4.0.1" - thenify-all: "npm:^1.0.0" - checksum: 10c0/103114e93f87362f0b56ab5b2e7245051ad0276b646e3902c98397d18bb8f4a77f2ea4a2c9d3ad516034ea3a56553b60d3f5f78220001ca4c404bd711bd0af39 - languageName: node - linkType: hard - "nan@npm:^2.19.0, nan@npm:^2.20.0": version: 2.22.2 resolution: "nan@npm:2.22.2" @@ -10041,7 +9955,7 @@ __metadata: languageName: node linkType: hard -"node-emoji@npm:^2.2.0": +"node-emoji@npm:^2.1.3": version: 2.2.0 resolution: "node-emoji@npm:2.2.0" dependencies: @@ -10318,16 +10232,6 @@ __metadata: languageName: node linkType: hard -"npm-run-path@npm:^6.0.0": - version: 6.0.0 - resolution: "npm-run-path@npm:6.0.0" - dependencies: - path-key: "npm:^4.0.0" - unicorn-magic: "npm:^0.3.0" - checksum: 10c0/b223c8a0dcd608abf95363ea5c3c0ccc3cd877daf0102eaf1b0f2390d6858d8337fbb7c443af2403b067a7d2c116d10691ecd22ab3c5273c44da1ff8d07753bd - languageName: node - linkType: hard - "npm-user-validate@npm:^3.0.0": version: 3.0.0 resolution: "npm-user-validate@npm:3.0.0" @@ -10425,7 +10329,7 @@ __metadata: languageName: node linkType: hard -"object-assign@npm:^4, object-assign@npm:^4.0.1": +"object-assign@npm:^4": version: 4.1.1 resolution: "object-assign@npm:4.1.1" checksum: 10c0/1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414 @@ -10904,36 +10808,6 @@ __metadata: languageName: node linkType: hard -"parse-ms@npm:^4.0.0": - version: 4.0.0 - resolution: "parse-ms@npm:4.0.0" - checksum: 10c0/a7900f4f1ebac24cbf5e9708c16fb2fd482517fad353aecd7aefb8c2ba2f85ce017913ccb8925d231770404780df46244ea6fec598b3bde6490882358b4d2d16 - languageName: node - linkType: hard - -"parse5-htmlparser2-tree-adapter@npm:^6.0.0": - version: 6.0.1 - resolution: "parse5-htmlparser2-tree-adapter@npm:6.0.1" - dependencies: - parse5: "npm:^6.0.1" - checksum: 10c0/dfa5960e2aaf125707e19a4b1bc333de49232eba5a6ffffb95d313a7d6087c3b7a274b58bee8d3bd41bdf150638815d1d601a42bbf2a0345208c3c35b1279556 - languageName: node - linkType: hard - -"parse5@npm:^5.1.1": - version: 5.1.1 - resolution: "parse5@npm:5.1.1" - checksum: 10c0/b0f87a77a7fea5f242e3d76917c983bbea47703b9371801d51536b78942db6441cbda174bf84eb30e47315ddc6f8a0b57d68e562c790154430270acd76c1fa03 - languageName: node - linkType: hard - -"parse5@npm:^6.0.1": - version: 6.0.1 - resolution: "parse5@npm:6.0.1" - checksum: 10c0/595821edc094ecbcfb9ddcb46a3e1fe3a718540f8320eff08b8cf6742a5114cce2d46d45f95c26191c11b184dcaf4e2960abcd9c5ed9eb9393ac9a37efcfdecb - languageName: node - linkType: hard - "parseurl@npm:~1.3.3": version: 1.3.3 resolution: "parseurl@npm:1.3.3" @@ -11246,15 +11120,6 @@ __metadata: languageName: node linkType: hard -"pretty-ms@npm:^9.0.0": - version: 9.2.0 - resolution: "pretty-ms@npm:9.2.0" - dependencies: - parse-ms: "npm:^4.0.0" - checksum: 10c0/ab6d066f90e9f77020426986e1b018369f41575674544c539aabec2e63a20fec01166d8cf6571d0e165ad11cfe5a8134a2a48a36d42ab291c59c6deca5264cbb - languageName: node - linkType: hard - "pretty-quick@npm:^3.1.3": version: 3.3.1 resolution: "pretty-quick@npm:3.3.1" @@ -11666,14 +11531,14 @@ __metadata: languageName: node linkType: hard -"read-package-up@npm:^11.0.0": +"read-pkg-up@npm:^11.0.0": version: 11.0.0 - resolution: "read-package-up@npm:11.0.0" + resolution: "read-pkg-up@npm:11.0.0" dependencies: find-up-simple: "npm:^1.0.0" read-pkg: "npm:^9.0.0" type-fest: "npm:^4.6.0" - checksum: 10c0/ffee09613c2b3c3ff7e7b5e838aa01f33cba5c6dfa14f87bf6f64ed27e32678e5550e712fd7e3f3105a05c43aa774d084af04ee86d3044978edb69f30ee4505a + checksum: 10c0/9dfe7b1088d22804e275c235e21d64acdfb81edb73373c9ef2707aae2db8309fd35f6de90f569f0159411c25972c5a321ae6cb6a54ec01e449ce9df0a0b2397a languageName: node linkType: hard @@ -11791,6 +11656,15 @@ __metadata: languageName: node linkType: hard +"redeyed@npm:~2.1.0": + version: 2.1.1 + resolution: "redeyed@npm:2.1.1" + dependencies: + esprima: "npm:~4.0.0" + checksum: 10c0/350f5e39aebab3886713a170235c38155ee64a74f0f7e629ecc0144ba33905efea30c2c3befe1fcbf0b0366e344e7bfa34e6b2502b423c9a467d32f1306ef166 + languageName: node + linkType: hard + "redis-commands@npm:^1.7.0": version: 1.7.0 resolution: "redis-commands@npm:1.7.0" @@ -12143,7 +12017,7 @@ __metadata: languageName: node linkType: hard -"semantic-release-monorepo@npm:^8.0.2": +"semantic-release-monorepo@npm:8.0.2": version: 8.0.2 resolution: "semantic-release-monorepo@npm:8.0.2" dependencies: @@ -12175,34 +12049,34 @@ __metadata: languageName: node linkType: hard -"semantic-release@npm:^24.2.3": - version: 24.2.3 - resolution: "semantic-release@npm:24.2.3" +"semantic-release@npm:22.0.12": + version: 22.0.12 + resolution: "semantic-release@npm:22.0.12" dependencies: - "@semantic-release/commit-analyzer": "npm:^13.0.0-beta.1" + "@semantic-release/commit-analyzer": "npm:^11.0.0" "@semantic-release/error": "npm:^4.0.0" - "@semantic-release/github": "npm:^11.0.0" - "@semantic-release/npm": "npm:^12.0.0" - "@semantic-release/release-notes-generator": "npm:^14.0.0-beta.1" + "@semantic-release/github": "npm:^9.0.0" + "@semantic-release/npm": "npm:^11.0.0" + "@semantic-release/release-notes-generator": "npm:^12.0.0" aggregate-error: "npm:^5.0.0" - cosmiconfig: "npm:^9.0.0" + cosmiconfig: "npm:^8.0.0" debug: "npm:^4.0.0" - env-ci: "npm:^11.0.0" - execa: "npm:^9.0.0" + env-ci: "npm:^10.0.0" + execa: "npm:^8.0.0" figures: "npm:^6.0.0" - find-versions: "npm:^6.0.0" + find-versions: "npm:^5.1.0" get-stream: "npm:^6.0.0" git-log-parser: "npm:^1.2.0" hook-std: "npm:^3.0.0" - hosted-git-info: "npm:^8.0.0" - import-from-esm: "npm:^2.0.0" + hosted-git-info: "npm:^7.0.0" + import-from-esm: "npm:^1.3.1" lodash-es: "npm:^4.17.21" - marked: "npm:^12.0.0" - marked-terminal: "npm:^7.0.0" + marked: "npm:^9.0.0" + marked-terminal: "npm:^6.0.0" micromatch: "npm:^4.0.2" p-each-series: "npm:^3.0.0" p-reduce: "npm:^3.0.0" - read-package-up: "npm:^11.0.0" + read-pkg-up: "npm:^11.0.0" resolve-from: "npm:^5.0.0" semver: "npm:^7.3.2" semver-diff: "npm:^4.0.0" @@ -12210,7 +12084,7 @@ __metadata: yargs: "npm:^17.5.1" bin: semantic-release: bin/semantic-release.js - checksum: 10c0/75c6657429bbd31c60e2a4982a9081de0d840dce7d0910b5f93e45bf717c921847d1cbc1f1c9e40a10ae20b6b8a61e9fc6d837623832f113c05468eb15ebb8f8 + checksum: 10c0/13e86ab9e16e32fd51b09f486ec5ea950bb541c5ea3cd4e66b0527d2a7108cfd3488510d5f29cefc83c86d279e6d5075f886bad8478c88a74cc7d5942e936722 languageName: node linkType: hard @@ -12808,7 +12682,7 @@ __metadata: "@polkadot/util": "npm:^12.3.2" "@polkadot/util-crypto": "npm:^12.3.2" "@semantic-release/changelog": "npm:^6.0.3" - "@semantic-release/exec": "npm:^7.0.3" + "@semantic-release/exec": "npm:6" "@semantic-release/git": "npm:^10.0.1" "@types/async": "npm:3.2.15" "@types/big.js": "npm:^6.1.6" @@ -12869,8 +12743,8 @@ __metadata: redlock: "npm:^5.0.0-beta.2" rimraf: "npm:^3.0.2" sass: "npm:1.55.0" - semantic-release: "npm:^24.2.3" - semantic-release-monorepo: "npm:^8.0.2" + semantic-release: "npm:22.0.12" + semantic-release-monorepo: "npm:8.0.2" shelljs: "npm:^0.8.5" source-map-support: "npm:^0.5.21" supertest: "npm:^6.3.3" @@ -13061,13 +12935,6 @@ __metadata: languageName: node linkType: hard -"strip-final-newline@npm:^4.0.0": - version: 4.0.0 - resolution: "strip-final-newline@npm:4.0.0" - checksum: 10c0/b0cf2b62d597a1b0e3ebc42b88767f0a0d45601f89fd379a928a1812c8779440c81abba708082c946445af1d6b62d5f16e2a7cf4f30d9d6587b89425fae801ff - languageName: node - linkType: hard - "strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1": version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" @@ -13098,16 +12965,6 @@ __metadata: languageName: node linkType: hard -"super-regex@npm:^1.0.0": - version: 1.0.0 - resolution: "super-regex@npm:1.0.0" - dependencies: - function-timeout: "npm:^1.0.1" - time-span: "npm:^5.1.0" - checksum: 10c0/9727b57702308af74be90ed92d4612eed6c8b03fdf25efe1a3455e40d7145246516638bcabf3538e9e9c706d8ecb233e4888e0223283543fb2836d4d7acb6200 - languageName: node - linkType: hard - "superagent@npm:^8.0.9, superagent@npm:^8.1.2": version: 8.1.2 resolution: "superagent@npm:8.1.2" @@ -13177,7 +13034,7 @@ __metadata: languageName: node linkType: hard -"supports-hyperlinks@npm:^3.1.0": +"supports-hyperlinks@npm:^3.0.0": version: 3.2.0 resolution: "supports-hyperlinks@npm:3.2.0" dependencies: @@ -13378,6 +13235,13 @@ __metadata: languageName: node linkType: hard +"text-extensions@npm:^2.0.0": + version: 2.4.0 + resolution: "text-extensions@npm:2.4.0" + checksum: 10c0/6790e7ee72ad4d54f2e96c50a13e158bb57ce840dddc770e80960ed1550115c57bdc2cee45d5354d7b4f269636f5ca06aab4d6e0281556c841389aa837b23fcb + languageName: node + linkType: hard + "text-hex@npm:1.0.x": version: 1.0.0 resolution: "text-hex@npm:1.0.0" @@ -13392,24 +13256,6 @@ __metadata: languageName: node linkType: hard -"thenify-all@npm:^1.0.0": - version: 1.6.0 - resolution: "thenify-all@npm:1.6.0" - dependencies: - thenify: "npm:>= 3.1.0 < 4" - checksum: 10c0/9b896a22735e8122754fe70f1d65f7ee691c1d70b1f116fda04fea103d0f9b356e3676cb789506e3909ae0486a79a476e4914b0f92472c2e093d206aed4b7d6b - languageName: node - linkType: hard - -"thenify@npm:>= 3.1.0 < 4": - version: 3.3.1 - resolution: "thenify@npm:3.3.1" - dependencies: - any-promise: "npm:^1.0.0" - checksum: 10c0/f375aeb2b05c100a456a30bc3ed07ef03a39cbdefe02e0403fb714b8c7e57eeaad1a2f5c4ecfb9ce554ce3db9c2b024eba144843cd9e344566d9fcee73b04767 - languageName: node - linkType: hard - "thread-stream@npm:^0.15.1": version: 0.15.2 resolution: "thread-stream@npm:0.15.2" @@ -13429,12 +13275,10 @@ __metadata: languageName: node linkType: hard -"time-span@npm:^5.1.0": - version: 5.1.0 - resolution: "time-span@npm:5.1.0" - dependencies: - convert-hrtime: "npm:^5.0.0" - checksum: 10c0/37b8284c53f4ee320377512ac19e3a034f2b025f5abd6959b8c1d0f69e0f06ab03681df209f2e452d30129e7b1f25bf573fb0f29d57e71f9b4a6b5b99f4c4b9e +"through@npm:>=2.2.7 <3": + version: 2.3.8 + resolution: "through@npm:2.3.8" + checksum: 10c0/4b09f3774099de0d4df26d95c5821a62faee32c7e96fb1f4ebd54a2d7c11c57fe88b0a0d49cf375de5fee5ae6bf4eb56dbbf29d07366864e2ee805349970d3cc languageName: node linkType: hard @@ -13954,10 +13798,10 @@ __metadata: languageName: node linkType: hard -"universal-user-agent@npm:^7.0.0, universal-user-agent@npm:^7.0.2": - version: 7.0.2 - resolution: "universal-user-agent@npm:7.0.2" - checksum: 10c0/e60517ee929813e6b3ac0ceb3c66deccafadc71341edca160279ff046319c684fd7090a60d63aa61cd34a06c2d2acebeb8c2f8d364244ae7bf8ab788e20cd8c8 +"universal-user-agent@npm:^6.0.0": + version: 6.0.1 + resolution: "universal-user-agent@npm:6.0.1" + checksum: 10c0/5c9c46ffe19a975e11e6443640ed4c9e0ce48fcc7203325757a8414ac49940ebb0f4667f2b1fa561489d1eb22cb2d05a0f7c82ec20c5cba42e58e188fb19b187 languageName: node linkType: hard @@ -14862,7 +14706,7 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^16.0.0, yargs@npm:^16.2.0": +"yargs@npm:^16.2.0": version: 16.2.0 resolution: "yargs@npm:16.2.0" dependencies: @@ -14913,13 +14757,6 @@ __metadata: languageName: node linkType: hard -"yoctocolors@npm:^2.0.0": - version: 2.1.1 - resolution: "yoctocolors@npm:2.1.1" - checksum: 10c0/85903f7fa96f1c70badee94789fade709f9d83dab2ec92753d612d84fcea6d34c772337a9f8914c6bed2f5fc03a428ac5d893e76fab636da5f1236ab725486d0 - languageName: node - linkType: hard - "yup@npm:^1.1.1": version: 1.6.1 resolution: "yup@npm:1.6.1" From 378f0f2ab1e61cff51b0b2a23e93482ba9edca39 Mon Sep 17 00:00:00 2001 From: Mateusz Nowakowski Date: Tue, 27 May 2025 13:01:06 +0200 Subject: [PATCH 4/6] feat: configurable metrics port --- sequencer/closer/src/cli.rs | 3 +++ sequencer/closer/src/main.rs | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/sequencer/closer/src/cli.rs b/sequencer/closer/src/cli.rs index 28c572703..b78e840f3 100644 --- a/sequencer/closer/src/cli.rs +++ b/sequencer/closer/src/cli.rs @@ -54,4 +54,7 @@ pub struct Cli { #[arg(long, default_value_t = false, env = "COLORS")] pub colors: bool, + + #[arg(long, env = "PROMETHEUS_PORT")] + pub prometheus_port: Option, } diff --git a/sequencer/closer/src/main.rs b/sequencer/closer/src/main.rs index 85402c963..13e803194 100644 --- a/sequencer/closer/src/main.rs +++ b/sequencer/closer/src/main.rs @@ -50,6 +50,16 @@ pub async fn main() -> anyhow::Result<()> { l1api::RolldownContract::new(provider.clone(), args.rolldown_contract_address) }; + let p = provider.clone(); + if let Some(port) = args.prometheus_port { + let _balance = tokio::spawn(async move { + common::report_account_balance(p).await; + }); + let _metrics = tokio::spawn(async move { + common::serve_metrics(port).await; + }); + } + let cicka = args .cicka_address .map(|addr| l1api::cicka::Cicka::new(provider.clone(), addr)); From 15a16fd548daa9bed878c641712cc0faaa87ff29 Mon Sep 17 00:00:00 2001 From: Mateusz Nowakowski Date: Wed, 28 May 2025 15:07:09 +0200 Subject: [PATCH 5/6] chore: improve logging --- contracts/compose.anvil-stubs.yml | 6 +++--- sequencer/closer/src/batch_subscription.rs | 4 ++-- sequencer/l1api/src/lib.rs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contracts/compose.anvil-stubs.yml b/contracts/compose.anvil-stubs.yml index 57d5d665e..b9dd33c09 100644 --- a/contracts/compose.anvil-stubs.yml +++ b/contracts/compose.anvil-stubs.yml @@ -1,6 +1,6 @@ services: eth-stub: - image: ghcr.io/foundry-rs/foundry:nightly-2f4b5dbe7f04d974bf99625325200d214089ee66 + image: gaspxyz/foundry:nightly-c2e529786c07ee7069cefcd4fe2db41f0e46cef6 platform: linux/amd64 ports: - 8545:8545 @@ -14,7 +14,7 @@ services: retries: 3 arbitrum-stub: - image: ghcr.io/foundry-rs/foundry:nightly-2f4b5dbe7f04d974bf99625325200d214089ee66 + image: gaspxyz/foundry:nightly-c2e529786c07ee7069cefcd4fe2db41f0e46cef6 platform: linux/amd64 ports: - 8546:8545 @@ -28,7 +28,7 @@ services: retries: 3 base-stub: - image: ghcr.io/foundry-rs/foundry:nightly-2f4b5dbe7f04d974bf99625325200d214089ee66 + image: gaspxyz/foundry:nightly-c2e529786c07ee7069cefcd4fe2db41f0e46cef6 platform: linux/amd64 ports: - 8547:8545 diff --git a/sequencer/closer/src/batch_subscription.rs b/sequencer/closer/src/batch_subscription.rs index 9ee937d94..76fc3c305 100644 --- a/sequencer/closer/src/batch_subscription.rs +++ b/sequencer/closer/src/batch_subscription.rs @@ -7,9 +7,9 @@ use tokio::time::{timeout, Duration}; #[derive(Debug, thiserror::Error)] pub enum Error { - #[error("L1 error")] + #[error("L1 error {0:?}")] L1(#[from] L1Error), - #[error("L2 error")] + #[error("L2 error {0:?}")] L2(#[from] L2Error), #[error("Sink send error")] NoBatchForL2RequestId(#[from] mpsc::error::SendError), diff --git a/sequencer/l1api/src/lib.rs b/sequencer/l1api/src/lib.rs index 5f6a9b9b6..fadaabf3b 100644 --- a/sequencer/l1api/src/lib.rs +++ b/sequencer/l1api/src/lib.rs @@ -68,9 +68,9 @@ pub enum L1Error { InvalidRange, #[error("Overflow error")] OverflowError, - #[error("alloy error")] + #[error("alloy error {0:?}")] Alloy(#[from] alloy::contract::Error), - #[error("alloy error")] + #[error("alloy error {0:?}")] TransportAlloy(#[from] alloy::transports::TransportError), #[error("transaction error")] TxSendError(#[from] PendingTransactionError), From fd6ba85a8739345d99d7380425d3cfd5381bb3da Mon Sep 17 00:00:00 2001 From: Mateusz Nowakowski Date: Tue, 17 Jun 2025 14:53:46 +0200 Subject: [PATCH 6/6] bump submodule --- gasp-node/gasp-e2e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gasp-node/gasp-e2e b/gasp-node/gasp-e2e index a997e9991..00fa5489d 160000 --- a/gasp-node/gasp-e2e +++ b/gasp-node/gasp-e2e @@ -1 +1 @@ -Subproject commit a997e99918f28da9b15ba94dd96f16cde7082052 +Subproject commit 00fa5489df09796af07461979efec264581db590