nihilist/haveno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support getXmrPrimaryAddress(), getXmrNewSubaddress()

Browse Source
This commit is contained in:
woodser 2022-05-15 13:46:01 -04:00
parent fa15612586
commit ffccf83ac5
4 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/bisq/core/api/CoreApi.java
View File

@ -273,8 +273,12 @@ public class CoreApi {
return walletsService.getXmrSeed(); return walletsService.getXmrSeed();
} }
public String getNewDepositAddress() { public String getXmrPrimaryAddress() {
return walletsService.getNewDepositAddress(); return walletsService.getXmrPrimaryAddress();
}
public String getXmrNewSubaddress() {
return walletsService.getXmrNewSubaddress();
} }
public List<MoneroTxWallet> getXmrTxs() { public List<MoneroTxWallet> getXmrTxs() {

6
core/src/main/java/bisq/core/api/CoreWalletsService.java
View File

@ -165,7 +165,11 @@ class CoreWalletsService {
return xmrWalletService.getWallet().getMnemonic(); return xmrWalletService.getWallet().getMnemonic();
} }
String getNewDepositAddress() { String getXmrPrimaryAddress() {
return xmrWalletService.getWallet().getPrimaryAddress();
}
String getXmrNewSubaddress() {
accountService.checkAccountOpen(); accountService.checkAccountOpen();
return xmrWalletService.getWallet().createSubaddress(0).getAddress(); return xmrWalletService.getWallet().createSubaddress(0).getAddress();
} }

28
daemon/src/main/java/bisq/daemon/grpc/GrpcWalletsService.java
View File

@ -28,8 +28,10 @@ import bisq.proto.grpc.GetBalancesReply;
import bisq.proto.grpc.GetBalancesRequest; import bisq.proto.grpc.GetBalancesRequest;
import bisq.proto.grpc.GetFundingAddressesReply; import bisq.proto.grpc.GetFundingAddressesReply;
import bisq.proto.grpc.GetFundingAddressesRequest; import bisq.proto.grpc.GetFundingAddressesRequest;
import bisq.proto.grpc.GetNewDepositAddressRequest; import bisq.proto.grpc.GetXmrNewSubaddressRequest;
import bisq.proto.grpc.GetNewDepositAddressReply; import bisq.proto.grpc.GetXmrPrimaryAddressReply;
import bisq.proto.grpc.GetXmrPrimaryAddressRequest;
import bisq.proto.grpc.GetXmrNewSubaddressReply;
import bisq.proto.grpc.GetXmrTxsRequest; import bisq.proto.grpc.GetXmrTxsRequest;
import bisq.proto.grpc.GetXmrTxsReply; import bisq.proto.grpc.GetXmrTxsReply;
import bisq.proto.grpc.CreateXmrTxRequest; import bisq.proto.grpc.CreateXmrTxRequest;
@ -134,11 +136,25 @@ class GrpcWalletsService extends WalletsImplBase {
} }
@Override @Override
public void getNewDepositAddress(GetNewDepositAddressRequest req, public void getXmrPrimaryAddress(GetXmrPrimaryAddressRequest req,
StreamObserver<GetNewDepositAddressReply> responseObserver) { StreamObserver<GetXmrPrimaryAddressReply> responseObserver) {
try { try {
String subaddress = coreApi.getNewDepositAddress(); var reply = GetXmrPrimaryAddressReply.newBuilder()
var reply = GetNewDepositAddressReply.newBuilder() .setPrimaryAddress(coreApi.getXmrPrimaryAddress())
.build();
responseObserver.onNext(reply);
responseObserver.onCompleted();
} catch (Throwable cause) {
exceptionHandler.handleException(log, cause, responseObserver);
}
}
@Override
public void getXmrNewSubaddress(GetXmrNewSubaddressRequest req,
StreamObserver<GetXmrNewSubaddressReply> responseObserver) {
try {
String subaddress = coreApi.getXmrNewSubaddress();
var reply = GetXmrNewSubaddressReply.newBuilder()
.setSubaddress(subaddress) .setSubaddress(subaddress)
.build(); .build();
responseObserver.onNext(reply); responseObserver.onNext(reply);

15
proto/src/main/proto/grpc.proto
View File

@ -858,7 +858,9 @@ service Wallets {
} }
rpc GetXmrSeed (GetXmrSeedRequest) returns (GetXmrSeedReply) { rpc GetXmrSeed (GetXmrSeedRequest) returns (GetXmrSeedReply) {
} }
rpc GetNewDepositAddress (GetNewDepositAddressRequest) returns (GetNewDepositAddressReply) { rpc GetXmrPrimaryAddress (GetXmrPrimaryAddressRequest) returns (GetXmrPrimaryAddressReply) {
}
rpc GetXmrNewSubaddress (GetXmrNewSubaddressRequest) returns (GetXmrNewSubaddressReply) {
} }
rpc GetXmrTxs (GetXmrTxsRequest) returns (GetXmrTxsReply) { rpc GetXmrTxs (GetXmrTxsRequest) returns (GetXmrTxsReply) {
} }
@ -905,10 +907,17 @@ message GetXmrSeedReply {
string seed = 1; string seed = 1;
} }
message GetNewDepositAddressRequest { message GetXmrPrimaryAddressRequest {
} }
message GetNewDepositAddressReply { message GetXmrPrimaryAddressReply {
string primary_address = 1;
}
message GetXmrNewSubaddressRequest {
}
message GetXmrNewSubaddressReply {
string subaddress = 1; string subaddress = 1;
} }