git.delta.rocks / unique-network / refs/commits / 6d585f930166

difftreelog

chore use contractOwner method in contract

Grigoriy Simonov2022-08-11parent: #7e5f909.patch.diff
in: master

1 file changed

modifiedtests/src/eth/fractionalizer/Fractionalizer.soldiffbeforeafterboth
before · tests/src/eth/fractionalizer/Fractionalizer.sol
1// SPDX-License-Identifier:  Apache License2pragma solidity >=0.8.0;3import {CollectionHelpers} from "../api/CollectionHelpers.sol";4import {ContractHelpers} from "../api/ContractHelpers.sol";5import {UniqueRefungibleToken} from "../api/UniqueRefungibleToken.sol";6import {UniqueRefungible} from "../api/UniqueRefungible.sol";7import {UniqueNFT} from "../api/UniqueNFT.sol";89contract Fractionalizer {10    struct Token {11        address _collection;12        uint256 _tokenId;13    }14    address rftCollection;15    mapping(address => bool) nftCollectionAllowList;16    mapping(address => mapping(uint256 => uint256)) nft2rftMapping;17    mapping(address => Token) rft2nftMapping;18    address owner;19    bytes32 refungibleCollectionType = keccak256(bytes("ReFungible"));2021    constructor() {22        owner = msg.sender;23    }2425    modifier onlyOwner() {26        require(msg.sender == owner, "Only owner can");27        _;28    }2930    event RFTCollectionSet(address _collection);31    event AllowListSet(address _collection, bool _status);32    event Fractionalized(address _collection, uint256 _tokenId, address _rftToken, uint128 _amount);33    event Defractionalized(address _rftToken, address _nftCollection, uint256 _nftTokenId);3435    function setRFTCollection(address _collection) public onlyOwner {36        require(37            rftCollection == address(0),38            "RFT collection is already set"39        );40        UniqueRefungible refungibleContract = UniqueRefungible(_collection);41        string memory collectionType = refungibleContract.uniqueCollectionType();42        43        require(44            keccak256(bytes(collectionType)) == refungibleCollectionType,45            "Wrong collection type. Collection is not refungible."46        );47        require(48            refungibleContract.verifyOwnerOrAdmin(),49            "Fractionalizer contract should be an admin of the collection"50        );51        rftCollection = _collection;52        emit RFTCollectionSet(rftCollection);53    }5455    function createAndSetRFTCollection(string calldata _name, string calldata _description, string calldata _tokenPrefix) public onlyOwner {56        require(57            rftCollection == address(0),58            "RFT collection is already set"59        );60        address collectionHelpers = 0x6C4E9fE1AE37a41E93CEE429e8E1881aBdcbb54F;61        rftCollection = CollectionHelpers(collectionHelpers).createRefungibleCollection(_name, _description, _tokenPrefix);62        emit RFTCollectionSet(rftCollection);63    }6465    function setNftCollectionIsAllowed(address collection, bool status) public onlyOwner {66        nftCollectionAllowList[collection] = status;67        emit AllowListSet(collection, status);68    }6970    function nft2rft(address _collection, uint256 _token, uint128 _pieces) public {71        require(72            rftCollection != address(0),73            "RFT collection is not set"74        );75        UniqueRefungible rftCollectionContract = UniqueRefungible(rftCollection);76        require(77            nftCollectionAllowList[_collection] == true,78            "Fractionalization of this collection is not allowed by admin"79        );80        require(81            UniqueNFT(_collection).ownerOf(_token) == msg.sender,82            "Only token owner could fractionalize it"83        );84        UniqueNFT(_collection).transferFrom(85            msg.sender,86            address(this),87            _token88        );89        uint256 rftTokenId;90        address rftTokenAddress;91        UniqueRefungibleToken rftTokenContract;92        if (nft2rftMapping[_collection][_token] == 0) {93            rftTokenId = rftCollectionContract.nextTokenId();94            rftCollectionContract.mint(address(this), rftTokenId);95            rftTokenAddress = rftCollectionContract.tokenContractAddress(rftTokenId);96            nft2rftMapping[_collection][_token] = rftTokenId;97            rft2nftMapping[rftTokenAddress] = Token(_collection, _token);9899            rftTokenContract = UniqueRefungibleToken(rftTokenAddress);100            rftTokenContract.setParentNFT(_collection, _token);101        } else {102            rftTokenId = nft2rftMapping[_collection][_token];103            rftTokenAddress = rftCollectionContract.tokenContractAddress(rftTokenId);104            rftTokenContract = UniqueRefungibleToken(rftTokenAddress);105        }106        rftTokenContract.repartition(_pieces);107        rftTokenContract.transfer(msg.sender, _pieces);108        emit Fractionalized(_collection, _token, rftTokenAddress, _pieces);109    }110111    function rft2nft(address _collection, uint256 _token) public {112        require(113            rftCollection != address(0),114            "RFT collection is not set"115        );116        require(117            rftCollection == _collection,118            "Wrong RFT collection"119        );120        UniqueRefungible rftCollectionContract = UniqueRefungible(rftCollection);121        address rftTokenAddress = rftCollectionContract.tokenContractAddress(_token);122        Token memory nftToken = rft2nftMapping[rftTokenAddress];123        require(124            nftToken._collection != address(0),125            "No corresponding NFT token found"126        );127        UniqueRefungibleToken rftTokenContract = UniqueRefungibleToken(rftTokenAddress);128        require(129            rftTokenContract.balanceOf(msg.sender) == rftTokenContract.totalSupply(),130            "Not all pieces are owned by the caller"131        );132        rftCollectionContract.transferFrom(msg.sender, address(this), _token);133        UniqueNFT(nftToken._collection).transferFrom(134            address(this),135            msg.sender,136            nftToken._tokenId137        );138        emit Defractionalized(rftTokenAddress, nftToken._collection, nftToken._tokenId);139    }140}
after · tests/src/eth/fractionalizer/Fractionalizer.sol
1// SPDX-License-Identifier:  Apache License2pragma solidity >=0.8.0;3import {CollectionHelpers} from "../api/CollectionHelpers.sol";4import {ContractHelpers} from "../api/ContractHelpers.sol";5import {UniqueRefungibleToken} from "../api/UniqueRefungibleToken.sol";6import {UniqueRefungible} from "../api/UniqueRefungible.sol";7import {UniqueNFT} from "../api/UniqueNFT.sol";89contract Fractionalizer {10    struct Token {11        address _collection;12        uint256 _tokenId;13    }14    address rftCollection;15    mapping(address => bool) nftCollectionAllowList;16    mapping(address => mapping(uint256 => uint256)) nft2rftMapping;17    mapping(address => Token) rft2nftMapping;18    bytes32 refungibleCollectionType = keccak256(bytes("ReFungible"));1920    constructor() {21    }2223    modifier onlyOwner() {24        address contracthelpersAddress = 0x842899ECF380553E8a4de75bF534cdf6fBF64049;25        ContractHelpers contractHelpers = ContractHelpers(contracthelpersAddress);26        address contractOwner = contractHelpers.contractOwner(address(this));27        require(msg.sender == contractOwner, "Only owner can");28        _;29    }3031    event RFTCollectionSet(address _collection);32    event AllowListSet(address _collection, bool _status);33    event Fractionalized(address _collection, uint256 _tokenId, address _rftToken, uint128 _amount);34    event Defractionalized(address _rftToken, address _nftCollection, uint256 _nftTokenId);3536    function setRFTCollection(address _collection) public onlyOwner {37        require(38            rftCollection == address(0),39            "RFT collection is already set"40        );41        UniqueRefungible refungibleContract = UniqueRefungible(_collection);42        string memory collectionType = refungibleContract.uniqueCollectionType();43        44        require(45            keccak256(bytes(collectionType)) == refungibleCollectionType,46            "Wrong collection type. Collection is not refungible."47        );48        require(49            refungibleContract.verifyOwnerOrAdmin(),50            "Fractionalizer contract should be an admin of the collection"51        );52        rftCollection = _collection;53        emit RFTCollectionSet(rftCollection);54    }5556    function createAndSetRFTCollection(string calldata _name, string calldata _description, string calldata _tokenPrefix) public onlyOwner {57        require(58            rftCollection == address(0),59            "RFT collection is already set"60        );61        address collectionHelpers = 0x6C4E9fE1AE37a41E93CEE429e8E1881aBdcbb54F;62        rftCollection = CollectionHelpers(collectionHelpers).createRefungibleCollection(_name, _description, _tokenPrefix);63        emit RFTCollectionSet(rftCollection);64    }6566    function setNftCollectionIsAllowed(address collection, bool status) public onlyOwner {67        nftCollectionAllowList[collection] = status;68        emit AllowListSet(collection, status);69    }7071    function nft2rft(address _collection, uint256 _token, uint128 _pieces) public {72        require(73            rftCollection != address(0),74            "RFT collection is not set"75        );76        UniqueRefungible rftCollectionContract = UniqueRefungible(rftCollection);77        require(78            nftCollectionAllowList[_collection] == true,79            "Fractionalization of this collection is not allowed by admin"80        );81        require(82            UniqueNFT(_collection).ownerOf(_token) == msg.sender,83            "Only token owner could fractionalize it"84        );85        UniqueNFT(_collection).transferFrom(86            msg.sender,87            address(this),88            _token89        );90        uint256 rftTokenId;91        address rftTokenAddress;92        UniqueRefungibleToken rftTokenContract;93        if (nft2rftMapping[_collection][_token] == 0) {94            rftTokenId = rftCollectionContract.nextTokenId();95            rftCollectionContract.mint(address(this), rftTokenId);96            rftTokenAddress = rftCollectionContract.tokenContractAddress(rftTokenId);97            nft2rftMapping[_collection][_token] = rftTokenId;98            rft2nftMapping[rftTokenAddress] = Token(_collection, _token);99100            rftTokenContract = UniqueRefungibleToken(rftTokenAddress);101            rftTokenContract.setParentNFT(_collection, _token);102        } else {103            rftTokenId = nft2rftMapping[_collection][_token];104            rftTokenAddress = rftCollectionContract.tokenContractAddress(rftTokenId);105            rftTokenContract = UniqueRefungibleToken(rftTokenAddress);106        }107        rftTokenContract.repartition(_pieces);108        rftTokenContract.transfer(msg.sender, _pieces);109        emit Fractionalized(_collection, _token, rftTokenAddress, _pieces);110    }111112    function rft2nft(address _collection, uint256 _token) public {113        require(114            rftCollection != address(0),115            "RFT collection is not set"116        );117        require(118            rftCollection == _collection,119            "Wrong RFT collection"120        );121        UniqueRefungible rftCollectionContract = UniqueRefungible(rftCollection);122        address rftTokenAddress = rftCollectionContract.tokenContractAddress(_token);123        Token memory nftToken = rft2nftMapping[rftTokenAddress];124        require(125            nftToken._collection != address(0),126            "No corresponding NFT token found"127        );128        UniqueRefungibleToken rftTokenContract = UniqueRefungibleToken(rftTokenAddress);129        require(130            rftTokenContract.balanceOf(msg.sender) == rftTokenContract.totalSupply(),131            "Not all pieces are owned by the caller"132        );133        rftCollectionContract.transferFrom(msg.sender, address(this), _token);134        UniqueNFT(nftToken._collection).transferFrom(135            address(this),136            msg.sender,137            nftToken._tokenId138        );139        emit Defractionalized(rftTokenAddress, nftToken._collection, nftToken._tokenId);140    }141}