fix: looksrare & blur adapter recipient

Signed-off-by: GopherJ <[email protected]>

Author: 0x8f701

contracts/misc/marketplaces/BlurAdapter.sol

@@ -67,9 +67,9 @@ contract BlurAdapter is IMarketplace {
             itemType,
             token,
             0,
-            sell.order.price,
-            sell.order.price,
-            payable(buy.order.trader)
+            buy.order.price,
+            buy.order.price,
+            payable(sell.order.trader)
         );
         orderInfo.id = abi.encodePacked(sell.r, sell.s, sell.v);
         orderInfo.consideration = consideration;

contracts/misc/marketplaces/LooksRareAdapter.sol

@@ -69,9 +69,9 @@ contract LooksRareAdapter is IMarketplace {
             itemType,
             token,
             0,
-            makerAsk.price, // TODO: take minPercentageToAsk into account
-            makerAsk.price,
-            payable(takerBid.taker)
+            takerBid.price, // TODO: take minPercentageToAsk into account
+            takerBid.price,
+            payable(makerAsk.signer)
         );
         orderInfo.id = abi.encodePacked(makerAsk.r, makerAsk.s, makerAsk.v);
         orderInfo.consideration = consideration;

test/_pool_marketplace_accept_bid_with_credit.spec.ts

@@ -1315,7 +1315,8 @@ describe("Leveraged Bid - unit tests", () => {
       creditAmount,
       nftId,
       maker,
-      taker
+      taker,
+      true
     );
     const usdcConfigData = BigNumber.from(
       (await pool.getUserConfiguration(taker.address)).data

test/_pool_marketplace_buy_with_credit.spec.ts

@@ -1511,7 +1511,8 @@ describe("Leveraged Buy - Positive tests", () => {
       creditAmount,
       nftId,
       maker,
-      taker
+      taker,
+      true
     );
 
     const usdcConfigData = BigNumber.from(

test/helpers/marketplace-helper.ts

@@ -304,7 +304,7 @@ export async function executeSeaportBuyWithCredit(
   nftId: number,
   maker: SignerWithAddress,
   taker: SignerWithAddress,
-  _sellOrderStartAmount = 1
+  isCollateralSwap = false
 ) {
   // approve
   await waitForTx(
@@ -316,13 +316,7 @@ export async function executeSeaportBuyWithCredit(
   const seaport = await getSeaport();
   const getSellOrder = async (): Promise<AdvancedOrder> => {
     const offers = [
-      getOfferOrConsiderationItem(
-        2,
-        tokenToBuy.address,
-        nftId,
-        _sellOrderStartAmount,
-        _sellOrderStartAmount
-      ),
+      getOfferOrConsiderationItem(2, tokenToBuy.address, nftId, 1, 1),
     ];
 
     const considerations = [
@@ -332,7 +326,7 @@ export async function executeSeaportBuyWithCredit(
         nftId,
         startAmount,
         endAmount,
-        maker.address
+        isCollateralSwap ? pool.address : maker.address
       ),
     ];
 
@@ -382,7 +376,8 @@ export async function executeAcceptBidWithCredit(
   payLaterAmount: BigNumberish,
   nftId: number,
   maker: SignerWithAddress,
-  taker: SignerWithAddress
+  taker: SignerWithAddress,
+  isCollateralSwap = false
 ) {
   const pool = await getPoolProxy();
   const seaport = await getSeaport();
@@ -451,7 +446,7 @@ export async function executeAcceptBidWithCredit(
         toBN(0),
         startAmount,
         endAmount,
-        taker.address
+        isCollateralSwap ? pool.address : taker.address
       ),
     ];