fix: NonexistentOffer | OfferAlreadyExists error

bakstag-finance · Aug 7, 2024 · d816854 · d816854
1 parent aa8033b
commit d816854
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/contracts/protocol/OtcMarketAcceptOffer.sol b/contracts/protocol/OtcMarketAcceptOffer.sol
@@ -78,25 +78,24 @@ abstract contract OtcMarketAcceptOffer is IOtcMarketAcceptOffer, OtcMarketCore {
         _validateAcceptOffer(_params); // revert
         Offer storage offer = offers[_params.offerId];
 
-
         if (offer.dstEid != offer.srcEid) {
             (bytes memory payload, bytes memory options) = _buildAcceptOfferMsgAndOptions(
                 _dstBuyerAddress,
                 offer.srcEid,
                 _params
             ); // revert
             fee = _quote(offer.srcEid, payload, options, _payInLzToken);
-        }else{
-            fee = MessagingFee(0,0);
+        } else {
+            fee = MessagingFee(0, 0);
         }
-        
+
         acceptOfferReceipt = _toDstAmount(_params.srcAmountSD, offer.exchangeRateSD, offer.dstTokenAddress.toAddress()); // revert
     }
 
     function _validateAcceptOffer(AcceptOfferParams calldata _params) internal view virtual {
         Offer storage offer = offers[_params.offerId];
 
-        if (offer.srcAmountSD == 0) {
+        if (offer.exchangeRateSD == 0) {
             revert NonexistentOffer(_params.offerId);
         }
         if (eid != offer.dstEid) {

diff --git a/contracts/protocol/OtcMarketCancelOffer.sol b/contracts/protocol/OtcMarketCancelOffer.sol
@@ -80,7 +80,7 @@ abstract contract OtcMarketCancelOffer is IOtcMarketCancelOffer, OtcMarketCore {
     function _validateCancelOffer(bytes32 _srcSellerAddress, bytes32 _offerId) internal view virtual {
         Offer storage offer = offers[_offerId];
 
-        if (offer.srcAmountSD == 0) {
+        if (offer.exchangeRateSD == 0) {
             revert NonexistentOffer(_offerId);
         }
         if (eid != offer.srcEid) {

diff --git a/contracts/protocol/OtcMarketCreateOffer.sol b/contracts/protocol/OtcMarketCreateOffer.sol
@@ -50,7 +50,7 @@ abstract contract OtcMarketCreateOffer is IOtcMarketCreateOffer, OtcMarketCore {
             _params.dstTokenAddress,
             _params.exchangeRateSD
         );
-        if (offers[offerId].srcAmountSD != 0) {
+        if (offers[offerId].exchangeRateSD != 0) {
             revert OfferAlreadyExists(offerId);
         }
 
@@ -96,7 +96,7 @@ abstract contract OtcMarketCreateOffer is IOtcMarketCreateOffer, OtcMarketCore {
             _params.dstTokenAddress,
             _params.exchangeRateSD
         );
-        if (offers[offerId].srcAmountSD != 0) {
+        if (offers[offerId].exchangeRateSD != 0) {
             revert OfferAlreadyExists(offerId);
         } // revert
 
@@ -116,7 +116,7 @@ abstract contract OtcMarketCreateOffer is IOtcMarketCreateOffer, OtcMarketCore {
             ); // revert
 
             fee = _quote(_params.dstEid, payload, options, _payInLzToken);
-        } else{
+        } else {
             fee = MessagingFee(0, 0);
         }
         createOfferReceipt = CreateOfferReceipt(offerId, srcAmountLD);