diff --git a/package.json b/package.json index 628cb4079..1a5daa035 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@blockworks-foundation/mango-v4", - "version": "0.5.25", + "version": "0.9.2", "description": "Typescript Client for mango-v4 program.", "repository": "https://github.com/blockworks-foundation/mango-v4", "author": { diff --git a/ts/client/src/accounts/group.ts b/ts/client/src/accounts/group.ts index 24f9c23b9..827b2a42b 100644 --- a/ts/client/src/accounts/group.ts +++ b/ts/client/src/accounts/group.ts @@ -44,6 +44,7 @@ export class Group { depositLimitQuote: BN; ixGate: BN; buybackFeesSwapMangoAccount: PublicKey; + buybackFeesExpiryInterval: BN; }, ): Group { return new Group( @@ -64,6 +65,7 @@ export class Group { obj.depositLimitQuote, obj.ixGate, obj.buybackFeesSwapMangoAccount, + obj.buybackFeesExpiryInterval, [], // addressLookupTablesList new Map(), // banksMapByName new Map(), // banksMapByMint @@ -98,6 +100,7 @@ export class Group { public depositLimitQuote, public ixGate: BN, public buybackFeesSwapMangoAccount: PublicKey, + public buybackFeesExpiryInterval: BN, public addressLookupTablesList: AddressLookupTableAccount[], public banksMapByName: Map, public banksMapByMint: Map, diff --git a/ts/client/src/accounts/mangoAccount.ts b/ts/client/src/accounts/mangoAccount.ts index 4f3d92426..fbc6ef76d 100644 --- a/ts/client/src/accounts/mangoAccount.ts +++ b/ts/client/src/accounts/mangoAccount.ts @@ -869,7 +869,7 @@ export class MangoAccount { const hc = HealthCache.fromMangoAccount(group, this); const baseLots = hc.getMaxPerpForHealthRatio( perpMarket, - I80F48.fromNumber(perpMarket.uiPrice), + perpMarket.price, PerpOrderSide.bid, I80F48.fromNumber(2), ); @@ -896,7 +896,7 @@ export class MangoAccount { const hc = HealthCache.fromMangoAccount(group, this); const baseLots = hc.getMaxPerpForHealthRatio( perpMarket, - I80F48.fromNumber(perpMarket.uiPrice), + perpMarket.price, PerpOrderSide.ask, I80F48.fromNumber(2), ); @@ -919,7 +919,7 @@ export class MangoAccount { : PerpPosition.emptyFromPerpMarketIndex(perpMarket.perpMarketIndex), PerpOrderSide.bid, perpMarket.uiBaseToLots(size), - I80F48.fromNumber(perpMarket.uiPrice), + perpMarket.price, HealthType.init, ) .toNumber(); @@ -941,7 +941,7 @@ export class MangoAccount { : PerpPosition.emptyFromPerpMarketIndex(perpMarket.perpMarketIndex), PerpOrderSide.ask, perpMarket.uiBaseToLots(size), - I80F48.fromNumber(perpMarket.uiPrice), + perpMarket.price, HealthType.init, ) .toNumber(); diff --git a/tsconfig.types.json b/tsconfig.types.json index 982e90f2d..b2be9d5e6 100644 --- a/tsconfig.types.json +++ b/tsconfig.types.json @@ -1,6 +1,7 @@ { "extends": "./tsconfig", "compilerOptions": { + "noEmit": false, "outDir": "./dist/types", "declaration": true, "declarationMap": true, diff --git a/yarn.lock b/yarn.lock index 0510a2494..ae6da852a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2473,7 +2473,7 @@ tsutils@^3.21.0: dependencies: tslib "^1.8.1" -tweetnacl@^1.0.3: +tweetnacl@^1.0.0, tweetnacl@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596" integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==