@orca-so/whirlpool-sdk - npm Package Compare versions

Comparing version 0.0.31 to 0.0.32

dist/admin.d.ts

 import { TransactionBuilder, InitFeeTierParams } from "@orca-so/whirlpool-client-sdk";
 import { Address } from "@project-serum/anchor";
-import { InitWhirlpoolConfigsTxParam, SetCollectProtocolFeesAuthorityTxParam } from "./admin/public";
 import { WhirlpoolContext } from "./context";
+import { Keypair } from "@solana/web3.js";
 export declare type WhirlpoolAdmin = {
@@ -9,3 +9,3 @@ initConfig(params: InitWhirlpoolConfigsTxParam): TransactionBuilder;
     setFeeAuthority(newFeeAuthority: Address): TransactionBuilder;
-    setCollectProtocolFeeAuthority(param: SetCollectProtocolFeesAuthorityTxParam): TransactionBuilder;
+    setCollectProtocolFeeAuthority(newCollectProtocolFeesAuthority: Address): TransactionBuilder;
     setRewardEmissionsBySuperAuthority(rewardEmissionsSuperAuthority: Address, newRewardEmissionsSuperAuthority: Address): TransactionBuilder;
@@ -16,1 +16,8 @@ };
 }
+export declare type InitWhirlpoolConfigsTxParam = {
+    whirlpoolConfigKeypair: Keypair;
+    feeAuthority: Address;
+    collectProtocolFeesAuthority: Address;
+    rewardEmissionsSuperAuthority: Address;
+    defaultProtocolFeeRate: number;
+};

dist/admin.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WhirlpoolAdminInstance = void 0;
-const whirlpool_admin_impl_1 = require("./admin/whirlpool-admin-impl");
+const whirlpool_admin_impl_1 = require("./impl/whirlpool-admin-impl");
 class WhirlpoolAdminInstance {
@@ -6,0 +6,0 @@ static from(ctx) {

dist/admin/whirlpool-admin-impl.d.ts

@@ -8,3 +8,2 @@ import { TransactionBuilder, InitFeeTierParams } from "@orca-so/whirlpool-client-sdk";
     readonly ctx: WhirlpoolContext;
-    static from(): void;
     constructor(ctx: WhirlpoolContext);
@@ -11,0 +10,0 @@ initConfig(params: InitWhirlpoolConfigsTxParam): TransactionBuilder;

dist/admin/whirlpool-admin-impl.js

@@ -11,5 +11,2 @@ "use strict";
     }
-    static from() {
-        throw new Error("Method not implemented.");
-    }
     // TODO: Context dictates that we are current in an existing configAddress space.
@@ -16,0 +13,0 @@ // So it's a bit weird to have a WhirlpoolAdmin of a certain context initing another config

dist/context.d.ts

@@ -16,10 +16,10 @@ import { Whirlpool } from "@orca-so/whirlpool-client-sdk/dist/artifacts/whirlpool";
     readonly configAddress: PublicKey;
+    readonly provider: Provider;
+    readonly program: Program<Whirlpool>;
+    readonly accountFetcher: AccountFetcher;
     readonly connection: Connection;
     readonly wallet: Wallet;
     readonly opts: ConfirmOptions;
-    readonly program: Program<Whirlpool>;
-    readonly provider: Provider;
-    readonly accountFetcher: AccountFetcher;
     constructor(provider: Provider, configAddress?: PublicKey, network?: OrcaNetwork, // TODO: Why custom enum? Are there other networks?
     programId?: PublicKey);
 }

dist/pool/orca-pool.js

@@ -363,3 +363,3 @@ "use strict";
             const targetSqrtPriceLimitX64 = sqrtPriceLimitX64 || this.getDefaultSqrtPriceLimit(aToB);
-            const tickArrayAddresses = yield this.getTickArrayPublicKeysForSwap(whirlpool.sqrtPrice, targetSqrtPriceLimitX64, whirlpool.tickSpacing, (0, address_1.toPubKey)(poolAddress), this.dal.programId);
+            const tickArrayAddresses = yield this.getTickArrayPublicKeysForSwap(whirlpool.tickCurrentIndex, targetSqrtPriceLimitX64, whirlpool.tickSpacing, (0, address_1.toPubKey)(poolAddress), this.dal.programId, aToB);
             const oraclePda = (0, whirlpool_client_sdk_1.getOraclePda)(ctx.program.programId, (0, anchor_1.translateAddress)(poolAddress));
@@ -391,9 +391,9 @@ txBuilder.addInstruction(client
     }
-    getTickArrayPublicKeysForSwap(currentSqrtPriceX64, targetSqrtPriceX64, tickSpacing, poolAddress, programId) {
+    getTickArrayPublicKeysForSwap(tickCurrentIndex, targetSqrtPriceX64, tickSpacing, poolAddress, programId, aToB) {
         return __awaiter(this, void 0, void 0, function* () {
-            const currentTickIndex = (0, whirlpool_client_sdk_1.sqrtPriceX64ToTickIndex)(currentSqrtPriceX64);
+            const nextInitializableTickIndex = tick_util_1.TickUtil.getNextInitializableTickIndex(tickCurrentIndex, tickSpacing, aToB);
             const targetTickIndex = (0, whirlpool_client_sdk_1.sqrtPriceX64ToTickIndex)(targetSqrtPriceX64);
-            let currentStartTickIndex = tick_util_1.TickUtil.getStartTickIndex(currentTickIndex, tickSpacing);
+            let currentStartTickIndex = tick_util_1.TickUtil.getStartTickIndex(nextInitializableTickIndex, tickSpacing);
             const targetStartTickIndex = tick_util_1.TickUtil.getStartTickIndex(targetTickIndex, tickSpacing);
-            const offset = currentTickIndex < targetTickIndex ? 1 : -1;
+            const offset = nextInitializableTickIndex < targetTickIndex ? 1 : -1;
             let count = 1;
@@ -405,4 +405,4 @@ const tickArrayAddresses = [
             ];
-            while (currentStartTickIndex != targetStartTickIndex && count < 3) {
-                const nextStartTickIndex = tick_util_1.TickUtil.getStartTickIndex(currentTickIndex, tickSpacing, offset * count);
+            while (currentStartTickIndex !== targetStartTickIndex && count < 3) {
+                const nextStartTickIndex = tick_util_1.TickUtil.getStartTickIndex(nextInitializableTickIndex, tickSpacing, offset * count);
                 const nextTickArrayAddress = (0, whirlpool_client_sdk_1.getTickArrayPda)(programId, poolAddress, nextStartTickIndex).publicKey;
@@ -409,0 +409,0 @@ const nextTickArray = yield this.dal.getTickArray(nextTickArrayAddress, false);

dist/quotes/quotes.d.ts

 import { WhirlpoolContext } from "../context";
-import { OpenPositionQuoteParam, OpenPositionQuote, ClosePositionQuoteParam, ClosePositionQuote, SwapQuoteParam, SwapQuote } from "../pool/public";
+import { ClosePositionQuote, ClosePositionQuoteParam, OpenPositionQuote, OpenPositionQuoteParam, SwapQuote, SwapQuoteParam } from "./types";
 /**
@@ -4,0 +4,0 @@ * Construct a quote for opening a new position

dist/quotes/quotes.js

@@ -20,9 +20,9 @@ "use strict";
 const public_1 = require("../constants/public");
-const public_2 = require("../pool/public");
 const add_liquidity_1 = require("./add-liquidity");
 const address_1 = require("../utils/address");
-const public_3 = require("../utils/public");
+const public_2 = require("../utils/public");
 const tick_util_1 = require("../utils/whirlpool/tick-util");
 const swap_quoter_1 = require("./swap-quoter");
 const remove_liquidity_1 = require("./remove-liquidity");
+const types_1 = require("./types");
 /**
@@ -40,3 +40,3 @@ * Construct a quote for opening a new position
         let tickUpperIndex = undefined;
-        if ((0, public_2.isQuoteByTickIndex)(param)) {
+        if ((0, types_1.isQuoteByTickIndex)(param)) {
             tickLowerIndex = param.tickLowerIndex;
@@ -46,3 +46,3 @@ tickUpperIndex = param.tickUpperIndex;
         else {
-            (0, tiny_invariant_1.default)((0, public_2.isQuoteByPrice)(param), "invalid OpenPositionQuoteParam");
+            (0, tiny_invariant_1.default)((0, types_1.isQuoteByPrice)(param), "invalid OpenPositionQuoteParam");
             tickLowerIndex = tick_util_1.TickUtil.toValid((0, whirlpool_client_sdk_1.sqrtPriceX64ToTickIndex)((0, whirlpool_client_sdk_1.toX64)(param.priceLower.sqrt())), whirlpool.tickSpacing);
@@ -123,3 +123,3 @@ tickUpperIndex = tick_util_1.TickUtil.toValid((0, whirlpool_client_sdk_1.sqrtPriceX64ToTickIndex)((0, whirlpool_client_sdk_1.toX64)(param.priceUpper.sqrt())), whirlpool.tickSpacing);
         });
-        const otherAmountThreshold = (0, public_3.adjustAmountForSlippage)(amountIn, amountOut, slippageTolerance, amountSpecified);
+        const otherAmountThreshold = (0, public_2.adjustAmountForSlippage)(amountIn, amountOut, slippageTolerance, amountSpecified);
         return {
@@ -126,0 +126,0 @@ poolAddress,

dist/utils/whirlpool/tick-util.d.ts

@@ -43,2 +43,3 @@ /// <reference types="bn.js" />
     private static tickArrayIndexToTickIndex;
+    static getNextInitializableTickIndex(tickIndex: number, tickSpacing: number, aToB: boolean): number;
 }

dist/utils/whirlpool/tick-util.js

@@ -102,3 +102,11 @@ "use strict";
     }
+    static getNextInitializableTickIndex(tickIndex, tickSpacing, aToB) {
+        if (!aToB) {
+            return tickIndex + tickSpacing;
+        }
+        else {
+            return tickIndex;
+        }
+    }
 }
 exports.TickUtil = TickUtil;

dist/whirlpool.d.ts

@@ -1,9 +0,8 @@
-import { Address } from "@project-serum/anchor";
+import { Address, BN } from "@project-serum/anchor";
 import { PublicKey } from "@solana/web3.js";
-import { ClosePositionQuote, OpenPositionQuote, SwapQuote } from "./pool/public/types";
+import { ClosePositionQuote, OpenPositionQuote, SwapQuote } from "./quotes/types";
 import { MultiTransactionBuilder } from "./utils/public/multi-transaction-builder";
 import { TransactionBuilder, WhirlpoolData, TickSpacing } from "@orca-so/whirlpool-client-sdk";
 import { WhirlpoolContext } from "./context";
-import { InitPoolTxParam, InitRewardTxParam, SetRewardAuthorityTxParam, SetRewardEmissionsTxParam } from "./admin/public";
-import { LiquidityDistribution } from "./pool/ux/liquidity-distribution";
+import { LiquidityDistribution } from "./impl/liquidity-distribution";
 export declare type Whirlpool = {
@@ -32,4 +31,4 @@ getAddress(): PublicKey;
     };
-    setRewardAuthority(param: SetRewardAuthorityTxParam): TransactionBuilder;
-    setRewardEmissions(param: SetRewardEmissionsTxParam): Promise<TransactionBuilder>;
+    setRewardAuthority(newRewardAuthority: Address, rewardIndex: number): TransactionBuilder;
+    setRewardEmissions(rewardIndex: number, emissionsPerSecondX64: BN): Promise<TransactionBuilder>;
     setRewardAuthorityBySuperAuthority(newRewardAuthority: Address, rewardIndex: number): TransactionBuilder;
@@ -41,1 +40,12 @@ };
 }
+export declare type InitPoolTxParam = {
+    initSqrtPrice: BN;
+    tokenMintA: Address;
+    tokenMintB: Address;
+    tickSpacing: TickSpacing;
+};
+export declare type InitRewardTxParam = {
+    rewardAuthority: Address;
+    rewardMint: Address;
+    rewardIndex: number;
+};

dist/whirlpool.js

@@ -6,3 +6,3 @@ "use strict";
 const whirlpool_client_sdk_1 = require("@orca-so/whirlpool-client-sdk");
-const whirlpool_impl_1 = require("./pool/whirlpool-impl");
+const whirlpool_impl_1 = require("./impl/whirlpool-impl");
 const address_1 = require("./utils/address");
@@ -9,0 +9,0 @@ const pool_util_1 = require("./utils/whirlpool/pool-util");

package.json

 {
   "name": "@orca-so/whirlpool-sdk",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "description": "Whirlpool SDK for the Orca protocol.",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

README.md

@@ -111,3 +111,3 @@ > Note: This is a pre-release. The public APIs are subject to change in the coming weeks.
 
-If you found a bug, open up an issue on github with the prefix [ISSUE]. To help us be more effective in resolving the problem, be specific in the steps it took to reproduce the problem (ex. when did the issue occur, code samples, debug logs etc).
+If you found a bug, please message the team over at @integrations on Discord.
 
@@ -114,0 +114,0 @@ # License

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

455817

increased by17.53%

Number of package files

148

increased by10.45%

Lines of code

9059

increased by16.22%

No dependency changes