Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug that made s_tokenToPool to store only the last created pool #1

Merged
merged 2 commits into from
Mar 24, 2024
Merged

Fix bug that made s_tokenToPool to store only the last created pool #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
054e59e
Fix bug that made s_tokenToPool to store only the last created pool
zarkk01 Mar 24, 2024
2a80f57
Fix bug of s_tokenToPools[] introducing s_pairings
zarkk01 Mar 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions src/ThunderSwapPoolFactory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";

contract ThunderSwapPoolFactory is Ownable {
mapping(address => bool) private s_supportedTokens;
mapping(address => address) private s_tokenToPool;
mapping(address => address[]) private s_poolToTokens;
mapping(address token => bool supported) private s_supportedTokens;
mapping(address token1 => mapping(address token2 => address pool)) private s_pairings;
mapping(address token => address[] pools) private s_tokenToPools;
mapping(address pool => address[] tokens) private s_poolToTokens;

event PoolCreated(address newPool, address token1, address token2);
event SupportedToken(address supportedToken);
Expand Down Expand Up @@ -42,13 +43,11 @@ contract ThunderSwapPoolFactory is Ownable {
external
returns (ThunderSwapPool)
{
address poolFromToken1 = s_tokenToPool[_token1];
if (!s_supportedTokens[_token1]) revert TokenNotSupported(_token1);
if (!s_supportedTokens[_token2]) revert TokenNotSupported(_token2);
if (_token1 == _token2) revert PoolCannotHaveTwoTokensOfTheSameType();
if (poolFromToken1 != address(0) && poolFromToken1 == s_tokenToPool[_token2]) {
revert PoolAlreadyExists(poolFromToken1);
}
address _pool = s_pairings[_token1][_token2];
if (_pool != address(0)) revert PoolAlreadyExists(_pool);

string memory poolName =
string.concat("ThunderSwap", ERC20(_token1).name(), ERC20(_token2).name());
Expand All @@ -57,8 +56,12 @@ contract ThunderSwapPoolFactory is Ownable {
ThunderSwapPool newPool = new ThunderSwapPool(_token1, _token2, poolName, poolSymbol);

s_poolToTokens[address(newPool)] = [_token1, _token2];
s_tokenToPool[_token1] = address(newPool);
s_tokenToPool[_token2] = address(newPool);

s_tokenToPools[_token1].push(address(newPool));
s_tokenToPools[_token2].push(address(newPool));

s_pairings[_token1][_token2] = address(newPool);
s_pairings[_token2][_token1] = address(newPool);

emit PoolCreated(address(newPool), _token1, _token2);

Expand All @@ -79,8 +82,8 @@ contract ThunderSwapPoolFactory is Ownable {
* @param _token The token to find a pool for
* @return The thunder swap pool address for the given token
*/
function getPoolFromToken(address _token) external view returns (address) {
return s_tokenToPool[_token];
function getPoolsFromToken(address _token) external view returns (address[] memory) {
return s_tokenToPools[_token];
}

/**
Expand All @@ -91,4 +94,14 @@ contract ThunderSwapPoolFactory is Ownable {
function getPoolTokens(address _pool) external view returns (address[] memory) {
return s_poolToTokens[_pool];
}

/**
* @notice Returns the address of the pool that two tokens have.
* @param _token1 The address of the first token.
* @param _token2 The address of the second token.
* @return The address of the pool for _token1 and _token2.
*/
function getPairing(address _token1, address _token2) external view returns (address) {
return s_pairings[_token1][_token2];
}
}
15 changes: 12 additions & 3 deletions test/unit/miscellaneousTests/miscellaneous.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,13 @@ contract MiscellaneousTest is UniversalHelper {
assert(thunderSwapPoolFactory.isTokenSupported(supportToken));
}

function testGetPoolFromToken() public view {
assertEq(thunderSwapPoolFactory.getPoolFromToken(address(tokenA)), address(thunderSwapPool));
assertEq(thunderSwapPoolFactory.getPoolFromToken(address(tokenB)), address(thunderSwapPool));
function testGetPoolsFromToken() public view {
assertEq(
thunderSwapPoolFactory.getPoolsFromToken(address(tokenA))[0], address(thunderSwapPool)
);
assertEq(
thunderSwapPoolFactory.getPoolsFromToken(address(tokenB))[0], address(thunderSwapPool)
);
}

function testGetPoolTokensFromThunderSwapPool() public view {
Expand All @@ -126,4 +130,9 @@ contract MiscellaneousTest is UniversalHelper {
assertEq(poolTokens[0], address(tokenA));
assertEq(poolTokens[1], address(tokenB));
}

function testGetPoolFromPairings() public view {
assertEq(thunderSwapPoolFactory.getPairing(address(tokenA),address(tokenB)), address(thunderSwapPool));
assertEq(thunderSwapPoolFactory.getPairing(address(tokenA),address(tokenB)), address(thunderSwapPool));
}
}