Merge branch 'main' of github.com:blockworks-foundation/liquidator-v3

This commit is contained in:
Riordan Panayides 2021-11-12 23:18:24 +00:00
commit a03a01fbaa
2 changed files with 8 additions and 29 deletions

View File

@ -198,11 +198,10 @@ async function main() {
);
const allAOs = mangoAccountsWithAOs.map((ma) => ma.advancedOrdersKey);
let advancedOrders;
[cache, liqorMangoAccount, advancedOrders] = await Promise.all([
const advancedOrders = await getMultipleAccounts(connection, allAOs);
[cache, liqorMangoAccount] = await Promise.all([
mangoGroup.loadCache(connection),
liqorMangoAccount.reload(connection),
getMultipleAccounts(connection, allAOs),
]);
mangoAccountsWithAOs.forEach((ma, i) => {
@ -740,11 +739,11 @@ async function liquidatePerps(
const marketIndex = lowestHealthMarket.marketIndex;
const perpAccount = liqee.perpAccounts[marketIndex];
const perpMarket = perpMarkets[lowestHealthMarket.i];
const baseRootBank = rootBanks[marketIndex];
if (!baseRootBank) {
throw new Error(`Base root bank not found for ${marketIndex}`);
}
// const baseRootBank = rootBanks[marketIndex];
//
// if (!baseRootBank) {
// throw new Error(`Base root bank not found for ${marketIndex}`);
// }
if (!perpMarket) {
throw new Error(`Perp market not found for ${marketIndex}`);

View File

@ -217,27 +217,7 @@
buffer-layout "^1.2.0"
dotenv "10.0.0"
"@solana/web3.js@1.21.0":
version "1.21.0"
resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.21.0.tgz#4f98edea38d4cb3ae4d2ea49a050b0ec09508023"
integrity sha512-x1NXlF92tEjxuTxS0u4n9JV17UKk0Dn2L+qSWGvKOb4iWhzApDj6wicJsrGdSbGdxnZ7eciQ/SNn3zB4ydUllA==
dependencies:
"@babel/runtime" "^7.12.5"
"@solana/buffer-layout" "^3.0.0"
bn.js "^5.0.0"
borsh "^0.4.0"
bs58 "^4.0.1"
buffer "6.0.1"
crypto-hash "^1.2.2"
jayson "^3.4.4"
js-sha3 "^0.8.0"
node-fetch "^2.6.1"
rpc-websockets "^7.4.2"
secp256k1 "^4.0.2"
superstruct "^0.14.2"
tweetnacl "^1.0.0"
"@solana/web3.js@^1.17.0", "@solana/web3.js@^1.21.0":
"@solana/web3.js@1.21.0", "@solana/web3.js@^1.17.0", "@solana/web3.js@^1.21.0":
version "1.30.2"
resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.30.2.tgz#e85da75e0825dc64f53eb64a1ff0115b27bec135"
integrity sha512-hznCj+rkfvM5taRP3Z+l5lumB7IQnDrB4l55Wpsg4kDU9Zds8pE5YOH5Z9bbF/pUzZJKQjyBjnY/6kScBm3Ugg==