Anchor 0.30.1 update, callback update, libs update

Author: orao-dev1

Cargo.toml

@@ -4,9 +4,10 @@ exclude = ["rust/examples/cpi", "callback/rust/examples/cpi"]
 resolver = "2"
 
 [workspace.dependencies]
-anchor-lang = "0.29.0"
-anchor-spl = "0.29.0"
-anchor-client = { version = "0.29.0" }
+anchor-lang = "0.30.1"
+anchor-spl = "0.30.1"
+anchor-client = { version = "0.30.1" }
 ed25519-dalek = { version = "1.0.1" }
 solana-cli-config = { version = "1.18" }
 rand = { version = "0.8" }
+bs58 = "0.4"

callback/rust/sdk/src/state/request.rs

@@ -2,7 +2,7 @@ use anchor_lang::{prelude::*, solana_program::clock::Slot};
 
 use super::{
     super::{majority, MAX_FULFILLMENT_AUTHORITIES},
-    client::ValidatedCallback,
+    client::{Callback, Client, ValidatedCallback},
 };
 
 #[derive(AnchorDeserialize, AnchorSerialize, Clone, Debug)]
@@ -41,6 +41,16 @@ impl RequestAccount {
     pub const STATIC_SIZE: usize = 1 + 8 + 32 + 32;
     pub const FULFILLED_SIZE: usize = Self::STATIC_SIZE + RequestState::FULFILLED_SIZE;
 
+    /// This function estimates the expected size of the new RequestAccount given the callback used.
+    pub fn expected_size(client: &Client, callback: Option<&Callback>) -> usize {
+        let callback_size = callback
+            .map(|x| x.valid_size())
+            .or_else(|| client.callback.as_ref().map(|c| c.size()))
+            .unwrap_or_default();
+
+        Self::STATIC_SIZE + 1 + Pending::STATIC_SIZE + 1 + callback_size
+    }
+
     pub fn new(bump: u8, slot: Slot, client: Pubkey, seed: [u8; 32], state: RequestState) -> Self {
         Self {
             bump,

js/dist/index.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="node" />
 import { BN, Program, Provider, web3 } from "@coral-xyz/anchor";
 import { TransactionInstruction } from "@solana/web3.js";
-import { NetworkConfiguration, NetworkState, OraoTokenFeeConfig, Randomness, FulfilledRandomness } from "./state";
+import { NetworkConfiguration, NetworkState, OraoTokenFeeConfig, RandomnessAccountData, FulfilledRandomnessAccountData } from "./state";
 import { OraoVrf } from "./types/orao_vrf";
 import { MethodsBuilder } from "@coral-xyz/anchor/dist/cjs/program/namespace/methods";
+import { AllInstructionsMap } from "@coral-xyz/anchor/dist/cjs/program/namespace/types";
 export { Randomness, FulfilledRandomness, RandomnessResponse, NetworkConfiguration, NetworkState, OraoTokenFeeConfig, } from "./state";
 export declare const PROGRAM_ADDRESS: string;
 export declare const PROGRAM_ID: web3.PublicKey;
@@ -80,7 +81,7 @@ export declare class Orao extends Program<OraoVrf> {
      * @param seed - seed buffer.
      * @param commitment - you can override the provider's commitment level.
      */
-    getRandomness(seed: Buffer | Uint8Array, commitment?: web3.Commitment): Promise<Randomness>;
+    getRandomness(seed: Buffer | Uint8Array, commitment?: web3.Commitment): Promise<RandomnessAccountData>;
     /**
      * Prepares a randomness request (see {@link RequestBuilder}).
      *
@@ -103,7 +104,7 @@ export declare class Orao extends Program<OraoVrf> {
      * @returns a {@link RequestBuilder} instance.
      */
     request(seed?: Buffer | Uint8Array): Promise<RequestBuilder>;
-    waitFulfilled(seed: Buffer | Uint8Array, commitment?: web3.Commitment): Promise<FulfilledRandomness>;
+    waitFulfilled(seed: Buffer | Uint8Array, commitment?: web3.Commitment): Promise<FulfilledRandomnessAccountData>;
 }
 declare class ComputeBudgetConfig {
     computeUnitPrice: bigint | null;
@@ -172,7 +173,7 @@ export declare class InitBuilder {
      * instance (use {@link InitBuilder.withComputeUnitPrice} and
      * {@link InitBuilder.withComputeUnitLimit} to opt-out).
      */
-    build(): Promise<MethodsBuilder<OraoVrf, OraoVrf["instructions"][0]>>;
+    build(): Promise<MethodsBuilder<OraoVrf, AllInstructionsMap<OraoVrf>["initNetwork"]>>;
     /**
      * Performs an RPC call.
      *
@@ -247,7 +248,7 @@ export declare class UpdateBuilder {
      * instance (use {@link UpdateBuilder.withComputeUnitPrice} and
      * {@link UpdateBuilder.withComputeUnitLimit} to opt-out).
      */
-    build(): Promise<MethodsBuilder<OraoVrf, OraoVrf["instructions"][1]>>;
+    build(): Promise<MethodsBuilder<OraoVrf, AllInstructionsMap<OraoVrf>["updateNetwork"]>>;
     /**
      * Performs an RPC call.
      *
@@ -319,7 +320,7 @@ export declare class RequestBuilder {
      * instance (use {@link RequestBuilder.withComputeUnitPrice} and
      * {@link RequestBuilder.withComputeUnitLimit} to opt-out).
      */
-    build(): Promise<MethodsBuilder<OraoVrf, OraoVrf["instructions"][2]>>;
+    build(): Promise<MethodsBuilder<OraoVrf, AllInstructionsMap<OraoVrf>["requestV2"]>>;
     /**
      * Performs an RPC call.
      *
@@ -384,7 +385,7 @@ export declare class FulfillBuilder {
      * @param fulfillmentAuthority - public key of a fulfillment authority
      * @param signature - signature of a seed, performed by the fulfillment authority
      */
-    build(fulfillmentAuthority: web3.PublicKey, signature: Uint8Array): Promise<MethodsBuilder<OraoVrf, OraoVrf["instructions"][3]>>;
+    build(fulfillmentAuthority: web3.PublicKey, signature: Uint8Array): Promise<MethodsBuilder<OraoVrf, AllInstructionsMap<OraoVrf>["fulfill"]> | MethodsBuilder<OraoVrf, AllInstructionsMap<OraoVrf>["fulfillV2"]>>;
     /**
      * Performs an RPC call.
      *

js/dist/index.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -17,15 +40,15 @@ const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const tweetnacl_1 = __importDefault(require("tweetnacl"));
 const state_1 = require("./state");
-const orao_vrf_1 = require("./types/orao_vrf");
+const IDL = __importStar(require("./types/orao_vrf.json"));
 var state_2 = require("./state");
 Object.defineProperty(exports, "Randomness", { enumerable: true, get: function () { return state_2.Randomness; } });
 Object.defineProperty(exports, "FulfilledRandomness", { enumerable: true, get: function () { return state_2.FulfilledRandomness; } });
 Object.defineProperty(exports, "RandomnessResponse", { enumerable: true, get: function () { return state_2.RandomnessResponse; } });
 Object.defineProperty(exports, "NetworkConfiguration", { enumerable: true, get: function () { return state_2.NetworkConfiguration; } });
 Object.defineProperty(exports, "NetworkState", { enumerable: true, get: function () { return state_2.NetworkState; } });
 Object.defineProperty(exports, "OraoTokenFeeConfig", { enumerable: true, get: function () { return state_2.OraoTokenFeeConfig; } });
-exports.PROGRAM_ADDRESS = "VRFzZoJdhFWL8rkvu87LpKM3RbcVezpMEc6X5GVDr7y";
+exports.PROGRAM_ADDRESS = IDL.address;
 exports.PROGRAM_ID = new anchor_1.web3.PublicKey(exports.PROGRAM_ADDRESS);
 exports.RANDOMNESS_ACCOUNT_SEED = Buffer.from("orao-vrf-randomness-request");
 exports.CONFIG_ACCOUNT_SEED = Buffer.from("orao-vrf-network-configuration");
@@ -87,7 +110,7 @@ class Orao extends anchor_1.Program {
      * @param [id=PROGRAM_ID] - you can override the program ID.
      */
     constructor(provider, id = exports.PROGRAM_ID) {
-        super(orao_vrf_1.IDL, id, provider);
+        super(Object.assign(Object.assign({}, IDL), { address: id.toString() }), provider);
         if (!provider.publicKey) {
             throw new Error("Wallet not provided");
         }
@@ -131,9 +154,23 @@ class Orao extends anchor_1.Program {
      */
     getRandomness(seed, commitment) {
         return __awaiter(this, void 0, void 0, function* () {
-            let randomness = yield this.account.randomness.fetch(randomnessAccountAddress(seed, this.programId), commitment);
-            let responses = randomness.responses;
-            return new state_1.Randomness(randomness.seed, randomness.randomness, responses.map((x) => new state_1.RandomnessResponse(x.pubkey, x.randomness)));
+            let address = randomnessAccountAddress(seed, this.programId);
+            try {
+                let randomness = yield this.account.randomnessV2.fetch(address, commitment);
+                if ("pending" in randomness.request && randomness.request.pending !== undefined) {
+                    let pending = randomness.request.pending[0];
+                    return new state_1.RandomnessAccountDataV2(new state_1.RandomnessV2(new state_1.PendingRequest(pending.seed, pending.client, pending.responses.map((x) => new state_1.RandomnessResponse(x.pubkey, x.randomness)))));
+                }
+                else {
+                    let fulfilled = randomness.request.fulfilled[0];
+                    return new state_1.RandomnessAccountDataV2(new state_1.RandomnessV2(new state_1.FulfilledRequest(fulfilled.seed, fulfilled.client, fulfilled.randomness)));
+                }
+            }
+            catch (_e) {
+                let randomness = yield this.account.randomness.fetch(address, commitment);
+                let responses = randomness.responses;
+                return new state_1.RandomnessAccountDataV1(new state_1.Randomness(randomness.seed, randomness.randomness, responses.map((x) => new state_1.RandomnessResponse(x.pubkey, x.randomness))));
+            }
         });
     }
     /**
@@ -179,20 +216,28 @@ class Orao extends anchor_1.Program {
             return new Promise((_resolve, reject) => __awaiter(this, void 0, void 0, function* () {
                 let resolved = false;
                 let maybeResolve = (subscriptionId, randomness) => {
-                    if (!randomness.fulfilled()) {
+                    if (!randomness.getFulfilledRandomness()) {
                         return;
                     }
                     if (resolved) {
                         return;
                     }
                     resolved = true;
                     this.provider.connection.removeAccountChangeListener(subscriptionId);
-                    _resolve(state_1.FulfilledRandomness.unchecked(randomness));
+                    _resolve(new state_1.FulfilledRandomnessAccountData(randomness));
                 };
                 try {
                     let subscriptionId = this.provider.connection.onAccountChange(account, (accountInfo, _ctx) => {
-                        let randomness = this.account.randomness.coder.accounts.decode("randomness", accountInfo.data);
-                        maybeResolve(subscriptionId, new state_1.Randomness(randomness.seed, randomness.randomness, randomness.responses.map((x) => new state_1.RandomnessResponse(x.pubkey, x.randomness))));
+                        try {
+                            let randomness = this.account.randomness.coder.accounts.decode("randomnessV2", accountInfo.data);
+                            maybeResolve(subscriptionId, new state_1.RandomnessAccountDataV2(new state_1.RandomnessV2("fulfilled" in randomness.request
+                                ? new state_1.FulfilledRequest(randomness.request.fulfilled[0].seed, randomness.request.fulfilled[0].client, randomness.request.fulfilled[0].randomness)
+                                : new state_1.PendingRequest(randomness.request.pending[0].seed, randomness.request.pending[0].client, randomness.request.pending[0].responses.map((r) => new state_1.RandomnessResponse(r.pubkey, r.randomness))))));
+                        }
+                        catch (_e) {
+                            let randomness = this.account.randomness.coder.accounts.decode("randomness", accountInfo.data);
+                            maybeResolve(subscriptionId, new state_1.RandomnessAccountDataV1(new state_1.Randomness(randomness.seed, randomness.randomness, randomness.responses.map((x) => new state_1.RandomnessResponse(x.pubkey, x.randomness)))));
+                        }
                     }, commitment);
                     // In case it's already fulfilled
                     let randomness = yield this.getRandomness(seed, commitment);
@@ -308,7 +353,7 @@ class InitBuilder {
             const networkState = networkStateAccountAddress(this.vrf.programId);
             let tx = this.vrf.methods
                 .initNetwork(this.config.requestFee, this.config.authority, this.config.fulfillmentAuthorities, this.config.tokenFeeConfig)
-                .accounts({
+                .accountsPartial({
                 networkState,
                 treasury: this.config.treasury,
             });
@@ -431,7 +476,7 @@ class UpdateBuilder {
             let tokenFeeConfig = this.tokenFeeConfig !== undefined ? this.tokenFeeConfig : config.tokenFeeConfig;
             let tx = this.vrf.methods
                 .updateNetwork(requestFee, authority, fulfillmentAuthorities, tokenFeeConfig)
-                .accounts({
+                .accountsPartial({
                 networkState,
                 treasury,
             });
@@ -535,7 +580,7 @@ class RequestBuilder {
         return __awaiter(this, void 0, void 0, function* () {
             const networkState = networkStateAccountAddress(this.vrf.programId);
             const networkStateAcc = yield this.vrf.getNetworkState();
-            let tx = this.vrf.methods.request([...this.seed]).accounts({
+            let tx = this.vrf.methods.requestV2([...this.seed]).accountsPartial({
                 networkState,
                 treasury: networkStateAcc.config.treasury,
                 request: randomnessAccountAddress(this.seed, this.vrf.programId),
@@ -629,11 +674,24 @@ class FulfillBuilder {
      */
     build(fulfillmentAuthority, signature) {
         return __awaiter(this, void 0, void 0, function* () {
-            let tx = this.vrf.methods.fulfill().accounts({
-                instructionAcc: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                networkState: networkStateAccountAddress(this.vrf.programId),
-                request: randomnessAccountAddress(this.seed, this.vrf.programId),
-            });
+            let randomness = yield this.vrf.getRandomness(this.seed);
+            let tx;
+            if (randomness.getVersion() === "V1") {
+                tx = this.vrf.methods.fulfill().accountsPartial({
+                    instructionAcc: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                    networkState: networkStateAccountAddress(this.vrf.programId),
+                    request: randomnessAccountAddress(this.seed, this.vrf.programId),
+                });
+            }
+            else {
+                tx = this.vrf.methods.fulfillV2().accountsPartial({
+                    instructionAcc: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                    networkState: networkStateAccountAddress(this.vrf.programId),
+                    request: randomnessAccountAddress(this.seed, this.vrf.programId),
+                    client: randomness.getClient() || undefined,
+                    systemProgram: web3_js_1.SystemProgram.programId,
+                });
+            }
             if (!this.computeBudgetConfig.isEmpty()) {
                 tx = tx.preInstructions(yield this.computeBudgetConfig.getInstructions(this.vrf.provider.connection));
             }