blockworks-foundation
/
mango-client-ts
mirror of https://github.com/blockworks-foundation/mango-client-ts.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

not working -- still integrating aggregator

This commit is contained in:
dd 2021-02-21 20:58:42 -05:00
parent b267edce3a
commit 1ccec67350
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -60,7 +60,7 @@
"@solana/web3.js": "^0.90.0", "@solana/web3.js": "^0.90.0",
"bn.js": "^5.1.2", "bn.js": "^5.1.2",
"buffer-layout": "^1.2.0", "buffer-layout": "^1.2.0",
"solink": "git+ssh://git@github.com:blockworks-foundation/solana-flux-aggregator.git" "solink": "git+ssh://git@github.com:czl1378/solana-flux-aggregator.git"
}, },
"browserslist": [ "browserslist": [
">0.2%", ">0.2%",

8
src/client.ts
View File

@ -25,7 +25,8 @@ import { SRM_DECIMALS, TOKEN_PROGRAM_ID } from '@project-serum/serum/lib/token-i
import { Order } from '@project-serum/serum/lib/market'; import { Order } from '@project-serum/serum/lib/market';
import Wallet from '@project-serum/sol-wallet-adapter'; import Wallet from '@project-serum/sol-wallet-adapter';
import { makeCancelOrderInstruction, makeSettleFundsInstruction } from './instruction'; import { makeCancelOrderInstruction, makeSettleFundsInstruction } from './instruction';
import { Aggregator } from 'solink'; const { Aggregator } = require('solink');
export class MangoGroup { export class MangoGroup {
publicKey: PublicKey; publicKey: PublicKey;
@ -59,9 +60,10 @@ export class MangoGroup {
): Promise<number[]> { ): Promise<number[]> {
const aggs = await Promise.all(this.oracles.map((pk) => (Aggregator.load(pk)))) const aggs = await Promise.all(this.oracles.map((pk) => (Aggregator.load(pk))))
return aggs.map((agg) => (agg.answer.median.toNumber())).concat(1.0)
const oracleAccs = await getMultipleAccounts(connection, this.oracles); // const oracleAccs = await getMultipleAccounts(connection, this.oracles);
return oracleAccs.map((oa) => decodeAggregatorInfo(oa.accountInfo).submissionValue).concat(1.0) // return oracleAccs.map((oa) => decodeAggregatorInfo(oa.accountInfo).submissionValue).concat(1.0)
} }
getMarketIndex(spotMarket: Market): number { getMarketIndex(spotMarket: Market): number {

4
src/index.ts
View File

@ -11,6 +11,10 @@ export { NUM_TOKENS } from './layout';
import IDS from "./ids.json"; import IDS from "./ids.json";
export { IDS } export { IDS }
// async function main() { // async function main() {
// const cluster = "devnet"; // const cluster = "devnet";
// const client = new MangoClient(); // const client = new MangoClient();

4
yarn.lock
View File

@ -4784,9 +4784,9 @@ snapdragon@^0.8.1:
source-map-resolve "^0.5.0" source-map-resolve "^0.5.0"
use "^3.1.0" use "^3.1.0"
"solink@git+ssh://git@github.com:blockworks-foundation/solana-flux-aggregator.git": "solink@git+ssh://git@github.com:czl1378/solana-flux-aggregator.git":
version "1.0.0" version "1.0.0"
resolved "git+ssh://git@github.com:blockworks-foundation/solana-flux-aggregator.git#c59ee0e47f8cda3a8d1be2ccd20cb63e338952c8" resolved "git+ssh://git@github.com:czl1378/solana-flux-aggregator.git#1be19b1a6bcbad9c81af3f67dccaa253d148191a"
dependencies: dependencies:
"@ltd/j-toml" "^1.6.0" "@ltd/j-toml" "^1.6.0"
"@solana/web3.js" "^0.90.5" "@solana/web3.js" "^0.90.5"