Merge pull request #131 from stejbac/change-musigrpc-txid-fields-to-strings

Change contractual txid fields to strings in `rpc.proto`

Author: ChrisSon15

rpc/build.rs

@@ -26,11 +26,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         // Add Serde serialization for musigrpc request types...
         .serde_serialized_types(&[
             "ReceiverAddressAndAmount", "PartialSignaturesRequest", "DepositTxSignatureRequest",
-            "PublishDepositTxRequest", "SubscribeTxConfirmationStatusRequest"
-        ])
-        .serde_serialized_type("ContractualTxIds", &[
-            rev_hex("depositTxId"), rev_hex("buyersWarningTxId"), rev_hex("sellersWarningTxId"),
-            rev_hex("buyersRedirectTxId"), rev_hex("sellersRedirectTxId")
+            "PublishDepositTxRequest", "SubscribeTxConfirmationStatusRequest", "ContractualTxIds"
         ])
         .serde_serialized_type("PubKeySharesRequest", &[
             enum_field("myRole", "Role")

rpc/src/main/proto/rpc.proto

@@ -33,11 +33,11 @@ message ReceiverAddressAndAmount {
 }
 
 message ContractualTxIds {
-  bytes depositTxId = 1;
-  bytes buyersWarningTxId = 2;
-  bytes sellersWarningTxId = 3;
-  bytes buyersRedirectTxId = 4;
-  bytes sellersRedirectTxId = 5;
+  string depositTxId = 1;
+  string buyersWarningTxId = 2;
+  string sellersWarningTxId = 3;
+  string buyersRedirectTxId = 4;
+  string sellersRedirectTxId = 5;
 }
 
 message PubKeySharesRequest {
@@ -48,41 +48,43 @@ message PubKeySharesRequest {
 message PubKeySharesResponse {
   bytes buyerOutputPubKeyShare = 1;
   bytes sellerOutputPubKeyShare = 2;
-  uint32 currentBlockHeight = 3;
+  // bytes multisigScriptKey = 3; TODO: Uncomment - provisionally added to Bisq2 side.
+  uint32 currentBlockHeight = 4;
 }
 
 message NonceSharesRequest {
   string tradeId = 1;
   bytes buyerOutputPeersPubKeyShare = 2;
   bytes sellerOutputPeersPubKeyShare = 3;
-  uint64 depositTxFeeRate = 4;       // sats per kwu
-  uint64 preparedTxFeeRate = 5;      // sats per kwu
-  uint64 tradeAmount = 6;            // sats
-  uint64 buyersSecurityDeposit = 7;  // sats
-  uint64 sellersSecurityDeposit = 8; // sats
-  ReceiverAddressAndAmount tradeFeeReceiver = 9;
+  // bytes peersMultisigScriptKey = 4; TODO: Uncomment - provisionally added to Bisq2 side.
+  uint64 depositTxFeeRate = 5;       // sats per kwu
+  uint64 preparedTxFeeRate = 6;      // sats per kwu
+  uint64 tradeAmount = 7;            // sats
+  uint64 buyersSecurityDeposit = 8;  // sats
+  uint64 sellersSecurityDeposit = 9; // sats
+  optional ReceiverAddressAndAmount tradeFeeReceiver = 10;
 }
 
 message NonceSharesMessage {
   string warningTxFeeBumpAddress = 1;
   string redirectTxFeeBumpAddress = 2;
-  string claimTxPayoutAddress = 11;
-  bytes halfDepositPsbt = 3;
-  uint64 redirectionAmountMsat = 14; // (millisatoshis)
-  bytes swapTxInputNonceShare = 4;
-  bytes buyersWarningTxBuyerInputNonceShare = 5;
-  bytes buyersWarningTxSellerInputNonceShare = 6;
-  bytes sellersWarningTxBuyerInputNonceShare = 7;
-  bytes sellersWarningTxSellerInputNonceShare = 8;
-  bytes buyersRedirectTxInputNonceShare = 9;
-  bytes sellersRedirectTxInputNonceShare = 10;
-  bytes buyersClaimTxInputNonceShare = 12;
-  bytes sellersClaimTxInputNonceShare = 13;
+  string claimTxPayoutAddress = 3;
+  bytes halfDepositPsbt = 4;
+  uint64 redirectionAmountMsat = 5; // (millisatoshis)
+  bytes swapTxInputNonceShare = 6;
+  bytes buyersWarningTxBuyerInputNonceShare = 7;
+  bytes buyersWarningTxSellerInputNonceShare = 8;
+  bytes sellersWarningTxBuyerInputNonceShare = 9;
+  bytes sellersWarningTxSellerInputNonceShare = 10;
+  bytes buyersRedirectTxInputNonceShare = 11;
+  bytes sellersRedirectTxInputNonceShare = 12;
+  bytes buyersClaimTxInputNonceShare = 13;
+  bytes sellersClaimTxInputNonceShare = 14;
 }
 
 message PartialSignaturesRequest {
   string tradeId = 1;
-  NonceSharesMessage peersNonceShares = 2;
+  optional NonceSharesMessage peersNonceShares = 2;
   repeated ReceiverAddressAndAmount redirectionReceivers = 3;
   bool buyerReadyToRelease = 4;
 }
@@ -91,10 +93,10 @@ message PartialSignaturesMessage {
   bytes peersWarningTxBuyerInputPartialSignature = 1;
   bytes peersWarningTxSellerInputPartialSignature = 2;
   bytes peersRedirectTxInputPartialSignature = 3;
-  bytes peersClaimTxInputPartialSignature = 6;
-  optional bytes swapTxInputPartialSignature = 4;
-  optional bytes swapTxInputSighash = 5;
-  ContractualTxIds contractualTxIds = 7;
+  bytes peersClaimTxInputPartialSignature = 4;
+  optional bytes swapTxInputPartialSignature = 5;
+  optional bytes swapTxInputSighash = 6;
+  optional ContractualTxIds contractualTxIds = 7;
 }
 
 message DepositTxSignatureRequest {

rpc/src/pb/convert.rs

@@ -246,14 +246,14 @@ impl From<SentAddressesNoncesPair<'_>> for NonceSharesMessage {
     }
 }
 
-impl From<ContractualTxids> for crate::pb::musigrpc::ContractualTxIds {
+impl From<ContractualTxids> for musigrpc::ContractualTxIds {
     fn from(value: ContractualTxids) -> Self {
         Self {
-            deposit_tx_id: value.deposit.to_byte_array().into(),
-            buyers_warning_tx_id: value.buyers_warning.to_byte_array().into(),
-            sellers_warning_tx_id: value.sellers_warning.to_byte_array().into(),
-            buyers_redirect_tx_id: value.buyers_redirect.to_byte_array().into(),
-            sellers_redirect_tx_id: value.sellers_redirect.to_byte_array().into(),
+            deposit_tx_id: value.deposit.to_string(),
+            buyers_warning_tx_id: value.buyers_warning.to_string(),
+            sellers_warning_tx_id: value.sellers_warning.to_string(),
+            buyers_redirect_tx_id: value.buyers_redirect.to_string(),
+            sellers_redirect_tx_id: value.sellers_redirect.to_string(),
         }
     }
 }