Optimize Personal Edition #25

rmeissner · 2018-04-17T09:51:02Z

Implements:

Set up CI #27: Added CI to project
Add solc package #22: Add solc package
Remove constructors from Safe contract and extensions, which only execute setup function. #21: Remove setup constructors
Optimize GnosisSafe setup function #20: Optimize array access in setup functions
_nonce argument not used #19: Separated Personal and Team edition logic
Add local nonce #17: Added Team Edition without global nonce
Remove functionality related to transaction confirmations via smart contracts #16: Remove functionality related to transaction confirmations via
Add version byte to follow EIP191 #15: Add version byte for hashing
Allow extension execution via meta transaction #14: Use signature with daily limit extension
Implement EIP897 interface for proxy contract #13: EIP-897 interface on Proxy
Make masterCopy state variable public #12: Expose master copy address
Favor use of the gas opcode over not(0) #8: Use gas instead of not(0)
Consider using if instead of switch in the ProxyFactory contract #7: Replace assembly switch with if

ToDos:

Implements * #21: Remove setup constructors * #22: Add solc package * #16: Remove functionality related to transaction confirmations via smart contracts

rmeissner · 2018-04-17T09:52:37Z

contracts/GnosisSafe.sol

    uint256 public nonce;
+    uint8 public threshold;


The declaration of the threshold was moved to ensure that it is not combined with the masterCopy address

rmeissner · 2018-04-17T09:53:26Z

contracts/Proxy.sol

+        pure
+        returns (uint256)
+    {
+        return 2;


Not sure if these methods should be declared here or in the master copy

I think the intention was to implement them in Proxy.sol.

Georgi87 · 2018-04-19T16:01:45Z

What was the motivation to change the extension behaviour?

rmeissner · 2018-04-19T16:11:25Z

In my opinion it is more flexible, but it was just an example implementation. I commented on the issue for the extension change #14

Georgi87 · 2018-05-09T16:45:30Z

contracts/GnosisSafePersonalEdition.sol

+        return startGas - gasleft();
+    }
+
+    function checkHash(bytes32 hash, uint8[] v, bytes32[] r, bytes32[] s)


Add natspec here?

I will change it to internal, no need to expose that in the abi

Georgi87 · 2018-05-09T16:59:07Z

contracts/GnosisSafePersonalEdition.sol

+        public
+    {
+        uint256 startGas = gasleft();
+        require(address(this).balance - value >= totalGasCosts(safeTxGas) * gasPrice);


I wonder if this check is really helpful. This check allows to let a transaction fail early in case the transaction service was front run by another service or safe owner. In this attack scenario the attacker could easily obfuscate value transfers using multisend transactions to make the transaction not fail.

True, I will remove it

Georgi87 · 2018-05-09T17:04:11Z

contracts/GnosisSafePersonalEdition.sol

+        checkHash(getTransactionHash(to, value, data, operation, safeTxGas, gasPrice, nonce), v, r, s);
+        // Increase nonce and execute transaction.
+        nonce++;
+        require(gasleft() - PAYMENT_GAS_COSTS >= safeTxGas);


Is this check really necessary? The tx service should be able to verify that this require statement will always be satisfied at the time the transaction is sent.

This is so that the service cannot set a too low total gas that makes the user transaction fail, but still allow a successful transfer of funds

Oh right, because execute(to, value, data, operation, safeTxGas) wont revert if safeTxGas < gasleft() right?

yes, it might still use up the gas so the final payment would fail ... but the check makes this more secure

Georgi87 · 2018-05-09T17:05:40Z

contracts/GnosisSafePersonalEdition.sol

+        pure
+        returns (uint256) 
+    {
+        return executionGas + PAYMENT_GAS_COSTS + BASE_TX_GAS_COSTS + msg.data.length * DATA_BYTE_GAS_COSTS;


The tx service has the possibility to add a lot of useless payload to the transaction, to let the user pay more than necessary. Maybe we should include the data.length in the signature.

In this case we maybe should precalculate the whole data costs

Agreed, this would make sense.

Georgi87 · 2018-05-09T17:23:53Z

contracts/DelegateConstructorProxy.sol

+        delegate(msg.data, true);
+    }
+
+    function delegate(bytes _calldata, bool returnData)


Why not always retrunData == true? I would remove this argument as the constructor case a single time use case.

If we copy the delegate call logic in the constructor the one time costs might increase not sure how much the per transaction gas increases because of that, will check

hmm gas costs are exactly the same :D

Georgi87 · 2018-05-09T17:27:42Z

contracts/GnosisSafe.sol

-                confirmationCount++;
-            }
-        }
+        setupOwners(_owners, _threshold);


Constructors of inherited contracts can be called like modifiers (https://github.com/gnosis/MultiSigWallet/blob/master/contracts/MultiSigWalletWithDailyLimit.sol#L30). I guess this won't work for regular functions (not sure)?

not as far as I understand the docs.

Georgi87 · 2018-05-09T17:29:46Z

contracts/GnosisSafeTeamEdition.sol

+            bool ownerConfirmed = isConfirmed[transactionHash][owner];
+            if(owner == msg.sender || ownerConfirmed) {
+                if (ownerConfirmed) {
+                    isConfirmed[transactionHash][owner] = false;


For gas refunds?

Yes, without would be cleaner, what do you prefer?

Georgi87 · 2018-05-09T17:42:41Z

contracts/GnosisSafe.sol

-            }
-        }
+        setupOwners(_owners, _threshold);
+        setupModules(to, data);


We could make setupOwners and setupModules internal functions. They can still be called in the Safe setup function and we won't have to set the initialized storage in the modules manager.

I made setupModules public to have the possibility to just deploy the modulemanager (that was more the case for personal edition module solution). I can take that out and if somebody wants this functionality they have to add a StandaloneModuleManger that has this functionality

…modules

…de them in dataGas

Sticknmove

Thanks

rmeissner added 6 commits April 16, 2018 18:15

Improve and cleanup Gnosis Safe

c12c720

Implements * #21: Remove setup constructors * #22: Add solc package * #16: Remove functionality related to transaction confirmations via smart contracts

Implement #15: Add version byte for hashing

b14eb2c

Implement #13: EIP-897 interface on Proxy

cd5f25c

Adjusted extension logic

e72143b

Fixed tests

4d7342d

Implemented #14: Use signature with daily limit extension

e7ca1b2

rmeissner self-assigned this Apr 17, 2018

rmeissner requested a review from Georgi87 April 17, 2018 09:51

rmeissner added the WIP label Apr 17, 2018

rmeissner commented Apr 17, 2018

View reviewed changes

Implements #20: Optimize array access in setup functions

37d6a41

rmeissner and others added 6 commits May 8, 2018 00:31

Added different payment options (#26)

60facf3

Use gas instead of not(0)

ce6acef

replace assembly switch with if

1ffee77

Added test for different safe versions

2b95bc5

Added test for send exploit

1a750ec

Use preset gasPrice, Use transfer instead of send

af6a41b

Georgi87 reviewed May 9, 2018

View reviewed changes

rmeissner added 2 commits May 10, 2018 00:25

Implemented PR comments

cf3098e

Fix tests

910f6dd

rmeissner removed the WIP label May 18, 2018

rmeissner and others added 25 commits May 19, 2018 22:30

Audit improvements for team edition

d84819b

Require token transfer for payment to be successfull

4d616d0

Added test for auto confirm of sender

4ed1ece

Added error message to all requires

be2c138

Adjusted revert messages

95ccf95

More error message adjustments

b24f6fc

Add mnemonic logic for deployment

b42b5f9

Fix truffle dependency

76b70e8

Fix possibility of malicious replace/remove operations on owners and …

b22967a

…modules

Added delegatecall for multi send

0ef7ade

Add hash to failed event; Use ganache npm package

51a0935

Update package-lock

ecf060b

Added error message for ether payment; Removed static costs and inclu…

4567ea1

…de them in dataGas

Change bool and uint8 to uint256

355c413

Change r, s, v arrays to bytes

942968d

Use uint256 instead of uint8

2983553

Adjust visibility of signature validation methods

9dd2a84

Perform token transfer in assembly for correct return

04d2785

Remove naming check for team edition

1007cd9

Remove unused erc20 interface

cb41a12

Delete .node-xmlhttprequest-sync-11990

7aec3c0

Add tests for failed payment of creation

5a7a442

Fix safe creation payment

73acdc6

Added require messages for paying proxy

898cc89

Added audit report

68685cd

Georgi87 approved these changes Jul 4, 2018

View reviewed changes

rmeissner merged commit e0575ce into master Jul 5, 2018

rmeissner deleted the feature/optimize_personal_edition branch August 15, 2018 15:29

Sticknmove reviewed Oct 19, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Optimize Personal Edition #25

Optimize Personal Edition #25

rmeissner commented Apr 17, 2018 •

edited

Loading

rmeissner Apr 17, 2018

rmeissner Apr 17, 2018

Georgi87 Apr 19, 2018

Georgi87 commented Apr 19, 2018

rmeissner commented Apr 19, 2018

Georgi87 May 9, 2018

rmeissner May 9, 2018

Georgi87 May 9, 2018

rmeissner May 9, 2018

Georgi87 May 9, 2018

rmeissner May 9, 2018

Georgi87 May 9, 2018

rmeissner May 9, 2018 •

edited

Loading

Georgi87 May 9, 2018

rmeissner May 9, 2018

Georgi87 May 9, 2018

Georgi87 May 9, 2018

rmeissner May 9, 2018

rmeissner May 9, 2018

Georgi87 May 9, 2018

rmeissner May 9, 2018

Georgi87 May 9, 2018

rmeissner May 9, 2018

Georgi87 May 9, 2018

rmeissner May 9, 2018

Sticknmove left a comment

Optimize Personal Edition #25

Optimize Personal Edition #25

Conversation

rmeissner commented Apr 17, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Georgi87 commented Apr 19, 2018

rmeissner commented Apr 19, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rmeissner May 9, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Sticknmove left a comment

Choose a reason for hiding this comment

rmeissner commented Apr 17, 2018 •

edited

Loading

rmeissner May 9, 2018 •

edited

Loading