@wireio/stake 0.4.2 → 0.5.0

package/src/assets/solana/types/liqsol_token.ts

@@ -5,7 +5,7 @@
  * IDL can be found at `target/idl/liqsol_token.json`.
  */
 export type LiqsolToken = {
-  "address": "6hiJ8PrSyYLr7H9MA9VYh9fvGoHxZ2TXdDAMzjeUVSXZ",
+  "address": "5MRFSLCkXPEzfR6gkcZCVttq9g83mMUHyTZ85Z3TSpvU",
   "metadata": {
     "name": "liqsolToken",
     "version": "0.1.0",

package/src/assets/solana/types/transfer_hook.ts

@@ -5,7 +5,7 @@
  * IDL can be found at `target/idl/transfer_hook.json`.
  */
 export type TransferHook = {
-  "address": "EtqCLddkPNGjkgiH9rVUmK3M5X2FKFprQvgscBJ8g6hX",
+  "address": "HbBpH9opFW9gcYVanHLweKuHhWQ8P3Kcc1mbpAx1vojz",
   "metadata": {
     "name": "transferHook",
     "version": "0.1.0",
@@ -129,6 +129,11 @@ export type TransferHook = {
     {
       "code": 6002,
       "name": "tlvAccountResolutionError"
+    },
+    {
+      "code": 6003,
+      "name": "cannotTransferToBucket",
+      "msg": "Cannot transfer liqSOL directly to bucket - only protocol minting is allowed"
     }
   ],
   "types": [

package/src/assets/solana/types/validator_leaderboard.ts

@@ -5,7 +5,7 @@
  * IDL can be found at `target/idl/validator_leaderboard.json`.
  */
 export type ValidatorLeaderboard = {
-  "address": "H6CWj2PgxCE9Z5dPi9nMrR2VxT1C4DQcqR1QjmLeon47",
+  "address": "5v7mWL1735qp2Th9B5WNf7spGynR5ZaxwyCYoQw13DP2",
   "metadata": {
     "name": "validatorLeaderboard",
     "version": "0.1.0",
@@ -124,6 +124,9 @@ export type ValidatorLeaderboard = {
         },
         {
           "name": "systemProgram"
+        },
+        {
+          "name": "clock"
         }
       ],
       "args": [

package/src/networks/ethereum/clients/convert.client.ts

@@ -86,7 +86,7 @@ export class ConvertClient {
     public async performWithdraw(signerAddress: string, amountWei: BigNumber): Promise<any> {
         let tx, receipt;
         try {
-            tx = await this.contract.LiqEth.safeBurn(signerAddress, amountWei);
+            tx = await this.contract.LiqEthToken.safeBurn(signerAddress, amountWei);
             receipt = await tx.wait(1);
         } catch (err: any) {
             let errorObj = formatContractErrors(err);
@@ -129,7 +129,7 @@ export class ConvertClient {
             name: await liqEth.name(),
             version: '1',
             chainId,
-            verifyingContract: this.contract.LiqEth.address,
+            verifyingContract: this.contract.LiqEthToken.address,
         } as any;
 
         const types = {

package/src/networks/ethereum/clients/pretoken.client.ts

@@ -19,7 +19,7 @@ export class PretokenClient {
      */
     async purchasePretokensWithLiqETH(amountLiq: bigint, buyer: string): Promise<any> {
 
-        const bal = await this.contract.LiqEth.balanceOf(buyer);
+        const bal = await this.contract.LiqEthToken.balanceOf(buyer);
         const paused = await this.contract.Depositor.paused();
         if(paused) {
             throw new Error("Error - Depositor is in a paused state");
@@ -32,11 +32,11 @@ export class PretokenClient {
 
         //check that the contract has allowance for the token
         const depositorAddr = this.contract.Depositor.address;
-        const allowance = await this.contract.LiqEth.allowance(buyer, depositorAddr);
+        const allowance = await this.contract.LiqEthToken.allowance(buyer, depositorAddr);
 
         // if allowance is less than the requested stake amount, request permission to spend LiqEth
         if (allowance.lt(amountLiq)) {
-            const liqWrite = this.contractService.getWrite('LiqEth');
+            const liqWrite = this.contractService.getWrite('LiqEthToken');
 
             // currently requested unlimited amount - potentially change to only request up to the current amount?
             const approveAmount = ethers.constants.MaxUint256;
@@ -47,7 +47,7 @@ export class PretokenClient {
             await approveTx.wait(1);
 
             // re-read allowance to ensure approval succeeded
-            const newAllowance = await this.contract.LiqEth.allowance(buyer, depositorAddr);
+            const newAllowance = await this.contract.LiqEthToken.allowance(buyer, depositorAddr);
             if (newAllowance.lt(amountLiq)) {
                 throw new Error('Approval failed or allowance still insufficient after approve');
             }
@@ -58,6 +58,8 @@ export class PretokenClient {
             const amountLiqBN = BigNumber.from(amountLiq)
             await this.contract.Depositor.callStatic.purchasePretokensWithLiqETH(amountLiqBN, buyer);
         } catch (err: any) {
+            console.log('err', err);
+            
             let errorObj = formatContractErrors(err);
 
             // ! TEMP for testing

package/src/networks/ethereum/clients/stake.client.ts

@@ -36,7 +36,7 @@ export class StakeClient {
      */
     async performStake(amountWei: BigNumber, signerAddress: string): Promise<any> {
         const depositor = this.contract.Depositor.address;
-        const liqRead = this.contract.LiqEth;
+        const liqRead = this.contract.LiqEthToken;
         const bal = await liqRead.balanceOf(signerAddress);
         const allowance = await liqRead.allowance(signerAddress, depositor);
 
@@ -48,7 +48,7 @@ export class StakeClient {
 
         // if allowance is less than the requested stake amount, request permission to spend LiqEth
         if (allowance.lt(amountWei)) {
-            const liqWrite = this.contractService.getWrite('LiqEth');
+            const liqWrite = this.contractService.getWrite('LiqEthToken');
 
             // currently requested unlimited amount - potentially change to only request up to the current amount?
             const approveAmount = ethers.constants.MaxUint256;

package/src/networks/ethereum/contract.ts

@@ -3,12 +3,16 @@
  *
  * Provides a unified service for interacting with Ethereum smart contracts using ethers.js.
  */
+
+// LiqETH Artifacts
 import AccountingArtifact from '../../assets/ethereum/ABI/liqEth/accounting.sol/Accounting.json';
 import DepositManagerArtifact from '../../assets/ethereum/ABI/liqEth/DepositManager.sol/DepositManager.json';
 import LiqEthArtifact from '../../assets/ethereum/ABI/liqEth/liqEth.sol/LiqEthToken.json';
 import StakingModuleArtifact from '../../assets/ethereum/ABI/liqEth/stakingModule.sol/StakingModule.json';
 import WithdrawalQueueArtifact from '../../assets/ethereum/ABI/liqEth/withdrawalQueue.sol/WithdrawalQueue.json';
 import WithdrawalVaultArtifact from '../../assets/ethereum/ABI/liqEth/withdrawalVault.sol/WithdrawalVault.json';
+import BeaconStateArtifact from '../../assets/ethereum/ABI/liqEth/BeaconState.sol/BeaconState.json';
+import YieldOracleArtifact from '../../assets/ethereum/ABI/liqEth/Yield.sol/YieldOracle.json';
 
 // Outpost Artifacts
 import DepositorArtifact from '../../assets/ethereum/ABI/outpost/Depositor.sol/Depositor.json';
@@ -19,10 +23,18 @@ import OPPArtifact from '../../assets/ethereum/ABI/outpost/OPP.sol/OPP.json';
 import OPPCommonArtifact from '../../assets/ethereum/ABI/outpost/OPPCommon.sol/OPPCommon.json';
 import OPPInboundArtifact from '../../assets/ethereum/ABI/outpost/OPPInbound.sol/OPPInbound.json';
 import PretokenArtifact from '../../assets/ethereum/ABI/outpost/Pretoken.sol/Pretoken.json';
-import AggregatorArtifact from '../../assets/ethereum/ABI/outpost/Aggregator.sol/Aggregator.json';
+import AggregatorArtifact from '../../assets/ethereum/ABI/outpost/EthUsdPriceConsumer.sol/AggregatorV3Interface.json';
 import EthUsdPriceConsumerArtifact from '../../assets/ethereum/ABI/outpost/EthUsdPriceConsumer.sol/EthUsdPriceConsumer.json';
 import PoolArtifact from '../../assets/ethereum/ABI/outpost/Pool.sol/Pool.json';
+import OutpostManagerAuthorityArtifact from '../../assets/ethereum/ABI/outpost/OutpostManagerAuthority.sol/OutpostManagerAuthority.json';
+
+// Common Artifacts
+import IodataArtifact from '../../assets/ethereum/ABI/common/iodata.sol/iodata.json';
+import Base58Artifact from '../../assets/ethereum/ABI/common/Base58.sol/Base58.json';
+import sysio_merkleArtifact from '../../assets/ethereum/ABI/common/sysio_merkle.sol/sysio_merkle.json';
+import sysio_writeArtifact from '../../assets/ethereum/ABI/common/sysio_write.sol/sysio_write.json';
 
+// ERC Token Artifacts
 import ERC20Artifact from '../../assets/ethereum/ABI/token/ERC20Token.sol/ERC20Token.json';
 import ERC721Artifact from '../../assets/ethereum/ABI/token/ERC721Token.sol/ERC721Token.json';
 import ERC1155Artifact from '../../assets/ethereum/ABI/token/ERC1155Token.sol/ERC1155Token.json';
@@ -43,25 +55,33 @@ export const ERC1155Abi = ERC1155Artifact.abi;
 // Make sure ContractName in ./types includes all of these keys.
 export const ADDRESSES: AddressBook = {
     // LiqETH contracts
-    Accounting: "0xd333A03a44D5d602A98c1B7bcd7ED1f042DD0dEd",
-    DepositManager: "0x601eaA31e8d33D8725786f1733f4cE6cCEf740D4",
-    LiqEth: "0x08252e1Dcbaa86A2887927b02536CD3E67a802c8", // AKA LiqEthToken
-    StakingModule: "0x7Aac2fCfc83d7F2f15eA53a10C1677CA377AFcF4",
-    WithdrawalQueue: "0x951E413FC81a2CE133078ABE8B88677F5296abE7",
-    WithdrawalVault: "0x0D2bf834DD560839e986d42D06DeE268A17c2d13",
+    LiqEthAuthority: "0x9686E04F30Fa93496B7d7fE0FBc2e4e0aD52891E",
+    BeaconState: "0x207b249d7a83F6E9FCa04a1CD9b484D4f4f9aD2D",
+    WithdrawalQueue: "0x9a575c7Acce9e616cD07A0BDb2D28866027b75Ae",
+    LiqEthToken: "0x5f7192fa756304b255F6F9C1123426Db6A1Db748",
+    Accounting: "0xBAbAd5219f022B29282b904ceEaeBB7ab1b069fC",
+    DepositManager: "0x2e1986508472805c1649e4BBB424879B89720741",
+    WithdrawalVault: "0xC82FAf3Fed135B70A7E797864F504819a98E96c4",
+    StakingModule: "0xdd24EffAa4B42f3273E2b44995639119c08daBea",
+    YieldOracle: "0x56A27E1d10d4aEc7402dC26693fb7c0Eb66eF802",
 
     //Outpost contracts
-    Depositor: "0x69Aa53Ef02F124dB421AeDda509d6912341299Cc",
-    ReceiptNFT: "0x13588fF41E2f47D047874162B1eD15AaF6818f5a",
-    OutpostManager: "0x187f4fEDBCAD2f3150120B743b5d568F11dD3452",
-    BAR: "0x27d4646abF638A13934c94f8bA9AC1Bda39F5dbb",
-    OPP: "0x79CA2DE915C294593edc16b32CBA8B7866159205",
-    OPPCommon: "0x8392ea945Cd8C03F5241d4964D20BB5A9c320c71",
-    OPPInbound: "0xfDA9A2C7e395a9722d9fa506f5d67aba823298dd",
-    Pretoken: "0xcf6A1209A7A391cc576174204386F4e5462323dC",
-    EthUsdPriceConsumer: "0x1Ef180FF49313fCB8B5c0470268295d0d24CDE69",
-    Aggregator: "0xFCfc3ddd4CBd9Ad3b3af3A374B8bdA1b66eE6FFF",
-    Pool: "0x29DEf0fA009e02d108d9505018EAe0168F233e03",
+    OutpostManagerAuthority: "0xAEcd2aa6EeFa4Aa7Cb9368728aA89Ca59Aa9ea59",
+    iodata: "0x2c2ab53F6Bc146bd31B459E832Ce0B9Da78712d8",
+    Base58: "0x9F188Ec124c9ad9bF6D195650d8360Fd052F585A",
+    sysio_merkle: "0x6eDA3C4c34421Cd667800C17fe33E48f5698e004",
+    ReceiptNFT: "0xd083051d9bb8353875abCecAB50C6e4FB5e527a8",
+    MockAggregator: "0xD721d15Ae1D1bF58DF1B9471198d968A16B8e58D",
+    Pool: "0xee5F11aC9b104c18d2423f266c5E737fC95ebA92",
+    OutpostManager: "0xB1B6ba7FA156652849069aC7ADB281283D235B9f",
+    sysio_write: "0xEfA608136d372349C09a7aA57665C09Fb4a620Ca",
+    EthUsdPriceConsumer: "0x6337A23b61f98b1526faF2848385Abe9cB4cFF21",
+    BAR: "0x9264eAA449da94caF70Fc18522021a94C8DF32Fb",
+    OPPCommon: "0x86A8cA16ce521De3EBdd1C541fAf188795b59FD0",
+    OPP: "0x79e8395Bb5131FB285aCEE5329BB43E66f50F88C",
+    Pretoken: "0x62f98AF2f9C3EF4eF2fA7bc0245BD5a9315E7541",
+    OPPInbound: "0xC85f57Ff069711e0b3472De3963bd2fC2FEfF3e2",
+    Depositor: "0xb0BACAb6f13dd96281300be13a6346461b2f35F3"
 };
 
 export type Contracts<T extends string = ContractName> = Record<T, ContractConfig>;
@@ -76,76 +96,109 @@ export type ContractConfig = {
 // -----------------------------------------------------------------------------
 
 export const CONTRACTS: Contracts<ContractName> = {
+    // LiqETH Contracts
+    LiqEthAuthority: {
+        address: ADDRESSES.LiqEthAuthority,
+        abi: LiqEthArtifact.abi as JsonFragment[],
+    },
+    BeaconState: {
+        address: ADDRESSES.BeaconState,
+        abi: BeaconStateArtifact.abi as JsonFragment[]
+    },
+    WithdrawalQueue: {
+        address: ADDRESSES.WithdrawalQueue,
+        abi: WithdrawalQueueArtifact.abi as JsonFragment[],
+    },
+    LiqEthToken: {
+        address: ADDRESSES.LiqEthToken,
+        abi: LiqEthArtifact.abi as JsonFragment[],
+    },
     Accounting: {
         address: ADDRESSES.Accounting,
         abi: AccountingArtifact.abi as JsonFragment[],
     },
-    LiqEth: {
-        address: ADDRESSES.LiqEth,
-        abi: LiqEthArtifact.abi as JsonFragment[],
-    },
     DepositManager: {
         address: ADDRESSES.DepositManager,
         abi: DepositManagerArtifact.abi as JsonFragment[],
     },
+    WithdrawalVault: {
+        address: ADDRESSES.WithdrawalVault,
+        abi: WithdrawalVaultArtifact.abi as JsonFragment[],
+    },
     StakingModule: {
         address: ADDRESSES.StakingModule,
         abi: StakingModuleArtifact.abi as JsonFragment[],
     },
-    WithdrawalQueue: {
-        address: ADDRESSES.WithdrawalQueue,
-        abi: WithdrawalQueueArtifact.abi as JsonFragment[],
-    },
-    WithdrawalVault: {
-        address: ADDRESSES.WithdrawalVault,
-        abi: WithdrawalVaultArtifact.abi as JsonFragment[],
+    YieldOracle: {
+        address: ADDRESSES.YieldOracle,
+        abi: YieldOracleArtifact.abi as JsonFragment[],
     },
 
     // Outpost Contracts
-    Depositor: {
-        address: ADDRESSES.Depositor,
-        abi: DepositorArtifact.abi as JsonFragment[],
+    OutpostManagerAuthority: {
+        address: ADDRESSES.OutpostManagerAuthority,
+        abi: OutpostManagerAuthorityArtifact.abi as JsonFragment[],
+    },
+    iodata: {
+        address: ADDRESSES.iodata,
+        abi: IodataArtifact.abi as JsonFragment[],
+    },
+    Base58: {
+        address: ADDRESSES.Base58,
+        abi: Base58Artifact.abi as JsonFragment[],
+    },
+    sysio_merkle: {
+        address: ADDRESSES.sysio_merkle,
+        abi: sysio_merkleArtifact.abi as JsonFragment[],
     },
     ReceiptNFT: {
         address: ADDRESSES.ReceiptNFT,
         abi: ReceiptNFTArtifact.abi as JsonFragment[],
     },
+    MockAggregator: {
+        address: ADDRESSES.MockAggregator,
+        abi: AggregatorArtifact.abi as JsonFragment[],
+    },
+    Pool: {
+        address: ADDRESSES.Pool,
+        abi: PoolArtifact.abi as JsonFragment[],
+    },
     OutpostManager: {
         address: ADDRESSES.OutpostManager,
         abi: OutpostManagerArtifact.abi as JsonFragment[],
     },
+    sysio_write: {
+        address: ADDRESSES.sysio_write,
+        abi: sysio_writeArtifact.abi as JsonFragment[],
+    },
+    EthUsdPriceConsumer: {
+        address: ADDRESSES.EthUsdPriceConsumer,
+        abi: EthUsdPriceConsumerArtifact.abi as JsonFragment[],
+    },
     BAR: {
         address: ADDRESSES.BAR,
         abi: BARArtifact.abi as JsonFragment[],
     },
-    OPP: {
-        address: ADDRESSES.OPP,
-        abi: OPPArtifact.abi as JsonFragment[],
-    },
     OPPCommon: {
         address: ADDRESSES.OPPCommon,
         abi: OPPCommonArtifact.abi as JsonFragment[],
     },
-    OPPInbound: {
-        address: ADDRESSES.OPPInbound,
-        abi: OPPInboundArtifact.abi as JsonFragment[],
+    OPP: {
+        address: ADDRESSES.OPP,
+        abi: OPPArtifact.abi as JsonFragment[],
     },
     Pretoken: {
         address: ADDRESSES.Pretoken,
         abi: PretokenArtifact.abi as JsonFragment[],
     },
-    Aggregator: {
-        address: ADDRESSES.Aggregator,
-        abi: AggregatorArtifact.abi as JsonFragment[],
+    OPPInbound: {
+        address: ADDRESSES.OPPInbound,
+        abi: OPPInboundArtifact.abi as JsonFragment[],
     },
-    EthUsdPriceConsumer: {
-        address: ADDRESSES.EthUsdPriceConsumer,
-        abi: EthUsdPriceConsumerArtifact.abi as JsonFragment[],
+    Depositor: {
+        address: ADDRESSES.Depositor,
+        abi: DepositorArtifact.abi as JsonFragment[],
     },
-    Pool: {
-        address: ADDRESSES.Pool,
-        abi: PoolArtifact.abi as JsonFragment[],
-    }
 };
 
 export interface ContractOptions {

package/src/networks/ethereum/ethereum.ts

@@ -165,7 +165,7 @@ export class EthereumStakingClient implements IStakingClient {
         const nativeSymbol = this.network?.nativeCurrency?.symbol ?? 'ETH';
 
         // 2) liqETH ERC-20 balance (actual)
-        const liqBalance: ethers.BigNumber = await this.contract.LiqEth.balanceOf(walletAddress);
+        const liqBalance: ethers.BigNumber = await this.contract.LiqEthToken.balanceOf(walletAddress);
         const liqSymbol = 'Liq' + (this.network?.nativeCurrency?.symbol ?? 'ETH');
 
         // 3) staked liqEth ERC-20 balance (calculate from receipts)
@@ -174,10 +174,48 @@ export class EthereumStakingClient implements IStakingClient {
         for (let r of stakeReceipts) {
             stakeBalanceBN = stakeBalanceBN.add(BigNumber.from(r.receipt.principal.amount));
         }
+        let stakeSharesBN = BigNumber.from(0);
+        for (let r of stakeReceipts) {
+            stakeSharesBN = stakeSharesBN.add(BigNumber.from(r.receipt.shares.amount));
+        }
 
         // 4) WIRE pretoken balance
         const wireBalance: ethers.BigNumber = await this.contract.Pretoken.balanceOf(walletAddress);
 
+
+        // 5) Calculate staking yield 
+        let currentIndex = BigInt(0);
+        let totalShares = BigInt(0);
+        let userShares = BigInt(0);
+        const indexScale = BigInt(1e27);
+        try {
+            // These may throw if not implemented on contract
+            const [indexBn, totalSharesBn] = await Promise.all([
+                this.contract.Depositor.index().catch(() => BigNumber.from(0)),
+                this.contract.Depositor.totalShares().catch(() => BigNumber.from(0)),
+            ]);
+
+            const userSharesBn = stakeSharesBN;
+            currentIndex = BigInt(indexBn.toString());
+            totalShares = BigInt(totalSharesBn.toString());
+            userShares = BigInt(userSharesBn.toString());
+        } catch {}
+
+        // sharesToTokens(userShares, currentIndex) = userShares * currentIndex / indexScale
+        let estimatedClaim = BigInt(0);
+        let estimatedYield = BigInt(0);
+
+        // started work on estimating the user's personal APY - not necessary at the moment
+        // let estimatedAPY: number | null = null;
+        // if (userShares > BigInt(0) && currentIndex > BigInt(0)) {
+        //     estimatedClaim = (userShares * currentIndex) / indexScale;
+        //     if (estimatedClaim > stakeBalanceBN.toBigInt()) {
+        //         estimatedYield = estimatedClaim - stakeBalanceBN.toBigInt();
+        //     }
+
+        //     estimatedAPY = null;
+        // }
+
         const portfolio: Portfolio = {
             native: {
                 amount: nativeBalance.toBigInt(),
@@ -199,6 +237,15 @@ export class EthereumStakingClient implements IStakingClient {
                 decimals: 18,
                 symbol: '$WIRE',
             },
+
+            yield: {
+                currentIndex,
+                indexScale,
+                totalShares,
+                userShares,
+                estimatedClaim,
+                estimatedYield,
+            },
             chainID: this.network.chainId
         }
         return portfolio;
@@ -241,15 +288,15 @@ export class EthereumStakingClient implements IStakingClient {
     // ---------------------------------------------------------------------
 
     // Estimated total APY for staking yeild
-    getSystemAPY(): Promise<number> {
-        // TODO
-        return Promise.resolve(0);
+    async getSystemAPY(): Promise<number> {
+        const annualBpsBn = await this.contract.DepositManager.dailyRateBPS();
+        return annualBpsBn.toNumber() / 10000; // 0.04 for 4%
     }
 
     // Protocol fee charged for deposit from Native to LIQ
-    getDepositFee(amount: bigint): Promise<bigint> {
-        // TODO
-        return Promise.resolve(BigInt(0));
+    async getDepositFee(amountWei: bigint): Promise<bigint> {
+        const feeBn: BigNumber = await this.contract.DepositManager.procFee(amountWei);
+        return BigInt(feeBn.toString());
     }
 
     async getOPPStatus(): Promise<any> {
@@ -257,7 +304,7 @@ export class EthereumStakingClient implements IStakingClient {
     }
 
     async getEthStats(): Promise<any> {
-        let withdrawDelay = await this.contract.DepositManager.withdrawDelay();
+        let withdrawDelay = await this.contract.WithdrawalQueue.withdrawDelay();
         let minDeposit = await this.contract.DepositManager.minDeposit();
         let rewardCooldown = await this.contract.DepositManager.rewardCooldown();
 
@@ -285,55 +332,67 @@ export class EthereumStakingClient implements IStakingClient {
         } = options ?? {};
 
 
-        const blockNumber = await this.provider.getBlockNumber();
-        const blockTag = { blockTag: blockNumber };
-
-        // Fetch all required contract data
-        const [totalSharesBn, indexBn, trancheNumberBn, trancheSupplyBn, tranchePriceWadBn, totalSupplyBn, supplyGrowthBps, priceGrowthBps, minPriceUsd, maxPriceUsd] = await Promise.all([
-            this.contract.Depositor.totalShares(blockTag),
-            this.contract.Depositor.index(blockTag),
-            this.contract.Pretoken.trancheNumber(blockTag),
-            this.contract.Pretoken.trancheSupply(blockTag),
-            this.contract.Pretoken.tranchePriceUsd(blockTag),
-            this.contract.Pretoken.totalSupply(blockTag),
-            this.contract.Pretoken.supplyGrowthBps(blockTag),
-            this.contract.Pretoken.priceGrowthBps(blockTag),
-            this.contract.EthUsdPriceConsumer.MIN_PRICE(),
-            this.contract.EthUsdPriceConsumer.MAX_PRICE(),
-        ]);
-
-
-        const totalTrancheSupply = BigInt(totalSupplyBn.toString()) / BigInt(1e10);
-        const currentTrancheSupply = BigInt(trancheSupplyBn.toString()) / BigInt(1e10);
-
-
-        // fetch price and timestamp from aggregator
-        const [roundId, answer, startedAt, updatedAt, answeredInRound] = await this.contract.Aggregator.latestRoundData();
-        let ethPriceUsd: bigint = BigInt(answer.toString());
-        let nativePriceTimestamp: number = Number(updatedAt);
-
-        // ! Placeholder from hoodi deployment - don't think this can be fetched dynamically
-        const initialTrancheSupply = BigInt(60000) * BigInt(1e8);
-
-        return buildEthereumTrancheSnapshot({
-            chainID,
-            totalSharesBn,
-            indexBn,
-            trancheNumberBn,
-            currentTrancheSupply,
-            tranchePriceWadBn,
-            totalTrancheSupply,
-            initialTrancheSupply,
-            supplyGrowthBps,
-            priceGrowthBps,
-            minPriceUsd,
-            maxPriceUsd,
-
-            ethPriceUsd,
-            nativePriceTimestamp,
-            ladderWindowBefore: windowBefore,
-            ladderWindowAfter: windowAfter,
-        });
+        try {
+
+            const blockNumber = await this.provider.getBlockNumber();
+            const blockTag = { blockTag: blockNumber };
+
+
+            // Fetch all required contract data
+            const [totalSharesBn, indexBn, trancheNumberBn, trancheSupplyBn, tranchePriceWadBn, totalSupplyBn, supplyGrowthBps, priceIncrementUsd, minPriceUsd, maxPriceUsd] = await Promise.all([
+                this.contract.Depositor.totalShares(blockTag),
+                this.contract.Depositor.index(blockTag),
+                this.contract.Pretoken.trancheNumber(blockTag),
+                this.contract.Pretoken.trancheSupply(blockTag),
+                this.contract.Pretoken.tranchePriceUsd(blockTag),
+                this.contract.Pretoken.totalSupply(blockTag),
+                this.contract.Pretoken.supplyGrowthBps(blockTag),
+                this.contract.Pretoken.priceIncrementUsd(blockTag),
+                this.contract.EthUsdPriceConsumer.MIN_PRICE(),
+                this.contract.EthUsdPriceConsumer.MAX_PRICE(),
+            ]);
+
+
+            const totalTrancheSupply = BigInt(totalSupplyBn.toString()) / BigInt(1e10);
+            const currentTrancheSupply = BigInt(trancheSupplyBn.toString()) / BigInt(1e10);
+
+
+            // fetch price and timestamp from aggregator
+            const [roundId, answer, startedAt, updatedAt, answeredInRound] = await this.contract.MockAggregator.latestRoundData();
+            let ethPriceUsd: bigint = BigInt(answer.toString());
+            let nativePriceTimestamp: number = Number(updatedAt);
+
+            // ! Placeholder from hoodi deployment - don't think this can be fetched dynamically
+            const initialTrancheSupply = BigInt(70000) * BigInt(1e8);
+
+            console.log('priceIncrementUsd',priceIncrementUsd);
+            
+
+            return buildEthereumTrancheSnapshot({
+                chainID,
+                totalSharesBn,
+                indexBn,
+                trancheNumberBn,
+                currentTrancheSupply,
+                tranchePriceWadBn,
+                totalTrancheSupply,
+                initialTrancheSupply,
+                supplyGrowthBps,
+                priceIncrementUsd,
+                minPriceUsd,
+                maxPriceUsd,
+
+                ethPriceUsd,
+                nativePriceTimestamp,
+                ladderWindowBefore: windowBefore,
+                ladderWindowAfter: windowAfter,
+            });
+        }
+        catch (err: any) {
+            console.log(err);
+            
+            throw new Error(`Error fetching Ethereum tranche snapshot: ${err?.message || err}`);
+        }
     }
 
     // ---------------------------------------------------------------------
@@ -342,7 +401,7 @@ export class EthereumStakingClient implements IStakingClient {
 
     // ! This is a temporary measure for Hoodi testnet because there is no aggregator deployed
     private async updateMockAggregatorPrice() {
-        const aggregator = this.contract.Aggregator;
+        const aggregator = this.contract.MockAggregator;
 
         // read latest round & compute age
         const [roundId, answer, startedAt, updatedAt, answeredInRound] = await aggregator.latestRoundData();

package/src/networks/ethereum/types.ts

@@ -2,25 +2,34 @@ import { BigNumber, ethers } from 'ethers';
 import { BalanceView } from '../../types';
 
 export const CONTRACT_NAMES = [
-    'Accounting',
-    'DepositManager',
-    'LiqEth',
-    'StakingModule',
-    'WithdrawalQueue',
-    'WithdrawalVault',
+    // LiqETH contracts
+    "LiqEthAuthority",
+    "BeaconState",
+    "WithdrawalQueue",
+    "LiqEthToken",
+    "Accounting",
+    "DepositManager",
+    "WithdrawalVault",
+    "StakingModule",
+    "YieldOracle",
 
     //Outpost contracts
-    'Depositor',
-    'ReceiptNFT',
-    'OutpostManager',
-    'BAR',
-    'OPP',
-    'OPPCommon',
-    'OPPInbound',
-    'Pretoken',
-    'Aggregator',
-    'EthUsdPriceConsumer',
-    'Pool',
+    "OutpostManagerAuthority",
+    "iodata",
+    "Base58",
+    "sysio_merkle",
+    "ReceiptNFT",
+    "MockAggregator",
+    "Pool",
+    "OutpostManager",
+    "sysio_write",
+    "EthUsdPriceConsumer",
+    "BAR",
+    "OPPCommon",
+    "OPP",
+    "Pretoken",
+    "OPPInbound",
+    "Depositor",
 
 ] as const;