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

Compare commits

base: hueso:fd7c84f20a041453bbeb6dfca6e76e12f5b3614f
Branches Tags
hueso:dev
hueso:feature_bonds
hueso:hueso
hueso:main
hueso:codespaces
..
compare: hueso:2596b58e76fdf1de38e79dd1d3076f1153a53eed
Branches Tags
hueso:dev
hueso:feature_bonds
hueso:hueso
hueso:main
hueso:codespaces

2 Commits
fd7c84f20a ... 2596b58e76

Author SHA1 Message Date
hueso
2596b58e76 use ERC20 datatype 2023-05-22 02:13:41 -03:00
hueso
9c15bfb38c revamped lock() conditionals 2023-05-22 02:12:25 -03:00
1 changed files with 4 additions and 1 deletions
Show Stats Expand all files Collapse all files

5
contracts/p2pix.sol
View File

@ -167,8 +167,11 @@ contract P2PIX is BaseUtils {
address sender; uint256 forwarder; address sender; uint256 forwarder;
(sender, forwarder) = _isTrustedForwarder(); (sender, forwarder) = _isTrustedForwarder();
// transaction forwarding must leave `merkleProof` empty;
// otherwise, the trustedForwarder must be previously added
// to a seller whitelist.
if (merkleProof.length != 0) { if (merkleProof.length != 0) {
_merkleVerify( merkleProof, sellerAllowList(k), msg.sender); _merkleVerify( merkleProof, sellerAllowList(k), sender);
} else if (_amount > REPUTATION_LOWERBOUND && forwarder == 0) { } else if (_amount > REPUTATION_LOWERBOUND && forwarder == 0) {