Use bitcoinj with chainwork fix#7567
Conversation
WalkthroughBumps release version to 1.9.22, updates bitcoinj dependency hash and Gradle verification metadata (adds protobuf 3.18.0 entries), adds a new PGP signing key and resource, and includes the new key in installer trusted keys; updates macOS packaging scripts and metadata. Changes
Sequence Diagram(s)(omitted — changes are versioning, metadata, and asset additions without new multi-component control flow) Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Possibly related PRs
Pre-merge checks and finishing touches❌ Failed checks (1 inconclusive)
✅ Passed checks (2 passed)
✨ Finishing touches
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
📜 Review details
Configuration used: defaults
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (11)
build-logic/packaging/src/main/kotlin/bisq/gradle/packaging/PackagingPlugin.ktcommon/src/main/java/bisq/common/app/Version.javadesktop/package/387C8307.ascdesktop/package/macosx/Info.plistdesktop/package/macosx/copy_dbs.shdesktop/package/macosx/finalize.shdesktop/package/macosx/insert_snapshot_version.shdesktop/package/macosx/replace_version_number.shdesktop/package/signingkey.ascdesktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.javadesktop/src/main/resources/version.txt
✅ Files skipped from review due to trivial changes (2)
- desktop/package/387C8307.asc
- desktop/package/macosx/copy_dbs.sh
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (3)
- GitHub Check: Test Java 11, macOS-latest
- GitHub Check: Test Java 11, ubuntu-latest
- GitHub Check: Test Java 11, windows-latest
🔇 Additional comments (11)
desktop/package/macosx/insert_snapshot_version.sh (1)
5-5: LGTM!The version bump from 1.9.21 to 1.9.22 is correct and aligns with the broader version update across the project.
desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java (1)
61-61: LGTM!The new fingerprint constant for Henrik Jannsen is correctly defined and follows the established naming convention.
build-logic/packaging/src/main/kotlin/bisq/gradle/packaging/PackagingPlugin.kt (1)
25-25: LGTM!The APP_VERSION constant update from 1.9.21 to 1.9.22 is correct and consistent with the project-wide version bump.
desktop/package/macosx/replace_version_number.sh (1)
5-6: LGTM!The version literals are correctly updated for the 1.9.21 → 1.9.22 bump, maintaining the script's intended behavior.
desktop/src/main/resources/version.txt (1)
1-1: LGTM!The version update from 1.9.21-SNAPSHOT to 1.9.22 is correct. The removal of the SNAPSHOT suffix indicates this is a release version.
desktop/package/macosx/Info.plist (1)
8-8: LGTM!Both CFBundleVersion and CFBundleShortVersionString are correctly updated to 1.9.22, maintaining consistency in the macOS bundle versioning.
Also applies to: 11-11
desktop/package/macosx/finalize.sh (2)
5-5: LGTM!The version bump to 1.9.22 is correct and aligns with the project-wide version update.
62-63: Verify the key file exists before copying.The script copies Henrik Jannsen's key file to the release directory. The source file
desktop/package/387C8307.ascexists and contains a valid PGP public key.desktop/package/signingkey.asc (1)
1-1: The signing key file is present and accessible.The key file
387C8307.ascexists indesktop/package/and is accessible at the public URL (HTTP 200). No action required.common/src/main/java/bisq/common/app/Version.java (2)
46-48: Verify whether "1.9.22" should be added to the historical resource file list.The
HISTORICAL_RESOURCE_FILE_VERSION_TAGSlist currently ends at "1.9.20". According to the comment on lines 42-45, this list should only contain versions where new version-tagged resource files are added for historical data stores.Please confirm whether version "1.9.22" introduces new version-tagged resource files that require addition to this list.
39-39: Version bump is complete and correct.Version updated from 1.9.21 to 1.9.22 consistently across Version.java and PackagingPlugin.kt. The HISTORICAL_RESOURCE_FILE_VERSION_TAGS list correctly excludes this version, as documented—it only includes versions that add new resource files for historical data stores.
desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java
Show resolved
Hide resolved
HenrikJannsen
force-pushed
the
use-backported-bitcoinj-fix
branch
from
37e6a47 to
0429d87
Compare
There was a problem hiding this comment.
Actionable comments posted: 0
🧹 Nitpick comments (1)
desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java (1)
249-250: Consider adding defensive null-checking togetLocalKeyFileDescriptor.The resource file
desktop/src/main/resources/keys/387C8307.ascexists and the past fix has been properly applied. However, thegetLocalKeyFileDescriptormethod (lines 265-272) directly callsgetClass().getResource("/keys/" + fingerPrint + ".asc").toExternalForm()without null-checking. If the resource is ever missing, this will throw a NullPointerException. Add defensive null-checking:private FileDescriptor getLocalKeyFileDescriptor(String fingerPrint) { java.net.URL resource = getClass().getResource("/keys/" + fingerPrint + ".asc"); if (resource == null) { throw new IllegalStateException("Local key file not found for fingerprint: " + fingerPrint); } return FileDescriptor.builder() .type(DownloadType.KEY) .fileName(fingerPrint + ".asc-local") .id(fingerPrint) .loadUrl(resource.toExternalForm()) .build(); }
📜 Review details
Configuration used: defaults
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (5)
desktop/package/387C8307.ascdesktop/package/macosx/finalize.shdesktop/package/signingkey.ascdesktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.javadesktop/src/main/resources/keys/387C8307.asc
✅ Files skipped from review due to trivial changes (1)
- desktop/src/main/resources/keys/387C8307.asc
🚧 Files skipped from review as they are similar to previous changes (3)
- desktop/package/signingkey.asc
- desktop/package/387C8307.asc
- desktop/package/macosx/finalize.sh
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (3)
- GitHub Check: Test Java 11, windows-latest
- GitHub Check: Test Java 11, macOS-latest
- GitHub Check: Test Java 11, ubuntu-latest
🔇 Additional comments (1)
desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java (1)
61-61: LGTM! Constant declaration follows existing pattern.The fingerprint constant for Henrik Jannsen is declared consistently with the existing key fingerprints for Gabriel Bernard and Alejandro Garcia.
… backport of the chainwork bugfix. See bisq-network/bitcoinj#45
Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
HenrikJannsen
force-pushed
the
use-backported-bitcoinj-fix
branch
from
0429d87 to
b3faaf7
Compare
HenrikJannsen
changed the title
1 participant
See bisq-network/bitcoinj#45
Summary by CodeRabbit
✏️ Tip: You can customize this high-level summary in your review settings.