Skip to content

Commit

Permalink
Bump prettier-plugin-solidity from 1.0.0-alpha.36 to 1.0.0-alpha.37 (#…
Browse files Browse the repository at this point in the history
…506)

* Bump prettier-plugin-solidity from 1.0.0-alpha.36 to 1.0.0-alpha.37

Bumps [prettier-plugin-solidity](https://github.com/prettier-solidity/prettier-plugin-solidity) from 1.0.0-alpha.36 to 1.0.0-alpha.37.
- [Release notes](https://github.com/prettier-solidity/prettier-plugin-solidity/releases)
- [Commits](prettier-solidity/prettier-plugin-solidity@v1.0.0-alpha.36...v1.0.0-alpha.37)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* new prettier rules

Co-authored-by: Nicholas Rodrigues Lordello <[email protected]>
  • Loading branch information
dependabot-preview[bot] and nlordell committed Jan 27, 2020
1 parent f4aa886 commit cc4c230
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 5 deletions.
3 changes: 3 additions & 0 deletions contracts/BatchExchange.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import "openzeppelin-solidity/contracts/utils/SafeCast.sol";
import "solidity-bytes-utils/contracts/BytesLib.sol";
import "./libraries/TokenConservation.sol";


/** @title BatchExchange - A decentralized exchange for any ERC20 token as a multi-token batch
* auction with uniform clearing prices.
* For more information visit: <https://github.com/gnosis/dex-contracts>
Expand Down Expand Up @@ -389,6 +390,7 @@ contract BatchExchange is EpochTokenLocker {
);
return (objectiveValue);
}

/**
* Public View Methods
*/
Expand Down Expand Up @@ -536,6 +538,7 @@ contract BatchExchange is EpochTokenLocker {
return 0;
}
}

/**
* Private Functions
*/
Expand Down
1 change: 1 addition & 0 deletions contracts/DevDependencies.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ import "openzeppelin-solidity/contracts/token/ERC20/ERC20Mintable.sol";
import "solidity-multicall/contracts/MultiCaller.sol";
import "@gnosis.pm/owl-token/contracts/TokenOWLProxy.sol";


contract DevDependencies {}
2 changes: 2 additions & 0 deletions contracts/EpochTokenLocker.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import "openzeppelin-solidity/contracts/token/ERC20/SafeERC20.sol";
import "openzeppelin-solidity/contracts/math/Math.sol";
import "openzeppelin-solidity/contracts/math/SafeMath.sol";


/** @title Epoch Token Locker
* EpochTokenLocker saveguards tokens for applications with constant-balances during discrete epochs
* It allows to deposit a token which become credited in the next epoch and allows to request a token-withdraw
Expand Down Expand Up @@ -115,6 +116,7 @@ contract EpochTokenLocker {
SafeERC20.safeTransfer(IERC20(token), user, amount);
emit Withdraw(user, token, amount);
}

/**
* Public view functions
*/
Expand Down
1 change: 1 addition & 0 deletions contracts/Migrations.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pragma solidity >=0.4.21 <0.6.0;


contract Migrations {
address public owner;
uint256 public last_completed_migration;
Expand Down
1 change: 1 addition & 0 deletions contracts/SnappAuction.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ pragma solidity ^0.5.0;
import "./SnappBase.sol";
import "solidity-bytes-utils/contracts/BytesLib.sol";


contract SnappAuction is SnappBase {
using BytesLib for bytes;

Expand Down
1 change: 1 addition & 0 deletions contracts/SnappBase.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
import "./libraries/SnappBaseCore.sol";
import "@gnosis.pm/solidity-data-structures/contracts/libraries/IdToAddressBiMap.sol";


contract SnappBase is Ownable {
using SnappBaseCore for SnappBaseCore.Data;
SnappBaseCore.Data internal coreData;
Expand Down
1 change: 1 addition & 0 deletions contracts/libraries/SnappBaseCore.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import "@gnosis.pm/solidity-data-structures/contracts/libraries/IdToAddressBiMap
import "@gnosis.pm/solidity-data-structures/contracts/libraries/Merkle.sol";
import "../SnappBase.sol";


library SnappBaseCore {
using Merkle for bytes32;

Expand Down
1 change: 1 addition & 0 deletions contracts/libraries/TokenConservation.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ pragma solidity ^0.5.0;

import "openzeppelin-solidity/contracts/drafts/SignedSafeMath.sol";


/** @title Token Conservation
* A library for updating and verifying the tokenConservation contraint for BatchExchange's batch auction
* @author @gnosis/dfusion-team <https://github.com/orgs/gnosis/teams/dfusion-team/members>
Expand Down
1 change: 1 addition & 0 deletions contracts/test/EpochTokenLockerTestInterface.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ pragma solidity ^0.5.0;
import "@gnosis.pm/mock-contract/contracts/MockContract.sol";
import "../EpochTokenLocker.sol";


contract EpochTokenLockerTestInterface is EpochTokenLocker {
function addBalanceTest(address user, address token, uint256 amount) public {
super.addBalance(user, token, amount);
Expand Down
1 change: 1 addition & 0 deletions contracts/test/TokenConservationWrapper.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ pragma solidity ^0.5.0;

import "../libraries/TokenConservation.sol";


contract TokenConservationWrapper {
using TokenConservation for int256[];
using TokenConservation for uint16[];
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"node-fetch": "^2.6.0",
"openzeppelin-solidity": "OpenZeppelin/openzeppelin-contracts#2c11ed59",
"prettier": "^1.19.1",
"prettier-plugin-solidity": "^1.0.0-alpha.36",
"prettier-plugin-solidity": "^1.0.0-alpha.37",
"solhint": "^2.3.0",
"solhint-plugin-prettier": "0.0.3",
"solidity-bytes-utils": "0.0.8",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6882,10 +6882,10 @@ prettier-linter-helpers@^1.0.0:
dependencies:
fast-diff "^1.1.2"

prettier-plugin-solidity@^1.0.0-alpha.36:
version "1.0.0-alpha.36"
resolved "https://registry.yarnpkg.com/prettier-plugin-solidity/-/prettier-plugin-solidity-1.0.0-alpha.36.tgz#34b528377d9ee40b673f90995364f1e61f450ce4"
integrity sha512-qCvREmzya+OpZq4rK0Hz5Wk2gelTAx/ffFbp7ATit/Mklf7uCA1h3fHp3jg+8eW/3ie2kLoQw2Fc8gOGYa1Tcw==
prettier-plugin-solidity@^1.0.0-alpha.37:
version "1.0.0-alpha.37"
resolved "https://registry.yarnpkg.com/prettier-plugin-solidity/-/prettier-plugin-solidity-1.0.0-alpha.37.tgz#075098f08123564264517985adf69101b0437410"
integrity sha512-DPXw25fUBqBEkBSpCjlBsM4LP+qIj4x1U6o3CXr29WRzSZg0r5X0i2Jhs7XaD08A4e6QRMQwk2xtiLkUP/4eoQ==
dependencies:
dir-to-object "^2.0.0"
emoji-regex "^8.0.0"
Expand Down

0 comments on commit cc4c230

Please sign in to comment.