@reflectmoney/oracle.ts 3.2.4 → 4.0.0

package/dist/index.d.ts

@@ -1,116 +1,60 @@
-import { Connection, PublicKey, Transaction, Keypair } from '@solana/web3.js';
-import { Buffer } from 'buffer';
-export declare const DOPPLER_PROGRAM_ID: PublicKey;
-export declare const ADMIN_PUBKEY: PublicKey;
-/**
- * Generic Oracle data structure matching Rust implementation
- */
+import { type Address, type KeyPairSigner, type Blockhash, type Rpc, type SolanaRpcApi } from '@solana/kit';
+export declare const DOPPLER_PROGRAM_ID: Address;
+export declare const ADMIN_PUBKEY: Address;
 export interface Oracle<T> {
     slot: bigint;
     payload: T;
 }
-/**
- * Price data payload with precision information
- * Matches the Rust PriceData struct
- */
 export interface PriceData {
     price: bigint;
     precision: number;
 }
-/**
- * Serializer interface for custom payload types
- */
 export interface PayloadSerializer<T> {
-    serialize(payload: T): Buffer;
-    deserialize(buffer: Buffer): T;
+    serialize(payload: T): Uint8Array;
+    deserialize(buffer: Uint8Array): T;
     size(): number;
 }
-/**
- * Helper function to create a PriceData payload buffer from price and precision
- */
-export declare function createPriceDataPayload(price: bigint, precision: number): Buffer;
-/**
- * Helper function to read PriceData from a buffer payload
- */
-export declare function readPriceDataFromPayload(payload: Buffer): PriceData;
-/**
- * Built-in serializer for PriceData payloads
- * Structure: 8 bytes for price, 1 byte for precision (total 9 bytes)
- */
+export declare function createPriceDataPayload(price: bigint, precision: number): Uint8Array;
+export declare function readPriceDataFromPayload(payload: Uint8Array): PriceData;
 export declare class PriceDataSerializer implements PayloadSerializer<PriceData> {
-    serialize(payload: PriceData): Buffer;
-    deserialize(buffer: Buffer): PriceData;
+    serialize(payload: PriceData): Uint8Array;
+    deserialize(buffer: Uint8Array): PriceData;
     size(): number;
 }
-/**
- * Transaction builder for Doppler oracle updates
- */
 export declare class TransactionBuilder {
     private admin;
     private oracleUpdateInstructions;
     private unitPrice?;
     private computeUnits;
     private loadedAccountDataSize;
-    constructor(admin: Keypair);
-    /**
-     * Add an oracle update instruction to the transaction
-     */
-    addOracleUpdate<T>(oraclePubkey: PublicKey, payload: T, serializer: PayloadSerializer<T>): this;
-    /**
-     * Set the compute unit price in micro-lamports
-     */
+    constructor(admin: KeyPairSigner);
+    addOracleUpdate<T>(oracleAddress: Address, payload: T, serializer: PayloadSerializer<T>): this;
     withUnitPrice(microLamports: bigint): this;
-    /**
-     * Build the final transaction
-     */
-    build(recentBlockhash: string): Transaction;
+    build(latestBlockhash: Readonly<{
+        blockhash: Blockhash;
+        lastValidBlockHeight: bigint;
+    }>): Promise<import("@solana/kit").FullySignedTransaction & import("@solana/kit").TransactionWithinSizeLimit & Readonly<{
+        messageBytes: import("@solana/kit").TransactionMessageBytes;
+        signatures: import("@solana/kit").SignaturesMap;
+    }> & import("@solana/kit").TransactionWithLifetime & import("@solana/kit").TransactionWithBlockhashLifetime>;
     private createUpdateInstruction;
 }
-/**
- * Main Doppler class for interacting with oracle accounts
- */
 export declare class Doppler {
-    private connection;
     private admin;
-    constructor(connection: Connection, admin: Keypair);
-    /**
-     * Create a new transaction builder
-     */
+    private rpc;
+    private rpcSubscriptions;
+    constructor(rpcUrl: string, rpcSubscriptionsUrl: string, admin: KeyPairSigner);
     createTransactionBuilder(): TransactionBuilder;
-    /**
-     * Fetch oracle account data and deserialize it
-     */
-    fetchOracle<T>(oraclePubkey: PublicKey, serializer: PayloadSerializer<T>): Promise<Oracle<T> | null>;
-    /**
-     * Deserialize oracle data from a buffer
-     */
-    deserializeOracle<T>(data: Buffer, serializer: PayloadSerializer<T>): Oracle<T>;
-    /**
-     * Create an oracle account from a keypair
-     */
-    createOracleAccount<T>(oracleKeypair: Keypair, serializer: PayloadSerializer<T>): Promise<PublicKey>;
-    /**
-     * Create an oracle account with a seed
-     */
-    createOracleAccountWithSeed<T>(seed: string, serializer: PayloadSerializer<T>): Promise<PublicKey>;
-    /**
-     * Update a single oracle account
-     */
-    updateOracle<T>(oraclePubkey: PublicKey, payload: T, serializer: PayloadSerializer<T>, unitPrice?: bigint): Promise<string>;
-    /**
-     * Update multiple oracle accounts in a single transaction
-     */
+    fetchOracle<T>(oracleAddress: Address, serializer: PayloadSerializer<T>): Promise<Oracle<T> | null>;
+    deserializeOracle<T>(data: Uint8Array, serializer: PayloadSerializer<T>): Oracle<T>;
+    createOracleAccount<T>(oracleKeypair: KeyPairSigner, serializer: PayloadSerializer<T>): Promise<Address>;
+    createOracleAccountWithSeed<T>(seed: string, serializer: PayloadSerializer<T>): Promise<Address>;
+    updateOracle<T>(oracleAddress: Address, payload: T, serializer: PayloadSerializer<T>, unitPrice?: bigint): Promise<string>;
     updateMultipleOracles<T>(updates: Array<{
-        oraclePubkey: PublicKey;
+        oracleAddress: Address;
         payload: T;
         serializer: PayloadSerializer<T>;
     }>, unitPrice?: bigint): Promise<string>;
-    /**
-     * Get the admin keypair
-     */
-    getAdmin(): Keypair;
-    /**
-     * Get the connection
-     */
-    getConnection(): Connection;
+    getAdmin(): KeyPairSigner;
+    getRpc(): Rpc<SolanaRpcApi>;
 }

package/dist/index.js

@@ -12,14 +12,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Doppler = exports.TransactionBuilder = exports.PriceDataSerializer = exports.ADMIN_PUBKEY = exports.DOPPLER_PROGRAM_ID = void 0;
 exports.createPriceDataPayload = createPriceDataPayload;
 exports.readPriceDataFromPayload = readPriceDataFromPayload;
-const web3_js_1 = require("@solana/web3.js");
-const buffer_1 = require("buffer");
+const kit_1 = require("@solana/kit");
 const compute_budget_1 = require("@solana-program/compute-budget");
-// Program ID: PRicevBH6BaeaE8qmrxrwGBZ5hSZ9vjBNue5Ygot1ML
-exports.DOPPLER_PROGRAM_ID = new web3_js_1.PublicKey('PRicevBH6BaeaE8qmrxrwGBZ5hSZ9vjBNue5Ygot1ML');
-// Admin public key: pRiCEzwgkSi7KTsQHdyfuRbPEuCFoK9sA5QVn2hvABV
-exports.ADMIN_PUBKEY = new web3_js_1.PublicKey('pRiCEzwgkSi7KTsQHdyfuRbPEuCFoK9sA5QVn2hvABV');
-// Constants for compute unit calculations
+const system_1 = require("@solana-program/system");
+const sysvars_1 = require("@solana/sysvars");
+exports.DOPPLER_PROGRAM_ID = (0, kit_1.address)('PRicevBH6BaeaE8qmrxrwGBZ5hSZ9vjBNue5Ygot1ML');
+exports.ADMIN_PUBKEY = (0, kit_1.address)('pRiCEzwgkSi7KTsQHdyfuRbPEuCFoK9sA5QVn2hvABV');
 const SEQUENCE_CHECK_CU = 5;
 const ADMIN_VERIFICATION_CU = 6;
 const PAYLOAD_WRITE_CU = 8;
@@ -30,53 +28,34 @@ const COMPUTE_BUDGET_DATA_LIMIT_SIZE = 5;
 const COMPUTE_BUDGET_PROGRAM_SIZE = 22;
 const ORACLE_PROGRAM_SIZE = 36;
 const READ_CLOCK_CU = 11;
-/**
- * Helper function to create a PriceData payload buffer from price and precision
- */
 function createPriceDataPayload(price, precision) {
-    const buf = buffer_1.Buffer.alloc(9);
-    buf.writeBigUInt64LE(price, 0);
-    buf.writeUInt8(precision, 8);
-    return buf;
+    const buf = new ArrayBuffer(9);
+    const view = new DataView(buf);
+    view.setBigUint64(0, price, true);
+    view.setUint8(8, precision);
+    return new Uint8Array(buf);
 }
-/**
- * Helper function to read PriceData from a buffer payload
- */
 function readPriceDataFromPayload(payload) {
     if (payload.length < 9) {
         throw new Error('Payload must be at least 9 bytes');
     }
-    const price = payload.readBigUInt64LE(0);
-    const precision = payload.readUInt8(8);
+    const view = new DataView(payload.buffer, payload.byteOffset, payload.byteLength);
+    const price = view.getBigUint64(0, true);
+    const precision = view.getUint8(8);
     return { price, precision };
 }
-/**
- * Built-in serializer for PriceData payloads
- * Structure: 8 bytes for price, 1 byte for precision (total 9 bytes)
- */
 class PriceDataSerializer {
     serialize(payload) {
-        const buf = buffer_1.Buffer.alloc(9);
-        buf.writeBigUInt64LE(payload.price, 0);
-        buf.writeUInt8(payload.precision, 8);
-        return buf;
+        return createPriceDataPayload(payload.price, payload.precision);
     }
     deserialize(buffer) {
-        if (buffer.length < 9) {
-            throw new Error('Buffer must be at least 9 bytes');
-        }
-        const price = buffer.readBigUInt64LE(0);
-        const precision = buffer.readUInt8(8);
-        return { price, precision };
+        return readPriceDataFromPayload(buffer);
     }
     size() {
         return 9;
     }
 }
 exports.PriceDataSerializer = PriceDataSerializer;
-/**
- * Transaction builder for Doppler oracle updates
- */
 class TransactionBuilder {
     constructor(admin) {
         this.admin = admin;
@@ -88,115 +67,91 @@ class TransactionBuilder {
             COMPUTE_BUDGET_DATA_LIMIT_SIZE +
             2;
     }
-    /**
-     * Add an oracle update instruction to the transaction
-     */
-    addOracleUpdate(oraclePubkey, payload, serializer) {
-        const instruction = this.createUpdateInstruction(oraclePubkey, payload, serializer);
+    addOracleUpdate(oracleAddress, payload, serializer) {
+        const instruction = this.createUpdateInstruction(oracleAddress, payload, serializer);
         const payloadSize = serializer.size();
-        const oracleSize = 8 + payloadSize; // slot + payload
+        const oracleSize = 8 + payloadSize;
         this.computeUnits +=
             SEQUENCE_CHECK_CU +
                 ADMIN_VERIFICATION_CU +
                 PAYLOAD_WRITE_CU +
                 Math.floor(oracleSize / 4) +
                 READ_CLOCK_CU;
-        this.loadedAccountDataSize += oracleSize * 4;
+        this.loadedAccountDataSize += oracleSize * 200;
         this.oracleUpdateInstructions.push(instruction);
         return this;
     }
-    /**
-     * Set the compute unit price in micro-lamports
-     */
     withUnitPrice(microLamports) {
         this.unitPrice = microLamports;
         return this;
     }
-    /**
-     * Build the final transaction
-     */
-    build(recentBlockhash) {
-        const instructions = [];
-        let loadedAccountDataSize = this.loadedAccountDataSize;
-        let computeUnits = this.computeUnits;
-        if (this.unitPrice !== undefined) {
-            instructions.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                microLamports: this.unitPrice,
+    build(latestBlockhash) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const instructions = [];
+            let loadedAccountDataSize = this.loadedAccountDataSize;
+            let computeUnits = this.computeUnits;
+            if (this.unitPrice !== undefined) {
+                instructions.push((0, compute_budget_1.getSetComputeUnitPriceInstruction)({
+                    microLamports: this.unitPrice,
+                }));
+                loadedAccountDataSize += COMPUTE_BUDGET_UNIT_PRICE_SIZE;
+                computeUnits += COMPUTE_BUDGET_IX_CU;
+            }
+            instructions.push((0, compute_budget_1.getSetLoadedAccountsDataSizeLimitInstruction)({
+                accountDataSizeLimit: loadedAccountDataSize * 2,
             }));
-            loadedAccountDataSize += COMPUTE_BUDGET_UNIT_PRICE_SIZE;
-            computeUnits += COMPUTE_BUDGET_IX_CU;
-        }
-        const loadedAccountsDataSizeLimitInstruction = (0, compute_budget_1.getSetLoadedAccountsDataSizeLimitInstruction)({
-            accountDataSizeLimit: loadedAccountDataSize * 2
-        });
-        instructions.push(new web3_js_1.TransactionInstruction({
-            keys: [],
-            programId: new web3_js_1.PublicKey(loadedAccountsDataSizeLimitInstruction.programAddress.toString()),
-            data: buffer_1.Buffer.from(loadedAccountsDataSizeLimitInstruction.data),
-        }));
-        instructions.push(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
-            units: computeUnits,
-        }));
-        instructions.push(...this.oracleUpdateInstructions);
-        const transaction = new web3_js_1.Transaction({
-            feePayer: this.admin.publicKey,
-            recentBlockhash,
+            instructions.push((0, compute_budget_1.getSetComputeUnitLimitInstruction)({
+                units: computeUnits,
+            }));
+            instructions.push(...this.oracleUpdateInstructions);
+            const transactionMessage = (0, kit_1.pipe)((0, kit_1.createTransactionMessage)({ version: 0 }), (m) => (0, kit_1.setTransactionMessageFeePayerSigner)(this.admin, m), (m) => (0, kit_1.setTransactionMessageLifetimeUsingBlockhash)(latestBlockhash, m), (m) => (0, kit_1.appendTransactionMessageInstructions)(instructions, m));
+            const signedTransaction = yield (0, kit_1.signTransactionMessageWithSigners)(transactionMessage);
+            (0, kit_1.assertIsSendableTransaction)(signedTransaction);
+            (0, kit_1.assertIsTransactionWithBlockhashLifetime)(signedTransaction);
+            return signedTransaction;
         });
-        transaction.add(...instructions);
-        transaction.sign(this.admin);
-        return transaction;
     }
-    createUpdateInstruction(oraclePubkey, payload, serializer) {
+    createUpdateInstruction(oracleAddress, payload, serializer) {
         const data = serializer.serialize(payload);
-        return new web3_js_1.TransactionInstruction({
-            programId: exports.DOPPLER_PROGRAM_ID,
-            keys: [
+        return {
+            programAddress: exports.DOPPLER_PROGRAM_ID,
+            accounts: [
                 {
-                    pubkey: this.admin.publicKey,
-                    isSigner: true,
-                    isWritable: false,
+                    address: this.admin.address,
+                    role: kit_1.AccountRole.READONLY_SIGNER,
+                    signer: this.admin,
                 },
                 {
-                    pubkey: oraclePubkey,
-                    isSigner: false,
-                    isWritable: true,
+                    address: oracleAddress,
+                    role: kit_1.AccountRole.WRITABLE,
                 },
                 {
-                    pubkey: web3_js_1.SYSVAR_CLOCK_PUBKEY,
-                    isSigner: false,
-                    isWritable: false,
+                    address: sysvars_1.SYSVAR_CLOCK_ADDRESS,
+                    role: kit_1.AccountRole.READONLY,
                 },
             ],
             data,
-        });
+        };
     }
 }
 exports.TransactionBuilder = TransactionBuilder;
-/**
- * Main Doppler class for interacting with oracle accounts
- */
 class Doppler {
-    constructor(connection, admin) {
-        this.connection = connection;
+    constructor(rpcUrl, rpcSubscriptionsUrl, admin) {
         this.admin = admin;
+        this.rpc = (0, kit_1.createSolanaRpc)(rpcUrl);
+        this.rpcSubscriptions = (0, kit_1.createSolanaRpcSubscriptions)(rpcSubscriptionsUrl);
     }
-    /**
-     * Create a new transaction builder
-     */
     createTransactionBuilder() {
         return new TransactionBuilder(this.admin);
     }
-    /**
-     * Fetch oracle account data and deserialize it
-     */
-    fetchOracle(oraclePubkey, serializer) {
+    fetchOracle(oracleAddress, serializer) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const accountInfo = yield this.connection.getAccountInfo(oraclePubkey);
-                if (!accountInfo || !accountInfo.data) {
+                const maybeAccount = yield (0, kit_1.fetchEncodedAccount)(this.rpc, oracleAddress);
+                if (!maybeAccount.exists) {
                     return null;
                 }
-                return this.deserializeOracle(accountInfo.data, serializer);
+                return this.deserializeOracle(maybeAccount.data, serializer);
             }
             catch (error) {
                 console.error('Error fetching oracle account:', error);
@@ -204,121 +159,117 @@ class Doppler {
             }
         });
     }
-    /**
-     * Deserialize oracle data from a buffer
-     */
     deserializeOracle(data, serializer) {
         const expectedSize = 8 + serializer.size();
         if (data.length < expectedSize) {
             throw new Error(`Invalid oracle data size. Expected at least ${expectedSize}, got ${data.length}`);
         }
-        const slot = data.readBigUInt64LE(0);
-        const payloadBuffer = data.subarray(8, 8 + serializer.size());
+        const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
+        const slot = view.getBigUint64(0, true);
+        const payloadBuffer = data.slice(8, 8 + serializer.size());
         const payload = serializer.deserialize(payloadBuffer);
         return { slot, payload };
     }
-    /**
-     * Create an oracle account from a keypair
-     */
     createOracleAccount(oracleKeypair, serializer) {
         return __awaiter(this, void 0, void 0, function* () {
             const oracleSize = 8 + serializer.size();
-            const lamports = yield this.connection.getMinimumBalanceForRentExemption(oracleSize);
-            const createAccountInstruction = web3_js_1.SystemProgram.createAccount({
-                fromPubkey: this.admin.publicKey,
-                newAccountPubkey: oracleKeypair.publicKey,
-                lamports,
+            const rentLamports = yield this.rpc
+                .getMinimumBalanceForRentExemption(BigInt(oracleSize))
+                .send();
+            const createAccountIx = (0, system_1.getCreateAccountInstruction)({
+                payer: this.admin,
+                newAccount: oracleKeypair,
+                lamports: rentLamports,
                 space: oracleSize,
-                programId: exports.DOPPLER_PROGRAM_ID,
+                programAddress: exports.DOPPLER_PROGRAM_ID,
             });
-            const recentBlockhash = yield this.connection.getLatestBlockhash();
-            const transaction = new web3_js_1.Transaction({
-                feePayer: this.admin.publicKey,
-                recentBlockhash: recentBlockhash.blockhash,
+            const { value: latestBlockhash } = yield this.rpc.getLatestBlockhash().send();
+            const transactionMessage = (0, kit_1.pipe)((0, kit_1.createTransactionMessage)({ version: 0 }), (m) => (0, kit_1.setTransactionMessageFeePayerSigner)(this.admin, m), (m) => (0, kit_1.setTransactionMessageLifetimeUsingBlockhash)(latestBlockhash, m), (m) => (0, kit_1.appendTransactionMessageInstructions)([createAccountIx], m));
+            const signedTransaction = yield (0, kit_1.signTransactionMessageWithSigners)(transactionMessage);
+            (0, kit_1.assertIsSendableTransaction)(signedTransaction);
+            (0, kit_1.assertIsTransactionWithBlockhashLifetime)(signedTransaction);
+            const sendAndConfirm = (0, kit_1.sendAndConfirmTransactionFactory)({
+                rpc: this.rpc,
+                rpcSubscriptions: this.rpcSubscriptions,
             });
-            transaction.add(createAccountInstruction);
-            transaction.sign(this.admin, oracleKeypair);
-            yield (0, web3_js_1.sendAndConfirmTransaction)(this.connection, transaction, [
-                this.admin,
-                oracleKeypair,
-            ]);
-            return oracleKeypair.publicKey;
+            yield sendAndConfirm(signedTransaction, { commitment: 'confirmed' });
+            return oracleKeypair.address;
         });
     }
-    /**
-     * Create an oracle account with a seed
-     */
     createOracleAccountWithSeed(seed, serializer) {
         return __awaiter(this, void 0, void 0, function* () {
             const oracleSize = 8 + serializer.size();
-            const lamports = yield this.connection.getMinimumBalanceForRentExemption(oracleSize);
-            const oraclePubkey = yield web3_js_1.PublicKey.createWithSeed(this.admin.publicKey, seed, exports.DOPPLER_PROGRAM_ID);
-            const createAccountInstruction = web3_js_1.SystemProgram.createAccountWithSeed({
-                fromPubkey: this.admin.publicKey,
-                newAccountPubkey: oraclePubkey,
-                basePubkey: this.admin.publicKey,
+            const rentLamports = yield this.rpc
+                .getMinimumBalanceForRentExemption(BigInt(oracleSize))
+                .send();
+            const oracleAddress = yield (0, kit_1.createAddressWithSeed)({
+                baseAddress: this.admin.address,
+                programAddress: exports.DOPPLER_PROGRAM_ID,
                 seed,
-                lamports,
+            });
+            const createAccountIx = (0, system_1.getCreateAccountWithSeedInstruction)({
+                payer: this.admin,
+                newAccount: oracleAddress,
+                base: this.admin.address,
+                baseAccount: this.admin,
+                seed,
+                amount: rentLamports,
                 space: oracleSize,
-                programId: exports.DOPPLER_PROGRAM_ID,
+                programAddress: exports.DOPPLER_PROGRAM_ID,
             });
-            const recentBlockhash = yield this.connection.getLatestBlockhash();
-            const transaction = new web3_js_1.Transaction({
-                feePayer: this.admin.publicKey,
-                recentBlockhash: recentBlockhash.blockhash,
+            const { value: latestBlockhash } = yield this.rpc.getLatestBlockhash().send();
+            const transactionMessage = (0, kit_1.pipe)((0, kit_1.createTransactionMessage)({ version: 0 }), (m) => (0, kit_1.setTransactionMessageFeePayerSigner)(this.admin, m), (m) => (0, kit_1.setTransactionMessageLifetimeUsingBlockhash)(latestBlockhash, m), (m) => (0, kit_1.appendTransactionMessageInstructions)([createAccountIx], m));
+            const signedTransaction = yield (0, kit_1.signTransactionMessageWithSigners)(transactionMessage);
+            (0, kit_1.assertIsSendableTransaction)(signedTransaction);
+            (0, kit_1.assertIsTransactionWithBlockhashLifetime)(signedTransaction);
+            const sendAndConfirm = (0, kit_1.sendAndConfirmTransactionFactory)({
+                rpc: this.rpc,
+                rpcSubscriptions: this.rpcSubscriptions,
             });
-            transaction.add(createAccountInstruction);
-            transaction.sign(this.admin);
-            yield (0, web3_js_1.sendAndConfirmTransaction)(this.connection, transaction, [this.admin]);
-            return oraclePubkey;
+            yield sendAndConfirm(signedTransaction, { commitment: 'confirmed' });
+            return oracleAddress;
         });
     }
-    /**
-     * Update a single oracle account
-     */
-    updateOracle(oraclePubkey, payload, serializer, unitPrice) {
+    updateOracle(oracleAddress, payload, serializer, unitPrice) {
         return __awaiter(this, void 0, void 0, function* () {
-            const recentBlockhash = yield this.connection.getLatestBlockhash();
-            let builder = this.createTransactionBuilder().addOracleUpdate(oraclePubkey, payload, serializer);
+            const { value: latestBlockhash } = yield this.rpc.getLatestBlockhash().send();
+            let builder = this.createTransactionBuilder().addOracleUpdate(oracleAddress, payload, serializer);
             if (unitPrice !== undefined) {
                 builder = builder.withUnitPrice(unitPrice);
             }
-            const transaction = builder.build(recentBlockhash.blockhash);
-            const signature = yield (0, web3_js_1.sendAndConfirmTransaction)(this.connection, transaction, [this.admin], {
-                skipPreflight: true
+            const signedTransaction = yield builder.build(latestBlockhash);
+            const sendAndConfirm = (0, kit_1.sendAndConfirmTransactionFactory)({
+                rpc: this.rpc,
+                rpcSubscriptions: this.rpcSubscriptions,
             });
-            return signature;
+            yield sendAndConfirm(signedTransaction, { commitment: 'confirmed' });
+            return (0, kit_1.getSignatureFromTransaction)(signedTransaction);
         });
     }
-    /**
-     * Update multiple oracle accounts in a single transaction
-     */
     updateMultipleOracles(updates, unitPrice) {
         return __awaiter(this, void 0, void 0, function* () {
-            const recentBlockhash = yield this.connection.getLatestBlockhash();
+            const { value: latestBlockhash } = yield this.rpc.getLatestBlockhash().send();
             let builder = this.createTransactionBuilder();
             for (const update of updates) {
-                builder = builder.addOracleUpdate(update.oraclePubkey, update.payload, update.serializer);
+                builder = builder.addOracleUpdate(update.oracleAddress, update.payload, update.serializer);
             }
             if (unitPrice !== undefined) {
                 builder = builder.withUnitPrice(unitPrice);
             }
-            const transaction = builder.build(recentBlockhash.blockhash);
-            const signature = yield (0, web3_js_1.sendAndConfirmTransaction)(this.connection, transaction, [this.admin]);
-            return signature;
+            const signedTransaction = yield builder.build(latestBlockhash);
+            const sendAndConfirm = (0, kit_1.sendAndConfirmTransactionFactory)({
+                rpc: this.rpc,
+                rpcSubscriptions: this.rpcSubscriptions,
+            });
+            yield sendAndConfirm(signedTransaction, { commitment: 'confirmed' });
+            return (0, kit_1.getSignatureFromTransaction)(signedTransaction);
         });
     }
-    /**
-     * Get the admin keypair
-     */
     getAdmin() {
         return this.admin;
     }
-    /**
-     * Get the connection
-     */
-    getConnection() {
-        return this.connection;
+    getRpc() {
+        return this.rpc;
     }
 }
 exports.Doppler = Doppler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reflectmoney/oracle.ts",
-  "version": "3.2.4",
+  "version": "4.0.0",
   "type": "commonjs",
   "author": "L0STE, stablecoinjesus @ Palindrome Engineering",
   "repository": {
@@ -11,25 +11,14 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@solana-program/compute-budget": "^0.9.0",
-    "@solana-program/token": "^0.6.0",
-    "@solana/buffer-layout": "^4.0.1",
-    "@solana/kit": "^3.0.3",
-    "@solana/web3.js": "^1.98.4",
-    "bn.js": "^5.2.2",
-    "buffer": "^6.0.3"
+    "@solana-program/compute-budget": "^0.12.0",
+    "@solana-program/system": "^0.10.0",
+    "@solana/kit": "5.5.1"
   },
   "devDependencies": {
-    "@types/bn.js": "5.1.6",
-    "@types/chai": "^4.3.11",
-    "@types/mocha": "^10.0.6",
     "@types/node": "^24.7.2",
-    "bs58": "^6.0.0",
-    "chai": "^4.3.10",
-    "commander": "^14.0.1",
-    "mocha": "^10.2.0",
-    "ts-node": "^10.9.2",
-    "tsx": "^4.20.6"
+    "tsx": "^4.20.6",
+    "typescript": "^5.7.0"
   },
   "license": "MIT",
   "main": "./dist/index.js",