From 1ccec6735027e1bc5292481092eb87b9a6e85791 Mon Sep 17 00:00:00 2001 From: dd Date: Sun, 21 Feb 2021 20:58:42 -0500 Subject: [PATCH] not working -- still integrating aggregator --- package.json | 2 +- src/client.ts | 8 +++++--- src/index.ts | 4 ++++ yarn.lock | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 0b50852..457dde6 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@solana/web3.js": "^0.90.0", "bn.js": "^5.1.2", "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": [ ">0.2%", diff --git a/src/client.ts b/src/client.ts index 74020c8..36ff679 100644 --- a/src/client.ts +++ b/src/client.ts @@ -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 Wallet from '@project-serum/sol-wallet-adapter'; import { makeCancelOrderInstruction, makeSettleFundsInstruction } from './instruction'; -import { Aggregator } from 'solink'; +const { Aggregator } = require('solink'); + export class MangoGroup { publicKey: PublicKey; @@ -59,9 +60,10 @@ export class MangoGroup { ): Promise { 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); - return oracleAccs.map((oa) => decodeAggregatorInfo(oa.accountInfo).submissionValue).concat(1.0) + // const oracleAccs = await getMultipleAccounts(connection, this.oracles); + // return oracleAccs.map((oa) => decodeAggregatorInfo(oa.accountInfo).submissionValue).concat(1.0) } getMarketIndex(spotMarket: Market): number { diff --git a/src/index.ts b/src/index.ts index abbc4f2..d8bf28f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -11,6 +11,10 @@ export { NUM_TOKENS } from './layout'; import IDS from "./ids.json"; export { IDS } + + + + // async function main() { // const cluster = "devnet"; // const client = new MangoClient(); diff --git a/yarn.lock b/yarn.lock index 52ada45..8e13dea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4784,9 +4784,9 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.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" - 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: "@ltd/j-toml" "^1.6.0" "@solana/web3.js" "^0.90.5"