Latest deployments

Author: jmsm412

README.md

@@ -1,6 +1,6 @@
 # RAIR Smart Contracts
 Source code and deployment scripts for RAIR smart contracts.
-Notice: classic-contracts are deprecated contracts, for deployment you'll need to modify the deployment scripts with your addresses.
+Notice: classic-contracts are deprecated
 
 ## Setup
 Environment variables  
@@ -59,7 +59,8 @@ Once all diamond facets are verified you'll need to connect them with the diamon
 ### Setup calls
 | Functions | Description |
 | --- | --- | 
-| Factory.changeToken(<erc20 address>, <price to deploy>) | Configure the factory to use tokens from the ERC20 to deploy |
-| Marketplace.updateTreasuryAddress(<treasury address>) | Set the address for the treasury fees |
-| Marketplace.updateTreasuryFee(<value>) | Percentage the treasury will receive on every mint  |
-| Marketplace.grantRole(RESALE_ADMIN, <signer address>) | Approve an user address to generate resale hashes |
+| Factory.changeToken(ERC20 address, Price for deployment) | Configure the factory to use tokens from the ERC20 to deploy |
+| Factory.setSourceFacet(Facet source address) | Connect the factory to the main hub of diamond facets |
+| Marketplace.updateTreasuryAddress(Treasury address) | Set the address for the treasury fees |
+| Marketplace.updateTreasuryFee(Value) | Percentage the treasury will receive on every mint  |
+| Marketplace.grantRole(RESALE_ADMIN, Signer address) | Approve an user address to generate resale hashes |

classic-contracts/deploy/tokenFactory.js

@@ -1,6 +1,6 @@
-const {deployments} = require('hardhat');
+const {deployments, ethers} = require('hardhat');
 
-module.exports = async ({getUnnamedAccounts}) => {
+module.exports = async ({accounts, getUnnamedAccounts}) => {
   const {deploy} = deployments;
   const [deployerAddress] = await getUnnamedAccounts();
   console.log('Factory deployed at', (await deploy('RAIR_Token_Factory', {

diamond-contracts/contracts/Marketplace/Facets/ResalesFacet.sol

@@ -17,6 +17,7 @@ contract ResaleFacet is AccessControlAppStorageEnumerableMarket {
 	bytes32 public constant RESALE_ADMIN = keccak256("RESALE_ADMIN");
 
     event TokenSold(address erc721Address, address buyer, address seller, uint token, uint tokenPrice);
+    event TokenOfferCreated(address erc721Address, address seller, uint token, uint tokenPrice, uint offerId);
 
     modifier onlyOwnerOfContract(address erc721) {
         ResaleStorage.Layout storage data = ResaleStorage.layout();
@@ -110,22 +111,24 @@ contract ResaleFacet is AccessControlAppStorageEnumerableMarket {
         }
     }
 
-    function purchaseTokenOffer(
+    function _sendToken(
         address erc721,
-        address buyer,
-        address seller,
         uint token,
+        address seller,
+        address buyer,
+        uint tokenPrice
+    ) internal {
+        IERC721(erc721).transferFrom(seller, buyer, token);
+        emit TokenSold(erc721, buyer, seller, token, tokenPrice);
+    }
+
+    function _distributeFees(
+        address erc721,
         uint tokenPrice,
         address nodeAddress,
-        bytes memory signature
-    ) public payable {
+        address seller
+    ) internal {
         ResaleStorage.feeSplits[] storage royaltyData = ResaleStorage.layout().royaltySplits[erc721];
-        bytes32 messageHash = generateResaleHash(erc721, buyer, seller, token, tokenPrice, nodeAddress);
-        bytes32 ethSignedMessageHash = getSignedMessageHash(messageHash);
-        require(
-            hasRole(RESALE_ADMIN, recoverSigner(ethSignedMessageHash, signature)),
-            "Resale: Invalid withdraw request"
-        );
         require(tokenPrice <= msg.value, "Resale: Insufficient funds!");
         uint leftoverForSeller = tokenPrice;
         if (msg.value - tokenPrice > 0) {
@@ -151,7 +154,74 @@ contract ResaleFacet is AccessControlAppStorageEnumerableMarket {
         payable(address(seller)).transfer(leftoverForSeller);
         totalTransferred += leftoverForSeller;
         require(totalTransferred == tokenPrice, "Resale: Error transferring funds!");
-        IERC721(erc721).transferFrom(seller, buyer, token);
-        emit TokenSold(erc721, buyer, seller, token, tokenPrice);
+    }
+
+    function createGasTokenOffer(
+        address erc721,
+        uint token,
+        uint tokenPrice,
+        address nodeAddress
+    ) public {
+        require(
+            IERC721(erc721).ownerOf(token) == msg.sender,
+            "Resale: Not the current owner of the token"
+        );
+		ResaleStorage.resaleOffer storage newOffer = ResaleStorage.layout().resaleOffers.push();
+        newOffer.erc721 = erc721;
+        newOffer.seller = msg.sender;
+        newOffer.token = token;
+        newOffer.tokenPrice = tokenPrice;
+        newOffer.nodeAddress = nodeAddress;
+        emit TokenOfferCreated(
+            erc721,
+            msg.sender,
+            token,
+            tokenPrice,
+            ResaleStorage.layout().resaleOffers.length - 1
+        );
+    }
+
+    function purchaseGasTokenOffer(
+        uint offerIndex
+    ) public payable {
+        ResaleStorage.resaleOffer storage offerData = ResaleStorage.layout().resaleOffers[offerIndex];
+        require(
+            offerData.buyer == address(0),
+            "Resale: Offer already purchased"
+        );
+        _distributeFees(
+            offerData.erc721,
+            offerData.tokenPrice,
+            offerData.nodeAddress,
+            offerData.seller
+        );
+        _sendToken(
+            offerData.erc721,
+            offerData.token,
+            offerData.seller,
+            msg.sender,
+            offerData.tokenPrice
+        );
+        offerData.buyer = msg.sender;
+    }
+
+    function purchaseTokenOffer(
+        address erc721,
+        address buyer,
+        address seller,
+        uint token,
+        uint tokenPrice,
+        address nodeAddress,
+        bytes memory signature
+    ) public payable {
+        bytes32 messageHash = generateResaleHash(erc721, buyer, seller, token, tokenPrice, nodeAddress);
+        bytes32 ethSignedMessageHash = getSignedMessageHash(messageHash);
+        require(
+            hasRole(RESALE_ADMIN, recoverSigner(ethSignedMessageHash, signature)),
+            "Resale: Invalid withdraw request"
+        );
+
+        _distributeFees(erc721, tokenPrice, nodeAddress, seller);
+        _sendToken(erc721, token, seller, buyer, tokenPrice);
     }
 }

diamond-contracts/contracts/Marketplace/Storage/ResaleStorage.sol

@@ -10,11 +10,21 @@ library ResaleStorage {
         uint percentage;
     }
 
+    struct resaleOffer {
+        address erc721;
+        address buyer;
+        address seller;
+        uint token;
+        uint tokenPrice;
+        address nodeAddress;
+    }
+
     struct Layout {
         mapping(address => feeSplits[]) royaltySplits;
         mapping(address => address) contractOwner;
         uint purchaseGracePeriod;
         uint decimalPow;
+        resaleOffer[] resaleOffers;
     }
 
     function layout() internal pure returns (Layout storage l) {