Skip to content
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

Jump to bottom

feat (uniswapv3): Add liquidity gross to batch sync #203

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

feat (uniswapv3): Add liquidity gross to batch sync #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c2487b2
Original
PlamenHristov Aug 10, 2024
791751e
Added liquidityGross to the batch tick sync
PlamenHristov Aug 19, 2024
5e3aee5
Added missing liquidity gross field
PlamenHristov Aug 19, 2024
f2deb76
Formatted
PlamenHristov Aug 19, 2024
8f4039c
Improved batch tick loading
PlamenHristov Aug 24, 2024
5bc101a
Added missing comment
PlamenHristov Aug 24, 2024
e3ae5b7
Removed unnecessary clone
PlamenHristov Aug 24, 2024
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
18 changes: 16 additions & 2 deletions contracts/src/GetUniswapV3TickDataBatchRequest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,15 @@ contract GetUniswapV3TickDataBatchRequest {
struct TickData {
bool initialized;
int24 tick;
uint128 liquidityGross;
int128 liquidityNet;
}

struct TicksWithBlock {
TickData[] ticks;
uint256 blockNumber;
}

constructor(
address pool,
bool zeroForOne,
Expand All @@ -40,7 +46,7 @@ contract GetUniswapV3TickDataBatchRequest {
);

//Make sure the next tick is initialized
(, int128 liquidityNet, , , , , , ) = IUniswapV3PoolState(pool)
(uint128 liquidityGross, int128 liquidityNet, , , , , , ) = IUniswapV3PoolState(pool)
.ticks(nextTick);

//Make sure not to overshoot the max/min tick
Expand All @@ -49,17 +55,20 @@ contract GetUniswapV3TickDataBatchRequest {
nextTick = MIN_TICK;
tickData[counter].initialized = initialized;
tickData[counter].tick = nextTick;
tickData[counter].liquidityGross = liquidityGross;
tickData[counter].liquidityNet = liquidityNet;
break;
} else if (nextTick > MAX_TICK) {
nextTick = MIN_TICK;
tickData[counter].initialized = initialized;
tickData[counter].tick = nextTick;
tickData[counter].liquidityGross = liquidityGross;
tickData[counter].liquidityNet = liquidityNet;
break;
} else {
tickData[counter].initialized = initialized;
tickData[counter].tick = nextTick;
tickData[counter].liquidityGross = liquidityGross;
tickData[counter].liquidityNet = liquidityNet;
}

Expand All @@ -69,9 +78,14 @@ contract GetUniswapV3TickDataBatchRequest {
currentTick = zeroForOne ? nextTick - 1 : nextTick;
}

TicksWithBlock memory ticksWithBlock = TicksWithBlock({
ticks: tickData,
blockNumber: block.number
});

// ensure abi encoding, not needed here but increase reusability for different return types
// note: abi.encode add a first 32 bytes word with the address of the original data
bytes memory abiEncodedData = abi.encode(tickData, block.number);
bytes memory abiEncodedData = abi.encode(ticksWithBlock);

assembly {
// Return from the start of the data (discarding the original data address)
Expand Down
Loading