@defisaver/positions-sdk 2.1.169-custom-fetching-dev → 2.1.169-custom-fetching-2-dev

package/cjs/portfolio/customDeFiData.js

@@ -51,8 +51,9 @@ function getCustomDeFiData(provider_1, network_1, defaultProvider_1, addresses_1
         const has = (protocol) => protocols.includes(protocol);
         const isMainnet = network === common_1.NetworkNumber.Eth;
         const isFluidSupported = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.NetworkNumber.Plasma].includes(network);
-        const client = (0, viem_1.getViemProvider)(provider, network, { batch: { multicall: { batchSize } } });
-        const defaultClient = (0, viem_1.getViemProvider)(defaultProvider, network, { batch: { multicall: { batchSize } } });
+        const pin = (p) => (options.blockNumber !== undefined ? (0, viem_1.pinProviderBlock)(p, options.blockNumber) : p);
+        const client = (0, viem_1.getViemProvider)(pin(provider), network, { batch: { multicall: { batchSize } } });
+        const defaultClient = (0, viem_1.getViemProvider)(pin(defaultProvider), network, { batch: { multicall: { batchSize } } });
         const aaveV3Markets = has(types_1.PortfolioProtocol.AaveV3)
             ? [types_1.AaveVersions.AaveV3, types_1.AaveVersions.AaveV3Lido, types_1.AaveVersions.AaveV3Etherfi].map((v) => (0, markets_1.AaveMarkets)(network)[v]).filter((m) => m.chainIds.includes(network))
             : [];

package/cjs/services/viem.d.ts

@@ -4403,6 +4403,8 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         uid?: undefined;
     } & import("viem").ExactPartial<Pick<import("viem").PublicActions<import("viem").Transport, undefined, undefined>, "getBlockNumber" | "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getChainId" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "prepareTransactionRequest" | "readContract" | "sendRawTransaction" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions<undefined, undefined>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").Transport, undefined, undefined, import("viem").PublicRpcSchema, import("viem").PublicActions<import("viem").Transport, undefined>>) => client) => import("viem").Client<import("viem").Transport, undefined, undefined, import("viem").PublicRpcSchema, { [K in keyof client]: client[K]; } & import("viem").PublicActions<import("viem").Transport, undefined>>;
 };
+/** Rewrites 'latest' reads so a client built on this provider sees a fixed block. */
+export declare const pinProviderBlock: (provider: EthereumProvider, blockNumber: number | bigint) => EthereumProvider;
 export declare const setViemBlockNumber: (block: Blockish) => {
     blockNumber?: undefined;
 } | {

package/cjs/services/viem.js

@@ -1,6 +1,15 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setViemBlockNumber = exports.getViemProvider = exports.getViemChain = void 0;
+exports.setViemBlockNumber = exports.pinProviderBlock = exports.getViemProvider = exports.getViemChain = void 0;
 exports.encodeCalldata = encodeCalldata;
 const viem_1 = require("viem");
 const chains_1 = require("viem/chains");
@@ -26,6 +35,23 @@ const getViemChain = (network) => {
 exports.getViemChain = getViemChain;
 const getViemProvider = (provider, network, options) => (0, viem_1.createPublicClient)(Object.assign({ transport: (0, viem_1.custom)(provider), chain: (0, exports.getViemChain)(network) }, options));
 exports.getViemProvider = getViemProvider;
+/** Rewrites 'latest' reads so a client built on this provider sees a fixed block. */
+const pinProviderBlock = (provider, blockNumber) => {
+    const block = `0x${BigInt(blockNumber).toString(16)}`;
+    return {
+        request: (args) => __awaiter(void 0, void 0, void 0, function* () {
+            const params = [...(args.params || [])];
+            if (args.method === 'eth_blockNumber')
+                return block;
+            if (['eth_call', 'eth_getCode', 'eth_getBalance', 'eth_getStorageAt'].includes(args.method) && (params[1] === undefined || params[1] === 'latest'))
+                params[1] = block;
+            if (args.method === 'eth_getBlockByNumber' && params[0] === 'latest')
+                params[0] = block;
+            return provider.request(Object.assign(Object.assign({}, args), { params }));
+        }),
+    };
+};
+exports.pinProviderBlock = pinProviderBlock;
 const setViemBlockNumber = (block) => {
     if (block === 'latest')
         return {};

package/cjs/types/portfolio.d.ts

@@ -87,6 +87,8 @@ export interface CustomDeFiDataOptions {
     isSim?: boolean;
     /** viem multicall calldata cap in bytes; defaults to 250k (2k when isSim). */
     batchSize?: number;
+    /** Pins every read to this block; defaults to latest. */
+    blockNumber?: number;
 }
 export interface CustomDeFiData {
     positions: PortfolioPositionsData;

package/esm/portfolio/customDeFiData.js

@@ -11,7 +11,7 @@ import Dec from 'decimal.js';
 import { NetworkNumber } from '../types/common';
 import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, LiquityV2Markets, LlamaLendMarkets, MakerActiveIlks, MorphoBlueMarkets, MorphoMidnightMarkets, SparkMarkets, } from '../markets';
 import { AaveVersions, CompoundVersions, PortfolioProtocol, } from '../types';
-import { getViemProvider } from '../services/viem';
+import { getViemProvider, pinProviderBlock } from '../services/viem';
 import { ZERO_ADDRESS } from '../constants';
 import { _getAaveV2AccountData, _getAaveV2MarketsData } from '../aaveV2';
 import { _getAaveV3AccountData, _getAaveV3MarketData, getStakeAaveData } from '../aaveV3';
@@ -45,8 +45,9 @@ export function getCustomDeFiData(provider_1, network_1, defaultProvider_1, addr
         const has = (protocol) => protocols.includes(protocol);
         const isMainnet = network === NetworkNumber.Eth;
         const isFluidSupported = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Plasma].includes(network);
-        const client = getViemProvider(provider, network, { batch: { multicall: { batchSize } } });
-        const defaultClient = getViemProvider(defaultProvider, network, { batch: { multicall: { batchSize } } });
+        const pin = (p) => (options.blockNumber !== undefined ? pinProviderBlock(p, options.blockNumber) : p);
+        const client = getViemProvider(pin(provider), network, { batch: { multicall: { batchSize } } });
+        const defaultClient = getViemProvider(pin(defaultProvider), network, { batch: { multicall: { batchSize } } });
         const aaveV3Markets = has(PortfolioProtocol.AaveV3)
             ? [AaveVersions.AaveV3, AaveVersions.AaveV3Lido, AaveVersions.AaveV3Etherfi].map((v) => AaveMarkets(network)[v]).filter((m) => m.chainIds.includes(network))
             : [];

package/esm/services/viem.d.ts

@@ -4393,6 +4393,8 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         uid?: undefined;
     } & import("viem").ExactPartial<Pick<import("viem").PublicActions<import("viem").Transport, undefined, undefined>, "getBlockNumber" | "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getChainId" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "prepareTransactionRequest" | "readContract" | "sendRawTransaction" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions<undefined, undefined>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").Transport, undefined, undefined, import("viem").PublicRpcSchema, import("viem").PublicActions<import("viem").Transport, undefined>>) => client) => import("viem").Client<import("viem").Transport, undefined, undefined, import("viem").PublicRpcSchema, { [K in keyof client]: client[K]; } & import("viem").PublicActions<import("viem").Transport, undefined>>;
 };
+/** Rewrites 'latest' reads so a client built on this provider sees a fixed block. */
+export declare const pinProviderBlock: (provider: EthereumProvider, blockNumber: number | bigint) => EthereumProvider;
 export declare const setViemBlockNumber: (block: Blockish) => {
     blockNumber?: undefined;
 } | {

package/esm/services/viem.js

@@ -1,3 +1,12 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { createPublicClient, custom, encodeFunctionData, } from 'viem';
 import { arbitrum, base, mainnet, optimism, linea, plasma, } from 'viem/chains';
 import { NetworkNumber } from '../types/common';
@@ -20,6 +29,22 @@ export const getViemChain = (network) => {
     }
 };
 export const getViemProvider = (provider, network, options) => createPublicClient(Object.assign({ transport: custom(provider), chain: getViemChain(network) }, options));
+/** Rewrites 'latest' reads so a client built on this provider sees a fixed block. */
+export const pinProviderBlock = (provider, blockNumber) => {
+    const block = `0x${BigInt(blockNumber).toString(16)}`;
+    return {
+        request: (args) => __awaiter(void 0, void 0, void 0, function* () {
+            const params = [...(args.params || [])];
+            if (args.method === 'eth_blockNumber')
+                return block;
+            if (['eth_call', 'eth_getCode', 'eth_getBalance', 'eth_getStorageAt'].includes(args.method) && (params[1] === undefined || params[1] === 'latest'))
+                params[1] = block;
+            if (args.method === 'eth_getBlockByNumber' && params[0] === 'latest')
+                params[0] = block;
+            return provider.request(Object.assign(Object.assign({}, args), { params }));
+        }),
+    };
+};
 export const setViemBlockNumber = (block) => {
     if (block === 'latest')
         return {};

package/esm/types/portfolio.d.ts

@@ -87,6 +87,8 @@ export interface CustomDeFiDataOptions {
     isSim?: boolean;
     /** viem multicall calldata cap in bytes; defaults to 250k (2k when isSim). */
     batchSize?: number;
+    /** Pins every read to this block; defaults to latest. */
+    blockNumber?: number;
 }
 export interface CustomDeFiData {
     positions: PortfolioPositionsData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.169-custom-fetching-dev",
+  "version": "2.1.169-custom-fetching-2-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/portfolio/customDeFiData.ts

@@ -22,7 +22,7 @@ import {
   PortfolioPositionsData,
   PortfolioProtocol,
 } from '../types';
-import { getViemProvider } from '../services/viem';
+import { getViemProvider, pinProviderBlock } from '../services/viem';
 import { ZERO_ADDRESS } from '../constants';
 import { _getAaveV2AccountData, _getAaveV2MarketsData } from '../aaveV2';
 import { _getAaveV3AccountData, _getAaveV3MarketData, getStakeAaveData } from '../aaveV3';
@@ -74,8 +74,9 @@ export async function getCustomDeFiData(
   const isMainnet = network === NetworkNumber.Eth;
   const isFluidSupported = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Plasma].includes(network);
 
-  const client = getViemProvider(provider, network, { batch: { multicall: { batchSize } } });
-  const defaultClient = getViemProvider(defaultProvider, network, { batch: { multicall: { batchSize } } });
+  const pin = (p: EthereumProvider) => (options.blockNumber !== undefined ? pinProviderBlock(p, options.blockNumber) : p);
+  const client = getViemProvider(pin(provider), network, { batch: { multicall: { batchSize } } });
+  const defaultClient = getViemProvider(pin(defaultProvider), network, { batch: { multicall: { batchSize } } });
 
   const aaveV3Markets = has(PortfolioProtocol.AaveV3)
     ? [AaveVersions.AaveV3, AaveVersions.AaveV3Lido, AaveVersions.AaveV3Etherfi].map((v) => AaveMarkets(network)[v]).filter((m) => m.chainIds.includes(network))

package/src/services/viem.ts

@@ -34,6 +34,20 @@ export const getViemProvider = (provider: EthereumProvider, network: NetworkNumb
   ...options,
 });
 
+/** Rewrites 'latest' reads so a client built on this provider sees a fixed block. */
+export const pinProviderBlock = (provider: EthereumProvider, blockNumber: number | bigint): EthereumProvider => {
+  const block = `0x${BigInt(blockNumber).toString(16)}`;
+  return {
+    request: async (args: any) => {
+      const params = [...(args.params || [])];
+      if (args.method === 'eth_blockNumber') return block;
+      if (['eth_call', 'eth_getCode', 'eth_getBalance', 'eth_getStorageAt'].includes(args.method) && (params[1] === undefined || params[1] === 'latest')) params[1] = block;
+      if (args.method === 'eth_getBlockByNumber' && params[0] === 'latest') params[0] = block;
+      return provider.request({ ...args, params });
+    },
+  };
+};
+
 export const setViemBlockNumber = (block: Blockish) => {
   if (block === 'latest') return {};
   return { blockNumber: BigInt(block) };

package/src/types/portfolio.ts

@@ -95,6 +95,8 @@ export interface CustomDeFiDataOptions {
   isSim?: boolean;
   /** viem multicall calldata cap in bytes; defaults to 250k (2k when isSim). */
   batchSize?: number;
+  /** Pins every read to this block; defaults to latest. */
+  blockNumber?: number;
 }
 
 export interface CustomDeFiData {