OZ v5.5.0

Refactoring and code improvements | by @hueso

.commitlintrc.yaml

@@ -1,2 +0,0 @@
-extends:
-  - "@commitlint/config-conventional"

.czrc

@@ -1,3 +0,0 @@
-{
-  "path": "cz-conventional-changelog"
-}

.husky/.gitignore

@@ -1 +0,0 @@
-_

.husky/commit-msg

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn dlx commitlint --edit $1

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn dlx lint-staged

.yarnrc.yml

@@ -1,7 +1,7 @@
+compressionLevel: mixed
+
+enableGlobalCache: false
+
 nodeLinker: node-modules
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
-
-yarnPath: .yarn/releases/yarn-3.2.1.cjs
+yarnPath: .yarn/releases/yarn-4.9.2.cjs

contracts/Reputation.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.19;
+pragma solidity ^0.8.19;
 
 import { IReputation } from "./lib/interfaces/IReputation.sol";
 

contracts/core/BaseUtils.sol

@@ -1,11 +1,12 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.19;
+pragma solidity ^0.8.19;
 
 import { ERC20, OwnerSettings } from "contracts/core/OwnerSettings.sol";
 
-import { ECDSA } from "contracts/lib/utils/ECDSA.sol";
-import { MerkleProofLib as Merkle } from "contracts/lib/utils/MerkleProofLib.sol";
-import { ReentrancyGuard } from "contracts/lib/utils/ReentrancyGuard.sol";
+import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+import { MessageHashUtils } from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
+import { MerkleProof as Merkle } from "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol";
+import { ReentrancyGuard } from "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 
 abstract contract BaseUtils is
     OwnerSettings,
@@ -43,8 +44,8 @@ abstract contract BaseUtils is
         if (
             !validBacenSigners(
                 _castAddrToKey(
-                    ECDSA.recoverCalldata(
-                        ECDSA.toEthSignedMessageHash(
+                    ECDSA.recover(
+                        MessageHashUtils.toEthSignedMessageHash(
                             _message
                         ),
                         _signature

contracts/core/Constants.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.19;
+pragma solidity ^0.8.19;
 
 abstract contract Constants {
     /// ███ Constants ██████████████████████████████████████████████████████████

contracts/core/DataTypes.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.19;
+pragma solidity ^0.8.19;
 
-import { ERC20 } from "contracts/lib/tokens/ERC20.sol";
+import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 library DataTypes {
 

contracts/core/EventAndErrors.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.19;
+pragma solidity ^0.8.19;
 
-import { ERC20 } from "contracts/lib/tokens/ERC20.sol";
+import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 // prettier-ignore
 interface EventAndErrors {

contracts/core/OwnerSettings.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.19;
+pragma solidity ^0.8.19;
 
-import { ERC2771Context as ERC2771 } from "contracts/lib/metatx/ERC2771Context.sol";
+import { ERC2771 } from "contracts/lib/metatx/ERC2771Context.sol";
 import { ERC20, SafeTransferLib } from "contracts/lib/utils/SafeTransferLib.sol";
 import { IReputation } from "contracts/lib/interfaces/IReputation.sol";
 import { EventAndErrors } from "contracts/core/EventAndErrors.sol";

contracts/lib/metatx/ERC2771Context.sol

@@ -1,87 +1,14 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity >=0.8.4;
+pragma solidity ^0.8.20;
 
-/// @author OpenZeppelin Contracts v4.4.1 (utils/Context.sol)
-/// (https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/Context.sol)
+import { ERC2771Context } from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
 
-/// @dev Provides information about the current execution context, including the
-/// sender of the transaction and its data. While these are generally available
-/// via msg.sender and msg.data, they should not be accessed in such a direct
-/// manner, since when dealing with meta-transactions the account sending and
-/// paying for execution may not be the actual sender (as far as an application
-/// is concerned).
-///
-/// This contract is only required for intermediate, library-like contracts.
-abstract contract Context {
-    function _msgSender()
-        internal
-        view
-        virtual
-        returns (address)
-    {
-        return msg.sender;
-    }
-
-    function _msgData()
-        internal
-        view
-        virtual
-        returns (bytes calldata)
-    {
-        return msg.data;
-    }
-}
-
-/// @author Modified from OpenZeppelin Contracts (last updated v4.7.0) (metatx/ERC2771Context.sol)
-/// https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/metatx/ERC2771Context.sol
-
-/// @dev Context variant with ERC2771 support.
-abstract contract ERC2771Context is Context {
-    // address private immutable _trustedForwarder;
+abstract contract ERC2771 is ERC2771Context(address(0)) {
     mapping(address => bool) public trustedForwarders;
-
-    /// @custom:oz-upgrades-unsafe-allow constructor
-    // constructor(address trustedForwarder) {
-    //     _trustedForwarder = trustedForwarder;
-    // }
-
-    function _msgSender()
-        internal
-        view
-        virtual
-        override
-        returns (address sender)
-    {
-        if (trustedForwarders[msg.sender]) {
-            // The assembly code is more direct than the Solidity version using `abi.decode`.
-            /// @solidity memory-safe-assembly
-            assembly {
-                sender := shr(
-                    96,
-                    calldataload(sub(calldatasize(), 20))
-                )
-            }
-        } else {
-            return super._msgSender();
-        }
-    }
-
-    function isTrustedForwarder(address forwarder) public view virtual returns (bool) {
+    
+    function isTrustedForwarder(address forwarder) public view override returns (bool) {
       return trustedForwarders[forwarder];
     }
 
-    function _msgData()
-        internal
-        view
-        virtual
-        override
-        returns (bytes calldata)
-    {
-        if (isTrustedForwarder(msg.sender)) {
-            return msg.data[:msg.data.length - 20];
-        } else {
-            return super._msgData();
-        }
-    }
 }

contracts/lib/mock/mockToken.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.19;
+pragma solidity ^0.8.19;
 
-import { ERC20 } from "../tokens/ERC20.sol";
+import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract MockToken is ERC20 {
-    constructor(uint256 supply) ERC20("MockBRL", "MBRL", 18) {
+    constructor(uint256 supply) ERC20("MockBRL", "MBRL") {
         _mint(msg.sender, supply);
     }
 

contracts/lib/tokens/ERC20.sol

@@ -1,250 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity >=0.8.4;
-
-/// @notice Modern and gas efficient ERC20 + EIP-2612 implementation.
-/// @author Solmate (https://github.com/Rari-Capital/solmate/blob/main/src/tokens/ERC20.sol)
-/// @author Modified from Uniswap (https://github.com/Uniswap/uniswap-v2-core/blob/master/contracts/UniswapV2ERC20.sol)
-/// @dev Do not manually set balances without updating totalSupply, as the sum of all user balances must not exceed it.
-abstract contract ERC20 {
-    /*//////////////////////////////////////////////////////////////
-                                 EVENTS
-    //////////////////////////////////////////////////////////////*/
-
-    event Transfer(
-        address indexed from,
-        address indexed to,
-        uint256 amount
-    );
-
-    event Approval(
-        address indexed owner,
-        address indexed spender,
-        uint256 amount
-    );
-
-    /*//////////////////////////////////////////////////////////////
-                            METADATA STORAGE
-    //////////////////////////////////////////////////////////////*/
-
-    string public name;
-
-    string public symbol;
-
-    uint8 public immutable decimals;
-
-    /*//////////////////////////////////////////////////////////////
-                              ERC20 STORAGE
-    //////////////////////////////////////////////////////////////*/
-
-    uint256 public totalSupply;
-
-    mapping(address => uint256) public balanceOf;
-
-    mapping(address => mapping(address => uint256))
-        public allowance;
-
-    /*//////////////////////////////////////////////////////////////
-                            EIP-2612 STORAGE
-    //////////////////////////////////////////////////////////////*/
-
-    uint256 internal immutable INITIAL_CHAIN_ID;
-
-    bytes32 internal immutable INITIAL_DOMAIN_SEPARATOR;
-
-    mapping(address => uint256) public nonces;
-
-    /*//////////////////////////////////////////////////////////////
-                               CONSTRUCTOR
-    //////////////////////////////////////////////////////////////*/
-
-    constructor(
-        string memory _name,
-        string memory _symbol,
-        uint8 _decimals
-    ) {
-        name = _name;
-        symbol = _symbol;
-        decimals = _decimals;
-
-        INITIAL_CHAIN_ID = block.chainid;
-        INITIAL_DOMAIN_SEPARATOR = computeDomainSeparator();
-    }
-
-    /*//////////////////////////////////////////////////////////////
-                               ERC20 LOGIC
-    //////////////////////////////////////////////////////////////*/
-
-    function approve(
-        address spender,
-        uint256 amount
-    ) public virtual returns (bool) {
-        allowance[msg.sender][spender] = amount;
-
-        emit Approval(msg.sender, spender, amount);
-
-        return true;
-    }
-
-    function transfer(
-        address to,
-        uint256 amount
-    ) public virtual returns (bool) {
-        balanceOf[msg.sender] -= amount;
-
-        // Cannot overflow because the sum of all user
-        // balances can't exceed the max uint256 value.
-        unchecked {
-            balanceOf[to] += amount;
-        }
-
-        emit Transfer(msg.sender, to, amount);
-
-        return true;
-    }
-
-    function transferFrom(
-        address from,
-        address to,
-        uint256 amount
-    ) public virtual returns (bool) {
-        uint256 allowed = allowance[from][msg.sender]; // Saves gas for limited approvals.
-
-        if (allowed != type(uint256).max)
-            allowance[from][msg.sender] = allowed - amount;
-
-        balanceOf[from] -= amount;
-
-        // Cannot overflow because the sum of all user
-        // balances can't exceed the max uint256 value.
-        unchecked {
-            balanceOf[to] += amount;
-        }
-
-        emit Transfer(from, to, amount);
-
-        return true;
-    }
-
-    /*//////////////////////////////////////////////////////////////
-                             EIP-2612 LOGIC
-    //////////////////////////////////////////////////////////////*/
-
-    function permit(
-        address owner,
-        address spender,
-        uint256 value,
-        uint256 deadline,
-        uint8 v,
-        bytes32 r,
-        bytes32 s
-    ) public virtual {
-        require(
-            deadline >= block.timestamp,
-            "PERMIT_DEADLINE_EXPIRED"
-        );
-
-        // Unchecked because the only math done is incrementing
-        // the owner's nonce which cannot realistically overflow.
-        unchecked {
-            address recoveredAddress = ecrecover(
-                keccak256(
-                    abi.encodePacked(
-                        "\x19\x01",
-                        DOMAIN_SEPARATOR(),
-                        keccak256(
-                            abi.encode(
-                                keccak256(
-                                    "Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)"
-                                ),
-                                owner,
-                                spender,
-                                value,
-                                nonces[owner]++,
-                                deadline
-                            )
-                        )
-                    )
-                ),
-                v,
-                r,
-                s
-            );
-
-            require(
-                recoveredAddress != address(0) &&
-                    recoveredAddress == owner,
-                "INVALID_SIGNER"
-            );
-
-            allowance[recoveredAddress][spender] = value;
-        }
-
-        emit Approval(owner, spender, value);
-    }
-
-    function DOMAIN_SEPARATOR()
-        public
-        view
-        virtual
-        returns (bytes32)
-    {
-        return
-            block.chainid == INITIAL_CHAIN_ID
-                ? INITIAL_DOMAIN_SEPARATOR
-                : computeDomainSeparator();
-    }
-
-    function computeDomainSeparator()
-        internal
-        view
-        virtual
-        returns (bytes32)
-    {
-        return
-            keccak256(
-                abi.encode(
-                    keccak256(
-                        "EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)"
-                    ),
-                    keccak256(bytes(name)),
-                    keccak256("1"),
-                    block.chainid,
-                    address(this)
-                )
-            );
-    }
-
-    /*//////////////////////////////////////////////////////////////
-                        INTERNAL MINT/BURN LOGIC
-    //////////////////////////////////////////////////////////////*/
-
-    function _mint(
-        address to,
-        uint256 amount
-    ) internal virtual {
-        totalSupply += amount;
-
-        // Cannot overflow because the sum of all user
-        // balances can't exceed the max uint256 value.
-        unchecked {
-            balanceOf[to] += amount;
-        }
-
-        emit Transfer(address(0), to, amount);
-    }
-
-    function _burn(
-        address from,
-        uint256 amount
-    ) internal virtual {
-        balanceOf[from] -= amount;
-
-        // Cannot underflow because a user's balance
-        // will never be larger than the total supply.
-        unchecked {
-            totalSupply -= amount;
-        }
-
-        emit Transfer(from, address(0), amount);
-    }
-}

contracts/lib/utils/ECDSA.sol

@@ -1,95 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity >=0.8.4;
-
-/// @notice Gas optimized ECDSA wrapper.
-/// @author Solady (https://github.com/vectorized/solady/blob/main/src/utils/ECDSA.sol)
-/// @author Modified from Solmate (https://github.com/transmissions11/solmate/blob/main/src/utils/ECDSA.sol)
-/// @author Modified from OpenZeppelin (https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/cryptography/ECDSA.sol)
-library ECDSA {
-    /// @dev The signature is invalid.
-    error InvalidSignature();
-
-    /// @dev The number which `s` must not exceed in order for
-    /// the signature to be non-malleable.
-    bytes32 private constant _MALLEABILITY_THRESHOLD =
-        0x7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a0;
-
-    /// @dev Recovers the signer's address from a message digest `hash`,
-    /// and the `signature`.
-    ///
-    /// This function does NOT accept EIP-2098 short form signatures.
-    /// Use `recover(bytes32 hash, bytes32 r, bytes32 vs)` for EIP-2098
-    /// short form signatures instead.
-    function recoverCalldata(
-        bytes32 hash,
-        bytes calldata signature
-    ) internal view returns (address result) {
-        /// @solidity memory-safe-assembly
-        assembly {
-            // Copy the free memory pointer so that we can restore it later.
-            let m := mload(0x40)
-            // Directly copy `r` and `s` from the calldata.
-            calldatacopy(0x40, signature.offset, 0x40)
-            // Store the `hash` in the scratch space.
-            mstore(0x00, hash)
-            // Compute `v` and store it in the scratch space.
-            mstore(
-                0x20,
-                byte(
-                    0,
-                    calldataload(add(signature.offset, 0x40))
-                )
-            )
-            pop(
-                staticcall(
-                    gas(), // Amount of gas left for the transaction.
-                    and(
-                        // If the signature is exactly 65 bytes in length.
-                        eq(signature.length, 65),
-                        // If `s` in lower half order, such that the signature is not malleable.
-                        lt(
-                            mload(0x60),
-                            add(_MALLEABILITY_THRESHOLD, 1)
-                        )
-                    ), // Address of `ecrecover`.
-                    0x00, // Start of input.
-                    0x80, // Size of input.
-                    0x00, // Start of output.
-                    0x20 // Size of output.
-                )
-            )
-            result := mload(0x00)
-            // `returndatasize()` will be `0x20` upon success, and `0x00` otherwise.
-            if iszero(returndatasize()) {
-                // Store the function selector of `InvalidSignature()`.
-                mstore(0x00, 0x8baa579f)
-                // Revert with (offset, size).
-                revert(0x1c, 0x04)
-            }
-            // Restore the zero slot.
-            mstore(0x60, 0)
-            // Restore the free memory pointer.
-            mstore(0x40, m)
-        }
-    }
-
-    /// @dev Returns an Ethereum Signed Message, created from a `hash`.
-    /// This produces a hash corresponding to the one signed with the
-    /// [`eth_sign`](https://eth.wiki/json-rpc/API#eth_sign)
-    /// JSON-RPC method as part of EIP-191.
-    function toEthSignedMessageHash(
-        bytes32 hash
-    ) internal pure returns (bytes32 result) {
-        /// @solidity memory-safe-assembly
-        assembly {
-            // Store into scratch space for keccak256.
-            mstore(0x20, hash)
-            mstore(
-                0x00,
-                "\x00\x00\x00\x00\x19Ethereum Signed Message:\n32"
-            )
-            // 0x40 - 0x04 = 0x3c
-            result := keccak256(0x04, 0x3c)
-        }
-    }
-}

contracts/lib/utils/MerkleProofLib.sol

@@ -1,58 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity >=0.8.4;
-
-/// @notice Gas optimized verification of proof of inclusion for a leaf in a Merkle tree.
-/// @author Solady
-/// (https://github.com/vectorized/solady/blob/main/src/utils/MerkleProofLib.sol)
-/// @author Modified from Solmate
-/// (https://github.com/transmissions11/solmate/blob/main/src/utils/MerkleProofLib.sol)
-/// @author Modified from OpenZeppelin
-/// (https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/cryptography/MerkleProof.sol)
-library MerkleProofLib {
-    /// @dev Returns whether `leaf` exists in the Merkle tree with `root`, given `proof`.
-    function verify(
-        bytes32[] calldata proof,
-        bytes32 root,
-        bytes32 leaf
-    ) internal pure returns (bool isValid) {
-        /// @solidity memory-safe-assembly
-        assembly {
-            if proof.length {
-                // Left shift by 5 is equivalent to multiplying by 0x20.
-                let end := add(
-                    proof.offset,
-                    shl(5, proof.length)
-                )
-                // Initialize `offset` to the offset of `proof` in the calldata.
-                let offset := proof.offset
-                // Iterate over proof elements to compute root hash.
-                for {
-
-                } 1 {
-
-                } {
-                    // Slot of `leaf` in scratch space.
-                    // If the condition is true: 0x20, otherwise: 0x00.
-                    let scratch := shl(
-                        5,
-                        gt(leaf, calldataload(offset))
-                    )
-                    // Store elements to hash contiguously in scratch space.
-                    // Scratch space is 64 bytes (0x00 - 0x3f) and both elements are 32 bytes.
-                    mstore(scratch, leaf)
-                    mstore(
-                        xor(scratch, 0x20),
-                        calldataload(offset)
-                    )
-                    // Reuse `leaf` to store the hash to reduce stack operations.
-                    leaf := keccak256(0x00, 0x40)
-                    offset := add(offset, 0x20)
-                    if iszero(lt(offset, end)) {
-                        break
-                    }
-                }
-            }
-            isValid := eq(leaf, root)
-        }
-    }
-}

contracts/lib/utils/ReentrancyGuard.sol

@@ -1,34 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity >=0.8.4;
-
-/// @notice Reentrancy protection for smart contracts.
-/// @author z0r0z.eth
-/// @author Modified from Seaport
-///         (https://github.com/ProjectOpenSea/seaport/blob/main/contracts/lib/ReentrancyGuard.sol)
-/// @author Modified from Solmate
-///         (https://github.com/Rari-Capital/solmate/blob/main/src/utils/ReentrancyGuard.sol)
-abstract contract ReentrancyGuard {
-    error Reentrancy();
-
-    uint256 private guard = 1;
-
-    modifier nonReentrant() virtual {
-        setReentrancyGuard();
-
-        _;
-
-        clearReentrancyGuard();
-    }
-
-    /// @dev Check guard sentinel value and set it.
-    function setReentrancyGuard() internal virtual {
-        if (guard == 2) revert Reentrancy();
-
-        guard = 2;
-    }
-
-    /// @dev Unset sentinel value.
-    function clearReentrancyGuard() internal virtual {
-        guard = 1;
-    }
-}

contracts/lib/utils/SafeTransferLib.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.4;
 
-import { ERC20 } from "../tokens/ERC20.sol";
+import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 /// @notice Safe ETH and ERC20 transfer library that gracefully handles missing return values.
 /// @author Solady (https://github.com/vectorized/solady/blob/main/src/utils/SafeTransferLib.sol)

contracts/p2pix.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.19;
+pragma solidity ^0.8.19;
 
 ///         ______         __
 /// .-----.|__    |.-----.|__|.--.--.
@@ -57,7 +57,7 @@ contract P2PIX is BaseUtils {
         ERC20 token,
         uint96 amount,
         bool valid
-    ) public {
+    ) public nonReentrant {
 
         if (bytes(pixTarget).length == 0) revert EmptyPixTarget();
         if (!allowedERC20s(token)) revert TokenDenied();
@@ -68,8 +68,6 @@ contract P2PIX is BaseUtils {
         if (_newBal > MAXBALANCE_UPPERBOUND)
             revert MaxBalExceeded();
 
-        setReentrancyGuard();
-
         if (allowlistRoot != 0) {
             setRoot(msg.sender, allowlistRoot);
         }
@@ -91,8 +89,6 @@ contract P2PIX is BaseUtils {
             amount
         );
 
-        clearReentrancyGuard();
-
         emit DepositAdded(msg.sender, token, amount);
     }
 
@@ -124,7 +120,7 @@ contract P2PIX is BaseUtils {
     /// @notice This method can be performed either by:
     /// - An user allowed via the seller's allowlist;
     /// - An user with enough userRecord to lock the wished amount;
-    /// @notice There can only exist a lock per each `_amount` partitioned
+    /// @notice There can only exist a lock per each `amount` partitioned
     /// from the total `remaining` value.
     /// @notice Locks can only be performed in valid orders.
     /// @param amount The deposit's remaining amount wished to be locked.

deploys/rsktestnet.json

@@ -1,8 +1,9 @@
 {
   "signers": [
     "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-    "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
+    "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
+    "0x8963E134E6d22Ee9A26ac62a99964aB391ead816"
   ],
   "token": "0xfE841c74250e57640390f46d914C88d22C51e82e",
-  "p2pix": "0x98ba35eb14b38D6Aa709338283af3e922476dE34"
+  "p2pix": "0x57Dcba05980761169508886eEdc6f5E7EC0411Dc"
 }

deploys/sepolia.json

@@ -0,0 +1,8 @@
+{
+  "signers": [
+    "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+    "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
+  ],
+  "p2pix": "0xb7cD135F5eFD9760981e02E2a898790b688939fe",
+  "token": "0x3eBE67A2C7bdB2081CBd34ba3281E90377462289"
+}

docs/core/DataTypes.md

@@ -1 +1,29 @@
-# DataTypes
+# Solidity API
+
+## DataTypes
+
+### Lock
+
+```solidity
+struct Lock {
+  uint256 counter;
+  uint256 expirationBlock;
+  bytes32 pixTarget;
+  uint80 amount;
+  contract ERC20 token;
+  address buyerAddress;
+  address seller;
+}
+```
+
+### LockStatus
+
+```solidity
+enum LockStatus {
+  Inexistent,
+  Active,
+  Expired,
+  Released
+}
+```
+

docs/core/EventAndErrors.md

@@ -1,63 +1,54 @@
-# EventAndErrors
+# Solidity API
 
-## Events
-
-### AllowedERC20Updated
-
-```solidity
-event AllowedERC20Updated(address indexed token, bool indexed state)
-```
-
-#### Parameters
-
-| Name            | Type    | Description |
-| --------------- | ------- | ----------- |
-| token `indexed` | address | undefined   |
-| state `indexed` | bool    | undefined   |
+## EventAndErrors
 
 ### DepositAdded
 
 ```solidity
-event DepositAdded(address indexed seller, uint256 depositID, address token, uint256 amount)
+event DepositAdded(address seller, contract ERC20 token, uint256 amount)
 ```
 
-███ Events ████████████████████████████████████████████████████████████
+_0x63d8d7d5e63e9840ec91a12a160d27b7cfab294f6ba070b7359692acfe6b03bf_
 
-#### Parameters
-
-| Name             | Type    | Description |
-| ---------------- | ------- | ----------- |
-| seller `indexed` | address | undefined   |
-| depositID        | uint256 | undefined   |
-| token            | address | undefined   |
-| amount           | uint256 | undefined   |
-
-### DepositClosed
+### ValidSet
 
 ```solidity
-event DepositClosed(address indexed seller, uint256 depositID)
+event ValidSet(address seller, contract ERC20 token, bool state)
 ```
 
-#### Parameters
-
-| Name             | Type    | Description |
-| ---------------- | ------- | ----------- |
-| seller `indexed` | address | undefined   |
-| depositID        | uint256 | undefined   |
+_0xca585721b6b442dc9183932f7c84dc2880efb67c4da52cc06873e78971105d49_
 
 ### DepositWithdrawn
 
 ```solidity
-event DepositWithdrawn(address indexed seller, uint256 depositID, uint256 amount)
+event DepositWithdrawn(address seller, contract ERC20 token, uint256 amount)
 ```
 
-#### Parameters
+_0x2cd6435b1b961c13f55202979edd0765a809f69a539d8a477436c94c1211e43e_
 
-| Name             | Type    | Description |
-| ---------------- | ------- | ----------- |
-| seller `indexed` | address | undefined   |
-| depositID        | uint256 | undefined   |
-| amount           | uint256 | undefined   |
+### LockAdded
+
+```solidity
+event LockAdded(address buyer, uint256 lockID, address seller, uint256 amount)
+```
+
+_0x8fb3989f70bd172a37d15b41b015e48ea09d59329638377304a4198cd0c4ea65_
+
+### LockReleased
+
+```solidity
+event LockReleased(address buyer, uint256 lockId, uint256 amount)
+```
+
+_0x364537f14276f2a0ce9905588413f96454cbb8fb2e4f5308389307c1098bede8_
+
+### LockReturned
+
+```solidity
+event LockReturned(address buyer, uint256 lockId)
+```
+
+_0x830501e61b8b075e170b22a430e39454bdb12ed3e9620e586430b6ac00079da5_
 
 ### FundsWithdrawn
 
@@ -65,65 +56,31 @@ event DepositWithdrawn(address indexed seller, uint256 depositID, uint256 amount
 event FundsWithdrawn(address owner, uint256 amount)
 ```
 
-#### Parameters
+_0xeaff4b37086828766ad3268786972c0cd24259d4c87a80f9d3963a3c3d999b0d_
 
-| Name   | Type    | Description |
-| ------ | ------- | ----------- |
-| owner  | address | undefined   |
-| amount | uint256 | undefined   |
-
-### LockAdded
+### RootUpdated
 
 ```solidity
-event LockAdded(address indexed buyer, bytes32 indexed lockID, uint256 depositID, uint256 amount)
+event RootUpdated(address seller, bytes32 merkleRoot)
 ```
 
-#### Parameters
+_0x0b294da292f26e55fd442b5c0164fbb9013036ff00c5cfdde0efd01c1baaf632_
 
-| Name             | Type    | Description |
-| ---------------- | ------- | ----------- |
-| buyer `indexed`  | address | undefined   |
-| lockID `indexed` | bytes32 | undefined   |
-| depositID        | uint256 | undefined   |
-| amount           | uint256 | undefined   |
-
-### LockBlocksUpdated
+### AllowedERC20Updated
 
 ```solidity
-event LockBlocksUpdated(uint256 blocks)
+event AllowedERC20Updated(address token, bool state)
 ```
 
-#### Parameters
+_0x5d6e86e5341d57a92c49934296c51542a25015c9b1782a1c2722a940131c3d9a_
 
-| Name   | Type    | Description |
-| ------ | ------- | ----------- |
-| blocks | uint256 | undefined   |
-
-### LockReleased
+### TrustedForwarderUpdated
 
 ```solidity
-event LockReleased(address indexed buyer, bytes32 lockId)
+event TrustedForwarderUpdated(address forwarder, bool state)
 ```
 
-#### Parameters
-
-| Name            | Type    | Description |
-| --------------- | ------- | ----------- |
-| buyer `indexed` | address | undefined   |
-| lockId          | bytes32 | undefined   |
-
-### LockReturned
-
-```solidity
-event LockReturned(address indexed buyer, bytes32 lockId)
-```
-
-#### Parameters
-
-| Name            | Type    | Description |
-| --------------- | ------- | ----------- |
-| buyer `indexed` | address | undefined   |
-| lockId          | bytes32 | undefined   |
+_0xbee55516e29d3969d3cb8eb01351eb3c52d06f9e2435bd5a8bfe3647e185df92_
 
 ### ReputationUpdated
 
@@ -131,11 +88,15 @@ event LockReturned(address indexed buyer, bytes32 lockId)
 event ReputationUpdated(address reputation)
 ```
 
-#### Parameters
+_0xe127cf589a3879da0156d4a24f43b44f65cfa3570de594806b0bfa2fcf06884f_
 
-| Name       | Type    | Description |
-| ---------- | ------- | ----------- |
-| reputation | address | undefined   |
+### LockBlocksUpdated
+
+```solidity
+event LockBlocksUpdated(uint256 blocks)
+```
+
+_0x70fa43ca70216ad905ade86b9e650a691b2ce5a01980d0a81bdd8324141b8511_
 
 ### ValidSignersUpdated
 
@@ -143,101 +104,7 @@ event ReputationUpdated(address reputation)
 event ValidSignersUpdated(address[] signers)
 ```
 
-#### Parameters
-
-| Name    | Type      | Description |
-| ------- | --------- | ----------- |
-| signers | address[] | undefined   |
-
-## Errors
-
-### AddressDenied
-
-```solidity
-error AddressDenied()
-```
-
-_Address doesn't exist in a MerkleTree.Address not allowed as relayer.0x3b8474be_
-
-### AlreadyReleased
-
-```solidity
-error AlreadyReleased()
-```
-
-_Lock already released or returned.0x63b4904e_
-
-### AmountNotAllowed
-
-```solidity
-error AmountNotAllowed()
-```
-
-_Wished amount to be locked exceeds the limit allowed.0x1c18f846_
-
-### DepositAlreadyExists
-
-```solidity
-error DepositAlreadyExists()
-```
-
-_Deposit already exist and it is still valid.0xc44bd765_
-
-### InvalidDeposit
-
-```solidity
-error InvalidDeposit()
-```
-
-_Deposit not valid anymore.0xb2e532de_
-
-### InvalidSigner
-
-```solidity
-error InvalidSigner()
-```
-
-_Signer is not a valid signer.0x815e1d64_
-
-### LengthMismatch
-
-```solidity
-error LengthMismatch()
-```
-
-_Arrays' length don't match.0xff633a38_
-
-### LoopOverflow
-
-```solidity
-error LoopOverflow()
-```
-
-_Loop bounds have overflowed.0xdfb035c9_
-
-### NoTokens
-
-```solidity
-error NoTokens()
-```
-
-_No tokens array provided as argument.0xdf957883_
-
-### NotEnoughTokens
-
-```solidity
-error NotEnoughTokens()
-```
-
-_Not enough token remaining on deposit.0x22bbb43c_
-
-### NotExpired
-
-```solidity
-error NotExpired()
-```
-
-_Lock not expired or already released.Another lock with same ID is not expired yet.0xd0404f85_
+_0x14a422d2412784a5749d03da98921fe468c98577b767851389a9f58ea5a363d7_
 
 ### OnlySeller
 
@@ -245,15 +112,55 @@ _Lock not expired or already released.Another lock with same ID is not expired y
 error OnlySeller()
 ```
 
-_Only seller could call this function.`msg.sender` and the seller differ.0x85d1f726_
+_Only seller could call this function.
+`msg.sender` and the seller differ.
+0x85d1f726_
 
-### TokenDenied
+### NotExpired
 
 ```solidity
-error TokenDenied()
+error NotExpired()
 ```
 
-_Token address not allowed to be deposited.0x1578328e_
+_Lock not expired or already released.
+Another lock with same ID is not expired yet.
+0xd0404f85_
+
+### LoopOverflow
+
+```solidity
+error LoopOverflow()
+```
+
+_Loop bounds have overflowed.
+0xdfb035c9_
+
+### InvalidDeposit
+
+```solidity
+error InvalidDeposit()
+```
+
+_Deposit not valid anymore.
+0xb2e532de_
+
+### NotEnoughTokens
+
+```solidity
+error NotEnoughTokens()
+```
+
+_Not enough token remaining on deposit.
+0x22bbb43c_
+
+### AlreadyReleased
+
+```solidity
+error AlreadyReleased()
+```
+
+_Lock already released or returned.
+0x63b4904e_
 
 ### TxAlreadyUsed
 
@@ -261,4 +168,111 @@ _Token address not allowed to be deposited.0x1578328e_
 error TxAlreadyUsed()
 ```
 
-_Transaction already used to unlock payment.0xf490a6ea_
+_Transaction already used to unlock payment.
+0xf490a6ea_
+
+### InvalidSigner
+
+```solidity
+error InvalidSigner()
+```
+
+_Signer is not a valid signer.
+0x815e1d64_
+
+### AddressDenied
+
+```solidity
+error AddressDenied()
+```
+
+_Address doesn't exist in a MerkleTree.
+Address not allowed as relayer.
+0x3b8474be_
+
+### LengthMismatch
+
+```solidity
+error LengthMismatch()
+```
+
+_Arrays' length don't match.
+0xff633a38_
+
+### NoTokens
+
+```solidity
+error NoTokens()
+```
+
+_No tokens array provided as argument.
+0xdf957883_
+
+### TokenDenied
+
+```solidity
+error TokenDenied()
+```
+
+_Token address not allowed to be deposited.
+0x1578328e_
+
+### AmountNotAllowed
+
+```solidity
+error AmountNotAllowed()
+```
+
+_Wished amount to be locked exceeds the limit allowed.
+0x1c18f846_
+
+### StaticCallFailed
+
+```solidity
+error StaticCallFailed()
+```
+
+_Reverts when success return value returns false.
+0xe10bf1cc_
+
+### LockExpired
+
+```solidity
+error LockExpired()
+```
+
+_Reverts on an expired lock.
+0xf6fafba0_
+
+### DecOverflow
+
+```solidity
+error DecOverflow()
+```
+
+_0xce3a3d37_
+
+### MaxBalExceeded
+
+```solidity
+error MaxBalExceeded()
+```
+
+_0xf3fb0eb9_
+
+### EmptyPixTarget
+
+```solidity
+error EmptyPixTarget()
+```
+
+_0x6a3bc53e_
+
+### NotInitialized
+
+```solidity
+error NotInitialized()
+```
+
+_0x87138d5c_
+

docs/p2pix.md

@@ -1,694 +1,207 @@
-# P2PIX
+# Solidity API
 
-## Methods
+## P2PIX
 
-### \_castAddrToKey
+### lockCounter
 
 ```solidity
-function _castAddrToKey(address _addr) external pure returns (uint256 _key)
+uint256 lockCounter
 ```
 
-Public method that handles `address` to `uint256` safe type casting.
-
-_Function sighash: 0x4b2ae980._
-
-#### Parameters
-
-| Name   | Type    | Description |
-| ------ | ------- | ----------- |
-| \_addr | address | undefined   |
-
-#### Returns
-
-| Name  | Type    | Description |
-| ----- | ------- | ----------- |
-| \_key | uint256 | undefined   |
-
-### allowedERC20s
-
-```solidity
-function allowedERC20s(contract ERC20) external view returns (bool)
-```
-
-_Tokens allowed to serve as the underlying amount of a deposit._
-
-#### Parameters
-
-| Name | Type           | Description |
-| ---- | -------------- | ----------- |
-| \_0  | contract ERC20 | undefined   |
-
-#### Returns
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| \_0  | bool | undefined   |
-
-### cancelDeposit
-
-```solidity
-function cancelDeposit(uint256 depositID) external nonpayable
-```
-
-Enables seller to invalidate future locks made to his/her token offering order.
-
-_This function does not affect any ongoing active locks.Function sighash: 0x72fada5c._
-
-#### Parameters
-
-| Name      | Type    | Description |
-| --------- | ------- | ----------- |
-| depositID | uint256 | undefined   |
-
-### defaultLockBlocks
-
-```solidity
-function defaultLockBlocks() external view returns (uint256)
-```
-
-_Default blocks that lock will hold tokens._
-
-#### Returns
-
-| Name | Type    | Description |
-| ---- | ------- | ----------- |
-| \_0  | uint256 | undefined   |
-
-### deposit
-
-```solidity
-function deposit(address _token, uint256 _amount, string _pixTarget, bytes32 allowlistRoot) external nonpayable returns (uint256 depositID)
-```
-
-Creates a deposit order based on a seller's offer of an amount of ERC20 tokens.
-
-_Seller needs to send his tokens to the P2PIX smart contract.Function sighash: 0xbfe07da6._
-
-#### Parameters
-
-| Name          | Type    | Description                                             |
-| ------------- | ------- | ------------------------------------------------------- |
-| \_token       | address | undefined                                               |
-| \_amount      | uint256 | undefined                                               |
-| \_pixTarget   | string  | Pix key destination provided by the offer's seller. |
-| allowlistRoot | bytes32 | Optional allow list merkleRoot update `bytes32` value.  |
-
-#### Returns
-
-| Name      | Type    | Description                                                    |
-| --------- | ------- | -------------------------------------------------------------- |
-| depositID | uint256 | The `uint256` return value provided as the deposit identifier. |
-
-### depositCount
-
-```solidity
-function depositCount() external view returns (uint256 _val)
-```
-
-#### Returns
-
-| Name  | Type    | Description |
-| ----- | ------- | ----------- |
-| \_val | uint256 | undefined   |
-
-### lock
-
-```solidity
-function lock(uint256 _depositID, address _buyerAddress, address _relayerTarget, uint256 _relayerPremium, uint256 _amount, bytes32[] merkleProof, bytes32[] expiredLocks) external nonpayable returns (bytes32 lockID)
-```
-
-Public method designed to lock an remaining amount of the deposit order of a seller.
-
-_This method can be performed either by: - An user allowed via the seller's allowlist; - An user with enough userRecord to lock the wished amount; There can only exist a lock per each `_amount` partitioned from the total `remaining` value.Locks can only be performed in valid orders.Function sighash: 0x03aaf306._
-
-#### Parameters
-
-| Name             | Type      | Description                                                                                                              |
-| ---------------- | --------- | ------------------------------------------------------------------------------------------------------------------------ |
-| \_depositID      | uint256   | undefined                                                                                                                |
-| \_buyerAddress   | address   | The address of the buyer of a `_depositID`.                                                                              |
-| \_relayerTarget  | address   | Target address entitled to the `relayerPremim`.                                                                          |
-| \_relayerPremium | uint256   | The refund/premium owed to a relayer.                                                                                    |
-| \_amount         | uint256   | The deposit's remaining amount wished to be locked.                                                                  |
-| merkleProof      | bytes32[] | This value should be: - Provided as a pass if the `msg.sender` is in the seller's allowlist; - Left empty otherwise; |
-| expiredLocks     | bytes32[] | An array of `bytes32` identifiers to be provided so to unexpire locks using this transaction gas push.                   |
-
-#### Returns
-
-| Name   | Type    | Description                                          |
-| ------ | ------- | ---------------------------------------------------- |
-| lockID | bytes32 | The `bytes32` value returned as the lock identifier. |
-
-### mapDeposits
-
-```solidity
-function mapDeposits(uint256) external view returns (uint256 remaining, string pixTarget, address seller, address token, bool valid)
-```
-
-_Seller list of deposits_
-
-#### Parameters
-
-| Name | Type    | Description |
-| ---- | ------- | ----------- |
-| \_0  | uint256 | undefined   |
-
-#### Returns
-
-| Name      | Type    | Description |
-| --------- | ------- | ----------- |
-| remaining | uint256 | undefined   |
-| pixTarget | string  | undefined   |
-| seller    | address | undefined   |
-| token     | address | undefined   |
-| valid     | bool    | undefined   |
-
 ### mapLocks
 
 ```solidity
-function mapLocks(bytes32) external view returns (uint256 depositID, uint256 relayerPremium, uint256 amount, uint256 expirationBlock, address buyerAddress, address relayerTarget, address relayerAddress)
+mapping(uint256 => struct DataTypes.Lock) mapLocks
 ```
 
 _List of Locks._
 
-#### Parameters
-
-| Name | Type    | Description |
-| ---- | ------- | ----------- |
-| \_0  | bytes32 | undefined   |
-
-#### Returns
-
-| Name            | Type    | Description |
-| --------------- | ------- | ----------- |
-| depositID       | uint256 | undefined   |
-| relayerPremium  | uint256 | undefined   |
-| amount          | uint256 | undefined   |
-| expirationBlock | uint256 | undefined   |
-| buyerAddress    | address | undefined   |
-| relayerTarget   | address | undefined   |
-| relayerAddress  | address | undefined   |
-
-### owner
+### userRecord
 
 ```solidity
-function owner() external view returns (address)
+mapping(uint256 => uint256) userRecord
 ```
 
-#### Returns
+_Stores an relayer's last computed credit._
 
-| Name | Type    | Description |
-| ---- | ------- | ----------- |
-| \_0  | address | undefined   |
+### constructor
+
+```solidity
+constructor(uint256 defaultBlocks, address[] validSigners, address _reputation, contract ERC20[] tokens, bool[] tokenStates) public payable
+```
+
+### deposit
+
+```solidity
+function deposit(string pixTarget, bytes32 allowlistRoot, contract ERC20 token, uint96 amount, bool valid) public
+```
+
+Creates a deposit order based on a seller's
+offer of an amount of ERC20 tokens.
+Seller needs to send his tokens to the P2PIX smart contract.
+
+_Function sighash: 0x5e918943_
+
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| pixTarget | string | Pix key destination provided by the offer's seller. |
+| allowlistRoot | bytes32 | Optional allow list merkleRoot update `bytes32` value. as the deposit identifier. |
+| token | contract ERC20 |  |
+| amount | uint96 |  |
+| valid | bool |  |
+
+### setValidState
+
+```solidity
+function setValidState(contract ERC20 token, bool state) public
+```
+
+Enables seller to invalidate future
+locks made to his/her token offering order.
+This function does not affect any ongoing active locks.
+
+_Function sighash: 0x6d82d9e0_
+
+### lock
+
+```solidity
+function lock(address seller, contract ERC20 token, uint80 amount, bytes32[] merkleProof, uint256[] expiredLocks) public returns (uint256 lockID)
+```
+
+Public method designed to lock an remaining amount of
+the deposit order of a seller.
+Transaction forwarding must leave `merkleProof` empty;
+otherwise, the trustedForwarder must be previously added 
+to a seller whitelist.
+This method can be performed either by:
+- An user allowed via the seller's allowlist;
+- An user with enough userRecord to lock the wished amount;
+There can only exist a lock per each `_amount` partitioned
+from the total `remaining` value.
+Locks can only be performed in valid orders.
+
+_Function sighash: 0xdc43221c_
+
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| seller | address |  |
+| token | contract ERC20 |  |
+| amount | uint80 | The deposit's remaining amount wished to be locked. |
+| merkleProof | bytes32[] | Provided as a pass if the `msg.sender` is in the seller's allowlist; Left empty otherwise; |
+| expiredLocks | uint256[] | An array of identifiers to be provided so to unexpire locks using this transaction gas push. |
+
+#### Return Values
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| lockID | uint256 | The lock identifier. |
 
 ### release
 
 ```solidity
-function release(bytes32 lockID, address _relayerTarget, uint256 pixTimestamp, bytes32 r, bytes32 s, uint8 v) external nonpayable
+function release(uint256 lockID, bytes32 pixTimestamp, bytes signature) public
 ```
 
-Lock release method that liquidate lock orders and distributes relayer fees.
+Lock release method that liquidate lock
+orders and distributes relayer fees.
+This method can be called by any public actor
+as long the signature provided is valid.
+`relayerPremium` gets splitted equaly
+if relayer addresses differ.
+If the `msg.sender` of this method and `l.relayerAddress` are the same,
+`msg.sender` accrues both l.amount and l.relayerPremium as userRecord credit.
+ In case of they differing:
+- `lock` caller gets accrued with `l.amount` as userRecord credit;
+- `release` caller gets accrued with `l.relayerPremium` as userRecord credit;
 
-_This method can be called by any public actor as long the signature provided is valid.`relayerPremium` gets splitted equaly if `relayerTarget` addresses differ.If the `msg.sender` of this method and `l.relayerAddress` are the same, `msg.sender` accrues both l.amount and l.relayerPremium as userRecord credit. In case of they differing: - `lock` caller gets accrued with `l.amount` as userRecord credit; - `release` caller gets accrued with `l.relayerPremium` as userRecord credit; Function sighash: 0x4e1389ed._
-
-#### Parameters
-
-| Name            | Type    | Description                                     |
-| --------------- | ------- | ----------------------------------------------- |
-| lockID          | bytes32 | undefined                                       |
-| \_relayerTarget | address | Target address entitled to the `relayerPremim`. |
-| pixTimestamp    | uint256 | undefined                                       |
-| r               | bytes32 | undefined                                       |
-| s               | bytes32 | undefined                                       |
-| v               | uint8   | undefined                                       |
-
-### reputation
-
-```solidity
-function reputation() external view returns (contract IReputation)
-```
-
-███ Storage ████████████████████████████████████████████████████████████
-
-#### Returns
-
-| Name | Type                 | Description |
-| ---- | -------------------- | ----------- |
-| \_0  | contract IReputation | undefined   |
-
-### sellerAllowList
-
-```solidity
-function sellerAllowList(uint256) external view returns (bytes32)
-```
-
-_Seller casted to key => Seller's allowlist merkleroot._
-
-#### Parameters
-
-| Name | Type    | Description |
-| ---- | ------- | ----------- |
-| \_0  | uint256 | undefined   |
-
-#### Returns
-
-| Name | Type    | Description |
-| ---- | ------- | ----------- |
-| \_0  | bytes32 | undefined   |
-
-### setDefaultLockBlocks
-
-```solidity
-function setDefaultLockBlocks(uint256 _blocks) external nonpayable
-```
-
-#### Parameters
-
-| Name     | Type    | Description |
-| -------- | ------- | ----------- |
-| \_blocks | uint256 | undefined   |
-
-### setOwner
-
-```solidity
-function setOwner(address newOwner) external nonpayable
-```
-
-#### Parameters
-
-| Name     | Type    | Description |
-| -------- | ------- | ----------- |
-| newOwner | address | undefined   |
-
-### setReputation
-
-```solidity
-function setReputation(contract IReputation _reputation) external nonpayable
-```
-
-#### Parameters
-
-| Name         | Type                 | Description |
-| ------------ | -------------------- | ----------- |
-| \_reputation | contract IReputation | undefined   |
-
-### setRoot
-
-```solidity
-function setRoot(address addr, bytes32 merkleroot) external nonpayable
-```
-
-#### Parameters
-
-| Name       | Type    | Description |
-| ---------- | ------- | ----------- |
-| addr       | address | undefined   |
-| merkleroot | bytes32 | undefined   |
-
-### setValidSigners
-
-```solidity
-function setValidSigners(address[] _validSigners) external nonpayable
-```
-
-#### Parameters
-
-| Name           | Type      | Description |
-| -------------- | --------- | ----------- |
-| \_validSigners | address[] | undefined   |
-
-### tokenSettings
-
-```solidity
-function tokenSettings(address[] _tokens, bool[] _states) external nonpayable
-```
-
-#### Parameters
-
-| Name     | Type      | Description |
-| -------- | --------- | ----------- |
-| \_tokens | address[] | undefined   |
-| \_states | bool[]    | undefined   |
+_Function sighash: 0x11fc7f9a_
 
 ### unlockExpired
 
 ```solidity
-function unlockExpired(bytes32[] lockIDs) external nonpayable
+function unlockExpired(uint256[] lockIDs) public
 ```
 
 Unlocks expired locks.
+Triggered in the callgraph by both `lock` and `withdraw` functions.
+This method can also have any public actor as its `tx.origin`.
+For each successfull unexpired lock recovered,
+`userRecord[_castAddrToKey(l.relayerAddress)]` is decreased by half of its value.
 
-_Triggered in the callgraph by both `lock` and `withdraw` functions.This method can also have any public actor as its `tx.origin`.For each successfull unexpired lock recovered, `userRecord[_castAddrToKey(l.relayerAddress)]` is decreased by half of its value.Function sighash: 0x8e2749d6._
-
-#### Parameters
-
-| Name    | Type      | Description |
-| ------- | --------- | ----------- |
-| lockIDs | bytes32[] | undefined   |
-
-### userRecord
-
-```solidity
-function userRecord(uint256) external view returns (uint256)
-```
-
-_Stores an relayer's last computed credit._
-
-#### Parameters
-
-| Name | Type    | Description |
-| ---- | ------- | ----------- |
-| \_0  | uint256 | undefined   |
-
-#### Returns
-
-| Name | Type    | Description |
-| ---- | ------- | ----------- |
-| \_0  | uint256 | undefined   |
-
-### validBacenSigners
-
-```solidity
-function validBacenSigners(uint256) external view returns (bool)
-```
-
-_List of valid Bacen signature addresses_
-
-#### Parameters
-
-| Name | Type    | Description |
-| ---- | ------- | ----------- |
-| \_0  | uint256 | undefined   |
-
-#### Returns
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| \_0  | bool | undefined   |
+_Function sighash: 0xb0983d39_
 
 ### withdraw
 
 ```solidity
-function withdraw(uint256 depositID, bytes32[] expiredLocks) external nonpayable
+function withdraw(contract ERC20 token, uint256 amount, uint256[] expiredLocks) public
 ```
 
-Seller's expired deposit fund sweeper.
+Seller's expired deposit fund sweeper.
+A seller may use this method to recover
+tokens from expired deposits.
 
-_A seller may use this method to recover tokens from expired deposits.Function sighash: 0x36317972._
+_Function sighash: 0xfb8c5ef0_
 
-#### Parameters
-
-| Name         | Type      | Description |
-| ------------ | --------- | ----------- |
-| depositID    | uint256   | undefined   |
-| expiredLocks | bytes32[] | undefined   |
-
-### withdrawBalance
+### setRoot
 
 ```solidity
-function withdrawBalance() external nonpayable
+function setRoot(address addr, bytes32 merkleroot) public
 ```
 
-_Contract's underlying balance withdraw method.Function sighash: 0x5fd8c710._
-
-## Events
-
-### AllowedERC20Updated
+### receive
 
 ```solidity
-event AllowedERC20Updated(address indexed token, bool indexed state)
+receive() external payable
 ```
 
-#### Parameters
-
-| Name            | Type    | Description |
-| --------------- | ------- | ----------- |
-| token `indexed` | address | undefined   |
-| state `indexed` | bool    | undefined   |
-
-### DepositAdded
+### _addLock
 
 ```solidity
-event DepositAdded(address indexed seller, uint256 depositID, address token, uint256 amount)
+function _addLock(uint256 _bal, struct DataTypes.Lock _l) internal
 ```
 
-███ Events ████████████████████████████████████████████████████████████
-
-#### Parameters
-
-| Name             | Type    | Description |
-| ---------------- | ------- | ----------- |
-| seller `indexed` | address | undefined   |
-| depositID        | uint256 | undefined   |
-| token            | address | undefined   |
-| amount           | uint256 | undefined   |
-
-### DepositClosed
+### getBalance
 
 ```solidity
-event DepositClosed(address indexed seller, uint256 depositID)
+function getBalance(address seller, contract ERC20 token) public view returns (uint256 bal)
 ```
 
-#### Parameters
-
-| Name             | Type    | Description |
-| ---------------- | ------- | ----------- |
-| seller `indexed` | address | undefined   |
-| depositID        | uint256 | undefined   |
-
-### DepositWithdrawn
+### getValid
 
 ```solidity
-event DepositWithdrawn(address indexed seller, uint256 depositID, uint256 amount)
+function getValid(address seller, contract ERC20 token) public view returns (bool valid)
 ```
 
-#### Parameters
-
-| Name             | Type    | Description |
-| ---------------- | ------- | ----------- |
-| seller `indexed` | address | undefined   |
-| depositID        | uint256 | undefined   |
-| amount           | uint256 | undefined   |
-
-### FundsWithdrawn
+### getPixTarget
 
 ```solidity
-event FundsWithdrawn(address owner, uint256 amount)
+function getPixTarget(address seller, contract ERC20 token) public view returns (bytes32 pixTarget)
 ```
 
-#### Parameters
-
-| Name   | Type    | Description |
-| ------ | ------- | ----------- |
-| owner  | address | undefined   |
-| amount | uint256 | undefined   |
-
-### LockAdded
+### getPixTargetString
 
 ```solidity
-event LockAdded(address indexed buyer, bytes32 indexed lockID, uint256 depositID, uint256 amount)
+function getPixTargetString(address seller, contract ERC20 token) public view returns (string pixTarget)
 ```
 
-#### Parameters
-
-| Name             | Type    | Description |
-| ---------------- | ------- | ----------- |
-| buyer `indexed`  | address | undefined   |
-| lockID `indexed` | bytes32 | undefined   |
-| depositID        | uint256 | undefined   |
-| amount           | uint256 | undefined   |
-
-### LockBlocksUpdated
+### getBalances
 
 ```solidity
-event LockBlocksUpdated(uint256 blocks)
+function getBalances(address[] sellers, contract ERC20 token) external view returns (uint256[])
 ```
 
-#### Parameters
-
-| Name   | Type    | Description |
-| ------ | ------- | ----------- |
-| blocks | uint256 | undefined   |
-
-### LockReleased
+### getLocksStatus
 
 ```solidity
-event LockReleased(address indexed buyer, bytes32 lockId)
+function getLocksStatus(uint256[] ids) external view returns (uint256[], enum DataTypes.LockStatus[])
 ```
 
-#### Parameters
+External getter that returns the status of a lockIDs array.
+Call will not revert if provided with an empty array as parameter.
 
-| Name            | Type    | Description |
-| --------------- | ------- | ----------- |
-| buyer `indexed` | address | undefined   |
-| lockId          | bytes32 | undefined   |
+_Function sighash: 0x49ef8448_
 
-### LockReturned
-
-```solidity
-event LockReturned(address indexed buyer, bytes32 lockId)
-```
-
-#### Parameters
-
-| Name            | Type    | Description |
-| --------------- | ------- | ----------- |
-| buyer `indexed` | address | undefined   |
-| lockId          | bytes32 | undefined   |
-
-### OwnerUpdated
-
-```solidity
-event OwnerUpdated(address indexed user, address indexed newOwner)
-```
-
-#### Parameters
-
-| Name               | Type    | Description |
-| ------------------ | ------- | ----------- |
-| user `indexed`     | address | undefined   |
-| newOwner `indexed` | address | undefined   |
-
-### ReputationUpdated
-
-```solidity
-event ReputationUpdated(address reputation)
-```
-
-#### Parameters
-
-| Name       | Type    | Description |
-| ---------- | ------- | ----------- |
-| reputation | address | undefined   |
-
-### ValidSignersUpdated
-
-```solidity
-event ValidSignersUpdated(address[] signers)
-```
-
-#### Parameters
-
-| Name    | Type      | Description |
-| ------- | --------- | ----------- |
-| signers | address[] | undefined   |
-
-## Errors
-
-### AddressDenied
-
-```solidity
-error AddressDenied()
-```
-
-_Address doesn't exist in a MerkleTree.Address not allowed as relayer.0x3b8474be_
-
-### AlreadyReleased
-
-```solidity
-error AlreadyReleased()
-```
-
-_Lock already released or returned.0x63b4904e_
-
-### AmountNotAllowed
-
-```solidity
-error AmountNotAllowed()
-```
-
-_Wished amount to be locked exceeds the limit allowed.0x1c18f846_
-
-### DepositAlreadyExists
-
-```solidity
-error DepositAlreadyExists()
-```
-
-_Deposit already exist and it is still valid.0xc44bd765_
-
-### InvalidDeposit
-
-```solidity
-error InvalidDeposit()
-```
-
-_Deposit not valid anymore.0xb2e532de_
-
-### InvalidSigner
-
-```solidity
-error InvalidSigner()
-```
-
-_Signer is not a valid signer.0x815e1d64_
-
-### LengthMismatch
-
-```solidity
-error LengthMismatch()
-```
-
-_Arrays' length don't match.0xff633a38_
-
-### LoopOverflow
-
-```solidity
-error LoopOverflow()
-```
-
-_Loop bounds have overflowed.0xdfb035c9_
-
-### NoTokens
-
-```solidity
-error NoTokens()
-```
-
-_No tokens array provided as argument.0xdf957883_
-
-### NotEnoughTokens
-
-```solidity
-error NotEnoughTokens()
-```
-
-_Not enough token remaining on deposit.0x22bbb43c_
-
-### NotExpired
-
-```solidity
-error NotExpired()
-```
-
-_Lock not expired or already released.Another lock with same ID is not expired yet.0xd0404f85_
-
-### OnlySeller
-
-```solidity
-error OnlySeller()
-```
-
-_Only seller could call this function.`msg.sender` and the seller differ.0x85d1f726_
-
-### Reentrancy
-
-```solidity
-error Reentrancy()
-```
-
-### TokenDenied
-
-```solidity
-error TokenDenied()
-```
-
-_Token address not allowed to be deposited.0x1578328e_
-
-### TxAlreadyUsed
-
-```solidity
-error TxAlreadyUsed()
-```
-
-_Transaction already used to unlock payment.0xf490a6ea_

hardhat.config.ts

@@ -1,7 +1,6 @@
 import "@nomicfoundation/hardhat-chai-matchers";
 import "@nomicfoundation/hardhat-toolbox";
 import { config as dotenvConfig } from "dotenv";
-import "hardhat-tracer";
 import { HardhatUserConfig } from "hardhat/config";
 import { NetworkUserConfig } from "hardhat/types";
 import "hardhat-contract-sizer";
@@ -15,14 +14,6 @@ if (!mnemonic) {
   throw new Error("Please set your MNEMONIC in a .env file");
 }
 
-const infuraApiKey: string | undefined =
-  process.env.INFURA_API_KEY;
-if (!infuraApiKey) {
-  throw new Error(
-    "Please set your INFURA_API_KEY in a .env file",
-  );
-}
-
 const alchemyApiKey: string | undefined =
   process.env.ALCHEMY_API_KEY;
 if (!alchemyApiKey) {
@@ -35,33 +26,16 @@ const chainIds = {
   // "{INSERT_NAME}": {INSERT_ID},
   hardhat: 31337,
   mainnet: 1,
-  sepolia: 11155111,
-  goerli: 5,
+  "eth-sepolia": 11155111,
   "polygon-mumbai": 80001,
   rootstock:30,
-  rsktestnet:31,
+  "rootstock-testnet":31,
 };
 
 function getChainConfig(
   chain: keyof typeof chainIds,
 ): NetworkUserConfig {
-  let jsonRpcUrl: string;
-  switch (chain) {
-    case "polygon-mumbai":
-      jsonRpcUrl =
-        "https://polygon-mumbai.g.alchemy.com/v2/" +
-        alchemyApiKey;
-      break;
-    case "rsktestnet":
-      jsonRpcUrl = "https://public-node.testnet.rsk.co/";
-      break;
-    case "rootstock":
-      jsonRpcUrl = "https://public-node.rsk.co/"
-      break;
-    default:
-      jsonRpcUrl =
-        "https://" + chain + ".infura.io/v3/" + infuraApiKey;
-  }
+  let jsonRpcUrl = "https://" + chain + ".g.alchemy.com/v2/" + alchemyApiKey;
   return {
     // Comment out for default hardhat account settings
     accounts: {
@@ -90,6 +64,7 @@ const config: HardhatUserConfig = {
       process.env.REPORT_GAS &&
       process.env.REPORT_GAS != "false"
     ),
+    offline: true,
     showTimeSpent: true,
     showMethodSig: true,
     token: "ETH",
@@ -109,11 +84,10 @@ const config: HardhatUserConfig = {
     },
     // network: getChainConfig("{INSERT_NAME}"),
     mainnet: getChainConfig("mainnet"),
-    goerli: getChainConfig("goerli"),
-    sepolia: getChainConfig("sepolia"),
-    "polygon-mumbai": getChainConfig("polygon-mumbai"),
+    sepolia: getChainConfig("eth-sepolia"),
+    mumbai: getChainConfig("polygon-mumbai"),
     rootstock: getChainConfig("rootstock"),
-    rsktestnet: getChainConfig("rsktestnet"),
+    rsktestnet: getChainConfig("rootstock-testnet"),
   },
   paths: {
     artifacts: "./artifacts",
@@ -122,10 +96,10 @@ const config: HardhatUserConfig = {
     tests: "./test",
   },
   solidity: {
-    version: "0.8.19",
+    version: "0.8.28",
     settings: {
       viaIR: true,
-      evmVersion: "paris",
+      evmVersion: "cancun",
       optimizer: {
         enabled: true,
         runs: 20_000,
@@ -145,7 +119,7 @@ const config: HardhatUserConfig = {
   },
   typechain: {
     outDir: "src/types",
-    target: "ethers-v5",
+    target: "ethers-v6",
   },
   docgen: {
     pages: "files",

package.json

@@ -9,10 +9,9 @@
     "url": "https://github.com/doiim/p2pix-smart-contracts/issues"
   },
   "scripts": {
-    "clean": "shx rm -rf ./artifacts ./cache ./coverage ./src/types ./coverage.json && yarn typechain",
-    "commit": "git-cz",
-    "compile": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat compile",
-    "typechain": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat typechain",
+    "clean": "hardhat clean",
+    "compile": "hardhat compile",
+    "typechain": "hardhat typechain",
     "test": "hardhat test",
     "deploy1:localhost": "hardhat run scripts/1-deploy-mockToken.ts --network localhost",
     "deploy2:localhost": "hardhat run scripts/2-deploy-p2pix.ts --network localhost",
@@ -24,71 +23,50 @@
     "lint": "yarn lint:sol && yarn lint:ts && yarn prettier:check",
     "lint:sol": "solhint --config ./.solhint.json --max-warnings 0 \"contracts/**/*.sol\"",
     "lint:ts": "eslint --config ./.eslintrc.yaml --ignore-path ./.eslintignore --ext .js,.ts .",
-    "_postinstall": "husky install",
-    "postpublish": "pinst --enable",
-    "prepublishOnly": "pinst --disable",
     "prettier": "prettier --config ./.prettierrc.yaml --write \"**/*.{js,json,md,sol,ts,yaml,yml}\"",
     "prettier:check": "prettier --check --config ./.prettierrc.yaml \"**/*.{js,json,md,sol,ts,yaml,yml}\""
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.2.0",
-    "@commitlint/config-conventional": "^17.2.0",
-    "@ethersproject/abi": "^5.7.0",
-    "@ethersproject/abstract-signer": "^5.7.0",
-    "@ethersproject/bignumber": "^5.7.0",
-    "@ethersproject/bytes": "^5.7.0",
-    "@ethersproject/providers": "^5.7.2",
-    "@nomicfoundation/hardhat-chai-matchers": "^1.0.4",
-    "@nomicfoundation/hardhat-network-helpers": "1.0.6",
-    "@nomicfoundation/hardhat-toolbox": "^2.0.0",
-    "@nomiclabs/hardhat-ethers": "^2.2.1",
-    "@nomiclabs/hardhat-etherscan": "^3.1.2",
-    "@trivago/prettier-plugin-sort-imports": "^3.4.0",
-    "@typechain/ethers-v5": "^10.1.1",
-    "@typechain/hardhat": "^6.1.4",
-    "@types/chai": "^4.3.3",
-    "@types/fs-extra": "^9.0.13",
-    "@types/mocha": "^9.1.1",
-    "@types/node": "^18.11.9",
-    "@typescript-eslint/eslint-plugin": "^5.42.0",
-    "@typescript-eslint/parser": "^5.42.0",
-    "chai": "^4.3.6",
-    "chalk": "4.x",
-    "commitizen": "^4.2.5",
-    "cross-env": "^7.0.3",
-    "cz-conventional-changelog": "^3.3.0",
-    "dotenv": "^16.0.3",
-    "eslint": "^8.26.0",
-    "eslint-config-prettier": "^8.5.0",
-    "ethers": "^5.7.2",
-    "fs-extra": "^10.1.0",
-    "hardhat": "^2.12.2",
-    "hardhat-contract-sizer": "^2.8.0",
-    "hardhat-gas-reporter": "^1.0.9",
-    "hardhat-tracer": "beta",
-    "husky": "^8.0.1",
+    "@ethersproject/abi": "^5.8.0",
+    "@ethersproject/providers": "^5.8.0",
+    "@nomicfoundation/hardhat-chai-matchers": "^2.1.0",
+    "@nomicfoundation/hardhat-ethers": "^3.1.0",
+    "@nomicfoundation/hardhat-ignition": "^0.15.13",
+    "@nomicfoundation/hardhat-ignition-ethers": "^0.15.14",
+    "@nomicfoundation/hardhat-network-helpers": "^1.1.0",
+    "@nomicfoundation/hardhat-toolbox": "^6.1.0",
+    "@nomicfoundation/hardhat-verify": "^2.1.0",
+    "@nomicfoundation/hardhat-viem": "^2.1.0",
+    "@nomicfoundation/ignition-core": "^0.15.13",
+    "@openzeppelin/contracts": "5.5.0",
+    "@typechain/ethers-v6": "^0.5.1",
+    "@typechain/hardhat": "^9.1.0",
+    "@types/chai": "^4.3.20",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^24.1.0",
+    "chai": "4.5.0",
+    "dotenv": "^16.6.1",
+    "eslint": "^9.32.0",
+    "eslint-config-prettier": "^10.1.8",
+    "ethers": "^6.15.0",
+    "hardhat": "^2.26.1",
+    "hardhat-contract-sizer": "^2.10.0",
+    "hardhat-gas-reporter": "^2.3.0",
     "keccak256": "^1.0.6",
-    "lint-staged": "^13.0.3",
     "lodash": "^4.17.21",
-    "merkletreejs": "^0.2.32",
-    "mocha": "^10.1.0",
-    "pinst": "^3.0.0",
-    "prettier": "^2.7.1",
-    "prettier-plugin-solidity": "^1.0.0-rc.1",
-    "shx": "^0.3.4",
-    "solhint": "^3.3.7",
-    "solhint-plugin-prettier": "^0.0.5",
-    "solidity-coverage": "^0.8.2",
+    "merkletreejs": "^0.5.2",
+    "mocha": "^10.8.2",
+    "solidity-coverage": "^0.8.16",
     "solidity-docgen": "^0.6.0-beta.36",
-    "ts-generator": "^0.1.1",
-    "ts-node": "^10.9.1",
-    "typechain": "^8.1.1",
-    "typescript": "^4.8.4"
+    "ts-node": "^10.9.2",
+    "typechain": "^8.3.2",
+    "typescript": "^5.8.3",
+    "viem": "^2.33.1"
   },
   "files": [
     "/contracts"
   ],
-  "packageManager": "yarn@3.2.1",
+  "packageManager": "yarn@4.9.2",
   "publishConfig": {
     "access": "public"
   }

scripts/1-deploy-mockToken.ts

@@ -1,14 +1,11 @@
-import "@nomiclabs/hardhat-ethers";
-import "@nomiclabs/hardhat-etherscan";
-import { BigNumber } from "ethers";
+import "@nomicfoundation/hardhat-ethers";
 import * as fs from "fs";
 import { ethers, network } from "hardhat";
-import hre from "hardhat";
 
 import { Deploys } from "../test/utils/interfaces";
 
 let deploysJson: Deploys;
-const supply: BigNumber = ethers.utils.parseEther("20000000");
+const supply: BigInt = ethers.parseEther("20000000");
 
 const main = async () => {
   try {
@@ -25,15 +22,11 @@ const main = async () => {
   const [deployer] = await ethers.getSigners();
   console.log(`Deploying contracts with ${deployer.address}`);
 
-  const ERC20Factory = await ethers.getContractFactory(
-    "MockToken",
-  );
-  const erc20 = await ERC20Factory.deploy(supply);
-  await erc20.deployed();
+  let erc20 = await ethers.deployContract("MockToken", [supply]);
+  erc20 = await erc20.waitForDeployment();
 
-  deploysJson.token = erc20.address;
-  console.log("🚀 Mock Token Deployed:", erc20.address);
-  await erc20.deployTransaction.wait(6);
+  deploysJson.token = await erc20.getAddress();
+  console.log("🚀 Mock Token Deployed:", await erc20.getAddress());
 
   fs.writeFileSync(
     `./deploys/${network.name}.json`,

scripts/2-deploy-p2pix.ts

@@ -1,8 +1,6 @@
-import "@nomiclabs/hardhat-ethers";
-import "@nomiclabs/hardhat-etherscan";
+import "@nomicfoundation/hardhat-ethers";
 import * as fs from "fs";
 import { ethers, network } from "hardhat";
-import hre from "hardhat";
 
 import { Deploys } from "../test/utils/interfaces";
 
@@ -23,32 +21,24 @@ const main = async () => {
   const [deployer] = await ethers.getSigners();
   console.log(`Deploying contracts with ${deployer.address}`);
 
-  const Reputation = await ethers.getContractFactory(
-    "Reputation",
-  );
-  const Multicall = await ethers.getContractFactory(
-    "Multicall",
-  );
-  const reputation = await Reputation.deploy();
-  await reputation.deployed();
-  const mutlicall = await Multicall.deploy();
-  await mutlicall.deployed();
-
-  const P2PIX = await ethers.getContractFactory("P2PIX");
-  const p2pix = await P2PIX.deploy(
+  let reputation = await ethers.deployContract("Reputation");
+  let multicall = await ethers.deployContract("Multicall");
+  let p2pix = await ethers.deployContract("P2PIX", [
     10,
     deploysJson.signers,
-    reputation.address,
+    reputation.target,
     [deploysJson.token],
     [true],
-  );
-  await p2pix.deployed();
+  ]);
 
-  deploysJson.p2pix = p2pix.address;
-  console.log("🚀 P2PIX Deployed:", p2pix.address);
-  console.log("🌠 Reputation Deployed:", reputation.address);
-  console.log("🛰 Multicall Deployed:", mutlicall.address);
-  await p2pix.deployTransaction.wait(6);
+  reputation = await reputation.waitForDeployment();
+  multicall = await multicall.waitForDeployment();
+  p2pix = await p2pix.waitForDeployment();
+
+  deploysJson.p2pix = await p2pix.getAddress();
+  console.log("🚀 P2PIX Deployed:", await p2pix.getAddress());
+  console.log("🌠 Reputation Deployed:", await reputation.getAddress());
+  console.log("🛰 Multicall Deployed:", await multicall.getAddress());
 
   fs.writeFileSync(
     `./deploys/${network.name}.json`,

test/Reputation.test.ts

@@ -1,6 +1,6 @@
 import "@nomicfoundation/hardhat-chai-matchers";
 import { loadFixture } from "@nomicfoundation/hardhat-network-helpers";
-import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
+import { SignerWithAddress } from "@nomicfoundation/hardhat-ethers/signers";
 import { expect } from "chai";
 import { ethers, network } from "hardhat";
 
@@ -15,7 +15,7 @@ describe("Reputation", () => {
 
   before("Set signers and reset network", async () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    [owner] = await (ethers as any).getSigners();
+    [owner] = await ethers.getSigners();
 
     await network.provider.send("hardhat_reset");
   });
@@ -60,7 +60,7 @@ describe("Reputation", () => {
         },
         {
           x: Number.MAX_SAFE_INTEGER,
-          shouldRevert: "overflow",
+          expected: curve(Number.MAX_SAFE_INTEGER),
         },
         {
           x: Number.POSITIVE_INFINITY,

test/utils/fixtures.ts

@@ -1,5 +1,5 @@
-import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
-import { BigNumber, Signer } from "ethers";
+import { SignerWithAddress } from "@nomicfoundation/hardhat-ethers/signers";
+import { Signer } from "ethers";
 import { ethers } from "hardhat";
 import keccak256 from "keccak256";
 import { MerkleTree } from "merkletreejs";
@@ -14,30 +14,7 @@ import {
 
 import { Call, RepFixture, P2PixAndReputation, DepositArgs, LockArgs, ReleaseArgs } from "./interfaces";
 
-
 // exported constants
-export const createDepositArgs = (pixTarget: string, allowlistRoot: string, token: string, amount: BigNumber, valid:boolean): DepositArgs => ({
-  pixTarget,
-  allowlistRoot,
-  token,
-  amount,
-  valid,
-});
-
-export const createLockArgs = (seller: string, token: string, amount: BigNumber, merkleProof: string[], expiredLocks: BigNumber[]): LockArgs => ({
-  seller,
-  token,
-  amount,
-  merkleProof,
-  expiredLocks,
-});
-
-export const createReleaseArgs = (lockID: BigNumber, pixTimestamp: string, signature: string): ReleaseArgs => ({
-  lockID,
-  pixTimestamp,
-  signature,
-});
-
 export const getSignerAddrs = (
   amount: number,
   addrs: SignerWithAddress[],
@@ -45,16 +22,16 @@ export const getSignerAddrs = (
   return addrs.slice(0, amount).map(({ address }) => address);
 };
 
-export const getBnFrom = (nums: number[]): BigNumber[] => {
-  const bns = nums.map(num => ethers.BigNumber.from(num));
+export const getBnFrom = (nums: number[]): BigInt[] => {
+  const bns = nums.map(num => BigInt(num));
   return bns;
 };
 
 export const getLockData = (
   addr: string,
-  locks: BigNumber[][],
+  locks: BigInt[][],
 ): Call[] => {
-  const iface = new ethers.utils.Interface(
+  const iface = new ethers.Interface(
     P2PIX__factory.abi,
   );
   return locks.map(lock => ({
@@ -94,13 +71,8 @@ export const curve = (x: number): number => {
 
 // exported async functions
 export async function repFixture(): Promise<RepFixture> {
-  const Reputation = await ethers.getContractFactory(
-    "Reputation",
-  );
-  const reputation =
-    (await Reputation.deploy()) as Reputation;
-
-  return { reputation };
+  const reputation = await ethers.deployContract("Reputation");
+  return { reputation: await reputation.waitForDeployment()  };
 }
 
 export async function p2pixFixture(): Promise<P2PixAndReputation> {
@@ -109,30 +81,21 @@ export async function p2pixFixture(): Promise<P2PixAndReputation> {
     await ethers.getSigners(),
   );
 
-  const Reputation = await ethers.getContractFactory(
-    "Reputation",
-  );
-  const reputation =
-    (await Reputation.deploy()) as Reputation;
+  const reputation = await ethers.deployContract("Reputation");
 
-  const ERC20 = await ethers.getContractFactory("MockToken");
-  const erc20 = (await ERC20.deploy(
-    ethers.utils.parseEther("20000000"), // 20M
-  )) as MockToken;
+  const erc20 = await ethers.deployContract("MockToken", [
+    ethers.parseEther("20000000") // 20M
+  ]) as MockToken;
 
-  const P2PIX = await ethers.getContractFactory("P2PIX");
-  const p2pix = (await P2PIX.deploy(
+  const p2pix = await ethers.deployContract("P2PIX", [
     10,
     validSigners,
-    reputation.address,
-    [erc20.address],
+    reputation.target,
+    [erc20.target],
     [true],
-  )) as P2PIX;
+  ]);
 
-  const Multicall = await ethers.getContractFactory(
-    "Multicall",
-  );
-  const multicall = (await Multicall.deploy()) as Multicall;
+  const multicall = await ethers.deployContract("Multicall");
 
   const signers = await ethers.getSigners();
   const whitelisted = signers.slice(0, 2);
@@ -148,10 +111,10 @@ export async function p2pixFixture(): Promise<P2PixAndReputation> {
   );
 
   return {
-    multicall,
-    reputation,
-    erc20,
-    p2pix,
+    multicall: await multicall.waitForDeployment(),
+    reputation: await reputation.waitForDeployment(),
+    erc20: await erc20.waitForDeployment(),
+    p2pix: await p2pix.waitForDeployment(),
     merkleRoot,
     proof,
   };

test/utils/interfaces.ts

@@ -1,5 +1,3 @@
-import { BigNumber } from "ethers";
-
 import {
   MockToken,
   Multicall,
@@ -19,29 +17,29 @@ export interface DepositArgs {
   pixTarget: string;
   allowlistRoot: string;
   token: string;
-  amount: BigNumber;
+  amount: BigInt;
   valid: boolean;
 } 
 
 export interface LockArgs {
   seller: string;
   token: string;
-  amount: BigNumber;
+  amount: BigInt;
   merkleProof: string[];
-  expiredLocks: BigNumber[];
+  expiredLocks: BigInt[];
 }
 
 export interface ReleaseArgs {
-  lockID: BigNumber;
+  lockID: BigInt;
   pixTimestamp: string;
   signature: string;
 }
 
 export interface Lock {
-  counter: BigNumber;
-  expirationBlock: BigNumber;
+  counter: BigInt;
+  expirationBlock: BigInt;
   pixTarget: string;
-  amount: BigNumber;
+  amount: BigInt;
   token: string;
   buyerAddress: string;
   seller: string;