Merge pull request #13 from mschneider/error-reporting
Improved error reporting
This commit is contained in:
commit
bfb79fb727
|
@ -36,12 +36,12 @@
|
||||||
"trailingComma": "all"
|
"trailingComma": "all"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@blockworks-foundation/mango-client": "git+https://github.com/blockworks-foundation/mango-client-v3.git",
|
"@blockworks-foundation/mango-client": "latest",
|
||||||
"@project-serum/anchor": "^0.16.2",
|
"@project-serum/anchor": "^0.16.2",
|
||||||
"@project-serum/serum": "0.13.55",
|
"@project-serum/serum": "0.13.55",
|
||||||
"@project-serum/sol-wallet-adapter": "^0.2.0",
|
"@project-serum/sol-wallet-adapter": "^0.2.0",
|
||||||
"@solana/spl-token": "^0.1.6",
|
"@solana/spl-token": "^0.1.6",
|
||||||
"@solana/web3.js": "1.21.0",
|
"@solana/web3.js": "^1.31.0",
|
||||||
"axios": "^0.21.1",
|
"axios": "^0.21.1",
|
||||||
"big.js": "^6.1.1",
|
"big.js": "^6.1.1",
|
||||||
"bigint-buffer": "^1.1.5",
|
"bigint-buffer": "^1.1.5",
|
||||||
|
|
|
@ -269,7 +269,7 @@ async function main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
cache = await mangoGroup.loadCache(connection);
|
cache = await mangoGroup.loadCache(connection);
|
||||||
liqorMangoAccount.reload(connection, mangoGroup.dexProgramId);
|
await liqorMangoAccount.reload(connection, mangoGroup.dexProgramId);
|
||||||
|
|
||||||
// Check need to rebalance again after checking accounts
|
// Check need to rebalance again after checking accounts
|
||||||
await balanceAccount(
|
await balanceAccount(
|
||||||
|
@ -310,6 +310,7 @@ function watchAccounts(
|
||||||
mangoSubscriptionId = connection.onProgramAccountChange(
|
mangoSubscriptionId = connection.onProgramAccountChange(
|
||||||
mangoProgramId,
|
mangoProgramId,
|
||||||
async ({ accountId, accountInfo }) => {
|
async ({ accountId, accountInfo }) => {
|
||||||
|
try {
|
||||||
const index = mangoAccounts.findIndex((account) =>
|
const index = mangoAccounts.findIndex((account) =>
|
||||||
account.publicKey.equals(accountId),
|
account.publicKey.equals(accountId),
|
||||||
);
|
);
|
||||||
|
@ -330,6 +331,9 @@ function watchAccounts(
|
||||||
mangoGroup.dexProgramId,
|
mangoGroup.dexProgramId,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error(`could not update mango account ${err}`);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
'processed',
|
'processed',
|
||||||
[
|
[
|
||||||
|
@ -451,7 +455,7 @@ async function processTriggerOrders(
|
||||||
console.log(
|
console.log(
|
||||||
`Executing order for account ${mangoAccount.publicKey.toBase58()}`,
|
`Executing order for account ${mangoAccount.publicKey.toBase58()}`,
|
||||||
);
|
);
|
||||||
await client.executePerpTriggerOrder(
|
return client.executePerpTriggerOrder(
|
||||||
mangoGroup,
|
mangoGroup,
|
||||||
mangoAccount,
|
mangoAccount,
|
||||||
cache,
|
cache,
|
||||||
|
@ -1187,8 +1191,8 @@ function notify(content: string) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
process.on('unhandledRejection', (err) => {
|
process.on('unhandledRejection', (err: any, p: any) => {
|
||||||
console.error(`Unhandled rejection: ${err})`);
|
console.error(`Unhandled rejection: ${err} promise: ${p})`);
|
||||||
});
|
});
|
||||||
|
|
||||||
main();
|
main();
|
||||||
|
|
59
yarn.lock
59
yarn.lock
|
@ -30,16 +30,10 @@
|
||||||
dependencies:
|
dependencies:
|
||||||
regenerator-runtime "^0.13.4"
|
regenerator-runtime "^0.13.4"
|
||||||
|
|
||||||
"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5":
|
"@blockworks-foundation/mango-client@latest":
|
||||||
version "7.16.7"
|
|
||||||
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa"
|
|
||||||
integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==
|
|
||||||
dependencies:
|
|
||||||
regenerator-runtime "^0.13.4"
|
|
||||||
|
|
||||||
"@blockworks-foundation/mango-client@git+https://github.com/blockworks-foundation/mango-client-v3.git":
|
|
||||||
version "3.2.24"
|
version "3.2.24"
|
||||||
resolved "git+https://github.com/blockworks-foundation/mango-client-v3.git#b3bc67c039a790b4997c8e41f4305b3bb24b1266"
|
resolved "https://registry.yarnpkg.com/@blockworks-foundation/mango-client/-/mango-client-3.2.24.tgz#c46f2cff3dca06d88e304610643f40fddbf0ee76"
|
||||||
|
integrity sha512-1rWvmMBK1wGVLG7UfTpHI2FPnXfRNTLFWifGa9q/FkRLp07GzGDY3fGhquJW2NxGv2KPwzX/YJEAHX+2x485OA==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@project-serum/anchor" "^0.16.2"
|
"@project-serum/anchor" "^0.16.2"
|
||||||
"@project-serum/serum" "0.13.55"
|
"@project-serum/serum" "0.13.55"
|
||||||
|
@ -220,30 +214,30 @@
|
||||||
buffer-layout "^1.2.0"
|
buffer-layout "^1.2.0"
|
||||||
dotenv "10.0.0"
|
dotenv "10.0.0"
|
||||||
|
|
||||||
"@solana/web3.js@1.21.0":
|
"@solana/web3.js@^1.17.0", "@solana/web3.js@^1.21.0":
|
||||||
version "1.21.0"
|
version "1.30.2"
|
||||||
resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.21.0.tgz#4f98edea38d4cb3ae4d2ea49a050b0ec09508023"
|
resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.30.2.tgz#e85da75e0825dc64f53eb64a1ff0115b27bec135"
|
||||||
integrity sha512-x1NXlF92tEjxuTxS0u4n9JV17UKk0Dn2L+qSWGvKOb4iWhzApDj6wicJsrGdSbGdxnZ7eciQ/SNn3zB4ydUllA==
|
integrity sha512-hznCj+rkfvM5taRP3Z+l5lumB7IQnDrB4l55Wpsg4kDU9Zds8pE5YOH5Z9bbF/pUzZJKQjyBjnY/6kScBm3Ugg==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/runtime" "^7.12.5"
|
"@babel/runtime" "^7.12.5"
|
||||||
|
"@ethersproject/sha2" "^5.5.0"
|
||||||
"@solana/buffer-layout" "^3.0.0"
|
"@solana/buffer-layout" "^3.0.0"
|
||||||
bn.js "^5.0.0"
|
bn.js "^5.0.0"
|
||||||
borsh "^0.4.0"
|
borsh "^0.4.0"
|
||||||
bs58 "^4.0.1"
|
bs58 "^4.0.1"
|
||||||
buffer "6.0.1"
|
buffer "6.0.1"
|
||||||
crypto-hash "^1.2.2"
|
cross-fetch "^3.1.4"
|
||||||
jayson "^3.4.4"
|
jayson "^3.4.4"
|
||||||
js-sha3 "^0.8.0"
|
js-sha3 "^0.8.0"
|
||||||
node-fetch "^2.6.1"
|
|
||||||
rpc-websockets "^7.4.2"
|
rpc-websockets "^7.4.2"
|
||||||
secp256k1 "^4.0.2"
|
secp256k1 "^4.0.2"
|
||||||
superstruct "^0.14.2"
|
superstruct "^0.14.2"
|
||||||
tweetnacl "^1.0.0"
|
tweetnacl "^1.0.0"
|
||||||
|
|
||||||
"@solana/web3.js@^1.17.0", "@solana/web3.js@^1.21.0":
|
"@solana/web3.js@^1.31.0":
|
||||||
version "1.30.2"
|
version "1.31.0"
|
||||||
resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.30.2.tgz#e85da75e0825dc64f53eb64a1ff0115b27bec135"
|
resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.31.0.tgz#7a313d4c1a90b77f27ddbfe845a10d6883e06452"
|
||||||
integrity sha512-hznCj+rkfvM5taRP3Z+l5lumB7IQnDrB4l55Wpsg4kDU9Zds8pE5YOH5Z9bbF/pUzZJKQjyBjnY/6kScBm3Ugg==
|
integrity sha512-7nHHx1JNFnrt15e9y8m38I/EJCbaB+bFC3KZVM1+QhybCikFxGMtGA5r7PDC3GEL1R2RZA8yKoLkDKo3vzzqnw==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/runtime" "^7.12.5"
|
"@babel/runtime" "^7.12.5"
|
||||||
"@ethersproject/sha2" "^5.5.0"
|
"@ethersproject/sha2" "^5.5.0"
|
||||||
|
@ -878,7 +872,7 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.2:
|
||||||
shebang-command "^2.0.0"
|
shebang-command "^2.0.0"
|
||||||
which "^2.0.1"
|
which "^2.0.1"
|
||||||
|
|
||||||
crypto-hash@^1.2.2, crypto-hash@^1.3.0:
|
crypto-hash@^1.3.0:
|
||||||
version "1.3.0"
|
version "1.3.0"
|
||||||
resolved "https://registry.yarnpkg.com/crypto-hash/-/crypto-hash-1.3.0.tgz#b402cb08f4529e9f4f09346c3e275942f845e247"
|
resolved "https://registry.yarnpkg.com/crypto-hash/-/crypto-hash-1.3.0.tgz#b402cb08f4529e9f4f09346c3e275942f845e247"
|
||||||
integrity sha512-lyAZ0EMyjDkVvz8WOeVnuCPvKVBXcMv1l5SVqO1yC7PzTwrD/pPje/BIRbWhMoPe436U+Y2nD7f5bFx0kt+Sbg==
|
integrity sha512-lyAZ0EMyjDkVvz8WOeVnuCPvKVBXcMv1l5SVqO1yC7PzTwrD/pPje/BIRbWhMoPe436U+Y2nD7f5bFx0kt+Sbg==
|
||||||
|
@ -1714,13 +1708,6 @@ node-fetch@2.6.1:
|
||||||
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
|
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
|
||||||
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
|
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
|
||||||
|
|
||||||
node-fetch@^2.6.1:
|
|
||||||
version "2.6.6"
|
|
||||||
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89"
|
|
||||||
integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==
|
|
||||||
dependencies:
|
|
||||||
whatwg-url "^5.0.0"
|
|
||||||
|
|
||||||
node-gyp-build@^4.2.0, node-gyp-build@^4.3.0:
|
node-gyp-build@^4.2.0, node-gyp-build@^4.3.0:
|
||||||
version "4.3.0"
|
version "4.3.0"
|
||||||
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
|
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
|
||||||
|
@ -2114,11 +2101,6 @@ toml@^3.0.0:
|
||||||
resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"
|
resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"
|
||||||
integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==
|
integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==
|
||||||
|
|
||||||
tr46@~0.0.3:
|
|
||||||
version "0.0.3"
|
|
||||||
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
|
|
||||||
integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
|
|
||||||
|
|
||||||
traverse-chain@~0.1.0:
|
traverse-chain@~0.1.0:
|
||||||
version "0.1.0"
|
version "0.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/traverse-chain/-/traverse-chain-0.1.0.tgz#61dbc2d53b69ff6091a12a168fd7d433107e40f1"
|
resolved "https://registry.yarnpkg.com/traverse-chain/-/traverse-chain-0.1.0.tgz#61dbc2d53b69ff6091a12a168fd7d433107e40f1"
|
||||||
|
@ -2220,19 +2202,6 @@ vscode-textmate@5.2.0:
|
||||||
resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.2.0.tgz#01f01760a391e8222fe4f33fbccbd1ad71aed74e"
|
resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.2.0.tgz#01f01760a391e8222fe4f33fbccbd1ad71aed74e"
|
||||||
integrity sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==
|
integrity sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==
|
||||||
|
|
||||||
webidl-conversions@^3.0.0:
|
|
||||||
version "3.0.1"
|
|
||||||
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
|
|
||||||
integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
|
|
||||||
|
|
||||||
whatwg-url@^5.0.0:
|
|
||||||
version "5.0.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
|
|
||||||
integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
|
|
||||||
dependencies:
|
|
||||||
tr46 "~0.0.3"
|
|
||||||
webidl-conversions "^3.0.0"
|
|
||||||
|
|
||||||
which@2.0.2, which@^2.0.1:
|
which@2.0.2, which@^2.0.1:
|
||||||
version "2.0.2"
|
version "2.0.2"
|
||||||
resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
|
resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
|
||||||
|
|
Loading…
Reference in New Issue