Merge remote-tracking branch 'origin/main' into update-ropsten-contracts-addresses

Author: michalinacienciala

solidity/migrations/2_deploy_contracts.js

@@ -27,6 +27,7 @@ const LPRewardsKEEPETH = artifacts.require("LPRewardsKEEPETH")
 const LPRewardsKEEPTBTC = artifacts.require("LPRewardsKEEPTBTC")
 const LPRewardsTBTCSaddle = artifacts.require("LPRewardsTBTCSaddle")
 const LPRewardsTBTCv2Saddle = artifacts.require("LPRewardsTBTCv2Saddle")
+const LPRewardsTBTCv2SaddleV2 = artifacts.require("LPRewardsTBTCv2SaddleV2")
 const TestToken = artifacts.require("./test/TestToken")
 const ECDSARewards = artifacts.require("ECDSARewards")
 const ECDSARewardsDistributor = artifacts.require("ECDSARewardsDistributor")
@@ -173,6 +174,13 @@ module.exports = async function (deployer, network) {
     WrappedTokenTBTCv2Saddle.address
   )
 
+  const WrappedTokenTBTCv2SaddleV2 = await deployer.deploy(TestToken)
+  await deployer.deploy(
+    LPRewardsTBTCv2SaddleV2,
+    KeepTokenAddress,
+    WrappedTokenTBTCv2SaddleV2.address
+  )
+
   // ECDSA Rewards
   await deployer.deploy(
     ECDSARewards,

solidity/scripts/etherscan-verify.sh

@@ -23,6 +23,8 @@ npx truffle run verify \
     LPRewardsKEEPTBTC \
     LPRewardsTBTCETH \
     LPRewardsTBTCSaddle \
+    LPRewardsTBTCv2Saddle \
+    LPRewardsTBTCv2SaddleV2 \
     Migrations \
     Position \
     StackLib \

solidity/scripts/liquidity-rewards-starter.js

@@ -3,6 +3,7 @@ const LPRewardsKEEPETH = artifacts.require("LPRewardsKEEPETH")
 const LPRewardsKEEPTBTC = artifacts.require("LPRewardsKEEPTBTC")
 const LPRewardsTBTCSaddle = artifacts.require("LPRewardsTBTCSaddle")
 const LPRewardsTBTCv2Saddle = artifacts.require("LPRewardsTBTCv2Saddle")
+const LPRewardsTBTCv2SaddleV2 = artifacts.require("LPRewardsTBTCv2SaddleV2")
 
 const TestToken = artifacts.require("./test/TestToken")
 const KeepToken = artifacts.require(
@@ -67,6 +68,7 @@ module.exports = async function () {
       LPRewardsKEEPTBTC,
       LPRewardsTBTCSaddle,
       LPRewardsTBTCv2Saddle,
+      LPRewardsTBTCv2SaddleV2,
     ]
 
     for (const LPRewardsContract of LPRewardsContracts) {