Merge branch 'dev' into feat/periphery-one-txn

solidity/contracts/UpdateStorageMirrorGuard.sol

@@ -5,6 +5,7 @@ import {BaseGuard} from 'safe-contracts/base/GuardManager.sol';
 import {Enum} from 'safe-contracts/common/Enum.sol';
 import {IGuardCallbackModule} from 'interfaces/IGuardCallbackModule.sol';
 import {IStorageMirror} from 'interfaces/IStorageMirror.sol';
+import {ISafe} from 'interfaces/ISafe.sol';
 
 /**
  * @title UpdateStorageMirrorGuard
@@ -52,9 +53,11 @@ contract UpdateStorageMirrorGuard is BaseGuard {
    */
   function checkAfterExecution(bytes32 _txHash, bool _success) external {
     if (_success) {
-      address[] memory _owners = new address[](1);
-      _owners[0] = msg.sender;
-      IStorageMirror.SafeSettings memory _safeSettings = IStorageMirror.SafeSettings({owners: _owners, threshold: 1});
+      address[] memory _owners = ISafe(msg.sender).getOwners();
+      uint256 _threshold = ISafe(msg.sender).getThreshold();
+
+      IStorageMirror.SafeSettings memory _safeSettings =
+        IStorageMirror.SafeSettings({owners: _owners, threshold: _threshold});
       bytes32 _settingsHash = keccak256(abi.encode(_safeSettings));
 
       // NOTE: No need to reset settings as this function will only be called when the settings change

solidity/contracts/VerifierModule.sol

@@ -136,6 +136,7 @@ contract VerifierModule is IVerifierModule {
     bytes memory _storageMirrorStorageProof,
     SafeTxnParams calldata _arbitraryTxnParams
   ) internal {
+    uint256 _startingGas = gasleft();
     bytes32 _hashedProposedSettings = _verifyNewSettings(_safe, _proposedSettings, _storageMirrorStorageProof);
 
     // If we dont revert from the _verifyNewSettings() call, then we can update the safe
@@ -156,15 +157,24 @@ contract VerifierModule is IVerifierModule {
       _arbitraryTxnParams.signatures
     );
 
-    // Pay incentives
-    // TODO: Calculations for incentives so its not hardcoded to 1e18
-    ISafe(_safe).execTransactionFromModule(msg.sender, 1e18, '', Enum.Operation.Call);
-
     // Make the storage updates at the end of the call to save gas in a revert scenario
     latestVerifiedSettings[_safe] = _hashedProposedSettings;
     latestVerifiedSettingsTimestamp[_safe] = block.timestamp;
 
     emit VerifiedUpdate(_safe, _hashedProposedSettings);
+
+    // NOTE: This is not the exact gas spent as we still have to make the transaction after the calculation
+    // NOTE: We do all this at the end of the call to get the most accurate gas calculations
+
+    uint256 _gasLeft = gasleft();
+
+    uint256 _gasSpent = _startingGas - _gasLeft;
+
+    // Gas spent plus 10% incentive
+    uint256 _incentive = _gasSpent + _gasSpent * 10 / 100;
+
+    // Pay incentives
+    ISafe(_safe).execTransactionFromModule(msg.sender, _incentive, '', Enum.Operation.Call);
   }
 
   /**

solidity/test/unit/UpdateStorageMirrorGuard.t.sol

@@ -5,6 +5,7 @@ import {Test} from 'forge-std/Test.sol';
 import {UpdateStorageMirrorGuard} from 'contracts/UpdateStorageMirrorGuard.sol';
 import {IGuardCallbackModule} from 'interfaces/IGuardCallbackModule.sol';
 import {IStorageMirror} from 'interfaces/IStorageMirror.sol';
+import {ISafe} from 'interfaces/ISafe.sol';
 
 abstract contract Base is Test {
   event SettingsChanged(address indexed _safe, bytes32 indexed _settingsHash, IStorageMirror.SafeSettings _settings);
@@ -30,6 +31,15 @@ abstract contract Base is Test {
 
 contract UnitUpdateStorageMirrorGuard is Base {
   function testCheckAfterExecution(bytes32 _txHash) public {
+    address[] memory _owners = new address[](1);
+    _owners[0] = safe;
+
+    uint256 _threshold = 1;
+
+    vm.mockCall(address(safe), abi.encodeCall(ISafe.getOwners, ()), abi.encode(_owners));
+
+    vm.mockCall(address(safe), abi.encodeCall(ISafe.getThreshold, ()), abi.encode(_threshold));
+
     vm.mockCall(
       address(guardCallbackModule),
       abi.encodeCall(IGuardCallbackModule.saveUpdatedSettings, (safe, settingsHash)),