refactor: refactor populateApprove

Author: fedorovdg

README.md

@@ -184,6 +184,8 @@ import curve from "@curvefi/api";
 
     // Get populated approve transactions (without executing)
     const approveTxs = await curve.populateApprove(["DAI", "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"], ['1000', '1000'], spender);
+    // OR with custom user address (for API): 
+    // await curve.populateApprove(["DAI", "USDC"], ['1000', '1000'], spender, false, '0x...userAddress');
     // Returns array of TransactionLike objects (may include reset to 0 if needed for some tokens)
     console.log(approveTxs);
     // [
@@ -1204,7 +1206,6 @@ import curve from "@curvefi/api";
     // Get populated transactions for approve (without executing)
     const approveTxs = await curve.router.populateApprove('DAI', 1000);
     // OR const approveTxs = await curve.router.populateApprove('0x6B175474E89094C44Da98b954EedeAC495271d0F', 1000);
-    // OR with custom spender: await curve.router.populateApprove('DAI', 1000, '0x...customSpender');
     console.log(approveTxs);
     // [{ to: '0x6B17...', data: '0x...', ... }]
     // Returns array of TransactionLike objects

src/router.ts

@@ -20,7 +20,6 @@ import {
     getTxCostsUsd,
     hasAllowance,
     isEth,
-    MAX_ALLOWANCE,
     parseUnits,
     populateApprove,
     runWorker,
@@ -409,9 +408,8 @@ export async function swapApprove(this: Curve, inputCoin: string, amount: number
     return await ensureAllowance.call(this, [inputCoin], [amount], this.constants.ALIASES.router);
 }
 
-export async function swapPopulateApprove(this: Curve, inputCoin: string, amount: number | string, spender?: string, isMax = true): Promise<TransactionLike[]> {
-    const routerAddress = this.contracts[this.constants.ALIASES.router].contract.target as string;
-    return await populateApprove.call(this, [inputCoin], [amount], spender || routerAddress, isMax);
+export async function swapPopulateApprove(this: Curve, inputCoin: string, amount: number | string, isMax = true): Promise<TransactionLike[]> {
+    return await populateApprove.call(this, [inputCoin], [amount], this.constants.ALIASES.router, isMax);
 }
 
 export async function swapEstimateGas(this: Curve, inputCoin: string, outputCoin: string, amount: number | string): Promise<number | number[]> {

src/utils.ts

@@ -310,12 +310,14 @@ export async function ensureAllowance(this: Curve, coins: string[], amounts: (nu
     return await _ensureAllowance.call(this, coinAddresses, _amounts, spender, isMax)
 }
 
-export async function populateApprove(this: Curve, coins: string[], amounts: (number | string)[], spender: string, isMax = true): Promise<TransactionLike[]> {
+export async function populateApprove(this: Curve, coins: string[], amounts: (number | string)[], spender: string, isMax = true, userAddress?: string): Promise<TransactionLike[]> {
     const coinAddresses = _getCoinAddresses.call(this, coins);
     const decimals = _getCoinDecimals.call(this, coinAddresses);
     const _amounts = amounts.map((a, i) => parseUnits(a, decimals[i]));
 
-    const address = this.signerAddress;
+    const address = userAddress || this.signerAddress;
+    if (!address) throw Error("User address is not defined. Pass userAddress parameter.");
+    
     const allowance = await _getAllowance.call(this, coinAddresses, address, spender);
 
     const transactions: TransactionLike[] = [];