@wireio/stake 0.1.2 → 0.2.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": "AY6sWK1dt23rkAiqiETwaEcbjhJCwb5cNC6hVWadZLFf",
+  "address": "HEAKvfg2X7K4zbGDiAbfuu5abxQyk1HbKVgskZZFXrUx",
   "metadata": {
     "name": "liqsolToken",
     "version": "0.1.0",

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": "5Nf6jL5B2qkMbnLoN3RTT1sKcBKrrsRnovTBDZXcQnfo",
+  "address": "BcMW7wN54FexYaB7Xujvag5uUQ1WoDoGbzVg1VEXPBhV",
   "metadata": {
     "name": "validatorLeaderboard",
     "version": "0.1.0",

package/src/index.ts

@@ -16,3 +16,4 @@ export * from './networks/solana/utils';
 export * from './networks/solana/clients/deposit.client';
 export * from './networks/solana/clients/distribution.client';
 export * from './networks/solana/clients/leaderboard.client';
+export * from './networks/solana/clients/outpost.client';

package/src/networks/ethereum/ethereum.ts

@@ -1,12 +1,9 @@
-// src/networks/ethereum/ethereum.ts
-
 import { BigNumber, BigNumberish, ethers } from 'ethers';
 import { IStakingClient, Portfolio, StakerConfig } from '../../staker/types';
 import { PublicKey as WirePubKey } from '@wireio/core';
 import { ERC20Abi, EthereumContractService } from './contract'; // TODO replace with staking contract ABI
 import { DepositEvent, DepositResult } from './types';
 
-// TODO extend to implement ISTAKINGCLIENT
 export class EthereumStakingClient implements IStakingClient {
     public readonly pubKey: WirePubKey;
     private readonly provider: ethers.providers.Web3Provider;
@@ -34,7 +31,7 @@ export class EthereumStakingClient implements IStakingClient {
     }
 
     // ---------------------------------------------------------------------
-    // Public IStakingClient.deposit
+    // Public IStakingClient Interface Methods
     // ---------------------------------------------------------------------
 
     /**
@@ -49,10 +46,81 @@ export class EthereumStakingClient implements IStakingClient {
             : BigNumber.from(amount);
 
         const result = await this.performDeposit(amountWei);
-        // For now, IStakingClient contract is: just return tx hash.
-        // If/when you extend the interface, you can surface more here.
         return result.txHash;
     }
+
+    // TODO
+    async withdraw(): Promise<string> {
+        throw new Error("Method not yet implemented.");
+    }
+
+    // TODO
+    async stake(): Promise<string> {
+        throw new Error("Method not yet implemented.");
+    }
+
+    // TODO
+    async unstake(): Promise<string> {
+        throw new Error("Method not yet implemented.");
+    }
+
+    /**
+     * Resolve the user's ETH + liqETH balances.
+     *
+     * native  = ETH in wallet
+     * actual  = liqETH token balance (ERC-20)
+     * tracked = liqETH tracked balance (protocol/accounting view)
+     */
+    async getPortfolio(): Promise<Portfolio> {
+        const walletAddress = await this.signer.getAddress();
+        // console.log('getPortfolio() wallet address', walletAddress)
+        // 1) Native ETH balance
+        const nativeBalance = await this.provider.getBalance(walletAddress);
+        // console.log('nativeBalance', nativeBalance);
+        const nativeDecimals = this.network?.nativeCurrency?.decimals ?? 18;
+        const nativeSymbol = this.network?.nativeCurrency?.symbol ?? 'ETH';
+
+        
+
+        // 2) liqETH ERC-20 balance (actual)
+        const liqBalance: ethers.BigNumber = await this.contract.LiqEth.balanceOf(walletAddress);
+        // console.log('liqBalance', liqBalance);
+        
+        const liqDecimals = this.network?.nativeCurrency?.decimals ?? 18;
+        const liqSymbol = 'Liq' + (this.network?.nativeCurrency?.symbol ?? 'ETH');
+
+        const portfolio: Portfolio = {
+            native: {
+                amount: nativeBalance.toBigInt(),
+                decimals: nativeDecimals,
+                symbol: nativeSymbol,
+            },
+            liq: {
+                amount: liqBalance.toBigInt(),
+                decimals: liqDecimals,
+                symbol: liqSymbol,
+            },
+            tracked: {
+                amount: liqBalance.toBigInt(),
+                decimals: liqDecimals,
+                symbol: liqSymbol,
+            },
+            staked: { // TODO fetch staked balance from outpost
+                amount: BigNumber.from(0).toBigInt(),
+                decimals: liqDecimals,
+                symbol: liqSymbol,
+            },
+            chainID: this.network.chainId
+        }
+        // console.log('ETH PORTFOLIO', portfolio);
+        return portfolio;
+    }
+
+    
+    // ---------------------------------------------------------------------
+    // Internal ETH Staking client helper functions
+    // ---------------------------------------------------------------------
+
     /**
      * Simulate a deposit via callStatic.
      *
@@ -111,50 +179,5 @@ export class EthereumStakingClient implements IStakingClient {
         };
     }
 
-    /**
-     * Resolve the user's ETH + liqETH balances.
-     *
-     * native  = ETH in wallet
-     * actual  = liqETH token balance (ERC-20)
-     * tracked = liqETH tracked balance (protocol/accounting view)
-     */
-    async getPortfolio(): Promise<Portfolio> {
-        const walletAddress = await this.signer.getAddress();
-
-        // 1) Native ETH balance
-        const nativeBalance = await this.provider.getBalance(walletAddress);
-        // console.log('nativeBalance', nativeBalance);
-        const nativeDecimals = this.network?.nativeCurrency?.decimals ?? 18;
-        const nativeSymbol = this.network?.nativeCurrency?.symbol ?? 'ETH';
-
-        // 2) liqETH ERC-20 balance (actual)
-        const liqBalance: ethers.BigNumber = await this.contract.LiqEth.balanceOf(walletAddress);
-        // console.log('liqBalance', liqBalance);
-        
-        const liqDecimals = this.network?.nativeCurrency?.decimals ?? 18;
-        const liqSymbol = 'Liq' + (this.network?.nativeCurrency?.symbol ?? 'ETH');
-
-        const portfolio: Portfolio = {
-            native: {
-                amount: nativeBalance,
-                decimals: nativeDecimals,
-                symbol: nativeSymbol,
-            },
-            liq: {
-                amount: liqBalance,
-                decimals: liqDecimals,
-                symbol: liqSymbol,
-            },
-            staked: { // TODO fetch staked balance from outpost
-                amount: BigNumber.from(0),
-                decimals: liqDecimals,
-                symbol: liqSymbol,
-            },
-            chainID: this.network.chainId
-        }
-        // console.log('ETH PORTFOLIO', portfolio);
-        return portfolio;
-    }
-
     // TODO: implement withdraw, claimRewards, etc.
 }

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

@@ -34,22 +34,19 @@ import {
     derivePayoutStatePda,
     deriveEphemeralStakeAddress,
 } from '../constants';
+import { WalletLike } from '../types';
 
 export class DepositClient {
     private program: Program<LiqsolCore>;
 
+    get wallet(): WalletLike { return this.provider.wallet; }
+
     constructor(private provider: AnchorProvider) {
         const svc = new SolanaProgramService(provider);
         this.program = svc.getProgram('liqsolCore');
     }
 
-    async buildDepositTx(
-        user: PublicKey,
-        lamports: number
-    ): Promise<{ transaction: Transaction; ephemeralStake: PublicKey }> {
-
-        const program = this.program;
-
+    async buildDepositTx(amount: bigint, user = this.wallet.publicKey): Promise<Transaction> {
         // -------------------------------------------------------------
         // PDAs
         // -------------------------------------------------------------
@@ -91,8 +88,8 @@ export class DepositClient {
         // -------------------------------------------------------------
         // BUILD IX (MUST MATCH IDL)
         // -------------------------------------------------------------
-        const ix: TransactionInstruction = await program.methods
-            .deposit(new BN(lamports), seed)
+        const ix: TransactionInstruction = await this.program.methods
+            .deposit(new BN(amount.toString()), seed)
             .accounts({
                 user,
                 depositAuthority,
@@ -125,7 +122,6 @@ export class DepositClient {
             })
             .instruction();
 
-        const tx = new Transaction().add(ix);
-        return { transaction: tx, ephemeralStake };
+        return new Transaction().add(ix);
     }
 }

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

@@ -42,9 +42,7 @@ export class DistributionClient {
         this.program = svc.getProgram('liqsolCore');
     }
 
-    get connection() {
-        return this.provider.connection;
-    }
+    get connection() { return this.provider.connection; }
 
     /**
      * Fetch the global distribution state account.