Skip to content

Commit

Permalink
upgrade to solidity 0.6.8 (#106)
Browse files Browse the repository at this point in the history
  • Loading branch information
ralph-pichler authored May 19, 2020
1 parent 530480b commit efe312e
Show file tree
Hide file tree
Showing 13 changed files with 541 additions and 3,135 deletions.
2 changes: 1 addition & 1 deletion .solhint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"rules": {
"indent": [4],
"not-rely-on-time": "off",
"mark-callable-contracts": "off"
"compiler-version": "off"
}
}
2 changes: 0 additions & 2 deletions .soliumignore

This file was deleted.

21 changes: 0 additions & 21 deletions .soliumrc.json

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile.abigen
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM node:10.16.0-stretch as builder

ARG GETH_VERSION="1.9.7-a718daa6"
ARG SOLIDITY_VERSION="0.5.15"
ARG SOLIDITY_VERSION="0.6.8"

RUN wget -q "https://github.com/ethereum/solidity/releases/download/v$SOLIDITY_VERSION/solc-static-linux" \
&& chmod +x solc-static-linux \
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ To also generate coverage information use `npm run coverage` instead.

## Linting

This repo currently uses both `solhint` and `ethlint` as linters. Both can be called through npm:
This repo currently uses `solhint` as linter. It can be called through npm:
```sh
npm run ethlint
npm run solhint
```

Expand Down
4 changes: 2 additions & 2 deletions contracts/ERC20SimpleSwap.sol
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pragma solidity =0.5.15;
pragma solidity =0.6.8;
import "@openzeppelin/contracts/math/SafeMath.sol";
import "@openzeppelin/contracts/math/Math.sol";
import "@openzeppelin/contracts/cryptography/ECDSA.sol";
import "@openzeppelin/contracts/token/ERC20/ERC20Mintable.sol";
import "@openzeppelin/contracts/token/ERC20/ERC20.sol";

/**
@title Chequebook contract without waivers
Expand Down
3 changes: 2 additions & 1 deletion contracts/Migrations.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pragma solidity ^0.5.0;
pragma solidity =0.6.8;
import "@openzeppelin/contracts/presets/ERC20PresetMinterPauser.sol";

contract Migrations {
address public owner;
Expand Down
2 changes: 1 addition & 1 deletion contracts/SimpleSwapFactory.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity =0.5.15;
pragma solidity =0.6.8;
import "./ERC20SimpleSwap.sol";

/**
Expand Down
Loading

0 comments on commit efe312e

Please # to comment.