Merge branch 'fix/escrow'

Author: cinnabarhorse

contracts/Aavegotchi/facets/AavegotchiFacet.sol

@@ -167,7 +167,9 @@ contract AavegotchiFacet is Modifiers {
     function safeTransferFrom(address _from, address _to, uint256 _tokenId, bytes calldata _data) external {
         address sender = LibMeta.msgSender();
         internalTransferFrom(sender, _from, _to, _tokenId);
-        CollateralEscrow(payable(s.aavegotchis[_tokenId].escrow)).transferOwnership(_to);
+        if (s.aavegotchis[_tokenId].status == LibAavegotchi.STATUS_AAVEGOTCHI) {
+            CollateralEscrow(payable(s.aavegotchis[_tokenId].escrow)).transferOwnership(_to);
+        }
         LibERC721.checkOnERC721Received(sender, _from, _to, _tokenId, _data);
     }
 
@@ -189,7 +191,9 @@ contract AavegotchiFacet is Modifiers {
         for (uint256 index = 0; index < _tokenIds.length; index++) {
             uint256 _tokenId = _tokenIds[index];
             internalTransferFrom(sender, _from, _to, _tokenId);
-            CollateralEscrow(payable(s.aavegotchis[_tokenId].escrow)).transferOwnership(_to);
+            if (s.aavegotchis[_tokenId].status == LibAavegotchi.STATUS_AAVEGOTCHI) {
+                CollateralEscrow(payable(s.aavegotchis[_tokenId].escrow)).transferOwnership(_to);
+            }
             LibERC721.checkOnERC721Received(sender, _from, _to, _tokenId, _data);
         }
     }
@@ -203,7 +207,9 @@ contract AavegotchiFacet is Modifiers {
     function safeTransferFrom(address _from, address _to, uint256 _tokenId) external {
         address sender = LibMeta.msgSender();
         internalTransferFrom(sender, _from, _to, _tokenId);
-        CollateralEscrow(payable(s.aavegotchis[_tokenId].escrow)).transferOwnership(_to);
+        if (s.aavegotchis[_tokenId].status == LibAavegotchi.STATUS_AAVEGOTCHI) {
+            CollateralEscrow(payable(s.aavegotchis[_tokenId].escrow)).transferOwnership(_to);
+        }
         LibERC721.checkOnERC721Received(sender, _from, _to, _tokenId, "");
     }
 
@@ -219,7 +225,9 @@ contract AavegotchiFacet is Modifiers {
     /// @param _tokenId The NFT to transfer
     function transferFrom(address _from, address _to, uint256 _tokenId) external {
         internalTransferFrom(LibMeta.msgSender(), _from, _to, _tokenId);
-        CollateralEscrow(payable(s.aavegotchis[_tokenId].escrow)).transferOwnership(_to);
+        if (s.aavegotchis[_tokenId].status == LibAavegotchi.STATUS_AAVEGOTCHI) {
+            CollateralEscrow(payable(s.aavegotchis[_tokenId].escrow)).transferOwnership(_to);
+        }
     }
 
     // This function is used by transfer functions

contracts/Aavegotchi/facets/ERC721BuyOrderFacet.sol

@@ -236,7 +236,9 @@ contract ERC721BuyOrderFacet is Modifiers {
             LibAavegotchi.transfer(sender, erc721BuyOrder.buyer, _erc721TokenId);
 
             //transfer escrow ownership
-            CollateralEscrow(payable(s.aavegotchis[erc721BuyOrder.erc721TokenId].escrow)).transferOwnership(erc721BuyOrder.buyer);
+            if (LibAavegotchi.getAavegotchi(_erc721TokenId).status == LibAavegotchi.STATUS_AAVEGOTCHI) {
+                CollateralEscrow(payable(s.aavegotchis[erc721BuyOrder.erc721TokenId].escrow)).transferOwnership(erc721BuyOrder.buyer);
+            }
             LibERC721Marketplace.updateERC721Listing(address(this), _erc721TokenId, sender);
         } else {
             IERC721(_erc721TokenAddress).safeTransferFrom(sender, erc721BuyOrder.buyer, _erc721TokenId);

contracts/Aavegotchi/facets/ERC721MarketplaceFacet.sol

@@ -165,7 +165,9 @@ contract ERC721MarketplaceFacet is Modifiers {
         if (_erc721TokenAddress == address(this)) {
             s.aavegotchis[_erc721TokenId].locked = true;
             //transfer escrow ownership
-            CollateralEscrow(payable(s.aavegotchis[_erc721TokenId].escrow)).transferOwnership(address(0));
+            if (_category == LibAavegotchi.STATUS_AAVEGOTCHI) {
+                CollateralEscrow(payable(s.aavegotchis[_erc721TokenId].escrow)).transferOwnership(address(0));
+            }
         }
 
         //Burn listing fee
@@ -317,7 +319,9 @@ contract ERC721MarketplaceFacet is Modifiers {
         if (listing.erc721TokenAddress == address(this)) {
             s.aavegotchis[listing.erc721TokenId].locked = false;
             //transfer escrow ownership
-            CollateralEscrow(payable(s.aavegotchis[listing.erc721TokenId].escrow)).transferOwnership(buyer);
+            if (listing.category == LibAavegotchi.STATUS_AAVEGOTCHI) {
+                CollateralEscrow(payable(s.aavegotchis[listing.erc721TokenId].escrow)).transferOwnership(buyer);
+            }
             LibAavegotchi.transfer(seller, _recipient, listing.erc721TokenId);
         } else {
             // External contracts

contracts/Aavegotchi/libraries/LibERC721Marketplace.sol

@@ -30,7 +30,9 @@ library LibERC721Marketplace {
         if (listing.erc721TokenAddress == address(this)) {
             s.aavegotchis[listing.erc721TokenId].locked = false;
             //transfer escrow ownership back to owner
-            CollateralEscrow(payable(s.aavegotchis[listing.erc721TokenId].escrow)).transferOwnership(listing.seller);
+            if (listing.category == 3) {
+                CollateralEscrow(payable(s.aavegotchis[listing.erc721TokenId].escrow)).transferOwnership(listing.seller);
+            }
         }
 
         emit ERC721ListingCancelled(_listingId, listing.category, block.number);

scripts/upgrades/base/upgrade-escrowOwnershiptransfer.ts

@@ -8,6 +8,8 @@ import {
 import { varsForNetwork } from "../../../helpers/constants";
 import { PC_WALLET } from "../../geistBridge/paths";
 
+//adds the aavegotchi status check before escrow transfers
+
 export async function upgrade() {
   const c = await varsForNetwork(ethers);
   const facets: FacetsAndAddSelectors[] = [
@@ -16,26 +18,11 @@ export async function upgrade() {
       addSelectors: [],
       removeSelectors: [],
     },
-    {
-      facetName: "AavegotchiGameFacet",
-      addSelectors: [],
-      removeSelectors: [],
-    },
     {
       facetName: "ERC721BuyOrderFacet",
       addSelectors: [],
       removeSelectors: [],
     },
-    {
-      facetName: "GotchiLendingFacet",
-      addSelectors: [],
-      removeSelectors: [],
-    },
-    {
-      facetName: "GotchiLendingFacet",
-      addSelectors: [],
-      removeSelectors: [],
-    },
     {
       facetName: "ERC721MarketplaceFacet",
       addSelectors: [],