@wireio/stake 0.7.3 → 1.0.0

package/src/networks/ethereum/contract.ts

@@ -54,34 +54,67 @@ export const ERC1155Abi = ERC1155Artifact.abi;
 
 // Make sure ContractName in ./types includes all of these keys.
 export const ADDRESSES: AddressBook = {
+    /**
+     * MAINNET LATEST
+     * 1/23/26
+     */
+    LiqEthAuthority: "0xB8fb7dBA2de501c94EAB723fa48679f698a39Aa4",
+    BeaconState: "0x29719E8e76C52F5fD4888DF401579859c305f2DF",
+    WithdrawalQueue: "0xce388339bFDAed9cAF536ea7b4F42123b4D755d4",
+    LiqEthToken: "0x2C0e75e930Fc72ceD0725854C5E7A55566333F3f",
+    Accounting: "0xE31C44d04c7B055afAC9301F55840f030eaF04BC",
+    DepositManager: "0x21b339ED55A0f037f91B88044C808CcfCCBbF9A8",
+    WithdrawalVault: "0x028743bE7E727aA331A1e952575cb00623B95fE2",
+    StakingModule: "0xDe9754Fb58CcD4D74e94DA5682192E4e6eC334b0",
+    YieldOracle: "0x7B7B8894e75b44B6cA7Dc8bE6dED5059621907b2",
+
+     OutpostManagerAuthority: "0xeaE32b94c0F858b3600861aAE4Caeee6B6341751",
+    iodata: "0x485Ed153c45189d623Bb37816eD3016A56552273",
+    Base58: "0x8bB3856EC1114B1cE45a78620CF174D90a1Fd4e7",
+    sysio_merkle: "0x5180a926D71c6d94c5c939Fe7Fed14cD7dcAa541",
+    ReceiptNFT: "0x651De616A20b17De1095f9A0694A0e0E68025b78",
+    EthUsdPriceConsumer: "0x2d866f8DB6F6c94997b0027Ba24bc64a03627ddc",
+    Pool: "0xDA268Adcb90c422C2102A5f713182A42A8b9EA0D",
+    OutpostManager: "0x9f279804Cb8539c53709AA37a4C1b30A52A85175",
+    sysio_write: "0x3F8c880efd2c8C3aA1f0CE40b886cc6913eEC1d3",
+    Pretoken: "0xCabF19Fdb7cD063738dd63a418702Ee3642FFc68",
+    BAR: "0x2D8f4D4435509d7b8F93C3Ba93D45447C892f7ED",
+    OPPCommon: "0x1716EEC9f1E0c1aF7BbbA8Fed10652138914f766",
+    OPP: "0x5e1135cF8987268a3e7F68551558Ae92c454429f",
+    Depositor: "0xf4b4ccfD684feB46504D77232FBde23b23d4F774",
+    OPPInbound: "0x088484d45fF93AFabC63810FB0b335792E2B24f3"
+
+    /**
+     * HOODI TESTNET LATEST
+     * 1/23/26
+     */
     // LiqETH contracts
-    LiqEthAuthority: "0x3Eb66Bb91F7a022FbABc1619Cb6acce7025Bc41F",
-    BeaconState: "0x08F879c6D0964E0A17bF688Af23168f654DF372e",
-    WithdrawalQueue: "0x74aDeD940369baDDb0F36426F23B08499e45Fe18",
-    LiqEthToken: "0x8C974517D038e2e3b8a1da7b1A026bC8132A4b2e",
-    Accounting: "0x766CE996B8132b927988c5b2ECAE8108fB1a9307",
-    DepositManager: "0xEd391dB5DB11B5eDBE08e69A51D16e84293C09a3",
-    WithdrawalVault: "0xbaBc0D5997283ab9886696A0dEaB8A8093436b48",
-    StakingModule: "0x4998fBb6Ca5Ee3Db6c339e2962A34791Af643fEa",
-    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",
-    MockAggregator: "0xFCfc3ddd4CBd9Ad3b3af3A374B8bdA1b66eE6FFF",
+    // LiqEthAuthority: "0x3Eb66Bb91F7a022FbABc1619Cb6acce7025Bc41F",
+    // BeaconState: "0x08F879c6D0964E0A17bF688Af23168f654DF372e",
+    // WithdrawalQueue: "0x74aDeD940369baDDb0F36426F23B08499e45Fe18",
+    // LiqEthToken: "0x8C974517D038e2e3b8a1da7b1A026bC8132A4b2e",
+    // Accounting: "0x766CE996B8132b927988c5b2ECAE8108fB1a9307",
+    // DepositManager: "0xEd391dB5DB11B5eDBE08e69A51D16e84293C09a3",
+    // WithdrawalVault: "0xbaBc0D5997283ab9886696A0dEaB8A8093436b48",
+    // StakingModule: "0x4998fBb6Ca5Ee3Db6c339e2962A34791Af643fEa",
+    // 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",
+    // MockAggregator: "0xFCfc3ddd4CBd9Ad3b3af3A374B8bdA1b66eE6FFF",
 };
 
 export type Contracts<T extends string = ContractName> = Record<T, ContractConfig>;
@@ -155,10 +188,6 @@ export const CONTRACTS: Contracts<ContractName> = {
         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[],
@@ -199,8 +228,14 @@ export const CONTRACTS: Contracts<ContractName> = {
         address: ADDRESSES.Depositor,
         abi: DepositorArtifact.abi as JsonFragment[],
     },
+
+    // MockAggregator: {
+    //     address: ADDRESSES.MockAggregator,
+    //     abi: AggregatorArtifact.abi as JsonFragment[],
+    // },
 };
 
+
 export interface ContractOptions {
     /** RPC endpoint or injected EIP-1193 provider */
     provider?: ethers.providers.Provider;

package/src/networks/ethereum/ethereum.ts

@@ -142,10 +142,10 @@ export class EthereumStakingClient implements IStakingClient {
         const buyer = await this.signer!.getAddress();
 
         // ! Hoodi only - check if the mock aggregator price is stale, and if so, update it before submitting the buy request
-        const network = await this.provider.getNetwork();
-        const chainId = network.chainId;
-        const allowedTestChains = new Set([560048]);
-        if (allowedTestChains.has(chainId)) await this.updateMockAggregatorPrice();
+        // const network = await this.provider.getNetwork();
+        // const chainId = network.chainId;
+        // const allowedTestChains = new Set([560048]);
+        // if (allowedTestChains.has(chainId)) await this.updateMockAggregatorPrice();
 
         let result = await this.pretokenClient.purchasePretokensWithLiqETH(amount, buyer);
         return result && result.txHash ? result.txHash : "Error - no resulting txHash";
@@ -339,7 +339,7 @@ export class EthereumStakingClient implements IStakingClient {
         windowAfter?: number;
     }): Promise<TrancheSnapshot> {
         const {
-            chainID = EvmChainID.Hoodi,
+            chainID = EvmChainID.Ethereum,
             windowBefore,
             windowAfter,
         } = options ?? {};
@@ -370,14 +370,14 @@ export class EthereumStakingClient implements IStakingClient {
 
 
             // fetch price and timestamp from aggregator
-            const [roundId, answer, startedAt, updatedAt, answeredInRound] = await this.contract.MockAggregator.latestRoundData();
+            // const [roundId, answer, startedAt, updatedAt, answeredInRound] = await this.contract.MockAggregator.latestRoundData();
             //originally fetched ethPrice from aggregator - pulling from EthUsdPriceConsumer instead - this is where the actual price gets pulled from when purchasing pretokens.
             // let ethPriceUsd: bigint = BigInt(answer.toString());)
 
             let ethPriceUsdBn = await this.contract.EthUsdPriceConsumer.getPrice18Decimals();
             let ethPriceUsd: bigint = BigInt(ethPriceUsdBn.toString()) / BigInt(1e10);
 
-            let nativePriceTimestamp: number = Number(updatedAt);
+            // let nativePriceTimestamp: number = Number(updatedAt);
 
             const initialTrancheSupply = BigInt(INITIAL_TRANCHE_SUPPLY) * BigInt(1e8);
 
@@ -396,7 +396,7 @@ export class EthereumStakingClient implements IStakingClient {
                 maxPriceUsd,
 
                 ethPriceUsd,
-                nativePriceTimestamp,
+                // nativePriceTimestamp,
                 ladderWindowBefore: windowBefore,
                 ladderWindowAfter: windowAfter,
             });
@@ -482,49 +482,49 @@ 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.MockAggregator;
-
-        // read latest round & compute age
-        const [roundId, answer, startedAt, updatedAt, answeredInRound] = await aggregator.latestRoundData();
-        const now = (await this.provider.getBlock("latest")).timestamp;
-        const ageSec = Number(now) - Number(updatedAt);
-
-        const ONE_HOUR = 1 * 3600;
-        // const ONE_HOUR = 10;
-        if (ageSec > ONE_HOUR) {
-            // safety check - only run in non-production contexts
-            const network = await this.provider.getNetwork();
-            const chainId = network.chainId;
-            const allowedTestChains = new Set([560048]);
-            if (!allowedTestChains.has(chainId)) {
-                console.warn(`MockAggregator is stale (${ageSec}s) but chainId ${chainId} is not a test/local network — skipping update.`);
-                return;
-            }
-
-
-            //fetch the current ETH / USD price
-            const res = await fetch('https://api.coingecko.com/api/v3/simple/price?ids=ethereum&vs_currencies=usd');
-            const data = await res.json();
-            const ethUsd = data.ethereum.usd;
-
-            const currentEthPrice = ethers.utils.parseUnits(ethUsd.toString(), 8);
-
-            try {
-                //update to be intentionally stale
-                // const alttx = await aggregator.updateStale(currentEthPrice, now - 7200);
-                // const altreceipt = await alttx.wait(1);
-                // console.log('stale update receipt', altreceipt)
-
-                //update answer with current timestamp
-                const tx = await aggregator.updateAnswer(currentEthPrice);
-                const txreceipt = await tx.wait(1);
-                // console.log('MockAggregator answer updated - receipt:', txreceipt)
-            } catch (err: any) {
-                console.error('MockAggregator updateAnswer failed', err?.message || err);
-            }
-        } else {
-            console.log(`MockAggregator updated ${ageSec}s ago — no update needed`);
-        }
-    }
+    // private async updateMockAggregatorPrice() {
+    //     const aggregator = this.contract.MockAggregator;
+
+    //     // read latest round & compute age
+    //     const [roundId, answer, startedAt, updatedAt, answeredInRound] = await aggregator.latestRoundData();
+    //     const now = (await this.provider.getBlock("latest")).timestamp;
+    //     const ageSec = Number(now) - Number(updatedAt);
+
+    //     const ONE_HOUR = 1 * 3600;
+    //     // const ONE_HOUR = 10;
+    //     if (ageSec > ONE_HOUR) {
+    //         // safety check - only run in non-production contexts
+    //         const network = await this.provider.getNetwork();
+    //         const chainId = network.chainId;
+    //         const allowedTestChains = new Set([560048]);
+    //         if (!allowedTestChains.has(chainId)) {
+    //             console.warn(`MockAggregator is stale (${ageSec}s) but chainId ${chainId} is not a test/local network — skipping update.`);
+    //             return;
+    //         }
+
+
+    //         //fetch the current ETH / USD price
+    //         const res = await fetch('https://api.coingecko.com/api/v3/simple/price?ids=ethereum&vs_currencies=usd');
+    //         const data = await res.json();
+    //         const ethUsd = data.ethereum.usd;
+
+    //         const currentEthPrice = ethers.utils.parseUnits(ethUsd.toString(), 8);
+
+    //         try {
+    //             //update to be intentionally stale
+    //             // const alttx = await aggregator.updateStale(currentEthPrice, now - 7200);
+    //             // const altreceipt = await alttx.wait(1);
+    //             // console.log('stale update receipt', altreceipt)
+
+    //             //update answer with current timestamp
+    //             const tx = await aggregator.updateAnswer(currentEthPrice);
+    //             const txreceipt = await tx.wait(1);
+    //             // console.log('MockAggregator answer updated - receipt:', txreceipt)
+    //         } catch (err: any) {
+    //             console.error('MockAggregator updateAnswer failed', err?.message || err);
+    //         }
+    //     } else {
+    //         console.log(`MockAggregator updated ${ageSec}s ago — no update needed`);
+    //     }
+    // }
 }

package/src/networks/ethereum/types.ts

@@ -19,7 +19,6 @@ export const CONTRACT_NAMES = [
     "Base58",
     "sysio_merkle",
     "ReceiptNFT",
-    "MockAggregator",
     "Pool",
     "OutpostManager",
     "sysio_write",
@@ -30,7 +29,7 @@ export const CONTRACT_NAMES = [
     "Pretoken",
     "OPPInbound",
     "Depositor",
-
+    // "MockAggregator",
 ] as const;
 
 export type ContractName = typeof CONTRACT_NAMES[number];

package/src/networks/solana/constants.ts

@@ -355,7 +355,7 @@ export const deriveEphemeralStakeAddress = async (
  * Constant keys (Chainlink)
  */
 export const CHAINLINK_FEED = new PublicKey(
-    '99B2bTijsU6f1GCT73HmdR7HCFFjGMBcPZY6jZ96ynrR',
+    'CH31Xns5z3M1cTAbKW34jcxPPciazARpijcHj9rxtemt',
 );
 export const CHAINLINK_PROGRAM = new PublicKey(
     'HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny',