Upgrade prettier-solidity

contracts/libraries/LibAddRemoveToken.sol

@@ -20,9 +20,8 @@ library LibAddRemoveToken {
 
     uint256 totalSupply = PCStorage.load().totalSupply;
 
-    uint256 poolShares = totalSupply.bmul(ws.newToken.denorm).bdiv(
-      s.bPool.getTotalDenormalizedWeight()
-    );
+    uint256 poolShares =
+      totalSupply.bmul(ws.newToken.denorm).bdiv(s.bPool.getTotalDenormalizedWeight());
 
     ws.newToken.isCommitted = false;
 
@@ -70,9 +69,10 @@ library LibAddRemoveToken {
     uint256 totalSupply = PCStorage.load().totalSupply;
 
     // poolShares = totalSupply * tokenWeight / totalWeight
-    uint256 poolShares = totalSupply.bmul(s.bPool.getDenormalizedWeight(_token)).bdiv(
-      s.bPool.getTotalDenormalizedWeight()
-    );
+    uint256 poolShares =
+      totalSupply.bmul(s.bPool.getDenormalizedWeight(_token)).bdiv(
+        s.bPool.getTotalDenormalizedWeight()
+      );
 
     // this is what will be unbound from the pool
     // Have to get it before unbinding

contracts/libraries/LibPoolEntryExit.sol

@@ -19,7 +19,7 @@ library LibPoolEntryExit {
 
   modifier lockBPoolSwap() {
     IBPool bPool = PBStorage.load().bPool;
-    if(bPool.isPublicSwap()) {
+    if (bPool.isPublicSwap()) {
       // If public swap is enabled turn it of, execute function and turn it off again
       bPool.setPublicSwap(false);
       _;
@@ -221,7 +221,7 @@ library LibPoolEntryExit {
     address _token,
     uint256 _amountIn,
     uint256 _minPoolAmountOut
-  ) external lockBPoolSwap returns (uint256 poolAmountOut)  {
+  ) external lockBPoolSwap returns (uint256 poolAmountOut) {
     IBPool bPool = PBStorage.load().bPool;
     LibFees.chargeOutstandingAnnualFee();
     require(bPool.isBound(_token), "LibPoolEntryExit.joinswapExternAmountIn: Token Not Bound");

contracts/libraries/LibPoolMath.sol

@@ -270,9 +270,8 @@ library LibPoolMath {
   {
     tokens = PBStorage.load().bPool.getCurrentTokens();
     amounts = new uint256[](tokens.length);
-    uint256 ratio = _amount.bdiv(
-      PCStorage.load().totalSupply.badd(LibFees.calcOutstandingAnnualFee())
-    );
+    uint256 ratio =
+      _amount.bdiv(PCStorage.load().totalSupply.badd(LibFees.calcOutstandingAnnualFee()));
 
     for (uint256 i = 0; i < tokens.length; i++) {
       address t = tokens[i];

contracts/libraries/LibSafeApprove.sol

@@ -3,20 +3,24 @@ pragma solidity 0.6.4;
 import "../interfaces/IERC20.sol";
 
 library LibSafeApprove {
-    function safeApprove(IERC20 _token, address _spender, uint256 _amount) internal {
-        uint256 currentAllowance = _token.allowance(address(this), _spender);
+  function safeApprove(
+    IERC20 _token,
+    address _spender,
+    uint256 _amount
+  ) internal {
+    uint256 currentAllowance = _token.allowance(address(this), _spender);
 
-        // Do nothing if allowance is already set to this value
-        if(currentAllowance == _amount) {
-            return;
-        }
-
-        // If approval is not zero reset it to zero first
-        if(currentAllowance != 0) {
-            _token.approve(_spender, 0);
-        }
+    // Do nothing if allowance is already set to this value
+    if (currentAllowance == _amount) {
+      return;
+    }
 
-        // do the actual approval
-        _token.approve(_spender, _amount);
+    // If approval is not zero reset it to zero first
+    if (currentAllowance != 0) {
+      _token.approve(_spender, 0);
     }
-}
+
+    // do the actual approval
+    _token.approve(_spender, _amount);
+  }
+}

contracts/libraries/LibWeights.sol

@@ -151,7 +151,7 @@ library LibWeights {
       s.bPool.rebind(tokens[i], s.bPool.getBalance(tokens[i]), newWeight);
     }
 
-    if(minBetweenEndBlockAndThisBlock == ws.endBlock) {
+    if (minBetweenEndBlockAndThisBlock == ws.endBlock) {
       // All the weights are adjusted, adjustment finished.
 
       // save gas option: set this to max number instead of 0

contracts/smart-pools/PV2SmartPool.sol

@@ -454,9 +454,12 @@ contract PV2SmartPool is IPV2SmartPool, PCToken, ReentryProtection {
     @notice Set the circuit breaker address. Can only be called by the controller
     @param _newCircuitBreaker Address of the new circuit breaker
   */
-  function setCircuitBreaker(
-    address _newCircuitBreaker
-  ) external override onlyController noReentry {
+  function setCircuitBreaker(address _newCircuitBreaker)
+    external
+    override
+    onlyController
+    noReentry
+  {
     emit CircuitBreakerChanged(P2Storage.load().circuitBreaker, _newCircuitBreaker);
     P2Storage.load().circuitBreaker = _newCircuitBreaker;
   }
@@ -568,8 +571,8 @@ contract PV2SmartPool is IPV2SmartPool, PCToken, ReentryProtection {
     */
   function calcTokensForAmount(uint256 _amount)
     external
-    override
     view
+    override
     returns (address[] memory tokens, uint256[] memory amounts)
   {
     return LibPoolMath.calcTokensForAmount(_amount);
@@ -583,8 +586,8 @@ contract PV2SmartPool is IPV2SmartPool, PCToken, ReentryProtection {
   */
   function calcPoolOutGivenSingleIn(address _token, uint256 _amount)
     external
-    override
     view
+    override
     returns (uint256)
   {
     return LibPoolMath.calcPoolOutGivenSingleIn(_token, _amount);
@@ -598,8 +601,8 @@ contract PV2SmartPool is IPV2SmartPool, PCToken, ReentryProtection {
   */
   function calcSingleInGivenPoolOut(address _token, uint256 _amount)
     external
-    override
     view
+    override
     returns (uint256)
   {
     return LibPoolMath.calcSingleInGivenPoolOut(_token, _amount);
@@ -613,8 +616,8 @@ contract PV2SmartPool is IPV2SmartPool, PCToken, ReentryProtection {
   */
   function calcSingleOutGivenPoolIn(address _token, uint256 _amount)
     external
-    override
     view
+    override
     returns (uint256)
   {
     return LibPoolMath.calcSingleOutGivenPoolIn(_token, _amount);
@@ -628,8 +631,8 @@ contract PV2SmartPool is IPV2SmartPool, PCToken, ReentryProtection {
   */
   function calcPoolInGivenSingleOut(address _token, uint256 _amount)
     external
-    override
     view
+    override
     returns (uint256)
   {
     return LibPoolMath.calcPoolInGivenSingleOut(_token, _amount);
@@ -639,79 +642,79 @@ contract PV2SmartPool is IPV2SmartPool, PCToken, ReentryProtection {
     @notice Get the current tokens in the smart pool
     @return Addresses of the tokens in the smart pool
   */
-  function getTokens() external override view returns (address[] memory) {
+  function getTokens() external view override returns (address[] memory) {
     return PBStorage.load().bPool.getCurrentTokens();
   }
 
   /**
     @notice Get the address of the controller
     @return The address of the pool
   */
-  function getController() external override view returns (address) {
+  function getController() external view override returns (address) {
     return PBStorage.load().controller;
   }
 
   /**
     @notice Get the address of the public swap setter
     @return The public swap setter address
   */
-  function getPublicSwapSetter() external override view returns (address) {
+  function getPublicSwapSetter() external view override returns (address) {
     return PBStorage.load().publicSwapSetter;
   }
 
   /**
     @notice Get the address of the token binder
     @return The token binder address
   */
-  function getTokenBinder() external override view returns (address) {
+  function getTokenBinder() external view override returns (address) {
     return PBStorage.load().tokenBinder;
   }
 
   /**
     @notice Get the address of the circuitBreaker
     @return The address of the circuitBreaker
   */
-  function getCircuitBreaker() external override view returns (address) {
+  function getCircuitBreaker() external view override returns (address) {
     return P2Storage.load().circuitBreaker;
   }
 
   /**
     @notice Get if public swapping is enabled
     @return If public swapping is enabled
   */
-  function isPublicSwap() external override view returns (bool) {
+  function isPublicSwap() external view override returns (bool) {
     return PBStorage.load().bPool.isPublicSwap();
   }
 
   /**
     @notice Get the current cap
     @return The current cap in wei
   */
-  function getCap() external override view returns (uint256) {
+  function getCap() external view override returns (uint256) {
     return PCSStorage.load().cap;
   }
 
-  function getAnnualFee() external override view returns (uint256) {
+  function getAnnualFee() external view override returns (uint256) {
     return P2Storage.load().annualFee;
   }
 
-  function getFeeRecipient() external override view returns (address) {
+  function getFeeRecipient() external view override returns (address) {
     return P2Storage.load().feeRecipient;
   }
 
   /**
     @notice Get the denormalized weight of a specific token in the underlying balancer pool
     @return the normalized weight of the token in uint
   */
-  function getDenormalizedWeight(address _token) external override view returns (uint256) {
+  function getDenormalizedWeight(address _token) external view override returns (uint256) {
     return PBStorage.load().bPool.getDenormalizedWeight(_token);
   }
 
   /**
     @notice Get all denormalized weights
     @return weights Denormalized weights
   */
-  function getDenormalizedWeights() external override view returns (uint256[] memory weights) {
+  function getDenormalizedWeights() external view override returns (uint256[] memory weights) {
     PBStorage.StorageStruct storage s = PBStorage.load();
     address[] memory tokens = s.bPool.getCurrentTokens();
     weights = new uint256[](tokens.length);
@@ -724,63 +727,63 @@ contract PV2SmartPool is IPV2SmartPool, PCToken, ReentryProtection {
     @notice Get the address of the underlying Balancer pool
     @return The address of the underlying balancer pool
   */
-  function getBPool() external override view returns (address) {
+  function getBPool() external view override returns (address) {
     return address(PBStorage.load().bPool);
   }
 
   /**
     @notice Get the current swap fee
     @return The current swap fee
   */
-  function getSwapFee() external override view returns (uint256) {
+  function getSwapFee() external view override returns (uint256) {
     return PBStorage.load().bPool.getSwapFee();
   }
 
   /**
     @notice Get the target weights
     @return weights Target weights
   */
-  function getNewWeights() external override view returns (uint256[] memory weights) {
+  function getNewWeights() external view override returns (uint256[] memory weights) {
     return P2Storage.load().newWeights;
   }
 
   /**
     @notice Get weights at start of weight adjustment
     @return weights Start weights
   */
-  function getStartWeights() external override view returns (uint256[] memory weights) {
+  function getStartWeights() external view override returns (uint256[] memory weights) {
     return P2Storage.load().startWeights;
   }
 
   /**
     @notice Get start block of weight adjustment
     @return Start block
   */
-  function getStartBlock() external override view returns (uint256) {
+  function getStartBlock() external view override returns (uint256) {
     return P2Storage.load().startBlock;
   }
 
   /**
     @notice Get end block of weight adjustment
     @return End block
   */
-  function getEndBlock() external override view returns (uint256) {
+  function getEndBlock() external view override returns (uint256) {
     return P2Storage.load().endBlock;
   }
 
   /**
     @notice Get new token being added
     @return New token
   */
-  function getNewToken() external override view returns (P2Storage.NewToken memory) {
+  function getNewToken() external view override returns (P2Storage.NewToken memory) {
     return P2Storage.load().newToken;
   }
 
   /**
     @notice Get if joining and exiting is enabled
     @return Enabled or not
   */
-  function getJoinExitEnabled() external override view returns (bool) {
+  function getJoinExitEnabled() external view override returns (bool) {
     return P2Storage.load().joinExitEnabled;
   }
 
@@ -789,14 +792,14 @@ contract PV2SmartPool is IPV2SmartPool, PCToken, ReentryProtection {
   /**
     @notice Not Supported in PieDAO implementation of Balancer Smart Pools
   */
-  function finalizeSmartPool() external override view {
+  function finalizeSmartPool() external view override {
     revert("PV2SmartPool.finalizeSmartPool: unsupported function");
   }
 
   /**
     @notice Not Supported in PieDAO implementation of Balancer Smart Pools
   */
-  function createPool(uint256 initialSupply) external override view {
+  function createPool(uint256 initialSupply) external view override {
     revert("PV2SmartPool.createPool: unsupported function");
   }
 }

contracts/test/TestLibSafeApprove.sol

@@ -4,19 +4,19 @@ import "../libraries/LibSafeApprove.sol";
 import "../interfaces/IERC20.sol";
 
 contract TestLibSafeApprove {
-    using LibSafeApprove for IERC20;
+  using LibSafeApprove for IERC20;
 
-    function doubleApprovalUnsafe(address _token) external {
-        IERC20 token = IERC20(_token);
+  function doubleApprovalUnsafe(address _token) external {
+    IERC20 token = IERC20(_token);
 
-        token.approve(msg.sender, 1337);
-        token.approve(msg.sender, 42);
-    }
+    token.approve(msg.sender, 1337);
+    token.approve(msg.sender, 42);
+  }
 
-    function doubleApprovalSafe(address _token) external {
-        IERC20 token = IERC20(_token);
+  function doubleApprovalSafe(address _token) external {
+    IERC20 token = IERC20(_token);
 
-        token.safeApprove(msg.sender, 1337);
-        token.safeApprove(msg.sender, 42);
-    }
-}
+    token.safeApprove(msg.sender, 1337);
+    token.safeApprove(msg.sender, 42);
+  }
+}

package.json

@@ -41,7 +41,7 @@
     "ethereum-waffle": "^2.3.2",
     "ethers": "^4.0.47",
     "prettier": "^2.0.5",
-    "prettier-plugin-solidity": "^1.0.0-alpha.52",
+    "prettier-plugin-solidity": "^1.0.0-beta.1",
     "solhint": "^3.0.0",
     "solidity-coverage": "^0.7.9",
     "ts-generator": "0.0.8",