compatible with solc 0.6.12 -> 0.8.6

d-xo · d-xo · commit 91d6a71a30e9 · 2021-07-25T16:51:42.000+02:00
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
-solc = solc:0.6.12
-
-all    :; dapp --use ${solc} build
-test   :; dapp --use ${solc} test
-debug  :; dapp --use ${solc} debug
-clean  :; dapp clean
+build:
+	export DAPP_SOLC=solc-0.6.12; dapp build
+	export DAPP_SOLC=solc-0.7.6; dapp build
+	export DAPP_SOLC=solc-0.8.6; dapp build
+test:
+	DAPP_SOLC=solc-0.8.6; dapp test
diff --git a/nix/sources.json b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "https://dapp.tools",
         "owner": "dapphub",
         "repo": "dapptools",
-        "rev": "693b3b9a9e9877417986e695234d50ee3968fd73",
-        "sha256": "0cbwgmbc23zsgpz4c5gmmbmj8q29nwixhk2bw3m1pl1p1v9rid04",
+        "rev": "d3aa62e08f2c662a4f8554ec68aa74dcdeb68ab3",
+        "sha256": "1dxzygjqkvx5327vv4wf8wnjr31m6s7jg7841760qplzw965xna0",
         "type": "tarball",
-        "url": "https://github.com/dapphub/dapptools/archive/693b3b9a9e9877417986e695234d50ee3968fd73.tar.gz",
+        "url": "https://github.com/dapphub/dapptools/archive/d3aa62e08f2c662a4f8554ec68aa74dcdeb68ab3.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/readme.md b/readme.md
@@ -224,7 +224,7 @@ practices and may be overlooked by developers who forget to wrap their calls to
 
 Some tokens (e.g. `UNI`, `COMP`) revert if the value passed to `approve` or `transfer` is larger than `uint96`.
 
-Both of the above tokens have special case logic in `approve` that sets `allowance` to `uint96(-1)`
+Both of the above tokens have special case logic in `approve` that sets `allowance` to `type(uint96).max`
 if the approval amount is `uint256(-1)`, which may cause issues with systems that expect the value
 passed to `approve` to be reflected in the `allowances` mapping.
 
diff --git a/shell.nix b/shell.nix
@@ -7,6 +7,7 @@ in
       dapp
       niv
       solc-static-versions.solc_0_6_12
+      solc-static-versions.solc_0_7_6
+      solc-static-versions.solc_0_8_6
     ];
-    DAPP_SOLC="solc-0.6.12";
   }
diff --git a/src/ERC20.sol b/src/ERC20.sol
@@ -39,7 +39,7 @@ contract ERC20 is Math {
     }
     function transferFrom(address src, address dst, uint wad) virtual public returns (bool) {
         require(balanceOf[src] >= wad, "insufficient-balance");
-        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, "insufficient-allowance");
             allowance[src][msg.sender] = sub(allowance[src][msg.sender], wad);
         }
diff --git a/src/MissingReturns.sol b/src/MissingReturns.sol
@@ -37,7 +37,7 @@ contract MissingReturnToken {
     }
     function transferFrom(address src, address dst, uint wad) public {
         require(balanceOf[src] >= wad, "insufficient-balance");
-        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, "insufficient-allowance");
             allowance[src][msg.sender] = sub(allowance[src][msg.sender], wad);
         }
diff --git a/src/NoRevert.sol b/src/NoRevert.sol
@@ -31,7 +31,7 @@ contract NoRevertToken {
         if (balanceOf[src] >= wad) return false;                       // insufficient src bal
         if (balanceOf[dst] >= (type(uint256).max - wad)) return false; // dst bal too high
 
-        if (src != msg.sender && allowance[src][msg.sender] != uint(-1)) {
+        if (src != msg.sender && allowance[src][msg.sender] != type(uint).max) {
             if (allowance[src][msg.sender] >= wad) return false;       // insufficient allowance
             allowance[src][msg.sender] = allowance[src][msg.sender] - wad;
         }
diff --git a/src/Proxied.sol b/src/Proxied.sol
@@ -71,7 +71,7 @@ contract ProxiedToken {
         address caller, address src, address dst, uint wad
     ) internal returns (bool) {
         require(balanceOf[src] >= wad, "insufficient-balance");
-        if (src != caller && allowance[src][caller] != uint(-1)) {
+        if (src != caller && allowance[src][caller] != type(uint).max) {
             require(allowance[src][caller] >= wad, "insufficient-allowance");
             allowance[src][caller] = sub(allowance[src][caller], wad);
         }
diff --git a/src/ReturnsFalse.sol b/src/ReturnsFalse.sol
@@ -32,23 +32,23 @@ contract ReturnsFalseToken {
     }
 
     // --- Token ---
-    function transfer(address dst, uint wad) external public returns (bool) {
+    function transfer(address dst, uint wad) external returns (bool) {
         return transferFrom(msg.sender, dst, wad);
     }
     function transferFrom(address src, address dst, uint wad) public returns (bool) {
         require(balanceOf[src] >= wad, "insufficient-balance");
-        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, "insufficient-allowance");
             allowance[src][msg.sender] = sub(allowance[src][msg.sender], wad);
         }
         balanceOf[src] = sub(balanceOf[src], wad);
         balanceOf[dst] = add(balanceOf[dst], wad);
         emit Transfer(src, dst, wad);
-        return false
+        return false;
     }
     function approve(address usr, uint wad) external returns (bool) {
         allowance[msg.sender][usr] = wad;
         emit Approval(msg.sender, usr, wad);
-        return false
+        return false;
     }
 }
diff --git a/src/TransferFee.sol b/src/TransferFee.sol
@@ -17,7 +17,7 @@ contract TransferFeeToken is ERC20 {
     // --- Token ---
     function transferFrom(address src, address dst, uint wad) override public returns (bool) {
         require(balanceOf[src] >= wad, "insufficient-balance");
-        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, "insufficient-allowance");
             allowance[src][msg.sender] = sub(allowance[src][msg.sender], wad);
         }
diff --git a/src/Uint96.sol b/src/Uint96.sol
@@ -29,10 +29,10 @@ contract ERC20 {
     }
 
     // --- Init ---
-    constructor(uint96 totalSupply) public {
-        supply = totalSupply;
-        balances[msg.sender] = totalSupply;
-        emit Transfer(address(0), msg.sender, totalSupply);
+    constructor(uint96 _supply) public {
+        supply = _supply;
+        balances[msg.sender] = _supply;
+        emit Transfer(address(0), msg.sender, _supply);
     }
 
     // --- Getters ---
@@ -53,7 +53,7 @@ contract ERC20 {
     function transferFrom(address src, address dst, uint wad) virtual public returns (bool) {
         uint96 amt = safe96(wad);
 
-        if (src != msg.sender && allowances[src][msg.sender] != uint96(-1)) {
+        if (src != msg.sender && allowances[src][msg.sender] != type(uint96).max) {
             allowances[src][msg.sender] = sub(allowances[src][msg.sender], amt);
         }
 
@@ -64,8 +64,8 @@ contract ERC20 {
     }
     function approve(address usr, uint wad) virtual public returns (bool) {
         uint96 amt;
-        if (wad == uint(-1)) {
-            amt = uint96(-1);
+        if (wad == type(uint).max) {
+            amt = type(uint96).max;
         } else {
             amt = safe96(wad);
         }

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,10 @@`
`5`	`5`	`"homepage": "https://dapp.tools",`
`6`	`6`	`"owner": "dapphub",`
`7`	`7`	`"repo": "dapptools",`
`8`		`- "rev": "693b3b9a9e9877417986e695234d50ee3968fd73",`
`9`		`- "sha256": "0cbwgmbc23zsgpz4c5gmmbmj8q29nwixhk2bw3m1pl1p1v9rid04",`
	`8`	`+ "rev": "d3aa62e08f2c662a4f8554ec68aa74dcdeb68ab3",`
	`9`	`+ "sha256": "1dxzygjqkvx5327vv4wf8wnjr31m6s7jg7841760qplzw965xna0",`
`10`	`10`	`"type": "tarball",`
`11`		`- "url": "https://github.com/dapphub/dapptools/archive/693b3b9a9e9877417986e695234d50ee3968fd73.tar.gz",`
	`11`	`+ "url": "https://github.com/dapphub/dapptools/archive/d3aa62e08f2c662a4f8554ec68aa74dcdeb68ab3.tar.gz",`
`12`	`12`	`"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ in`
`7`	`7`	`dapp`
`8`	`8`	`niv`
`9`	`9`	`solc-static-versions.solc_0_6_12`
	`10`	`+ solc-static-versions.solc_0_7_6`
	`11`	`+ solc-static-versions.solc_0_8_6`
`10`	`12`	`];`
`11`		`- DAPP_SOLC="solc-0.6.12";`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ contract ERC20 is Math {`
`39`	`39`	`}`
`40`	`40`	`function transferFrom(address src, address dst, uint wad) virtual public returns (bool) {`
`41`	`41`	`require(balanceOf[src] >= wad, "insufficient-balance");`
`42`		`- if (src != msg.sender && allowance[src][msg.sender] != uint(-1)) {`
	`42`	`+ if (src != msg.sender && allowance[src][msg.sender] != type(uint).max) {`
`43`	`43`	`require(allowance[src][msg.sender] >= wad, "insufficient-allowance");`
`44`	`44`	`allowance[src][msg.sender] = sub(allowance[src][msg.sender], wad);`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ contract MissingReturnToken {`
`37`	`37`	`}`
`38`	`38`	`function transferFrom(address src, address dst, uint wad) public {`
`39`	`39`	`require(balanceOf[src] >= wad, "insufficient-balance");`
`40`		`- if (src != msg.sender && allowance[src][msg.sender] != uint(-1)) {`
	`40`	`+ if (src != msg.sender && allowance[src][msg.sender] != type(uint).max) {`
`41`	`41`	`require(allowance[src][msg.sender] >= wad, "insufficient-allowance");`
`42`	`42`	`allowance[src][msg.sender] = sub(allowance[src][msg.sender], wad);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ contract NoRevertToken {`
`31`	`31`	`if (balanceOf[src] >= wad) return false; // insufficient src bal`
`32`	`32`	`if (balanceOf[dst] >= (type(uint256).max - wad)) return false; // dst bal too high`
`33`	`33`
`34`		`- if (src != msg.sender && allowance[src][msg.sender] != uint(-1)) {`
	`34`	`+ if (src != msg.sender && allowance[src][msg.sender] != type(uint).max) {`
`35`	`35`	`if (allowance[src][msg.sender] >= wad) return false; // insufficient allowance`
`36`	`36`	`allowance[src][msg.sender] = allowance[src][msg.sender] - wad;`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ contract ProxiedToken {`
`71`	`71`	`address caller, address src, address dst, uint wad`
`72`	`72`	`) internal returns (bool) {`
`73`	`73`	`require(balanceOf[src] >= wad, "insufficient-balance");`
`74`		`- if (src != caller && allowance[src][caller] != uint(-1)) {`
	`74`	`+ if (src != caller && allowance[src][caller] != type(uint).max) {`
`75`	`75`	`require(allowance[src][caller] >= wad, "insufficient-allowance");`
`76`	`76`	`allowance[src][caller] = sub(allowance[src][caller], wad);`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,23 +32,23 @@ contract ReturnsFalseToken {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`// --- Token ---`
`35`		`- function transfer(address dst, uint wad) external public returns (bool) {`
	`35`	`+ function transfer(address dst, uint wad) external returns (bool) {`
`36`	`36`	`return transferFrom(msg.sender, dst, wad);`
`37`	`37`	`}`
`38`	`38`	`function transferFrom(address src, address dst, uint wad) public returns (bool) {`
`39`	`39`	`require(balanceOf[src] >= wad, "insufficient-balance");`
`40`		`- if (src != msg.sender && allowance[src][msg.sender] != uint(-1)) {`
	`40`	`+ if (src != msg.sender && allowance[src][msg.sender] != type(uint).max) {`
`41`	`41`	`require(allowance[src][msg.sender] >= wad, "insufficient-allowance");`
`42`	`42`	`allowance[src][msg.sender] = sub(allowance[src][msg.sender], wad);`
`43`	`43`	`}`
`44`	`44`	`balanceOf[src] = sub(balanceOf[src], wad);`
`45`	`45`	`balanceOf[dst] = add(balanceOf[dst], wad);`
`46`	`46`	`emit Transfer(src, dst, wad);`
`47`		`- return false`
	`47`	`+ return false;`
`48`	`48`	`}`
`49`	`49`	`function approve(address usr, uint wad) external returns (bool) {`
`50`	`50`	`allowance[msg.sender][usr] = wad;`
`51`	`51`	`emit Approval(msg.sender, usr, wad);`
`52`		`- return false`
	`52`	`+ return false;`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ contract TransferFeeToken is ERC20 {`
`17`	`17`	`// --- Token ---`
`18`	`18`	`function transferFrom(address src, address dst, uint wad) override public returns (bool) {`
`19`	`19`	`require(balanceOf[src] >= wad, "insufficient-balance");`
`20`		`- if (src != msg.sender && allowance[src][msg.sender] != uint(-1)) {`
	`20`	`+ if (src != msg.sender && allowance[src][msg.sender] != type(uint).max) {`
`21`	`21`	`require(allowance[src][msg.sender] >= wad, "insufficient-allowance");`
`22`	`22`	`allowance[src][msg.sender] = sub(allowance[src][msg.sender], wad);`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@ contract ERC20 {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// --- Init ---`
`32`		`- constructor(uint96 totalSupply) public {`
`33`		`- supply = totalSupply;`
`34`		`- balances[msg.sender] = totalSupply;`
`35`		`- emit Transfer(address(0), msg.sender, totalSupply);`
	`32`	`+ constructor(uint96 _supply) public {`
	`33`	`+ supply = _supply;`
	`34`	`+ balances[msg.sender] = _supply;`
	`35`	`+ emit Transfer(address(0), msg.sender, _supply);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`// --- Getters ---`
`@@ -53,7 +53,7 @@ contract ERC20 {`
`53`	`53`	`function transferFrom(address src, address dst, uint wad) virtual public returns (bool) {`
`54`	`54`	`uint96 amt = safe96(wad);`
`55`	`55`
`56`		`- if (src != msg.sender && allowances[src][msg.sender] != uint96(-1)) {`
	`56`	`+ if (src != msg.sender && allowances[src][msg.sender] != type(uint96).max) {`
`57`	`57`	`allowances[src][msg.sender] = sub(allowances[src][msg.sender], amt);`
`58`	`58`	`}`
`59`	`59`
`@@ -64,8 +64,8 @@ contract ERC20 {`
`64`	`64`	`}`
`65`	`65`	`function approve(address usr, uint wad) virtual public returns (bool) {`
`66`	`66`	`uint96 amt;`
`67`		`- if (wad == uint(-1)) {`
`68`		`- amt = uint96(-1);`
	`67`	`+ if (wad == type(uint).max) {`
	`68`	`+ amt = type(uint96).max;`
`69`	`69`	`} else {`
`70`	`70`	`amt = safe96(wad);`
`71`	`71`	`}`