dexorder/contract
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mock price fix

Browse Source
This commit is contained in:
Tim Olson
2023-11-13 18:58:50 -04:00
parent 331b9df337
commit 8265665c36
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/MockEnv.sol
View File

@@ -41,7 +41,7 @@ contract MockEnv {
inverted = address(COIN) > address(USD); inverted = address(COIN) > address(USD);
token0 = inverted ? address(USD) : address(COIN); token0 = inverted ? address(USD) : address(COIN);
token1 = inverted ? address(COIN) : address(USD); token1 = inverted ? address(COIN) : address(USD);
uint160 initialPrice = uint160(79228162514264337593543950336000000); // $1.00 uint160 initialPrice = inverted ? uint160(79228162514264337593543950336000000) : uint160(79228162514264337593543); // $1.00
console2.log('if this is the last line before a revert then make sure to run forge with --rpc-url'); console2.log('if this is the last line before a revert then make sure to run forge with --rpc-url');
// if this reverts here make sure Anvil is started and you are running forge with --rpc-url // if this reverts here make sure Anvil is started and you are running forge with --rpc-url
pool = IUniswapV3Pool(nfpm.createAndInitializePoolIfNecessary(token0, token1, fee, initialPrice)); pool = IUniswapV3Pool(nfpm.createAndInitializePoolIfNecessary(token0, token1, fee, initialPrice));
@@ -85,15 +85,15 @@ contract MockEnv {
uint256 amount1 uint256 amount1
) )
{ {
console2.log('stake amounts'); // console2.log('stake amounts');
console2.log(coinAmount); // console2.log(coinAmount);
console2.log(usdAmount); // console2.log(usdAmount);
COIN.mint(address(this), coinAmount); COIN.mint(address(this), coinAmount);
COIN.approve(address(nfpm), coinAmount); COIN.approve(address(nfpm), coinAmount);
console2.log('COIN minted'); // console2.log('COIN minted');
USD.mint(address(this), usdAmount); USD.mint(address(this), usdAmount);
USD.approve(address(nfpm), usdAmount); USD.approve(address(nfpm), usdAmount);
console2.log('USD minted'); // console2.log('USD minted');
// struct MintParams { // struct MintParams {
// address token0; // address token0;
// address token1; // address token1;
@@ -110,9 +110,8 @@ contract MockEnv {
int24 ts = pool.tickSpacing(); int24 ts = pool.tickSpacing();
lower = Util.roundTick(lower, ts); lower = Util.roundTick(lower, ts);
upper = Util.roundTick(upper, ts); upper = Util.roundTick(upper, ts);
(uint256 a0, uint256 a1) = inverted ? (usdAmount, coinAmount) : (coinAmount, usdAmount);
INonfungiblePositionManager.MintParams memory params = INonfungiblePositionManager.MintParams( INonfungiblePositionManager.MintParams memory params = INonfungiblePositionManager.MintParams(
token0, token1, fee, lower, upper, a0, a1, 0, 0, msg.sender, block.timestamp address(COIN), address(USD), fee, lower, upper, coinAmount, usdAmount, 0, 0, msg.sender, block.timestamp
); );
(tokenId, liquidity, amount0, amount1) = nfpm.mint(params); (tokenId, liquidity, amount0, amount1) = nfpm.mint(params);
console2.log('minted'); console2.log('minted');