@wireio/stake 2.5.2 → 2.6.1

package/src/networks/ethereum/contract.ts

@@ -4,40 +4,62 @@
  * Provides a unified service for interacting with Ethereum smart contracts using ethers.js.
  */
 
-// LiqETH Artifacts (for now, used by both mainnet and hoodi)
-import AccountingArtifact from '../../assets/ethereum/mainnet/liqEth/accounting.sol/Accounting.json';
-import DepositManagerArtifact from '../../assets/ethereum/mainnet/liqEth/DepositManager.sol/DepositManager.json';
-import LiqEthArtifact from '../../assets/ethereum/mainnet/liqEth/liqEth.sol/LiqEthToken.json';
-import StakingModuleArtifact from '../../assets/ethereum/mainnet/liqEth/stakingModule.sol/StakingModule.json';
-import WithdrawalQueueArtifact from '../../assets/ethereum/mainnet/liqEth/withdrawalQueue.sol/WithdrawalQueue.json';
-import WithdrawalVaultArtifact from '../../assets/ethereum/mainnet/liqEth/withdrawalVault.sol/WithdrawalVault.json';
-import BeaconStateArtifact from '../../assets/ethereum/mainnet/liqEth/BeaconState.sol/BeaconState.json';
-import YieldOracleArtifact from '../../assets/ethereum/mainnet/liqEth/Yield.sol/YieldOracle.json';
-
-// Outpost Artifacts (for now, used by both mainnet and hoodi)
-import DepositorArtifact from '../../assets/ethereum/mainnet/outpost/Depositor.sol/Depositor.json';
-import ReceiptNFTArtifact from '../../assets/ethereum/mainnet/outpost/ReceiptNFT.sol/ReceiptNFT.json';
-import OutpostManagerArtifact from '../../assets/ethereum/mainnet/outpost/OutpostManager.sol/OutpostManager.json';
-import BARArtifact from '../../assets/ethereum/mainnet/outpost/BAR.sol/BAR.json';
-import OPPArtifact from '../../assets/ethereum/mainnet/outpost/OPP.sol/OPP.json';
-import OPPCommonArtifact from '../../assets/ethereum/mainnet/outpost/OPPCommon.sol/OPPCommon.json';
-import OPPInboundArtifact from '../../assets/ethereum/mainnet/outpost/OPPInbound.sol/OPPInbound.json';
-import PretokenArtifact from '../../assets/ethereum/mainnet/outpost/Pretoken.sol/Pretoken.json';
-import AggregatorArtifact from '../../assets/ethereum/mainnet/outpost/Aggregator.sol/Aggregator.json';
-import EthUsdPriceConsumerArtifact from '../../assets/ethereum/mainnet/outpost/EthUsdPriceConsumer.sol/EthUsdPriceConsumer.json';
-import PoolArtifact from '../../assets/ethereum/mainnet/outpost/Pool.sol/Pool.json';
-import OutpostManagerAuthorityArtifact from '../../assets/ethereum/mainnet/outpost/OutpostManagerAuthority.sol/OutpostManagerAuthority.json';
-
-// Common Artifacts (for now, used by both mainnet and hoodi)
-import IodataArtifact from '../../assets/ethereum/mainnet/common/iodata.sol/iodata.json';
-import Base58Artifact from '../../assets/ethereum/mainnet/common/Base58.sol/Base58.json';
-import sysio_merkleArtifact from '../../assets/ethereum/mainnet/common/sysio_merkle.sol/sysio_merkle.json';
-import sysio_writeArtifact from '../../assets/ethereum/mainnet/common/sysio_write.sol/sysio_write.json';
-
-// ERC Token Artifacts (for now, used by both mainnet and hoodi)
-import ERC20Artifact from '../../assets/ethereum/mainnet/token/ERC20Token.sol/ERC20Token.json';
-import ERC721Artifact from '../../assets/ethereum/mainnet/token/ERC721Token.sol/ERC721Token.json';
-import ERC1155Artifact from '../../assets/ethereum/mainnet/token/ERC1155Token.sol/ERC1155Token.json';
+// Mainnet artifacts
+import MainnetAccountingArtifact from '../../assets/ethereum/mainnet/liqEth/accounting.sol/Accounting.json';
+import MainnetDepositManagerArtifact from '../../assets/ethereum/mainnet/liqEth/DepositManager.sol/DepositManager.json';
+import MainnetLiqEthArtifact from '../../assets/ethereum/mainnet/liqEth/liqEth.sol/LiqEthToken.json';
+import MainnetStakingModuleArtifact from '../../assets/ethereum/mainnet/liqEth/stakingModule.sol/StakingModule.json';
+import MainnetWithdrawalQueueArtifact from '../../assets/ethereum/mainnet/liqEth/withdrawalQueue.sol/WithdrawalQueue.json';
+import MainnetWithdrawalVaultArtifact from '../../assets/ethereum/mainnet/liqEth/withdrawalVault.sol/WithdrawalVault.json';
+import MainnetBeaconStateArtifact from '../../assets/ethereum/mainnet/liqEth/BeaconState.sol/BeaconState.json';
+import MainnetYieldOracleArtifact from '../../assets/ethereum/mainnet/liqEth/Yield.sol/YieldOracle.json';
+import MainnetDepositorArtifact from '../../assets/ethereum/mainnet/outpost/Depositor.sol/Depositor.json';
+import MainnetReceiptNFTArtifact from '../../assets/ethereum/mainnet/outpost/ReceiptNFT.sol/ReceiptNFT.json';
+import MainnetOutpostManagerArtifact from '../../assets/ethereum/mainnet/outpost/OutpostManager.sol/OutpostManager.json';
+import MainnetBARArtifact from '../../assets/ethereum/mainnet/outpost/BAR.sol/BAR.json';
+import MainnetOPPArtifact from '../../assets/ethereum/mainnet/outpost/OPP.sol/OPP.json';
+import MainnetOPPCommonArtifact from '../../assets/ethereum/mainnet/outpost/OPPCommon.sol/OPPCommon.json';
+import MainnetOPPInboundArtifact from '../../assets/ethereum/mainnet/outpost/OPPInbound.sol/OPPInbound.json';
+import MainnetPretokenArtifact from '../../assets/ethereum/mainnet/outpost/Pretoken.sol/Pretoken.json';
+import MainnetAggregatorArtifact from '../../assets/ethereum/mainnet/outpost/Aggregator.sol/Aggregator.json';
+import MainnetEthUsdPriceConsumerArtifact from '../../assets/ethereum/mainnet/outpost/EthUsdPriceConsumer.sol/EthUsdPriceConsumer.json';
+import MainnetPoolArtifact from '../../assets/ethereum/mainnet/outpost/Pool.sol/Pool.json';
+import MainnetOutpostManagerAuthorityArtifact from '../../assets/ethereum/mainnet/outpost/OutpostManagerAuthority.sol/OutpostManagerAuthority.json';
+import MainnetIodataArtifact from '../../assets/ethereum/mainnet/common/iodata.sol/iodata.json';
+import MainnetBase58Artifact from '../../assets/ethereum/mainnet/common/Base58.sol/Base58.json';
+import MainnetSysioMerkleArtifact from '../../assets/ethereum/mainnet/common/sysio_merkle.sol/sysio_merkle.json';
+import MainnetSysioWriteArtifact from '../../assets/ethereum/mainnet/common/sysio_write.sol/sysio_write.json';
+import MainnetERC20Artifact from '../../assets/ethereum/mainnet/token/ERC20Token.sol/ERC20Token.json';
+import MainnetERC721Artifact from '../../assets/ethereum/mainnet/token/ERC721Token.sol/ERC721Token.json';
+import MainnetERC1155Artifact from '../../assets/ethereum/mainnet/token/ERC1155Token.sol/ERC1155Token.json';
+
+// Hoodi artifacts
+import HoodiAccountingArtifact from '../../assets/ethereum/hoodi/liqEth/v1/accounting.sol/Accounting.json';
+import HoodiDepositManagerArtifact from '../../assets/ethereum/hoodi/liqEth/v1/DepositManager.sol/DepositManager.json';
+import HoodiLiqEthArtifact from '../../assets/ethereum/hoodi/liqEth/v1/liqEth.sol/LiqEthToken.json';
+import HoodiStakingModuleArtifact from '../../assets/ethereum/hoodi/liqEth/v1/stakingModule.sol/StakingModule.json';
+import HoodiWithdrawalQueueArtifact from '../../assets/ethereum/hoodi/liqEth/withdrawalQueue.sol/WithdrawalQueue.json';
+import HoodiWithdrawalVaultArtifact from '../../assets/ethereum/hoodi/liqEth/withdrawalVault.sol/WithdrawalVault.json';
+import HoodiBeaconStateArtifact from '../../assets/ethereum/hoodi/liqEth/BeaconState.sol/BeaconState.json';
+import HoodiYieldOracleArtifact from '../../assets/ethereum/hoodi/liqEth/Yield.sol/YieldOracle.json';
+import HoodiDepositorArtifact from '../../assets/ethereum/hoodi/outpost/Depositor.sol/DepositorV2.json';
+import HoodiReceiptNFTArtifact from '../../assets/ethereum/hoodi/outpost/ReceiptNFT.sol/ReceiptNFT.json';
+import HoodiOutpostManagerArtifact from '../../assets/ethereum/hoodi/outpost/OutpostManager.sol/OutpostManagerV2.json';
+import HoodiBARArtifact from '../../assets/ethereum/hoodi/outpost/BAR.sol/BARV2.json';
+import HoodiOPPArtifact from '../../assets/ethereum/hoodi/outpost/OPP.sol/OPP.json';
+import HoodiOPPCommonArtifact from '../../assets/ethereum/hoodi/outpost/OPPCommon.sol/OPPCommon.json';
+import HoodiOPPInboundArtifact from '../../assets/ethereum/hoodi/outpost/OPPInbound.sol/OPPInbound.json';
+import HoodiPretokenArtifact from '../../assets/ethereum/hoodi/outpost/Pretoken.sol/PretokenV2.json';
+import HoodiEthUsdPriceConsumerArtifact from '../../assets/ethereum/hoodi/outpost/EthUsdPriceConsumer.sol/EthUsdPriceConsumer.json';
+import HoodiPoolArtifact from '../../assets/ethereum/hoodi/outpost/Pool.sol/PoolV2.json';
+import HoodiOutpostManagerAuthorityArtifact from '../../assets/ethereum/hoodi/outpost/OutpostManagerAuthority.sol/OutpostManagerAuthority.json';
+import HoodiIodataArtifact from '../../assets/ethereum/hoodi/common/iodata.sol/iodata.json';
+import HoodiBase58Artifact from '../../assets/ethereum/hoodi/common/Base58.sol/Base58.json';
+import HoodiSysioMerkleArtifact from '../../assets/ethereum/hoodi/common/sysio_merkle.sol/sysio_merkle.json';
+import HoodiSysioWriteArtifact from '../../assets/ethereum/hoodi/common/sysio_write.sol/sysio_write.json';
+import HoodiERC20Artifact from '../../assets/ethereum/hoodi/token/ERC20Token.sol/ERC20Token.json';
+import HoodiERC721Artifact from '../../assets/ethereum/hoodi/token/ERC721Token.sol/ERC721Token.json';
+import HoodiERC1155Artifact from '../../assets/ethereum/hoodi/token/ERC1155Token.sol/ERC1155Token.json';
 
 import { AddressBook, ContractName } from './types';
 import { Contract, ethers, providers, Signer } from 'ethers';
@@ -46,9 +68,102 @@ import { ErrorDescription } from '@ethersproject/abi/lib/interface';
 import { EvmChainID } from '@wireio/core';
 import { SupportedEvmChainID } from '../../types';
 
-export const ERC20Abi = ERC20Artifact.abi;
-export const ERC721Abi = ERC721Artifact.abi;
-export const ERC1155Abi = ERC1155Artifact.abi;
+export const ERC20Abi = MainnetERC20Artifact.abi;
+export const ERC721Abi = MainnetERC721Artifact.abi;
+export const ERC1155Abi = MainnetERC1155Artifact.abi;
+
+type AbiArtifact = { abi: JsonFragment[] };
+
+type ArtifactBundle = {
+    Accounting: AbiArtifact;
+    DepositManager: AbiArtifact;
+    LiqEthToken: AbiArtifact;
+    StakingModule: AbiArtifact;
+    WithdrawalQueue: AbiArtifact;
+    WithdrawalVault: AbiArtifact;
+    BeaconState: AbiArtifact;
+    YieldOracle: AbiArtifact;
+    Depositor: AbiArtifact;
+    ReceiptNFT: AbiArtifact;
+    OutpostManager: AbiArtifact;
+    BAR: AbiArtifact;
+    OPP: AbiArtifact;
+    OPPCommon: AbiArtifact;
+    OPPInbound: AbiArtifact;
+    Pretoken: AbiArtifact;
+    Aggregator: AbiArtifact;
+    EthUsdPriceConsumer: AbiArtifact;
+    Pool: AbiArtifact;
+    OutpostManagerAuthority: AbiArtifact;
+    iodata: AbiArtifact;
+    Base58: AbiArtifact;
+    sysio_merkle: AbiArtifact;
+    sysio_write: AbiArtifact;
+    ERC20: AbiArtifact;
+    ERC721: AbiArtifact;
+    ERC1155: AbiArtifact;
+};
+
+const MAINNET_ARTIFACTS: ArtifactBundle = {
+    Accounting: MainnetAccountingArtifact as AbiArtifact,
+    DepositManager: MainnetDepositManagerArtifact as AbiArtifact,
+    LiqEthToken: MainnetLiqEthArtifact as AbiArtifact,
+    StakingModule: MainnetStakingModuleArtifact as AbiArtifact,
+    WithdrawalQueue: MainnetWithdrawalQueueArtifact as AbiArtifact,
+    WithdrawalVault: MainnetWithdrawalVaultArtifact as AbiArtifact,
+    BeaconState: MainnetBeaconStateArtifact as AbiArtifact,
+    YieldOracle: MainnetYieldOracleArtifact as AbiArtifact,
+    Depositor: MainnetDepositorArtifact as AbiArtifact,
+    ReceiptNFT: MainnetReceiptNFTArtifact as AbiArtifact,
+    OutpostManager: MainnetOutpostManagerArtifact as AbiArtifact,
+    BAR: MainnetBARArtifact as AbiArtifact,
+    OPP: MainnetOPPArtifact as AbiArtifact,
+    OPPCommon: MainnetOPPCommonArtifact as AbiArtifact,
+    OPPInbound: MainnetOPPInboundArtifact as AbiArtifact,
+    Pretoken: MainnetPretokenArtifact as AbiArtifact,
+    Aggregator: MainnetAggregatorArtifact as AbiArtifact,
+    EthUsdPriceConsumer: MainnetEthUsdPriceConsumerArtifact as AbiArtifact,
+    Pool: MainnetPoolArtifact as AbiArtifact,
+    OutpostManagerAuthority: MainnetOutpostManagerAuthorityArtifact as AbiArtifact,
+    iodata: MainnetIodataArtifact as AbiArtifact,
+    Base58: MainnetBase58Artifact as AbiArtifact,
+    sysio_merkle: MainnetSysioMerkleArtifact as AbiArtifact,
+    sysio_write: MainnetSysioWriteArtifact as AbiArtifact,
+    ERC20: MainnetERC20Artifact as AbiArtifact,
+    ERC721: MainnetERC721Artifact as AbiArtifact,
+    ERC1155: MainnetERC1155Artifact as AbiArtifact,
+};
+
+const HOODI_ARTIFACTS: ArtifactBundle = {
+    Accounting: HoodiAccountingArtifact as AbiArtifact,
+    DepositManager: HoodiDepositManagerArtifact as AbiArtifact,
+    LiqEthToken: HoodiLiqEthArtifact as AbiArtifact,
+    StakingModule: HoodiStakingModuleArtifact as AbiArtifact,
+    WithdrawalQueue: HoodiWithdrawalQueueArtifact as AbiArtifact,
+    WithdrawalVault: HoodiWithdrawalVaultArtifact as AbiArtifact,
+    BeaconState: HoodiBeaconStateArtifact as AbiArtifact,
+    YieldOracle: HoodiYieldOracleArtifact as AbiArtifact,
+    Depositor: HoodiDepositorArtifact as AbiArtifact,
+    ReceiptNFT: HoodiReceiptNFTArtifact as AbiArtifact,
+    OutpostManager: HoodiOutpostManagerArtifact as AbiArtifact,
+    BAR: HoodiBARArtifact as AbiArtifact,
+    OPP: HoodiOPPArtifact as AbiArtifact,
+    OPPCommon: HoodiOPPCommonArtifact as AbiArtifact,
+    OPPInbound: HoodiOPPInboundArtifact as AbiArtifact,
+    Pretoken: HoodiPretokenArtifact as AbiArtifact,
+    // No hoodi Aggregator artifact currently exists in assets; keep ABI compatibility with mainnet artifact.
+    Aggregator: MainnetAggregatorArtifact as AbiArtifact,
+    EthUsdPriceConsumer: HoodiEthUsdPriceConsumerArtifact as AbiArtifact,
+    Pool: HoodiPoolArtifact as AbiArtifact,
+    OutpostManagerAuthority: HoodiOutpostManagerAuthorityArtifact as AbiArtifact,
+    iodata: HoodiIodataArtifact as AbiArtifact,
+    Base58: HoodiBase58Artifact as AbiArtifact,
+    sysio_merkle: HoodiSysioMerkleArtifact as AbiArtifact,
+    sysio_write: HoodiSysioWriteArtifact as AbiArtifact,
+    ERC20: HoodiERC20Artifact as AbiArtifact,
+    ERC721: HoodiERC721Artifact as AbiArtifact,
+    ERC1155: HoodiERC1155Artifact as AbiArtifact,
+};
 
 // -----------------------------------------------------------------------------
 // Address books (per-chain)
@@ -93,36 +208,36 @@ export const MAINNET_ADDRESSES: AddressBook = {
 
 /**
  * HOODI TESTNET LATEST
- * 1/23/26
+ * 3/25/26
  */
 export const HOODI_ADDRESSES: AddressBook = {
     // LiqETH contracts
-    LiqEthAuthority: '0x3Eb66Bb91F7a022FbABc1619Cb6acce7025Bc41F',
-    BeaconState: '0x08F879c6D0964E0A17bF688Af23168f654DF372e',
-    WithdrawalQueue: '0x74aDeD940369baDDb0F36426F23B08499e45Fe18',
-    LiqEthToken: '0x8C974517D038e2e3b8a1da7b1A026bC8132A4b2e',
-    Accounting: '0x766CE996B8132b927988c5b2ECAE8108fB1a9307',
-    DepositManager: '0xEd391dB5DB11B5eDBE08e69A51D16e84293C09a3',
-    WithdrawalVault: '0xbaBc0D5997283ab9886696A0dEaB8A8093436b48',
-    StakingModule: '0x4998fBb6Ca5Ee3Db6c339e2962A34791Af643fEa',
+    LiqEthAuthority: '0xF2f111CB61fF600A958917bEEc4ae95AB839b0fD',
+    BeaconState: '0xe9E05bF63A5a95F45B856400bcFC3b4Bcb332A27',
+    WithdrawalQueue: '0x8fB35513ede9847D478B5ecE09524ebA42bf6947',
+    LiqEthToken: '0xf24ef96791BAEB825ffadCcC12bd59bf46b1493A',
+    Accounting: '0x2f12ECd08cAA2883f227eb6D8718913840c4d536',
+    DepositManager: '0x3807b9a0746DD47075B1d7127d82F4413090b5d0',
+    WithdrawalVault: '0x5d0A20942e34434A894F7faa45E255dF38DFbbA5',
+    StakingModule: '0x98ebf82771524906E0dC79661D41778F88C3A153',
     // YieldOracle: '0x61Fe311C57dd9a38Fb7B0c5A8ec521452dB25378',
 
     // Outpost contracts
-    OutpostManagerAuthority: '0x3B8705Ba1195AF632b3bd9E46F19348BC828FA3D',
-    iodata: '0x4aCABbC74a1cA9B0058d9ADAa0E00Af0f4f73212',
-    Base58: '0x1241F36ff30065deD52d51f0d6524EF971259A12',
-    sysio_merkle: '0x58ca9b5515266Fd6bF94D5F1268C505b2eC9679c',
-    ReceiptNFT: '0x03d6bD46cA9F54B8F8bbA21CfAfe717b36cB8593',
-    EthUsdPriceConsumer: '0xdC2DD993A13b3DD6D255B52285625694bd967c9A',
-    Pool: '0xd4742757AA61B1Fd3Fcd87980D7D460B12Cd9275',
-    OutpostManager: '0x38ec2B56cBCeCaFFe28b535517de1a102C3D74E3',
-    sysio_write: '0x0Ec4C1BaB772958aa3Db27459643bfbE7d92E305',
-    Pretoken: '0x8c97a51A71640fa411DEfab8feC3401eFfd1a2E4',
-    BAR: '0xbAFac13ffd3Aa9aEabaaeb6e4C2cF3dFf3479DC0',
-    OPPCommon: '0x12283a6d4E6cE4A0e8AdB319Fc161c7F4f91EA8F',
-    OPP: '0x87CE3Fe2CDca39C04aa2c14bbF1E1d9DB6358C4A',
-    Depositor: '0x5351B30EA4b75bD9be9Fc0048e88F675f7b3Ac2b',
-    OPPInbound: '0x0B1f7FB1c7f01A9cf490a1387E1E100F2bEA6C6d',
+    OutpostManagerAuthority: '0x2297f03dDF927Ab02658722fFF4b56095B9D5715',
+    iodata: '0x57513B553fa7b5d6f223eE454f79480168493298',
+    Base58: '0x92D738e4615Edf8eF60100286549555ec0117BA7',
+    sysio_merkle: '0x1D4f3C6B0632150B44FcF9D3A37B517d70A6eBD4',
+    ReceiptNFT: '0x4a896163E39579cA64BD163E769CA5b53fc9c859',
+    EthUsdPriceConsumer: '0x069D24345AE78Fb172F3bf1Dc9C397F3DD7FEaed',
+    Pool: '0x3b7ecEd59B64FC48cd02997FfDA5A50E4376c750',
+    OutpostManager: '0x672256b775BF70f81CeBD5c99cb4F457Fcd5Ba47',
+    sysio_write: '0x5a70610632Fc07067F9ECAf1d48d8880f8D7b950',
+    Pretoken: '0x4a80082Fe770AD9995Ea95da3Da77C8aDa14FE2C',
+    BAR: '0x8E3062455d6818c3273b94A4101a7509BC8BD189',
+    OPPCommon: '0xEc6BfA399d37e8F10d730AACA23e25b208386463',
+    OPP: '0xe54B0ebFC8F4ECFc0B86C37eC0A2579084F223c1',
+    Depositor: '0x4Cd296E02C60b40646f7b02E83514c938280441C',
+    OPPInbound: '0x5f16d85B454db90ca716166345d4EAc166793466',
 
     // Test-only mock aggregator
     MockAggregator: '0xFCfc3ddd4CBd9Ad3b3af3A374B8bdA1b66eE6FFF',
@@ -147,118 +262,118 @@ export type ContractConfig = {
 
 export type Contracts<T extends string = ContractName> = Record<T, ContractConfig>;
 
-function buildContracts(addresses: AddressBook): Contracts<ContractName> {
+function buildContracts(addresses: AddressBook, artifacts: ArtifactBundle): Contracts<ContractName> {
     return {
         // LiqETH Contracts
         LiqEthAuthority: {
             address: addresses.LiqEthAuthority,
-            abi: LiqEthArtifact.abi as JsonFragment[],
+            abi: artifacts.LiqEthToken.abi as JsonFragment[],
         },
         BeaconState: {
             address: addresses.BeaconState,
-            abi: BeaconStateArtifact.abi as JsonFragment[],
+            abi: artifacts.BeaconState.abi as JsonFragment[],
         },
         WithdrawalQueue: {
             address: addresses.WithdrawalQueue,
-            abi: WithdrawalQueueArtifact.abi as JsonFragment[],
+            abi: artifacts.WithdrawalQueue.abi as JsonFragment[],
         },
         LiqEthToken: {
             address: addresses.LiqEthToken,
-            abi: LiqEthArtifact.abi as JsonFragment[],
+            abi: artifacts.LiqEthToken.abi as JsonFragment[],
         },
         Accounting: {
             address: addresses.Accounting,
-            abi: AccountingArtifact.abi as JsonFragment[],
+            abi: artifacts.Accounting.abi as JsonFragment[],
         },
         DepositManager: {
             address: addresses.DepositManager,
-            abi: DepositManagerArtifact.abi as JsonFragment[],
+            abi: artifacts.DepositManager.abi as JsonFragment[],
         },
         WithdrawalVault: {
             address: addresses.WithdrawalVault,
-            abi: WithdrawalVaultArtifact.abi as JsonFragment[],
+            abi: artifacts.WithdrawalVault.abi as JsonFragment[],
         },
         StakingModule: {
             address: addresses.StakingModule,
-            abi: StakingModuleArtifact.abi as JsonFragment[],
+            abi: artifacts.StakingModule.abi as JsonFragment[],
         },
         // YieldOracle: {
         //     address: addresses.YieldOracle,
-        //     abi: YieldOracleArtifact.abi as JsonFragment[],
+        //     abi: artifacts.YieldOracle.abi as JsonFragment[],
         // },
 
         // Outpost Contracts
         OutpostManagerAuthority: {
             address: addresses.OutpostManagerAuthority,
-            abi: OutpostManagerAuthorityArtifact.abi as JsonFragment[],
+            abi: artifacts.OutpostManagerAuthority.abi as JsonFragment[],
         },
         iodata: {
             address: addresses.iodata,
-            abi: IodataArtifact.abi as JsonFragment[],
+            abi: artifacts.iodata.abi as JsonFragment[],
         },
         Base58: {
             address: addresses.Base58,
-            abi: Base58Artifact.abi as JsonFragment[],
+            abi: artifacts.Base58.abi as JsonFragment[],
         },
         sysio_merkle: {
             address: addresses.sysio_merkle,
-            abi: sysio_merkleArtifact.abi as JsonFragment[],
+            abi: artifacts.sysio_merkle.abi as JsonFragment[],
         },
         ReceiptNFT: {
             address: addresses.ReceiptNFT,
-            abi: ReceiptNFTArtifact.abi as JsonFragment[],
+            abi: artifacts.ReceiptNFT.abi as JsonFragment[],
         },
         Pool: {
             address: addresses.Pool,
-            abi: PoolArtifact.abi as JsonFragment[],
+            abi: artifacts.Pool.abi as JsonFragment[],
         },
         OutpostManager: {
             address: addresses.OutpostManager,
-            abi: OutpostManagerArtifact.abi as JsonFragment[],
+            abi: artifacts.OutpostManager.abi as JsonFragment[],
         },
         sysio_write: {
             address: addresses.sysio_write,
-            abi: sysio_writeArtifact.abi as JsonFragment[],
+            abi: artifacts.sysio_write.abi as JsonFragment[],
         },
         EthUsdPriceConsumer: {
             address: addresses.EthUsdPriceConsumer,
-            abi: EthUsdPriceConsumerArtifact.abi as JsonFragment[],
+            abi: artifacts.EthUsdPriceConsumer.abi as JsonFragment[],
         },
         BAR: {
             address: addresses.BAR,
-            abi: BARArtifact.abi as JsonFragment[],
+            abi: artifacts.BAR.abi as JsonFragment[],
         },
         OPPCommon: {
             address: addresses.OPPCommon,
-            abi: OPPCommonArtifact.abi as JsonFragment[],
+            abi: artifacts.OPPCommon.abi as JsonFragment[],
         },
         OPP: {
             address: addresses.OPP,
-            abi: OPPArtifact.abi as JsonFragment[],
+            abi: artifacts.OPP.abi as JsonFragment[],
         },
         Pretoken: {
             address: addresses.Pretoken,
-            abi: PretokenArtifact.abi as JsonFragment[],
+            abi: artifacts.Pretoken.abi as JsonFragment[],
         },
         OPPInbound: {
             address: addresses.OPPInbound,
-            abi: OPPInboundArtifact.abi as JsonFragment[],
+            abi: artifacts.OPPInbound.abi as JsonFragment[],
         },
         Depositor: {
             address: addresses.Depositor,
-            abi: DepositorArtifact.abi as JsonFragment[],
+            abi: artifacts.Depositor.abi as JsonFragment[],
         },
 
         MockAggregator: {
             address: addresses.MockAggregator,
-            abi: AggregatorArtifact.abi as JsonFragment[],
+            abi: artifacts.Aggregator.abi as JsonFragment[],
         },
     };
 }
 
 export const CONTRACTS_BY_CHAIN: Record<SupportedEvmChainID, Contracts<ContractName>> = {
-    [EvmChainID.Ethereum]: buildContracts(MAINNET_ADDRESSES),
-    [EvmChainID.Hoodi]: buildContracts(HOODI_ADDRESSES),
+    [EvmChainID.Ethereum]: buildContracts(MAINNET_ADDRESSES, MAINNET_ARTIFACTS),
+    [EvmChainID.Hoodi]: buildContracts(HOODI_ADDRESSES, HOODI_ARTIFACTS),
 };
 
 // -----------------------------------------------------------------------------
@@ -274,6 +389,11 @@ export interface ContractOptions {
     signer?: Signer;
 }
 
+const ARTIFACTS_BY_CHAIN: Record<SupportedEvmChainID, ArtifactBundle> = {
+    [EvmChainID.Ethereum]: MAINNET_ARTIFACTS,
+    [EvmChainID.Hoodi]: HOODI_ARTIFACTS,
+};
+
 export class EthereumContractService {
     private provider?: providers.Provider;
     private signer?: Signer;
@@ -351,20 +471,8 @@ export class EthereumContractService {
     public get omniInterface(): ethers.utils.Interface {
         const all: any[] = [];
 
-        const allArtifacts = [
-            ERC20Artifact,
-            ERC721Artifact,
-            ERC1155Artifact,
-
-            // If you want, you can gradually re-enable protocol ABIs here
-            // AccountingArtifact,
-            // DepositManagerArtifact,
-            // LiqEthArtifact,
-            // StakingModuleArtifact,
-            // WithdrawalQueueArtifact,
-            // WithdrawalVaultArtifact,
-            // YieldOracleArtifact,
-        ];
+        const artifacts : ArtifactBundle = ARTIFACTS_BY_CHAIN[this.chainId];
+        const allArtifacts = Object.values(artifacts);
 
         allArtifacts.forEach((artifact) => {
             if (artifact && artifact.abi) {
@@ -400,4 +508,4 @@ export class EthereumContractService {
             throw new Error(`Unable to parse error data: ${revertData}`);
         }
     }
-}
+}

package/src/networks/ethereum/ethereum.ts

@@ -103,9 +103,9 @@ export class EthereumStakingClient implements IStakingClient {
     }
 
     /**
-     * Withdraw native ETH from the liqETH protocol via the liqeth safeBurn function, which burns the LiqETH and adds the user to the withdrawal queue.
-     * @param amount  Amount in wei (or something convertible to BigNumber).
-     * @returns transaction hash
+     * List withdrawal queue receipts for a wallet (pending / in-progress exits after safeBurn).
+     * @param address  Owner to query; defaults to the connected wallet.
+     * @returns Withdrawal receipt NFT entries from the protocol view
      */
     async getPendingWithdraws(address?: string): Promise<WithdrawReceipt[]> {
         this.ensureUser();
@@ -114,8 +114,9 @@ export class EthereumStakingClient implements IStakingClient {
     }
 
     /**
-     * Withdraw native ETH from the liqETH protocol via the liqeth safeBurn function, which burns the LiqETH and adds the user to the withdrawal queue.
-     * @param tokenId  The ID of the withdrawal request NFT
+     * Claim native ETH for a matured withdrawal using the WithdrawalQueue NFT token id
+     * (via DepositManager.claim after the delay has passed).
+     * @param tokenId  Withdrawal request / queue NFT token id
      * @returns transaction hash
      */
     async claimWithdraw(tokenId: bigint): Promise<string> {
@@ -148,6 +149,46 @@ export class EthereumStakingClient implements IStakingClient {
         throw new Error("Method not yet implemented.");
     }
 
+    /**
+     * Deposit ETH to liqETH, then stake liqETH in a single transaction.
+     * @param amountWei  Amount in wei.
+     * @returns transaction hash
+     */
+    async depositAndStake(amountWei: bigint): Promise<string> {
+        this.ensureUser();
+        if (!amountWei || amountWei <= BigInt(0))
+            throw new Error('Amount must be greater than zero.');
+
+        const result = await this.stakeClient.performDepositAndStake(BigNumber.from(amountWei));
+        return result.txHash;
+    }
+
+    /**
+     * Deposit ETH to liqETH, then purchase pretokens in a single transaction.
+     * @param amountWei  Amount in wei.
+     * @returns transaction hash
+     */
+    async depositAndBuy(amountWei: bigint): Promise<string> {
+        this.ensureUser();
+        if (!amountWei || amountWei <= BigInt(0))
+            throw new Error('Amount must be greater than zero.');
+
+        const result = await this.stakeClient.performDepositAndPurchase(BigNumber.from(amountWei));
+        return result.txHash;
+    }
+
+    /**
+     * Unstake liqETH, then request a withdrawal in a single transaction.
+     * @param tokenId  The ReceiptNFT token ID for the stake position
+     * @returns transaction hash
+     */
+    async unstakeAndWithdraw(tokenId: bigint): Promise<string> {
+        this.ensureUser();
+
+        const result = await this.stakeClient.performUnstakeAndRequestWithdraw(BigNumber.from(tokenId));
+        return result.txHash;
+    }
+
 
     /**
      * ETH Prelaunch function to unstake liqEth
@@ -560,4 +601,4 @@ export class EthereumStakingClient implements IStakingClient {
     //         console.log(`MockAggregator updated ${ageSec}s ago — no update needed`);
     //     }
     // }
-}
+}

package/src/networks/ethereum/types.ts

@@ -90,7 +90,17 @@ export interface WithdrawnStakeEvent {
 export interface WithdrawnStakeResult extends Result {
     /** Parsed WithdrawnStake event, if present */
     withdrawnstake?: WithdrawnStakeEvent;
+}
+
+export interface DepositAndStakeResult extends Result {
+    /** Parsed Staked event, if present */
+    staked?: StakedEvent;
+}
+
+export interface DepositAndPurchaseResult extends Result {
+}
 
+export interface UnstakeAndWithdrawResult extends Result {
 }
 
 export interface SharesBurnedEvent {

package/src/networks/solana/constants.ts

@@ -21,7 +21,7 @@ export type SolanaProgramIds = {
     LIQSOL_TOKEN: PublicKey;
     VALIDATOR_LEADERBOARD: PublicKey;
     TRANSFER_HOOK: PublicKey;
-    ALT_LOOKUP_TABLE: PublicKey;
+    ALT: PublicKey;
 };
 
 const MAINNET_PROGRAM_IDS: SolanaProgramIds = {
@@ -29,7 +29,7 @@ const MAINNET_PROGRAM_IDS: SolanaProgramIds = {
     LIQSOL_TOKEN: new PublicKey(mainnetLiqSolTokenIDL.address),
     VALIDATOR_LEADERBOARD: new PublicKey(mainnetValidatorLeaderboardIDL.address),
     TRANSFER_HOOK: new PublicKey(mainnetTransferHookIDL.address),
-    ALT_LOOKUP_TABLE: new PublicKey("AQXTHwkdNBEiXeQuVA5uCoxvzgYUmudRxthQY4vWKCPS")
+    ALT: new PublicKey("AQXTHwkdNBEiXeQuVA5uCoxvzgYUmudRxthQY4vWKCPS")
 };
 
 const DEVNET_PROGRAM_IDS: SolanaProgramIds = {
@@ -37,7 +37,7 @@ const DEVNET_PROGRAM_IDS: SolanaProgramIds = {
     LIQSOL_TOKEN: new PublicKey(devnetLiqSolTokenIDL.address),
     VALIDATOR_LEADERBOARD: new PublicKey(devnetValidatorLeaderboardIDL.address),
     TRANSFER_HOOK: new PublicKey(devnetTransferHookIDL.address),
-    ALT_LOOKUP_TABLE: new PublicKey("3MbupRDxUqPtJzoLLmjEYV3dXJdh1jojQrpDEQUqv7xb")
+    ALT: new PublicKey("AZQmTbacBuAsJpncg2N2AwcZsLG1Sxeohbau9vjezmTz")
 };
 
 export const PROGRAM_IDS_BY_CHAIN: Record<SupportedSolChainID, SolanaProgramIds> = {