Skip to content

[WIP] Update to address feedback from PR #57 #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tcheeric merged 2 commits into from
Nov 2, 2025
Merged

[WIP] Update to address feedback from PR #57 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19b4b6b
Initial plan
Copilot Nov 2, 2025
316c3f2
refactor: extract Bech32 charset to class constant
Copilot Nov 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ...ixd-base/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/home/runner/work/phoenixd-java/phoenixd-java/phoenixd-base/src/main/java/xyz/tcheeric/phoenixd/common/rest/Operation.java
/home/runner/work/phoenixd-java/phoenixd-java/phoenixd-base/src/main/java/xyz/tcheeric/phoenixd/common/rest/VoidRequestParam.java
/home/runner/work/phoenixd-java/phoenixd-java/phoenixd-base/src/main/java/xyz/tcheeric/phoenixd/common/rest/Request.java
/home/runner/work/phoenixd-java/phoenixd-java/phoenixd-base/src/main/java/xyz/tcheeric/phoenixd/common/rest/Response.java
/home/runner/work/phoenixd-java/phoenixd-java/phoenixd-base/src/main/java/xyz/tcheeric/phoenixd/common/rest/VoidResponse.java
/home/runner/work/phoenixd-java/phoenixd-java/phoenixd-base/src/main/java/xyz/tcheeric/phoenixd/common/rest/util/Configuration.java
/home/runner/work/phoenixd-java/phoenixd-java/phoenixd-base/src/main/java/xyz/tcheeric/phoenixd/common/rest/util/Constants.java
12 changes: 5 additions & 7 deletions phoenixd-mock/src/main/java/xyz/tcheeric/phoenixd/mock/MockLnServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

@RequiredArgsConstructor
public class MockLnServer {
private static final String BECH32_CHARSET = "qpzry9x8gf2tvdw0s3jn54khce6mua7l";

private HttpServer server;

private final int port;
Expand Down Expand Up @@ -64,14 +66,12 @@ private String generateValidBolt11Invoice() {

// Generate random payment hash (32 bytes = 52 chars in bech32, roughly)
// For a minimal valid invoice, we need at least timestamp + payment hash
// Bech32 charset: qpzry9x8gf2tvdw0s3jn54khce6mua7l
SecureRandom random = new SecureRandom();
StringBuilder data = new StringBuilder();
String charset = "qpzry9x8gf2tvdw0s3jn54khce6mua7l";

// Generate 52 random bech32 characters (represents ~32 bytes of data)
for (int i = 0; i < 52; i++) {
data.append(charset.charAt(random.nextInt(charset.length())));
data.append(BECH32_CHARSET.charAt(random.nextInt(BECH32_CHARSET.length())));
}

// Calculate and append Bech32 checksum (6 characters)
Expand All @@ -85,8 +85,6 @@ private String generateValidBolt11Invoice() {
* Simplified implementation for mock purposes.
*/
private String calculateBech32Checksum(String hrp, String data) {
String charset = "qpzry9x8gf2tvdw0s3jn54khce6mua7l";

// Expand HRP
int[] values = new int[hrp.length() * 2 + 1 + data.length() + 6];
int idx = 0;
Expand All @@ -98,7 +96,7 @@ private String calculateBech32Checksum(String hrp, String data) {
values[idx++] = hrp.charAt(i) & 31;
}
for (int i = 0; i < data.length(); i++) {
values[idx++] = charset.indexOf(data.charAt(i));
values[idx++] = BECH32_CHARSET.indexOf(data.charAt(i));
}
for (int i = 0; i < 6; i++) {
values[idx++] = 0;
Expand All @@ -109,7 +107,7 @@ private String calculateBech32Checksum(String hrp, String data) {

StringBuilder checksum = new StringBuilder();
for (int i = 0; i < 6; i++) {
checksum.append(charset.charAt((polymod >> (5 * (5 - i))) & 31));
checksum.append(BECH32_CHARSET.charAt((polymod >> (5 * (5 - i))) & 31));
}

return checksum.toString();
Expand Down
Binary file added phoenixd-mock/target/classes/xyz/tcheeric/phoenixd/mock/Main.class
View file
Open in desktop
Binary file not shown.
Binary file added phoenixd-mock/target/classes/xyz/tcheeric/phoenixd/mock/MockLnServer.class
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions ...d-mock/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
xyz/tcheeric/phoenixd/mock/MockLnServer.class
xyz/tcheeric/phoenixd/mock/Main.class
2 changes: 2 additions & 0 deletions ...ixd-mock/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/home/runner/work/phoenixd-java/phoenixd-java/phoenixd-mock/src/main/java/xyz/tcheeric/phoenixd/mock/MockLnServer.java
/home/runner/work/phoenixd-java/phoenixd-java/phoenixd-mock/src/main/java/xyz/tcheeric/phoenixd/mock/Main.java