Prettify Solidity files (#1623)

Author: nambrot

.prettierrc.js

@@ -6,4 +6,12 @@ module.exports = {
   printWidth: 100,
   tabWidth: 2,
   bracketSpacing: true,
+  overrides: [
+    {
+      files: '**/*.sol',
+      options: {
+        singleQuote: false,
+      },
+    },
+  ],
 }

package.json

@@ -7,8 +7,8 @@
   "scripts": {
     "install-pkg": "yarn install --link-duplicates",
     "lint": "yarn lerna run lint",
-    "prettify": "yarn run prettier --config .prettierrc.js --write '**/*.+(ts|tsx|js|jsx)'",
-    "prettify:diff": "yarn run prettier --config .prettierrc.js --list-different '**/*.+(ts|tsx|js|jsx)'",
+    "prettify": "yarn run prettier --config .prettierrc.js --write '**/*.+(ts|tsx|js|jsx|sol)'",
+    "prettify:diff": "yarn run prettier --config .prettierrc.js --list-different '**/*.+(ts|tsx|js|jsx|sol)'",
     "reset": "yarn reset-modules && yarn reset-cache",
     "reset-cache": "yarn reset-yarn && yarn reset-rn",
     "reset-modules": "rm -rf node_modules/ packages/*/node_modules",
@@ -51,6 +51,7 @@
     "lerna": "^3.16.0",
     "patch-package": "^5.1.1",
     "prettier": "1.13.5",
+    "prettier-plugin-solidity": "1.0.0-alpha.34",
     "pretty-quick": "^1.11.1",
     "solc": "0.5.8",
     "tslint": "^5.20.0",
@@ -76,4 +77,4 @@
     "**/extend": "^3.0.2",
     "sha3": "1.2.3"
   }
-} 
+}

packages/protocol/contracts/Migrations.sol

@@ -1,10 +1,8 @@
 pragma solidity ^0.5.3;
 
-
 contract Migrations {
-
   address public owner;
-  uint public last_completed_migration; // solhint-disable var-name-mixedcase
+  uint256 public last_completed_migration; // solhint-disable var-name-mixedcase
 
   modifier restricted() {
     if (msg.sender == owner) _;
@@ -14,7 +12,7 @@ contract Migrations {
     owner = msg.sender;
   }
 
-  function setCompleted(uint completed) external restricted {
+  function setCompleted(uint256 completed) external restricted {
     last_completed_migration = completed; // solhint-disable var-name-mixedcase
   }
 

packages/protocol/contracts/baklava/Freezable.sol

@@ -1,6 +1,5 @@
 pragma solidity ^0.5.3;
 
-
 contract Freezable {
   bool public frozen;
   address public freezer;

packages/protocol/contracts/baklava/test/FreezableTest.sol

@@ -2,7 +2,6 @@ pragma solidity ^0.5.8;
 
 import "../Freezable.sol";
 
-
 contract FreezableTest is Freezable {
   event FunctionCalled();
 

packages/protocol/contracts/common/Accounts.sol

@@ -10,20 +10,17 @@ import "../common/Signatures.sol";
 import "../common/UsingRegistry.sol";
 
 contract Accounts is IAccounts, ReentrancyGuard, Initializable, UsingRegistry {
-
   using SafeMath for uint256;
 
   struct Signers {
     //The address that is authorized to vote in governance and validator elections on behalf of the
     // account. The account can vote as well, whether or not an vote signing key has been specified.
     address voting;
-
     // The address that is authorized to manage a validator or validator group and sign consensus
     // messages on behalf of the account. The account can manage the validator, whether or not an
     // validation signing key has been specified. However if an validation signing key has been
     // specified, only that key may actually participate in consensus.
     address validating;
-
     // The address of the key with which this account wants to sign attestations on the Attestations
     // contract
     address attesting;
@@ -35,17 +32,13 @@ contract Accounts is IAccounts, ReentrancyGuard, Initializable, UsingRegistry {
     // These keys may not be keys of other accounts, and may not be authorized by any other
     // account for any purpose.
     Signers signers;
-
     // The address at which the account expects to receive transfers. If it's empty/0x0, the
     // account indicates that an address exchange should be initiated with the dataEncryptionKey
     address walletAddress;
-
     // An optional human readable identifier for the account
     string name;
-
     // The ECDSA public key used to encrypt and decrypt data for this account
     bytes dataEncryptionKey;
-
     // The URL under which an account adds metadata and claims
     string metadataURL;
   }
@@ -54,7 +47,6 @@ contract Accounts is IAccounts, ReentrancyGuard, Initializable, UsingRegistry {
   // Maps voting and validating keys to the account that provided the authorization.
   mapping(address => address) public authorizedBy;
 
-
   event AttestationSignerAuthorized(address indexed account, address signer);
   event VoteSignerAuthorized(address indexed account, address signer);
   event ValidationSignerAuthorized(address indexed account, address signer);
@@ -70,14 +62,10 @@ contract Accounts is IAccounts, ReentrancyGuard, Initializable, UsingRegistry {
    * @param dataEncryptionKey secp256k1 public key for data encryption. Preferably compressed.
    * @param walletAddress The wallet address to set for the account
    */
-  function setAccount(
-    string calldata name,
-    bytes calldata dataEncryptionKey,
-    address walletAddress
-  )
+  function setAccount(string calldata name, bytes calldata dataEncryptionKey, address walletAddress)
     external
   {
-    if(!isAccount(msg.sender)) {
+    if (!isAccount(msg.sender)) {
       createAccount();
     }
     setName(name);
@@ -103,15 +91,7 @@ contract Accounts is IAccounts, ReentrancyGuard, Initializable, UsingRegistry {
    * @param s Output value s of the ECDSA signature.
    * @dev v, r, s constitute `voter`'s signature on `msg.sender`.
    */
-  function authorizeVoteSigner(
-    address voter,
-    uint8 v,
-    bytes32 r,
-    bytes32 s
-  )
-    external
-    nonReentrant
-  {
+  function authorizeVoteSigner(address voter, uint8 v, bytes32 r, bytes32 s) external nonReentrant {
     Account storage account = accounts[msg.sender];
     authorize(voter, account.signers.voting, v, r, s);
     account.signers.voting = voter;
@@ -126,12 +106,7 @@ contract Accounts is IAccounts, ReentrancyGuard, Initializable, UsingRegistry {
    * @param s Output value s of the ECDSA signature.
    * @dev v, r, s constitute `validator`'s signature on `msg.sender`.
    */
-  function authorizeValidationSigner(
-    address validator,
-    uint8 v,
-    bytes32 r,
-    bytes32 s
-  )
+  function authorizeValidationSigner(address validator, uint8 v, bytes32 r, bytes32 s)
     external
     nonReentrant
   {
@@ -179,11 +154,7 @@ contract Accounts is IAccounts, ReentrancyGuard, Initializable, UsingRegistry {
    * @dev Fails if the `accountOrVoteSigner` is not an account or active authorized vote signer.
    * @return The associated account.
    */
-  function activeVoteSignerToAccount(address accountOrVoteSigner)
-    external
-    view
-    returns (address)
-  {
+  function activeVoteSignerToAccount(address accountOrVoteSigner) external view returns (address) {
     address authorizingAccount = authorizedBy[accountOrVoteSigner];
     if (authorizingAccount != address(0)) {
       require(accounts[authorizingAccount].signers.voting == accountOrVoteSigner);
@@ -228,7 +199,7 @@ contract Accounts is IAccounts, ReentrancyGuard, Initializable, UsingRegistry {
     return accounts[account].metadataURL;
   }
 
-    /**
+  /**
    * @notice Getter for the data encryption key and version.
    * @param account The address of the account to get the key for
    * @return dataEncryptionKey secp256k1 public key for data encryption. Preferably compressed.
@@ -296,14 +267,7 @@ contract Accounts is IAccounts, ReentrancyGuard, Initializable, UsingRegistry {
    * @param s Output value s of the ECDSA signature.
    * @dev v, r, s constitute `attestor`'s signature on `msg.sender`.
    */
-  function authorizeAttestationSigner(
-    address attestor,
-    uint8 v,
-    bytes32 r,
-    bytes32 s
-  )
-    public
-  {
+  function authorizeAttestationSigner(address attestor, uint8 v, bytes32 r, bytes32 s) public {
     Account storage account = accounts[msg.sender];
     authorize(attestor, account.signers.attesting, v, r, s);
     account.signers.attesting = attestor;
@@ -444,15 +408,7 @@ contract Accounts is IAccounts, ReentrancyGuard, Initializable, UsingRegistry {
    * @dev Fails if the address is already authorized or is an account.
    * @dev v, r, s constitute `current`'s signature on `msg.sender`.
    */
-  function authorize(
-    address current,
-    address previous,
-    uint8 v,
-    bytes32 r,
-    bytes32 s
-  )
-    private
-  {
+  function authorize(address current, address previous, uint8 v, bytes32 r, bytes32 s) private {
     require(isAccount(msg.sender) && isNotAccount(current) && isNotAuthorized(current));
 
     address signer = Signatures.getSignerOfAddress(msg.sender, v, r, s);
@@ -461,4 +417,4 @@ contract Accounts is IAccounts, ReentrancyGuard, Initializable, UsingRegistry {
     authorizedBy[previous] = address(0);
     authorizedBy[current] = msg.sender;
   }
-}
+}

packages/protocol/contracts/common/ExtractFunctionSignature.sol

@@ -7,7 +7,9 @@ library ExtractFunctionSignature {
    * @return The first four bytes of `input`.
    */
   function extractFunctionSignature(bytes memory input) internal pure returns (bytes4) {
-    return (bytes4(input[0]) | bytes4(input[1])>>8 | bytes4(input[2])>>16 | bytes4(input[3])>>24);
+    return (bytes4(input[0]) |
+      (bytes4(input[1]) >> 8) |
+      (bytes4(input[2]) >> 16) |
+      (bytes4(input[3]) >> 24));
   }
 }
-

packages/protocol/contracts/common/FixidityLib.sol

@@ -1,6 +1,5 @@
 pragma solidity ^0.5.0;
 
-
 /**
  * @title FixidityLib
  * @author Gadi Guy, Alberto Cuesta Canada
@@ -16,7 +15,6 @@ pragma solidity ^0.5.0;
  * overflow.
  */
 library FixidityLib {
-
   struct Fraction {
     uint256 value;
   }
@@ -120,11 +118,7 @@ library FixidityLib {
    * Test newFixed(maxNewFixed()) returns maxNewFixed() * fixed1()
    * Test newFixed(maxNewFixed()+1) fails
    */
-  function newFixed(uint256 x)
-    internal
-    pure
-    returns (Fraction memory)
-  {
+  function newFixed(uint256 x) internal pure returns (Fraction memory) {
     require(x <= maxNewFixed());
     return Fraction(x * FIXED1_UINT);
   }
@@ -133,11 +127,7 @@ library FixidityLib {
    * @notice Converts a uint256 in the fixed point representation of this
    * library to a non decimal. All decimal digits will be truncated.
    */
-  function fromFixed(Fraction memory x)
-    internal
-    pure
-    returns (uint256)
-  {
+  function fromFixed(Fraction memory x) internal pure returns (uint256) {
     return x.value / FIXED1_UINT;
   }
 
@@ -153,10 +143,7 @@ library FixidityLib {
    * Test newFixedFraction(maxFixedDividend(),1) returns maxFixedDividend()*fixed1()
    * Test newFixedFraction(1,fixed1()) returns 1
    */
-  function newFixedFraction(
-    uint256 numerator,
-    uint256 denominator
-  )
+  function newFixedFraction(uint256 numerator, uint256 denominator)
     internal
     pure
     returns (Fraction memory)
@@ -278,7 +265,7 @@ library FixidityLib {
    */
   function reciprocal(Fraction memory x) internal pure returns (Fraction memory) {
     require(x.value != 0);
-    return Fraction((FIXED1_UINT*FIXED1_UINT) / x.value); // Can't overflow
+    return Fraction((FIXED1_UINT * FIXED1_UINT) / x.value); // Can't overflow
   }
 
   /**