Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: allow to be compatible with solc 0.8.x #42

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: allow to be compatible with solc 0.8.x #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/token.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

pragma solidity >=0.4.23 <0.7.0;
pragma solidity >=0.4.23;

import "ds-math/math.sol";
import "ds-auth/auth.sol";
Expand Down Expand Up @@ -48,7 +48,7 @@ contract DSToken is DSMath, DSAuth {
}

function approve(address guy) external returns (bool) {
return approve(guy, uint(-1));
return approve(guy, type(uint).max);
}

function approve(address guy, uint wad) public stoppable returns (bool) {
Expand All @@ -68,7 +68,7 @@ contract DSToken is DSMath, DSAuth {
stoppable
returns (bool)
{
if (src != msg.sender && allowance[src][msg.sender] != uint(-1)) {
if (src != msg.sender && allowance[src][msg.sender] != type(uint).max) {
require(allowance[src][msg.sender] >= wad, "ds-token-insufficient-approval");
allowance[src][msg.sender] = sub(allowance[src][msg.sender], wad);
}
Expand Down Expand Up @@ -110,7 +110,7 @@ contract DSToken is DSMath, DSAuth {
}

function burn(address guy, uint wad) public auth stoppable {
if (guy != msg.sender && allowance[guy][msg.sender] != uint(-1)) {
if (guy != msg.sender && allowance[guy][msg.sender] != type(uint).max) {
require(allowance[guy][msg.sender] >= wad, "ds-token-insufficient-approval");
allowance[guy][msg.sender] = sub(allowance[guy][msg.sender], wad);
}
Expand Down
8 changes: 4 additions & 4 deletions src/token.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

pragma solidity >=0.4.23 <0.7.0;
pragma solidity >=0.4.23;

import "ds-test/test.sol";

Expand Down Expand Up @@ -315,7 +315,7 @@ contract DSTokenTest is DSTest {
function testTrusting() public {
assertEq(token.allowance(self, user2), 0);
token.approve(user2);
assertEq(token.allowance(self, user2), uint(-1));
assertEq(token.allowance(self, user2), type(uint).max);
token.approve(user2, 0);
assertEq(token.allowance(self, user2), 0);
}
Expand Down Expand Up @@ -363,10 +363,10 @@ contract DSTokenTest is DSTest {
assertEq(token.allowance(self, user1), 0);
assertEq(token.balanceOf(user1), 0);
token.approve(user1);
assertEq(token.allowance(self, user1), uint(-1));
assertEq(token.allowance(self, user1), type(uint).max);
TokenUser(user1).doPull(self, 1000);
assertEq(token.balanceOf(user1), 1000);
assertEq(token.allowance(self, user1), uint(-1));
assertEq(token.allowance(self, user1), type(uint).max);
}

function testFailTransferOnlyTrustedCaller() public {
Expand Down