@gearbox-protocol/sdk 15.1.0-next.21 → 15.1.0-next.22

package/dist/cjs/sdk/market/oracle/PriceOracleBaseContract.js

@@ -138,6 +138,17 @@ var PriceOracleBaseContract = class extends require_sdk_base_BaseContract.BaseCo
 		return amount * 10n ** BigInt(this.tokensMeta.decimals(token)) / price;
 	}
 	/**
+	* {@inheritDoc IPriceOracleContract.safeConvert}
+	**/
+	safeConvert(from, to, amount) {
+		try {
+			return this.convert(from, to, amount);
+		} catch (e) {
+			this.logger?.debug(`cannot convert ${this.labelAddress(from)} to ${this.labelAddress(to)}: ${e}`);
+			return null;
+		}
+	}
+	/**
 	* {@inheritDoc IPriceOracleContract.safeConvertToUSD}
 	**/
 	safeConvertToUSD(token, amount) {

package/dist/cjs/sdk/positions/PositionsService.js

@@ -154,6 +154,24 @@ var PositionsService = class extends require_sdk_base_SDKConstruct.SDKConstruct
 		const borrowRate = this.borrowRate(snapshot);
 		const timeToLiquidation = this.timeToLiquidation(snapshot);
 		const liquidationPrice = this.liquidationPrice(snapshot);
+		const zeroDebt = ca.debt === 0n;
+		const collaterals = [];
+		let totalValue = zeroDebt ? 0n : ca.totalValue;
+		let totalValueUSD = zeroDebt ? 0n : ca.totalValueUSD;
+		for (const t of ca.tokens) {
+			if (t.balance <= 10n) continue;
+			collaterals.push({
+				collateral: priceOracle.toTokenAmount(t.token, t.balance),
+				quota: priceOracle.toTokenAmount(market.underlying, t.quota),
+				withdrawals: withdrawals.get(t.token) ?? []
+			});
+			if (zeroDebt) {
+				const value = priceOracle.safeConvert(t.token, market.underlying, t.balance) || 0n;
+				totalValue += value;
+				const usd = priceOracle.safeConvertToUSD(t.token, t.balance) || 0n;
+				totalValueUSD += usd;
+			}
+		}
 		return {
 			kind: "strategy",
 			chainId: this.sdk.chainId,
@@ -161,7 +179,7 @@ var PositionsService = class extends require_sdk_base_SDKConstruct.SDKConstruct
 			creditAccount: ca.creditAccount,
 			name: target ? require_sdk_market_strategyName.strategyName(this.sdk.tokensMeta.mustGetToken(target), token, this.sdk.chainId) : token.symbol,
 			targetCollateral: target ? this.sdk.tokensMeta.mustGetToken(target) : null,
-			leverage: require_sdk_market_math.calcPositionLeverage(ca.totalValue, totalDebtValue),
+			leverage: require_sdk_market_math.calcPositionLeverage(totalValue, totalDebtValue),
 			borrowApy: require_sdk_market_math.calcBorrowApy(pool.baseInterestRate, suite.creditManager.feeInterest),
 			totalDebt: {
 				token,
@@ -170,21 +188,14 @@ var PositionsService = class extends require_sdk_base_SDKConstruct.SDKConstruct
 			},
 			totalValue: {
 				token,
-				value: ca.totalValue,
-				valueUsd: require_sdk_market_math.usdToNumber(ca.totalValueUSD)
+				value: totalValue,
+				valueUsd: require_sdk_market_math.usdToNumber(totalValueUSD)
 			},
 			healthFactor: require_sdk_market_math.healthFactorBps(ca.healthFactor),
 			borrowRate,
 			timeToLiquidation,
 			liquidationPrice,
-			collaterals: ca.tokens.flatMap((t) => {
-				if (t.balance <= 10n) return [];
-				return [{
-					collateral: priceOracle.toTokenAmount(t.token, t.balance),
-					quota: priceOracle.toTokenAmount(market.underlying, t.quota),
-					withdrawals: withdrawals.get(t.token) ?? []
-				}];
-			})
+			collaterals
 		};
 	}
 	/**

package/dist/esm/dev/AccountOpener.js

@@ -1,9 +1,9 @@
-import { ierc20Abi } from "../abi/iERC20.js";
 import { iCreditFacadeV310Abi } from "../abi/310/generated.js";
 import { AddressMap } from "../sdk/utils/AddressMap.js";
 import { AddressSet } from "../sdk/utils/AddressSet.js";
 import { AssetsMap } from "../sdk/utils/AssetsMap.js";
 import { childLogger } from "../sdk/utils/childLogger.js";
+import { ierc20Abi } from "../abi/iERC20.js";
 import "../sdk/constants/addresses.js";
 import { MAX_UINT256, PERCENTAGE_FACTOR } from "../sdk/constants/math.js";
 import { SDKConstruct } from "../sdk/base/SDKConstruct.js";

package/dist/esm/dev/withdrawalUtils.js

@@ -1,6 +1,6 @@
-import { iWithdrawalCompressorV313Abi } from "../abi/IWithdrawalCompressorV313.js";
 import { getNetworkType } from "../sdk/chain/chains.js";
 import { getWithdrawalCompressorAddress } from "../sdk/accounts/withdrawal-compressor/addresses.js";
+import { iWithdrawalCompressorV313Abi } from "../abi/IWithdrawalCompressorV313.js";
 import "../sdk/index.js";
 import { iMidasDataFeedAbi, iMidasRedemptionVaultAbi, midasGatewayAbi, midasRedeemerAbi, midasRedemptionVaultPhantomTokenAbi, securitizeRedeemerAbi, securitizeRedemptionGatewayAbi, securitizeRedemptionPhantomTokenAbi } from "./withdrawalAbi.js";
 import { erc20Abi, hexToString, parseAbi, parseEther } from "viem";

package/dist/esm/preview/simulate/simulatePoolOperation.js

@@ -1,5 +1,5 @@
-import { iZapperAbi } from "../../abi/iZapper.js";
 import { iPoolV310Abi } from "../../abi/310/generated.js";
+import { iZapperAbi } from "../../abi/iZapper.js";
 import { asPreviewSimulationError } from "./errors.js";
 //#region src/preview/simulate/simulatePoolOperation.ts
 function previewRead(operation) {

package/dist/esm/preview/trace/extractTransfers.js

@@ -1,6 +1,6 @@
-import { ierc20Abi } from "../../abi/iERC20.js";
 import { iCreditFacadeV310Abi } from "../../abi/310/generated.js";
 import { AddressMap } from "../../sdk/utils/AddressMap.js";
+import { ierc20Abi } from "../../abi/iERC20.js";
 import "../../sdk/index.js";
 import { UnexpectedFacadeEventOrderError } from "./errors.js";
 import { getAddress, isAddressEqual, parseEventLogs } from "viem";

package/dist/esm/sdk/accounts/CreditAccountsServiceV310.js

@@ -1,5 +1,3 @@
-import { iBaseRewardPoolAbi } from "../../abi/iBaseRewardPool.js";
-import { ierc4626AdapterAbi } from "../../abi/ierc4626Adapter.js";
 import { AP_REWARDS_COMPRESSOR } from "../constants/address-provider.js";
 import { ADDRESS_0X0 } from "../constants/addresses.js";
 import { MAX_UINT256 } from "../constants/math.js";
@@ -10,6 +8,8 @@ import "../base/index.js";
 import { AccountBotsService } from "./bots/AccountBotsService.js";
 import "./bots/index.js";
 import { rewardsCompressorAbi } from "../../abi/compressors/rewardsCompressor.js";
+import { iBaseRewardPoolAbi } from "../../abi/iBaseRewardPool.js";
+import { ierc4626AdapterAbi } from "../../abi/ierc4626Adapter.js";
 import { expectedBalanceDeltas } from "../market/credit/expectedBalanceDeltas.js";
 import "../market/index.js";
 import { CreditAccountCompressor } from "./credit-account-compressor/CreditAccountCompressor.js";

package/dist/esm/sdk/accounts/liquidations/LiquidationsService.js

@@ -1,4 +1,3 @@
-import { iLiquidationCompressorV313Abi } from "../../../abi/ILiquidationCompressorV313.js";
 import { AddressSet } from "../../utils/AddressSet.js";
 import { bytes32ToString } from "../../utils/bytes32ToString.js";
 import { ADDRESS_0X0 } from "../../constants/addresses.js";
@@ -20,6 +19,7 @@ import { SecuritizeLiquidatorContract } from "../../market/rwa/securitize/Securi
 import "../../market/rwa/securitize/index.js";
 import "../../market/index.js";
 import { LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS } from "./constants.js";
+import { iLiquidationCompressorV313Abi } from "../../../abi/ILiquidationCompressorV313.js";
 //#region src/sdk/accounts/liquidations/LiquidationsService.ts
 /**
 * Service for discovering liquidatable credit accounts and previewing manual

package/dist/esm/sdk/accounts/withdrawal-compressor/RedemptionLoggerV310Contract.js

@@ -1,7 +1,7 @@
-import { iRedemptionLoggerV310Abi } from "../../../abi/iRedemptionLoggerV310.js";
 import { BaseContract } from "../../base/BaseContract.js";
 import "../../base/index.js";
 import { decodeDelayedIntent } from "./intent-codec.js";
+import { iRedemptionLoggerV310Abi } from "../../../abi/iRedemptionLoggerV310.js";
 import { InvalidDelayedIntentError } from "./errors.js";
 //#region src/sdk/accounts/withdrawal-compressor/RedemptionLoggerV310Contract.ts
 const abi = iRedemptionLoggerV310Abi;

package/dist/esm/sdk/accounts/withdrawal-compressor/WithdrawalCompressorV310Contract.js

@@ -1,5 +1,5 @@
-import { iWithdrawalCompressorV310Abi } from "../../../abi/IWithdrawalCompressorV310.js";
 import { AbstractWithdrawalCompressorContract } from "./AbstractWithdrawalCompressorContract.js";
+import { iWithdrawalCompressorV310Abi } from "../../../abi/IWithdrawalCompressorV310.js";
 //#region src/sdk/accounts/withdrawal-compressor/WithdrawalCompressorV310Contract.ts
 const abi = iWithdrawalCompressorV310Abi;
 /**

package/dist/esm/sdk/accounts/withdrawal-compressor/WithdrawalCompressorV311Contract.js

@@ -1,5 +1,5 @@
-import { iWithdrawalCompressorV311Abi } from "../../../abi/IWithdrawalCompressorV311.js";
 import { AbstractWithdrawalCompressorContract } from "./AbstractWithdrawalCompressorContract.js";
+import { iWithdrawalCompressorV311Abi } from "../../../abi/IWithdrawalCompressorV311.js";
 //#region src/sdk/accounts/withdrawal-compressor/WithdrawalCompressorV311Contract.ts
 const abi = iWithdrawalCompressorV311Abi;
 /**

package/dist/esm/sdk/accounts/withdrawal-compressor/WithdrawalCompressorV313Contract.js

@@ -1,6 +1,6 @@
-import { iWithdrawalCompressorV313Abi } from "../../../abi/IWithdrawalCompressorV313.js";
 import { encodeDelayedIntent } from "./intent-codec.js";
 import { AbstractWithdrawalCompressorContract, iCreditAccountAbi, toClaimableWithdrawal, toPendingWithdrawal, toRequestableWithdrawal } from "./AbstractWithdrawalCompressorContract.js";
+import { iWithdrawalCompressorV313Abi } from "../../../abi/IWithdrawalCompressorV313.js";
 import { toWithdrawalStatus } from "./types.js";
 //#region src/sdk/accounts/withdrawal-compressor/WithdrawalCompressorV313Contract.ts
 const abi = iWithdrawalCompressorV313Abi;

package/dist/esm/sdk/base/TokensMeta.js

@@ -1,12 +1,12 @@
-import { iExpirableAbi } from "../../abi/iExpirable.js";
-import { iStateSerializerAbi } from "../../abi/iStateSerializer.js";
-import { iVersionAbi } from "../../abi/iVersion.js";
 import { AddressMap } from "../utils/AddressMap.js";
 import { AddressSet } from "../utils/AddressSet.js";
 import { bytes32ToString } from "../utils/bytes32ToString.js";
 import { getAssetType } from "../chain/chains.js";
 import { formatBN } from "../utils/formatter.js";
 import "../utils/index.js";
+import { iExpirableAbi } from "../../abi/iExpirable.js";
+import { iStateSerializerAbi } from "../../abi/iStateSerializer.js";
+import { iVersionAbi } from "../../abi/iVersion.js";
 import { executeMulticallBatches } from "../utils/viem/executeMulticallBatches.js";
 //#region src/sdk/base/TokensMeta.ts
 /**

package/dist/esm/sdk/chain/detectNetwork.js

@@ -1,5 +1,5 @@
-import { ierc20Abi } from "../../abi/iERC20.js";
 import { chains } from "./chains.js";
+import { ierc20Abi } from "../../abi/iERC20.js";
 //#region src/sdk/chain/detectNetwork.ts
 /**
 * Detects the network type from the given client.

package/dist/esm/sdk/core/createAddressProvider.js

@@ -1,8 +1,8 @@
-import { iVersionAbi } from "../../abi/iVersion.js";
 import { AP_MARKET_COMPRESSOR, AP_PRICE_FEED_COMPRESSOR } from "../constants/address-provider.js";
 import { isV310 } from "../constants/versions.js";
 import "../constants/index.js";
 import { hexEq } from "../utils/hex.js";
+import { iVersionAbi } from "../../abi/iVersion.js";
 import { AddressProviderV310Contract } from "./AddressProviderV310Contract.js";
 //#region src/sdk/core/createAddressProvider.ts
 const OVERRIDE_ADDRESSES = { Mainnet: {

package/dist/esm/sdk/market/adapters/contracts/AccountMigratorAdapterContract.js

@@ -1,5 +1,5 @@
-import { accountMigratorAbi } from "../../../../abi/AccountMigrator.js";
 import { AbstractAdapterContract } from "./AbstractAdapter.js";
+import { accountMigratorAbi } from "../../../../abi/AccountMigrator.js";
 //#region src/sdk/market/adapters/contracts/AccountMigratorAdapterContract.ts
 const abi = accountMigratorAbi;
 const protocolAbi = accountMigratorAbi;

package/dist/esm/sdk/market/adapters/contracts/ERC4626AdapterContract.js

@@ -1,6 +1,6 @@
-import { ierc4626AdapterAbi } from "../../../../abi/ierc4626Adapter.js";
 import { MissingSerializedParamsError } from "../../../base/errors.js";
 import "../../../base/index.js";
+import { ierc4626AdapterAbi } from "../../../../abi/ierc4626Adapter.js";
 import { iERC4626Abi } from "../abi/targetContractAbi.js";
 import { fnSigToName, swapFromTransfers } from "../transferHelpers.js";
 import { AbstractAdapterContract } from "./AbstractAdapter.js";

package/dist/esm/sdk/market/credit/CreditFacadeV310BaseContract.js

@@ -1,7 +1,7 @@
-import { iPausableAbi } from "../../../abi/iPausable.js";
 import { iCreditFacadeMulticallV310Abi, iCreditFacadeV310Abi } from "../../../abi/310/generated.js";
 import { BaseContract } from "../../base/BaseContract.js";
 import "../../base/index.js";
+import { iPausableAbi } from "../../../abi/iPausable.js";
 //#region src/sdk/market/credit/CreditFacadeV310BaseContract.ts
 const abi = [
 	...iCreditFacadeV310Abi,

package/dist/esm/sdk/market/oracle/PriceOracleBaseContract.js

@@ -137,6 +137,17 @@ var PriceOracleBaseContract = class extends BaseContract {
 		return amount * 10n ** BigInt(this.tokensMeta.decimals(token)) / price;
 	}
 	/**
+	* {@inheritDoc IPriceOracleContract.safeConvert}
+	**/
+	safeConvert(from, to, amount) {
+		try {
+			return this.convert(from, to, amount);
+		} catch (e) {
+			this.logger?.debug(`cannot convert ${this.labelAddress(from)} to ${this.labelAddress(to)}: ${e}`);
+			return null;
+		}
+	}
+	/**
 	* {@inheritDoc IPriceOracleContract.safeConvertToUSD}
 	**/
 	safeConvertToUSD(token, amount) {

package/dist/esm/sdk/market/pool/PoolV310Contract.js

@@ -1,4 +1,3 @@
-import { iPausableAbi } from "../../../abi/iPausable.js";
 import { iPoolV310Abi } from "../../../abi/310/generated.js";
 import { AddressMap } from "../../utils/AddressMap.js";
 import { RAY } from "../../constants/math.js";
@@ -7,6 +6,7 @@ import { formatBN, formatBNvalue, percentFmt } from "../../utils/formatter.js";
 import "../../utils/index.js";
 import { BaseContract } from "../../base/BaseContract.js";
 import "../../base/index.js";
+import { iPausableAbi } from "../../../abi/iPausable.js";
 import { calcUtilization } from "../math.js";
 //#region src/sdk/market/pool/PoolV310Contract.ts
 const abi = [...iPoolV310Abi, ...iPausableAbi];

package/dist/esm/sdk/market/zapper/IETHZapperContract.js

@@ -1,5 +1,5 @@
-import { iethZapperAbi } from "../../../abi/iETHZapper.js";
 import { ZapperContract } from "./ZapperContract.js";
+import { iethZapperAbi } from "../../../abi/iETHZapper.js";
 //#region src/sdk/market/zapper/IETHZapperContract.ts
 const abi = iethZapperAbi;
 var IETHZapperContract = class extends ZapperContract {

package/dist/esm/sdk/market/zapper/ZapperContract.js

@@ -1,6 +1,6 @@
-import { iZapperAbi } from "../../../abi/iZapper.js";
 import { BaseContract } from "../../base/BaseContract.js";
 import "../../base/index.js";
+import { iZapperAbi } from "../../../abi/iZapper.js";
 import { UnsupportedZapperFunctionError } from "./errors.js";
 //#region src/sdk/market/zapper/ZapperContract.ts
 /**

package/dist/esm/sdk/pools/PoolService.js

@@ -1,5 +1,5 @@
-import { ierc20Abi } from "../../abi/iERC20.js";
 import { AddressSet } from "../utils/AddressSet.js";
+import { ierc20Abi } from "../../abi/iERC20.js";
 import "../constants/addresses.js";
 import { PERCENTAGE_FACTOR, RAY } from "../constants/math.js";
 import "../constants/index.js";

package/dist/esm/sdk/positions/PositionsService.js

@@ -153,6 +153,24 @@ var PositionsService = class extends SDKConstruct {
 		const borrowRate = this.borrowRate(snapshot);
 		const timeToLiquidation = this.timeToLiquidation(snapshot);
 		const liquidationPrice = this.liquidationPrice(snapshot);
+		const zeroDebt = ca.debt === 0n;
+		const collaterals = [];
+		let totalValue = zeroDebt ? 0n : ca.totalValue;
+		let totalValueUSD = zeroDebt ? 0n : ca.totalValueUSD;
+		for (const t of ca.tokens) {
+			if (t.balance <= 10n) continue;
+			collaterals.push({
+				collateral: priceOracle.toTokenAmount(t.token, t.balance),
+				quota: priceOracle.toTokenAmount(market.underlying, t.quota),
+				withdrawals: withdrawals.get(t.token) ?? []
+			});
+			if (zeroDebt) {
+				const value = priceOracle.safeConvert(t.token, market.underlying, t.balance) || 0n;
+				totalValue += value;
+				const usd = priceOracle.safeConvertToUSD(t.token, t.balance) || 0n;
+				totalValueUSD += usd;
+			}
+		}
 		return {
 			kind: "strategy",
 			chainId: this.sdk.chainId,
@@ -160,7 +178,7 @@ var PositionsService = class extends SDKConstruct {
 			creditAccount: ca.creditAccount,
 			name: target ? strategyName(this.sdk.tokensMeta.mustGetToken(target), token, this.sdk.chainId) : token.symbol,
 			targetCollateral: target ? this.sdk.tokensMeta.mustGetToken(target) : null,
-			leverage: calcPositionLeverage(ca.totalValue, totalDebtValue),
+			leverage: calcPositionLeverage(totalValue, totalDebtValue),
 			borrowApy: calcBorrowApy(pool.baseInterestRate, suite.creditManager.feeInterest),
 			totalDebt: {
 				token,
@@ -169,21 +187,14 @@ var PositionsService = class extends SDKConstruct {
 			},
 			totalValue: {
 				token,
-				value: ca.totalValue,
-				valueUsd: usdToNumber(ca.totalValueUSD)
+				value: totalValue,
+				valueUsd: usdToNumber(totalValueUSD)
 			},
 			healthFactor: healthFactorBps(ca.healthFactor),
 			borrowRate,
 			timeToLiquidation,
 			liquidationPrice,
-			collaterals: ca.tokens.flatMap((t) => {
-				if (t.balance <= 10n) return [];
-				return [{
-					collateral: priceOracle.toTokenAmount(t.token, t.balance),
-					quota: priceOracle.toTokenAmount(market.underlying, t.quota),
-					withdrawals: withdrawals.get(t.token) ?? []
-				}];
-			})
+			collaterals
 		};
 	}
 	/**

package/dist/esm/sdk/utils/viem/simulateWithPriceUpdates.js

@@ -1,6 +1,6 @@
 import { errorAbis } from "../../../abi/errors.js";
-import { iUpdatablePriceFeedAbi } from "../../../abi/iUpdatablePriceFeed.js";
 import { generateCastTraceCall } from "./cast.js";
+import { iUpdatablePriceFeedAbi } from "../../../abi/iUpdatablePriceFeed.js";
 import { simulateMulticall } from "./simulateMulticall.js";
 import { BaseError, CallExecutionError, ContractFunctionRevertedError, decodeFunctionData, decodeFunctionResult, encodeFunctionData, parseAbi } from "viem";
 import { getAction, parseAccount } from "viem/utils";

package/dist/types/sdk/market/oracle/PriceOracleBaseContract.d.ts

@@ -92,6 +92,10 @@ declare abstract class PriceOracleBaseContract<abi extends Abi | readonly unknow
    * {@inheritDoc IPriceOracleContract.convertFromUSD}
    **/
   convertFromUSD(to: Address, amount: bigint, reserve?: boolean): bigint;
+  /**
+   * {@inheritDoc IPriceOracleContract.safeConvert}
+   **/
+  safeConvert(from: Address, to: Address, amount: bigint): bigint | null;
   /**
    * {@inheritDoc IPriceOracleContract.safeConvertToUSD}
    **/

package/dist/types/sdk/market/oracle/types.d.ts

@@ -131,6 +131,15 @@ interface IPriceOracleContract extends IBaseContract {
    * @param reserve - Use reserve feeds instead of main.
    **/
   convert: (from: Address, to: Address, amount: bigint, reserve?: boolean) => bigint;
+  /**
+   * Like {@link convert}, but returns `null` instead of throwing when either
+   * token cannot be priced (missing or unsuccessful feed).
+   *
+   * @param from - Source token address.
+   * @param to - Destination token address.
+   * @param amount - Amount in source-token decimals.
+   **/
+  safeConvert: (from: Address, to: Address, amount: bigint) => bigint | null;
   /**
    * Converts a token amount to its USD value using latest known prices.
    *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "15.1.0-next.21",
+  "version": "15.1.0-next.22",
   "description": "Gearbox SDK",
   "license": "MIT",
   "repository": {