Skip to content

Commit 57e322f

Browse files
authored
bumping up solidity to version 0.7.x (#197)
1 parent 1a3245b commit 57e322f

21 files changed

+38
-29
lines changed

contracts/Orchestrator.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
import "./_external/Ownable.sol";
44

contracts/UFragments.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
import "./_external/SafeMath.sol";
44
import "./_external/Ownable.sol";

contracts/UFragmentsPolicy.sol

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
import "./_external/SafeMath.sol";
44
import "./_external/Ownable.sol";
@@ -104,12 +104,13 @@ contract UFragmentsPolicy is Ownable {
104104
require(inRebaseWindow());
105105

106106
// This comparison also ensures there is no reentrancy.
107-
require(lastRebaseTimestampSec.add(minRebaseTimeIntervalSec) < now);
107+
require(lastRebaseTimestampSec.add(minRebaseTimeIntervalSec) < block.timestamp);
108108

109109
// Snap the rebase time to the start of this window.
110-
lastRebaseTimestampSec = now.sub(now.mod(minRebaseTimeIntervalSec)).add(
111-
rebaseWindowOffsetSec
112-
);
110+
lastRebaseTimestampSec = block
111+
.timestamp
112+
.sub(block.timestamp.mod(minRebaseTimeIntervalSec))
113+
.add(rebaseWindowOffsetSec);
113114

114115
epoch = epoch.add(1);
115116

@@ -140,7 +141,7 @@ contract UFragmentsPolicy is Ownable {
140141

141142
uint256 supplyAfterRebase = uFrags.rebase(epoch, supplyDelta);
142143
assert(supplyAfterRebase <= MAX_SUPPLY);
143-
emit LogRebase(epoch, exchangeRate, cpi, supplyDelta, now);
144+
emit LogRebase(epoch, exchangeRate, cpi, supplyDelta, block.timestamp);
144145
}
145146

146147
/**
@@ -259,8 +260,9 @@ contract UFragmentsPolicy is Ownable {
259260
* Otherwise, returns false.
260261
*/
261262
function inRebaseWindow() public view returns (bool) {
262-
return (now.mod(minRebaseTimeIntervalSec) >= rebaseWindowOffsetSec &&
263-
now.mod(minRebaseTimeIntervalSec) < (rebaseWindowOffsetSec.add(rebaseWindowLengthSec)));
263+
return (block.timestamp.mod(minRebaseTimeIntervalSec) >= rebaseWindowOffsetSec &&
264+
block.timestamp.mod(minRebaseTimeIntervalSec) <
265+
(rebaseWindowOffsetSec.add(rebaseWindowLengthSec)));
264266
}
265267

266268
/**

contracts/_external/ERC20Detailed.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
import "./Initializable.sol";
44
import "./IERC20.sol";

contracts/_external/IERC20.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
/**
44
* @title ERC20 interface

contracts/_external/Initializable.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
/**
44
* @title Initializable

contracts/_external/Ownable.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
import "./Initializable.sol";
44

contracts/_external/SafeMath.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
/**
44
* @title SafeMath

contracts/lib/SafeMathInt.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2323
SOFTWARE.
2424
*/
2525

26-
pragma solidity 0.6.12;
26+
pragma solidity 0.7.6;
2727

2828
/**
2929
* @title SafeMathInt

contracts/lib/UInt256Lib.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
/**
44
* @title Various utilities useful for uint256.

contracts/mocks/ConstructorRebaseCallerContract.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
import "../Orchestrator.sol";
44

contracts/mocks/Mock.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
contract Mock {
44
event FunctionCalled(string instanceName, string functionName, address caller);

contracts/mocks/MockDownstream.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
import "./Mock.sol";
44

contracts/mocks/MockOracle.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
import "./Mock.sol";
44

contracts/mocks/MockUFragments.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
import "./Mock.sol";
44

contracts/mocks/MockUFragmentsPolicy.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
import "./Mock.sol";
44

contracts/mocks/RebaseCallerContract.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
import "../Orchestrator.sol";
44

contracts/mocks/SafeMathIntMock.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
import "./Mock.sol";
44
import "../lib/SafeMathInt.sol";

contracts/mocks/UInt256LibMock.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.6.12;
1+
pragma solidity 0.7.6;
22

33
import "./Mock.sol";
44
import "../lib/UInt256Lib.sol";

hardhat.config.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@ export default {
1212
solidity: {
1313
compilers: [
1414
{
15-
version: '0.6.12',
15+
version: '0.7.6',
16+
settings: {
17+
optimizer: {
18+
enabled: true,
19+
runs: 200,
20+
},
21+
},
1622
},
1723
{
1824
version: '0.4.24',

truffle.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
module.exports = {
55
compilers: {
66
solc: {
7-
version: '0.6.12',
7+
version: '0.7.6',
88
settings: {
99
optimizer: {
10-
enabled: false
10+
enabled: true,
11+
runs: 200,
1112
}
1213
}
1314
}

0 commit comments

Comments
 (0)