Compare commits
4 Commits
4c8eb63c38
...
655cec97e0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
655cec97e0 | ||
|
|
80b197ab87 | ||
|
|
691c84bbbc | ||
|
|
6f873785aa |
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"_format": "hh-sol-dbg-1",
|
||||
"buildInfo": "../../build-info/eceac9979aa58fac0d83cf0060ae7a91.json"
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
@@ -150,12 +150,10 @@ contract P2PIX is BaseUtils {
|
||||
uint256 bal = getBalance(args.seller, args.token);
|
||||
if (bal < args.amount) revert NotEnoughTokens();
|
||||
|
||||
unchecked {
|
||||
lockID = ++lockCounter;
|
||||
}
|
||||
uint256 c = lockCounter + 1;
|
||||
|
||||
if (
|
||||
mapLocks[lockID].expirationBlock >= block.number
|
||||
mapLocks[c].expirationBlock >= block.number
|
||||
) revert NotExpired();
|
||||
|
||||
address sender; uint256 forwarder;
|
||||
@@ -180,7 +178,7 @@ contract P2PIX is BaseUtils {
|
||||
}
|
||||
|
||||
DT.Lock memory l = DT.Lock(
|
||||
lockID,
|
||||
c,
|
||||
(block.number + defaultLockBlocks),
|
||||
_pixTarget,
|
||||
args.amount,
|
||||
@@ -385,10 +383,12 @@ contract P2PIX is BaseUtils {
|
||||
function _addLock(
|
||||
uint256 _bal,
|
||||
DT.Lock memory _l
|
||||
) internal {
|
||||
) internal returns(uint256 counter){
|
||||
mapLocks[_l.counter] = _l;
|
||||
|
||||
_decBal(_bal, _l.amount, ERC20(_l.token), _l.seller);
|
||||
++lockCounter;
|
||||
counter = _l.counter;
|
||||
|
||||
emit LockAdded(
|
||||
_l.buyerAddress,
|
||||
|
||||
Reference in New Issue
Block a user