From 086353b7d4ba25aea14a4f700f433178f710405d Mon Sep 17 00:00:00 2001 From: moreal Date: Fri, 6 Dec 2024 13:36:44 +0900 Subject: [PATCH 1/4] feat(js): allow to use shared dependency --- .../@planetarium/lib9c/package.json | 8 +++--- .../javascript/@planetarium/pnpm-lock.yaml | 25 ++++++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/integrations/javascript/@planetarium/lib9c/package.json b/integrations/javascript/@planetarium/lib9c/package.json index be64363a9c..2f7258acd8 100644 --- a/integrations/javascript/@planetarium/lib9c/package.json +++ b/integrations/javascript/@planetarium/lib9c/package.json @@ -28,11 +28,13 @@ "vitest": "^1.5.2" }, "dependencies": { - "@planetarium/account": "^4.4.1", "@planetarium/bencodex": "^0.2.2", - "@planetarium/tx": "^4.4.1", "buffer": "^6.0.3", "decimal.js": "^10.4.3", "uuid": "^9.0.1" + }, + "peerDependencies": { + "@planetarium/account": "5.x", + "@planetarium/tx": "5.x" } -} \ No newline at end of file +} diff --git a/integrations/javascript/@planetarium/pnpm-lock.yaml b/integrations/javascript/@planetarium/pnpm-lock.yaml index 2adfd78e57..e0da2c67f3 100644 --- a/integrations/javascript/@planetarium/pnpm-lock.yaml +++ b/integrations/javascript/@planetarium/pnpm-lock.yaml @@ -9,14 +9,14 @@ importers: lib9c: dependencies: '@planetarium/account': - specifier: ^4.4.1 - version: 4.4.1 + specifier: 5.x + version: 5.3.2 '@planetarium/bencodex': specifier: ^0.2.2 version: 0.2.2 '@planetarium/tx': - specifier: ^4.4.1 - version: 4.4.1(@planetarium/account@4.4.1) + specifier: 5.x + version: 5.3.2(@planetarium/account@5.3.2) buffer: specifier: ^6.0.3 version: 6.0.3 @@ -540,17 +540,17 @@ packages: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} - '@planetarium/account@4.4.1': - resolution: {integrity: sha512-aCPOiv2//axVtXmsRy7lXqcWj/bq01+DH3CQSjPisil/bg639hSzuCaTwJf/X1pTKxkItOEHW66yyAP83uyARA==} + '@planetarium/account@5.3.2': + resolution: {integrity: sha512-Yx+FpOkzFtuOO3NqMeC+4rtncqtel12uP/b4xr4wNL7HWhYt1Syg8UDh+Ibz9MWuGyoP6lA35D2PCBg0Ar1ykA==} '@planetarium/bencodex@0.2.2': resolution: {integrity: sha512-hXYmV0gzEUxbhpVDiMIe/b0XAUoXBIl8Fo84Fx8nE0U39sU5q7tCFTkceock8TYs5rS4ix793033b7QYAPVoLA==} - '@planetarium/tx@4.4.1': - resolution: {integrity: sha512-SZayh/xU57DxbaYKdpBrevwV43RPumhDtcvr9jV6LZMk00msCyo8d2PUPxA2YkwekMJnj9gWsTyd8n/JR29fug==} + '@planetarium/tx@5.3.2': + resolution: {integrity: sha512-jlxyNhS1kXElR+biWNEAzAPULk6UlyUEB0l1EuS4Xm0N2gXAuPCTV5ERvaD/+DWv+kivBW20tfBmB9N/Jdqitg==} engines: {node: '>=19.0.0'} peerDependencies: - '@planetarium/account': ^4.4.1 + '@planetarium/account': ^5.3.2 '@rollup/rollup-android-arm-eabi@4.16.4': resolution: {integrity: sha512-GkhjAaQ8oUTOKE4g4gsZ0u8K/IHU1+2WQSgS1TwTcYvL+sjbaQjNHFXbOJ6kgqGHIO1DfUhI/Sphi9GkRT9K+Q==} @@ -1933,16 +1933,17 @@ snapshots: '@pkgjs/parseargs@0.11.0': optional: true - '@planetarium/account@4.4.1': + '@planetarium/account@5.3.2': dependencies: '@noble/hashes': 1.4.0 '@noble/secp256k1': 1.7.1 + buffer: 6.0.3 '@planetarium/bencodex@0.2.2': {} - '@planetarium/tx@4.4.1(@planetarium/account@4.4.1)': + '@planetarium/tx@5.3.2(@planetarium/account@5.3.2)': dependencies: - '@planetarium/account': 4.4.1 + '@planetarium/account': 5.3.2 '@planetarium/bencodex': 0.2.2 '@rollup/rollup-android-arm-eabi@4.16.4': From 1b78189316f23871c594cabdeba42d0ac0c762e8 Mon Sep 17 00:00:00 2001 From: moreal Date: Fri, 6 Dec 2024 14:00:09 +0900 Subject: [PATCH 2/4] Revert "Merge pull request #3071 from moreal/feat/js/peer-dependencies" This reverts commit 6874cf62c012f5367e21d26c283750e7e2561a68, reversing changes made to f674f0ff075a73c518bbd4b3d16f21f2d9a64ccc. --- .../@planetarium/lib9c/package.json | 8 +++--- .../javascript/@planetarium/pnpm-lock.yaml | 25 +++++++++---------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/integrations/javascript/@planetarium/lib9c/package.json b/integrations/javascript/@planetarium/lib9c/package.json index 2f7258acd8..be64363a9c 100644 --- a/integrations/javascript/@planetarium/lib9c/package.json +++ b/integrations/javascript/@planetarium/lib9c/package.json @@ -28,13 +28,11 @@ "vitest": "^1.5.2" }, "dependencies": { + "@planetarium/account": "^4.4.1", "@planetarium/bencodex": "^0.2.2", + "@planetarium/tx": "^4.4.1", "buffer": "^6.0.3", "decimal.js": "^10.4.3", "uuid": "^9.0.1" - }, - "peerDependencies": { - "@planetarium/account": "5.x", - "@planetarium/tx": "5.x" } -} +} \ No newline at end of file diff --git a/integrations/javascript/@planetarium/pnpm-lock.yaml b/integrations/javascript/@planetarium/pnpm-lock.yaml index e0da2c67f3..2adfd78e57 100644 --- a/integrations/javascript/@planetarium/pnpm-lock.yaml +++ b/integrations/javascript/@planetarium/pnpm-lock.yaml @@ -9,14 +9,14 @@ importers: lib9c: dependencies: '@planetarium/account': - specifier: 5.x - version: 5.3.2 + specifier: ^4.4.1 + version: 4.4.1 '@planetarium/bencodex': specifier: ^0.2.2 version: 0.2.2 '@planetarium/tx': - specifier: 5.x - version: 5.3.2(@planetarium/account@5.3.2) + specifier: ^4.4.1 + version: 4.4.1(@planetarium/account@4.4.1) buffer: specifier: ^6.0.3 version: 6.0.3 @@ -540,17 +540,17 @@ packages: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} - '@planetarium/account@5.3.2': - resolution: {integrity: sha512-Yx+FpOkzFtuOO3NqMeC+4rtncqtel12uP/b4xr4wNL7HWhYt1Syg8UDh+Ibz9MWuGyoP6lA35D2PCBg0Ar1ykA==} + '@planetarium/account@4.4.1': + resolution: {integrity: sha512-aCPOiv2//axVtXmsRy7lXqcWj/bq01+DH3CQSjPisil/bg639hSzuCaTwJf/X1pTKxkItOEHW66yyAP83uyARA==} '@planetarium/bencodex@0.2.2': resolution: {integrity: sha512-hXYmV0gzEUxbhpVDiMIe/b0XAUoXBIl8Fo84Fx8nE0U39sU5q7tCFTkceock8TYs5rS4ix793033b7QYAPVoLA==} - '@planetarium/tx@5.3.2': - resolution: {integrity: sha512-jlxyNhS1kXElR+biWNEAzAPULk6UlyUEB0l1EuS4Xm0N2gXAuPCTV5ERvaD/+DWv+kivBW20tfBmB9N/Jdqitg==} + '@planetarium/tx@4.4.1': + resolution: {integrity: sha512-SZayh/xU57DxbaYKdpBrevwV43RPumhDtcvr9jV6LZMk00msCyo8d2PUPxA2YkwekMJnj9gWsTyd8n/JR29fug==} engines: {node: '>=19.0.0'} peerDependencies: - '@planetarium/account': ^5.3.2 + '@planetarium/account': ^4.4.1 '@rollup/rollup-android-arm-eabi@4.16.4': resolution: {integrity: sha512-GkhjAaQ8oUTOKE4g4gsZ0u8K/IHU1+2WQSgS1TwTcYvL+sjbaQjNHFXbOJ6kgqGHIO1DfUhI/Sphi9GkRT9K+Q==} @@ -1933,17 +1933,16 @@ snapshots: '@pkgjs/parseargs@0.11.0': optional: true - '@planetarium/account@5.3.2': + '@planetarium/account@4.4.1': dependencies: '@noble/hashes': 1.4.0 '@noble/secp256k1': 1.7.1 - buffer: 6.0.3 '@planetarium/bencodex@0.2.2': {} - '@planetarium/tx@5.3.2(@planetarium/account@5.3.2)': + '@planetarium/tx@4.4.1(@planetarium/account@4.4.1)': dependencies: - '@planetarium/account': 5.3.2 + '@planetarium/account': 4.4.1 '@planetarium/bencodex': 0.2.2 '@rollup/rollup-android-arm-eabi@4.16.4': From e0b90e4e671ae71409539c596d8ad3221c961721 Mon Sep 17 00:00:00 2001 From: moreal Date: Fri, 6 Dec 2024 14:03:38 +0900 Subject: [PATCH 3/4] feat(js): prepare 0.4.0 --- integrations/javascript/@planetarium/lib9c/jsr.json | 2 +- integrations/javascript/@planetarium/lib9c/package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integrations/javascript/@planetarium/lib9c/jsr.json b/integrations/javascript/@planetarium/lib9c/jsr.json index 53906b81db..f8597242df 100644 --- a/integrations/javascript/@planetarium/lib9c/jsr.json +++ b/integrations/javascript/@planetarium/lib9c/jsr.json @@ -1,7 +1,7 @@ { "$schema": "https://jsr.io/schema/config-file.v1.json", "name": "@planetarium/lib9c", - "version": "0.3.0", + "version": "0.4.0", "exports": "./src/index.ts", "publish": { "include": [ diff --git a/integrations/javascript/@planetarium/lib9c/package.json b/integrations/javascript/@planetarium/lib9c/package.json index be64363a9c..308ea50e94 100644 --- a/integrations/javascript/@planetarium/lib9c/package.json +++ b/integrations/javascript/@planetarium/lib9c/package.json @@ -1,6 +1,6 @@ { "name": "@planetarium/lib9c", - "version": "0.3.0", + "version": "0.4.0", "description": "", "module": "dist/index.js", "type": "module", @@ -35,4 +35,4 @@ "decimal.js": "^10.4.3", "uuid": "^9.0.1" } -} \ No newline at end of file +} From b7994a523f771591a9bc7f8dfa206c439a0353d4 Mon Sep 17 00:00:00 2001 From: moreal Date: Fri, 6 Dec 2024 15:21:39 +0900 Subject: [PATCH 4/4] feat: bump libplanet-related dependencies --- .../@planetarium/lib9c/package.json | 4 +-- .../javascript/@planetarium/pnpm-lock.yaml | 25 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/integrations/javascript/@planetarium/lib9c/package.json b/integrations/javascript/@planetarium/lib9c/package.json index 308ea50e94..548aa722d6 100644 --- a/integrations/javascript/@planetarium/lib9c/package.json +++ b/integrations/javascript/@planetarium/lib9c/package.json @@ -28,9 +28,9 @@ "vitest": "^1.5.2" }, "dependencies": { - "@planetarium/account": "^4.4.1", + "@planetarium/account": "^5.4.1", "@planetarium/bencodex": "^0.2.2", - "@planetarium/tx": "^4.4.1", + "@planetarium/tx": "^5.4.1", "buffer": "^6.0.3", "decimal.js": "^10.4.3", "uuid": "^9.0.1" diff --git a/integrations/javascript/@planetarium/pnpm-lock.yaml b/integrations/javascript/@planetarium/pnpm-lock.yaml index 2adfd78e57..d79b8e090d 100644 --- a/integrations/javascript/@planetarium/pnpm-lock.yaml +++ b/integrations/javascript/@planetarium/pnpm-lock.yaml @@ -9,14 +9,14 @@ importers: lib9c: dependencies: '@planetarium/account': - specifier: ^4.4.1 - version: 4.4.1 + specifier: ^5.4.1 + version: 5.4.1 '@planetarium/bencodex': specifier: ^0.2.2 version: 0.2.2 '@planetarium/tx': - specifier: ^4.4.1 - version: 4.4.1(@planetarium/account@4.4.1) + specifier: ^5.4.1 + version: 5.4.1(@planetarium/account@5.4.1) buffer: specifier: ^6.0.3 version: 6.0.3 @@ -540,17 +540,17 @@ packages: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} - '@planetarium/account@4.4.1': - resolution: {integrity: sha512-aCPOiv2//axVtXmsRy7lXqcWj/bq01+DH3CQSjPisil/bg639hSzuCaTwJf/X1pTKxkItOEHW66yyAP83uyARA==} + '@planetarium/account@5.4.1': + resolution: {integrity: sha512-J6sOkL0nyawqqgHj5WtK1w90BDhVJIgddsbL89HCTsn+ybhNdqFM8O9pdx38FuF3REyGmIv2DvD/4MCcljDGvQ==} '@planetarium/bencodex@0.2.2': resolution: {integrity: sha512-hXYmV0gzEUxbhpVDiMIe/b0XAUoXBIl8Fo84Fx8nE0U39sU5q7tCFTkceock8TYs5rS4ix793033b7QYAPVoLA==} - '@planetarium/tx@4.4.1': - resolution: {integrity: sha512-SZayh/xU57DxbaYKdpBrevwV43RPumhDtcvr9jV6LZMk00msCyo8d2PUPxA2YkwekMJnj9gWsTyd8n/JR29fug==} + '@planetarium/tx@5.4.1': + resolution: {integrity: sha512-+OAHaScs/BVZUoQZsbQCWEKybEfSOKmhhaNAVj6Ko6RHE7pHJ+4s2dRmUOaffnbZy0FymHookciJcA3BThfevw==} engines: {node: '>=19.0.0'} peerDependencies: - '@planetarium/account': ^4.4.1 + '@planetarium/account': ^5.4.1 '@rollup/rollup-android-arm-eabi@4.16.4': resolution: {integrity: sha512-GkhjAaQ8oUTOKE4g4gsZ0u8K/IHU1+2WQSgS1TwTcYvL+sjbaQjNHFXbOJ6kgqGHIO1DfUhI/Sphi9GkRT9K+Q==} @@ -1933,16 +1933,17 @@ snapshots: '@pkgjs/parseargs@0.11.0': optional: true - '@planetarium/account@4.4.1': + '@planetarium/account@5.4.1': dependencies: '@noble/hashes': 1.4.0 '@noble/secp256k1': 1.7.1 + buffer: 6.0.3 '@planetarium/bencodex@0.2.2': {} - '@planetarium/tx@4.4.1(@planetarium/account@4.4.1)': + '@planetarium/tx@5.4.1(@planetarium/account@5.4.1)': dependencies: - '@planetarium/account': 4.4.1 + '@planetarium/account': 5.4.1 '@planetarium/bencodex': 0.2.2 '@rollup/rollup-android-arm-eabi@4.16.4':