sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2025-11-05 11:56:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix cormorant server.version rpc issue

Browse source
This commit is contained in:
Craig Raw 2025-06-04 17:18:31 +02:00
parent 890f0476b1
commit c265fd1969
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/sparrowwallet/sparrow/net/SimpleElectrumServerRpc.java
View file

@ -39,7 +39,7 @@ public class SimpleElectrumServerRpc implements ElectrumServerRpc {
@Override @Override
public List<String> getServerVersion(Transport transport, String clientName, String[] supportedVersions) { public List<String> getServerVersion(Transport transport, String clientName, String[] supportedVersions) {
if(Config.get().isLegacyServer()) { if(Config.get().getServerType() == ServerType.ELECTRUM_SERVER && Config.get().isLegacyServer()) {
return getLegacyServerVersion(transport, clientName); return getLegacyServerVersion(transport, clientName);
} }

7
src/main/java/com/sparrowwallet/sparrow/net/cormorant/electrum/ElectrumServerService.java
View file

@ -35,10 +35,11 @@ public class ElectrumServerService {
} }
@JsonRpcMethod("server.version") @JsonRpcMethod("server.version")
public List<String> getServerVersion(@JsonRpcParam("client_name") String clientName, @JsonRpcParam("protocol_version") String protocolVersion) throws UnsupportedVersionException { public List<String> getServerVersion(@JsonRpcParam("client_name") String clientName, @JsonRpcParam("protocol_version") String[] protocolVersion) throws UnsupportedVersionException {
Version clientVersion = new Version(protocolVersion); String version = protocolVersion.length > 1 ? protocolVersion[1] : protocolVersion[0];
Version clientVersion = new Version(version);
if(clientVersion.compareTo(VERSION) < 0) { if(clientVersion.compareTo(VERSION) < 0) {
throw new UnsupportedVersionException(protocolVersion); throw new UnsupportedVersionException(version);
} }
return List.of(Cormorant.SERVER_NAME + " " + SparrowWallet.APP_VERSION, VERSION.get()); return List.of(Cormorant.SERVER_NAME + " " + SparrowWallet.APP_VERSION, VERSION.get());