Skip to content

Commit e414078

Browse files
feat: add vaults address to poolKey and event
1 parent 48e8bf6 commit e414078

File tree

2 files changed

+26
-16
lines changed

2 files changed

+26
-16
lines changed

src/EulerSwapFactory.sol

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ contract EulerSwapFactory is IEulerSwapFactory {
1616
event PoolDeployed(
1717
address indexed asset0,
1818
address indexed asset1,
19+
address vault0,
20+
address vault1,
1921
uint256 indexed feeMultiplier,
2022
address swapAccount,
2123
uint256 priceX,
@@ -51,27 +53,33 @@ contract EulerSwapFactory is IEulerSwapFactory {
5153
address poolAsset1 = pool.asset1();
5254
uint256 feeMultiplier = pool.feeMultiplier();
5355

54-
bytes32 poolKey = keccak256(
55-
abi.encode(
56-
poolAsset0,
57-
poolAsset1,
58-
feeMultiplier,
59-
params.swapAccount,
60-
params.priceX,
61-
params.priceY,
62-
params.concentrationX,
63-
params.concentrationY
64-
)
65-
);
56+
{
57+
bytes32 poolKey = keccak256(
58+
abi.encode(
59+
poolAsset0,
60+
poolAsset1,
61+
params.vault0,
62+
params.vault1,
63+
params.swapAccount,
64+
feeMultiplier,
65+
params.priceX,
66+
params.priceY,
67+
params.concentrationX,
68+
params.concentrationY
69+
)
70+
);
6671

67-
require(getPool[poolKey] == address(0), AlreadyDeployed());
72+
require(getPool[poolKey] == address(0), AlreadyDeployed());
6873

69-
getPool[poolKey] = address(pool);
70-
allPools.push(address(pool));
74+
getPool[poolKey] = address(pool);
75+
allPools.push(address(pool));
76+
}
7177

7278
emit PoolDeployed(
7379
poolAsset0,
7480
poolAsset1,
81+
params.vault0,
82+
params.vault1,
7583
feeMultiplier,
7684
params.swapAccount,
7785
params.priceX,

test/EulerSwapFactoryTest.t.sol

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ contract EulerSwapFactoryTest is EulerSwapTestBase {
3333
abi.encode(
3434
eulerSwap.asset0(),
3535
eulerSwap.asset1(),
36-
eulerSwap.feeMultiplier(),
36+
eulerSwap.vault0(),
37+
eulerSwap.vault1(),
3738
eulerSwap.myAccount(),
39+
eulerSwap.feeMultiplier(),
3840
eulerSwap.priceX(),
3941
eulerSwap.priceY(),
4042
eulerSwap.concentrationX(),

0 commit comments

Comments
 (0)