Merge pull request #5215 from swaponline/audit1

due to audit https://scrutify.super.site/encore-defi
swaponline · Sep 1, 2023 · 4b8f838 · 4b8f838
2 parents bd0a04b + 5c39355
commit 4b8f838
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 1,621 deletions.
diff --git a/src/contracts/AtomicSwap.sol b/src/contracts/AtomicSwap.sol
@@ -6,7 +6,7 @@
  *Submitted for verification at Etherscan.io on 2019-01-17
 */
 
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 contract EthToSmthSwaps {
 
@@ -15,9 +15,6 @@ contract EthToSmthSwaps {
   address public owner;
   address public ratingContractAddress;
   uint256 SafeTime = 1 hours; // atomic swap timeOut
-
-  address public admin = 0x180c3B784f3425B40fAE0eD8CeFF6bBc577A3c13;
-  uint256 closeByAdminTimeout = 355 days; 
 
   struct Swap {
     address payable targetWallet;
@@ -156,18 +153,6 @@ contract EthToSmthSwaps {
 
     emit Refund(_participantAddress, msg.sender, swap.secretHash);
   }
-
-  function closeSwapByAdminAfterOneYear(address _ownerAddress, address _participantAddress) public {
-    Swap memory swap = swaps[_ownerAddress][_participantAddress];
-
-    require(swap.balance > uint256(0));
-    require(swap.createdAt.add(closeByAdminTimeout) < now);
-    require(msg.sender == admin);
-
-    msg.sender.transfer(swap.balance);
-
-    clean(_ownerAddress, _participantAddress);
-  }
 
   function clean(address _ownerAddress, address _participantAddress) internal {
     delete swaps[_ownerAddress][_participantAddress];

diff --git a/src/contracts/AtomicSwapERC20.sol b/src/contracts/AtomicSwapERC20.sol
@@ -1,12 +1,4 @@
-/**
- *Submitted for verification at Etherscan.io on 2019-08-14
-*/
-
-/**
- *Submitted for verification at Etherscan.io on 2019-01-17
-*/
-
-pragma solidity ^0.5.0;
+pragma solidity ^0.8.0;
 
 /**
  * @title SafeMath
@@ -85,9 +77,6 @@ contract EthTokenToSmthSwaps {
 
   address public owner;
   uint256 SafeTime = 1 hours; // atomic swap timeOut
-
-  address public admin = 0x180c3B784f3425B40fAE0eD8CeFF6bBc577A3c13;
-  uint256 closeByAdminTimeout = 355 days; 
 
   struct Swap {
     address token;
@@ -226,18 +215,7 @@ contract EthTokenToSmthSwaps {
     emit Refund(_participantAddress, msg.sender, swap.secretHash);
   }
 
-  function closeSwapByAdminAfterOneYear(address _ownerAddress, address _participantAddress) public {
-    //sometimes clients do not complete swaps and at the same time lose their private key, we can help
-    Swap memory swap = swaps[_ownerAddress][_participantAddress];
-
-    require(swap.balance > uint256(0));
-    require(swap.createdAt.add(closeByAdminTimeout) < now);
-    require(msg.sender == admin);
-
-    ERC20(swap.token).transfer(msg.sender, swap.balance);
-    clean(_ownerAddress, _participantAddress);
-  }
   function clean(address _ownerAddress, address _participantAddress) internal {
     delete swaps[_ownerAddress][_participantAddress];
   }
-}
+}