@wireio/stake 0.2.5 → 0.3.0

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

@@ -1,9 +1,6 @@
 import { BigNumber, ethers } from "ethers";
 import { EthereumContractService } from "../contract";
 import { formatContractErrors, sendOPPFinalize } from "../utils";
-import { PurchaseAsset } from "../../../types";
-
-
 
 export class PretokenClient {
     private readonly contractService: EthereumContractService;
@@ -17,60 +14,60 @@ export class PretokenClient {
 
 
     /**
-     * Purchase warrants by sending ETH to the Depositor.purchaseWarrantsWithETH(buyer) payable function.
+     * Purchase pretokens by sending ETH to the Depositor.purchasePretokensWithETH(buyer) payable function.
      * Returns txHash, receipt and parsed PurchasedWithETH event (if present).
      */
-    async purchaseWarrantsWithETH(amountWei: BigNumber, buyer: string): Promise<any> {
-        // attempt a simulation of the purchase call
-        try {
-            await this.contract.Depositor.callStatic.purchaseWarrantsWithETH(buyer, { value: amountWei });
-        } catch (err: any) {
-            let errorObj = formatContractErrors(err);
-            throw new Error(errorObj.name ?? errorObj.raw)
-        }
-
-        // attempt the real purchase call
-        let tx, receipt;
-        try {
-            tx = await this.contract.Depositor.purchaseWarrantsWithETH(buyer, { value: amountWei });
-            receipt = await tx.wait(1);
-        } catch (err: any) {
-            let errorObj = formatContractErrors(err);
-            throw new Error(errorObj.name ?? errorObj.raw)
-        }
-
-
-        // Attempt to parse PurchasedWithETH event
-        let purchased: any | undefined;
-        const ev = receipt.events?.find((e) => e.event === 'PurchasedWithETH' || e.event === 'PurchasedWithETH(address,uint256,uint256,uint256)');
-
-        if (ev && ev.args) {
-            // event signature: PurchasedWithETH(address indexed user, uint256 ethIn, uint256 shares, uint256 tokenId)
-            const { user, ethIn, shares, tokenId } = ev.args as any;
-
-            purchased = {
-                buyer: user,
-                amount: BigNumber.from(ethIn),
-                shares: BigNumber.from(shares),
-                tokenId: BigNumber.from(tokenId),
-            };
-        }
-
-        return {
-            txHash: tx.hash,
-            receipt,
-            purchased,
-        };
-    }
+    // async purchasePretokensWithETH(amountWei: BigNumber, buyer: string): Promise<any> {
+    //     // attempt a simulation of the purchase call
+    //     try {
+    //         await this.contract.Depositor.callStatic.purchasePretokensWithETH(buyer, { value: amountWei });
+    //     } catch (err: any) {
+    //         let errorObj = formatContractErrors(err);
+    //         throw new Error(errorObj.name ?? errorObj.raw)
+    //     }
+
+    //     // attempt the real purchase call
+    //     let tx, receipt;
+    //     try {
+    //         tx = await this.contract.Depositor.purchasePretokensWithETH(buyer, { value: amountWei });
+    //         receipt = await tx.wait(1);
+    //     } catch (err: any) {
+    //         let errorObj = formatContractErrors(err);
+    //         throw new Error(errorObj.name ?? errorObj.raw)
+    //     }
+
+
+    //     // Attempt to parse PurchasedWithETH event
+    //     let purchased: any | undefined;
+    //     const ev = receipt.events?.find((e) => e.event === 'PurchasedWithETH' || e.event === 'PurchasedWithETH(address,uint256,uint256,uint256)');
+
+    //     if (ev && ev.args) {
+    //         // event signature: PurchasedWithETH(address indexed user, uint256 ethIn, uint256 shares, uint256 tokenId)
+    //         const { user, ethIn, shares, tokenId } = ev.args as any;
+
+    //         purchased = {
+    //             buyer: user,
+    //             amount: BigNumber.from(ethIn),
+    //             shares: BigNumber.from(shares),
+    //             tokenId: BigNumber.from(tokenId),
+    //         };
+    //     }
+
+    //     return {
+    //         txHash: tx.hash,
+    //         receipt,
+    //         purchased,
+    //     };
+    // }
 
     /**
-     * Purchase warrants by transferring liqETH into the pool (ERC-20) and calling Depositor.purchaseWarrantsWithLiqETH(amountLiq, buyer).
+     * Purchase pretokens by transferring liqETH into the pool (ERC-20) and calling Depositor.purchasePretokensWithLiqETH(amountLiq, buyer).
      * Returns txHash, receipt and parsed PurchasedWithLiqETH event (if present).
      */
-    async purchaseWarrantsWithLiqETH(amountLiq: BigNumber, buyer: string): Promise<any> {
+    async purchasePretokensWithLiqETH(amountLiq: BigNumber, buyer: string): Promise<any> {
         // attempt a simulation of the purchase call
         try {
-            await this.contract.Depositor.callStatic.purchaseWarrantsWithLiqETH(amountLiq, buyer);
+            await this.contract.Depositor.callStatic.purchasePretokensWithLiqETH(amountLiq, buyer);
         } catch (err: any) {
             let errorObj = formatContractErrors(err);
 
@@ -87,7 +84,7 @@ export class PretokenClient {
         // attempt the real purchase call
         let tx, receipt;
         try {
-            tx = await this.contract.Depositor.purchaseWarrantsWithLiqETH(amountLiq, buyer);
+            tx = await this.contract.Depositor.purchasePretokensWithLiqETH(amountLiq, buyer);
             receipt = await tx.wait(1);
         } catch (err: any) {
             let errorObj = formatContractErrors(err);

package/src/networks/ethereum/contract.ts

@@ -6,8 +6,6 @@
 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 LiqEthBurnArtifact from '../../assets/ethereum/ABI/liqEth/liqEthBurn.sol/LiqEthBurn.json';
-// import LiqEthMintArtifact from '../../assets/ethereum/ABI/liqEth/liqEthMint.sol/LiqEthMint.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';
@@ -20,16 +18,10 @@ import BARArtifact from '../../assets/ethereum/ABI/outpost/BAR.sol/BAR.json';
 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 WarrantArtifact from '../../assets/ethereum/ABI/outpost/Warrant.sol/Warrant.json';
+import PretokenArtifact from '../../assets/ethereum/ABI/outpost/Pretoken.sol/Pretoken.json';
 import AggregatorArtifact from '../../assets/ethereum/ABI/outpost/Aggregator.sol/Aggregator.json';
 import EthUsdPriceConsumerArtifact from '../../assets/ethereum/ABI/outpost/EthUsdPriceConsumer.sol/EthUsdPriceConsumer.json';
 
-// Currently Unused Artifacts
-// import LiqEthCommonArtifact from '../../assets/ethereum/ABI/liqEth/liqEthCommon.sol/liqEthCommon.json';
-// import RewardsERC20Artifact from '../../assets/ethereum/ABI/liqEth/RewardsERC20.sol/RewardsERC20.json';
-// import ValidatorBalanceArtifact from '../../assets/ethereum/ABI/liqEth/ValidatorBalanceVerifier.sol/ValidatorBalanceVerifier.json';
-// import YieldArtifact from '../../assets/ethereum/ABI/liqEth/Yield.sol/YieldOracle.json';
-
 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';
@@ -49,26 +41,28 @@ export const ERC1155Abi = ERC1155Artifact.abi;
 
 // Make sure ContractName in ./types includes all of these keys.
 export const ADDRESSES: AddressBook = {
-    Accounting: "0xDf9da63E9CD14c79bD9f0E8F2E797096A40B6031",
-    DepositManager: "0x3fEd507e554cd0e973CeCAf2168526b1617418d3",
-    LiqEth: "0x1dA6aB23c2E2fA0a52C74F7f4189F770ED1eF9B3",
-    StakingModule: "0xBd13C85fdefBBc63904e7301aCdeFE87c9C93234",
-    WithdrawalQueue: "0xD9A1D38ae4A636DEf20B02F35387a6b126D73fAe", //aka "queue"
-    WithdrawalVault: "0x150334D09a1d3d30EE93d5e6009EB897B5dDF5b2", //aka withdrawVault
+    Accounting: "0xd333A03a44D5d602A98c1B7bcd7ED1f042DD0dEd",
+    DepositManager: "0x601eaA31e8d33D8725786f1733f4cE6cCEf740D4",
+    LiqEth: "0x08252e1Dcbaa86A2887927b02536CD3E67a802c8", // AKA LiqEthToken
+    StakingModule: "0x7Aac2fCfc83d7F2f15eA53a10C1677CA377AFcF4",
+    WithdrawalQueue: "0x951E413FC81a2CE133078ABE8B88677F5296abE7",
+    WithdrawalVault: "0x0D2bf834DD560839e986d42D06DeE268A17c2d13",
+
+    // LiqEthAuthority: "0x7A9cf59EC53F32577Cc8200466Cc7693713129D5",
+    // BeaconState: "0xD3860E5977C94b343341635a2dEEBD20B651c48f",
+    // YieldOracle: "0x307b35816674913cf122975B3CF912b5709653F3",
     
-
     //Outpost contracts
-    Depositor: "0x6aE1D7095B81970654Bd51bCAD42825C6E579088",
-    ReceiptNFT: "0x38eAEa05cB1FFD0c8426A3f9e77815a251DdC197",
-    OutpostManager: "0x6512bB8E7f8418A8e3bB73c49E33EcC30F53f221",
-    BAR: "0x00c128A37598d018Eb8ca4f516688695D83bD413",
-    OPP: "0x8C5710103Ec6a7608dAC539DC232d3822bA3d14C",
-    OPPCommon: "0x52C1d7F02B35176F79b03F6eF7E5b74b27d1dB8c",
-    OPPInbound: "0x39feC7536BaEd4E376b1B5cf2f2e8182ab203418",
-    Warrant: "0x9190bBcaB5cfeb4b7b6DE5Ae21105F3114753F10",
-
-    Aggregator: "0xd89F85Ce867E523Dc3E58578B06Ee72cdaBc39ec",
-    EthUsdPriceConsumer: "0xd02F512eAcCA4c713CA954DfD907DC6E8cFACf8e",
+    Depositor: "0x69Aa53Ef02F124dB421AeDda509d6912341299Cc",
+    ReceiptNFT: "0x13588fF41E2f47D047874162B1eD15AaF6818f5a",
+    OutpostManager: "0x187f4fEDBCAD2f3150120B743b5d568F11dD3452",
+    BAR: "0x27d4646abF638A13934c94f8bA9AC1Bda39F5dbb",
+    OPP: "0x79CA2DE915C294593edc16b32CBA8B7866159205",
+    OPPCommon: "0x8392ea945Cd8C03F5241d4964D20BB5A9c320c71",
+    OPPInbound: "0xfDA9A2C7e395a9722d9fa506f5d67aba823298dd",
+    Pretoken: "0xcf6A1209A7A391cc576174204386F4e5462323dC",
+    EthUsdPriceConsumer: "0x1Ef180FF49313fCB8B5c0470268295d0d24CDE69",
+    Aggregator: "0xFCfc3ddd4CBd9Ad3b3af3A374B8bdA1b66eE6FFF",
 };
 
 export type Contracts<T extends string = ContractName> = Record<T, ContractConfig>;
@@ -95,26 +89,10 @@ export const CONTRACTS: Contracts<ContractName> = {
         address: ADDRESSES.DepositManager,
         abi: DepositManagerArtifact.abi as JsonFragment[],
     },
-    // LiqEthMint: {
-    //     address: ADDRESSES.LiqEthMint,
-    //     abi: LiqEthMintArtifact.abi as JsonFragment[],
-    // },
-    // LiqEthBurn: {
-    //     address: ADDRESSES.LiqEthBurn,
-    //     abi: LiqEthBurnArtifact.abi as JsonFragment[],
-    // },
-    // RewardsERC20: {
-    //     address: ADDRESSES.RewardsERC20,
-    //     abi: RewardsERC20Artifact.abi as JsonFragment[],
-    // },
     StakingModule: {
         address: ADDRESSES.StakingModule,
         abi: StakingModuleArtifact.abi as JsonFragment[],
     },
-    // ValidatorBalance: {
-    //     address: ADDRESSES.ValidatorBalance,
-    //     abi: ValidatorBalanceArtifact.abi as JsonFragment[],
-    // },
     WithdrawalQueue: {
         address: ADDRESSES.WithdrawalQueue,
         abi: WithdrawalQueueArtifact.abi as JsonFragment[],
@@ -123,11 +101,6 @@ export const CONTRACTS: Contracts<ContractName> = {
         address: ADDRESSES.WithdrawalVault,
         abi: WithdrawalVaultArtifact.abi as JsonFragment[],
     },
-    // Yield: {
-    //     address: ADDRESSES.Yield,
-    //     abi: YieldArtifact.abi as JsonFragment[],
-    // },
-
 
     // Outpost Contracts
     Depositor: {
@@ -158,9 +131,9 @@ export const CONTRACTS: Contracts<ContractName> = {
         address: ADDRESSES.OPPInbound,
         abi: OPPInboundArtifact.abi as JsonFragment[],
     },
-    Warrant: {
-        address: ADDRESSES.Warrant,
-        abi: WarrantArtifact.abi as JsonFragment[],
+    Pretoken: {
+        address: ADDRESSES.Pretoken,
+        abi: PretokenArtifact.abi as JsonFragment[],
     },
     Aggregator: {
         address: ADDRESSES.Aggregator,

package/src/networks/ethereum/ethereum.ts

@@ -1,43 +1,47 @@
 import { BigNumber, ethers } from 'ethers';
-import { IStakingClient, Portfolio, PurchaseAsset, PurchaseQuote, StakerConfig, TrancheSnapshot } from '../../types';
+import { IStakingClient, Portfolio, StakerConfig, TrancheSnapshot } from '../../types';
 import { ChainID, EvmChainID, PublicKey as WirePubKey } from '@wireio/core';
 import { EthereumContractService } from './contract';
-import { preLaunchReceipt, WithdrawRequestedEvent, WithdrawResult } from './types';
+import { preLaunchReceipt } from './types';
 import { DepositClient } from './clients/deposit.client';
 import { StakeClient } from './clients/stake.client';
 import { PretokenClient } from './clients/pretoken.client';
-import { buildEthereumTrancheSnapshot, sendOPPFinalize } from './utils';
+import { buildEthereumTrancheSnapshot } from './utils';
+import { LiqClient } from './clients/liq.client';
+
 
 
 
 export class EthereumStakingClient implements IStakingClient {
-    public readonly pubKey: WirePubKey;
+    public readonly pubKey?: WirePubKey;
     private readonly provider: ethers.providers.Web3Provider;
     private readonly signer: ethers.Signer;
     private readonly contractService: EthereumContractService;
 
     private depositClient: DepositClient;
-    private stakeClient: StakeClient;
+    private liqClient: LiqClient;
     private pretokenClient: PretokenClient;
+    private stakeClient: StakeClient;
 
 
     get contract() { return this.contractService.contract; }
     get network() { return this.config.network; }
 
-
     constructor(private config: StakerConfig) {
         try {
             this.provider = config.provider as ethers.providers.Web3Provider;
             this.signer = this.provider.getSigner();
-            this.pubKey = config.pubKey as WirePubKey;
+            this.pubKey = config.pubKey;
             
             this.contractService = new EthereumContractService({
                 provider: this.provider,
                 signer: this.signer,
             });
+            
             this.depositClient = new DepositClient(this.contractService);
-            this.stakeClient = new StakeClient(this.contractService);
+            this.liqClient = new LiqClient(this.contractService);
             this.pretokenClient = new PretokenClient(this.contractService);
+            this.stakeClient = new StakeClient(this.contractService);
         }   
         catch (error) {
             // console.error('Error initializing EthereumStakingClient:', error);
@@ -45,6 +49,8 @@ export class EthereumStakingClient implements IStakingClient {
         }     
     }
 
+
+
     // ---------------------------------------------------------------------
     // Public IStakingClient Interface Methods
     // ---------------------------------------------------------------------
@@ -65,20 +71,21 @@ export class EthereumStakingClient implements IStakingClient {
     }
 
 
+
     /**
-     * Withdraw native ETH from the liqETH protocol via DepositManager.
+     * 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).
-     *                Keep this as a bigint / string in the caller; avoid JS floats.
      * @returns transaction hash
      */
     async withdraw(amount: bigint): Promise<string> {
-        // const amountWei = BigNumber.from(amount);
+        const address = await this.signer.getAddress();
+        const amountWei = BigNumber.from(amount);
         // const chainId = this.network?.chainId ?? (await this.provider.getNetwork()).chainId;
         // const result = await this.depositClient.requestWithdraw(amountWei, this.signer, chainId);
-        // return result.txHash;
-        throw new Error("Method not yet implemented.");
-    }
 
+        const result = await this.liqClient.safeBurn(address, amountWei)
+        return result.txHash;
+    }
 
 
     /**
@@ -159,7 +166,7 @@ export class EthereumStakingClient implements IStakingClient {
         }
 
 
-        let result = await this.pretokenClient.purchaseWarrantsWithLiqETH(amountBigNum, buyer);
+        let result = await this.pretokenClient.purchasePretokensWithLiqETH(amountBigNum, buyer);
 
         return result && result.txHash ? result.txHash : "Error - no resulting txHash";
     }
@@ -199,14 +206,6 @@ export class EthereumStakingClient implements IStakingClient {
         }
     }
 
-    
-    
-    // TODO
-    getBuyQuote(amount: bigint, purchaseAsset: PurchaseAsset): Promise<PurchaseQuote> {
-        throw new Error("Method not yet implemented.");
-    }
-
-    
     /**
      * Resolve the user's ETH + liqETH balances.
      *
@@ -286,12 +285,12 @@ export class EthereumStakingClient implements IStakingClient {
         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.Warrant.trancheNumber(blockTag),
-            this.contract.Warrant.trancheSupply(blockTag),
-            this.contract.Warrant.tranchePriceUsd(blockTag),
-            this.contract.Warrant.totalSupply(blockTag),
-            this.contract.Warrant.supplyGrowthBps(blockTag),
-            this.contract.Warrant.priceGrowthBps(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(),
         ]);
@@ -303,33 +302,11 @@ export class EthereumStakingClient implements IStakingClient {
 
         // fetch price and timestamp from aggregator
         const [ roundId, answer, startedAt, updatedAt, answeredInRound ] = await this.contract.Aggregator.latestRoundData();
-        console.log('mockaggregator answer', answer.toString())
         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); 
-        
-        console.log('options for building eth tranche snapshot', {
-            chainID,
-            totalSharesBn, 
-            indexBn, 
-            trancheNumberBn,
-            currentTrancheSupply: currentTrancheSupply.toString(), 
-            tranchePriceWadBn, 
-            totalTrancheSupply: totalTrancheSupply.toString(),
-            initialTrancheSupply: initialTrancheSupply.toString(),
-            supplyGrowthBps,
-            priceGrowthBps,
-            minPriceUsd, 
-            maxPriceUsd,
-
-            ethPriceUsd,
-            nativePriceTimestamp,
-            ladderWindowBefore: windowBefore,
-            ladderWindowAfter: windowAfter,
-        })
 
         return buildEthereumTrancheSnapshot({
             chainID,
@@ -400,7 +377,7 @@ export class EthereumStakingClient implements IStakingClient {
                 //update answer with current timestamp
                 const tx = await aggregator.updateAnswer(currentEthPrice);
                 const txreceipt = await tx.wait(1);
-                console.log('MockAggregator answer updated - receipt:', txreceipt)
+                // console.log('MockAggregator answer updated - receipt:', txreceipt)
             } catch (err: any) {
                 console.error('MockAggregator updateAnswer failed', err?.message || err);
             }

package/src/networks/ethereum/types.ts

@@ -5,14 +5,9 @@ export const CONTRACT_NAMES = [
     'Accounting',
     'DepositManager',
     'LiqEth',
-    // 'LiqEthBurn',
-    // 'LiqEthMint',
-    // 'RewardsERC20',
     'StakingModule',
-    // 'ValidatorBalance',
     'WithdrawalQueue',
     'WithdrawalVault',
-    // 'Yield',
 
     //Outpost contracts
     'Depositor',
@@ -22,7 +17,7 @@ export const CONTRACT_NAMES = [
     'OPP',
     'OPPCommon',
     'OPPInbound',
-    'Warrant',
+    'Pretoken',
     'Aggregator',
     'EthUsdPriceConsumer',
 
@@ -89,6 +84,12 @@ export interface WithdrawnStakeResult extends Result {
 
 }
 
+export interface SharesBurnedEvent {
+    from: string;
+    shares: BigNumber;
+    tokenValue: BigNumber;
+}
+
 export interface preLaunchReceipt {
     tokenId: bigint;
     receipt: {

package/src/networks/ethereum/utils.ts

@@ -138,7 +138,7 @@ function shrinkOnce(value: bigint, growthBps: number): bigint {
  */
 function getTrancheSize(startSupply: bigint, supplyGrowthBps: number, trancheNumber: number): bigint {
     let supply = startSupply;
-    for (let i = 1; i < trancheNumber; i++) {
+    for (let i = 0; i < trancheNumber; i++) {
         supply = (supply * (BPS + BigInt(supplyGrowthBps)) + BPS / BigInt(2)) / BPS;
     }
     return supply;
@@ -172,12 +172,8 @@ export function buildEthereumTrancheLadder(options: {
         windowAfter = 5,
     } = options;
 
-    const startId = Math.max(1, currentTranche - windowBefore);
+    const startId = Math.max(0, currentTranche - windowBefore);
     const endId = currentTranche + windowAfter;
-
-    console.error('loading eth tranche ladder - ', currentTranche, currentTrancheSupply);
-    console.log('startId', startId)
-    
     
     //calculate total tranche size (e.g. 60,600 on tranche 2)
     const currentTrancheSize = getTrancheSize(initialTrancheSupply, supplyGrowthBps, currentTranche);
@@ -300,13 +296,11 @@ export async function buildEthereumTrancheSnapshot(options: {
         totalShares,
         currentTranche,
         currentPriceUsd,
-        minPriceUsd,
-        maxPriceUsd,
         supplyGrowthBps,
         priceGrowthBps,
         currentTrancheSupply,
         initialTrancheSupply,
-        totalWarrantsSold: totalTrancheSupply,
+        totalPretokensSold: totalTrancheSupply,
         nativePriceUsd: ethPriceUsd,
         nativePriceTimestamp,
         ladder,

package/src/networks/solana/clients/token.client.ts

@@ -20,7 +20,6 @@ import {
 import { derivePriceHistoryPda } from '../constants';
 import type { } from '../types';
 import { ChainID, SolChainID } from '@wireio/core';
-import { PurchaseAsset, PurchaseQuote, TrancheSnapshot } from '../../../types';
 
 export class TokenClient {
     private readonly program: Program<LiqsolCore>;