Audit fix: Proposer is not saved proposal data

contracts/DualGovernance.sol

@@ -188,7 +188,7 @@ contract DualGovernance is IDualGovernance {
             revert ProposalSubmissionBlocked();
         }
         Proposers.Proposer memory proposer = _proposers.getProposer(msg.sender);
-        proposalId = TIMELOCK.submit(proposer.executor, calls, metadata);
+        proposalId = TIMELOCK.submit(proposer.account, proposer.executor, calls, metadata);
     }
 
     /// @notice Schedules a previously submitted proposal for execution in the Dual Governance system.

contracts/EmergencyProtectedTimelock.sol

@@ -93,17 +93,19 @@ contract EmergencyProtectedTimelock is IEmergencyProtectedTimelock {
     // ---
 
     /// @notice Submits a new proposal to execute a series of calls through an executor.
+    /// @param proposer The address of the proposer submitting the proposal.
     /// @param executor The address of the executor contract that will execute the calls.
     /// @param calls An array of `ExternalCall` structs representing the calls to be executed.
     /// @param metadata A string containing additional information about the proposal.
     /// @return newProposalId The id of the newly created proposal.
     function submit(
+        address proposer,
         address executor,
         ExternalCall[] calldata calls,
         string calldata metadata
     ) external returns (uint256 newProposalId) {
         _timelockState.checkCallerIsGovernance();
-        newProposalId = _proposals.submit(executor, calls, metadata);
+        newProposalId = _proposals.submit(proposer, executor, calls, metadata);
     }
 
     /// @notice Schedules a proposal for execution after a specified delay.

contracts/TimelockedGovernance.sol

@@ -43,7 +43,7 @@ contract TimelockedGovernance is IGovernance {
         string calldata metadata
     ) external returns (uint256 proposalId) {
         _checkCallerIsGovernance();
-        return TIMELOCK.submit(TIMELOCK.getAdminExecutor(), calls, metadata);
+        return TIMELOCK.submit(msg.sender, TIMELOCK.getAdminExecutor(), calls, metadata);
     }
 
     /// @notice Schedules a submitted proposal.

contracts/interfaces/ITimelock.sol

@@ -16,6 +16,7 @@ interface ITimelock {
     }
 
     function submit(
+        address proposer,
         address executor,
         ExternalCall[] calldata calls,
         string calldata metadata

contracts/libraries/ExecutableProposals.sol

@@ -91,7 +91,9 @@ library ExecutableProposals {
     // Events
     // ---
 
-    event ProposalSubmitted(uint256 indexed id, address indexed executor, ExternalCall[] calls, string metadata);
+    event ProposalSubmitted(
+        uint256 indexed id, address indexed proposer, address indexed executor, ExternalCall[] calls, string metadata
+    );
     event ProposalScheduled(uint256 indexed id);
     event ProposalExecuted(uint256 indexed id, bytes[] callResults);
     event ProposalsCancelledTill(uint256 proposalId);
@@ -102,12 +104,14 @@ library ExecutableProposals {
 
     /// @notice Submits a new proposal with the specified executor and external calls.
     /// @param self The context of the Executable Proposal library.
+    /// @param proposer The address of the proposer submitting the proposal.
     /// @param executor The address authorized to execute the proposal.
     /// @param calls The list of external calls to include in the proposal.
     /// @param metadata Metadata describing the proposal.
     /// @return newProposalId The id of the newly submitted proposal.
     function submit(
         Context storage self,
+        address proposer,
         address executor,
         ExternalCall[] memory calls,
         string memory metadata
@@ -129,7 +133,7 @@ library ExecutableProposals {
             newProposal.calls.push(calls[i]);
         }
 
-        emit ProposalSubmitted(newProposalId, executor, calls, metadata);
+        emit ProposalSubmitted(newProposalId, proposer, executor, calls, metadata);
     }
 
     /// @notice Marks a previously submitted proposal as scheduled for execution if the required delay period

docs/plan-b.md

@@ -138,7 +138,7 @@ If the Emergency Committees are set up and active, the governance proposal under
 While active, the Emergency Activation Committee can enable Emergency Mode. This mode prohibits anyone but the Emergency Execution Committee from executing proposals. Once the **Emergency Duration** has ended, the Emergency Execution Committee or anyone else may disable the emergency mode, canceling all pending proposals. After the emergency mode is deactivated or the Emergency Period has elapsed, the Emergency Committees lose their power.
 ### Function: `EmergencyProtectedTimelock.submit`
 ```solidity
-function submit(address executor, ExecutorCall[] calls, string metadata)
+function submit(address proposer, address executor, ExecutorCall[] calls, string metadata)
   returns (uint256 proposalId)
 ```
 Registers a new governance proposal composed of one or more external `calls` to be made by the `executor` contract. Initiates the `AfterSubmitDelay`.

docs/specification.md

@@ -927,7 +927,7 @@ The governance reset entails the following steps:
 ### Function: EmergencyProtectedTimelock.submit
 
 ```solidity
-function submit(address executor, ExecutorCall[] calls, string calldata metadata)
+function submit(address proposer, address executor, ExecutorCall[] calls, string calldata metadata)
   returns (uint256 proposalId)
 ```
 

test/mocks/TimelockMock.sol

@@ -24,7 +24,12 @@ contract TimelockMock is ITimelock {
 
     address internal governance;
 
-    function submit(address, ExternalCall[] calldata, string calldata) external returns (uint256 newProposalId) {
+    function submit(
+        address,
+        address,
+        ExternalCall[] calldata,
+        string calldata
+    ) external returns (uint256 newProposalId) {
         newProposalId = submittedProposals.length + OFFSET;
         submittedProposals.push(newProposalId);
         canScheduleProposal[newProposalId] = false;

test/unit/DualGovernance.t.sol

@@ -107,7 +107,9 @@ contract DualGovernanceUnitTests is UnitTest {
         ExternalCall[] memory calls = _generateExternalCalls();
         Proposers.Proposer memory proposer = _dualGovernance.getProposer(address(this));
         vm.expectCall(
-            address(_timelock), 0, abi.encodeWithSelector(TimelockMock.submit.selector, proposer.executor, calls, "")
+            address(_timelock),
+            0,
+            abi.encodeWithSelector(TimelockMock.submit.selector, address(this), proposer.executor, calls, "")
         );
 
         uint256 proposalId = _dualGovernance.submitProposal(calls, "");
@@ -2090,7 +2092,7 @@ contract DualGovernanceUnitTests is UnitTest {
 
     function _submitMockProposal() internal {
         // mock timelock doesn't uses proposal data
-        _timelock.submit(address(0), new ExternalCall[](0), "");
+        _timelock.submit(msg.sender, address(0), new ExternalCall[](0), "");
     }
 
     function _generateExternalCalls() internal pure returns (ExternalCall[] memory calls) {

test/unit/EmergencyProtectedTimelock.t.sol

@@ -14,6 +14,7 @@ import {EmergencyProtection} from "contracts/libraries/EmergencyProtection.sol";
 
 import {Executor} from "contracts/Executor.sol";
 import {EmergencyProtectedTimelock, TimelockState} from "contracts/EmergencyProtectedTimelock.sol";
+import {ExecutableProposals} from "contracts/libraries/ExecutableProposals.sol";
 
 import {UnitTest} from "test/utils/unit-test.sol";
 import {TargetMock} from "test/utils/target-mock.sol";
@@ -22,6 +23,7 @@ import {ExternalCall} from "test/utils/executor-calls.sol";
 contract EmergencyProtectedTimelockUnitTests is UnitTest {
     EmergencyProtectedTimelock private _timelock;
     TargetMock private _targetMock;
+    TargetMock private _anotherTargetMock;
     Executor private _executor;
 
     address private _emergencyActivator = makeAddr("EMERGENCY_ACTIVATION_COMMITTEE");
@@ -40,6 +42,7 @@ contract EmergencyProtectedTimelockUnitTests is UnitTest {
         _timelock = _deployEmergencyProtectedTimelock();
 
         _targetMock = new TargetMock();
+        _anotherTargetMock = new TargetMock();
 
         _executor.transferOwnership(address(_timelock));
 
@@ -77,13 +80,21 @@ contract EmergencyProtectedTimelockUnitTests is UnitTest {
 
         vm.prank(stranger);
         vm.expectRevert(abi.encodeWithSelector(TimelockState.CallerIsNotGovernance.selector, [stranger]));
-        _timelock.submit(_adminExecutor, new ExternalCall[](0), "");
+        _timelock.submit(stranger, _adminExecutor, new ExternalCall[](0), "");
         assertEq(_timelock.getProposalsCount(), 0);
     }
 
     function test_submit_HappyPath() external {
+        string memory testMetadata = "testMetadata";
+
+        vm.expectEmit(true, true, true, true);
+        emit ExecutableProposals.ProposalSubmitted(
+            1, _dualGovernance, _adminExecutor, _getMockTargetRegularStaffCalls(address(_targetMock)), testMetadata
+        );
         vm.prank(_dualGovernance);
-        _timelock.submit(_adminExecutor, _getMockTargetRegularStaffCalls(address(_targetMock)), "");
+        _timelock.submit(
+            _dualGovernance, _adminExecutor, _getMockTargetRegularStaffCalls(address(_targetMock)), testMetadata
+        );
 
         assertEq(_timelock.getProposalsCount(), 1);
 
@@ -357,7 +368,7 @@ contract EmergencyProtectedTimelockUnitTests is UnitTest {
 
     function test_emergencyExecute_RevertOn_ModeNotActive() external {
         vm.startPrank(_dualGovernance);
-        _timelock.submit(_adminExecutor, _getMockTargetRegularStaffCalls(address(_targetMock)), "");
+        _timelock.submit(_dualGovernance, _adminExecutor, _getMockTargetRegularStaffCalls(address(_targetMock)), "");
 
         assertEq(_timelock.getProposalsCount(), 1);
 
@@ -808,8 +819,9 @@ contract EmergencyProtectedTimelockUnitTests is UnitTest {
 
         vm.startPrank(_dualGovernance);
         ExternalCall[] memory executorCalls = _getMockTargetRegularStaffCalls(address(_targetMock));
-        _timelock.submit(_adminExecutor, executorCalls, "");
-        _timelock.submit(_adminExecutor, executorCalls, "");
+        ExternalCall[] memory anotherExecutorCalls = _getMockTargetRegularStaffCalls(address(_anotherTargetMock));
+        _timelock.submit(_dualGovernance, _adminExecutor, executorCalls, "");
+        _timelock.submit(_dualGovernance, _adminExecutor, anotherExecutorCalls, "");
 
         (ITimelock.ProposalDetails memory submittedProposal, ExternalCall[] memory calls) = _timelock.getProposal(1);
 
@@ -876,9 +888,9 @@ contract EmergencyProtectedTimelockUnitTests is UnitTest {
         // assertEq(cancelledProposal.executedAt, Timestamps.ZERO);
         // assertEq doesn't support comparing enumerables so far
         assertEq(cancelledCalls.length, 1);
-        assertEq(cancelledCalls[0].value, executorCalls[0].value);
-        assertEq(cancelledCalls[0].target, executorCalls[0].target);
-        assertEq(cancelledCalls[0].payload, executorCalls[0].payload);
+        assertEq(cancelledCalls[0].value, anotherExecutorCalls[0].value);
+        assertEq(cancelledCalls[0].target, anotherExecutorCalls[0].target);
+        assertEq(cancelledCalls[0].payload, anotherExecutorCalls[0].payload);
     }
 
     function test_get_not_existing_proposal() external {
@@ -966,7 +978,7 @@ contract EmergencyProtectedTimelockUnitTests is UnitTest {
     function test_getProposalCalls() external {
         ExternalCall[] memory executorCalls = _getMockTargetRegularStaffCalls(address(_targetMock));
         vm.prank(_dualGovernance);
-        _timelock.submit(_adminExecutor, executorCalls, "");
+        _timelock.submit(_dualGovernance, _adminExecutor, executorCalls, "");
 
         ExternalCall[] memory calls = _timelock.getProposalCalls(1);
 
@@ -994,7 +1006,7 @@ contract EmergencyProtectedTimelockUnitTests is UnitTest {
 
     function _submitProposal() internal {
         vm.prank(_dualGovernance);
-        _timelock.submit(_adminExecutor, _getMockTargetRegularStaffCalls(address(_targetMock)), "");
+        _timelock.submit(_dualGovernance, _adminExecutor, _getMockTargetRegularStaffCalls(address(_targetMock)), "");
     }
 
     function _scheduleProposal(uint256 proposalId) internal {