@reflectmoney/junior 1.1.1 → 1.1.3

package/dist/classes/JuniorTranche.d.ts

@@ -98,7 +98,7 @@ export declare class JuniorTranche {
      * returning a new instruction with the extra accounts.
      */
     private appendRemainingAccounts;
-    deposit(signer: TransactionSigner, amount: number | bigint, mint: Address, liquidityPoolId: number, minLpTokens?: number | bigint | null): Promise<import("../generated").DepositInstruction<Address<"JrXLmS6aYJNJDVxdAfjNJE5wikT8ubf3TA9iL2JA9Av">, string, string, "JrXLmS6aYJNJDVxdAfjNJE5wikT8ubf3TA9iL2JA9Av", string, string, string, string, string, string, string, any, string, string, string, string, "JrXLmS6aYJNJDVxdAfjNJE5wikT8ubf3TA9iL2JA9Av", []>>;
+    deposit(signer: TransactionSigner, amount: number | bigint, mint: Address, liquidityPoolId: number, minLpTokens?: number | bigint | null): Promise<import("../generated").DepositInstruction<Address<"JrXLmS6aYJNJDVxdAfjNJE5wikT8ubf3TA9iL2JA9Av">, string, string, "JrXLmS6aYJNJDVxdAfjNJE5wikT8ubf3TA9iL2JA9Av", string, string, string, string, string, string, string, string, string, string, string, string, "JrXLmS6aYJNJDVxdAfjNJE5wikT8ubf3TA9iL2JA9Av", []>>;
     requestWithdrawal(signer: TransactionSigner, liquidityPoolId: number, amount: number | bigint): Promise<import("../generated").RequestWithdrawalInstruction<Address<"JrXLmS6aYJNJDVxdAfjNJE5wikT8ubf3TA9iL2JA9Av">, string, string, "JrXLmS6aYJNJDVxdAfjNJE5wikT8ubf3TA9iL2JA9Av", string, string, string, string, string, string, string, string, string, "JrXLmS6aYJNJDVxdAfjNJE5wikT8ubf3TA9iL2JA9Av", []>>;
     withdraw(signer: TransactionSigner, liquidityPoolId: number, cooldownId: number | bigint): Promise<import("../generated").WithdrawInstruction<Address<"JrXLmS6aYJNJDVxdAfjNJE5wikT8ubf3TA9iL2JA9Av">, string, string, string, string, string, string, string, string, string, string, string, "JrXLmS6aYJNJDVxdAfjNJE5wikT8ubf3TA9iL2JA9Av", []>>;
     swap(signer: TransactionSigner, liquidityPoolId: number, tokenFromMint: Address, tokenToMint: Address, amountIn: number | bigint, minOut?: number | bigint | null): Promise<import("../generated").SwapInstruction<Address<"JrXLmS6aYJNJDVxdAfjNJE5wikT8ubf3TA9iL2JA9Av">, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, "JrXLmS6aYJNJDVxdAfjNJE5wikT8ubf3TA9iL2JA9Av", []>>;

package/dist/classes/JuniorTranche.js

@@ -5,6 +5,20 @@ const token_1 = require("@solana-program/token");
 const kit_1 = require("@solana/kit");
 const generated_1 = require("../generated");
 const PdaClient_1 = require("./PdaClient");
+/**
+ * Resolve the on-chain oracle account address from an `Oracle` discriminated
+ * union. Codama emits the two variants with different field shapes:
+ *   - Pyth    → { __kind: "Pyth"; account: Address; feedId: [u8;32] }
+ *   - Doppler → { __kind: "Doppler"; fields: readonly [Address] }
+ *
+ * Old code did `(oracle as any).fields[0]` uniformly, which returns `undefined`
+ * for the Pyth variant (no `.fields` — the address lives at `.account`). Every
+ * deposit / slash / swap on a Pyth-priced asset was therefore passing an
+ * undefined oracle account to the program.
+ */
+function oracleAccountAddress(oracle) {
+    return oracle.__kind === "Pyth" ? oracle.account : oracle.fields[0];
+}
 class JuniorTranche {
     connection;
     settings;
@@ -249,7 +263,7 @@ class JuniorTranche {
         const assetEntry = assets.find((a) => a.data.mint === stablecoinMint);
         if (!assetEntry)
             throw new Error(`Asset not found for stablecoin mint ${stablecoinMint}`);
-        const oracleAddress = assetEntry.data.oracle.fields[0];
+        const oracleAddress = oracleAccountAddress(assetEntry.data.oracle);
         const [liquidityPoolTokenAccount] = await (0, token_1.findAssociatedTokenPda)({
             mint: stablecoinMint,
             owner: liquidityPoolAddress,
@@ -312,7 +326,7 @@ class JuniorTranche {
                 owner: liquidityPoolAddress,
                 tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
             });
-            const oracleAddress = asset.data.oracle.fields[0];
+            const oracleAddress = oracleAccountAddress(asset.data.oracle);
             remaining.push({ address: poolAta, role: kit_1.AccountRole.READONLY }, { address: asset.address, role: kit_1.AccountRole.READONLY }, { address: oracleAddress, role: kit_1.AccountRole.READONLY }, { address: asset.data.mint, role: kit_1.AccountRole.READONLY });
         }
         return remaining;
@@ -364,7 +378,7 @@ class JuniorTranche {
         const assetEntry = assets.find((a) => a.data.mint === mint);
         if (!assetEntry)
             throw new Error(`Asset not found for mint ${mint}`);
-        const oracleAddress = assetEntry.data.oracle.fields[0];
+        const oracleAddress = oracleAccountAddress(assetEntry.data.oracle);
         const lpEntry = this.liquidityPools.find((lp) => lp.data.index === liquidityPoolId);
         if (!lpEntry)
             throw new Error(`Liquidity pool ${liquidityPoolId} not found`);
@@ -444,10 +458,8 @@ class JuniorTranche {
         const tokenToEntry = assets.find((a) => a.data.mint === tokenToMint);
         if (!tokenToEntry)
             throw new Error(`Asset not found for mint ${tokenToMint}`);
-        const tokenFromOracle = tokenFromEntry.data.oracle
-            .fields[0];
-        const tokenToOracle = tokenToEntry.data.oracle
-            .fields[0];
+        const tokenFromOracle = oracleAccountAddress(tokenFromEntry.data.oracle);
+        const tokenToOracle = oracleAccountAddress(tokenToEntry.data.oracle);
         const lpEntry = this.liquidityPools.find((lp) => lp.data.index === liquidityPoolId);
         if (!lpEntry)
             throw new Error(`Liquidity pool ${liquidityPoolId} not found`);
@@ -564,17 +576,25 @@ class JuniorTranche {
      */
     async fetchOraclePrice(mintOrOracle) {
         // Resolve oracle address — try cached assets first, fall back to treating
-        // the input as a direct oracle address.
+        // the input as a direct oracle address. `Oracle` is a discriminated union
+        // (`Pyth` uses `account`, `Doppler` uses `fields[0]`), so unwrap per-variant.
         let oracleAddress = mintOrOracle;
         const assets = await this.getAssets();
         const assetEntry = assets.find((a) => a.data.mint === mintOrOracle);
         if (assetEntry) {
-            oracleAddress = assetEntry.data.oracle.fields[0];
+            oracleAddress = oracleAccountAddress(assetEntry.data.oracle);
         }
         const account = await (0, kit_1.fetchEncodedAccount)(this.connection, oracleAddress);
         if (!account.exists) {
             throw new Error(`Oracle account not found: ${oracleAddress}`);
         }
+        // NOTE: only Pyth accounts are decodable by `deserializePythPrice`. If the
+        // asset's oracle is Doppler, the caller must fetch the raw account and use
+        // the doppler oracle SDK's `PriceDataSerializer` instead.
+        if (assetEntry &&
+            assetEntry.data.oracle.__kind !== "Pyth") {
+            throw new Error(`fetchOraclePrice only decodes Pyth oracles; asset ${assetEntry.data.mint} uses ${assetEntry.data.oracle.__kind}`);
+        }
         return JuniorTranche.deserializePythPrice(new Uint8Array(account.data));
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reflectmoney/junior",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "TypeScript SDK for the Reflect Liquid Protection (RLP) program, powering junior tranche of Reflect's two-tranche protection system.",
   "type": "commonjs",
   "author": "stablecoinjesus @ Palindrome Engineering",