🧼 Clean up & refactor

Author: KimlikDAO-bot

erc/IERC721.sol

@@ -2,7 +2,9 @@
 
 pragma solidity ^0.8.0;
 
-interface IERC721 {
+import {IERC165} from "./IERC165.sol";
+
+interface IERC721Partial is IERC165 {
     function name() external pure returns (string memory);
 
     function symbol() external pure returns (string memory);
@@ -15,3 +17,7 @@ interface IERC721 {
 
     event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);
 }
+
+interface IERC721 is IERC721Partial {
+    function ownerOf(uint256 tokenId) external view returns (address);
+}

kimlikdao/IDIDSigners.sol

@@ -27,6 +27,12 @@ uint256 constant SIGNER_INFO_WITHDRAW_MASK = uint256(type(uint48).max) << 176;
  */
 type SignerInfo is uint256;
 
+function deposit(SignerInfo self) pure returns (uint256) {
+    return uint48(SignerInfo.unwrap(self) >> 64);
+}
+
+using {deposit} for SignerInfo global;
+
 interface IDIDSigners {
     function authenticateExposureReportID3Sigs(
         bytes32 exposureReportID,

kimlikdao/IProtocolFund.sol

@@ -11,7 +11,7 @@ function RedeemInfoFrom(uint48x2 totalAndAmount, address redeemer) pure returns
     return RedeemInfo.wrap(uint48x2.unwrap(totalAndAmount) << 160 | uint160(redeemer));
 }
 
-function unpack(RedeemInfo self) returns (uint256 total, uint256 redeemed, address redeemer) {
+function unpack(RedeemInfo self) pure returns (uint256 total, uint256 redeemed, address redeemer) {
     uint256 val = RedeemInfo.unwrap(self);
     return (val >> 208, uint48(val >> 160), address(uint160(val)));
 }

lib/forge-std

@@ -2,34 +2,8 @@
 
 pragma solidity ^0.8.0;
 
-import {TRYB_DEPLOYER, USDC_DEPLOYER, USDT_DEPLOYER} from "../avalanche/addresses.sol";
 import {IERC20Permit} from "../erc/IERC20Permit.sol";
-import {Vm} from "forge-std/Vm.sol";
-import {console2} from "forge-std/console2.sol";
 
-function DeployMockTokens() {
-    Vm vm = Vm(address(uint160(uint256(keccak256("hevm cheat code")))));
-
-    vm.setNonce(TRYB_DEPLOYER, 2);
-    vm.prank(TRYB_DEPLOYER);
-    IERC20Permit tryb = new MockERC20Permit("TRYB", "BiLira", 6);
-    console2.log("TRYB:", address(tryb));
-
-    vm.setNonce(USDC_DEPLOYER, 4);
-    vm.prank(USDC_DEPLOYER);
-    IERC20Permit usdc = new MockERC20Permit("USDC", "USD Coin", 6);
-    console2.log("USDC:", address(usdc));
-
-    vm.setNonce(USDT_DEPLOYER, 2);
-    vm.prank(USDT_DEPLOYER);
-    IERC20Permit usdt = new MockERC20Permit("USDt", "TetherToken", 6);
-    console2.log("USDT:", address(usdt));
-}
-
-/**
- * @title Example ERC20Permit contract for mocking the tokens we accept as
- * payment for testing purposes.
- */
 contract MockERC20Permit is IERC20Permit {
     // keccak256("Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)");
     bytes32 public constant PERMIT_TYPEHASH = 0x6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c9;
@@ -57,7 +31,7 @@ contract MockERC20Permit is IERC20Permit {
                 keccak256("EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)"),
                 keccak256(bytes(tokenSymbol)),
                 keccak256(bytes("1")),
-                0x144,
+                block.chainid,
                 address(this)
             )
         );

testing/MockTokens.sol testing/MockERC20Permit.sol

@@ -24,4 +24,8 @@ function notEqual(amountAddr self, amountAddr other) pure returns (bool) {
     return amountAddr.unwrap(self) != amountAddr.unwrap(other);
 }
 
-using {unpack, amount, addr, notEqual as !=} for amountAddr global;
+function isZero(amountAddr self) pure returns (bool) {
+    return amountAddr.unwrap(self) == 0;
+}
+
+using {unpack, amount, addr, isZero, notEqual as !=} for amountAddr global;

types/amountAddr.sol

@@ -52,6 +52,10 @@ function decLo(uint128x2 self, uint256 delta) pure returns (uint128x2) {
     }
 }
 
+function setLo(uint128x2 self, uint256 val) pure returns (uint128x2) {
+    return uint128x2.wrap((uint128x2.unwrap(self) & (~uint256(0) << 128)) | val);
+}
+
 function sum(uint128x2 self) pure returns (uint256) {
     unchecked {
         return (uint128x2.unwrap(self) >> 128) + uint128(uint128x2.unwrap(self));
@@ -70,4 +74,30 @@ function equal(uint128x2 self, uint128x2 other) pure returns (bool) {
     return uint128x2.unwrap(self) == uint128x2.unwrap(other);
 }
 
-using {hi, lo, inc, dec, incHi, incLo, decHi, decLo, sum, clearHi, clearLo, equal as ==} for uint128x2 global;
+/**
+ * Given a fraction (hi, lo) and a value val, computes the tuple (val * hi / lo, val) efficiently.
+ *
+ * @return (val * hi / lo, val)
+ */
+function fracMul(uint128x2 self, uint256 val) pure returns (uint128x2) {
+    unchecked {
+        return uint128x2.wrap(uint128x2.unwrap(self) * val / uint128(uint128x2.unwrap(self))).setLo(val);
+    }
+}
+
+using {
+    hi,
+    lo,
+    inc,
+    dec,
+    incHi,
+    incLo,
+    decHi,
+    decLo,
+    setLo,
+    sum,
+    clearHi,
+    clearLo,
+    fracMul,
+    equal as ==
+} for uint128x2 global;

types/uint128x2.sol

@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import {IERC20Permit} from "../erc/IERC20Permit.sol";
+
+IERC20Permit constant USDT = IERC20Permit(0x493257fD37EDB34451f62EDf8D2a0C418852bA4C);

zksync/addresses.sol

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import {IERC20Permit} from "../erc/IERC20Permit.sol";
+import {MockERC20Permit} from "../testing/MockERC20Permit.sol";
+import {Vm} from "forge-std/Vm.sol";
+import {console2} from "forge-std/console2.sol";
+
+address constant USDT_DEPLOYER = 0x493257fD37EDB34451f62EDf8D2a0C418852bA4C;
+
+function deployMockTokens() {
+    Vm vm = Vm(address(uint160(uint256(keccak256("hevm cheat code")))));
+
+    vm.setNonce(USDT_DEPLOYER, 4);
+    vm.prank(USDT_DEPLOYER);
+    IERC20Permit usdc = new MockERC20Permit("USDC", "USD Coin", 6);
+    console2.log("USDC:", address(usdc));
+}