Skip to content

Commit 63dc4de

Browse files
feat: VaultParams added into VaultDeployed event
1 parent b086255 commit 63dc4de

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

src/ATokenVaultFactory.sol

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,14 @@ contract ATokenVaultFactory {
4545
* @param implementation The address of the vault implementation
4646
* @param underlying The underlying asset address
4747
* @param deployer The address that deployed the vault
48-
* @param owner The owner of the vault
48+
* @param params The parameters used to deploy the vault
4949
*/
5050
event VaultDeployed(
5151
address indexed vault,
5252
address indexed implementation,
5353
address indexed underlying,
5454
address deployer,
55-
address owner,
56-
uint16 referralCode,
57-
address poolAddressesProvider
55+
VaultParams params
5856
);
5957

6058
/*//////////////////////////////////////////////////////////////
@@ -164,9 +162,7 @@ contract ATokenVaultFactory {
164162
implementation,
165163
params.underlying,
166164
msg.sender,
167-
params.owner,
168-
params.referralCode,
169-
address(params.poolAddressesProvider)
165+
params
170166
);
171167
}
172168

test/ATokenVaultFactory.t.sol

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,25 +219,32 @@ contract ATokenVaultFactoryTest is Test {
219219
// Find the VaultDeployed event (should be the last one)
220220
bool eventFound = false;
221221
for (uint i = 0; i < logs.length; i++) {
222-
if (logs[i].topics[0] == keccak256("VaultDeployed(address,address,address,address,address,uint16,address)")) {
222+
if (logs[i].topics[0] == keccak256("VaultDeployed(address,address,address,address,(address,uint16,address,address,uint256,string,string,uint256))")) {
223223
eventFound = true;
224224

225225
// Decode the event data
226226
address eventVault = address(uint160(uint256(logs[i].topics[1])));
227227
address eventImplementation = address(uint160(uint256(logs[i].topics[2])));
228228
address eventUnderlying = address(uint160(uint256(logs[i].topics[3])));
229229

230-
(address eventDeployer, address eventOwner, uint16 eventReferralCode, address eventPoolProvider) =
231-
abi.decode(logs[i].data, (address, address, uint16, address));
230+
(address eventDeployer, ATokenVaultFactory.VaultParams memory eventVaultParams) = abi.decode(
231+
logs[i].data,
232+
(address, ATokenVaultFactory.VaultParams)
233+
);
232234

233235
// Verify event data
234236
assertEq(eventVault, vault);
235237
assertTrue(eventImplementation != address(0));
236238
assertEq(eventUnderlying, address(dai));
237239
assertEq(eventDeployer, ALICE);
238-
assertEq(eventOwner, ALICE);
239-
assertEq(eventReferralCode, 42);
240-
assertEq(eventPoolProvider, address(poolAddrProvider));
240+
assertEq(eventVaultParams.underlying, address(dai));
241+
assertEq(eventVaultParams.referralCode, 42);
242+
assertEq(address(eventVaultParams.poolAddressesProvider), address(poolAddrProvider));
243+
assertEq(eventVaultParams.owner, ALICE);
244+
assertEq(eventVaultParams.initialFee, 0);
245+
assertEq(eventVaultParams.shareName, "Test Vault");
246+
assertEq(eventVaultParams.shareSymbol, "tVault");
247+
assertEq(eventVaultParams.initialLockDeposit, initialDeposit);
241248
break;
242249
}
243250
}

0 commit comments

Comments
 (0)