diff --git a/contracts/tasks/amoStrategy.js b/contracts/tasks/amoStrategy.js index db7d509d41..fc8bb5bfdc 100644 --- a/contracts/tasks/amoStrategy.js +++ b/contracts/tasks/amoStrategy.js @@ -49,7 +49,7 @@ async function amoStrategyTask(taskArguments) { vault, } = await curveContracts(poolOTokenSymbol); - // Strategy's Metapool LPs in the Convex pool + // Strategy's Curve LPs in the Convex pool const vaultLPsBefore = diffBlocks && (await cvxRewardPool.balanceOf(amoStrategy.address, { @@ -331,7 +331,7 @@ async function mintAndAddOTokensTask(taskArguments) { const signer = await getSigner(); const amountUnits = parseUnits(amount.toString()); - log(`Minting ${formatUnits(amountUnits)} ${symbol} and adding to Metapool`); + log(`Minting ${formatUnits(amountUnits)} ${symbol} and adding to Curve pool`); await amoStrategy.connect(signer).mintAndAddOTokens(amountUnits); } @@ -355,7 +355,7 @@ async function removeAndBurnOTokensTask(taskArguments) { log( `Remove OTokens using ${formatUnits( amountUnits - )} ${symbol} Metapool LP tokens and burn the OTokens` + )} ${symbol} Curve LP tokens and burn the OTokens` ); await amoStrategy.connect(signer).removeAndBurnOTokens(amountUnits); @@ -380,7 +380,7 @@ async function removeOnlyAssetsTask(taskArguments) { log( `Remove ETH using ${formatUnits( amountUnits - )} ${symbol} Metapool LP tokens and add to ${symbol} Vault` + )} ${symbol} Curve LP tokens and add to ${symbol} Vault` ); await amoStrategy.connect(signer).removeOnlyAssets(amountUnits); diff --git a/contracts/tasks/curve.js b/contracts/tasks/curve.js index 843e4ac064..88c1bed08c 100644 --- a/contracts/tasks/curve.js +++ b/contracts/tasks/curve.js @@ -300,17 +300,22 @@ async function curveSwapTask(taskArguments) { const signer = await getSigner(); - const fromAmount = parseUnits(from.toString()); + const fromAmount = parseUnits(amount.toString()); const minAmount = parseUnits(min.toString()); - log(`Swapping ${formatUnits(fromAmount)} ${from}`); const fromIndex = from === "ETH" || from === "3CRV" ? 0 : 1; const toIndex = from === "ETH" || from === "3CRV" ? 1 : 0; const override = from === "ETH" ? { value: amount } : {}; + + log( + `Swapping ${formatUnits( + fromAmount + )} ${from} from index ${fromIndex} to index ${toIndex}` + ); // prettier-ignore await pool - .connect(signer).exchange( + .connect(signer)["exchange(int128,int128,uint256,uint256)"]( fromIndex, toIndex, fromAmount, @@ -330,6 +335,7 @@ async function curveContracts(oTokenSymbol) { oTokenSymbol === "OETH" ? addresses.mainnet.CurveOETHMetaPool : addresses.mainnet.CurveOUSDMetaPool; + log(`Resolved ${oTokenSymbol} Curve pool to ${poolAddr}`); const strategyAddr = oTokenSymbol === "OETH" ? addresses.mainnet.ConvexOETHAMOStrategy diff --git a/contracts/tasks/tasks.js b/contracts/tasks/tasks.js index dc5c7e2c7b..00ef4f00a7 100644 --- a/contracts/tasks/tasks.js +++ b/contracts/tasks/tasks.js @@ -817,7 +817,7 @@ subtask( ) .addParam( "amount", - "Amount of Metapool LP tokens to burn for removed OTokens", + "Amount of Curve LP tokens to burn for removed OTokens", 0, types.float )