Skip to content

Commit

Permalink
fix foundry tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@MattPereira
MattPereira committed Jun 22, 2024
1 parent a59980f commit d4fcc52
Show file tree
Hide file tree
Showing 4 changed files with 417 additions and 317 deletions.
2 changes: 1 addition & 1 deletion packages/foundry/contracts/ConstantSumPool.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { IVault } from "@balancer-labs/v3-interfaces/contracts/vault/IVault.sol"
* @notice https://docs-v3.balancer.fi/build-a-custom-amm/build-an-amm/create-custom-amm-with-novel-invariant.html
*/
contract ConstantSumPool is IBasePool, BalancerPoolToken {
uint256 private constant _MIN_SWAP_FEE_PERCENTAGE = 0;
uint256 private constant _MIN_SWAP_FEE_PERCENTAGE = 1e12; // 0.00001%
uint256 private constant _MAX_SWAP_FEE_PERCENTAGE = 0.1e18; // 10%

constructor(IVault vault, string memory name, string memory symbol) BalancerPoolToken(vault, name, symbol) {}
Expand Down
235 changes: 133 additions & 102 deletions packages/foundry/test/ConstantSumFactory.t.sol
View file
Original file line number Diff line number Diff line change
@@ -1,102 +1,133 @@
// // SPDX-License-Identifier: GPL-3.0-or-later
// pragma solidity ^0.8.24;

// import "forge-std/Test.sol";

// import { ConstantSumPool } from "../contracts/ConstantSumPool.sol";
// import { ConstantSumFactory } from "../contracts/ConstantSumFactory.sol";

// import { IVault } from "@balancer-labs/v3-interfaces/contracts/vault/IVault.sol";
// import { TokenConfig, TokenType } from "@balancer-labs/v3-interfaces/contracts/vault/VaultTypes.sol";
// import { VaultMock } from "@balancer-labs/v3-vault/contracts/test/VaultMock.sol";
// import { VaultMockDeployer } from "@balancer-labs/v3-vault/test/foundry/utils/VaultMockDeployer.sol";
// import { ERC20TestToken } from "@balancer-labs/v3-solidity-utils/contracts/test/ERC20TestToken.sol";

// contract ConstantSumPoolFactoryTest is Test {
// VaultMock vault;
// ConstantSumFactory factory;
// ERC20TestToken tokenA;
// ERC20TestToken tokenB;

// address alice = vm.addr(1);

// function setUp() public {
// vault = VaultMockDeployer.deploy();
// factory = new ConstantSumFactory(IVault(address(vault)), 365 days);

// tokenA = new ERC20TestToken("Token A", "TKNA", 18);
// tokenB = new ERC20TestToken("Token B", "TKNB", 6);
// }

// function testFactoryPausedState() public {
// uint256 pauseWindowDuration = factory.getPauseWindowDuration();
// assertEq(pauseWindowDuration, 365 days);
// }

// function testPoolCreation__Fuzz(bytes32 salt) public {
// vm.assume(salt > 0);

// TokenConfig[] memory tokens = new TokenConfig[](2);

// // assign tokens in alphanumeric order - FYI in ConstantPool.t.sol, they are sorted via a helper
// tokens[0].token = tokenB;
// tokens[1].token = tokenA;

// ConstantSumPool pool = ConstantSumPool(factory.create("New Custom Pool #2", "CP2", tokens, bytes32(0)));

// assertEq(pool.symbol(), "CP2", "Wrong pool symbol");
// }

// function testPoolSalt__Fuzz(bytes32 salt) public {
// vm.assume(salt > 0);

// TokenConfig[] memory tokens = new TokenConfig[](2);
// tokens[0].token = tokenB;
// tokens[1].token = tokenA;

// ConstantSumPool pool = ConstantSumPool(factory.create("New Custom Pool #2", "CP2", tokens, bytes32(0)));
// address expectedPoolAddress = factory.getDeploymentAddress(salt);

// ConstantSumPool secondPool = ConstantSumPool(factory.create("New Custom Pool #2", "CP2", tokens, salt));

// assertFalse(address(pool) == address(secondPool), "Two deployed pool addresses are equal");
// assertEq(address(secondPool), expectedPoolAddress, "Unexpected pool address");
// }

// function testPoolSender__Fuzz(bytes32 salt) public {
// vm.assume(salt > 0);
// address expectedPoolAddress = factory.getDeploymentAddress(salt);

// TokenConfig[] memory tokens = new TokenConfig[](2);
// tokens[0].token = tokenB;
// tokens[1].token = tokenA;

// // Different sender should change the address of the pool, given the same salt value
// vm.prank(alice);
// ConstantSumPool pool = ConstantSumPool(factory.create("New Custom Pool #2", "CP2", tokens, salt));
// assertFalse(address(pool) == expectedPoolAddress, "Unexpected pool address");

// vm.prank(alice);
// address aliceExpectedPoolAddress = factory.getDeploymentAddress(salt);
// assertTrue(address(pool) == aliceExpectedPoolAddress, "Unexpected pool address");
// }

// function testPoolCrossChainProtection__Fuzz(bytes32 salt, uint16 chainId) public {
// vm.assume(chainId > 1);

// TokenConfig[] memory tokens = new TokenConfig[](2);
// tokens[0].token = tokenB;
// tokens[1].token = tokenA;

// vm.prank(alice);
// ConstantSumPool poolMainnet = ConstantSumPool(factory.create("New Custom Pool #2", "CP2", tokens, salt));

// vm.chainId(chainId);

// vm.prank(alice);
// ConstantSumPool poolL2 = ConstantSumPool(factory.create("New Custom Pool #2", "CP2", tokens, salt));

// // Same sender and salt, should still be different because of the chainId.
// assertFalse(address(poolL2) == address(poolMainnet), "L2 and mainnet pool addresses are equal");
// }
// }
// SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity ^0.8.24;

import "forge-std/Test.sol";

import {
LiquidityManagement,
PoolRoleAccounts,
TokenConfig
} from "@balancer-labs/v3-interfaces/contracts/vault/VaultTypes.sol";
import { IVault } from "@balancer-labs/v3-interfaces/contracts/vault/IVault.sol";
import { VaultMock } from "@balancer-labs/v3-vault/contracts/test/VaultMock.sol";
import { VaultMockDeployer } from "@balancer-labs/v3-vault/test/foundry/utils/VaultMockDeployer.sol";
import { ERC20TestToken } from "@balancer-labs/v3-solidity-utils/contracts/test/ERC20TestToken.sol";

import { ConstantSumPool } from "../contracts/ConstantSumPool.sol";
import { ConstantSumFactory } from "../contracts/ConstantSumFactory.sol";

contract ConstantSumPoolFactoryTest is Test {
uint256 internal DEFAULT_SWAP_FEE = 1e16; // 1%

VaultMock vault;
ConstantSumFactory factory;
ERC20TestToken tokenA;
ERC20TestToken tokenB;

address alice = vm.addr(1);

function setUp() public {
vault = VaultMockDeployer.deploy();
factory = new ConstantSumFactory(IVault(address(vault)), 365 days);
tokenA = new ERC20TestToken("Token A", "TKNA", 18);
tokenB = new ERC20TestToken("Token B", "TKNB", 6);
}

function _createPool(
string memory name,
string memory symbol,
TokenConfig[] memory tokenConfigs,
bytes32 salt
) private returns (ConstantSumPool) {
uint256 swapFeePercentage = 0;
bool protocolFeeExempt = false;
PoolRoleAccounts memory roleAccounts;
address poolHooksContract = address(0);
LiquidityManagement memory liquidityManagement;

return
ConstantSumPool(
factory.create(
name,
symbol,
salt,
tokenConfigs,
DEFAULT_SWAP_FEE, // swapFeePercentage
protocolFeeExempt,
roleAccounts,
poolHooksContract,
liquidityManagement
)
);
}

function testFactoryPausedState() public {
uint256 pauseWindowDuration = factory.getPauseWindowDuration();
assertEq(pauseWindowDuration, 365 days);
}

function testPoolCreation__Fuzz(bytes32 salt) public {
vm.assume(salt > 0);

TokenConfig[] memory tokenConfigs = new TokenConfig[](2);
tokenConfigs[0].token = tokenA;
tokenConfigs[1].token = tokenB;

ConstantSumPool pool = _createPool("Constant Sum Pool #1", "CSP1", tokenConfigs, bytes32(0));
assertEq(pool.symbol(), "CSP1", "Wrong pool symbol");
}

function testPoolSalt__Fuzz(bytes32 salt) public {
vm.assume(salt > 0);

TokenConfig[] memory tokenConfigs = new TokenConfig[](2);
tokenConfigs[0].token = tokenA;
tokenConfigs[1].token = tokenB;

ConstantSumPool pool = _createPool("Constant Sum Pool #1", "CSP1", tokenConfigs, bytes32(0));
ConstantSumPool secondPool = _createPool("Constant Sum Pool #2", "CSP2", tokenConfigs, salt);

address expectedPoolAddress = factory.getDeploymentAddress(salt);

assertFalse(address(pool) == address(secondPool), "Two deployed pool addresses are equal");
assertEq(address(secondPool), expectedPoolAddress, "Unexpected pool address");
}

function testPoolSender__Fuzz(bytes32 salt) public {
vm.assume(salt > 0);
address expectedPoolAddress = factory.getDeploymentAddress(salt);

TokenConfig[] memory tokenConfigs = new TokenConfig[](2);
tokenConfigs[0].token = tokenA;
tokenConfigs[1].token = tokenB;

// Different sender should change the address of the pool, given the same salt value
vm.prank(alice);
ConstantSumPool pool = _createPool("Constant Sum Pool #1", "CSP1", tokenConfigs, salt);

assertFalse(address(pool) == expectedPoolAddress, "Unexpected pool address");

vm.prank(alice);
address aliceExpectedPoolAddress = factory.getDeploymentAddress(salt);
assertTrue(address(pool) == aliceExpectedPoolAddress, "Unexpected pool address");
}

function testPoolCrossChainProtection__Fuzz(bytes32 salt, uint16 chainId) public {
vm.assume(chainId > 1);

TokenConfig[] memory tokenConfigs = new TokenConfig[](2);
tokenConfigs[0].token = tokenA;
tokenConfigs[1].token = tokenB;

vm.prank(alice);
ConstantSumPool poolMainnet = _createPool("Constant Sum Pool #1", "CSP1", tokenConfigs, salt);

vm.chainId(chainId);

vm.prank(alice);
ConstantSumPool poolL2 = _createPool("Constant Sum Pool #2", "CSP2", tokenConfigs, salt);

// Same sender and salt, should still be different because of the chainId.
assertFalse(address(poolL2) == address(poolMainnet), "L2 and mainnet pool addresses are equal");
}
}
Loading

0 comments on commit d4fcc52

Please sign in to comment.