@gearbox-protocol/sdk 15.1.0-next.18 → 15.1.0-next.19

package/dist/cjs/new-sdk/positions/PositionsNamespace.js

@@ -3,8 +3,8 @@ const require_model_positions = require("../../model/positions.js");
 require("../../model/index.js");
 const require_new_sdk_AbstractNamespace = require("../AbstractNamespace.js");
 const require_new_sdk_utils_filterResponse = require("../utils/filterResponse.js");
-const require_new_sdk_utils_mergeChains = require("../utils/mergeChains.js");
 require("../utils/index.js");
+const require_new_sdk_positions_mergePositionList = require("./mergePositionList.js");
 //#region src/new-sdk/positions/PositionsNamespace.ts
 /**
 * The `positions` namespace of a {@link GearboxSDK}, see
@@ -14,7 +14,7 @@ var PositionsNamespace = class extends require_new_sdk_AbstractNamespace.Abstrac
 	/**
 	* {@inheritDoc PositionsBase.merge}
 	**/
-	merge = { list: (onchain, offchain) => require_new_sdk_utils_mergeChains.mergeChainList(onchain, offchain, this.maxOffchainLagSeconds) };
+	merge = { list: (onchain, offchain) => require_new_sdk_positions_mergePositionList.mergePositionList(onchain, offchain, this.maxOffchainLagSeconds) };
 	constructor(onchain, offchain, options) {
 		super("Positions", onchain?.positions, offchain?.positions, options);
 	}

package/dist/cjs/new-sdk/positions/mergePositionList.js

@@ -0,0 +1,23 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_model_positions = require("../../model/positions.js");
+require("../../model/index.js");
+const require_new_sdk_utils_mergeChains = require("../utils/mergeChains.js");
+//#region src/new-sdk/positions/mergePositionList.ts
+function mergePositionList(onchain, offchain, maxLagSeconds) {
+	const merged = require_new_sdk_utils_mergeChains.mergeChainList(onchain, offchain, maxLagSeconds);
+	if (!merged || !offchain) return merged;
+	const backendById = new Map(offchain.data.filter((row) => row.kind === "strategy").map((row) => [require_model_positions.positionId(row), row]));
+	return {
+		...merged,
+		data: merged.data.map((row) => {
+			const backend = row.kind === "strategy" ? backendById.get(require_model_positions.positionId(row)) : void 0;
+			return backend ? {
+				...row,
+				targetCollateral: backend.targetCollateral,
+				name: backend.name
+			} : row;
+		})
+	};
+}
+//#endregion
+exports.mergePositionList = mergePositionList;

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/new-sdk/positions/PositionsNamespace.js

@@ -2,8 +2,8 @@ import { matchesPositionFilter } from "../../model/positions.js";
 import "../../model/index.js";
 import { AbstractNamespace } from "../AbstractNamespace.js";
 import { filterResponse } from "../utils/filterResponse.js";
-import { mergeChainList } from "../utils/mergeChains.js";
 import "../utils/index.js";
+import { mergePositionList } from "./mergePositionList.js";
 //#region src/new-sdk/positions/PositionsNamespace.ts
 /**
 * The `positions` namespace of a {@link GearboxSDK}, see
@@ -13,7 +13,7 @@ var PositionsNamespace = class extends AbstractNamespace {
 	/**
 	* {@inheritDoc PositionsBase.merge}
 	**/
-	merge = { list: (onchain, offchain) => mergeChainList(onchain, offchain, this.maxOffchainLagSeconds) };
+	merge = { list: (onchain, offchain) => mergePositionList(onchain, offchain, this.maxOffchainLagSeconds) };
 	constructor(onchain, offchain, options) {
 		super("Positions", onchain?.positions, offchain?.positions, options);
 	}

package/dist/esm/new-sdk/positions/mergePositionList.js

@@ -0,0 +1,22 @@
+import { positionId } from "../../model/positions.js";
+import "../../model/index.js";
+import { mergeChainList } from "../utils/mergeChains.js";
+//#region src/new-sdk/positions/mergePositionList.ts
+function mergePositionList(onchain, offchain, maxLagSeconds) {
+	const merged = mergeChainList(onchain, offchain, maxLagSeconds);
+	if (!merged || !offchain) return merged;
+	const backendById = new Map(offchain.data.filter((row) => row.kind === "strategy").map((row) => [positionId(row), row]));
+	return {
+		...merged,
+		data: merged.data.map((row) => {
+			const backend = row.kind === "strategy" ? backendById.get(positionId(row)) : void 0;
+			return backend ? {
+				...row,
+				targetCollateral: backend.targetCollateral,
+				name: backend.name
+			} : row;
+		})
+	};
+}
+//#endregion
+export { mergePositionList };

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

@@ -1,5 +1,5 @@
-import { iPoolV310Abi } from "../../abi/310/generated.js";
 import { iZapperAbi } from "../../abi/iZapper.js";
+import { iPoolV310Abi } from "../../abi/310/generated.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,3 +1,5 @@
+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";
@@ -8,8 +10,6 @@ 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,3 +1,4 @@
+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";
@@ -19,7 +20,6 @@ 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 { AbstractWithdrawalCompressorContract } from "./AbstractWithdrawalCompressorContract.js";
 import { iWithdrawalCompressorV310Abi } from "../../../abi/IWithdrawalCompressorV310.js";
+import { AbstractWithdrawalCompressorContract } from "./AbstractWithdrawalCompressorContract.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 { AbstractWithdrawalCompressorContract } from "./AbstractWithdrawalCompressorContract.js";
 import { iWithdrawalCompressorV311Abi } from "../../../abi/IWithdrawalCompressorV311.js";
+import { AbstractWithdrawalCompressorContract } from "./AbstractWithdrawalCompressorContract.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 { chains } from "./chains.js";
 import { ierc20Abi } from "../../abi/iERC20.js";
+import { chains } from "./chains.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 { AbstractAdapterContract } from "./AbstractAdapter.js";
 import { accountMigratorAbi } from "../../../../abi/AccountMigrator.js";
+import { AbstractAdapterContract } from "./AbstractAdapter.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/pool/PoolV310Contract.js

@@ -1,3 +1,4 @@
+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";
@@ -6,7 +7,6 @@ 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 { ZapperContract } from "./ZapperContract.js";
 import { iethZapperAbi } from "../../../abi/iETHZapper.js";
+import { ZapperContract } from "./ZapperContract.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 { AddressSet } from "../utils/AddressSet.js";
 import { ierc20Abi } from "../../abi/iERC20.js";
+import { AddressSet } from "../utils/AddressSet.js";
 import "../constants/addresses.js";
 import { PERCENTAGE_FACTOR, RAY } from "../constants/math.js";
 import "../constants/index.js";

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

@@ -1,6 +1,6 @@
 import { errorAbis } from "../../../abi/errors.js";
-import { generateCastTraceCall } from "./cast.js";
 import { iUpdatablePriceFeedAbi } from "../../../abi/iUpdatablePriceFeed.js";
+import { generateCastTraceCall } from "./cast.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/model/positions.d.ts

@@ -183,7 +183,9 @@ interface StrategyPosition {
    **/
   kind: "strategy";
   /**
-   * Human-readable strategy name, e.g. `"wstETH / WETH"`.
+   * Human-readable strategy name, e.g. `"wstETH / WETH"`. Derived from
+   * {@link targetCollateral}, so in `both` mode it follows the same backend
+   * override as that field.
    **/
   name: string;
   /**
@@ -203,6 +205,10 @@ interface StrategyPosition {
    * block (greatest opening-block USD value) — the asset the position was
    * initially leveraged into. `null` when the opening snapshot holds only the
    * underlying.
+   *
+   * In `both` mode the backend's value is always preferred when it has the
+   * row, even if the chain wins the freshness race: the chain can only guess
+   * from current holdings.
    **/
   targetCollateral: Token | null;
   /**

package/dist/types/new-sdk/index.d.ts

@@ -12,10 +12,10 @@ import { ChainOf, PrepareApi } from "./prepare/PrepareApi.js";
 import "./prepare/index.js";
 import { AccountPrepareRequest, ExecuteApi, OpenPrepareRequest, OpportunitiesExecute, PoolPrepareRequest, PrepareRequest } from "./execute/ExecuteApi.js";
 import "./execute/index.js";
-import { Opportunities, OpportunitiesBase, OpportunitiesByMode, OpportunitiesMerged, OpportunitiesOffchainBranch, OpportunitiesOffchainOnly, OpportunitiesOnchainBranch, OpportunitiesOnchainOnly, OpportunityMergers } from "./opportunities/types.js";
+import { Opportunities, OpportunitiesBase, OpportunitiesByMode, OpportunitiesOffchainBranch, OpportunitiesOffchainOnly, OpportunitiesOnchainBranch, OpportunitiesOnchainOnly, OpportunityMergers } from "./opportunities/types.js";
 import { OpportunitiesNamespace } from "./opportunities/OpportunitiesNamespace.js";
 import "./opportunities/index.js";
-import { PositionMergers, Positions, PositionsBase, PositionsByMode, PositionsMerged, PositionsOffchainBranch, PositionsOffchainOnly, PositionsOnchainBranch, PositionsOnchainOnly } from "./positions/types.js";
+import { PositionMergers, Positions, PositionsBase, PositionsByMode, PositionsOffchainBranch, PositionsOffchainOnly, PositionsOnchainBranch, PositionsOnchainOnly } from "./positions/types.js";
 import { PositionsNamespace } from "./positions/PositionsNamespace.js";
 import "./positions/index.js";
 import { Preview, PreviewByMode } from "./preview/types.js";
@@ -30,4 +30,4 @@ import { SourceUnavailableError } from "./errors/SourceUnavailableError.js";
 import { assertSameChains } from "./errors/assertSameChains.js";
 import { everyChainFailed } from "./errors/everyChainFailed.js";
 import "./errors/index.js";
-export { AbstractNamespace, AccountPrepareRequest, AddCollateralParams, AdjustLeverageParams, AllSourcesFailedError, ChainOf, ChainRef, DEFAULT_MAX_OFFCHAIN_LAG, DEFAULT_MAX_STATE_AGE, DelayedStrategySimulate, DepositStrategyParams, EnsureFreshChains, type EntityMerger, ExecuteApi, type FilterResult, FinalizeParams, GearboxSDK, GearboxSDKOptions, Liquidations, LiquidationsByMode, LiquidationsNamespace, type ListMerger, LpParams, LpRedeemParams, LpSimulate, type MergeListResult, MergedQuery, MissingSourceError, Mode, NamespaceOptions, NoSourceServedError, NoticesByMode, OffchainByMode, OffchainSource, OnchainByMode, OnchainSource, OpenPrepareRequest, OpenStrategyParams, OpenStrategySimulate, Opportunities, OpportunitiesBase, OpportunitiesByMode, OpportunitiesExecute, OpportunitiesMerged, OpportunitiesNamespace, OpportunitiesOffchainBranch, OpportunitiesOffchainOnly, OpportunitiesOnchainBranch, OpportunitiesOnchainOnly, OpportunitiesPrepare, OpportunityMergers, PlainMultichainSDKOptions, PoolInput, PoolPrepareRequest, PositionInput, PositionMergers, Positions, PositionsBase, PositionsByMode, PositionsMerged, PositionsNamespace, PositionsOffchainBranch, PositionsOffchainOnly, PositionsOnchainBranch, PositionsOnchainOnly, PrepareApi, PrepareOptions, PrepareRequest, Preview, PreviewByMode, PreviewNamespace, RepayStrategyParams, SourceChainMismatchError, SourceUnavailableError, StrategyInput, StrategyRoutesSimulate, StrategySimulate, WithdrawCollateralParams, WithdrawStrategyParams, assertSameChains, everyChainFailed, filterResponse, mergeChainList, mergeChainOne };
+export { AbstractNamespace, AccountPrepareRequest, AddCollateralParams, AdjustLeverageParams, AllSourcesFailedError, ChainOf, ChainRef, DEFAULT_MAX_OFFCHAIN_LAG, DEFAULT_MAX_STATE_AGE, DelayedStrategySimulate, DepositStrategyParams, EnsureFreshChains, type EntityMerger, ExecuteApi, type FilterResult, FinalizeParams, GearboxSDK, GearboxSDKOptions, Liquidations, LiquidationsByMode, LiquidationsNamespace, type ListMerger, LpParams, LpRedeemParams, LpSimulate, type MergeListResult, MergedQuery, MissingSourceError, Mode, NamespaceOptions, NoSourceServedError, NoticesByMode, OffchainByMode, OffchainSource, OnchainByMode, OnchainSource, OpenPrepareRequest, OpenStrategyParams, OpenStrategySimulate, Opportunities, OpportunitiesBase, OpportunitiesByMode, OpportunitiesExecute, OpportunitiesNamespace, OpportunitiesOffchainBranch, OpportunitiesOffchainOnly, OpportunitiesOnchainBranch, OpportunitiesOnchainOnly, OpportunitiesPrepare, OpportunityMergers, PlainMultichainSDKOptions, PoolInput, PoolPrepareRequest, PositionInput, PositionMergers, Positions, PositionsBase, PositionsByMode, PositionsNamespace, PositionsOffchainBranch, PositionsOffchainOnly, PositionsOnchainBranch, PositionsOnchainOnly, PrepareApi, PrepareOptions, PrepareRequest, Preview, PreviewByMode, PreviewNamespace, RepayStrategyParams, SourceChainMismatchError, SourceUnavailableError, StrategyInput, StrategyRoutesSimulate, StrategySimulate, WithdrawCollateralParams, WithdrawStrategyParams, assertSameChains, everyChainFailed, filterResponse, mergeChainList, mergeChainOne };

package/dist/types/new-sdk/opportunities/index.d.ts

@@ -1,3 +1,3 @@
-import { Opportunities, OpportunitiesBase, OpportunitiesByMode, OpportunitiesMerged, OpportunitiesOffchainBranch, OpportunitiesOffchainOnly, OpportunitiesOnchainBranch, OpportunitiesOnchainOnly, OpportunityMergers } from "./types.js";
+import { Opportunities, OpportunitiesBase, OpportunitiesByMode, OpportunitiesOffchainBranch, OpportunitiesOffchainOnly, OpportunitiesOnchainBranch, OpportunitiesOnchainOnly, OpportunityMergers } from "./types.js";
 import { OpportunitiesNamespace } from "./OpportunitiesNamespace.js";
-export { Opportunities, OpportunitiesBase, OpportunitiesByMode, OpportunitiesMerged, OpportunitiesNamespace, OpportunitiesOffchainBranch, OpportunitiesOffchainOnly, OpportunitiesOnchainBranch, OpportunitiesOnchainOnly, OpportunityMergers };
+export { Opportunities, OpportunitiesBase, OpportunitiesByMode, OpportunitiesNamespace, OpportunitiesOffchainBranch, OpportunitiesOffchainOnly, OpportunitiesOnchainBranch, OpportunitiesOnchainOnly, OpportunityMergers };

package/dist/types/new-sdk/opportunities/types.d.ts

@@ -103,20 +103,13 @@ interface OpportunitiesOffchainBranch {
 }
 /**
  * Merge policy of each read, exposed so that a consumer reading the two
- * branches itself combines them exactly as `both` mode would: a chain is served
- * by the backend when it is fresh enough, and by the chain otherwise.
+ * branches itself combines them exactly as `both` mode would.
  **/
 interface OpportunityMergers {
   list: ListMerger<Opportunity[]>;
   pool: EntityMerger<PoolOpportunityDetail>;
   strategy: EntityMerger<StrategyOpportunityDetail>;
 }
-/**
- * Merging, which only exists where there are two sources to merge.
- **/
-interface OpportunitiesMerged {
-  readonly merge: OpportunityMergers;
-}
 /**
  * Which methods the `opportunities` namespace has in each mode.
  **/
@@ -130,4 +123,4 @@ interface OpportunitiesByMode {
  **/
 type Opportunities<M extends Mode = Mode> = OpportunitiesByMode[M];
 //#endregion
-export { Opportunities, OpportunitiesBase, OpportunitiesByMode, OpportunitiesMerged, OpportunitiesOffchainBranch, OpportunitiesOffchainOnly, OpportunitiesOnchainBranch, OpportunitiesOnchainOnly, OpportunityMergers };
+export { Opportunities, OpportunitiesBase, OpportunitiesByMode, OpportunitiesOffchainBranch, OpportunitiesOffchainOnly, OpportunitiesOnchainBranch, OpportunitiesOnchainOnly, OpportunityMergers };

package/dist/types/new-sdk/positions/index.d.ts

@@ -1,3 +1,3 @@
-import { PositionMergers, Positions, PositionsBase, PositionsByMode, PositionsMerged, PositionsOffchainBranch, PositionsOffchainOnly, PositionsOnchainBranch, PositionsOnchainOnly } from "./types.js";
+import { PositionMergers, Positions, PositionsBase, PositionsByMode, PositionsOffchainBranch, PositionsOffchainOnly, PositionsOnchainBranch, PositionsOnchainOnly } from "./types.js";
 import { PositionsNamespace } from "./PositionsNamespace.js";
-export { PositionMergers, Positions, PositionsBase, PositionsByMode, PositionsMerged, PositionsNamespace, PositionsOffchainBranch, PositionsOffchainOnly, PositionsOnchainBranch, PositionsOnchainOnly };
+export { PositionMergers, Positions, PositionsBase, PositionsByMode, PositionsNamespace, PositionsOffchainBranch, PositionsOffchainOnly, PositionsOnchainBranch, PositionsOnchainOnly };

package/dist/types/new-sdk/positions/mergePositionList.d.ts

@@ -0,0 +1,18 @@
+import { Position } from "../../model/positions.js";
+import { DataResponse } from "../../model/response.js";
+import "../../model/index.js";
+import { MergeListResult } from "../utils/types.js";
+//#region src/new-sdk/positions/mergePositionList.d.ts
+/**
+ * Merges two position lists under the same per-chain freshness rule as
+ * {@link mergeChainList}, then overlays the backend's `targetCollateral` and
+ * `name` onto every strategy row the backend has — even when that chain was
+ * served from on-chain data because the backend was stale.
+ *
+ * The backend records the collateral the strategy was opened into; the chain
+ * can only guess from current holdings. `name` is derived from that collateral,
+ * so it follows the same override.
+ **/
+declare function mergePositionList<Onchain extends DataResponse<Position[]> | undefined, Offchain extends DataResponse<Position[]> | undefined>(onchain: Onchain, offchain: Offchain, maxLagSeconds?: number): MergeListResult<Onchain, Offchain, Position[]>;
+//#endregion
+export { mergePositionList };

package/dist/types/new-sdk/positions/types.d.ts

@@ -78,18 +78,11 @@ interface PositionsOffchainBranch {
 }
 /**
  * Merge policy of each read, exposed so that a consumer reading the two
- * branches itself combines them exactly as `both` mode would: a chain is served
- * by the backend when it is fresh enough, and by the chain otherwise.
+ * branches itself combines them exactly as `both` mode would.
  **/
 interface PositionMergers {
   list: ListMerger<Position[]>;
 }
-/**
- * Merging, which only exists where there are two sources to merge.
- **/
-interface PositionsMerged {
-  readonly merge: PositionMergers;
-}
 /**
  * Which methods the `positions` namespace has in each mode.
  **/
@@ -103,4 +96,4 @@ interface PositionsByMode {
  **/
 type Positions<M extends Mode = Mode> = PositionsByMode[M];
 //#endregion
-export { PositionMergers, Positions, PositionsBase, PositionsByMode, PositionsMerged, PositionsOffchainBranch, PositionsOffchainOnly, PositionsOnchainBranch, PositionsOnchainOnly };
+export { PositionMergers, Positions, PositionsBase, PositionsByMode, PositionsOffchainBranch, PositionsOffchainOnly, PositionsOnchainBranch, PositionsOnchainOnly };

package/package.json

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