Merge branch 'add-steth-oracle' into ui-dex-ui/add-steth-oracle

BeanstalkFarms · Jul 18, 2024 · 440c0a8 · 440c0a8
2 parents 073cd06 + c9cc2ce
commit 440c0a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/protocol/contracts/beanstalk/silo/ConvertFacet.sol b/protocol/contracts/beanstalk/silo/ConvertFacet.sol
@@ -78,8 +78,6 @@ contract ConvertFacet is ReentrancyGuard {
         address toToken; address fromToken; uint256 grownStalk;
 
         (toToken, fromToken, toAmount, fromAmount) = LibConvert.convert(convertData);
-
-        require(fromAmount > 0, "Convert: From amount is 0.");
 
         require(fromAmount > 0, "Convert: From amount is 0.");
 

diff --git a/protocol/hardhat.config.js b/protocol/hardhat.config.js
@@ -28,7 +28,7 @@ const { upgradeWithNewFacets } = require("./scripts/diamond");
 const { BEANSTALK, PUBLIUS, BEAN_3_CURVE, PRICE } = require("./test/utils/constants.js");
 const { task } = require("hardhat/config");
 const { TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS } = require("hardhat/builtin-tasks/task-names");
-const { bipNewSilo, bipMorningAuction, bipSeedGauge } = require("./scripts/bips.js");
+const { bipNewSilo, bipMorningAuction, bipSeedGauge, bipMigrateUnripeBeanEthToBeanSteth } = require("./scripts/bips.js");
 const { ebip9, ebip10, ebip11, ebip13, ebip14, ebip15, ebip16, ebip17 } = require("./scripts/ebips.js");
 
 const { finishWstethMigration } = require("./scripts/beanWstethMigration.js");
@@ -225,12 +225,8 @@ task("deploySeedGauge", async function () {
   await bipSeedGauge();
 });
 
-// TODO: remove me later
-task("UI-deployWstethMigration", async function () {
-  await impersonateBean();
-  await impersonateWsteth();
-  await bipMigrateUnripeBeanEthToBeanSteth(true, undefined, true);
-  await finishWstethMigration(true, true);
+task("deployWstethMigration", async function () {
+  await bipMigrateUnripeBeanEthToBeanSteth();
 });
 
 /// EBIPS ///