first draft/test/release on bitriel-farm v0.1.0

Author: hangleang

contracts/BitrielFarmer.sol

@@ -45,14 +45,14 @@ interface IBitrielFarmer is IERC721Receiver, IMulticall {
     /// @return totalYieldUnclaimed The amount of yield (reward token) not yet claimed by users
     /// @return totalSecondsClaimedX128 Total liquidity-seconds claimed, represented as a UQ32.128
     /// @return numberOfStakes The count of deposits that are currently staked for the yield farming incentive
-    /// @return lastYieldBlock Last block number that BTRs distribution occurs
+    // /// @return lastYieldBlock Last block number that BTRs distribution occurs
     // /// @return accBTRPerShare Accumulated BTRs per share, times 1e12
     function farms(bytes32 farmId) external view 
     returns (
         uint256 totalYieldUnclaimed,
         uint160 totalSecondsClaimedX128,
-        uint96 numberOfStakes,
-        uint256 lastYieldBlock
+        uint96 numberOfStakes
+        // uint256 lastYieldBlock
         // uint256 accBTRPerShare
     );
 
@@ -74,7 +74,7 @@ interface IBitrielFarmer is IERC721Receiver, IMulticall {
     /// @param farmId The ID of the yield farming incentive for which the token is staked
     /// @return secondsPerLiquidityInsideInitialX128 secondsPerLiquidity represented as a UQ32.128
     /// @return liquidity The amount of liquidity in the NFT as of the last time the rewards were computed
-    function stakes(bytes32 farmId, uint256 tokenId) external view 
+    function stakes(uint256 tokenId, bytes32 farmId) external view 
     returns (
         uint160 secondsPerLiquidityInsideInitialX128, 
         uint128 liquidity
@@ -130,19 +130,6 @@ interface IBitrielFarmer is IERC721Receiver, IMulticall {
     /// @return yieldHarvested The amount of yield harvested
     function harvest(address to, uint256 yieldRequested) external returns (uint256 yieldHarvested);
 
-    /// @notice Withdraw a BitrielSwap LP token `tokenId` and Transfers `amountRequested` of accrued BTRs yield (reward tokens) from the contract to the recipient `to`
-    /// @param to The address where harvest yield will be sent to
-    /// @param tokenId The unique identifier of an BitrielSwap liquidity NFT token
-    /// @param amountRequested The amount of yield to harvest. Claims entire yield amount if set to 0.
-    /// @param data An optional data array that will be passed along to the `to` address via the NFT safeTransferFrom
-    /// @return yieldHarvested The amount of yield harvested
-    function withdrawAndHarvest(
-        address to, 
-        uint256 tokenId, 
-        uint256 amountRequested, 
-        bytes calldata data
-    ) external returns (uint256 yieldHarvested);
-
     /// @notice Calculates the yield (reward) amount that will be received for the given stake
     /// @param key The key of the yield farming incentive
     /// @param tokenId The ID of the token
@@ -158,7 +145,8 @@ interface IBitrielFarmer is IERC721Receiver, IMulticall {
 
     /// @notice Migrate lp token to another lp contract. Can be called by anyone. We trust that migrator contract is good.
     /// @param params The params necessary to migrate v2 liquidity, encoded as `MigrateParams` in calldata
-    function migrate(IMigrator.MigrateParams calldata params) external;
+    /// @param data An optional data array that will be passed along to the `to` address via the NFT safeTransferFrom
+    function migrate(IMigrator.MigrateParams calldata params, bytes calldata data) external;
 
     /// @notice Event emitted when a yield farming incentive has been created
     /// @param pool The BitrielSwap pool

contracts/interfaces/IBitrielFarmer.sol

@@ -1,4 +1,4 @@
-import { FACTORY_ADDRESS, NONFUNGIBLE_POSITION_MANAGER_ADDRESSES } from "@bitriel/bitrielswap-sdk"
+import { FACTORY_ADDRESS, NONFUNGIBLE_POSITION_MANAGER_ADDRESSES, MIGRATOR_ADDRESS } from "@bitriel/bitrielswap-sdk"
 import { HardhatRuntimeEnvironment } from 'hardhat/types'
 import { DeployFunction } from 'hardhat-deploy/types'
 
@@ -7,6 +7,7 @@ const deploy: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { deploy } = deployments
   const { deployer, dev } = await getNamedAccounts()
   const chainId = ethers.BigNumber.from(await getChainId()).toNumber()
+  
   if(chainId in FACTORY_ADDRESS && chainId in NONFUNGIBLE_POSITION_MANAGER_ADDRESSES) {
     const bitriel = await ethers.getContract("BitrielToken")
     const dayInSeconds = 60 * 60 * 24 // 86400
@@ -28,11 +29,9 @@ const deploy: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
     })
 
     const bitrielFarmer = await ethers.getContract("BitrielFarmer")
-    const migrator = await deployments.get("Migrator")
-
-    if(migrator.address != "0") {
+    if(chainId in MIGRATOR_ADDRESS) {
       console.log("Set migrator address on BitrielFarmer contract")
-      await (await bitrielFarmer.setMigrator(migrator.address)).wait()
+      await (await bitrielFarmer.setMigrator(MIGRATOR_ADDRESS[chainId])).wait()
     }
 
     if (await bitriel.owner() !== bitrielFarmer.address) {
@@ -48,5 +47,5 @@ const deploy: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
 }
 
 deploy.tags = ['BitrielFarmer']
-deploy.dependencies = ['BitrielToken', 'Migrator']
+deploy.dependencies = ['BitrielToken']
 export default deploy