diff --git a/packages/blue-sdk-ethers/README.md b/packages/blue-sdk-ethers/README.md index 1090b374..59b015b8 100644 --- a/packages/blue-sdk-ethers/README.md +++ b/packages/blue-sdk-ethers/README.md @@ -25,20 +25,20 @@ Opt in classes augmentation to easily fetch an entire entity of the Morpho Blue ```typescript // Granular, opt-in, per-entity class augmentation: -import "@morpho-org/blue-sdk-ethers/lib/fetch/AccrualPosition"; -import "@morpho-org/blue-sdk-ethers/lib/fetch/Holding"; -import "@morpho-org/blue-sdk-ethers/lib/fetch/Market"; -import "@morpho-org/blue-sdk-ethers/lib/fetch/MarketConfig"; -import "@morpho-org/blue-sdk-ethers/lib/fetch/Position"; -import "@morpho-org/blue-sdk-ethers/lib/fetch/Token"; -import "@morpho-org/blue-sdk-ethers/lib/fetch/Vault"; -import "@morpho-org/blue-sdk-ethers/lib/fetch/VaultConfig"; -import "@morpho-org/blue-sdk-ethers/lib/fetch/VaultMarketAllocation"; -import "@morpho-org/blue-sdk-ethers/lib/fetch/VaultMarketConfig"; -import "@morpho-org/blue-sdk-ethers/lib/fetch/VaultMarketPublicAllocatorConfig"; +import "@morpho-org/blue-sdk-ethers/lib/augment/AccrualPosition"; +import "@morpho-org/blue-sdk-ethers/lib/augment/Holding"; +import "@morpho-org/blue-sdk-ethers/lib/augment/Market"; +import "@morpho-org/blue-sdk-ethers/lib/augment/MarketConfig"; +import "@morpho-org/blue-sdk-ethers/lib/augment/Position"; +import "@morpho-org/blue-sdk-ethers/lib/augment/Token"; +import "@morpho-org/blue-sdk-ethers/lib/augment/Vault"; +import "@morpho-org/blue-sdk-ethers/lib/augment/VaultConfig"; +import "@morpho-org/blue-sdk-ethers/lib/augment/VaultMarketAllocation"; +import "@morpho-org/blue-sdk-ethers/lib/augment/VaultMarketConfig"; +import "@morpho-org/blue-sdk-ethers/lib/augment/VaultMarketPublicAllocatorConfig"; // Or full, opt-in class augmentation: -import "@morpho-org/blue-sdk-ethers/lib/fetch"; +import "@morpho-org/blue-sdk-ethers/lib/augment"; ``` ### Fetch the config of a specific market @@ -47,7 +47,7 @@ Leverage the [`MarketConfig`](./src/market/MarketConfig.ts) class to fetch infor ```typescript import { MarketId, MarketConfig } from "@morpho-org/blue-sdk"; -import "@morpho-org/blue-sdk-ethers/lib/fetch/MarketConfig"; +import "@morpho-org/blue-sdk-ethers/lib/augment/MarketConfig"; const config = await MarketConfig.fetch( "0xb323495f7e4148be5643a4ea4a8221eef163e4bccfdedc2a6f4696baacbc86cc" as MarketId, @@ -64,7 +64,7 @@ Leverage the [`Market`](./src/market/Market.ts) class to fetch information on a ```typescript import { Time } from "@morpho-org/morpho-ts"; import { MarketId, Market } from "@morpho-org/blue-sdk"; -import "@morpho-org/blue-sdk-ethers/lib/fetch/Market"; +import "@morpho-org/blue-sdk-ethers/lib/augment/Market"; const market = await Market.fetch( "0xb323495f7e4148be5643a4ea4a8221eef163e4bccfdedc2a6f4696baacbc86cc" as MarketId, @@ -93,7 +93,7 @@ Leverage the [`Position`](./src/position/Position.ts) class to fetch the positio ```typescript import { Time } from "@morpho-org/morpho-ts"; import { MarketId, AccrualPosition } from "@morpho-org/blue-sdk"; -import "@morpho-org/blue-sdk-ethers/lib/fetch/Position"; +import "@morpho-org/blue-sdk-ethers/lib/augment/Position"; const position = await AccrualPosition.fetch( "0x7f65e7326F22963e2039734dDfF61958D5d284Ca", diff --git a/packages/blue-sdk-ethers/package.json b/packages/blue-sdk-ethers/package.json index 8b8cd6dc..03f4ab1d 100644 --- a/packages/blue-sdk-ethers/package.json +++ b/packages/blue-sdk-ethers/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-ethers", - "version": "1.0.5", + "version": "1.1.0", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/blue-sdk-ethers/src/augment/Holding.ts b/packages/blue-sdk-ethers/src/augment/Holding.ts new file mode 100644 index 00000000..487c2597 --- /dev/null +++ b/packages/blue-sdk-ethers/src/augment/Holding.ts @@ -0,0 +1,10 @@ +import { Holding } from "@morpho-org/blue-sdk"; +import { fetchHolding } from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace Holding { + let fetch: typeof fetchHolding; + } +} + +Holding.fetch = fetchHolding; diff --git a/packages/blue-sdk-ethers/src/augment/Market.ts b/packages/blue-sdk-ethers/src/augment/Market.ts new file mode 100644 index 00000000..28796e84 --- /dev/null +++ b/packages/blue-sdk-ethers/src/augment/Market.ts @@ -0,0 +1,12 @@ +import { Market } from "@morpho-org/blue-sdk"; +import { fetchMarket, fetchMarketFromConfig } from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace Market { + let fetch: typeof fetchMarket; + let fetchFromConfig: typeof fetchMarketFromConfig; + } +} + +Market.fetch = fetchMarket; +Market.fetchFromConfig = fetchMarketFromConfig; diff --git a/packages/blue-sdk-ethers/src/augment/MarketConfig.ts b/packages/blue-sdk-ethers/src/augment/MarketConfig.ts new file mode 100644 index 00000000..c37b8825 --- /dev/null +++ b/packages/blue-sdk-ethers/src/augment/MarketConfig.ts @@ -0,0 +1,10 @@ +import { MarketConfig } from "@morpho-org/blue-sdk"; +import { fetchMarketConfig } from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace MarketConfig { + let fetch: typeof fetchMarketConfig; + } +} + +MarketConfig.fetch = fetchMarketConfig; diff --git a/packages/blue-sdk-ethers/src/augment/Position.ts b/packages/blue-sdk-ethers/src/augment/Position.ts new file mode 100644 index 00000000..bbf15750 --- /dev/null +++ b/packages/blue-sdk-ethers/src/augment/Position.ts @@ -0,0 +1,23 @@ +import { AccrualPosition, Position } from "@morpho-org/blue-sdk"; + +import "./Market"; +import { + fetchAccrualPosition, + fetchAccrualPositionFromConfig, + fetchPosition, +} from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace Position { + let fetch: typeof fetchPosition; + } + + namespace AccrualPosition { + let fetch: typeof fetchAccrualPosition; + let fetchFromConfig: typeof fetchAccrualPositionFromConfig; + } +} + +Position.fetch = fetchPosition; +AccrualPosition.fetch = fetchAccrualPosition; +AccrualPosition.fetchFromConfig = fetchAccrualPositionFromConfig; diff --git a/packages/blue-sdk-ethers/src/augment/Token.ts b/packages/blue-sdk-ethers/src/augment/Token.ts new file mode 100644 index 00000000..4ca621b9 --- /dev/null +++ b/packages/blue-sdk-ethers/src/augment/Token.ts @@ -0,0 +1,10 @@ +import { Token } from "@morpho-org/blue-sdk"; +import { fetchToken } from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace Token { + let fetch: typeof fetchToken; + } +} + +Token.fetch = fetchToken; diff --git a/packages/blue-sdk-ethers/src/augment/Vault.ts b/packages/blue-sdk-ethers/src/augment/Vault.ts new file mode 100644 index 00000000..02662c23 --- /dev/null +++ b/packages/blue-sdk-ethers/src/augment/Vault.ts @@ -0,0 +1,20 @@ +import { AccrualVault, Vault } from "@morpho-org/blue-sdk"; + +import "./VaultConfig"; +import "./VaultMarketAllocation"; +import { fetchAccrualVault, fetchVault, fetchVaultFromConfig } from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace Vault { + let fetch: typeof fetchVault; + let fetchFromConfig: typeof fetchVaultFromConfig; + } + + namespace AccrualVault { + let fetch: typeof fetchAccrualVault; + } +} + +Vault.fetch = fetchVault; +Vault.fetchFromConfig = fetchVaultFromConfig; +AccrualVault.fetch = fetchAccrualVault; diff --git a/packages/blue-sdk-ethers/src/augment/VaultConfig.ts b/packages/blue-sdk-ethers/src/augment/VaultConfig.ts new file mode 100644 index 00000000..1cb09387 --- /dev/null +++ b/packages/blue-sdk-ethers/src/augment/VaultConfig.ts @@ -0,0 +1,10 @@ +import { VaultConfig } from "@morpho-org/blue-sdk"; +import { fetchVaultConfig } from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace VaultConfig { + let fetch: typeof fetchVaultConfig; + } +} + +VaultConfig.fetch = fetchVaultConfig; diff --git a/packages/blue-sdk-ethers/src/augment/VaultMarketAllocation.ts b/packages/blue-sdk-ethers/src/augment/VaultMarketAllocation.ts new file mode 100644 index 00000000..c7144822 --- /dev/null +++ b/packages/blue-sdk-ethers/src/augment/VaultMarketAllocation.ts @@ -0,0 +1,18 @@ +import { VaultMarketAllocation } from "@morpho-org/blue-sdk"; + +import "./Position"; +import "./VaultMarketConfig"; +import { + fetchVaultMarketAllocation, + fetchVaultMarketAllocationFromConfig, +} from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace VaultMarketAllocation { + let fetch: typeof fetchVaultMarketAllocation; + let fetchFromConfig: typeof fetchVaultMarketAllocationFromConfig; + } +} + +VaultMarketAllocation.fetch = fetchVaultMarketAllocation; +VaultMarketAllocation.fetchFromConfig = fetchVaultMarketAllocationFromConfig; diff --git a/packages/blue-sdk-ethers/src/augment/VaultMarketConfig.ts b/packages/blue-sdk-ethers/src/augment/VaultMarketConfig.ts new file mode 100644 index 00000000..6c7e4a2c --- /dev/null +++ b/packages/blue-sdk-ethers/src/augment/VaultMarketConfig.ts @@ -0,0 +1,12 @@ +import { VaultMarketConfig } from "@morpho-org/blue-sdk"; + +import "./VaultMarketPublicAllocatorConfig"; +import { fetchVaultMarketConfig } from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace VaultMarketConfig { + let fetch: typeof fetchVaultMarketConfig; + } +} + +VaultMarketConfig.fetch = fetchVaultMarketConfig; diff --git a/packages/blue-sdk-ethers/src/augment/VaultMarketPublicAllocatorConfig.ts b/packages/blue-sdk-ethers/src/augment/VaultMarketPublicAllocatorConfig.ts new file mode 100644 index 00000000..8b85c831 --- /dev/null +++ b/packages/blue-sdk-ethers/src/augment/VaultMarketPublicAllocatorConfig.ts @@ -0,0 +1,10 @@ +import { VaultMarketPublicAllocatorConfig } from "@morpho-org/blue-sdk"; +import { fetchVaultMarketPublicAllocatorConfig } from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace VaultMarketPublicAllocatorConfig { + let fetch: typeof fetchVaultMarketPublicAllocatorConfig; + } +} + +VaultMarketPublicAllocatorConfig.fetch = fetchVaultMarketPublicAllocatorConfig; diff --git a/packages/blue-sdk-ethers/src/augment/index.ts b/packages/blue-sdk-ethers/src/augment/index.ts new file mode 100644 index 00000000..162caa25 --- /dev/null +++ b/packages/blue-sdk-ethers/src/augment/index.ts @@ -0,0 +1,10 @@ +export * from "./Holding"; +export * from "./Position"; +export * from "./MarketConfig"; +export * from "./Market"; +export * from "./Token"; +export * from "./VaultConfig"; +export * from "./Vault"; +export * from "./VaultMarketConfig"; +export * from "./VaultMarketAllocation"; +export * from "./VaultMarketPublicAllocatorConfig"; diff --git a/packages/blue-sdk-ethers/src/fetch/Holding.ts b/packages/blue-sdk-ethers/src/fetch/Holding.ts index aef866ee..7dca79c9 100644 --- a/packages/blue-sdk-ethers/src/fetch/Holding.ts +++ b/packages/blue-sdk-ethers/src/fetch/Holding.ts @@ -130,11 +130,3 @@ export async function fetchHolding( return holding; } - -declare module "@morpho-org/blue-sdk" { - namespace Holding { - let fetch: typeof fetchHolding; - } -} - -Holding.fetch = fetchHolding; diff --git a/packages/blue-sdk-ethers/src/fetch/Market.ts b/packages/blue-sdk-ethers/src/fetch/Market.ts index f5f64de9..7a2919f5 100644 --- a/packages/blue-sdk-ethers/src/fetch/Market.ts +++ b/packages/blue-sdk-ethers/src/fetch/Market.ts @@ -14,8 +14,7 @@ import { MarketId, getChainAddresses, } from "@morpho-org/blue-sdk"; - -import "./MarketConfig"; +import { fetchMarketConfig } from "./MarketConfig"; export async function fetchMarket( id: MarketId, @@ -29,9 +28,9 @@ export async function fetchMarket( chainId ?? (await runner.provider.getNetwork()).chainId, ); - const config = await MarketConfig.fetch(id, runner, { chainId }); + const config = await fetchMarketConfig(id, runner, { chainId }); - return Market.fetchFromConfig(config, runner, { chainId, overrides }); + return fetchMarketFromConfig(config, runner, { chainId, overrides }); } export async function fetchMarketFromConfig( @@ -84,13 +83,3 @@ export async function fetchMarketFromConfig( rateAtTarget, }); } - -declare module "@morpho-org/blue-sdk" { - namespace Market { - let fetch: typeof fetchMarket; - let fetchFromConfig: typeof fetchMarketFromConfig; - } -} - -Market.fetch = fetchMarket; -Market.fetchFromConfig = fetchMarketFromConfig; diff --git a/packages/blue-sdk-ethers/src/fetch/MarketConfig.ts b/packages/blue-sdk-ethers/src/fetch/MarketConfig.ts index 3224a36c..3bf90f59 100644 --- a/packages/blue-sdk-ethers/src/fetch/MarketConfig.ts +++ b/packages/blue-sdk-ethers/src/fetch/MarketConfig.ts @@ -33,11 +33,3 @@ export async function fetchMarketConfig( return config; } - -declare module "@morpho-org/blue-sdk" { - namespace MarketConfig { - let fetch: typeof fetchMarketConfig; - } -} - -MarketConfig.fetch = fetchMarketConfig; diff --git a/packages/blue-sdk-ethers/src/fetch/Position.ts b/packages/blue-sdk-ethers/src/fetch/Position.ts index 81841faf..6d81df0e 100644 --- a/packages/blue-sdk-ethers/src/fetch/Position.ts +++ b/packages/blue-sdk-ethers/src/fetch/Position.ts @@ -7,14 +7,12 @@ import { Address, ChainId, ChainUtils, - Market, MarketConfig, MarketId, Position, getChainAddresses, } from "@morpho-org/blue-sdk"; - -import "./Market"; +import { fetchMarket, fetchMarketFromConfig } from "./Market"; export async function fetchPosition( user: Address, @@ -58,8 +56,8 @@ export async function fetchAccrualPosition( ); const [position, market] = await Promise.all([ - await Position.fetch(user, marketId, runner, options), - await Market.fetch(marketId, runner, options), + await fetchPosition(user, marketId, runner, options), + await fetchMarket(marketId, runner, options), ]); return new AccrualPosition(position, market); @@ -76,24 +74,9 @@ export async function fetchAccrualPositionFromConfig( ); const [position, market] = await Promise.all([ - await Position.fetch(user, config.id, runner, options), - await Market.fetchFromConfig(config, runner, options), + await fetchPosition(user, config.id, runner, options), + await fetchMarketFromConfig(config, runner, options), ]); return new AccrualPosition(position, market); } - -declare module "@morpho-org/blue-sdk" { - namespace Position { - let fetch: typeof fetchPosition; - } - - namespace AccrualPosition { - let fetch: typeof fetchAccrualPosition; - let fetchFromConfig: typeof fetchAccrualPositionFromConfig; - } -} - -Position.fetch = fetchPosition; -AccrualPosition.fetch = fetchAccrualPosition; -AccrualPosition.fetchFromConfig = fetchAccrualPositionFromConfig; diff --git a/packages/blue-sdk-ethers/src/fetch/Token.ts b/packages/blue-sdk-ethers/src/fetch/Token.ts index 204bf493..17ee3237 100644 --- a/packages/blue-sdk-ethers/src/fetch/Token.ts +++ b/packages/blue-sdk-ethers/src/fetch/Token.ts @@ -183,11 +183,3 @@ export async function fetchToken( return new Token(token); } - -declare module "@morpho-org/blue-sdk" { - namespace Token { - let fetch: typeof fetchToken; - } -} - -Token.fetch = fetchToken; diff --git a/packages/blue-sdk-ethers/src/fetch/Vault.ts b/packages/blue-sdk-ethers/src/fetch/Vault.ts index af7114f1..5e0b1fd9 100644 --- a/packages/blue-sdk-ethers/src/fetch/Vault.ts +++ b/packages/blue-sdk-ethers/src/fetch/Vault.ts @@ -10,13 +10,11 @@ import { MarketId, Vault, VaultConfig, - VaultMarketAllocation, VaultPublicAllocatorConfig, getChainAddresses, } from "@morpho-org/blue-sdk"; - -import "./VaultConfig"; -import "./VaultMarketAllocation"; +import { fetchVaultConfig } from "./VaultConfig"; +import { fetchVaultMarketAllocation } from "./VaultMarketAllocation"; export async function fetchVault( address: Address, @@ -27,9 +25,9 @@ export async function fetchVault( options.chainId ?? (await runner.provider.getNetwork()).chainId, ); - const config = await VaultConfig.fetch(address, runner, options); + const config = await fetchVaultConfig(address, runner, options); - return Vault.fetchFromConfig(address, config, runner, options); + return fetchVaultFromConfig(address, config, runner, options); } export async function fetchVaultFromConfig( @@ -152,29 +150,14 @@ export async function fetchAccrualVault( options.chainId ?? (await runner.provider.getNetwork()).chainId, ); - const vault = await Vault.fetch(address, runner, options); + const vault = await fetchVault(address, runner, options); const allocations = await Promise.all( [...new Set(vault.supplyQueue.concat(vault.withdrawQueue))].map( (marketId) => - VaultMarketAllocation.fetch(vault.address, marketId, runner, options), + fetchVaultMarketAllocation(vault.address, marketId, runner, options), ), ); return new AccrualVault(vault, allocations); } - -declare module "@morpho-org/blue-sdk" { - namespace Vault { - let fetch: typeof fetchVault; - let fetchFromConfig: typeof fetchVaultFromConfig; - } - - namespace AccrualVault { - let fetch: typeof fetchAccrualVault; - } -} - -Vault.fetch = fetchVault; -Vault.fetchFromConfig = fetchVaultFromConfig; -AccrualVault.fetch = fetchAccrualVault; diff --git a/packages/blue-sdk-ethers/src/fetch/VaultConfig.ts b/packages/blue-sdk-ethers/src/fetch/VaultConfig.ts index 5eea13f6..e9babf52 100644 --- a/packages/blue-sdk-ethers/src/fetch/VaultConfig.ts +++ b/packages/blue-sdk-ethers/src/fetch/VaultConfig.ts @@ -51,11 +51,3 @@ export async function fetchVaultConfig( return config; } - -declare module "@morpho-org/blue-sdk" { - namespace VaultConfig { - let fetch: typeof fetchVaultConfig; - } -} - -VaultConfig.fetch = fetchVaultConfig; diff --git a/packages/blue-sdk-ethers/src/fetch/VaultMarketAllocation.ts b/packages/blue-sdk-ethers/src/fetch/VaultMarketAllocation.ts index e4ac3c70..a441064a 100644 --- a/packages/blue-sdk-ethers/src/fetch/VaultMarketAllocation.ts +++ b/packages/blue-sdk-ethers/src/fetch/VaultMarketAllocation.ts @@ -2,7 +2,6 @@ import { Provider } from "ethers"; import { ViewOverrides } from "ethers-types/dist/common"; import { - AccrualPosition, Address, ChainId, ChainUtils, @@ -10,9 +9,8 @@ import { VaultMarketAllocation, VaultMarketConfig, } from "@morpho-org/blue-sdk"; - -import "./Position"; -import "./VaultMarketConfig"; +import { fetchAccrualPosition } from "./Position"; +import { fetchVaultMarketConfig } from "./VaultMarketConfig"; export async function fetchVaultMarketAllocation( vault: Address, @@ -24,14 +22,9 @@ export async function fetchVaultMarketAllocation( options.chainId ?? (await runner.provider.getNetwork()).chainId, ); - const config = await VaultMarketConfig.fetch( - vault, - marketId, - runner, - options, - ); + const config = await fetchVaultMarketConfig(vault, marketId, runner, options); - return VaultMarketAllocation.fetchFromConfig( + return fetchVaultMarketAllocationFromConfig( config, marketId, runner, @@ -51,7 +44,7 @@ export async function fetchVaultMarketAllocationFromConfig( return new VaultMarketAllocation({ config, - position: await AccrualPosition.fetch( + position: await fetchAccrualPosition( config.vault, marketId, runner, @@ -59,13 +52,3 @@ export async function fetchVaultMarketAllocationFromConfig( ), }); } - -declare module "@morpho-org/blue-sdk" { - namespace VaultMarketAllocation { - let fetch: typeof fetchVaultMarketAllocation; - let fetchFromConfig: typeof fetchVaultMarketAllocationFromConfig; - } -} - -VaultMarketAllocation.fetch = fetchVaultMarketAllocation; -VaultMarketAllocation.fetchFromConfig = fetchVaultMarketAllocationFromConfig; diff --git a/packages/blue-sdk-ethers/src/fetch/VaultMarketConfig.ts b/packages/blue-sdk-ethers/src/fetch/VaultMarketConfig.ts index 3981ea8b..7ebbbdf4 100644 --- a/packages/blue-sdk-ethers/src/fetch/VaultMarketConfig.ts +++ b/packages/blue-sdk-ethers/src/fetch/VaultMarketConfig.ts @@ -8,10 +8,8 @@ import { ChainUtils, MarketId, VaultMarketConfig, - VaultMarketPublicAllocatorConfig, } from "@morpho-org/blue-sdk"; - -import "./VaultMarketPublicAllocatorConfig"; +import { fetchVaultMarketPublicAllocatorConfig } from "./VaultMarketPublicAllocatorConfig"; export async function fetchVaultMarketConfig( vault: Address, @@ -32,7 +30,7 @@ export async function fetchVaultMarketConfig( mm .pendingCap(marketId, options.overrides) .then(({ value, validAt }) => ({ value, validAt })), - VaultMarketPublicAllocatorConfig.fetch(vault, marketId, runner, options), + fetchVaultMarketPublicAllocatorConfig(vault, marketId, runner, options), ]); return new VaultMarketConfig({ @@ -45,11 +43,3 @@ export async function fetchVaultMarketConfig( publicAllocatorConfig, }); } - -declare module "@morpho-org/blue-sdk" { - namespace VaultMarketConfig { - let fetch: typeof fetchVaultMarketConfig; - } -} - -VaultMarketConfig.fetch = fetchVaultMarketConfig; diff --git a/packages/blue-sdk-ethers/src/fetch/VaultMarketPublicAllocatorConfig.ts b/packages/blue-sdk-ethers/src/fetch/VaultMarketPublicAllocatorConfig.ts index 6635fb1a..da8442e8 100644 --- a/packages/blue-sdk-ethers/src/fetch/VaultMarketPublicAllocatorConfig.ts +++ b/packages/blue-sdk-ethers/src/fetch/VaultMarketPublicAllocatorConfig.ts @@ -40,11 +40,3 @@ export async function fetchVaultMarketPublicAllocatorConfig( maxOut, }); } - -declare module "@morpho-org/blue-sdk" { - namespace VaultMarketPublicAllocatorConfig { - let fetch: typeof fetchVaultMarketPublicAllocatorConfig; - } -} - -VaultMarketPublicAllocatorConfig.fetch = fetchVaultMarketPublicAllocatorConfig; diff --git a/packages/blue-sdk-ethers/src/index.ts b/packages/blue-sdk-ethers/src/index.ts index a545a5a0..009bd558 100644 --- a/packages/blue-sdk-ethers/src/index.ts +++ b/packages/blue-sdk-ethers/src/index.ts @@ -1,9 +1,11 @@ export * from "./evm"; export * from "./notifications"; export * from "./signatures"; +export * from "./fetch"; export * from "./ethers"; export * as evm from "./evm"; export * as notifications from "./notifications"; export * as signatures from "./signatures"; +export * as fetch from "./fetch"; export * as ethers from "./ethers"; diff --git a/packages/blue-sdk-viem/README.md b/packages/blue-sdk-viem/README.md index 2edc32b6..b63e3941 100644 --- a/packages/blue-sdk-viem/README.md +++ b/packages/blue-sdk-viem/README.md @@ -25,20 +25,20 @@ Opt in classes augmentation to easily fetch an entire entity of the Morpho Blue ```typescript // Granular, opt-in, per-entity class augmentation: -import "@morpho-org/blue-sdk-viem/lib/fetch/AccrualPosition"; -import "@morpho-org/blue-sdk-viem/lib/fetch/Holding"; -import "@morpho-org/blue-sdk-viem/lib/fetch/Market"; -import "@morpho-org/blue-sdk-viem/lib/fetch/MarketConfig"; -import "@morpho-org/blue-sdk-viem/lib/fetch/Position"; -import "@morpho-org/blue-sdk-viem/lib/fetch/Token"; -import "@morpho-org/blue-sdk-viem/lib/fetch/Vault"; -import "@morpho-org/blue-sdk-viem/lib/fetch/VaultConfig"; -import "@morpho-org/blue-sdk-viem/lib/fetch/VaultMarketAllocation"; -import "@morpho-org/blue-sdk-viem/lib/fetch/VaultMarketConfig"; -import "@morpho-org/blue-sdk-viem/lib/fetch/VaultMarketPublicAllocatorConfig"; +import "@morpho-org/blue-sdk-viem/lib/augment/AccrualPosition"; +import "@morpho-org/blue-sdk-viem/lib/augment/Holding"; +import "@morpho-org/blue-sdk-viem/lib/augment/Market"; +import "@morpho-org/blue-sdk-viem/lib/augment/MarketConfig"; +import "@morpho-org/blue-sdk-viem/lib/augment/Position"; +import "@morpho-org/blue-sdk-viem/lib/augment/Token"; +import "@morpho-org/blue-sdk-viem/lib/augment/Vault"; +import "@morpho-org/blue-sdk-viem/lib/augment/VaultConfig"; +import "@morpho-org/blue-sdk-viem/lib/augment/VaultMarketAllocation"; +import "@morpho-org/blue-sdk-viem/lib/augment/VaultMarketConfig"; +import "@morpho-org/blue-sdk-viem/lib/augment/VaultMarketPublicAllocatorConfig"; // Or full, opt-in class augmentation: -import "@morpho-org/blue-sdk-viem/lib/fetch"; +import "@morpho-org/blue-sdk-viem/lib/augment"; ``` ### Fetch the config of a specific market @@ -47,7 +47,7 @@ Leverage the [`MarketConfig`](./src/market/MarketConfig.ts) class to fetch infor ```typescript import { MarketConfig } from "@morpho-org/blue-sdk"; -import "@morpho-org/blue-sdk-viem/lib/fetch/MarketConfig"; +import "@morpho-org/blue-sdk-viem/lib/augment/MarketConfig"; const config = await MarketConfig.fetch( "0xb323495f7e4148be5643a4ea4a8221eef163e4bccfdedc2a6f4696baacbc86cc", @@ -64,7 +64,7 @@ Leverage the [`Market`](./src/market/Market.ts) class to fetch information on a ```typescript import { Time } from "@morpho-org/morpho-ts"; import { Market } from "@morpho-org/blue-sdk"; -import "@morpho-org/blue-sdk-viem/lib/fetch/Market"; +import "@morpho-org/blue-sdk-viem/lib/augment/Market"; const market = await Market.fetch( "0xb323495f7e4148be5643a4ea4a8221eef163e4bccfdedc2a6f4696baacbc86cc", @@ -93,7 +93,7 @@ Leverage the [`Position`](./src/position/Position.ts) class to fetch the positio ```typescript import { Time } from "@morpho-org/morpho-ts"; import { AccrualPosition } from "@morpho-org/blue-sdk"; -import "@morpho-org/blue-sdk-viem/lib/fetch/Position"; +import "@morpho-org/blue-sdk-viem/lib/augment/Position"; const position = await AccrualPosition.fetch( "0x7f65e7326F22963e2039734dDfF61958D5d284Ca", diff --git a/packages/blue-sdk-viem/package.json b/packages/blue-sdk-viem/package.json index a5a987dd..eb8b0017 100644 --- a/packages/blue-sdk-viem/package.json +++ b/packages/blue-sdk-viem/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-viem", - "version": "1.0.0", + "version": "1.1.0", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/blue-sdk-viem/src/augment/Holding.ts b/packages/blue-sdk-viem/src/augment/Holding.ts new file mode 100644 index 00000000..487c2597 --- /dev/null +++ b/packages/blue-sdk-viem/src/augment/Holding.ts @@ -0,0 +1,10 @@ +import { Holding } from "@morpho-org/blue-sdk"; +import { fetchHolding } from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace Holding { + let fetch: typeof fetchHolding; + } +} + +Holding.fetch = fetchHolding; diff --git a/packages/blue-sdk-viem/src/augment/Market.ts b/packages/blue-sdk-viem/src/augment/Market.ts new file mode 100644 index 00000000..28796e84 --- /dev/null +++ b/packages/blue-sdk-viem/src/augment/Market.ts @@ -0,0 +1,12 @@ +import { Market } from "@morpho-org/blue-sdk"; +import { fetchMarket, fetchMarketFromConfig } from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace Market { + let fetch: typeof fetchMarket; + let fetchFromConfig: typeof fetchMarketFromConfig; + } +} + +Market.fetch = fetchMarket; +Market.fetchFromConfig = fetchMarketFromConfig; diff --git a/packages/blue-sdk-viem/src/augment/MarketConfig.ts b/packages/blue-sdk-viem/src/augment/MarketConfig.ts new file mode 100644 index 00000000..c37b8825 --- /dev/null +++ b/packages/blue-sdk-viem/src/augment/MarketConfig.ts @@ -0,0 +1,10 @@ +import { MarketConfig } from "@morpho-org/blue-sdk"; +import { fetchMarketConfig } from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace MarketConfig { + let fetch: typeof fetchMarketConfig; + } +} + +MarketConfig.fetch = fetchMarketConfig; diff --git a/packages/blue-sdk-viem/src/augment/Position.ts b/packages/blue-sdk-viem/src/augment/Position.ts new file mode 100644 index 00000000..bbf15750 --- /dev/null +++ b/packages/blue-sdk-viem/src/augment/Position.ts @@ -0,0 +1,23 @@ +import { AccrualPosition, Position } from "@morpho-org/blue-sdk"; + +import "./Market"; +import { + fetchAccrualPosition, + fetchAccrualPositionFromConfig, + fetchPosition, +} from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace Position { + let fetch: typeof fetchPosition; + } + + namespace AccrualPosition { + let fetch: typeof fetchAccrualPosition; + let fetchFromConfig: typeof fetchAccrualPositionFromConfig; + } +} + +Position.fetch = fetchPosition; +AccrualPosition.fetch = fetchAccrualPosition; +AccrualPosition.fetchFromConfig = fetchAccrualPositionFromConfig; diff --git a/packages/blue-sdk-viem/src/augment/Token.ts b/packages/blue-sdk-viem/src/augment/Token.ts new file mode 100644 index 00000000..4ca621b9 --- /dev/null +++ b/packages/blue-sdk-viem/src/augment/Token.ts @@ -0,0 +1,10 @@ +import { Token } from "@morpho-org/blue-sdk"; +import { fetchToken } from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace Token { + let fetch: typeof fetchToken; + } +} + +Token.fetch = fetchToken; diff --git a/packages/blue-sdk-viem/src/augment/Vault.ts b/packages/blue-sdk-viem/src/augment/Vault.ts new file mode 100644 index 00000000..02662c23 --- /dev/null +++ b/packages/blue-sdk-viem/src/augment/Vault.ts @@ -0,0 +1,20 @@ +import { AccrualVault, Vault } from "@morpho-org/blue-sdk"; + +import "./VaultConfig"; +import "./VaultMarketAllocation"; +import { fetchAccrualVault, fetchVault, fetchVaultFromConfig } from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace Vault { + let fetch: typeof fetchVault; + let fetchFromConfig: typeof fetchVaultFromConfig; + } + + namespace AccrualVault { + let fetch: typeof fetchAccrualVault; + } +} + +Vault.fetch = fetchVault; +Vault.fetchFromConfig = fetchVaultFromConfig; +AccrualVault.fetch = fetchAccrualVault; diff --git a/packages/blue-sdk-viem/src/augment/VaultConfig.ts b/packages/blue-sdk-viem/src/augment/VaultConfig.ts new file mode 100644 index 00000000..1cb09387 --- /dev/null +++ b/packages/blue-sdk-viem/src/augment/VaultConfig.ts @@ -0,0 +1,10 @@ +import { VaultConfig } from "@morpho-org/blue-sdk"; +import { fetchVaultConfig } from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace VaultConfig { + let fetch: typeof fetchVaultConfig; + } +} + +VaultConfig.fetch = fetchVaultConfig; diff --git a/packages/blue-sdk-viem/src/augment/VaultMarketAllocation.ts b/packages/blue-sdk-viem/src/augment/VaultMarketAllocation.ts new file mode 100644 index 00000000..c7144822 --- /dev/null +++ b/packages/blue-sdk-viem/src/augment/VaultMarketAllocation.ts @@ -0,0 +1,18 @@ +import { VaultMarketAllocation } from "@morpho-org/blue-sdk"; + +import "./Position"; +import "./VaultMarketConfig"; +import { + fetchVaultMarketAllocation, + fetchVaultMarketAllocationFromConfig, +} from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace VaultMarketAllocation { + let fetch: typeof fetchVaultMarketAllocation; + let fetchFromConfig: typeof fetchVaultMarketAllocationFromConfig; + } +} + +VaultMarketAllocation.fetch = fetchVaultMarketAllocation; +VaultMarketAllocation.fetchFromConfig = fetchVaultMarketAllocationFromConfig; diff --git a/packages/blue-sdk-viem/src/augment/VaultMarketConfig.ts b/packages/blue-sdk-viem/src/augment/VaultMarketConfig.ts new file mode 100644 index 00000000..6c7e4a2c --- /dev/null +++ b/packages/blue-sdk-viem/src/augment/VaultMarketConfig.ts @@ -0,0 +1,12 @@ +import { VaultMarketConfig } from "@morpho-org/blue-sdk"; + +import "./VaultMarketPublicAllocatorConfig"; +import { fetchVaultMarketConfig } from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace VaultMarketConfig { + let fetch: typeof fetchVaultMarketConfig; + } +} + +VaultMarketConfig.fetch = fetchVaultMarketConfig; diff --git a/packages/blue-sdk-viem/src/augment/VaultMarketPublicAllocatorConfig.ts b/packages/blue-sdk-viem/src/augment/VaultMarketPublicAllocatorConfig.ts new file mode 100644 index 00000000..8b85c831 --- /dev/null +++ b/packages/blue-sdk-viem/src/augment/VaultMarketPublicAllocatorConfig.ts @@ -0,0 +1,10 @@ +import { VaultMarketPublicAllocatorConfig } from "@morpho-org/blue-sdk"; +import { fetchVaultMarketPublicAllocatorConfig } from "../fetch"; + +declare module "@morpho-org/blue-sdk" { + namespace VaultMarketPublicAllocatorConfig { + let fetch: typeof fetchVaultMarketPublicAllocatorConfig; + } +} + +VaultMarketPublicAllocatorConfig.fetch = fetchVaultMarketPublicAllocatorConfig; diff --git a/packages/blue-sdk-viem/src/augment/index.ts b/packages/blue-sdk-viem/src/augment/index.ts new file mode 100644 index 00000000..162caa25 --- /dev/null +++ b/packages/blue-sdk-viem/src/augment/index.ts @@ -0,0 +1,10 @@ +export * from "./Holding"; +export * from "./Position"; +export * from "./MarketConfig"; +export * from "./Market"; +export * from "./Token"; +export * from "./VaultConfig"; +export * from "./Vault"; +export * from "./VaultMarketConfig"; +export * from "./VaultMarketAllocation"; +export * from "./VaultMarketPublicAllocatorConfig"; diff --git a/packages/blue-sdk-viem/src/fetch/Holding.ts b/packages/blue-sdk-viem/src/fetch/Holding.ts index b1b1eef0..2c034aa7 100644 --- a/packages/blue-sdk-viem/src/fetch/Holding.ts +++ b/packages/blue-sdk-viem/src/fetch/Holding.ts @@ -184,11 +184,3 @@ export async function fetchHolding< return holding; } - -declare module "@morpho-org/blue-sdk" { - namespace Holding { - let fetch: typeof fetchHolding; - } -} - -Holding.fetch = fetchHolding; diff --git a/packages/blue-sdk-viem/src/fetch/Market.ts b/packages/blue-sdk-viem/src/fetch/Market.ts index 5775e107..5de50445 100644 --- a/packages/blue-sdk-viem/src/fetch/Market.ts +++ b/packages/blue-sdk-viem/src/fetch/Market.ts @@ -18,9 +18,9 @@ import { getChainAddresses, } from "@morpho-org/blue-sdk"; -import "./MarketConfig"; import { adaptiveCurveIrmAbi, blueAbi, blueOracleAbi } from "../abis"; import { ViewOverrides } from "../types"; +import { fetchMarketConfig } from "./MarketConfig"; export async function fetchMarket< transport extends Transport, @@ -44,9 +44,9 @@ export async function fetchMarket< chainId ?? (await client.getChainId()), ); - const config = await MarketConfig.fetch(id, client, { chainId }); + const config = await fetchMarketConfig(id, client, { chainId }); - return Market.fetchFromConfig(config, client, { chainId, overrides }); + return fetchMarketFromConfig(config, client, { chainId, overrides }); } export async function fetchMarketFromConfig< @@ -123,13 +123,3 @@ export async function fetchMarketFromConfig< rateAtTarget, }); } - -declare module "@morpho-org/blue-sdk" { - namespace Market { - let fetch: typeof fetchMarket; - let fetchFromConfig: typeof fetchMarketFromConfig; - } -} - -Market.fetch = fetchMarket; -Market.fetchFromConfig = fetchMarketFromConfig; diff --git a/packages/blue-sdk-viem/src/fetch/MarketConfig.ts b/packages/blue-sdk-viem/src/fetch/MarketConfig.ts index 63ea7f94..ef25d3cf 100644 --- a/packages/blue-sdk-viem/src/fetch/MarketConfig.ts +++ b/packages/blue-sdk-viem/src/fetch/MarketConfig.ts @@ -62,11 +62,3 @@ export async function fetchMarketConfig< return config; } - -declare module "@morpho-org/blue-sdk" { - namespace MarketConfig { - let fetch: typeof fetchMarketConfig; - } -} - -MarketConfig.fetch = fetchMarketConfig; diff --git a/packages/blue-sdk-viem/src/fetch/Position.ts b/packages/blue-sdk-viem/src/fetch/Position.ts index 1202b815..472ae47c 100644 --- a/packages/blue-sdk-viem/src/fetch/Position.ts +++ b/packages/blue-sdk-viem/src/fetch/Position.ts @@ -12,7 +12,6 @@ import { AccrualPosition, ChainId, ChainUtils, - Market, MarketConfig, MarketId, Position, @@ -21,7 +20,7 @@ import { import { blueAbi } from "../abis"; import { ViewOverrides } from "../types"; -import "./Market"; +import { fetchMarket, fetchMarketFromConfig } from "./Market"; export async function fetchPosition< transport extends Transport, @@ -86,8 +85,8 @@ export async function fetchAccrualPosition< ); const [position, market] = await Promise.all([ - await Position.fetch(user, marketId, client, options), - await Market.fetch(marketId, client, options), + await fetchPosition(user, marketId, client, options), + await fetchMarket(marketId, client, options), ]); return new AccrualPosition(position, market); @@ -114,24 +113,9 @@ export async function fetchAccrualPositionFromConfig< ); const [position, market] = await Promise.all([ - await Position.fetch(user, config.id, client, options), - await Market.fetchFromConfig(config, client, options), + await fetchPosition(user, config.id, client, options), + await fetchMarketFromConfig(config, client, options), ]); return new AccrualPosition(position, market); } - -declare module "@morpho-org/blue-sdk" { - namespace Position { - let fetch: typeof fetchPosition; - } - - namespace AccrualPosition { - let fetch: typeof fetchAccrualPosition; - let fetchFromConfig: typeof fetchAccrualPositionFromConfig; - } -} - -Position.fetch = fetchPosition; -AccrualPosition.fetch = fetchAccrualPosition; -AccrualPosition.fetchFromConfig = fetchAccrualPositionFromConfig; diff --git a/packages/blue-sdk-viem/src/fetch/Token.ts b/packages/blue-sdk-viem/src/fetch/Token.ts index 5452e415..54ed33bb 100644 --- a/packages/blue-sdk-viem/src/fetch/Token.ts +++ b/packages/blue-sdk-viem/src/fetch/Token.ts @@ -110,11 +110,3 @@ export async function fetchToken< return new Token(token); } - -declare module "@morpho-org/blue-sdk" { - namespace Token { - let fetch: typeof fetchToken; - } -} - -Token.fetch = fetchToken; diff --git a/packages/blue-sdk-viem/src/fetch/Vault.ts b/packages/blue-sdk-viem/src/fetch/Vault.ts index e4b86849..e037e150 100644 --- a/packages/blue-sdk-viem/src/fetch/Vault.ts +++ b/packages/blue-sdk-viem/src/fetch/Vault.ts @@ -15,15 +15,14 @@ import { MarketId, Vault, VaultConfig, - VaultMarketAllocation, VaultPublicAllocatorConfig, getChainAddresses, } from "@morpho-org/blue-sdk"; -import "./VaultConfig"; -import "./VaultMarketAllocation"; import { metaMorphoAbi, publicAllocatorAbi } from "../abis"; import { ViewOverrides } from "../types"; +import { fetchVaultConfig } from "./VaultConfig"; +import { fetchVaultMarketAllocation } from "./VaultMarketAllocation"; export async function fetchVault< transport extends Transport, @@ -44,9 +43,9 @@ export async function fetchVault< options.chainId ?? (await client.getChainId()), ); - const config = await VaultConfig.fetch(address, client, options); + const config = await fetchVaultConfig(address, client, options); - return Vault.fetchFromConfig(address, config, client, options); + return fetchVaultFromConfig(address, config, client, options); } export async function fetchVaultFromConfig< @@ -295,12 +294,12 @@ export async function fetchAccrualVault< options.chainId ?? (await client.getChainId()), ); - const vault = await Vault.fetch(address, client, options); + const vault = await fetchVault(address, client, options); const allocations = await Promise.all( [...new Set(vault.supplyQueue.concat(vault.withdrawQueue))].map( (marketId) => - VaultMarketAllocation.fetch( + fetchVaultMarketAllocation( vault.address as Address, marketId, client, @@ -311,18 +310,3 @@ export async function fetchAccrualVault< return new AccrualVault(vault, allocations); } - -declare module "@morpho-org/blue-sdk" { - namespace Vault { - let fetch: typeof fetchVault; - let fetchFromConfig: typeof fetchVaultFromConfig; - } - - namespace AccrualVault { - let fetch: typeof fetchAccrualVault; - } -} - -Vault.fetch = fetchVault; -Vault.fetchFromConfig = fetchVaultFromConfig; -AccrualVault.fetch = fetchAccrualVault; diff --git a/packages/blue-sdk-viem/src/fetch/VaultConfig.ts b/packages/blue-sdk-viem/src/fetch/VaultConfig.ts index 557873b9..8c2dbec1 100644 --- a/packages/blue-sdk-viem/src/fetch/VaultConfig.ts +++ b/packages/blue-sdk-viem/src/fetch/VaultConfig.ts @@ -86,11 +86,3 @@ export async function fetchVaultConfig< return config; } - -declare module "@morpho-org/blue-sdk" { - namespace VaultConfig { - let fetch: typeof fetchVaultConfig; - } -} - -VaultConfig.fetch = fetchVaultConfig; diff --git a/packages/blue-sdk-viem/src/fetch/VaultMarketAllocation.ts b/packages/blue-sdk-viem/src/fetch/VaultMarketAllocation.ts index 5fd0b32b..26253421 100644 --- a/packages/blue-sdk-viem/src/fetch/VaultMarketAllocation.ts +++ b/packages/blue-sdk-viem/src/fetch/VaultMarketAllocation.ts @@ -9,7 +9,6 @@ import { } from "viem"; import { - AccrualPosition, ChainId, ChainUtils, MarketId, @@ -17,9 +16,9 @@ import { VaultMarketConfig, } from "@morpho-org/blue-sdk"; -import "./Position"; -import "./VaultMarketConfig"; import { ViewOverrides } from "../types"; +import { fetchAccrualPosition } from "./Position"; +import { fetchVaultMarketConfig } from "./VaultMarketConfig"; export async function fetchVaultMarketAllocation< transport extends Transport, @@ -41,14 +40,9 @@ export async function fetchVaultMarketAllocation< options.chainId ?? (await client.getChainId()), ); - const config = await VaultMarketConfig.fetch( - vault, - marketId, - client, - options, - ); + const config = await fetchVaultMarketConfig(vault, marketId, client, options); - return VaultMarketAllocation.fetchFromConfig( + return fetchVaultMarketAllocationFromConfig( config, marketId, client, @@ -78,7 +72,7 @@ export async function fetchVaultMarketAllocationFromConfig< return new VaultMarketAllocation({ config, - position: await AccrualPosition.fetch( + position: await fetchAccrualPosition( config.vault as Address, marketId, client, @@ -86,13 +80,3 @@ export async function fetchVaultMarketAllocationFromConfig< ), }); } - -declare module "@morpho-org/blue-sdk" { - namespace VaultMarketAllocation { - let fetch: typeof fetchVaultMarketAllocation; - let fetchFromConfig: typeof fetchVaultMarketAllocationFromConfig; - } -} - -VaultMarketAllocation.fetch = fetchVaultMarketAllocation; -VaultMarketAllocation.fetchFromConfig = fetchVaultMarketAllocationFromConfig; diff --git a/packages/blue-sdk-viem/src/fetch/VaultMarketConfig.ts b/packages/blue-sdk-viem/src/fetch/VaultMarketConfig.ts index 5dd5ed2c..096d89d7 100644 --- a/packages/blue-sdk-viem/src/fetch/VaultMarketConfig.ts +++ b/packages/blue-sdk-viem/src/fetch/VaultMarketConfig.ts @@ -13,12 +13,11 @@ import { ChainUtils, MarketId, VaultMarketConfig, - VaultMarketPublicAllocatorConfig, } from "@morpho-org/blue-sdk"; -import "./VaultMarketPublicAllocatorConfig"; import { metaMorphoAbi } from "../abis"; import { ViewOverrides } from "../types"; +import { fetchVaultMarketPublicAllocatorConfig } from "./VaultMarketPublicAllocatorConfig"; export async function fetchVaultMarketConfig< transport extends Transport, @@ -58,7 +57,7 @@ export async function fetchVaultMarketConfig< args: [marketId], }) .then(([value, validAt]) => ({ value, validAt })), - VaultMarketPublicAllocatorConfig.fetch(vault, marketId, client, options), + fetchVaultMarketPublicAllocatorConfig(vault, marketId, client, options), ]); return new VaultMarketConfig({ @@ -71,11 +70,3 @@ export async function fetchVaultMarketConfig< publicAllocatorConfig, }); } - -declare module "@morpho-org/blue-sdk" { - namespace VaultMarketConfig { - let fetch: typeof fetchVaultMarketConfig; - } -} - -VaultMarketConfig.fetch = fetchVaultMarketConfig; diff --git a/packages/blue-sdk-viem/src/fetch/VaultMarketPublicAllocatorConfig.ts b/packages/blue-sdk-viem/src/fetch/VaultMarketPublicAllocatorConfig.ts index 53257b6b..8d16836f 100644 --- a/packages/blue-sdk-viem/src/fetch/VaultMarketPublicAllocatorConfig.ts +++ b/packages/blue-sdk-viem/src/fetch/VaultMarketPublicAllocatorConfig.ts @@ -60,11 +60,3 @@ export async function fetchVaultMarketPublicAllocatorConfig< maxOut, }); } - -declare module "@morpho-org/blue-sdk" { - namespace VaultMarketPublicAllocatorConfig { - let fetch: typeof fetchVaultMarketPublicAllocatorConfig; - } -} - -VaultMarketPublicAllocatorConfig.fetch = fetchVaultMarketPublicAllocatorConfig;