File tree Expand file tree Collapse file tree 2 files changed +26
-16
lines changed Expand file tree Collapse file tree 2 files changed +26
-16
lines changed Original file line number Diff line number Diff line change @@ -16,6 +16,8 @@ contract EulerSwapFactory is IEulerSwapFactory {
16
16
event PoolDeployed (
17
17
address indexed asset0 ,
18
18
address indexed asset1 ,
19
+ address vault0 ,
20
+ address vault1 ,
19
21
uint256 indexed feeMultiplier ,
20
22
address swapAccount ,
21
23
uint256 priceX ,
@@ -51,27 +53,33 @@ contract EulerSwapFactory is IEulerSwapFactory {
51
53
address poolAsset1 = pool.asset1 ();
52
54
uint256 feeMultiplier = pool.feeMultiplier ();
53
55
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
+ );
66
71
67
- require (getPool[poolKey] == address (0 ), AlreadyDeployed ());
72
+ require (getPool[poolKey] == address (0 ), AlreadyDeployed ());
68
73
69
- getPool[poolKey] = address (pool);
70
- allPools.push (address (pool));
74
+ getPool[poolKey] = address (pool);
75
+ allPools.push (address (pool));
76
+ }
71
77
72
78
emit PoolDeployed (
73
79
poolAsset0,
74
80
poolAsset1,
81
+ params.vault0,
82
+ params.vault1,
75
83
feeMultiplier,
76
84
params.swapAccount,
77
85
params.priceX,
Original file line number Diff line number Diff line change @@ -33,8 +33,10 @@ contract EulerSwapFactoryTest is EulerSwapTestBase {
33
33
abi.encode (
34
34
eulerSwap.asset0 (),
35
35
eulerSwap.asset1 (),
36
- eulerSwap.feeMultiplier (),
36
+ eulerSwap.vault0 (),
37
+ eulerSwap.vault1 (),
37
38
eulerSwap.myAccount (),
39
+ eulerSwap.feeMultiplier (),
38
40
eulerSwap.priceX (),
39
41
eulerSwap.priceY (),
40
42
eulerSwap.concentrationX (),
You can’t perform that action at this time.
0 commit comments