Skip to content
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

fix: do not lowercase address #870

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix: do not lowercase address #870

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
fd0b829
fix: script
Jul 25, 2023
720f905
fix: do not lowercase addresses
Jul 25, 2023
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
2 changes: 1 addition & 1 deletion devnet/docker/icon-bsc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ stoprelayimg:
./build.sh stoprelayimg

buildimglocal:
./build.sh buildimg
./build.sh buildimglocal

runimglocal:
./build.sh runimglocal
Expand Down
6 changes: 3 additions & 3 deletions javascore/bts/src/main/java/foundation/icon/btp/bts/BTPTokenService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ public void addBlacklistAddress(String _net, String[] _addresses) {
List<String> blacklist = new ArrayList<>();

for (String addr: _addresses) {
addr = lowercase(addr);
addr = trimWhitespace(addr);
if (! isUserBlackListed(_net, addr) && addr.length() > 0) {
if (_net.equals(net) && !isValidIconAddress(addr)) {
continue;
Expand Down Expand Up @@ -1456,8 +1456,8 @@ private BigInteger increaseSn() {
return newSn;
}

private String lowercase(String word) {
return word.trim().toLowerCase();
private String trimWhitespace(String word) {
return word.trim();
}

private String[] getLinks() {
Expand Down
10 changes: 5 additions & 5 deletions javascore/bts/src/main/java/foundation/icon/btp/bts/BlacklistDB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ public String at(String net, int index) {
return null;
}

private String lowercase(String user) {
return user.trim().toLowerCase();
private String trimWhitespace(String user) {
return user.trim();
}

public Integer indexOf(String net, String user) {
Expand All @@ -65,13 +65,13 @@ public Integer indexOf(String net, String user) {
public boolean contains(String net, String user) {
var a = blacklistIndex.at(net);
if (a != null) {
return a.get(lowercase(user)) != null;
return a.get(trimWhitespace(user)) != null;
}
return false;
}

public void addToBlacklist(String net, String user) {
user = lowercase(user);
user = trimWhitespace(user);
if (!contains(net, user)) {
blacklistedUsers.at(net).add(user);
int size = length(net);
Expand All @@ -80,7 +80,7 @@ public void addToBlacklist(String net, String user) {
}

public String removeFromBlacklist(String net, String user) {
user = lowercase(user);
user = trimWhitespace(user);
Integer valueIdx = indexOf(net, user);
var netUsers = blacklistedUsers.at(net);
var netIndex = blacklistIndex.at(net);
Expand Down