fix some issues

Author: workwithhim

.gitignore

@@ -1,5 +1,4 @@
 node_modules
-flatten
 scripts
 test/
 .env
@@ -8,11 +7,13 @@ coverage.json
 typechain
 typechain-types
 package-lock.json
-yarn.lock
+# yarn.lock
+flatten
 
 #Hardhat files
 cache
 artifacts
 
 yarn.lock
 yarn.lock
+

contracts/NexusDiffuser.sol

@@ -71,11 +71,7 @@ contract NexusDiffuser is Ownable {
         _;
     }
 
-    constructor (
-        address _factory,
-        address _nexus,
-        address _weth
-    ) {
+    constructor(address _factory, address _nexus, address _weth) {
         factory = IUniswapV2Factory(_factory);
         nexus = _nexus;
         weth = _weth;
@@ -211,6 +207,7 @@ contract NexusDiffuser is Ownable {
         address[] calldata token1
     ) external onlyEOA onlyHolder {
         // TODO: This can be optimized a fair bit, but this is safer and simpler for now
+        require(token0.length == token1.length, "Not same length");
         uint256 len = token0.length;
         for (uint256 i = 0; i < len; i++) {
             _convert(token0[i], token1[i]);
@@ -321,10 +318,7 @@ contract NexusDiffuser is Ownable {
         IUniswapV2Pair pair = IUniswapV2Pair(
             factory.getPair(fromToken, toToken)
         );
-        require(
-            address(pair) != address(0),
-            "NexusDiffuser: Cannot convert"
-        );
+        require(address(pair) != address(0), "NexusDiffuser: Cannot convert");
 
         // Interactions
         (uint256 reserve0, uint256 reserve1, ) = pair.getReserves();
@@ -359,7 +353,6 @@ contract NexusDiffuser is Ownable {
         uint256 amountIn
     ) internal returns (uint256 amountOut) {
         if (nexusTreasury != address(0)) {
-
             uint256 treasuryAmount = _swap(
                 token,
                 nexus,
@@ -376,7 +369,9 @@ contract NexusDiffuser is Ownable {
                 amountIn.mul(2).div(10),
                 multiStakingGetter
             );
-            nexusMultiStakingTotalAmount = nexusMultiStakingTotalAmount.add(multiStakingAmount);
+            nexusMultiStakingTotalAmount = nexusMultiStakingTotalAmount.add(
+                multiStakingAmount
+            );
 
             uint256 burnAmount = _swap(
                 token,
@@ -399,7 +394,9 @@ contract NexusDiffuser is Ownable {
                 amountIn.mul(3).div(10),
                 multiStakingGetter
             );
-            nexusMultiStakingTotalAmount = nexusMultiStakingTotalAmount.add(multiStakingAmount);
+            nexusMultiStakingTotalAmount = nexusMultiStakingTotalAmount.add(
+                multiStakingAmount
+            );
 
             uint256 burnAmount = _swap(
                 token,
@@ -419,18 +416,12 @@ contract NexusDiffuser is Ownable {
     }
 
     function setNexusTreasury(address _treasury) external {
-        require(
-            msg.sender == nexusTreasurySetter,
-            "NexusDiffuser: FORBIDDEN"
-        );
+        require(msg.sender == nexusTreasurySetter, "NexusDiffuser: FORBIDDEN");
         nexusTreasury = _treasury;
     }
 
     function setNexusTreasurySetter(address _nexusTreasurySetter) external {
-        require(
-            msg.sender == nexusTreasurySetter,
-            "NexusDiffuser: FORBIDDEN"
-        );
+        require(msg.sender == nexusTreasurySetter, "NexusDiffuser: FORBIDDEN");
         nexusTreasurySetter = _nexusTreasurySetter;
     }
 

contracts/NexusGenerator.sol

@@ -380,7 +380,7 @@ contract NexusGenerator is MultiOwnable {
         uint256 lpSupply = pool.lpToken.balanceOf(address(this));
         if (lpSupply == 0) {
             rtInfo.lastRewardTimestamp = type(uint256).max;
-            rtInfo.rewardDuration == 0;
+            rtInfo.rewardDuration = 0;
             return;
         }
         uint256 rewardDuration;

contracts/NexusNFT.sol

@@ -30,7 +30,7 @@ contract NexusEtherealsNFT is ERC721Enumerable, Ownable {
     uint256 public whitelistCount;
     bool public whitelistEnabled = true;
 
-    event AddressAdded(address indexed _address);
+    event AddressAdded(address[] indexed _addresses);
     event AddressRemoved(address indexed _address);
     event WhitelistToggled(bool _enabled);
 
@@ -56,26 +56,15 @@ contract NexusEtherealsNFT is ERC721Enumerable, Ownable {
         require(!paused, "the contract is paused");
         uint256 supply = totalSupply();
         require(_mintAmount > 0, "need to mint at least 1 NFT");
-        require(
-            _mintAmount <= maxMintAmount,
-            "max mint amount per session exceeded"
-        );
+        require(_mintAmount <= maxMintAmount,"max mint amount per session exceeded");
         require(supply + _mintAmount <= maxSupply, "max NFT limit exceeded");
 
         uint256 costToMint = isWhitelisted(msg.sender) && whitelistEnabled
-            ? cost - whitelistDiscount
-            : cost;
+            ? cost - whitelistDiscount : cost;
 
         if (msg.sender != owner()) {
-            require(
-                msg.value >= costToMint * _mintAmount,
-                "insufficient funds"
-            );
-            require(
-                addressMintedBalance[msg.sender] + _mintAmount <=
-                    maxNFTPerAddress,
-                "max NFT per address exceeded"
-            );
+            require(msg.value >= costToMint * _mintAmount,"insufficient funds");
+            require(addressMintedBalance[msg.sender] + _mintAmount <=maxNFTPerAddress,"max NFT per address exceeded");
         }
 
         for (uint256 i = 1; i <= _mintAmount; i++) {
@@ -180,7 +169,6 @@ contract NexusEtherealsNFT is ERC721Enumerable, Ownable {
                 whitelist[_addresses[i]] = true;
                 whitelistIndices[_addresses[i]] = whitelistCount;
                 whitelistCount++;
-                emit AddressAdded(_addresses[i]);
             }
         }
     }

contracts/Referral.sol

@@ -19,14 +19,10 @@ interface INexusEtherealsNFT {
 
     function mint(uint256 _mintAmount) external payable;
 
-    function transferFrom(
-        address from,
-        address to,
-        uint256 tokenId
-    ) external;
+    function transferFrom(address from, address to, uint256 tokenId) external;
 }
 
-contract NFTReferral is IERC721Receiver {
+contract NFTReferral is IERC721Receiver, Ownable {
     address public nexusNFT;
 
     event ReferralUsed(
@@ -57,11 +53,7 @@ contract NFTReferral is IERC721Receiver {
 
         NFT.mint{value: mintPrice * _mintamount}(_mintamount);
         for (uint256 i = 1; i <= _mintamount; i++) {
-            NFT.transferFrom(
-                address(this),
-                msg.sender,
-                curTokenSupply + i
-            );
+            NFT.transferFrom(address(this), msg.sender, curTokenSupply + i);
         }
         uint256 reward = msg.value - mintPrice * _mintamount;
         if (reward > 0) {
@@ -70,6 +62,15 @@ contract NFTReferral is IERC721Receiver {
         }
     }
 
+    function withdraw(address to) public onlyOwner {
+        // =============================================================================
+        // Do not remove this otherwise you will not be able to withdraw the funds.
+        // =============================================================================
+        (bool os, ) = payable(to).call{value: address(this).balance}("");
+        require(os);
+        // =============================================================================
+    }
+
     function onERC721Received(
         address,
         address,