hueso/p2pix-smart-contracts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved stack allocation from memory to calldata

Browse Source
This commit is contained in:
PedroCailleret 2023-05-22 06:40:53 -03:00
parent 4281526d77
commit 26a495246e
43 changed files with 933 additions and 826 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.solcover.js
View File

@ -1,7 +1,18 @@
module.exports = {
configureYulOptimizer: true,
solcOptimizerDetails: {
deduplicate: true,
cse: true,
constantOptimizer: true,
peephole: true,
jumpdestRemover: true,
yul: true,
// inliner: false,
// orderLiterals: true,
},
istanbulReporter: ["html", "lcov"],
providerOptions: {
mnemonic: process.env.MNEMONIC,
},
skipFiles: ["test"],
skipFiles: ["test", 'core/BaseUtils.sol', 'core/OwnerSettings.sol'],
};

2
artifacts/contracts/Reputation.sol/Reputation.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../build-info/cd64a64b3749ac90866585a6471cc921.json"
"buildInfo": "../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

2
artifacts/contracts/core/BaseUtils.sol/BaseUtils.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../build-info/f220dbc6fa6f1dbf5c2cb562d65f0725.json"
"buildInfo": "../../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

8
artifacts/contracts/core/BaseUtils.sol/BaseUtils.json
View File

@ -213,9 +213,9 @@
},
{
"indexed": false,
"internalType": "uint256",
"internalType": "address",
"name": "seller",
"type": "uint256"
"type": "address"
},
{
"indexed": false,
@ -529,9 +529,9 @@
{
"inputs": [
{
"internalType": "uint256",
"internalType": "address",
"name": "sellerKey",
"type": "uint256"
"type": "address"
}
],
"name": "sellerAllowList",

2
artifacts/contracts/core/Constants.sol/Constants.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../build-info/cd64a64b3749ac90866585a6471cc921.json"
"buildInfo": "../../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

2
artifacts/contracts/core/DataTypes.sol/DataTypes.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../build-info/cd64a64b3749ac90866585a6471cc921.json"
"buildInfo": "../../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

4
artifacts/contracts/core/DataTypes.sol/DataTypes.json
View File

@ -3,8 +3,8 @@
"contractName": "DataTypes",
"sourceName": "contracts/core/DataTypes.sol",
"abi": [],
"bytecode": "0x60808060405234601757603a9081601d823930815050f35b600080fdfe600080fdfea2646970667358221220a40e6f94f4c0b9a9cdd9ac64f98613aece8f5a3f084ee1eca35eba466df9810964736f6c63430008130033",
"deployedBytecode": "0x600080fdfea2646970667358221220a40e6f94f4c0b9a9cdd9ac64f98613aece8f5a3f084ee1eca35eba466df9810964736f6c63430008130033",
"bytecode": "0x60808060405234601757603a9081601d823930815050f35b600080fdfe600080fdfea26469706673582212201904685203adfcebeda9a1444d5381c24a37e2895e8a7dff26bd8d5af2fafcbc64736f6c63430008130033",
"deployedBytecode": "0x600080fdfea26469706673582212201904685203adfcebeda9a1444d5381c24a37e2895e8a7dff26bd8d5af2fafcbc64736f6c63430008130033",
"linkReferences": {},
"deployedLinkReferences": {}
}

2
artifacts/contracts/core/EventAndErrors.sol/EventAndErrors.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../build-info/cd64a64b3749ac90866585a6471cc921.json"
"buildInfo": "../../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

4
artifacts/contracts/core/EventAndErrors.sol/EventAndErrors.json
View File

@ -203,9 +203,9 @@
},
{
"indexed": false,
"internalType": "uint256",
"internalType": "address",
"name": "seller",
"type": "uint256"
"type": "address"
},
{
"indexed": false,

2
artifacts/contracts/core/OwnerSettings.sol/OwnerSettings.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../build-info/cd64a64b3749ac90866585a6471cc921.json"
"buildInfo": "../../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

8
artifacts/contracts/core/OwnerSettings.sol/OwnerSettings.json
View File

@ -208,9 +208,9 @@
},
{
"indexed": false,
"internalType": "uint256",
"internalType": "address",
"name": "seller",
"type": "uint256"
"type": "address"
},
{
"indexed": false,
@ -467,9 +467,9 @@
{
"inputs": [
{
"internalType": "uint256",
"internalType": "address",
"name": "sellerKey",
"type": "uint256"
"type": "address"
}
],
"name": "sellerAllowList",

2
artifacts/contracts/lib/auth/Owned.sol/Owned.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/cd64a64b3749ac90866585a6471cc921.json"
"buildInfo": "../../../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

2
artifacts/contracts/lib/interfaces/IReputation.sol/IReputation.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/cd64a64b3749ac90866585a6471cc921.json"
"buildInfo": "../../../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

2
artifacts/contracts/lib/metatx/ERC2771Context.sol/Context.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/cd64a64b3749ac90866585a6471cc921.json"
"buildInfo": "../../../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

2
artifacts/contracts/lib/metatx/ERC2771Context.sol/ERC2771Context.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/cd64a64b3749ac90866585a6471cc921.json"
"buildInfo": "../../../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

2
artifacts/contracts/lib/mock/mockToken.sol/MockToken.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/cd64a64b3749ac90866585a6471cc921.json"
"buildInfo": "../../../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

2
artifacts/contracts/lib/tokens/ERC20.sol/ERC20.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/cd64a64b3749ac90866585a6471cc921.json"
"buildInfo": "../../../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

2
artifacts/contracts/lib/utils/ECDSA.sol/ECDSA.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/cd64a64b3749ac90866585a6471cc921.json"
"buildInfo": "../../../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

2
artifacts/contracts/lib/utils/MerkleProofLib.sol/MerkleProofLib.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/cd64a64b3749ac90866585a6471cc921.json"
"buildInfo": "../../../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

2
artifacts/contracts/lib/utils/Multicall.sol/Multicall.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/cd64a64b3749ac90866585a6471cc921.json"
"buildInfo": "../../../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

2
artifacts/contracts/lib/utils/ReentrancyGuard.sol/ReentrancyGuard.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/cd64a64b3749ac90866585a6471cc921.json"
"buildInfo": "../../../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

2
artifacts/contracts/lib/utils/SafeTransferLib.sol/SafeTransferLib.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/cd64a64b3749ac90866585a6471cc921.json"
"buildInfo": "../../../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

2
artifacts/contracts/p2pix.sol/P2PIX.dbg.json
View File

@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../build-info/f220dbc6fa6f1dbf5c2cb562d65f0725.json"
"buildInfo": "../../build-info/3d12978eb8a70621f317c36179381ad8.json"
}

128
artifacts/contracts/p2pix.sol/P2PIX.json
View File

File diff suppressed because one or more lines are too long

28
contracts/core/BaseUtils.sol
View File

@ -1,11 +1,11 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
import { ERC20, OwnerSettings } from "./OwnerSettings.sol";
import { ERC20, OwnerSettings } from "contracts/core/OwnerSettings.sol";
import { ECDSA } from "../lib/utils/ECDSA.sol";
import { MerkleProofLib as Merkle } from "../lib/utils/MerkleProofLib.sol";
import { ReentrancyGuard } from "../lib/utils/ReentrancyGuard.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";
abstract contract BaseUtils is
OwnerSettings,
@ -93,7 +93,7 @@ abstract contract BaseUtils is
}
function _setSellerBalance(
uint256 _sellerKey,
address _sellerKey,
ERC20 _erc20,
uint256 _packed,
bytes32 _pixTarget
@ -101,7 +101,7 @@ abstract contract BaseUtils is
assembly {
mstore(0x20, _erc20)
mstore(0x0c, _SELLER_BALANCE_SLOT_SEED)
mstore(0x00, shr(0xc, _sellerKey))
mstore(0x00, _sellerKey)
let _loc := keccak256(0x0c, 0x34)
sstore(add(_loc, 0x01), _packed)
sstore(_loc, _pixTarget)
@ -109,55 +109,55 @@ abstract contract BaseUtils is
}
function _setValidState(
uint256 _sellerKey,
address _sellerKey,
ERC20 _erc20,
uint256 _packed
) internal {
assembly {
mstore(0x20, _erc20)
mstore(0x0c, _SELLER_BALANCE_SLOT_SEED)
mstore(0x00, shr(0xc, _sellerKey))
mstore(0x00, _sellerKey)
let _loc := keccak256(0x0c, 0x34)
sstore(add(_loc, 0x01), _packed)
}
}
function _addSellerBalance(
uint256 _sellerKey,
address _sellerKey,
ERC20 _erc20,
uint256 _amount
) internal {
assembly {
mstore(0x20, _erc20)
mstore(0x0c, _SELLER_BALANCE_SLOT_SEED)
mstore(0x00, shr(0xc, _sellerKey))
mstore(0x00, _sellerKey)
let _loc := add(keccak256(0x0c, 0x34), 0x01)
sstore(_loc, add(sload(_loc), _amount))
}
}
function _decSellerBalance(
uint256 _sellerKey,
address _sellerKey,
ERC20 _erc20,
uint256 _amount
) internal {
assembly {
mstore(0x20, _erc20)
mstore(0x0c, _SELLER_BALANCE_SLOT_SEED)
mstore(0x00, shr(0xc, _sellerKey))
mstore(0x00, _sellerKey)
let _loc := add(keccak256(0x0c, 0x34), 0x01)
sstore(_loc, sub(sload(_loc), _amount))
}
}
function __sellerBalance(
uint256 _sellerKey,
address _sellerKey,
ERC20 _erc20
) internal view returns (uint256 _packed) {
assembly {
mstore(0x20, _erc20)
mstore(0x0c, _SELLER_BALANCE_SLOT_SEED)
mstore(0x00, shr(0xc, _sellerKey))
mstore(0x00, _sellerKey)
_packed := sload(add(keccak256(0x0c, 0x34), 0x01))
}
}

20
contracts/core/DataTypes.sol
View File

@ -1,15 +1,33 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
import { ERC20 } from "contracts/lib/tokens/ERC20.sol";
library DataTypes {
struct DepositArgs {
string pixTarget;
bytes32 allowlistRoot;
ERC20 token;
uint96 amount;
bool valid;
}
struct LockArgs {
address seller;
ERC20 token;
uint80 amount;
bytes32[] merkleProof;
uint256[] expiredLocks;
}
struct Lock {
uint256 sellerKey;
uint256 counter;
uint256 expirationBlock;
bytes32 pixTarget;
uint80 amount;
address token;
address buyerAddress;
address seller;
}
// prettier-ignore

2
contracts/core/EventAndErrors.sol
View File

@ -28,7 +28,7 @@ interface EventAndErrors {
event LockAdded(
address indexed buyer,
uint256 indexed lockID,
uint256 seller,
address seller,
uint256 amount
);
/// @dev 0x364537f14276f2a0ce9905588413f96454cbb8fb2e4f5308389307c1098bede8

18
contracts/core/OwnerSettings.sol
View File

@ -1,12 +1,12 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
import { ERC2771Context as ERC2771 } from "../lib/metatx/ERC2771Context.sol";
import { ERC20, SafeTransferLib } from "../lib/utils/SafeTransferLib.sol";
import { IReputation } from "../lib/interfaces/IReputation.sol";
import { EventAndErrors } from "./EventAndErrors.sol";
import { Constants } from "./Constants.sol";
import { Owned } from "../lib/auth/Owned.sol";
import { ERC2771Context as 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";
import { Constants } from "contracts/core/Constants.sol";
import { Owned } from "contracts/lib/auth/Owned.sol";
abstract contract OwnerSettings is
Constants,
@ -121,7 +121,7 @@ abstract contract OwnerSettings is
} iszero(returndatasize()) {
/* */
} {
sstore(shl(12, mload(i)), true)
sstore(shl(0xc, mload(i)), true)
i := add(i, 0x20)
if iszero(lt(i, end)) {
@ -187,11 +187,11 @@ abstract contract OwnerSettings is
}
function sellerAllowList(
uint256 sellerKey
address sellerKey
) public view returns (bytes32 root) {
assembly {
mstore(0x0c, _SELLER_ALLOWLIST_SLOT_SEED)
mstore(0x00, shr(12, sellerKey))
mstore(0x00, sellerKey)
root := sload(keccak256(0x00, 0x20))
}
}

151
contracts/p2pix.sol
View File

@ -8,9 +8,9 @@ pragma solidity 0.8.19;
/// |__| |__|
///
import { OwnerSettings, ERC20, SafeTransferLib } from "./core/OwnerSettings.sol";
import { BaseUtils } from "./core/BaseUtils.sol";
import { DataTypes as DT } from "./core/DataTypes.sol";
import { OwnerSettings, ERC20, SafeTransferLib } from "contracts/core/OwnerSettings.sol";
import { BaseUtils } from "contracts/core/BaseUtils.sol";
import { DataTypes as DT } from "contracts/core/DataTypes.sol";
contract P2PIX is BaseUtils {
@ -18,6 +18,8 @@ contract P2PIX is BaseUtils {
// solhint-disable no-inline-assembly
// solhint-disable no-empty-blocks
using DT for DT.DepositArgs;
using DT for DT.LockArgs;
using DT for DT.Lock;
using DT for DT.LockStatus;
@ -53,55 +55,49 @@ contract P2PIX is BaseUtils {
/// @notice Creates a deposit order based on a seller's
/// offer of an amount of ERC20 tokens.
/// @dev Seller needs to send his tokens to the P2PIX smart contract.
/// @param _pixTarget Pix key destination provided by the offer's seller.
/// @param allowlistRoot Optional allow list merkleRoot update `bytes32` value.
/// as the deposit identifier.
/* /// @param _pixTarget Pix key destination provided by the offer's seller. */
/* /// @param allowlistRoot Optional allow list merkleRoot update `bytes32` value. */
/* /// as the deposit identifier. */
/// @dev Function sighash: 0xbfe07da6.
function deposit(
address _token,
uint96 _amount,
string memory _pixTarget,
bool _valid,
bytes32 allowlistRoot
DT.DepositArgs calldata args
) public {
ERC20 t = ERC20(_token);
uint256 k = _castAddrToKey(msg.sender);
if (bytes(_pixTarget).length == 0) revert EmptyPixTarget();
if (!allowedERC20s(t)) revert TokenDenied();
uint256 _sellerBalance = __sellerBalance(k,t);
if (bytes(args.pixTarget).length == 0) revert EmptyPixTarget();
if (!allowedERC20s(args.token)) revert TokenDenied();
uint256 _sellerBalance = __sellerBalance(msg.sender, args.token);
uint256 currBal = _sellerBalance & BITMASK_SB_ENTRY;
uint256 _newBal = uint256(currBal + _amount);
uint256 _newBal = uint256(currBal + args.amount);
if (_newBal > MAXBALANCE_UPPERBOUND)
revert MaxBalExceeded();
setReentrancyGuard();
if (allowlistRoot != 0) {
setRoot(msg.sender, allowlistRoot);
if (args.allowlistRoot != 0) {
setRoot(msg.sender, args.allowlistRoot);
}
bytes32 pixTargetCasted = getStr(_pixTarget);
uint256 validCasted = _castBool(_valid);
bytes32 pixTargetCasted = getStr(args.pixTarget);
uint256 validCasted = _castBool(args.valid);
_setSellerBalance(
k,
t,
msg.sender,
args.token,
(_newBal | (validCasted << BITPOS_VALID)),
pixTargetCasted
);
SafeTransferLib.safeTransferFrom(
t,
args.token,
msg.sender,
address(this),
_amount
args.amount
);
clearReentrancyGuard();
emit DepositAdded(msg.sender, _token, _amount);
emit DepositAdded(msg.sender, address(args.token), args.amount);
}
/// @notice Enables seller to invalidate future
@ -109,8 +105,7 @@ contract P2PIX is BaseUtils {
/// @dev This function does not affect any ongoing active locks.
/// @dev Function sighash: 0x72fada5c.
function setValidState(ERC20 token, bool state) public {
uint256 key = _castAddrToKey(msg.sender);
uint256 _sellerBalance = __sellerBalance(key, token);
uint256 _sellerBalance = __sellerBalance(msg.sender, token);
if (_sellerBalance != 0) {
uint256 _valid = _castBool(state);
@ -119,7 +114,7 @@ contract P2PIX is BaseUtils {
(_sellerBalance & BITMASK_SB_ENTRY) |
(_valid << BITPOS_VALID);
_setValidState(key, token, _sellerBalance);
_setValidState(msg.sender, token, _sellerBalance);
emit ValidSet(msg.sender, address(token), state);
} else revert NotInitialized();
@ -127,78 +122,73 @@ contract P2PIX is BaseUtils {
/// @notice Public method designed to lock an remaining amount of
/// the deposit order of a seller.
/// @dev Transaction forwarding must leave `merkleProof` empty;
/// otherwise, the trustedForwarder must be previously added
/// to a seller whitelist.
/// @dev 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;
/// @dev There can only exist a lock per each `_amount` partitioned
/// from the total `remaining` value.
/// @dev Locks can only be performed in valid orders.
/// @param _amount The deposit's remaining amount wished to be locked.
/// @param merkleProof This value should be:
/// - Provided as a pass if the `msg.sender` is in the seller's allowlist;
/// - Left empty otherwise;
/// @param expiredLocks An array of `bytes32` identifiers to be
/// provided so to unexpire locks using this transaction gas push.
/* /// @param _amount The deposit's remaining amount wished to be locked. */
/* /// @param merkleProof This value should be: */
/* /// - Provided as a pass if the `msg.sender` is in the seller's allowlist; */
/* /// - Left empty otherwise; */
/* /// @param expiredLocks An array of `bytes32` identifiers to be */
/* /// provided so to unexpire locks using this transaction gas push. */
/// @return lockID The `bytes32` value returned as the lock identifier.
/// @dev Function sighash: 0x03aaf306.
function lock(
address _seller,
address _token,
uint80 _amount,
bytes32[] calldata merkleProof,
uint256[] calldata expiredLocks
DT.LockArgs calldata args
) public nonReentrant returns (uint256 lockID) {
unlockExpired(expiredLocks);
unlockExpired(args.expiredLocks);
ERC20 t = ERC20(_token);
if (!getValid(_seller, t)) revert InvalidDeposit();
if (!getValid(args.seller, args.token)) revert InvalidDeposit();
uint256 bal = getBalance(_seller, t);
if (bal < _amount) revert NotEnoughTokens();
uint256 bal = getBalance(args.seller, args.token);
if (bal < args.amount) revert NotEnoughTokens();
uint256 k = _castAddrToKey(_seller);
uint256 cCounter = lockCounter + 1;
uint256 c = lockCounter + 1;
if (
mapLocks[cCounter].expirationBlock >= block.number
mapLocks[c].expirationBlock >= block.number
) revert NotExpired();
address sender; uint256 forwarder;
(sender, forwarder) = _isTrustedForwarder();
bytes32 _pixTarget = getPixTarget(args.seller, args.token);
DT.Lock memory l = DT.Lock(
k,
cCounter,
c,
(block.number + defaultLockBlocks),
getPixTarget(_seller, t),
_amount,
address(t),
sender
_pixTarget,
args.amount,
address(args.token),
sender,
args.seller
);
// transaction forwarding must leave `merkleProof` empty;
// otherwise, the trustedForwarder must be previously added
// to a seller whitelist.
if (merkleProof.length != 0) {
_merkleVerify(merkleProof, sellerAllowList(k), sender);
lockID = _addLock(bal, _amount, cCounter, l, t, k);
if (args.merkleProof.length != 0) {
_merkleVerify(args.merkleProof, sellerAllowList(args.seller), sender);
lockID = _addLock(bal, l);
} else {
if (l.amount <= REPUTATION_LOWERBOUND) {
lockID = _addLock(bal, _amount, cCounter, l, t, k);
lockID = _addLock(bal, l);
} else {
if (forwarder != 0) {
lockID = _addLock(bal, _amount, cCounter, l, t, k);
lockID = _addLock(bal, l);
} else {
uint256 userCredit = userRecord[_castAddrToKey(msg.sender)];
uint256 spendLimit; (spendLimit) = _limiter(userCredit / WAD);
uint256 spendLimit; uint256 userCredit =
userRecord[_castAddrToKey(msg.sender)];
(spendLimit) = _limiter(userCredit / WAD);
if (
l.amount > (spendLimit * WAD) ||
l.amount > LOCKAMOUNT_UPPERBOUND
) revert AmountNotAllowed();
lockID = _addLock(bal, _amount, cCounter, l, t, k);
lockID = _addLock(bal, l);
/* */}/* */}/* */}
}
@ -285,12 +275,12 @@ contract P2PIX is BaseUtils {
_notExpired(l);
uint256 _sellerBalance =
__sellerBalance(l.sellerKey, ERC20(l.token)) & BITMASK_SB_ENTRY;
__sellerBalance(l.seller, ERC20(l.token)) & BITMASK_SB_ENTRY;
if ((_sellerBalance + l.amount) > MAXBALANCE_UPPERBOUND)
revert MaxBalExceeded();
_addSellerBalance(l.sellerKey, ERC20(l.token), l.amount);
_addSellerBalance(l.seller, ERC20(l.token), l.amount);
l.amount = 0;
@ -335,12 +325,11 @@ contract P2PIX is BaseUtils {
if (getValid(msg.sender, token))
setValidState(token, false);
uint256 key = _castAddrToKey(msg.sender);
_decBal(
(__sellerBalance(key, token) & BITMASK_SB_ENTRY),
(__sellerBalance(msg.sender, token) & BITMASK_SB_ENTRY),
amount,
token,
key
msg.sender
);
// safeTransfer tokens to seller
@ -400,22 +389,18 @@ contract P2PIX is BaseUtils {
function _addLock(
uint256 _bal,
uint256 _amount,
uint256 _lockID,
DT.Lock memory _l,
ERC20 _t,
uint256 _k
DT.Lock memory _l
) internal returns(uint256 counter){
mapLocks[_lockID] = _l;
mapLocks[_l.counter] = _l;
_decBal(_bal, _amount, _t, _k);
_decBal(_bal, _l.amount, ERC20(_l.token), _l.seller);
++lockCounter;
counter = _lockID;
counter = _l.counter;
emit LockAdded(
_l.buyerAddress,
_lockID,
_l.sellerKey,
_l.counter,
_l.seller,
_l.amount
);
}
@ -424,7 +409,7 @@ contract P2PIX is BaseUtils {
uint256 _bal,
uint256 _amount,
ERC20 _t,
uint256 _k
address _k
) private {
assembly {
if iszero(
@ -561,7 +546,7 @@ contract P2PIX is BaseUtils {
);
unchecked {
for (c; c < len; ) {
if (mapLocks[ids[c]].sellerKey == 0x0) {
if (mapLocks[ids[c]].seller == address(0)) {
sortedIDs[c] = ids[c];
status[c] = type(DT.LockStatus).min;
++c;

2
scripts/1-deploy-mockToken.ts
View File

@ -5,7 +5,7 @@ import * as fs from "fs";
import { ethers, network } from "hardhat";
import hre from "hardhat";
import { Deploys } from "../test/utils/fixtures";
import { Deploys } from "../test/utils/interfaces";
let deploysJson: Deploys;
const supply: BigNumber = ethers.utils.parseEther("20000000");

2
scripts/2-deploy-p2pix.ts
View File

@ -4,7 +4,7 @@ import * as fs from "fs";
import { ethers, network } from "hardhat";
import hre from "hardhat";
import { Deploys } from "../test/utils/fixtures";
import { Deploys } from "../test/utils/interfaces";
let deploysJson: Deploys;

2
scripts/setDefaultBlocks.ts
View File

@ -2,7 +2,7 @@ import "@nomiclabs/hardhat-ethers";
import "@nomiclabs/hardhat-etherscan";
import * as fs from "fs";
import { ethers, network } from "hardhat";
import { Deploys } from "../test/utils/fixtures";
import { Deploys } from "../test/utils/interfaces";
import { P2PIX__factory } from "../src/types";
let deploysJson: Deploys;

22
src/types/core/BaseUtils.ts
View File

@ -37,7 +37,7 @@ export interface BaseUtilsInterface extends utils.Interface {
"isTrustedForwarder(address)": FunctionFragment;
"owner()": FunctionFragment;
"reputation()": FunctionFragment;
"sellerAllowList(uint256)": FunctionFragment;
"sellerAllowList(address)": FunctionFragment;
"setDefaultLockBlocks(uint256)": FunctionFragment;
"setOwner(address)": FunctionFragment;
"setReputation(address)": FunctionFragment;
@ -102,7 +102,7 @@ export interface BaseUtilsInterface extends utils.Interface {
): string;
encodeFunctionData(
functionFragment: "sellerAllowList",
values: [PromiseOrValue<BigNumberish>]
values: [PromiseOrValue<string>]
): string;
encodeFunctionData(
functionFragment: "setDefaultLockBlocks",
@ -207,7 +207,7 @@ export interface BaseUtilsInterface extends utils.Interface {
"DepositAdded(address,address,uint256)": EventFragment;
"DepositWithdrawn(address,address,uint256)": EventFragment;
"FundsWithdrawn(address,uint256)": EventFragment;
"LockAdded(address,uint256,uint256,uint256)": EventFragment;
"LockAdded(address,uint256,address,uint256)": EventFragment;
"LockBlocksUpdated(uint256)": EventFragment;
"LockReleased(address,uint256,uint256)": EventFragment;
"LockReturned(address,uint256)": EventFragment;
@ -286,11 +286,11 @@ export type FundsWithdrawnEventFilter = TypedEventFilter<FundsWithdrawnEvent>;
export interface LockAddedEventObject {
buyer: string;
lockID: BigNumber;
seller: BigNumber;
seller: string;
amount: BigNumber;
}
export type LockAddedEvent = TypedEvent<
[string, BigNumber, BigNumber, BigNumber],
[string, BigNumber, string, BigNumber],
LockAddedEventObject
>;
@ -457,7 +457,7 @@ export interface BaseUtils extends BaseContract {
reputation(overrides?: CallOverrides): Promise<[string]>;
sellerAllowList(
sellerKey: PromiseOrValue<BigNumberish>,
sellerKey: PromiseOrValue<string>,
overrides?: CallOverrides
): Promise<[string] & { root: string }>;
@ -540,7 +540,7 @@ export interface BaseUtils extends BaseContract {
reputation(overrides?: CallOverrides): Promise<string>;
sellerAllowList(
sellerKey: PromiseOrValue<BigNumberish>,
sellerKey: PromiseOrValue<string>,
overrides?: CallOverrides
): Promise<string>;
@ -623,7 +623,7 @@ export interface BaseUtils extends BaseContract {
reputation(overrides?: CallOverrides): Promise<string>;
sellerAllowList(
sellerKey: PromiseOrValue<BigNumberish>,
sellerKey: PromiseOrValue<string>,
overrides?: CallOverrides
): Promise<string>;
@ -710,7 +710,7 @@ export interface BaseUtils extends BaseContract {
): FundsWithdrawnEventFilter;
FundsWithdrawn(owner?: null, amount?: null): FundsWithdrawnEventFilter;
"LockAdded(address,uint256,uint256,uint256)"(
"LockAdded(address,uint256,address,uint256)"(
buyer?: PromiseOrValue<string> | null,
lockID?: PromiseOrValue<BigNumberish> | null,
seller?: null,
@ -828,7 +828,7 @@ export interface BaseUtils extends BaseContract {
reputation(overrides?: CallOverrides): Promise<BigNumber>;
sellerAllowList(
sellerKey: PromiseOrValue<BigNumberish>,
sellerKey: PromiseOrValue<string>,
overrides?: CallOverrides
): Promise<BigNumber>;
@ -912,7 +912,7 @@ export interface BaseUtils extends BaseContract {
reputation(overrides?: CallOverrides): Promise<PopulatedTransaction>;
sellerAllowList(
sellerKey: PromiseOrValue<BigNumberish>,
sellerKey: PromiseOrValue<string>,
overrides?: CallOverrides
): Promise<PopulatedTransaction>;

8
src/types/core/EventAndErrors.ts
View File

@ -27,7 +27,7 @@ export interface EventAndErrorsInterface extends utils.Interface {
"DepositAdded(address,address,uint256)": EventFragment;
"DepositWithdrawn(address,address,uint256)": EventFragment;
"FundsWithdrawn(address,uint256)": EventFragment;
"LockAdded(address,uint256,uint256,uint256)": EventFragment;
"LockAdded(address,uint256,address,uint256)": EventFragment;
"LockBlocksUpdated(uint256)": EventFragment;
"LockReleased(address,uint256,uint256)": EventFragment;
"LockReturned(address,uint256)": EventFragment;
@ -104,11 +104,11 @@ export type FundsWithdrawnEventFilter = TypedEventFilter<FundsWithdrawnEvent>;
export interface LockAddedEventObject {
buyer: string;
lockID: BigNumber;
seller: BigNumber;
seller: string;
amount: BigNumber;
}
export type LockAddedEvent = TypedEvent<
[string, BigNumber, BigNumber, BigNumber],
[string, BigNumber, string, BigNumber],
LockAddedEventObject
>;
@ -273,7 +273,7 @@ export interface EventAndErrors extends BaseContract {
): FundsWithdrawnEventFilter;
FundsWithdrawn(owner?: null, amount?: null): FundsWithdrawnEventFilter;
"LockAdded(address,uint256,uint256,uint256)"(
"LockAdded(address,uint256,address,uint256)"(
buyer?: PromiseOrValue<string> | null,
lockID?: PromiseOrValue<BigNumberish> | null,
seller?: null,

22
src/types/core/OwnerSettings.ts
View File

@ -34,7 +34,7 @@ export interface OwnerSettingsInterface extends utils.Interface {
"isTrustedForwarder(address)": FunctionFragment;
"owner()": FunctionFragment;
"reputation()": FunctionFragment;
"sellerAllowList(uint256)": FunctionFragment;
"sellerAllowList(address)": FunctionFragment;
"setDefaultLockBlocks(uint256)": FunctionFragment;
"setOwner(address)": FunctionFragment;
"setReputation(address)": FunctionFragment;
@ -82,7 +82,7 @@ export interface OwnerSettingsInterface extends utils.Interface {
): string;
encodeFunctionData(
functionFragment: "sellerAllowList",
values: [PromiseOrValue<BigNumberish>]
values: [PromiseOrValue<string>]
): string;
encodeFunctionData(
functionFragment: "setDefaultLockBlocks",
@ -170,7 +170,7 @@ export interface OwnerSettingsInterface extends utils.Interface {
"DepositAdded(address,address,uint256)": EventFragment;
"DepositWithdrawn(address,address,uint256)": EventFragment;
"FundsWithdrawn(address,uint256)": EventFragment;
"LockAdded(address,uint256,uint256,uint256)": EventFragment;
"LockAdded(address,uint256,address,uint256)": EventFragment;
"LockBlocksUpdated(uint256)": EventFragment;
"LockReleased(address,uint256,uint256)": EventFragment;
"LockReturned(address,uint256)": EventFragment;
@ -249,11 +249,11 @@ export type FundsWithdrawnEventFilter = TypedEventFilter<FundsWithdrawnEvent>;
export interface LockAddedEventObject {
buyer: string;
lockID: BigNumber;
seller: BigNumber;
seller: string;
amount: BigNumber;
}
export type LockAddedEvent = TypedEvent<
[string, BigNumber, BigNumber, BigNumber],
[string, BigNumber, string, BigNumber],
LockAddedEventObject
>;
@ -405,7 +405,7 @@ export interface OwnerSettings extends BaseContract {
reputation(overrides?: CallOverrides): Promise<[string]>;
sellerAllowList(
sellerKey: PromiseOrValue<BigNumberish>,
sellerKey: PromiseOrValue<string>,
overrides?: CallOverrides
): Promise<[string] & { root: string }>;
@ -468,7 +468,7 @@ export interface OwnerSettings extends BaseContract {
reputation(overrides?: CallOverrides): Promise<string>;
sellerAllowList(
sellerKey: PromiseOrValue<BigNumberish>,
sellerKey: PromiseOrValue<string>,
overrides?: CallOverrides
): Promise<string>;
@ -531,7 +531,7 @@ export interface OwnerSettings extends BaseContract {
reputation(overrides?: CallOverrides): Promise<string>;
sellerAllowList(
sellerKey: PromiseOrValue<BigNumberish>,
sellerKey: PromiseOrValue<string>,
overrides?: CallOverrides
): Promise<string>;
@ -613,7 +613,7 @@ export interface OwnerSettings extends BaseContract {
): FundsWithdrawnEventFilter;
FundsWithdrawn(owner?: null, amount?: null): FundsWithdrawnEventFilter;
"LockAdded(address,uint256,uint256,uint256)"(
"LockAdded(address,uint256,address,uint256)"(
buyer?: PromiseOrValue<string> | null,
lockID?: PromiseOrValue<BigNumberish> | null,
seller?: null,
@ -716,7 +716,7 @@ export interface OwnerSettings extends BaseContract {
reputation(overrides?: CallOverrides): Promise<BigNumber>;
sellerAllowList(
sellerKey: PromiseOrValue<BigNumberish>,
sellerKey: PromiseOrValue<string>,
overrides?: CallOverrides
): Promise<BigNumber>;
@ -780,7 +780,7 @@ export interface OwnerSettings extends BaseContract {
reputation(overrides?: CallOverrides): Promise<PopulatedTransaction>;
sellerAllowList(
sellerKey: PromiseOrValue<BigNumberish>,
sellerKey: PromiseOrValue<string>,
overrides?: CallOverrides
): Promise<PopulatedTransaction>;

8
src/types/factories/core/BaseUtils__factory.ts
View File

@ -217,9 +217,9 @@ const _abi = [
},
{
indexed: false,
internalType: "uint256",
internalType: "address",
name: "seller",
type: "uint256",
type: "address",
},
{
indexed: false,
@ -533,9 +533,9 @@ const _abi = [
{
inputs: [
{
internalType: "uint256",
internalType: "address",
name: "sellerKey",
type: "uint256",
type: "address",
},
],
name: "sellerAllowList",

4
src/types/factories/core/EventAndErrors__factory.ts
View File

@ -210,9 +210,9 @@ const _abi = [
},
{
indexed: false,
internalType: "uint256",
internalType: "address",
name: "seller",
type: "uint256",
type: "address",
},
{
indexed: false,

8
src/types/factories/core/OwnerSettings__factory.ts
View File

@ -215,9 +215,9 @@ const _abi = [
},
{
indexed: false,
internalType: "uint256",
internalType: "address",
name: "seller",
type: "uint256",
type: "address",
},
{
indexed: false,
@ -474,9 +474,9 @@ const _abi = [
{
inputs: [
{
internalType: "uint256",
internalType: "address",
name: "sellerKey",
type: "uint256",
type: "address",
},
],
name: "sellerAllowList",

126
src/types/factories/p2pix.sol/P2PIX__factory.ts
View File

File diff suppressed because one or more lines are too long

160
src/types/p2pix.sol/P2PIX.ts
View File

@ -27,13 +27,59 @@ import type {
PromiseOrValue,
} from "../common";
export declare namespace DataTypes {
export type DepositArgsStruct = {
pixTarget: PromiseOrValue<string>;
allowlistRoot: PromiseOrValue<BytesLike>;
token: PromiseOrValue<string>;
amount: PromiseOrValue<BigNumberish>;
valid: PromiseOrValue<boolean>;
};
export type DepositArgsStructOutput = [
string,
string,
string,
BigNumber,
boolean
] & {
pixTarget: string;
allowlistRoot: string;
token: string;
amount: BigNumber;
valid: boolean;
};
export type LockArgsStruct = {
seller: PromiseOrValue<string>;
token: PromiseOrValue<string>;
amount: PromiseOrValue<BigNumberish>;
merkleProof: PromiseOrValue<BytesLike>[];
expiredLocks: PromiseOrValue<BigNumberish>[];
};
export type LockArgsStructOutput = [
string,
string,
BigNumber,
string[],
BigNumber[]
] & {
seller: string;
token: string;
amount: BigNumber;
merkleProof: string[];
expiredLocks: BigNumber[];
};
}
export interface P2PIXInterface extends utils.Interface {
functions: {
"_castAddrToKey(address)": FunctionFragment;
"_castKeyToAddr(uint256)": FunctionFragment;
"allowedERC20s(address)": FunctionFragment;
"defaultLockBlocks()": FunctionFragment;
"deposit(address,uint96,string,bool,bytes32)": FunctionFragment;
"deposit((string,bytes32,address,uint96,bool))": FunctionFragment;
"getBalance(address,address)": FunctionFragment;
"getBalances(address[],address)": FunctionFragment;
"getLocksStatus(uint256[])": FunctionFragment;
@ -42,13 +88,13 @@ export interface P2PIXInterface extends utils.Interface {
"getStr(string)": FunctionFragment;
"getValid(address,address)": FunctionFragment;
"isTrustedForwarder(address)": FunctionFragment;
"lock(address,address,uint80,bytes32[],uint256[])": FunctionFragment;
"lock((address,address,uint80,bytes32[],uint256[]))": FunctionFragment;
"lockCounter()": FunctionFragment;
"mapLocks(uint256)": FunctionFragment;
"owner()": FunctionFragment;
"release(uint256,bytes32,bytes32,bytes32,uint8)": FunctionFragment;
"reputation()": FunctionFragment;
"sellerAllowList(uint256)": FunctionFragment;
"sellerAllowList(address)": FunctionFragment;
"setDefaultLockBlocks(uint256)": FunctionFragment;
"setOwner(address)": FunctionFragment;
"setReputation(address)": FunctionFragment;
@ -121,13 +167,7 @@ export interface P2PIXInterface extends utils.Interface {
): string;
encodeFunctionData(
functionFragment: "deposit",
values: [
PromiseOrValue<string>,
PromiseOrValue<BigNumberish>,
PromiseOrValue<string>,
PromiseOrValue<boolean>,
PromiseOrValue<BytesLike>
]
values: [DataTypes.DepositArgsStruct]
): string;
encodeFunctionData(
functionFragment: "getBalance",
@ -163,13 +203,7 @@ export interface P2PIXInterface extends utils.Interface {
): string;
encodeFunctionData(
functionFragment: "lock",
values: [
PromiseOrValue<string>,
PromiseOrValue<string>,
PromiseOrValue<BigNumberish>,
PromiseOrValue<BytesLike>[],
PromiseOrValue<BigNumberish>[]
]
values: [DataTypes.LockArgsStruct]
): string;
encodeFunctionData(
functionFragment: "lockCounter",
@ -196,7 +230,7 @@ export interface P2PIXInterface extends utils.Interface {
): string;
encodeFunctionData(
functionFragment: "sellerAllowList",
values: [PromiseOrValue<BigNumberish>]
values: [PromiseOrValue<string>]
): string;
encodeFunctionData(
functionFragment: "setDefaultLockBlocks",
@ -362,7 +396,7 @@ export interface P2PIXInterface extends utils.Interface {
"DepositAdded(address,address,uint256)": EventFragment;
"DepositWithdrawn(address,address,uint256)": EventFragment;
"FundsWithdrawn(address,uint256)": EventFragment;
"LockAdded(address,uint256,uint256,uint256)": EventFragment;
"LockAdded(address,uint256,address,uint256)": EventFragment;
"LockBlocksUpdated(uint256)": EventFragment;
"LockReleased(address,uint256,uint256)": EventFragment;
"LockReturned(address,uint256)": EventFragment;
@ -441,11 +475,11 @@ export type FundsWithdrawnEventFilter = TypedEventFilter<FundsWithdrawnEvent>;
export interface LockAddedEventObject {
buyer: string;
lockID: BigNumber;
seller: BigNumber;
seller: string;
amount: BigNumber;
}
export type LockAddedEvent = TypedEvent<
[string, BigNumber, BigNumber, BigNumber],
[string, BigNumber, string, BigNumber],
LockAddedEventObject
>;
@ -598,11 +632,7 @@ export interface P2PIX extends BaseContract {
defaultLockBlocks(overrides?: CallOverrides): Promise<[BigNumber]>;
deposit(
_token: PromiseOrValue<string>,
_amount: PromiseOrValue<BigNumberish>,
_pixTarget: PromiseOrValue<string>,
_valid: PromiseOrValue<boolean>,
allowlistRoot: PromiseOrValue<BytesLike>,
args: DataTypes.DepositArgsStruct,
overrides?: Overrides & { from?: PromiseOrValue<string> }
): Promise<ContractTransaction>;
@ -652,11 +682,7 @@ export interface P2PIX extends BaseContract {
): Promise<[boolean]>;
lock(
_seller: PromiseOrValue<string>,
_token: PromiseOrValue<string>,
_amount: PromiseOrValue<BigNumberish>,
merkleProof: PromiseOrValue<BytesLike>[],
expiredLocks: PromiseOrValue<BigNumberish>[],
args: DataTypes.LockArgsStruct,
overrides?: Overrides & { from?: PromiseOrValue<string> }
): Promise<ContractTransaction>;
@ -666,14 +692,14 @@ export interface P2PIX extends BaseContract {
arg0: PromiseOrValue<BigNumberish>,
overrides?: CallOverrides
): Promise<
[BigNumber, BigNumber, BigNumber, string, BigNumber, string, string] & {
sellerKey: BigNumber;
[BigNumber, BigNumber, string, BigNumber, string, string, string] & {
counter: BigNumber;
expirationBlock: BigNumber;
pixTarget: string;
amount: BigNumber;
token: string;
buyerAddress: string;
seller: string;
}
>;
@ -691,7 +717,7 @@ export interface P2PIX extends BaseContract {
reputation(overrides?: CallOverrides): Promise<[string]>;
sellerAllowList(
sellerKey: PromiseOrValue<BigNumberish>,
sellerKey: PromiseOrValue<string>,
overrides?: CallOverrides
): Promise<[string] & { root: string }>;
@ -789,11 +815,7 @@ export interface P2PIX extends BaseContract {
defaultLockBlocks(overrides?: CallOverrides): Promise<BigNumber>;
deposit(
_token: PromiseOrValue<string>,
_amount: PromiseOrValue<BigNumberish>,
_pixTarget: PromiseOrValue<string>,
_valid: PromiseOrValue<boolean>,
allowlistRoot: PromiseOrValue<BytesLike>,
args: DataTypes.DepositArgsStruct,
overrides?: Overrides & { from?: PromiseOrValue<string> }
): Promise<ContractTransaction>;
@ -843,11 +865,7 @@ export interface P2PIX extends BaseContract {
): Promise<boolean>;
lock(
_seller: PromiseOrValue<string>,
_token: PromiseOrValue<string>,
_amount: PromiseOrValue<BigNumberish>,
merkleProof: PromiseOrValue<BytesLike>[],
expiredLocks: PromiseOrValue<BigNumberish>[],
args: DataTypes.LockArgsStruct,
overrides?: Overrides & { from?: PromiseOrValue<string> }
): Promise<ContractTransaction>;
@ -857,14 +875,14 @@ export interface P2PIX extends BaseContract {
arg0: PromiseOrValue<BigNumberish>,
overrides?: CallOverrides
): Promise<
[BigNumber, BigNumber, BigNumber, string, BigNumber, string, string] & {
sellerKey: BigNumber;
[BigNumber, BigNumber, string, BigNumber, string, string, string] & {
counter: BigNumber;
expirationBlock: BigNumber;
pixTarget: string;
amount: BigNumber;
token: string;
buyerAddress: string;
seller: string;
}
>;
@ -882,7 +900,7 @@ export interface P2PIX extends BaseContract {
reputation(overrides?: CallOverrides): Promise<string>;
sellerAllowList(
sellerKey: PromiseOrValue<BigNumberish>,
sellerKey: PromiseOrValue<string>,
overrides?: CallOverrides
): Promise<string>;
@ -980,11 +998,7 @@ export interface P2PIX extends BaseContract {
defaultLockBlocks(overrides?: CallOverrides): Promise<BigNumber>;
deposit(
_token: PromiseOrValue<string>,
_amount: PromiseOrValue<BigNumberish>,
_pixTarget: PromiseOrValue<string>,
_valid: PromiseOrValue<boolean>,
allowlistRoot: PromiseOrValue<BytesLike>,
args: DataTypes.DepositArgsStruct,
overrides?: CallOverrides
): Promise<void>;
@ -1034,11 +1048,7 @@ export interface P2PIX extends BaseContract {
): Promise<boolean>;
lock(
_seller: PromiseOrValue<string>,
_token: PromiseOrValue<string>,
_amount: PromiseOrValue<BigNumberish>,
merkleProof: PromiseOrValue<BytesLike>[],
expiredLocks: PromiseOrValue<BigNumberish>[],
args: DataTypes.LockArgsStruct,
overrides?: CallOverrides
): Promise<BigNumber>;
@ -1048,14 +1058,14 @@ export interface P2PIX extends BaseContract {
arg0: PromiseOrValue<BigNumberish>,
overrides?: CallOverrides
): Promise<
[BigNumber, BigNumber, BigNumber, string, BigNumber, string, string] & {
sellerKey: BigNumber;
[BigNumber, BigNumber, string, BigNumber, string, string, string] & {
counter: BigNumber;
expirationBlock: BigNumber;
pixTarget: string;
amount: BigNumber;
token: string;
buyerAddress: string;
seller: string;
}
>;
@ -1073,7 +1083,7 @@ export interface P2PIX extends BaseContract {
reputation(overrides?: CallOverrides): Promise<string>;
sellerAllowList(
sellerKey: PromiseOrValue<BigNumberish>,
sellerKey: PromiseOrValue<string>,
overrides?: CallOverrides
): Promise<string>;
@ -1189,7 +1199,7 @@ export interface P2PIX extends BaseContract {
): FundsWithdrawnEventFilter;
FundsWithdrawn(owner?: null, amount?: null): FundsWithdrawnEventFilter;
"LockAdded(address,uint256,uint256,uint256)"(
"LockAdded(address,uint256,address,uint256)"(
buyer?: PromiseOrValue<string> | null,
lockID?: PromiseOrValue<BigNumberish> | null,
seller?: null,
@ -1293,11 +1303,7 @@ export interface P2PIX extends BaseContract {
defaultLockBlocks(overrides?: CallOverrides): Promise<BigNumber>;
deposit(
_token: PromiseOrValue<string>,
_amount: PromiseOrValue<BigNumberish>,
_pixTarget: PromiseOrValue<string>,
_valid: PromiseOrValue<boolean>,
allowlistRoot: PromiseOrValue<BytesLike>,
args: DataTypes.DepositArgsStruct,
overrides?: Overrides & { from?: PromiseOrValue<string> }
): Promise<BigNumber>;
@ -1347,11 +1353,7 @@ export interface P2PIX extends BaseContract {
): Promise<BigNumber>;
lock(
_seller: PromiseOrValue<string>,
_token: PromiseOrValue<string>,
_amount: PromiseOrValue<BigNumberish>,
merkleProof: PromiseOrValue<BytesLike>[],
expiredLocks: PromiseOrValue<BigNumberish>[],
args: DataTypes.LockArgsStruct,
overrides?: Overrides & { from?: PromiseOrValue<string> }
): Promise<BigNumber>;
@ -1376,7 +1378,7 @@ export interface P2PIX extends BaseContract {
reputation(overrides?: CallOverrides): Promise<BigNumber>;
sellerAllowList(
sellerKey: PromiseOrValue<BigNumberish>,
sellerKey: PromiseOrValue<string>,
overrides?: CallOverrides
): Promise<BigNumber>;
@ -1475,11 +1477,7 @@ export interface P2PIX extends BaseContract {
defaultLockBlocks(overrides?: CallOverrides): Promise<PopulatedTransaction>;
deposit(
_token: PromiseOrValue<string>,
_amount: PromiseOrValue<BigNumberish>,
_pixTarget: PromiseOrValue<string>,
_valid: PromiseOrValue<boolean>,
allowlistRoot: PromiseOrValue<BytesLike>,
args: DataTypes.DepositArgsStruct,
overrides?: Overrides & { from?: PromiseOrValue<string> }
): Promise<PopulatedTransaction>;
@ -1529,11 +1527,7 @@ export interface P2PIX extends BaseContract {
): Promise<PopulatedTransaction>;
lock(
_seller: PromiseOrValue<string>,
_token: PromiseOrValue<string>,
_amount: PromiseOrValue<BigNumberish>,
merkleProof: PromiseOrValue<BytesLike>[],
expiredLocks: PromiseOrValue<BigNumberish>[],
args: DataTypes.LockArgsStruct,
overrides?: Overrides & { from?: PromiseOrValue<string> }
): Promise<PopulatedTransaction>;
@ -1558,7 +1552,7 @@ export interface P2PIX extends BaseContract {
reputation(overrides?: CallOverrides): Promise<PopulatedTransaction>;
sellerAllowList(
sellerKey: PromiseOrValue<BigNumberish>,
sellerKey: PromiseOrValue<string>,
overrides?: CallOverrides
): Promise<PopulatedTransaction>;

843
test/p2pix.test.ts
View File

File diff suppressed because it is too large Load Diff

61
test/utils/fixtures.ts
View File

@ -12,53 +12,26 @@ import {
Reputation,
} from "../../src/types";
// exported interfaces
export interface Deploys {
signers: string[];
p2pix: string;
token: string;
}
import { Call, RepFixture, P2PixAndReputation, DepositArgs, LockArgs } from "./interfaces";
export interface Lock {
sellerKey: BigNumber;
counter: BigNumber;
expirationBlock: BigNumber;
pixTarget: string;
token: string;
buyerAddress: string;
amount: BigNumber;
}
export interface Call {
target: string;
callData: string;
}
export interface Result {
success: boolean;
returnData: string;
}
export interface P2pixFixture {
p2pix: P2PIX;
erc20: MockToken;
proof: string[];
merkleRoot: string;
}
export interface RepFixture {
reputation: Reputation;
}
export interface MtcFixture {
multicall: Multicall;
}
type P2PixAndReputation = P2pixFixture &
RepFixture &
MtcFixture;
// 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 getSignerAddrs = (
amount: number,
addrs: SignerWithAddress[],

71
test/utils/interfaces.ts Normal file
View File

@ -0,0 +1,71 @@
import { BigNumber } from "ethers";
import {
MockToken,
Multicall,
P2PIX,
Reputation,
} from "../../src/types";
// exported interfaces
export interface Deploys {
signers: string[];
p2pix: string;
token: string;
}
export interface DepositArgs {
pixTarget: string;
allowlistRoot: string;
token: string;
amount: BigNumber;
valid: boolean;
}
export interface LockArgs {
seller: string;
token: string;
amount: BigNumber;
merkleProof: string[];
expiredLocks: BigNumber[];
}
export interface Lock {
counter: BigNumber;
expirationBlock: BigNumber;
pixTarget: string;
amount: BigNumber;
token: string;
buyerAddress: string;
seller: string;
}
export interface Call {
target: string;
callData: string;
}
export interface Result {
success: boolean;
returnData: string;
}
export interface P2pixFixture {
p2pix: P2PIX;
erc20: MockToken;
proof: string[];
merkleRoot: string;
}
export interface RepFixture {
reputation: Reputation;
}
export interface MtcFixture {
multicall: Multicall;
}
export type P2PixAndReputation = P2pixFixture &
RepFixture &
MtcFixture;