Skip to content

update function getLiquidityInPipRange #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DesertEaglePosition wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

update function getLiquidityInPipRange #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85a58c1
update function getLiquidityInPipRange
DesertEaglePosition Sep 26, 2022
3c47dd7
update pass test case
DesertEaglePosition Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions contracts/protocol/PositionManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,18 @@ contract PositionManager is

}

function initializePip() external {
// initialize singleSlot.pip
require(!_isInitiatedPip && singleSlot.pip == 0, "initialized");
uint256 _price = priceFeed.getPrice(priceFeedKey);
uint128 _pip = uint128(_price * basisPoint/PRICE_FEED_TOKEN_DIGIT);
singleSlot.pip = _pip;
reserveSnapshots.push(
ReserveSnapshot(_pip, _now(), _blocknumber())
);
_isInitiatedPip = true;
emit ReserveSnapshotted(_pip, _now());
}
// function initializePip() external {
// // initialize singleSlot.pip
// require(!_isInitiatedPip && singleSlot.pip == 0, "initialized");
// uint256 _price = priceFeed.getPrice(priceFeedKey);
// uint128 _pip = uint128(_price * basisPoint/PRICE_FEED_TOKEN_DIGIT);
// singleSlot.pip = _pip;
// reserveSnapshots.push(
// ReserveSnapshot(_pip, _now(), _blocknumber())
// );
// _isInitiatedPip = true;
// emit ReserveSnapshotted(_pip, _now());
// }

function updatePartialFilledOrder(uint128 _pip, uint64 _orderId)
public
Expand Down Expand Up @@ -530,9 +530,10 @@ contract PositionManager is
uint128(_dataLength)
);
allInitializedPips = liquidityBitmap.findAllLiquidityInMultipleWords(
maxWordRangeForMarketOrder,
_fromPip,
_dataLength,
_toHigher
!_toHigher
);
PipLiquidity[] memory allLiquidity = new PipLiquidity[](_dataLength);

Expand Down
157 changes: 119 additions & 38 deletions contracts/protocol/libraries/position/LiquidityBitmap.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,48 +129,98 @@ library LiquidityBitmap {
// find all pip has liquidity in multiple word
function findAllLiquidityInMultipleWords(
mapping(uint128 => uint256) storage _self,
uint128 _maxWords,
uint128 _startPip,
uint256 _dataLength,
bool _toHigher
bool _lte
) internal view returns (uint128[] memory) {
uint128 startWord = _startPip >> 8;
uint128 index = 0;
uint128[] memory allPip = new uint128[](uint128(_dataLength));
if (!_toHigher) {
for (uint128 i = startWord; i >= (startWord > 1000 ? startWord - 1000 : 1); i--) {
if (_self[i] != 0) {
uint128 next;
next = findHasLiquidityInOneWords(
_self,
i < startWord ? 256 * i + 255 : _startPip,
true
);
if (next != 0) {
allPip[index] = next;
index++;
if (index >= _dataLength) break;
}
while (true) {
if (_lte) {
uint128 next;
if (startWord != 0) {
uint128 i = startWord;
for (
i;
i > (startWord < _maxWords ? 0 : startWord - _maxWords);
i--
) {
if (_self[i] != 0) {
next = findHasLiquidityInOneWords(
_self,
next - 1,
i < startWord ? 256 * i + 255 : _startPip,
true
);
if (next != 0 && index <= _dataLength) {
if (next != 0) {
allPip[index] = next;
index++;
if (index >= _dataLength) break;
} else {
break;
_dataLength--;
if (_dataLength == 0) return allPip;
(
allPip,
index,
_dataLength
) = findAllLiquidityInOneWord(
_self,
next,
allPip,
index,
_dataLength,
true
);
}
}
}
if (index == _dataLength) return allPip;
if (i == 0 && _self[0] != 0) {
next = findHasLiquidityInOneWords(_self, 255, true);
if (next != 0) {
allPip[index] = next;
index++;
_dataLength--;
if (_dataLength == 0) return allPip;
(
allPip,
index,
_dataLength
) = findAllLiquidityInOneWord(
_self,
next,
allPip,
index,
_dataLength,
true
);
}
}
} else {
if (_self[startWord] != 0) {
next = findHasLiquidityInOneWords(_self, _startPip, true);
if (next != 0) {
allPip[index] = next;
index++;
_dataLength--;
if (_dataLength == 0) return allPip;
(
allPip,
index,
_dataLength
) = findAllLiquidityInOneWord(
_self,
next,
allPip,
index,
_dataLength,
true
);
}
}
}
} else {
for (uint128 i = startWord; i <= startWord + 1000; i++) {
uint128 i = startWord;
for (i; i < startWord + _maxWords; i++) {
uint128 next;
if (_self[i] != 0) {
uint128 next;
next = findHasLiquidityInOneWords(
_self,
i > startWord ? 256 * i : _startPip,
Expand All @@ -179,30 +229,61 @@ library LiquidityBitmap {
if (next != 0) {
allPip[index] = next;
index++;
if (index >= _dataLength) break;
}
while (true) {
next = findHasLiquidityInOneWords(
_dataLength--;
if (_dataLength == 0) return allPip;
(
allPip,
index,
_dataLength
) = findAllLiquidityInOneWord(
_self,
next + 1,
next,
allPip,
index,
_dataLength,
false
);
if (next != 0 && index <= _dataLength) {
allPip[index] = next;
index++;
if (index >= _dataLength) break;
} else {
break;
}
}
}
}
if (index == _dataLength) return allPip;
}

return allPip;
}

function findAllLiquidityInOneWord(
mapping(uint128 => uint256) storage _self,
uint128 _next,
uint128[] memory _allPip,
uint128 _index,
uint256 _dataLength,
bool _lte
)
internal
view
returns (
uint128[] memory,
uint128,
uint256
)
{
while (_dataLength != 0) {
_next = findHasLiquidityInOneWords(
_self,
_lte ? _next - 1 : _next + 1,
_lte
);
if (_next != 0) {
_allPip[_index] = _next;
_index++;
_dataLength--;
if (_dataLength == 0) return (_allPip, _index, _dataLength);
} else {
break;
}
}
return (_allPip, _index, _dataLength);
}

function hasLiquidity(
mapping(uint128 => uint256) storage _self,
uint128 _pip
Expand Down