Skip to content

feat(http): add int64_as_string parameter to query endpoints #6699

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

Open
waynercheung wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

feat(http): add int64_as_string parameter to query endpoints #6699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2b53916
feat(http): add int64_as_string core machinery for issue #6568
waynercheung Apr 21, 2026
3f4ec06
feat(http): wire int64_as_string into 43 whitelisted query servlets f…
waynercheung Apr 21, 2026
00bc4f8
test(http): add int64_as_string integration coverage for representati…
waynercheung Apr 21, 2026
5e718c9
refactor(http): read visible and int64_as_string via locals in GetBlo…
waynercheung Apr 22, 2026
43061c6
test(http): add int64_as_string coverage for GetBlockServlet and GetP…
waynercheung Apr 22, 2026
05bf8f5
fix(http): parse int64_as_string from POST JSON body in GetRewardServlet
waynercheung Apr 22, 2026
77ea731
feat(http): wire int64_as_string into 10 additional query servlets
waynercheung Apr 22, 2026
7ba22ba
test(http): cover Util helpers and drop decorative dividers
waynercheung Apr 23, 2026
96dfa86
test(http): pin the URL-query-only contract of ListExchangesServlet
waynercheung Apr 23, 2026
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
4 changes: 3 additions & 1 deletion framework/src/main/java/org/tron/core/services/http/GetAccountBalanceServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
BalanceContract.AccountBalanceRequest.Builder builder
= BalanceContract.AccountBalanceRequest.newBuilder();
JsonFormat.merge(params.getParams(), builder, params.isVisible());
fillResponse(params.isVisible(), builder.build(), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(params.isInt64AsString())) {
fillResponse(params.isVisible(), builder.build(), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand Down
9 changes: 7 additions & 2 deletions framework/src/main/java/org/tron/core/services/http/GetAccountByIdServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@ public class GetAccountByIdServlet extends RateLimiterServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) {
try {
boolean visible = Util.getVisible(request);
boolean int64AsString = Util.getInt64AsString(request);
String accountId = request.getParameter("account_id");
Account.Builder build = Account.newBuilder();
JSONObject jsonObject = new JSONObject();
jsonObject.put("account_id", accountId);
JsonFormat.merge(jsonObject.toJSONString(), build, visible);
fillResponse(build.build(), visible, response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(int64AsString)) {
fillResponse(build.build(), visible, response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand All @@ -37,7 +40,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
PostParams params = PostParams.getPostParams(request);
Account.Builder build = Account.newBuilder();
JsonFormat.merge(params.getParams(), build, params.isVisible());
fillResponse(build.build(), params.isVisible(), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(params.isInt64AsString())) {
fillResponse(build.build(), params.isVisible(), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand Down
9 changes: 7 additions & 2 deletions framework/src/main/java/org/tron/core/services/http/GetAccountNetServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,14 @@ public class GetAccountNetServlet extends RateLimiterServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) {
try {
boolean visible = Util.getVisible(request);
boolean int64AsString = Util.getInt64AsString(request);
String address = request.getParameter("address");
if (visible) {
address = Util.getHexAddress(address);
}
fillResponse(visible, ByteString.copyFrom(ByteArray.fromHexString(address)), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(int64AsString)) {
fillResponse(visible, ByteString.copyFrom(ByteArray.fromHexString(address)), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand All @@ -37,7 +40,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
PostParams params = PostParams.getPostParams(request);
Account.Builder build = Account.newBuilder();
JsonFormat.merge(params.getParams(), build, params.isVisible());
fillResponse(params.isVisible(), build.getAddress(), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(params.isInt64AsString())) {
fillResponse(params.isVisible(), build.getAddress(), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand Down
11 changes: 8 additions & 3 deletions framework/src/main/java/org/tron/core/services/http/GetAccountResourceServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ public class GetAccountResourceServlet extends RateLimiterServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) {
try {
boolean visible = Util.getVisible(request);
boolean int64AsString = Util.getInt64AsString(request);
String address = request.getParameter("address");
if (visible) {
address = Util.getHexAddress(address);
}
fillResponse(visible, ByteString.copyFrom(ByteArray.fromHexString(address)), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(int64AsString)) {
fillResponse(visible, ByteString.copyFrom(ByteArray.fromHexString(address)), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand All @@ -39,8 +42,10 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
if (params.isVisible()) {
address = Util.getHexAddress(address);
}
fillResponse(params.isVisible(), ByteString.copyFrom(ByteArray.fromHexString(address)),
response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(params.isInt64AsString())) {
fillResponse(params.isVisible(), ByteString.copyFrom(ByteArray.fromHexString(address)),
response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand Down
9 changes: 7 additions & 2 deletions framework/src/main/java/org/tron/core/services/http/GetAccountServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@ public class GetAccountServlet extends RateLimiterServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) {
try {
boolean visible = Util.getVisible(request);
boolean int64AsString = Util.getInt64AsString(request);
String address = request.getParameter("address");
Account.Builder build = Account.newBuilder();
JSONObject jsonObject = new JSONObject();
jsonObject.put("address", address);
JsonFormat.merge(jsonObject.toJSONString(), build, visible);
fillResponse(visible, build.build(), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(int64AsString)) {
fillResponse(visible, build.build(), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand All @@ -36,7 +39,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
PostParams params = PostParams.getPostParams(request);
Account.Builder build = Account.newBuilder();
JsonFormat.merge(params.getParams(), build, params.isVisible());
fillResponse(params.isVisible(), build.build(), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(params.isInt64AsString())) {
fillResponse(params.isVisible(), build.build(), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand Down
9 changes: 7 additions & 2 deletions framework/src/main/java/org/tron/core/services/http/GetAssetIssueByAccountServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,14 @@ public class GetAssetIssueByAccountServlet extends RateLimiterServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) {
try {
boolean visible = Util.getVisible(request);
boolean int64AsString = Util.getInt64AsString(request);
String address = request.getParameter("address");
if (visible) {
address = Util.getHexAddress(address);
}
fillResponse(visible, ByteString.copyFrom(ByteArray.fromHexString(address)), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(int64AsString)) {
fillResponse(visible, ByteString.copyFrom(ByteArray.fromHexString(address)), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand All @@ -37,7 +40,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
PostParams params = PostParams.getPostParams(request);
Account.Builder build = Account.newBuilder();
JsonFormat.merge(params.getParams(), build, params.isVisible());
fillResponse(params.isVisible(), build.getAddress(), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(params.isInt64AsString())) {
fillResponse(params.isVisible(), build.getAddress(), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand Down
9 changes: 7 additions & 2 deletions framework/src/main/java/org/tron/core/services/http/GetAssetIssueByIdServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,13 @@ public class GetAssetIssueByIdServlet extends RateLimiterServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) {
try {
boolean visible = Util.getVisible(request);
boolean int64AsString = Util.getInt64AsString(request);
String input = request.getParameter("value");
AssetIssueContract reply = wallet.getAssetIssueById(input);
if (reply != null) {
response.getWriter().println(JsonFormat.printToString(reply, visible));
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(int64AsString)) {
response.getWriter().println(JsonFormat.printToString(reply, visible));
}
} else {
response.getWriter().println("{}");
}
Expand All @@ -39,7 +42,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
String id = jsonObject.getString("value");
AssetIssueContract reply = wallet.getAssetIssueById(id);
if (reply != null) {
response.getWriter().println(JsonFormat.printToString(reply, params.isVisible()));
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(params.isInt64AsString())) {
response.getWriter().println(JsonFormat.printToString(reply, params.isVisible()));
}
} else {
response.getWriter().println("{}");
}
Expand Down
11 changes: 8 additions & 3 deletions framework/src/main/java/org/tron/core/services/http/GetAssetIssueByNameServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,14 @@ public class GetAssetIssueByNameServlet extends RateLimiterServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) {
try {
boolean visible = Util.getVisible(request);
boolean int64AsString = Util.getInt64AsString(request);
String input = request.getParameter("value");
if (visible) {
input = Util.getHexString(input);
}
fillResponse(visible, ByteString.copyFrom(ByteArray.fromHexString(input)), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(int64AsString)) {
fillResponse(visible, ByteString.copyFrom(ByteArray.fromHexString(input)), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand All @@ -41,8 +44,10 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
if (params.isVisible()) {
value = Util.getHexString(value);
}
fillResponse(params.isVisible(), ByteString.copyFrom(
ByteArray.fromHexString(value)), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(params.isInt64AsString())) {
fillResponse(params.isVisible(), ByteString.copyFrom(
ByteArray.fromHexString(value)), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand Down
9 changes: 7 additions & 2 deletions framework/src/main/java/org/tron/core/services/http/GetAssetIssueListByNameServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ public class GetAssetIssueListByNameServlet extends RateLimiterServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) {
try {
boolean visible = Util.getVisible(request);
boolean int64AsString = Util.getInt64AsString(request);
String value = request.getParameter("value");
fillResponse(visible, value, response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(int64AsString)) {
fillResponse(visible, value, response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand All @@ -36,7 +39,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
PostParams params = PostParams.getPostParams(request);
JSONObject jsonObject = JSON.parseObject(params.getParams());
String value = jsonObject.getString("value");
fillResponse(params.isVisible(), value, response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(params.isInt64AsString())) {
fillResponse(params.isVisible(), value, response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand Down
5 changes: 4 additions & 1 deletion framework/src/main/java/org/tron/core/services/http/GetAssetIssueListServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@ public class GetAssetIssueListServlet extends RateLimiterServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) {
try {
boolean visible = Util.getVisible(request);
boolean int64AsString = Util.getInt64AsString(request);
AssetIssueList reply = wallet.getAssetIssueList();
if (reply != null) {
response.getWriter().println(JsonFormat.printToString(reply, visible));
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(int64AsString)) {
response.getWriter().println(JsonFormat.printToString(reply, visible));
}
} else {
response.getWriter().println("{}");
}
Expand Down
17 changes: 11 additions & 6 deletions framework/src/main/java/org/tron/core/services/http/GetAvailableUnfreezeCountServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,19 @@ public class GetAvailableUnfreezeCountServlet extends RateLimiterServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) {
try {
boolean visible = Util.getVisible(request);
boolean int64AsString = Util.getInt64AsString(request);
String ownerAddress = request.getParameter("ownerAddress");
if (ownerAddress == null) {
ownerAddress = request.getParameter("owner_address");
}
if (visible) {
ownerAddress = Util.getHexAddress(ownerAddress);
}
fillResponse(visible,
ByteString.copyFrom(ByteArray.fromHexString(ownerAddress)),
response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(int64AsString)) {
fillResponse(visible,
ByteString.copyFrom(ByteArray.fromHexString(ownerAddress)),
response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand All @@ -44,9 +47,11 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
GrpcAPI.GetAvailableUnfreezeCountRequestMessage.Builder build =
GrpcAPI.GetAvailableUnfreezeCountRequestMessage.newBuilder();
JsonFormat.merge(params.getParams(), build, params.isVisible());
fillResponse(params.isVisible(),
build.getOwnerAddress(),
response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(params.isInt64AsString())) {
fillResponse(params.isVisible(),
build.getOwnerAddress(),
response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand Down
4 changes: 3 additions & 1 deletion framework/src/main/java/org/tron/core/services/http/GetBlockBalanceServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
BlockBalanceTrace.BlockIdentifier.Builder builder = BlockBalanceTrace.BlockIdentifier
.newBuilder();
JsonFormat.merge(params.getParams(), builder, params.isVisible());
fillResponse(params.isVisible(), builder.build(), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(params.isInt64AsString())) {
fillResponse(params.isVisible(), builder.build(), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand Down
9 changes: 7 additions & 2 deletions framework/src/main/java/org/tron/core/services/http/GetBlockByIdServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ public class GetBlockByIdServlet extends RateLimiterServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) {
try {
boolean visible = Util.getVisible(request);
boolean int64AsString = Util.getInt64AsString(request);
String input = request.getParameter("value");
fillResponse(visible, ByteString.copyFrom(ByteArray.fromHexString(input)), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(int64AsString)) {
fillResponse(visible, ByteString.copyFrom(ByteArray.fromHexString(input)), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand All @@ -35,7 +38,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
PostParams params = PostParams.getPostParams(request);
BytesMessage.Builder build = BytesMessage.newBuilder();
JsonFormat.merge(params.getParams(), build, params.isVisible());
fillResponse(params.isVisible(), build.getValue(), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(params.isInt64AsString())) {
fillResponse(params.isVisible(), build.getValue(), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand Down
9 changes: 7 additions & 2 deletions framework/src/main/java/org/tron/core/services/http/GetBlockByLatestNumServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ public class GetBlockByLatestNumServlet extends RateLimiterServlet {

protected void doGet(HttpServletRequest request, HttpServletResponse response) {
try {
fillResponse(Util.getVisible(request), Long.parseLong(request.getParameter("num")), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(Util.getInt64AsString(request))) {
fillResponse(Util.getVisible(request), Long.parseLong(request.getParameter("num")),
response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand All @@ -32,7 +35,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
PostParams params = PostParams.getPostParams(request);
NumberMessage.Builder build = NumberMessage.newBuilder();
JsonFormat.merge(params.getParams(), build, params.isVisible());
fillResponse(params.isVisible(), build.getNum(), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(params.isInt64AsString())) {
fillResponse(params.isVisible(), build.getNum(), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand Down
10 changes: 7 additions & 3 deletions framework/src/main/java/org/tron/core/services/http/GetBlockByLimitNextServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ public class GetBlockByLimitNextServlet extends RateLimiterServlet {

protected void doGet(HttpServletRequest request, HttpServletResponse response) {
try {
fillResponse(Util.getVisible(request), Long.parseLong(request.getParameter("startNum")),
Long.parseLong(request.getParameter("endNum")), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(Util.getInt64AsString(request))) {
fillResponse(Util.getVisible(request), Long.parseLong(request.getParameter("startNum")),
Long.parseLong(request.getParameter("endNum")), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand All @@ -33,7 +35,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
PostParams params = PostParams.getPostParams(request);
BlockLimit.Builder build = BlockLimit.newBuilder();
JsonFormat.merge(params.getParams(), build, params.isVisible());
fillResponse(params.isVisible(), build.getStartNum(), build.getEndNum(), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(params.isInt64AsString())) {
fillResponse(params.isVisible(), build.getStartNum(), build.getEndNum(), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand Down
8 changes: 6 additions & 2 deletions framework/src/main/java/org/tron/core/services/http/GetBlockByNumServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
if (numStr != null) {
num = Long.parseLong(numStr);
}
fillResponse(Util.getVisible(request), num, response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(Util.getInt64AsString(request))) {
fillResponse(Util.getVisible(request), num, response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand All @@ -38,7 +40,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
PostParams params = PostParams.getPostParams(request);
NumberMessage.Builder build = NumberMessage.newBuilder();
JsonFormat.merge(params.getParams(), build, params.isVisible());
fillResponse(params.isVisible(), build.getNum(), response);
try (AutoCloseable ignored = JsonFormat.pushInt64AsString(params.isInt64AsString())) {
fillResponse(params.isVisible(), build.getNum(), response);
}
} catch (Exception e) {
Util.processError(e, response);
}
Expand Down
Loading
Loading