Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-12 16:35:37 -04:00
Code Issues Projects Releases Packages Wiki Activity

remove offerFeeTxId from models

Browse source
This commit is contained in:
woodser 2023-08-16 07:37:59 -04:00
parent 9fb5dfb788
commit 9c5d0702ba
26 changed files with 53 additions and 290 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -533,15 +533,14 @@ message OfferInfo {
uint64 date = 17;
string state = 18;
uint64 seller_security_deposit = 19 [jstype = JS_STRING];
string offer_fee_tx_id = 20;
uint64 maker_fee = 22 [jstype = JS_STRING];
bool is_activated = 23;
bool is_my_offer = 24;
string owner_node_address = 25;
string pub_key_ring = 26;
string version_nr = 27;
int32 protocol_version = 28;
string arbitrator_signer = 29;
uint64 maker_fee = 20 [jstype = JS_STRING];
bool is_activated = 21;
bool is_my_offer = 22;
string owner_node_address = 23;
string pub_key_ring = 24;
string version_nr = 25;
int32 protocol_version = 26;
string arbitrator_signer = 27;
}
message AvailabilityResultWithDescription {

72
proto/src/main/proto/pb.proto
View file

@ -614,26 +614,25 @@ message OfferPayload {
string counter_currency_code = 12;
string payment_method_id = 13;
string maker_payment_account_id = 14;
string offer_fee_tx_id = 15;
string country_code = 16;
repeated string accepted_country_codes = 17;
string bank_id = 18;
repeated string accepted_bank_ids = 19;
string version_nr = 20;
int64 block_height_at_offer_creation = 21;
int64 maker_fee = 22;
int64 buyer_security_deposit = 23;
int64 seller_security_deposit = 24;
int64 max_trade_limit = 25;
int64 max_trade_period = 26;
bool use_auto_close = 27;
bool use_re_open_after_auto_close = 28;
int64 lower_close_price = 29;
int64 upper_close_price = 30;
bool is_private_offer = 31;
string hash_of_challenge = 32;
map<string, string> extra_data = 33;
int32 protocol_version = 34;
string country_code = 15;
repeated string accepted_country_codes = 16;
string bank_id = 17;
repeated string accepted_bank_ids = 18;
string version_nr = 19;
int64 block_height_at_offer_creation = 20;
int64 maker_fee = 21;
int64 buyer_security_deposit = 22;
int64 seller_security_deposit = 23;
int64 max_trade_limit = 24;
int64 max_trade_period = 25;
bool use_auto_close = 26;
bool use_re_open_after_auto_close = 27;
int64 lower_close_price = 28;
int64 upper_close_price = 29;
bool is_private_offer = 30;
string hash_of_challenge = 31;
map<string, string> extra_data = 32;
int32 protocol_version = 33;
NodeAddress arbitrator_signer = 1001;
bytes arbitrator_signature = 1002;
@ -1528,23 +1527,22 @@ message ProcessModel {
string offer_id = 1;
string account_id = 2;
PubKeyRing pub_key_ring = 3;
string take_offer_fee_tx_id = 4;
bytes payout_tx_signature = 5;
bool use_savings_wallet = 6;
int64 funds_needed_for_trade = 7;
string payment_sent_message_state = 8;
bytes maker_signature = 10;
TradePeer maker = 11;
TradePeer taker = 12;
TradePeer arbitrator = 13;
NodeAddress temp_trade_peer_node_address = 14;
string multisig_address = 15;
PaymentSentMessage payment_sent_message = 16;
PaymentReceivedMessage payment_received_message = 17;
DisputeClosedMessage dispute_closed_message = 18;
bytes mediated_payout_tx_signature = 19; // placeholder if mediation used in future
int64 buyer_payout_amount_from_mediation = 20;
int64 seller_payout_amount_from_mediation = 21;
bytes payout_tx_signature = 4;
bool use_savings_wallet = 5;
int64 funds_needed_for_trade = 6;
string payment_sent_message_state = 7;
bytes maker_signature = 8;
TradePeer maker = 9;
TradePeer taker = 10;
TradePeer arbitrator = 11;
NodeAddress temp_trade_peer_node_address = 12;
string multisig_address = 13;
PaymentSentMessage payment_sent_message = 14;
PaymentReceivedMessage payment_received_message = 15;
DisputeClosedMessage dispute_closed_message = 16;
bytes mediated_payout_tx_signature = 17; // placeholder if mediation used in future
int64 buyer_payout_amount_from_mediation = 18;
int64 seller_payout_amount_from_mediation = 19;
}
message TradePeer {