📜SQMF #126

OnlyForward0613 · 2024-05-08T21:29:48Z

src/strategies/SteerQuickSwapMerklFarmStrategy.sol

+    function _computePositionKey(address owner, int24 bottomTick, int24 topTick) internal pure returns (bytes32 key) {
+        assembly {
+            key := or(shl(24, or(shl(24, owner), and(bottomTick, 0xFFFFFF))), and(topTick, 0xFFFFFF))
+        }
+    }


src/strategies/SteerQuickSwapMerklFarmStrategy.sol

+    function _computePositionKey(address owner, int24 bottomTick, int24 topTick) internal pure returns (bytes32 key) {
+        assembly {
+            key := or(shl(24, or(shl(24, owner), and(bottomTick, 0xFFFFFF))), and(topTick, 0xFFFFFF))
+        }
+    }


src/strategies/SteerQuickSwapMerklFarmStrategy.sol

+    function extra() external pure returns (bytes32) {
+        return CommonLib.bytesToBytes32(abi.encodePacked(bytes3(0x3477ff), bytes3(0x000000)));
+    }


src/strategies/SteerQuickSwapMerklFarmStrategy.sol

+    /// @inheritdoc IControllable
+    string public constant VERSION = "1.1.0";
+
+    address internal constant ETH = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;


src/strategies/SteerQuickSwapMerklFarmStrategy.sol

+    function _depositAssets(uint[] memory amounts, bool /*claimRevenue*/ ) internal override returns (uint value) {
+        StrategyBaseStorage storage __$__ = _getStrategyBaseStorage();
+        (,, value) = IMultiPositionManager(__$__._underlying).deposit(amounts[0], amounts[1], 0, 0, address(0));
+        __$__.total += value;
+    }


src/strategies/SteerQuickSwapMerklFarmStrategy.sol

+    {
+        StrategyBaseStorage storage __$__ = _getStrategyBaseStorage();
+        IMultiPositionManager _underlying = IMultiPositionManager(__$__._underlying);
+        IMultiPositionManager.LiquidityPositions memory ticks_;


src/strategies/SteerQuickSwapMerklFarmStrategy.sol

+    function _previewDepositAssets(uint[] memory amountsMax)
+        internal
+        view
+        override(StrategyBase, LPStrategyBase)
+        returns (uint[] memory amountsConsumed, uint value)
+    {
+        StrategyBaseStorage storage __$__ = _getStrategyBaseStorage();
+        IMultiPositionManager _underlying = IMultiPositionManager(__$__._underlying);
+        IMultiPositionManager.LiquidityPositions memory ticks_;
+        (ticks_.lowerTick, ticks_.upperTick, )  = _underlying.getPositions();
+        int24[] memory ticks = new int24[](2);
+        ticks[0] = ticks_.lowerTick[0];
+        ticks[1] = ticks_.upperTick[0];
+        (, amountsConsumed) = ICAmmAdapter(address(ammAdapter())).getLiquidityForAmounts(pool(), amountsMax, ticks);
+
+        uint[] memory totalAmounts;
+        (totalAmounts[0], totalAmounts[1]) = _underlying.getTotalAmounts();
+
+        IMultiPositionManagerFactory factory = IMultiPositionManagerFactory(_underlying.vaultRegistry());
+        IFeedRegistryInterface chainlinkRegistry = IFeedRegistryInterface(factory.chainlinkRegistry());
+        bool[2] memory usdAsBase;
+        usdAsBase[0] = false;
+        usdAsBase[1] = false;
+        value = _calculateShares(
+            factory,
+            chainlinkRegistry,
+            ammAdapter().poolTokens(pool()),
+            usdAsBase,
+            amountsConsumed[0],
+            amountsConsumed[1],
+            totalAmounts[0],
+            totalAmounts[1],
+            _underlying.maxTotalSupply()
+        );
+    }


src/strategies/SteerQuickSwapMerklFarmStrategy.sol

+    function _previewDepositAssets(uint[] memory amountsMax)
+        internal
+        view
+        override(StrategyBase, LPStrategyBase)
+        returns (uint[] memory amountsConsumed, uint value)
+    {
+        StrategyBaseStorage storage __$__ = _getStrategyBaseStorage();
+        IMultiPositionManager _underlying = IMultiPositionManager(__$__._underlying);
+        IMultiPositionManager.LiquidityPositions memory ticks_;
+        (ticks_.lowerTick, ticks_.upperTick, )  = _underlying.getPositions();
+        int24[] memory ticks = new int24[](2);
+        ticks[0] = ticks_.lowerTick[0];
+        ticks[1] = ticks_.upperTick[0];
+        (, amountsConsumed) = ICAmmAdapter(address(ammAdapter())).getLiquidityForAmounts(pool(), amountsMax, ticks);
+
+        uint[] memory totalAmounts;
+        (totalAmounts[0], totalAmounts[1]) = _underlying.getTotalAmounts();
+
+        IMultiPositionManagerFactory factory = IMultiPositionManagerFactory(_underlying.vaultRegistry());
+        IFeedRegistryInterface chainlinkRegistry = IFeedRegistryInterface(factory.chainlinkRegistry());
+        bool[2] memory usdAsBase;
+        usdAsBase[0] = false;
+        usdAsBase[1] = false;
+        value = _calculateShares(
+            factory,
+            chainlinkRegistry,
+            ammAdapter().poolTokens(pool()),
+            usdAsBase,
+            amountsConsumed[0],
+            amountsConsumed[1],
+            totalAmounts[0],
+            totalAmounts[1],
+            _underlying.maxTotalSupply()
+        );
+    }


src/strategies/SteerQuickSwapMerklFarmStrategy.sol

+        returns (uint[] memory amountsConsumed, uint value)
+    {
+        StrategyBaseStorage storage __$__ = _getStrategyBaseStorage();
+        IMultiPositionManager _underlying = IMultiPositionManager(__$__._underlying);


src/strategies/SteerQuickSwapMerklFarmStrategy.sol

+    function _previewDepositAssets(uint[] memory amountsMax)
+        internal
+        view
+        override(StrategyBase, LPStrategyBase)
+        returns (uint[] memory amountsConsumed, uint value)
+    {
+        StrategyBaseStorage storage __$__ = _getStrategyBaseStorage();
+        IMultiPositionManager _underlying = IMultiPositionManager(__$__._underlying);
+        IMultiPositionManager.LiquidityPositions memory ticks_;
+        (ticks_.lowerTick, ticks_.upperTick,) = _underlying.getPositions();
+        int24[] memory ticks = new int24[](2);
+        ticks[0] = ticks_.lowerTick[0];
+        ticks[1] = ticks_.upperTick[0];
+        (, amountsConsumed) = ICAmmAdapter(address(ammAdapter())).getLiquidityForAmounts(pool(), amountsMax, ticks);
+
+        uint[] memory totalAmounts = new uint[](2);
+        (totalAmounts[0], totalAmounts[1]) = _underlying.getTotalAmounts();
+        PriceReader priceReader;
+        priceReader = PriceReader(IPlatform(platform()).priceReader());
+        (uint token0Price, ) = priceReader.getPrice(_underlying.token0());
+        (uint token1Price, ) = priceReader.getPrice(_underlying.token1());
+        uint numerator = token0Price * amountsConsumed[0] + token1Price * amountsConsumed[1];
+        uint denominator = token0Price * totalAmounts[0] + token1Price * totalAmounts[1];
+        amountsConsumed = amountsConsumed;
+        value = UniswapV3MathLib.mulDiv(numerator, _underlying.totalSupply(), denominator);
+    }


src/strategies/SteerQuickSwapMerklFarmStrategy.sol

+    function _previewDepositAssets(uint[] memory amountsMax)
+        internal
+        view
+        override(StrategyBase, LPStrategyBase)
+        returns (uint[] memory amountsConsumed, uint value)
+    {
+        StrategyBaseStorage storage __$__ = _getStrategyBaseStorage();
+        IMultiPositionManager _underlying = IMultiPositionManager(__$__._underlying);
+        IMultiPositionManager.LiquidityPositions memory ticks_;
+        (ticks_.lowerTick, ticks_.upperTick,) = _underlying.getPositions();
+        int24[] memory ticks = new int24[](2);
+        ticks[0] = ticks_.lowerTick[0];
+        ticks[1] = ticks_.upperTick[0];
+        (, amountsConsumed) = ICAmmAdapter(address(ammAdapter())).getLiquidityForAmounts(pool(), amountsMax, ticks);
+
+        uint[] memory totalAmounts = new uint[](2);
+        (totalAmounts[0], totalAmounts[1]) = _underlying.getTotalAmounts();
+        PriceReader priceReader;
+        priceReader = PriceReader(IPlatform(platform()).priceReader());
+        (uint token0Price, ) = priceReader.getPrice(_underlying.token0());
+        (uint token1Price, ) = priceReader.getPrice(_underlying.token1());
+        uint numerator = token0Price * amountsConsumed[0] + token1Price * amountsConsumed[1];
+        uint denominator = token0Price * totalAmounts[0] + token1Price * totalAmounts[1];
+        amountsConsumed = amountsConsumed;
+        value = UniswapV3MathLib.mulDiv(numerator, _underlying.totalSupply(), denominator);
+    }


src/strategies/SteerQuickSwapMerklFarmStrategy.sol

+
+    address internal constant ETH = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
+
+    address internal constant USD = address(840);


…teer-quickswap-merkl-farm # Conflicts: # chains/PolygonLib.sol # script/libs/DeployStrategyLib.sol

codecov · 2024-07-15T09:38:37Z

Codecov Report

Attention: Patch coverage is 95.55556% with 6 lines in your changes missing coverage. Please review.

Project coverage is 98.04%. Comparing base (43e38cc) to head (cb96c49).

Files	Patch %	Lines
src/strategies/SteerQuickSwapMerklFarmStrategy.sol	94.69%	4 Missing and 2 partials ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #126      +/-   ##
==========================================
+ Coverage   94.76%   98.04%   +3.28%     
==========================================
  Files          60       62       +2     
  Lines        4428     4562     +134     
  Branches      477      489      +12     
==========================================
+ Hits         4196     4473     +277     
- Misses         77       81       +4     
+ Partials      155        8     -147

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

src/strategies/SteerQuickSwapMerklFarmStrategy.sol

+        StrategyBaseStorage storage __$__ = _getStrategyBaseStorage();
+        //slither-disable-next-line similar-names
+        IMultiPositionManager _underlying = IMultiPositionManager(__$__._underlying);
+        IMultiPositionManager.LiquidityPositions memory ticks_;


a17

Need to add active farms with various steer vaults.

OnlyForward0613 added 2 commits May 7, 2024 14:30

Contract/ Steer / integration added

8bbbdd7

Steer Strategy / add farming, SteerQuickSwapMerklFarmSwap.sol

911eb93

OnlyForward0613 linked an issue May 8, 2024 that may be closed by this pull request

📜[DONE] Steer QuickSwap Merkl Farm #85

Closed

github-advanced-security bot found potential problems May 8, 2024

View reviewed changes

src/strategies/SteerQuickSwapMerklFarmStrategy.sol Dismissed Show dismissed Hide dismissed

src/strategies/SteerQuickSwapMerklFarmStrategy.sol Dismissed Show dismissed Hide dismissed

src/strategies/SteerQuickSwapMerklFarmStrategy.sol Fixed Show fixed Hide fixed

OnlyForward0613 closed this May 8, 2024

a17 changed the title ~~85 dev steer quickswap merkl farm~~ SQMF May 9, 2024

makeSteerQuickSwapMerklFarm function updated

21f079c

OnlyForward0613 reopened this May 9, 2024

OnlyForward0613 added 2 commits May 9, 2024 14:54

integration bug fixed

1c6c364

SQMF skeleton compiled

23ae653

github-advanced-security bot found potential problems May 10, 2024

View reviewed changes

src/strategies/SteerQuickSwapMerklFarmStrategy.sol Fixed Show fixed Hide fixed

github-advanced-security bot found potential problems May 10, 2024

View reviewed changes

SQMF withdraw and deposit created

e7af417

github-advanced-security bot found potential problems May 10, 2024

View reviewed changes

src/strategies/SteerQuickSwapMerklFarmStrategy.sol Fixed Show fixed Hide fixed

src/strategies/SteerQuickSwapMerklFarmStrategy.sol Fixed Show fixed Hide fixed

OnlyForward0613 added 2 commits May 10, 2024 13:53

delete unneccessary part

91132a2

SQMF format chagned

10e5744

github-advanced-security bot found potential problems May 10, 2024

View reviewed changes

src/strategies/SteerQuickSwapMerklFarmStrategy.sol Fixed Show fixed Hide fixed

src/strategies/SteerQuickSwapMerklFarmStrategy.sol Fixed Show fixed Hide fixed

SQMF updated

acbefa5

github-advanced-security bot found potential problems May 10, 2024

View reviewed changes

OnlyForward0613 added 4 commits May 10, 2024 15:43

forge fmt changed

7f2dc5c

unneccessary constants removed

2b168bb

unneccessary constants removed2

39aa73a

SQMF updated

6161495

a17 added the STRATEGY Strategy logic proposed for implementation label May 12, 2024

a17 assigned OnlyForward0613 May 14, 2024

OnlyForward0613 added 5 commits May 15, 2024 08:59

SQMF / test contract created

9677dd2

resolve conflicts from main

62c51f5

forge formatting updated

d6bb3dc

SQMF test contract testing

62d334f

SQMF strategy updated

eff942c

OnlyForward0613 added 2 commits May 17, 2024 21:43

SQMF updated

c873990

SQMF fixed 2 errors

a970359

github-advanced-security bot found potential problems May 18, 2024

View reviewed changes

SQMF totalAmounts, calculateShare function updated

c8ebfb9

github-advanced-security bot found potential problems May 18, 2024

View reviewed changes

src/strategies/SteerQuickSwapMerklFarmStrategy.sol Fixed Show fixed Hide fixed

OnlyForward0613 added 2 commits May 18, 2024 08:34

SQMF lint formatting

d22e304

_previewDeposit issues solved

ac0654e

github-advanced-security bot found potential problems May 23, 2024

View reviewed changes

withdraw assets updated

92d2951

github-advanced-security bot found potential problems May 30, 2024

View reviewed changes

OnlyForward0613 and others added 2 commits May 30, 2024 17:40

chore: unnecessary files removed

3bb9fad

Merge remote-tracking branch 'refs/remotes/origin/main' into 85-dev-s…

6f394a8

…teer-quickswap-merkl-farm # Conflicts: # chains/PolygonLib.sol # script/libs/DeployStrategyLib.sol

a17 self-assigned this Jul 15, 2024

a17 added 3 commits July 15, 2024 10:12

fixes

d17234d

fix testAll and add todo

d14d144

sqmf: cleanup

3c49283

sqmf: cleanup, alerts

d3e7997

github-advanced-security bot found potential problems Jul 15, 2024

View reviewed changes

a17 added 2 commits July 15, 2024 13:55

sqmf: add lib

66a136b

sqmf: cleanup, fixes

65a3472

a17 changed the title ~~SQMF~~ 📜SQMF Jul 15, 2024

a17 added 2 commits July 15, 2024 14:33

sqmf: deploy script, fixes

87c0f83

sqmf: lint

ed85f9f

a17 approved these changes Jul 15, 2024

View reviewed changes

a17 requested changes Jul 15, 2024

View reviewed changes

a17 added 2 commits July 15, 2024 18:06

sqmf: bugfix, add farms, presets, fix deploy script

e8eeabd

sqmf: change developer address

cb96c49

a17 approved these changes Jul 15, 2024

View reviewed changes

OnlyForward0613 merged commit 8e0325b into main Jul 15, 2024
8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

📜SQMF #126

📜SQMF #126

OnlyForward0613 commented May 8, 2024 •

edited by a17

Loading

codecov bot commented Jul 15, 2024 •

edited

Loading

a17 left a comment


		address internal constant ETH = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;

		address internal constant USD = address(840);

📜SQMF #126

📜SQMF #126

Conversation

OnlyForward0613 commented May 8, 2024 • edited by a17 Loading

codecov bot commented Jul 15, 2024 • edited Loading

Codecov Report

a17 left a comment

Choose a reason for hiding this comment

OnlyForward0613 commented May 8, 2024 •

edited by a17

Loading

codecov bot commented Jul 15, 2024 •

edited

Loading