@ember-finance/sdk 1.2.3 → 1.3.0

package/dist/src/evm-vaults/on-chain-calls/vault-reader.js

@@ -7,6 +7,7 @@ exports.EVMVaultReader = void 0;
 const ethers_1 = require("ethers");
 const deployment_parser_1 = require("../utils/deployment-parser");
 const EmberVault_json_1 = __importDefault(require("../../abis/EmberVault.json"));
+const EmberETHVault_json_1 = __importDefault(require("../../abis/EmberETHVault.json"));
 const EmberProtocolConfig_json_1 = __importDefault(require("../../abis/EmberProtocolConfig.json"));
 const ERC20Token_json_1 = __importDefault(require("../../abis/ERC20Token.json"));
 /**
@@ -46,9 +47,12 @@ class EVMVaultReader {
     }
     /**
      * Creates an ethers Contract instance for a vault
+     * @param vaultAddress The vault address
+     * @param isETHVault If true, uses EmberETHVault ABI (defaults to EmberVault ABI)
      */
-    getVaultContract(vaultAddress) {
-        return new ethers_1.Contract(vaultAddress, EmberVault_json_1.default.abi, this.provider);
+    getVaultContract(vaultAddress, isETHVault) {
+        const abi = isETHVault ? EmberETHVault_json_1.default.abi : EmberVault_json_1.default.abi;
+        return new ethers_1.Contract(vaultAddress, abi, this.provider);
     }
     /**
      * Creates an ethers Contract instance for protocol config
@@ -67,10 +71,11 @@ class EVMVaultReader {
     /**
      * Gets the basic vault state
      * @param vaultAddress The vault address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Vault state information
      */
-    async getVaultState(vaultAddress) {
-        const vault = this.getVaultContract(vaultAddress);
+    async getVaultState(vaultAddress, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         const [vaultName, tokenName, tokenSymbol, decimals, asset, totalAssets, totalSupply, maxTVL, minWithdrawableShares, protocolConfig, owner, sequenceNumber] = await Promise.all([
             vault.vaultName(),
             vault.name(),
@@ -103,10 +108,11 @@ class EVMVaultReader {
     /**
      * Gets the vault rate information
      * @param vaultAddress The vault address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Rate information
      */
-    async getVaultRate(vaultAddress) {
-        const vault = this.getVaultContract(vaultAddress);
+    async getVaultRate(vaultAddress, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         const rate = await vault.rate();
         return {
             value: rate.value,
@@ -118,10 +124,11 @@ class EVMVaultReader {
     /**
      * Gets the vault roles (admin, operator, rate manager)
      * @param vaultAddress The vault address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Vault roles
      */
-    async getVaultRoles(vaultAddress) {
-        const vault = this.getVaultContract(vaultAddress);
+    async getVaultRoles(vaultAddress, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         const roles = await vault.roles();
         return {
             admin: roles.admin,
@@ -132,10 +139,11 @@ class EVMVaultReader {
     /**
      * Gets the vault pause status
      * @param vaultAddress The vault address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Pause status for different operations
      */
-    async getVaultPauseStatus(vaultAddress) {
-        const vault = this.getVaultContract(vaultAddress);
+    async getVaultPauseStatus(vaultAddress, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         const status = await vault.pauseStatus();
         return {
             deposits: status.deposits,
@@ -146,10 +154,11 @@ class EVMVaultReader {
     /**
      * Gets the platform fee information
      * @param vaultAddress The vault address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Platform fee information
      */
-    async getVaultPlatformFee(vaultAddress) {
-        const vault = this.getVaultContract(vaultAddress);
+    async getVaultPlatformFee(vaultAddress, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         const fee = await vault.platformFee();
         return {
             accrued: fee.accrued,
@@ -161,16 +170,17 @@ class EVMVaultReader {
     /**
      * Gets complete vault information in a single call
      * @param vaultAddress The vault address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Complete vault information
      */
-    async getCompleteVaultInfo(vaultAddress) {
+    async getCompleteVaultInfo(vaultAddress, isETHVault) {
         const [state, rate, roles, pauseStatus, platformFee, pendingWithdrawalsCount] = await Promise.all([
-            this.getVaultState(vaultAddress),
-            this.getVaultRate(vaultAddress),
-            this.getVaultRoles(vaultAddress),
-            this.getVaultPauseStatus(vaultAddress),
-            this.getVaultPlatformFee(vaultAddress),
-            this.getPendingWithdrawalsCount(vaultAddress)
+            this.getVaultState(vaultAddress, isETHVault),
+            this.getVaultRate(vaultAddress, isETHVault),
+            this.getVaultRoles(vaultAddress, isETHVault),
+            this.getVaultPauseStatus(vaultAddress, isETHVault),
+            this.getVaultPlatformFee(vaultAddress, isETHVault),
+            this.getPendingWithdrawalsCount(vaultAddress, isETHVault)
         ]);
         return {
             address: vaultAddress,
@@ -186,128 +196,141 @@ class EVMVaultReader {
     /**
      * Gets the underlying asset address
      * @param vaultAddress The vault address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Asset address
      */
-    async getAsset(vaultAddress) {
-        const vault = this.getVaultContract(vaultAddress);
+    async getAsset(vaultAddress, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.asset();
     }
     /**
      * Gets total assets under management
      * @param vaultAddress The vault address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Total assets
      */
-    async getTotalAssets(vaultAddress) {
-        const vault = this.getVaultContract(vaultAddress);
+    async getTotalAssets(vaultAddress, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.totalAssets();
     }
     /**
      * Gets total shares supply
      * @param vaultAddress The vault address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Total supply
      */
-    async getTotalSupply(vaultAddress) {
-        const vault = this.getVaultContract(vaultAddress);
+    async getTotalSupply(vaultAddress, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.totalSupply();
     }
     /**
      * Converts assets to shares
      * @param vaultAddress The vault address
      * @param assets Amount of assets
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Equivalent shares
      */
-    async convertToShares(vaultAddress, assets) {
-        const vault = this.getVaultContract(vaultAddress);
+    async convertToShares(vaultAddress, assets, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.convertToShares(assets);
     }
     /**
      * Converts shares to assets
      * @param vaultAddress The vault address
      * @param shares Amount of shares
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Equivalent assets
      */
-    async convertToAssets(vaultAddress, shares) {
-        const vault = this.getVaultContract(vaultAddress);
+    async convertToAssets(vaultAddress, shares, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.convertToAssets(shares);
     }
     /**
      * Preview deposit - returns shares that would be minted
      * @param vaultAddress The vault address
      * @param assets Amount of assets to deposit
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Shares that would be minted
      */
-    async previewDeposit(vaultAddress, assets) {
-        const vault = this.getVaultContract(vaultAddress);
+    async previewDeposit(vaultAddress, assets, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.previewDeposit(assets);
     }
     /**
      * Preview mint - returns assets required for shares
      * @param vaultAddress The vault address
      * @param shares Amount of shares to mint
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Assets required
      */
-    async previewMint(vaultAddress, shares) {
-        const vault = this.getVaultContract(vaultAddress);
+    async previewMint(vaultAddress, shares, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.previewMint(shares);
     }
     /**
      * Preview redeem - returns assets that would be received
      * @param vaultAddress The vault address
      * @param shares Amount of shares to redeem
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Assets that would be received
      */
-    async previewRedeem(vaultAddress, shares) {
-        const vault = this.getVaultContract(vaultAddress);
+    async previewRedeem(vaultAddress, shares, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.previewRedeem(shares);
     }
     /**
      * Preview withdraw - returns shares that would be burned
      * @param vaultAddress The vault address
      * @param assets Amount of assets to withdraw
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Shares that would be burned
      */
-    async previewWithdraw(vaultAddress, assets) {
-        const vault = this.getVaultContract(vaultAddress);
+    async previewWithdraw(vaultAddress, assets, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.previewWithdraw(assets);
     }
     /**
      * Gets max deposit for an account
      * @param vaultAddress The vault address
      * @param account The account address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Maximum deposit amount
      */
-    async maxDeposit(vaultAddress, account) {
-        const vault = this.getVaultContract(vaultAddress);
+    async maxDeposit(vaultAddress, account, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.maxDeposit(account);
     }
     /**
      * Gets max mint for an account
      * @param vaultAddress The vault address
      * @param account The account address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Maximum mint amount
      */
-    async maxMint(vaultAddress, account) {
-        const vault = this.getVaultContract(vaultAddress);
+    async maxMint(vaultAddress, account, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.maxMint(account);
     }
     /**
      * Gets max redeem for an account
      * @param vaultAddress The vault address
      * @param account The account address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Maximum redeem amount
      */
-    async maxRedeem(vaultAddress, account) {
-        const vault = this.getVaultContract(vaultAddress);
+    async maxRedeem(vaultAddress, account, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.maxRedeem(account);
     }
     /**
      * Gets max withdraw for an account
      * @param vaultAddress The vault address
      * @param account The account address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Maximum withdraw amount
      */
-    async maxWithdraw(vaultAddress, account) {
-        const vault = this.getVaultContract(vaultAddress);
+    async maxWithdraw(vaultAddress, account, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.maxWithdraw(account);
     }
     // ========== User Position Methods ==========
@@ -315,10 +338,11 @@ class EVMVaultReader {
      * Gets the share balance for an account
      * @param vaultAddress The vault address
      * @param account The account address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Share balance
      */
-    async balanceOf(vaultAddress, account) {
-        const vault = this.getVaultContract(vaultAddress);
+    async balanceOf(vaultAddress, account, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.balanceOf(account);
     }
     /**
@@ -326,20 +350,22 @@ class EVMVaultReader {
      * @param vaultAddress The vault address
      * @param owner The owner address
      * @param spender The spender address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Allowance amount
      */
-    async allowance(vaultAddress, owner, spender) {
-        const vault = this.getVaultContract(vaultAddress);
+    async allowance(vaultAddress, owner, spender, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.allowance(owner, spender);
     }
     /**
      * Gets the account state including pending withdrawals
      * @param vaultAddress The vault address
      * @param account The account address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Account state
      */
-    async getAccountState(vaultAddress, account) {
-        const vault = this.getVaultContract(vaultAddress);
+    async getAccountState(vaultAddress, account, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         const state = await vault.getAccountState(account);
         return {
             totalPendingWithdrawalShares: state.totalPendingWithdrawalShares,
@@ -355,13 +381,14 @@ class EVMVaultReader {
      * Gets complete user position in a vault
      * @param vaultAddress The vault address
      * @param account The account address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Complete user position
      */
-    async getUserPosition(vaultAddress, account) {
-        const vault = this.getVaultContract(vaultAddress);
+    async getUserPosition(vaultAddress, account, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         const [shareBalance, accountState, maxDepositVal, maxMintVal, maxRedeemVal, maxWithdrawVal] = await Promise.all([
             vault.balanceOf(account),
-            this.getAccountState(vaultAddress, account),
+            this.getAccountState(vaultAddress, account, isETHVault),
             vault.maxDeposit(account),
             vault.maxMint(account),
             vault.maxRedeem(account),
@@ -383,20 +410,22 @@ class EVMVaultReader {
     /**
      * Gets the number of pending withdrawal requests
      * @param vaultAddress The vault address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Count of pending withdrawals
      */
-    async getPendingWithdrawalsCount(vaultAddress) {
-        const vault = this.getVaultContract(vaultAddress);
+    async getPendingWithdrawalsCount(vaultAddress, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.getPendingWithdrawalsLength();
     }
     /**
      * Gets a pending withdrawal request by index
      * @param vaultAddress The vault address
      * @param index The index in the pending withdrawals queue
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Withdrawal request details
      */
-    async getPendingWithdrawal(vaultAddress, index) {
-        const vault = this.getVaultContract(vaultAddress);
+    async getPendingWithdrawal(vaultAddress, index, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         const request = await vault.getPendingWithdrawal(index);
         return {
             owner: request.owner,
@@ -410,14 +439,15 @@ class EVMVaultReader {
     /**
      * Gets all pending withdrawal requests for a vault
      * @param vaultAddress The vault address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Array of withdrawal requests
      */
-    async getAllPendingWithdrawals(vaultAddress) {
-        const count = await this.getPendingWithdrawalsCount(vaultAddress);
+    async getAllPendingWithdrawals(vaultAddress, isETHVault) {
+        const count = await this.getPendingWithdrawalsCount(vaultAddress, isETHVault);
         const requests = [];
         const promises = [];
         for (let i = 0n; i < count; i++) {
-            promises.push(this.getPendingWithdrawal(vaultAddress, i));
+            promises.push(this.getPendingWithdrawal(vaultAddress, i, isETHVault));
         }
         const results = await Promise.all(promises);
         requests.push(...results);
@@ -428,10 +458,11 @@ class EVMVaultReader {
      * Checks if an address is a sub-account
      * @param vaultAddress The vault address
      * @param account The account to check
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns True if the account is a sub-account
      */
-    async isSubAccount(vaultAddress, account) {
-        const vault = this.getVaultContract(vaultAddress);
+    async isSubAccount(vaultAddress, account, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.subAccounts(account);
     }
     // ========== Token Balance Methods ==========
@@ -439,10 +470,11 @@ class EVMVaultReader {
      * Gets the underlying token balance for an account
      * @param vaultAddress The vault address
      * @param account The account address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Token balance
      */
-    async getUnderlyingTokenBalance(vaultAddress, account) {
-        const assetAddress = await this.getAsset(vaultAddress);
+    async getUnderlyingTokenBalance(vaultAddress, account, isETHVault) {
+        const assetAddress = await this.getAsset(vaultAddress, isETHVault);
         const token = this.getERC20Contract(assetAddress);
         return token.balanceOf(account);
     }
@@ -450,10 +482,11 @@ class EVMVaultReader {
      * Gets the underlying token allowance for the vault
      * @param vaultAddress The vault address
      * @param owner The token owner
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Allowance for the vault
      */
-    async getUnderlyingTokenAllowance(vaultAddress, owner) {
-        const assetAddress = await this.getAsset(vaultAddress);
+    async getUnderlyingTokenAllowance(vaultAddress, owner, isETHVault) {
+        const assetAddress = await this.getAsset(vaultAddress, isETHVault);
         const token = this.getERC20Contract(assetAddress);
         return token.allowance(owner, vaultAddress);
     }
@@ -494,10 +527,11 @@ class EVMVaultReader {
     /**
      * Gets the chain timestamp in milliseconds
      * @param vaultAddress The vault address
+     * @param isETHVault If true, uses EmberETHVault ABI
      * @returns Chain timestamp in ms
      */
-    async getChainTimestampMs(vaultAddress) {
-        const vault = this.getVaultContract(vaultAddress);
+    async getChainTimestampMs(vaultAddress, isETHVault) {
+        const vault = this.getVaultContract(vaultAddress, isETHVault);
         return vault.getChainTimestampMs();
     }
     // ========== Batch Query Methods ==========

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@ember-finance/sdk",
     "description": "Ember Protocol SDK",
-    "version": "1.2.3",
+    "version": "1.3.0",
     "module": "./dist/index.js",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",