Merge pull request #27 from superform-xyz/migrate-0.8.23

feat: remove unchecked and move to 0.8.23
superform-xyz · Nov 20, 2023 · d36bdc8 · d36bdc8
2 parents d75a8da + 11280ca
commit d36bdc8
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 67 deletions.
diff --git a/foundry.toml b/foundry.toml
@@ -1,6 +1,6 @@
 [profile.default]
 libs = ['lib']
-solc_version = "0.8.21" # Override for the solc version (setting this ignores `auto_detect_solc`)
+solc_version = "0.8.23" # Override for the solc version (setting this ignores `auto_detect_solc`)
 evm_version = "paris"   # to prevent usage of PUSH0, which is not supported on all chains
 
 optimizer = true

diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/solmate b/lib/solmate
diff --git a/src/ERC1155A.sol b/src/ERC1155A.sol
@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.21;
+pragma solidity ^0.8.23;
 
 import { IERC1155A } from "./interfaces/IERC1155A.sol";
 import { Strings } from "openzeppelin-contracts/contracts/utils/Strings.sol";
@@ -134,7 +134,7 @@ abstract contract ERC1155A is IERC1155A, IERC1155Errors {
         uint256 id;
         uint256 amount;
 
-        for (uint256 i; i < len;) {
+        for (uint256 i; i < len; ++i) {
             id = ids[i];
             amount = amounts[i];
 
@@ -145,12 +145,6 @@ abstract contract ERC1155A is IERC1155A, IERC1155Errors {
 
             balanceOf[from][id] -= amount;
             balanceOf[to][id] += amount;
-
-            // An array can't have a total length
-            // larger than the max uint256 value.
-            unchecked {
-                ++i;
-            }
         }
 
         emit TransferBatch(msg.sender, from, to, ids, amounts);
@@ -172,12 +166,8 @@ abstract contract ERC1155A is IERC1155A, IERC1155Errors {
 
         balances = new uint256[](owners.length);
 
-        // Unchecked because the only math done is incrementing
-        // the array index counter which cannot possibly overflow.
-        unchecked {
-            for (uint256 i = 0; i < owners.length; ++i) {
-                balances[i] = balanceOf[owners[i]][ids[i]];
-            }
+        for (uint256 i = 0; i < owners.length; ++i) {
+            balances[i] = balanceOf[owners[i]][ids[i]];
         }
     }
 
@@ -199,9 +189,7 @@ abstract contract ERC1155A is IERC1155A, IERC1155Errors {
     /// inheritdoc IERC1155A
     function increaseAllowance(address spender, uint256 id, uint256 addedValue) public virtual returns (bool) {
         address owner = msg.sender;
-        unchecked {
-            _setApprovalForOne(owner, spender, id, allowance(owner, spender, id) + addedValue);
-        }
+        _setApprovalForOne(owner, spender, id, allowance(owner, spender, id) + addedValue);
         return true;
     }
 
@@ -219,12 +207,8 @@ abstract contract ERC1155A is IERC1155A, IERC1155Errors {
     function setApprovalForMany(address spender, uint256[] memory ids, uint256[] memory amounts) public virtual {
         address owner = msg.sender;
 
-        for (uint256 i; i < ids.length;) {
+        for (uint256 i; i < ids.length; ++i) {
             _setApprovalForOne(owner, spender, ids[i], amounts[i]);
-
-            unchecked {
-                ++i;
-            }
         }
     }
 
@@ -240,12 +224,9 @@ abstract contract ERC1155A is IERC1155A, IERC1155Errors {
     {
         address owner = msg.sender;
         uint256 id;
-        for (uint256 i; i < ids.length;) {
+        for (uint256 i; i < ids.length; ++i) {
             id = ids[i];
-            unchecked {
-                _setApprovalForOne(owner, spender, id, allowance(owner, spender, id) + addedValues[i]);
-                ++i;
-            }
+            _setApprovalForOne(owner, spender, id, allowance(owner, spender, id) + addedValues[i]);
         }
 
         return true;
@@ -263,12 +244,8 @@ abstract contract ERC1155A is IERC1155A, IERC1155Errors {
     {
         address owner = msg.sender;
 
-        for (uint256 i; i < ids.length;) {
+        for (uint256 i; i < ids.length; ++i) {
             _decreaseAllowance(owner, spender, ids[i], subtractedValues[i]);
-
-            unchecked {
-                ++i;
-            }
         }
 
         return true;
@@ -294,14 +271,11 @@ abstract contract ERC1155A is IERC1155A, IERC1155Errors {
         /// @dev an approval is needed to burn
         _batchBurn(owner, msg.sender, ids, amounts);
 
-        for (uint256 i = 0; i < ids.length;) {
+        for (uint256 i = 0; i < ids.length; ++i) {
             address sERC20Token = synthethicTokenId[ids[i]];
             if (sERC20Token == address(0)) revert SYNTHETIC_ERC20_NOT_REGISTERED();
 
             IsERC20(sERC20Token).mint(owner, amounts[i]);
-            unchecked {
-                ++i;
-            }
         }
 
         emit TransmutedBatchToERC20(owner, ids, amounts);
@@ -316,14 +290,11 @@ abstract contract ERC1155A is IERC1155A, IERC1155Errors {
         external
         override
     {
-        for (uint256 i = 0; i < ids.length;) {
+        for (uint256 i = 0; i < ids.length; ++i) {
             address sERC20Token = synthethicTokenId[ids[i]];
             if (sERC20Token == address(0)) revert SYNTHETIC_ERC20_NOT_REGISTERED();
             /// @dev an approval is needed on each sERC20 to burn
             IsERC20(sERC20Token).burn(owner, msg.sender, amounts[i]);
-            unchecked {
-                ++i;
-            }
         }
 
         _batchMint(owner, msg.sender, ids, amounts, bytes(""));
@@ -442,9 +413,7 @@ abstract contract ERC1155A is IERC1155A, IERC1155Errors {
     {
         uint256 currentAllowance = allowance(owner, operator, id);
         if (currentAllowance < subtractedValue) revert DECREASED_ALLOWANCE_BELOW_ZERO();
-        unchecked {
-            _setApprovalForOne(owner, operator, id, currentAllowance - subtractedValue);
-        }
+        _setApprovalForOne(owner, operator, id, currentAllowance - subtractedValue);
 
         return true;
     }
@@ -491,15 +460,9 @@ abstract contract ERC1155A is IERC1155A, IERC1155Errors {
 
         if (idsLength != amounts.length) revert LENGTH_MISMATCH();
 
-        for (uint256 i = 0; i < idsLength;) {
+        for (uint256 i = 0; i < idsLength; ++i) {
             balanceOf[to][ids[i]] += amounts[i];
             _totalSupply[ids[i]] += amounts[i];
-
-            // An array can't have a total length
-            // larger than the max uint256 value.
-            unchecked {
-                ++i;
-            }
         }
 
         emit TransferBatch(operator, address(0), to, ids, amounts);
@@ -530,7 +493,7 @@ abstract contract ERC1155A is IERC1155A, IERC1155Errors {
         uint256 id;
         uint256 amount;
 
-        for (uint256 i = 0; i < idsLength;) {
+        for (uint256 i = 0; i < idsLength; ++i) {
             id = ids[i];
             amount = amounts[i];
 
@@ -541,12 +504,6 @@ abstract contract ERC1155A is IERC1155A, IERC1155Errors {
 
             balanceOf[from][id] -= amount;
             _totalSupply[id] -= amount;
-
-            // An array can't have a total length
-            // larger than the max uint256 value.
-            unchecked {
-                ++i;
-            }
         }
 
         emit TransferBatch(operator, from, address(0), ids, amounts);

diff --git a/src/interfaces/IERC1155A.sol b/src/interfaces/IERC1155A.sol
@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.21;
+pragma solidity ^0.8.23;
 
 import { IERC1155 } from "openzeppelin-contracts/contracts/token/ERC1155/IERC1155.sol";
 

diff --git a/src/interfaces/IsERC20.sol b/src/interfaces/IsERC20.sol
@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.21;
+pragma solidity ^0.8.23;
 
 import { IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 

diff --git a/src/sERC20.sol b/src/sERC20.sol
@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.21;
+pragma solidity ^0.8.23;
 
 import { ERC20 } from "openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
 import { IsERC20 } from "./interfaces/IsERC20.sol";

diff --git a/src/test/ERC1155.t.sol b/src/test/ERC1155.t.sol
@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.21;
+pragma solidity ^0.8.23;
 
 import { DSTestPlus } from "solmate/test/utils/DSTestPlus.sol";
 import { ERC1155TokenReceiver } from "solmate/tokens/ERC1155.sol";

diff --git a/src/test/ERC1155_A.t.sol b/src/test/ERC1155_A.t.sol
@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.21;
+pragma solidity ^0.8.23;
 
 import "forge-std/Test.sol";
 import { MockERC1155A } from "./mocks/MockERC1155A.sol";

diff --git a/src/test/mocks/MockERC1155A.sol b/src/test/mocks/MockERC1155A.sol
@@ -1,5 +1,5 @@
 /// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.21;
+pragma solidity ^0.8.23;
 
 import { ERC1155A } from "../../ERC1155A.sol";
 import { sERC20 } from "../../sERC20.sol";
+1 −1		package.json
+276 −441		src/Vm.sol
+0 −15		test/Vm.t.sol
+0 −6		.changeset/dull-ghosts-sip.md
+0 −5		.changeset/grumpy-poets-rush.md
+0 −6		.changeset/purple-squids-attend.md
+0 −5		.changeset/thirty-drinks-happen.md
+0 −2		.github/workflows/checks.yml
+7 −32		CHANGELOG.md
+2 −2		certora/Makefile
+0 −36		certora/harnesses/AccessManagedHarness.sol
+0 −116		certora/harnesses/AccessManagerHarness.sol
+0 −14		certora/harnesses/NoncesHarness.sol
+0 −24		certora/specs.json
+0 −34		certora/specs/AccessManaged.spec
+0 −826		certora/specs/AccessManager.spec
+0 −92		certora/specs/Nonces.spec
+0 −5		certora/specs/helpers/helpers.spec
+0 −5		certora/specs/methods/IAccessManaged.spec
+0 −33		certora/specs/methods/IAccessManager.spec
+2 −2		contracts/access/manager/AccessManager.sol
+1 −2		contracts/proxy/transparent/TransparentUpgradeableProxy.sol
+2 −1		contracts/token/ERC1155/IERC1155.sol
+15 −31		docs/modules/ROOT/pages/utilities.adoc
+27 −15		package-lock.json
+1 −1		requirements.txt
+2 −2		test/access/manager/AccessManaged.test.js
+543 −44		test/access/manager/AccessManager.behavior.js
+0 −461		test/access/manager/AccessManager.predicate.js
+61 −68		test/access/manager/AccessManager.test.js
+14 −11		test/access/manager/AuthorityUtils.test.js
+81 −201		test/governance/extensions/GovernorTimelockAccess.test.js
+13 −27		test/helpers/access-manager.js
+0 −30		test/helpers/namespaced-storage.js
+1 −1		test/utils/introspection/SupportsInterface.behavior.js
+114 −137		.gas-snapshot
+0 −1		README.md
+0 −312		src/test/ERC6909.t.sol
+0 −22		src/test/utils/mocks/MockERC6909.sol
+0 −140		src/tokens/ERC6909.sol