@@ -36,10 +36,10 @@ abstract contract ModularCore is IModularCore, OwnableRoles {
3636 //////////////////////////////////////////////////////////////*/
3737
3838 /// @notice Emitted when an extension is installed.
39- event ExtensionInstalled (address sender , address implementation , address installedExtension );
39+ event ExtensionInstalled (address caller , address implementation , address installedExtension );
4040
4141 /// @notice Emitted when an extension is uninstalled.
42- event ExtensionUninstalled (address sender , address implementation , address installedExtension );
42+ event ExtensionUninstalled (address caller , address implementation , address installedExtension );
4343
4444 /*//////////////////////////////////////////////////////////////
4545 STORAGE
@@ -233,7 +233,7 @@ abstract contract ModularCore is IModularCore, OwnableRoles {
233233 // Call `onInstall` callback function if extension has registered installation callback.
234234 if (config.registerInstallationCallback) {
235235 (bool success , bytes memory returndata ) =
236- _extension.call {value: msg . value } (abi.encodeCall (IInstallationCallback.onInstall, (msg . sender , _data)));
236+ _extension.delegatecall (abi.encodeCall (IInstallationCallback.onInstall, (_data)));
237237 if (! success) {
238238 _revert (returndata, CallbackExecutionReverted.selector );
239239 }
@@ -271,9 +271,8 @@ abstract contract ModularCore is IModularCore, OwnableRoles {
271271 }
272272
273273 if (config.registerInstallationCallback) {
274- (bool success , bytes memory returndata ) = _extension.call {value: msg .value }(
275- abi.encodeCall (IInstallationCallback.onUninstall, (msg .sender , _data))
276- );
274+ (bool success , bytes memory returndata ) =
275+ _extension.delegatecall (abi.encodeCall (IInstallationCallback.onUninstall, (_data)));
277276 if (! success) {
278277 _revert (returndata, CallbackExecutionReverted.selector );
279278 }
0 commit comments