@strkfarm/sdk 1.1.49 → 1.1.50

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/index.browser.global.js +20 -6
  2. package/dist/index.browser.mjs +20 -6
  3. package/dist/index.js +20 -6
  4. package/dist/index.mjs +20 -6
  5. package/package.json +1 -1
  6. package/src/strategies/ekubo-cl-vault.tsx +30 -11
package/dist/index.browser.global.js CHANGED
@@ -79681,13 +79681,27 @@ spurious results.`);
79681
79681
  const tvlBefore = await this._getTVL(blockBefore);
79682
79682
  const supplyBefore = await this.totalSupply(blockBefore);
79683
79683
  const priceBefore = await this.getCurrentPrice(blockBefore);
79684
- const tvlInToken0Now = tvlNow.amount0.multipliedBy(priceNow.price).plus(tvlNow.amount1);
79685
- const tvlPerShareNow = tvlInToken0Now.multipliedBy(1e18).dividedBy(adjustedSupplyNow.toString());
79686
- const tvlInToken0Bf = tvlBefore.amount0.multipliedBy(priceBefore.price).plus(tvlBefore.amount1);
79687
- const tvlPerShareBf = tvlInToken0Bf.multipliedBy(1e18).dividedBy(supplyBefore.toString());
79684
+ const poolKey = await this.getPoolKey(blockBefore);
79685
+ logger2.verbose(`priceBefore: ${priceBefore.price.toString()}`);
79686
+ logger2.verbose(`priceNow: ${priceNow.price.toString()}`);
79687
+ logger2.verbose(`tvlBefore: ${JSON.stringify(tvlBefore)}`);
79688
+ logger2.verbose(`tvlNow: ${JSON.stringify(tvlNow)}`);
79689
+ const isQuoteTokenToken0 = this.metadata.additionalInfo.quoteAsset.address.eq(poolKey.token0);
79690
+ logger2.verbose(`isQuoteTokenToken0: ${isQuoteTokenToken0}`);
79691
+ let tvlBeforeInBaseAsset = Web3Number.fromWei(0, this.metadata.additionalInfo.quoteAsset.decimals);
79692
+ let tvlNowInBaseAsset = Web3Number.fromWei(0, this.metadata.additionalInfo.quoteAsset.decimals);
79693
+ if (!isQuoteTokenToken0) {
79694
+ tvlNowInBaseAsset = tvlNow.amount0.multipliedBy(priceNow.price).plus(tvlNow.amount1);
79695
+ tvlBeforeInBaseAsset = tvlBefore.amount0.multipliedBy(priceBefore.price).plus(tvlBefore.amount1);
79696
+ } else {
79697
+ tvlNowInBaseAsset = tvlNow.amount1.multipliedBy(1 / priceNow.price).plus(tvlNow.amount0);
79698
+ tvlBeforeInBaseAsset = tvlBefore.amount1.multipliedBy(1 / priceBefore.price).plus(tvlBefore.amount0);
79699
+ }
79700
+ const tvlPerShareNow = tvlNowInBaseAsset.multipliedBy(1e18).dividedBy(adjustedSupplyNow.toString());
79701
+ const tvlPerShareBf = tvlBeforeInBaseAsset.multipliedBy(1e18).dividedBy(supplyBefore.toString());
79688
79702
  const timeDiffSeconds = blockNowTime - blockBeforeInfo.timestamp;
79689
- logger2.verbose(`tvlInToken0Now: ${tvlInToken0Now.toString()}`);
79690
- logger2.verbose(`tvlInToken0Bf: ${tvlInToken0Bf.toString()}`);
79703
+ logger2.verbose(`tvlNowInBaseAsset: ${tvlNowInBaseAsset.toString()}`);
79704
+ logger2.verbose(`tvlBeforeInBaseAsset: ${tvlBeforeInBaseAsset.toString()}`);
79691
79705
  logger2.verbose(`tvlPerShareNow: ${tvlPerShareNow.toString()}`);
79692
79706
  logger2.verbose(`tvlPerShareBf: ${tvlPerShareBf.toString()}`);
79693
79707
  logger2.verbose(`Price before: ${priceBefore.price.toString()}`);
package/dist/index.browser.mjs CHANGED
@@ -15758,13 +15758,27 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
15758
15758
  const tvlBefore = await this._getTVL(blockBefore);
15759
15759
  const supplyBefore = await this.totalSupply(blockBefore);
15760
15760
  const priceBefore = await this.getCurrentPrice(blockBefore);
15761
- const tvlInToken0Now = tvlNow.amount0.multipliedBy(priceNow.price).plus(tvlNow.amount1);
15762
- const tvlPerShareNow = tvlInToken0Now.multipliedBy(1e18).dividedBy(adjustedSupplyNow.toString());
15763
- const tvlInToken0Bf = tvlBefore.amount0.multipliedBy(priceBefore.price).plus(tvlBefore.amount1);
15764
- const tvlPerShareBf = tvlInToken0Bf.multipliedBy(1e18).dividedBy(supplyBefore.toString());
15761
+ const poolKey = await this.getPoolKey(blockBefore);
15762
+ logger.verbose(`priceBefore: ${priceBefore.price.toString()}`);
15763
+ logger.verbose(`priceNow: ${priceNow.price.toString()}`);
15764
+ logger.verbose(`tvlBefore: ${JSON.stringify(tvlBefore)}`);
15765
+ logger.verbose(`tvlNow: ${JSON.stringify(tvlNow)}`);
15766
+ const isQuoteTokenToken0 = this.metadata.additionalInfo.quoteAsset.address.eq(poolKey.token0);
15767
+ logger.verbose(`isQuoteTokenToken0: ${isQuoteTokenToken0}`);
15768
+ let tvlBeforeInBaseAsset = Web3Number.fromWei(0, this.metadata.additionalInfo.quoteAsset.decimals);
15769
+ let tvlNowInBaseAsset = Web3Number.fromWei(0, this.metadata.additionalInfo.quoteAsset.decimals);
15770
+ if (!isQuoteTokenToken0) {
15771
+ tvlNowInBaseAsset = tvlNow.amount0.multipliedBy(priceNow.price).plus(tvlNow.amount1);
15772
+ tvlBeforeInBaseAsset = tvlBefore.amount0.multipliedBy(priceBefore.price).plus(tvlBefore.amount1);
15773
+ } else {
15774
+ tvlNowInBaseAsset = tvlNow.amount1.multipliedBy(1 / priceNow.price).plus(tvlNow.amount0);
15775
+ tvlBeforeInBaseAsset = tvlBefore.amount1.multipliedBy(1 / priceBefore.price).plus(tvlBefore.amount0);
15776
+ }
15777
+ const tvlPerShareNow = tvlNowInBaseAsset.multipliedBy(1e18).dividedBy(adjustedSupplyNow.toString());
15778
+ const tvlPerShareBf = tvlBeforeInBaseAsset.multipliedBy(1e18).dividedBy(supplyBefore.toString());
15765
15779
  const timeDiffSeconds = blockNowTime - blockBeforeInfo.timestamp;
15766
- logger.verbose(`tvlInToken0Now: ${tvlInToken0Now.toString()}`);
15767
- logger.verbose(`tvlInToken0Bf: ${tvlInToken0Bf.toString()}`);
15780
+ logger.verbose(`tvlNowInBaseAsset: ${tvlNowInBaseAsset.toString()}`);
15781
+ logger.verbose(`tvlBeforeInBaseAsset: ${tvlBeforeInBaseAsset.toString()}`);
15768
15782
  logger.verbose(`tvlPerShareNow: ${tvlPerShareNow.toString()}`);
15769
15783
  logger.verbose(`tvlPerShareBf: ${tvlPerShareBf.toString()}`);
15770
15784
  logger.verbose(`Price before: ${priceBefore.price.toString()}`);
package/dist/index.js CHANGED
@@ -15758,13 +15758,27 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
15758
15758
  const tvlBefore = await this._getTVL(blockBefore);
15759
15759
  const supplyBefore = await this.totalSupply(blockBefore);
15760
15760
  const priceBefore = await this.getCurrentPrice(blockBefore);
15761
- const tvlInToken0Now = tvlNow.amount0.multipliedBy(priceNow.price).plus(tvlNow.amount1);
15762
- const tvlPerShareNow = tvlInToken0Now.multipliedBy(1e18).dividedBy(adjustedSupplyNow.toString());
15763
- const tvlInToken0Bf = tvlBefore.amount0.multipliedBy(priceBefore.price).plus(tvlBefore.amount1);
15764
- const tvlPerShareBf = tvlInToken0Bf.multipliedBy(1e18).dividedBy(supplyBefore.toString());
15761
+ const poolKey = await this.getPoolKey(blockBefore);
15762
+ logger.verbose(`priceBefore: ${priceBefore.price.toString()}`);
15763
+ logger.verbose(`priceNow: ${priceNow.price.toString()}`);
15764
+ logger.verbose(`tvlBefore: ${JSON.stringify(tvlBefore)}`);
15765
+ logger.verbose(`tvlNow: ${JSON.stringify(tvlNow)}`);
15766
+ const isQuoteTokenToken0 = this.metadata.additionalInfo.quoteAsset.address.eq(poolKey.token0);
15767
+ logger.verbose(`isQuoteTokenToken0: ${isQuoteTokenToken0}`);
15768
+ let tvlBeforeInBaseAsset = Web3Number.fromWei(0, this.metadata.additionalInfo.quoteAsset.decimals);
15769
+ let tvlNowInBaseAsset = Web3Number.fromWei(0, this.metadata.additionalInfo.quoteAsset.decimals);
15770
+ if (!isQuoteTokenToken0) {
15771
+ tvlNowInBaseAsset = tvlNow.amount0.multipliedBy(priceNow.price).plus(tvlNow.amount1);
15772
+ tvlBeforeInBaseAsset = tvlBefore.amount0.multipliedBy(priceBefore.price).plus(tvlBefore.amount1);
15773
+ } else {
15774
+ tvlNowInBaseAsset = tvlNow.amount1.multipliedBy(1 / priceNow.price).plus(tvlNow.amount0);
15775
+ tvlBeforeInBaseAsset = tvlBefore.amount1.multipliedBy(1 / priceBefore.price).plus(tvlBefore.amount0);
15776
+ }
15777
+ const tvlPerShareNow = tvlNowInBaseAsset.multipliedBy(1e18).dividedBy(adjustedSupplyNow.toString());
15778
+ const tvlPerShareBf = tvlBeforeInBaseAsset.multipliedBy(1e18).dividedBy(supplyBefore.toString());
15765
15779
  const timeDiffSeconds = blockNowTime - blockBeforeInfo.timestamp;
15766
- logger.verbose(`tvlInToken0Now: ${tvlInToken0Now.toString()}`);
15767
- logger.verbose(`tvlInToken0Bf: ${tvlInToken0Bf.toString()}`);
15780
+ logger.verbose(`tvlNowInBaseAsset: ${tvlNowInBaseAsset.toString()}`);
15781
+ logger.verbose(`tvlBeforeInBaseAsset: ${tvlBeforeInBaseAsset.toString()}`);
15768
15782
  logger.verbose(`tvlPerShareNow: ${tvlPerShareNow.toString()}`);
15769
15783
  logger.verbose(`tvlPerShareBf: ${tvlPerShareBf.toString()}`);
15770
15784
  logger.verbose(`Price before: ${priceBefore.price.toString()}`);
package/dist/index.mjs CHANGED
@@ -15656,13 +15656,27 @@ var EkuboCLVault = class _EkuboCLVault extends BaseStrategy {
15656
15656
  const tvlBefore = await this._getTVL(blockBefore);
15657
15657
  const supplyBefore = await this.totalSupply(blockBefore);
15658
15658
  const priceBefore = await this.getCurrentPrice(blockBefore);
15659
- const tvlInToken0Now = tvlNow.amount0.multipliedBy(priceNow.price).plus(tvlNow.amount1);
15660
- const tvlPerShareNow = tvlInToken0Now.multipliedBy(1e18).dividedBy(adjustedSupplyNow.toString());
15661
- const tvlInToken0Bf = tvlBefore.amount0.multipliedBy(priceBefore.price).plus(tvlBefore.amount1);
15662
- const tvlPerShareBf = tvlInToken0Bf.multipliedBy(1e18).dividedBy(supplyBefore.toString());
15659
+ const poolKey = await this.getPoolKey(blockBefore);
15660
+ logger.verbose(`priceBefore: ${priceBefore.price.toString()}`);
15661
+ logger.verbose(`priceNow: ${priceNow.price.toString()}`);
15662
+ logger.verbose(`tvlBefore: ${JSON.stringify(tvlBefore)}`);
15663
+ logger.verbose(`tvlNow: ${JSON.stringify(tvlNow)}`);
15664
+ const isQuoteTokenToken0 = this.metadata.additionalInfo.quoteAsset.address.eq(poolKey.token0);
15665
+ logger.verbose(`isQuoteTokenToken0: ${isQuoteTokenToken0}`);
15666
+ let tvlBeforeInBaseAsset = Web3Number.fromWei(0, this.metadata.additionalInfo.quoteAsset.decimals);
15667
+ let tvlNowInBaseAsset = Web3Number.fromWei(0, this.metadata.additionalInfo.quoteAsset.decimals);
15668
+ if (!isQuoteTokenToken0) {
15669
+ tvlNowInBaseAsset = tvlNow.amount0.multipliedBy(priceNow.price).plus(tvlNow.amount1);
15670
+ tvlBeforeInBaseAsset = tvlBefore.amount0.multipliedBy(priceBefore.price).plus(tvlBefore.amount1);
15671
+ } else {
15672
+ tvlNowInBaseAsset = tvlNow.amount1.multipliedBy(1 / priceNow.price).plus(tvlNow.amount0);
15673
+ tvlBeforeInBaseAsset = tvlBefore.amount1.multipliedBy(1 / priceBefore.price).plus(tvlBefore.amount0);
15674
+ }
15675
+ const tvlPerShareNow = tvlNowInBaseAsset.multipliedBy(1e18).dividedBy(adjustedSupplyNow.toString());
15676
+ const tvlPerShareBf = tvlBeforeInBaseAsset.multipliedBy(1e18).dividedBy(supplyBefore.toString());
15663
15677
  const timeDiffSeconds = blockNowTime - blockBeforeInfo.timestamp;
15664
- logger.verbose(`tvlInToken0Now: ${tvlInToken0Now.toString()}`);
15665
- logger.verbose(`tvlInToken0Bf: ${tvlInToken0Bf.toString()}`);
15678
+ logger.verbose(`tvlNowInBaseAsset: ${tvlNowInBaseAsset.toString()}`);
15679
+ logger.verbose(`tvlBeforeInBaseAsset: ${tvlBeforeInBaseAsset.toString()}`);
15666
15680
  logger.verbose(`tvlPerShareNow: ${tvlPerShareNow.toString()}`);
15667
15681
  logger.verbose(`tvlPerShareBf: ${tvlPerShareBf.toString()}`);
15668
15682
  logger.verbose(`Price before: ${priceBefore.price.toString()}`);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@strkfarm/sdk",
3
- "version": "1.1.49",
3
+ "version": "1.1.50",
4
4
  "description": "STRKFarm TS SDK (Meant for our internal use, but feel free to use it)",
5
5
  "typings": "dist/index.d.ts",
6
6
  "types": "dist/index.d.ts",
package/src/strategies/ekubo-cl-vault.tsx CHANGED
@@ -416,22 +416,41 @@ export class EkuboCLVault extends BaseStrategy<
416
416
  const tvlBefore = await this._getTVL(blockBefore);
417
417
  const supplyBefore = await this.totalSupply(blockBefore);
418
418
  const priceBefore = await this.getCurrentPrice(blockBefore);
419
-
420
- const tvlInToken0Now = (tvlNow.amount0
421
- .multipliedBy(priceNow.price))
422
- .plus(tvlNow.amount1);
423
- const tvlPerShareNow = tvlInToken0Now
419
+ const poolKey = await this.getPoolKey(blockBefore);
420
+ logger.verbose(`priceBefore: ${priceBefore.price.toString()}`);
421
+ logger.verbose(`priceNow: ${priceNow.price.toString()}`);
422
+ logger.verbose(`tvlBefore: ${JSON.stringify(tvlBefore)}`);
423
+ logger.verbose(`tvlNow: ${JSON.stringify(tvlNow)}`);
424
+
425
+ const isQuoteTokenToken0 = this.metadata.additionalInfo.quoteAsset.address.eq(poolKey.token0);
426
+ logger.verbose(`isQuoteTokenToken0: ${isQuoteTokenToken0}`);
427
+ let tvlBeforeInBaseAsset = Web3Number.fromWei(0, this.metadata.additionalInfo.quoteAsset.decimals);
428
+ let tvlNowInBaseAsset = Web3Number.fromWei(0, this.metadata.additionalInfo.quoteAsset.decimals);
429
+ if (!isQuoteTokenToken0) {
430
+ tvlNowInBaseAsset = (tvlNow.amount0
431
+ .multipliedBy(priceNow.price))
432
+ .plus(tvlNow.amount1);
433
+ tvlBeforeInBaseAsset = (tvlBefore.amount0
434
+ .multipliedBy(priceBefore.price))
435
+ .plus(tvlBefore.amount1);
436
+ } else {
437
+ tvlNowInBaseAsset = (tvlNow.amount1
438
+ .multipliedBy(1 / priceNow.price))
439
+ .plus(tvlNow.amount0);
440
+ tvlBeforeInBaseAsset = (tvlBefore.amount1
441
+ .multipliedBy(1 / priceBefore.price))
442
+ .plus(tvlBefore.amount0);
443
+ }
444
+ const tvlPerShareNow = tvlNowInBaseAsset
424
445
  .multipliedBy(1e18)
425
446
  .dividedBy(adjustedSupplyNow.toString());
426
- const tvlInToken0Bf = (tvlBefore.amount0
427
- .multipliedBy(priceBefore.price))
428
- .plus(tvlBefore.amount1);
429
- const tvlPerShareBf = tvlInToken0Bf
447
+
448
+ const tvlPerShareBf = tvlBeforeInBaseAsset
430
449
  .multipliedBy(1e18)
431
450
  .dividedBy(supplyBefore.toString());
432
451
  const timeDiffSeconds = blockNowTime - blockBeforeInfo.timestamp;
433
- logger.verbose(`tvlInToken0Now: ${tvlInToken0Now.toString()}`);
434
- logger.verbose(`tvlInToken0Bf: ${tvlInToken0Bf.toString()}`);
452
+ logger.verbose(`tvlNowInBaseAsset: ${tvlNowInBaseAsset.toString()}`);
453
+ logger.verbose(`tvlBeforeInBaseAsset: ${tvlBeforeInBaseAsset.toString()}`);
435
454
  logger.verbose(`tvlPerShareNow: ${tvlPerShareNow.toString()}`);
436
455
  logger.verbose(`tvlPerShareBf: ${tvlPerShareBf.toString()}`);
437
456
  logger.verbose(`Price before: ${priceBefore.price.toString()}`);