|
1 |
| -pragma solidity 0.6.12; |
| 1 | +pragma solidity 0.7.6; |
2 | 2 |
|
3 | 3 | import "./_external/SafeMath.sol";
|
4 | 4 | import "./_external/Ownable.sol";
|
@@ -104,12 +104,13 @@ contract UFragmentsPolicy is Ownable {
|
104 | 104 | require(inRebaseWindow());
|
105 | 105 |
|
106 | 106 | // This comparison also ensures there is no reentrancy.
|
107 |
| - require(lastRebaseTimestampSec.add(minRebaseTimeIntervalSec) < now); |
| 107 | + require(lastRebaseTimestampSec.add(minRebaseTimeIntervalSec) < block.timestamp); |
108 | 108 |
|
109 | 109 | // 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); |
113 | 114 |
|
114 | 115 | epoch = epoch.add(1);
|
115 | 116 |
|
@@ -140,7 +141,7 @@ contract UFragmentsPolicy is Ownable {
|
140 | 141 |
|
141 | 142 | uint256 supplyAfterRebase = uFrags.rebase(epoch, supplyDelta);
|
142 | 143 | assert(supplyAfterRebase <= MAX_SUPPLY);
|
143 |
| - emit LogRebase(epoch, exchangeRate, cpi, supplyDelta, now); |
| 144 | + emit LogRebase(epoch, exchangeRate, cpi, supplyDelta, block.timestamp); |
144 | 145 | }
|
145 | 146 |
|
146 | 147 | /**
|
@@ -259,8 +260,9 @@ contract UFragmentsPolicy is Ownable {
|
259 | 260 | * Otherwise, returns false.
|
260 | 261 | */
|
261 | 262 | 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))); |
264 | 266 | }
|
265 | 267 |
|
266 | 268 | /**
|
|
0 commit comments