mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-13 11:09:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Adjust bsq-swap-offer related gRPC services & msgs

Browse source 
- Adjust GetBsqSwapOffer(s) rpc services to remove currency param.
- Adjust OfferInfo and remove BsqSwapOfferInfo.
- Add GetOfferCategory service so CLI can determine what kind of takeoffer service is to be used.
- Add comment about adding sub-message BsqSwapTradeInfo field to TradeInfo.
This commit is contained in:
ghubstan 2021-11-11 12:51:00 -03:00
parent 9a1dc43088
commit 5924312e64
No known key found for this signature in database
GPG key ID: E35592D6800A861E
1 changed files with 53 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
proto/src/main/proto/grpc.proto
View file

@ -62,6 +62,8 @@ message GetMethodHelpReply {
///////////////////////////////////////////////////////////////////////////////////////////
service Offers {
rpc GetOfferCategory (GetOfferCategoryRequest) returns (GetOfferCategoryReply) {
}
rpc GetBsqSwapOffer (GetOfferRequest) returns (GetBsqSwapOfferReply) {
}
rpc GetOffer (GetOfferRequest) returns (GetOfferReply) {
@ -70,11 +72,11 @@ service Offers {
}
rpc GetMyOffer (GetMyOfferRequest) returns (GetMyOfferReply) {
}
rpc GetBsqSwapOffers (GetOffersRequest) returns (GetBsqSwapOffersReply) {
rpc GetBsqSwapOffers (GetBsqSwapOffersRequest) returns (GetBsqSwapOffersReply) {
}
rpc GetOffers (GetOffersRequest) returns (GetOffersReply) {
}
rpc GetMyBsqSwapOffers (GetMyOffersRequest) returns (GetMyBsqSwapOffersReply) {
rpc GetMyBsqSwapOffers (GetBsqSwapOffersRequest) returns (GetMyBsqSwapOffersReply) {
}
rpc GetMyOffers (GetMyOffersRequest) returns (GetMyOffersReply) {
}
@ -88,8 +90,22 @@ service Offers {
}
}
message GetOfferCategoryRequest {
string id = 1;
}
message GetOfferCategoryReply {
enum OfferCategory {
UNKNOWN = 0;
FIAT = 1;
ALTCOIN = 2;
BSQ_SWAP = 3;
}
OfferCategory offerCategory = 1;
}
message GetBsqSwapOfferReply {
BsqSwapOfferInfo bsqSwapOffer = 1;
OfferInfo bsqSwapOffer = 1;
}
message GetOfferRequest {
@ -101,7 +117,7 @@ message GetOfferReply {
}
message GetMyBsqSwapOfferReply {
BsqSwapOfferInfo bsqSwapOffer = 1;
OfferInfo bsqSwapOffer = 1;
}
message GetMyOfferRequest {
@ -121,8 +137,12 @@ message GetOffersReply {
repeated OfferInfo offers = 1;
}
message GetBsqSwapOffersRequest {
string direction = 1;
}
message GetBsqSwapOffersReply {
repeated BsqSwapOfferInfo bsqSwapOffers = 1;
repeated OfferInfo bsqSwapOffers = 1;
}
message GetMyOffersRequest {
@ -135,7 +155,7 @@ message GetMyOffersReply {
}
message GetMyBsqSwapOffersReply {
repeated BsqSwapOfferInfo bsqSwapOffers = 1;
repeated OfferInfo bsqSwapOffers = 1;
}
message CreateBsqSwapOfferRequest {
@ -147,7 +167,7 @@ message CreateBsqSwapOfferRequest {
}
message CreateBsqSwapOfferReply {
BsqSwapOfferInfo bsqSwapOffer = 1;
OfferInfo bsqSwapOffer = 1;
}
message CreateOfferRequest {
@ -204,25 +224,6 @@ message CancelOfferRequest {
message CancelOfferReply {
}
message BsqSwapOfferInfo {
string id = 1;
string direction = 2;
uint64 amount = 3;
uint64 minAmount = 4;
uint64 price = 5;
string makerPaymentAccountId = 6;
string paymentMethodId = 7;
string paymentMethodShortName = 8;
string baseCurrencyCode = 9;
string counterCurrencyCode = 10;
uint64 getMakerFee = 11;
uint64 date = 12;
string ownerNodeAddress = 13;
string pubKeyRing = 14;
string versionNr = 15;
int32 protocolVersion = 16;
}
message OfferInfo {
string id = 1;
string direction = 2;
@ -250,6 +251,11 @@ message OfferInfo {
bool isActivated = 24;
bool isMyOffer = 25;
bool isMyPendingOffer = 26;
bool isBsqSwapOffer = 27;
string ownerNodeAddress = 28;
string pubKeyRing = 29;
string versionNr = 30;
int32 protocolVersion = 31;
}
message AvailabilityResultWithDescription {
@ -460,33 +466,30 @@ message WithdrawFundsReply {
}
message BsqSwapTradeInfo {
BsqSwapOfferInfo bsqSwapOfferInfo = 1;
OfferInfo offer = 1;
string tradeId = 2;
string tempTradingPeerNodeAddress = 3;
string peerNodeAddress = 4;
string txId = 5;
uint64 bsqTradeAmount = 6;
uint64 bsqMaxTradeAmount = 7;
uint64 bsqMinTradeAmount = 8;
uint64 btcTradeAmount = 9;
uint64 btcMaxTradeAmount = 10;
uint64 btcMinTradeAmount = 11;
uint64 tradePrice = 12;
bool isCurrencyForMakerFeeBtc = 13;
bool isCurrencyForTakerFeeBtc = 14;
uint64 bsqMakerTradeFee = 15;
uint64 btcMakerTradeFee = 16;
uint64 bsqTakerTradeFee = 17;
uint64 btcTakerTradeFee = 18;
uint64 txFeePerVbyte = 19;
uint64 txFee = 20;
string makerBsqAddress = 21;
string makerBtcAddress = 22;
string takerBsqAddress = 23;
string takerBtcAddress = 24;
uint64 takeOfferDate = 25;
string state = 26;
string errorMessage = 27;
uint64 btcTradeAmount = 7;
uint64 tradePrice = 8;
bool isCurrencyForMakerFeeBtc = 9;
bool isCurrencyForTakerFeeBtc = 10;
uint64 bsqMakerTradeFee = 11;
uint64 btcMakerTradeFee = 12;
uint64 bsqTakerTradeFee = 13;
uint64 btcTakerTradeFee = 14;
uint64 txFeePerVbyte = 15;
uint64 txFee = 16;
string makerBsqAddress = 17;
string makerBtcAddress = 18;
string takerBsqAddress = 19;
string takerBtcAddress = 20;
uint64 takeOfferDate = 21;
string role = 22;
string state = 23;
string errorMessage = 24;
}
message TradeInfo {
@ -516,6 +519,8 @@ message TradeInfo {
string contractAsJson = 24;
ContractInfo contract = 25;
uint64 tradeVolume = 26;
// TODO See if a sub-message BsqSwapTradeInfo field could be added here.
// Use the existing BsqSwapTradeInfo message, without the redundant fields.
}
message ContractInfo {