@defisaver/positions-sdk 0.0.17 → 0.0.18

package/esm/types/contracts/generated/index.d.ts

@@ -56,6 +56,8 @@ export type { CrvUSDFactory } from "./CrvUSDFactory";
 export type { CrvUSDView } from "./CrvUSDView";
 export type { CrvUSDWBTCAmm } from "./CrvUSDWBTCAmm";
 export type { CrvUSDWBTCController } from "./CrvUSDWBTCController";
+export type { CrvUSDsfrxETHAmm } from "./CrvUSDsfrxETHAmm";
+export type { CrvUSDsfrxETHController } from "./CrvUSDsfrxETHController";
 export type { CrvUSDtBTCAmm } from "./CrvUSDtBTCAmm";
 export type { CrvUSDtBTCController } from "./CrvUSDtBTCController";
 export type { CrvUSDwstETHAmm } from "./CrvUSDwstETHAmm";

package/esm/types/curveUsd.d.ts

@@ -3,7 +3,8 @@ export declare enum CrvUSDVersions {
     'wstETH' = "wstETH",
     'WBTC' = "WBTC",
     'ETH' = "ETH",
-    'tBTC' = "tBTC"
+    'tBTC' = "tBTC",
+    'sfrxETH' = "sfrxETH"
 }
 export declare enum CrvUSDStatus {
     Nonexistant = "Nonexistant",

package/esm/types/curveUsd.js

@@ -4,6 +4,7 @@ export var CrvUSDVersions;
     CrvUSDVersions["WBTC"] = "WBTC";
     CrvUSDVersions["ETH"] = "ETH";
     CrvUSDVersions["tBTC"] = "tBTC";
+    CrvUSDVersions["sfrxETH"] = "sfrxETH";
 })(CrvUSDVersions || (CrvUSDVersions = {}));
 export var CrvUSDStatus;
 (function (CrvUSDStatus) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV3/index.ts

@@ -398,7 +398,7 @@ export const getAaveV3AccountBalances = async (web3: Web3, network: NetworkNumbe
   return balances;
 };
 
-export const getAaveV3AccountData = async (web3: Web3, network: NetworkNumber, address: EthAddress, extractedState: any, customGetAggregatedDataFunction?: Function): Promise<AaveV3PositionData> => {
+export const getAaveV3AccountData = async (web3: Web3, network: NetworkNumber, address: EthAddress, extractedState: any): Promise<AaveV3PositionData> => {
   const {
     selectedMarket: market, assetsData,
   } = extractedState;
@@ -509,13 +509,11 @@ export const getAaveV3AccountData = async (web3: Web3, network: NetworkNumber, a
     };
   });
 
-  const aggregateFunction = customGetAggregatedDataFunction || aaveAnyGetAggregatedPositionData;
-
   payload.eModeCategory = +multicallRes[0][0];
   payload = {
     ...payload,
     usedAssets,
-    ...aggregateFunction({
+    ...aaveAnyGetAggregatedPositionData({
       ...extractedState, usedAssets, eModeCategory: payload.eModeCategory,
     }),
   };

package/src/compoundV3/index.ts

@@ -170,7 +170,6 @@ export const getCompoundV3AccountData = async (
     selectedMarket: CompoundMarketData,
     assetsData: CompoundV3AssetsData,
   }),
-  customGetAggregatedDataFunction?: Function,
 ): Promise<CompoundV3PositionData> => {
   if (!address) throw new Error('No address provided');
   const {
@@ -245,12 +244,10 @@ export const getCompoundV3AccountData = async (
     };
   });
 
-  const aggregateFunction = customGetAggregatedDataFunction || getCompoundV3AggregatedData;
-
   payload = {
     ...payload,
     usedAssets,
-    ...aggregateFunction({
+    ...getCompoundV3AggregatedData({
       usedAssets, assetsData, network, selectedMarket,
     }),
     isAllowed: data[1][0],

package/src/morphoAaveV3/index.ts

@@ -447,7 +447,6 @@ export const getMorphoAaveV3AccountData = async (
   assetsData: MorphoAaveV3AssetsData,
   delegator: string,
   selectedMarket: MorphoAaveV3MarketInfo,
-  customGetAggregatedDataFunction?: Function,
 ): Promise<MorphoAaveV3PositionData> => {
   if (!address) {
     throw new Error('No address provided.');
@@ -591,11 +590,9 @@ export const getMorphoAaveV3AccountData = async (
     }
   });
 
-  const aggregateFunction = customGetAggregatedDataFunction || aaveAnyGetAggregatedPositionData;
-
   payload = {
     ...payload,
-    ...aggregateFunction({
+    ...aaveAnyGetAggregatedPositionData({
       usedAssets: payload.usedAssets, assetsData, eModeCategory, selectedMarket,
     }),
   };

package/src/types/contracts/generated/CrvUSDsfrxETHAmm.ts

@@ -0,0 +1,286 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import type BN from "bn.js";
+import type { ContractOptions } from "web3-eth-contract";
+import type { EventLog } from "web3-core";
+import type { EventEmitter } from "events";
+import type {
+  Callback,
+  PayableTransactionObject,
+  NonPayableTransactionObject,
+  BlockType,
+  ContractEventLog,
+  BaseContract,
+} from "./types";
+
+export interface EventOptions {
+  filter?: object;
+  fromBlock?: BlockType;
+  topics?: string[];
+}
+
+export type TokenExchange = ContractEventLog<{
+  buyer: string;
+  sold_id: string;
+  tokens_sold: string;
+  bought_id: string;
+  tokens_bought: string;
+  0: string;
+  1: string;
+  2: string;
+  3: string;
+  4: string;
+}>;
+export type Deposit = ContractEventLog<{
+  provider: string;
+  amount: string;
+  n1: string;
+  n2: string;
+  0: string;
+  1: string;
+  2: string;
+  3: string;
+}>;
+export type Withdraw = ContractEventLog<{
+  provider: string;
+  amount_borrowed: string;
+  amount_collateral: string;
+  0: string;
+  1: string;
+  2: string;
+}>;
+export type SetRate = ContractEventLog<{
+  rate: string;
+  rate_mul: string;
+  time: string;
+  0: string;
+  1: string;
+  2: string;
+}>;
+export type SetFee = ContractEventLog<{
+  fee: string;
+  0: string;
+}>;
+export type SetAdminFee = ContractEventLog<{
+  fee: string;
+  0: string;
+}>;
+
+export interface CrvUSDsfrxETHAmm extends BaseContract {
+  constructor(
+    jsonInterface: any[],
+    address?: string,
+    options?: ContractOptions
+  ): CrvUSDsfrxETHAmm;
+  clone(): CrvUSDsfrxETHAmm;
+  methods: {
+    set_admin(_admin: string): NonPayableTransactionObject<void>;
+
+    coins(i: number | string | BN): NonPayableTransactionObject<string>;
+
+    price_oracle(): NonPayableTransactionObject<string>;
+
+    dynamic_fee(): NonPayableTransactionObject<string>;
+
+    get_rate_mul(): NonPayableTransactionObject<string>;
+
+    get_base_price(): NonPayableTransactionObject<string>;
+
+    p_current_up(n: number | string | BN): NonPayableTransactionObject<string>;
+
+    p_current_down(
+      n: number | string | BN
+    ): NonPayableTransactionObject<string>;
+
+    p_oracle_up(n: number | string | BN): NonPayableTransactionObject<string>;
+
+    p_oracle_down(n: number | string | BN): NonPayableTransactionObject<string>;
+
+    get_p(): NonPayableTransactionObject<string>;
+
+    read_user_tick_numbers(
+      user: string
+    ): NonPayableTransactionObject<[string, string]>;
+
+    can_skip_bands(
+      n_end: number | string | BN
+    ): NonPayableTransactionObject<boolean>;
+
+    active_band_with_skip(): NonPayableTransactionObject<string>;
+
+    has_liquidity(user: string): NonPayableTransactionObject<boolean>;
+
+    deposit_range(
+      user: string,
+      amount: number | string | BN,
+      n1: number | string | BN,
+      n2: number | string | BN
+    ): NonPayableTransactionObject<void>;
+
+    withdraw(
+      user: string,
+      frac: number | string | BN
+    ): NonPayableTransactionObject<[string, string]>;
+
+    get_dy(
+      i: number | string | BN,
+      j: number | string | BN,
+      in_amount: number | string | BN
+    ): NonPayableTransactionObject<string>;
+
+    get_dxdy(
+      i: number | string | BN,
+      j: number | string | BN,
+      in_amount: number | string | BN
+    ): NonPayableTransactionObject<[string, string]>;
+
+    get_dx(
+      i: number | string | BN,
+      j: number | string | BN,
+      out_amount: number | string | BN
+    ): NonPayableTransactionObject<string>;
+
+    get_dydx(
+      i: number | string | BN,
+      j: number | string | BN,
+      out_amount: number | string | BN
+    ): NonPayableTransactionObject<[string, string]>;
+
+    "exchange(uint256,uint256,uint256,uint256)"(
+      i: number | string | BN,
+      j: number | string | BN,
+      in_amount: number | string | BN,
+      min_amount: number | string | BN
+    ): NonPayableTransactionObject<[string, string]>;
+
+    "exchange(uint256,uint256,uint256,uint256,address)"(
+      i: number | string | BN,
+      j: number | string | BN,
+      in_amount: number | string | BN,
+      min_amount: number | string | BN,
+      _for: string
+    ): NonPayableTransactionObject<[string, string]>;
+
+    "exchange_dy(uint256,uint256,uint256,uint256)"(
+      i: number | string | BN,
+      j: number | string | BN,
+      out_amount: number | string | BN,
+      max_amount: number | string | BN
+    ): NonPayableTransactionObject<[string, string]>;
+
+    "exchange_dy(uint256,uint256,uint256,uint256,address)"(
+      i: number | string | BN,
+      j: number | string | BN,
+      out_amount: number | string | BN,
+      max_amount: number | string | BN,
+      _for: string
+    ): NonPayableTransactionObject<[string, string]>;
+
+    get_y_up(user: string): NonPayableTransactionObject<string>;
+
+    get_x_down(user: string): NonPayableTransactionObject<string>;
+
+    get_sum_xy(user: string): NonPayableTransactionObject<[string, string]>;
+
+    get_xy(user: string): NonPayableTransactionObject<[string[], string[]]>;
+
+    get_amount_for_price(
+      p: number | string | BN
+    ): NonPayableTransactionObject<[string, boolean]>;
+
+    set_rate(rate: number | string | BN): NonPayableTransactionObject<string>;
+
+    set_fee(fee: number | string | BN): NonPayableTransactionObject<void>;
+
+    set_admin_fee(fee: number | string | BN): NonPayableTransactionObject<void>;
+
+    reset_admin_fees(): NonPayableTransactionObject<void>;
+
+    set_callback(
+      liquidity_mining_callback: string
+    ): NonPayableTransactionObject<void>;
+
+    admin(): NonPayableTransactionObject<string>;
+
+    A(): NonPayableTransactionObject<string>;
+
+    fee(): NonPayableTransactionObject<string>;
+
+    admin_fee(): NonPayableTransactionObject<string>;
+
+    rate(): NonPayableTransactionObject<string>;
+
+    active_band(): NonPayableTransactionObject<string>;
+
+    min_band(): NonPayableTransactionObject<string>;
+
+    max_band(): NonPayableTransactionObject<string>;
+
+    admin_fees_x(): NonPayableTransactionObject<string>;
+
+    admin_fees_y(): NonPayableTransactionObject<string>;
+
+    price_oracle_contract(): NonPayableTransactionObject<string>;
+
+    bands_x(arg0: number | string | BN): NonPayableTransactionObject<string>;
+
+    bands_y(arg0: number | string | BN): NonPayableTransactionObject<string>;
+
+    liquidity_mining_callback(): NonPayableTransactionObject<string>;
+  };
+  events: {
+    TokenExchange(cb?: Callback<TokenExchange>): EventEmitter;
+    TokenExchange(
+      options?: EventOptions,
+      cb?: Callback<TokenExchange>
+    ): EventEmitter;
+
+    Deposit(cb?: Callback<Deposit>): EventEmitter;
+    Deposit(options?: EventOptions, cb?: Callback<Deposit>): EventEmitter;
+
+    Withdraw(cb?: Callback<Withdraw>): EventEmitter;
+    Withdraw(options?: EventOptions, cb?: Callback<Withdraw>): EventEmitter;
+
+    SetRate(cb?: Callback<SetRate>): EventEmitter;
+    SetRate(options?: EventOptions, cb?: Callback<SetRate>): EventEmitter;
+
+    SetFee(cb?: Callback<SetFee>): EventEmitter;
+    SetFee(options?: EventOptions, cb?: Callback<SetFee>): EventEmitter;
+
+    SetAdminFee(cb?: Callback<SetAdminFee>): EventEmitter;
+    SetAdminFee(
+      options?: EventOptions,
+      cb?: Callback<SetAdminFee>
+    ): EventEmitter;
+
+    allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;
+  };
+
+  once(event: "TokenExchange", cb: Callback<TokenExchange>): void;
+  once(
+    event: "TokenExchange",
+    options: EventOptions,
+    cb: Callback<TokenExchange>
+  ): void;
+
+  once(event: "Deposit", cb: Callback<Deposit>): void;
+  once(event: "Deposit", options: EventOptions, cb: Callback<Deposit>): void;
+
+  once(event: "Withdraw", cb: Callback<Withdraw>): void;
+  once(event: "Withdraw", options: EventOptions, cb: Callback<Withdraw>): void;
+
+  once(event: "SetRate", cb: Callback<SetRate>): void;
+  once(event: "SetRate", options: EventOptions, cb: Callback<SetRate>): void;
+
+  once(event: "SetFee", cb: Callback<SetFee>): void;
+  once(event: "SetFee", options: EventOptions, cb: Callback<SetFee>): void;
+
+  once(event: "SetAdminFee", cb: Callback<SetAdminFee>): void;
+  once(
+    event: "SetAdminFee",
+    options: EventOptions,
+    cb: Callback<SetAdminFee>
+  ): void;
+}