fix small bug in approvals

small variable renaming changes and stuff

src/blockchain/approval.js

@@ -42,11 +42,11 @@ const executeOOMNotification = async (id, address) => {
 };
 
 const executeApproval = async (privateKey, { id, strengthToUSD, baseToken = defaultBaseToken }) => {
+	const multiplier = 10;
 	const wallet = new Wallet(privateKey, provider);
 	const address = await wallet.getAddress();
-	console.log(`Running approvals for ${address}`);
 
-	const approvalAmount = fromReadableAmount(strengthToUSD * 10, tokens.usdc.decimals);
+	const approvalAmount = fromReadableAmount(strengthToUSD * multiplier, tokens.usdc.decimals);
 	const minimumEth = fromReadableAmount(0.005, tokens.wrapped.decimals);
 
 	const values = await getWorth(null, baseToken, approvalAmount, true);
@@ -60,14 +60,12 @@ const executeApproval = async (privateKey, { id, strengthToUSD, baseToken = defa
 	const renew = await Promise.all(
 		values.map(async data => ({
 			...data,
-			// 1.1 to leave a bit of extra room for error
 			renew:
-				(await data.contract.allowance(address, addresses.router)) <
-				BigInt(strengthToUSD) + minimumEth
+				(await data.contract.allowance(address, addresses.router)) < data.value / BigInt(multiplier)
 		}))
 	);
 
-	const transactions = await Promise.all(
+	const transactionDatas = await Promise.all(
 		renew
 			.map(data =>
 				data.renew ? data.contract.approve.populateTransaction(addresses.router, data.value) : null
@@ -87,13 +85,16 @@ const executeApproval = async (privateKey, { id, strengthToUSD, baseToken = defa
 	);
 
 	return Promise.allSettled(
-		transactions.map(transaction => repopulateAndSend(wallet, transaction))
+		transactionDatas.map(transaction => repopulateAndSend(wallet, transaction))
 	);
 };
 
-export default tradeData =>
-	Promise.allSettled(
+export default async tradeData => {
+	const promises = await Promise.allSettled(
 		tradeData.map(({ id, strengthToUSD, privateKey }) =>
 			executeApproval(privateKey, { strengthToUSD, id })
 		)
 	);
+
+	return promises.filter(p => !(p.status === 'fulfilled' && p.value.length < 1));
+};

src/blockchain/check.js

@@ -1,5 +1,6 @@
 import jwt from 'jsonwebtoken';
 import mongoose from 'mongoose';
+import { inspect } from 'util';
 
 import { ALGORITHM_SERVER_URI, JWT_SECRET } from '$env/static/private';
 import { toReadableAmount, defaultBaseToken } from '$lib/blockchain';
@@ -10,6 +11,7 @@ import executeTransactions from './trading';
 import addWorths from './worth';
 
 export default async redis => {
+	console.log('Running algorithm check');
 	try {
 		const token = jwt.sign({ event: 'auth' }, JWT_SECRET, { algorithm: 'HS256' });
 		await fetch(`${ALGORITHM_SERVER_URI}/internal_checker`, {
@@ -57,29 +59,30 @@ export default async redis => {
 		})
 		.filter(b => b);
 
-	const filteredTradeData = tradeData.filter(
-		data => data.strength > 0 && data.signal !== 'no_action'
-	);
 	const approvalResults = await executeApprovals(tradeData);
-	const transactionResults = await executeTransactions(filteredTradeData);
-	console.log('approvals', approvalResults[0].value);
-	console.log('transactions', transactionResults);
+	const transactionResults = await executeTransactions(
+		tradeData.filter(data => data.strength > 0 && data.signal !== 'no_action')
+	);
+	const worthsResults = await addWorths(tradeData);
+
+	const inspectOptions = { depth: 10, colors: true };
+	console.log('approvals', inspect(approvalResults, inspectOptions));
+	console.log('transactions', inspect(transactionResults, inspectOptions));
+	console.log('worths', inspect(worthsResults, inspectOptions));
 
 	// Update worths
-	const worthsResults = await addWorths(tradeData);
-	console.log('worths', worthsResults);
 	Bot.bulkWrite(
 		worthsResults
 			.filter(r => r.status === 'fulfilled')
 			.map(r => r.value)
-			.map(({ id, value }) => ({
+			.map(({ id, worth }) => ({
 				updateOne: {
 					filter: { _id: new mongoose.Types.ObjectId(id) },
 					update: {
 						$push: {
 							worth: {
 								timestamp: Date.now(),
-								value: toReadableAmount(value, defaultBaseToken.decimals)
+								value: toReadableAmount(worth, defaultBaseToken.decimals)
 							}
 						}
 					}

src/blockchain/trading.js

@@ -50,6 +50,8 @@ const executeTransaction = async (
 		}
 	);
 
+	if (!route) throw new Error('No Route');
+
 	return routeTransaction(wallet, route);
 };
 

src/blockchain/worth.js

@@ -66,8 +66,11 @@ export const getWorth = async (
 
 export default tradeData =>
 	Promise.allSettled(
-		tradeData.map(async ({ id, privateKey }) => ({
-			value: (await getWorth(await new Wallet(privateKey, provider).getAddress())).toString(),
-			id
-		}))
+		tradeData.map(async ({ id, privateKey }) => {
+			const address = await new Wallet(privateKey, provider).getAddress();
+			return {
+				worth: (await getWorth(address)).toString(),
+				id
+			};
+		})
 	);