chore: upgrade program id (#1)

GabrielePicco · web-flow · commit cda5ec20f628 · 2025-04-03T13:28:03.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ resolver = "2"
 members = ["api", "program", "src", "vrf", "vrf-oracle", "vrf-cli", "sdk"]
 
 [workspace.package]
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 license = "Business Source License 1.1"
 authors = ["MagicBlock Labs <dev@magicblock.xyz>"]
@@ -14,9 +14,9 @@ readme = "./README.md"
 keywords = ["solana", "vrf", "ephemeral-rollups", "magicblock"]
 
 [workspace.dependencies]
-ephemeral-vrf = { path = "./vrf", version = "0.1.1" }
-ephemeral-vrf-api = { path = "./api", version = "0.1.1" }
-ephemeral-vrf-sdk-vrf-macro = { path = "sdk/vrf-macro", version = "0.1.1" }
+ephemeral-vrf = { path = "./vrf", version = "0.1.2" }
+ephemeral-vrf-api = { path = "./api", version = "0.1.2" }
+ephemeral-vrf-sdk-vrf-macro = { path = "sdk/vrf-macro", version = "0.1.2" }
 ephemeral-rollups-sdk = "0.2.4"
 borsh = ">=0.10.1"
 bytemuck = "1.14"
diff --git a/api/idl/idl.json b/api/idl/idl.json
@@ -1,5 +1,5 @@
 {
-  "address": "VrffXU38S8MzqTtTYQG3M8GNwheKH8n77HVEZUdakH8",
+  "address": "Vrf1RNUjXmQGjmQrQLvJHs9SNkvDJEsRVFPkfSQUwGz",
   "metadata": {
     "name": "ephemeral_vrf",
     "version": "0.1.0",
diff --git a/api/src/lib.rs b/api/src/lib.rs
@@ -16,4 +16,4 @@ pub mod prelude {
 
 use steel::*;
 
-declare_id!("VrffXU38S8MzqTtTYQG3M8GNwheKH8n77HVEZUdakH8");
+declare_id!("Vrf1RNUjXmQGjmQrQLvJHs9SNkvDJEsRVFPkfSQUwGz");
diff --git a/program/src/provide_randomness.rs b/program/src/provide_randomness.rs
@@ -1,6 +1,6 @@
-use solana_program::hash::hash;
 use crate::verify::verify_vrf;
 use ephemeral_vrf_api::prelude::*;
+use solana_program::hash::hash;
 use steel::*;
 
 /// Process the provide randomness instruction which verifies VRF proof and executes vrf-macro
diff --git a/program/tests/fixtures/mod.rs b/program/tests/fixtures/mod.rs
@@ -6,4 +6,4 @@ use solana_program::pubkey;
 use steel::Pubkey;
 
 pub(crate) const TEST_CALLBACK_PROGRAM: Pubkey =
-    pubkey!("AL32mNVFdhxHXztaWuNWvwoiPYCHofWmVRNH49pMCafD");
+    pubkey!("CDiutifqugEkabdqwc5TK3FmSAgFpkP3RPE1642BCEhi");
diff --git a/program/tests/integration/use-randomness/Anchor.toml b/program/tests/integration/use-randomness/Anchor.toml
@@ -6,7 +6,7 @@ resolution = true
 skip-lint = false
 
 [programs.localnet]
-use_randomness = "AL32mNVFdhxHXztaWuNWvwoiPYCHofWmVRNH49pMCafD"
+use_randomness = "CDiutifqugEkabdqwc5TK3FmSAgFpkP3RPE1642BCEhi"
 
 [registry]
 url = "https://api.apr.dev"
@@ -25,18 +25,18 @@ program = "tests/fixtures/dlp.so"
 upgradeable = false
 
 [[test.genesis]]
-address = "VrffXU38S8MzqTtTYQG3M8GNwheKH8n77HVEZUdakH8"
+address = "Vrf1RNUjXmQGjmQrQLvJHs9SNkvDJEsRVFPkfSQUwGz"
 program = "../../../../target/deploy/ephemeral_vrf_program.so"
 upgradeable = false
 
 [[test.validator.account]]
-address = "BXQ9Bx1BUYN75Hk8ys1ZMiQtQUn5VqcWUD52hJKTTXPe"
+address = "GKE6d7iv8kCBrsxr78W3xVdjGLLLJnxsGiuzrsZCGEvb"
 filename = "tests/fixtures/oracles.json"
 
 [[test.validator.account]]
-address = "4g469Nt55ffcqwR1TwLbpVpE19joPUGdmExPtLR1Lk2Q"
+address = "CXMc1eCiEp9YXjanBNB6HUvbWCmxeVmhcR3bPXw8exJA"
 filename = "tests/fixtures/oracle_data.json"
 
 [[test.validator.account]]
-address = "BXQ9Bx1BUYN75Hk8ys1ZMiQtQUn5VqcWUD52hJKTTXPe"
+address = "GKE6d7iv8kCBrsxr78W3xVdjGLLLJnxsGiuzrsZCGEvb"
 filename = "tests/fixtures/oracle_queue.json"
diff --git a/program/tests/integration/use-randomness/Cargo.lock b/program/tests/integration/use-randomness/Cargo.lock
diff --git a/program/tests/integration/use-randomness/programs/use-randomness/src/lib.rs b/program/tests/integration/use-randomness/programs/use-randomness/src/lib.rs
@@ -11,7 +11,7 @@ use ephemeral_vrf_sdk::consts::IDENTITY;
 use ephemeral_vrf_sdk::instructions::RequestRandomnessParams;
 use anchor_lang::solana_program::program::invoke_signed;
 
-declare_id!("AL32mNVFdhxHXztaWuNWvwoiPYCHofWmVRNH49pMCafD");
+declare_id!("CDiutifqugEkabdqwc5TK3FmSAgFpkP3RPE1642BCEhi");
 
 #[program]
 pub mod use_randomness {
@@ -116,4 +116,4 @@ pub struct ConsumeRandomnessCtx<'info> {
     pub vrf_program_identity: Signer<'info>,
 }
 
-pub const DEFAULT_TEST_QUEUE: Pubkey = pubkey!("BXQ9Bx1BUYN75Hk8ys1ZMiQtQUn5VqcWUD52hJKTTXPe");
+pub const DEFAULT_TEST_QUEUE: Pubkey = pubkey!("GKE6d7iv8kCBrsxr78W3xVdjGLLLJnxsGiuzrsZCGEvb");
diff --git a/program/tests/integration/use-randomness/tests/fixtures/oracle_data.json b/program/tests/integration/use-randomness/tests/fixtures/oracle_data.json
@@ -1,12 +1,12 @@
 {
-  "pubkey": "4g469Nt55ffcqwR1TwLbpVpE19joPUGdmExPtLR1Lk2Q",
+  "pubkey": "CXMc1eCiEp9YXjanBNB6HUvbWCmxeVmhcR3bPXw8exJA",
   "account": {
     "lamports": 1000000000000,
     "data": [
       "AQAAAAAAAADcov41UGJB/RQ8J4gZGi5PYLRirtI0A+zMeSDw8sVDcQEAAAAAAAAA",
       "base64"
     ],
-    "owner": "VrffXU38S8MzqTtTYQG3M8GNwheKH8n77HVEZUdakH8",
+    "owner": "Vrf1RNUjXmQGjmQrQLvJHs9SNkvDJEsRVFPkfSQUwGz",
     "executable": false,
     "rentEpoch": 18446744073709551615,
     "space": 48
diff --git a/program/tests/integration/use-randomness/tests/fixtures/oracle_queue.json b/program/tests/integration/use-randomness/tests/fixtures/oracle_queue.json
@@ -1,12 +1,12 @@
 {
-  "pubkey": "BXQ9Bx1BUYN75Hk8ys1ZMiQtQUn5VqcWUD52hJKTTXPe",
+  "pubkey": "GKE6d7iv8kCBrsxr78W3xVdjGLLLJnxsGiuzrsZCGEvb",
   "account": {
     "lamports": 1000000000000,
     "data": [
       "AwAAAAAAAAAAAAAAAA==",
       "base64"
     ],
-    "owner": "VrffXU38S8MzqTtTYQG3M8GNwheKH8n77HVEZUdakH8",
+    "owner": "Vrf1RNUjXmQGjmQrQLvJHs9SNkvDJEsRVFPkfSQUwGz",
     "executable": false,
     "rentEpoch": 18446744073709551615,
     "space": 13
diff --git a/program/tests/integration/use-randomness/tests/fixtures/oracles.json b/program/tests/integration/use-randomness/tests/fixtures/oracles.json
@@ -1,12 +1,12 @@
 {
-  "pubkey": "BXQ9Bx1BUYN75Hk8ys1ZMiQtQUn5VqcWUD52hJKTTXPe",
+  "pubkey": "3ctxDejjAY6YGt7rNUUGaKTwvaTaRvwSwRo2fJQqcqWA",
   "account": {
     "lamports": 1000000000000,
     "data": [
       "AAAAAAAAAAAAAAAA",
       "base64"
     ],
-    "owner": "VrffXU38S8MzqTtTYQG3M8GNwheKH8n77HVEZUdakH8",
+    "owner": "Vrf1RNUjXmQGjmQrQLvJHs9SNkvDJEsRVFPkfSQUwGz",
     "executable": false,
     "rentEpoch": 18446744073709551615,
     "space": 12
diff --git a/program/tests/test.rs b/program/tests/test.rs
@@ -49,7 +49,7 @@ async fn setup() -> (BanksClient, Keypair, Hash) {
     // Setup program to test vrf-macro
     let data = read_file("tests/integration/use-randomness/target/deploy/use_randomness.so");
     program_test.add_account(
-        pubkey!("AL32mNVFdhxHXztaWuNWvwoiPYCHofWmVRNH49pMCafD"),
+        pubkey!("CDiutifqugEkabdqwc5TK3FmSAgFpkP3RPE1642BCEhi"),
         Account {
             lamports: Rent::default().minimum_balance(data.len()).max(1),
             data,
@@ -291,11 +291,13 @@ pub fn request_randomness(signer: Pubkey, client_seed: u8) -> Instruction {
     const DISCRIMINATOR: [u8; 8] = [213, 5, 173, 166, 37, 236, 31, 18];
 
     // Default addresses as per instruction
-    let oracle_queue = pubkey!("BXQ9Bx1BUYN75Hk8ys1ZMiQtQUn5VqcWUD52hJKTTXPe");
+    let oracle_queue = pubkey!("GKE6d7iv8kCBrsxr78W3xVdjGLLLJnxsGiuzrsZCGEvb");
 
     // Program identity PDA (seeded with "identity")
     let (program_identity, _) = Pubkey::find_program_address(&[IDENTITY], &TEST_CALLBACK_PROGRAM);
 
+    println!("program_identity: {}", program_identity);
+
     // Construct account metas
     let accounts = vec![
         AccountMeta::new(signer, true),
diff --git a/sdk/src/consts.rs b/sdk/src/consts.rs
@@ -2,16 +2,16 @@ use solana_program::pubkey;
 use solana_program::pubkey::Pubkey;
 
 /// Verifiable Random Function program id
-pub const VRF_PROGRAM_ID: Pubkey = pubkey!("VrffXU38S8MzqTtTYQG3M8GNwheKH8n77HVEZUdakH8");
+pub const VRF_PROGRAM_ID: Pubkey = pubkey!("Vrf1RNUjXmQGjmQrQLvJHs9SNkvDJEsRVFPkfSQUwGz");
 
 /// The default queue for randomness requests
-pub const DEFAULT_QUEUE: Pubkey = pubkey!("6qqax73tfwwZgkYq59Yebb1xUWpYrZDSutAeHoMihKYS");
+pub const DEFAULT_QUEUE: Pubkey = pubkey!("Cuj97ggrhhidhbu39TijNVqE74xvKJ69gDervRUXAxGh");
 
 /// The default queue for ephemeral randomness requests
-pub const DEFAULT_EPHEMERAL_QUEUE: Pubkey = pubkey!("6ykZL44GxESV7sLYZfeNEouD2chTMP5D4JyxG1HJM6ur");
+pub const DEFAULT_EPHEMERAL_QUEUE: Pubkey = pubkey!("5hBR571xnXppuCPveTrctfTU7tJLSN94nq7kv7FRK5Tc");
 
 /// Vrf program identity PDA
-pub const VRF_PROGRAM_IDENTITY: Pubkey = pubkey!("AwF6egvgtC2RdkfUEcCCtjHP2iWhCzFBMi1a6bjv9Hkp");
+pub const VRF_PROGRAM_IDENTITY: Pubkey = pubkey!("9irBy75QS2BN81FUgXuHcjqceJJRuc9oDkAe8TKVvvAw");
 
 /// Seed of the identity PDA
 pub const IDENTITY: &[u8] = b"identity";
diff --git a/vrf-oracle/src/main.rs b/vrf-oracle/src/main.rs
@@ -24,6 +24,9 @@ use solana_sdk::{
 use std::str::FromStr;
 use std::sync::Arc;
 
+/// Maximum number of retry attempts for failed transactions
+const MAX_RETRY_ATTEMPTS: u8 = 5;
+
 /// VRF Oracle client
 #[derive(Parser, Debug)]
 #[command(author, version, about)]
@@ -189,12 +192,21 @@ async fn process_oracle_queue(
         }
 
         for (input_seed, item) in oracle_queue.items.iter() {
-            match ProcessableItem(item.clone())
-                .process_item(oracle_client, rpc_client, input_seed, queue)
-                .await
-            {
-                Ok(signature) => println!("Transaction signature: {}", signature),
-                Err(e) => println!("Failed to send transaction: {:?}", e),
+            let mut attempts = 0;
+            while attempts < MAX_RETRY_ATTEMPTS {
+                match ProcessableItem(item.clone())
+                    .process_item(oracle_client, rpc_client, input_seed, queue)
+                    .await
+                {
+                    Ok(signature) => {
+                        println!("Transaction signature: {}", signature);
+                        break;
+                    }
+                    Err(e) => {
+                        attempts += 1;
+                        println!("Failed to send transaction: {:?}", e)
+                    }
+                }
             }
         }
     }
@@ -240,7 +252,9 @@ impl ProcessableItem {
             }));
 
         let compute_ix = ComputeBudgetInstruction::set_compute_unit_limit(200_000);
-        let blockhash = rpc_client.get_latest_blockhash()?;
+        let blockhash = rpc_client
+            .get_latest_blockhash_with_commitment(CommitmentConfig::processed())?
+            .0;
 
         let tx = Transaction::new_signed_with_payer(
             &[compute_ix, ix],

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "address": "VrffXU38S8MzqTtTYQG3M8GNwheKH8n77HVEZUdakH8",`
	`2`	`+ "address": "Vrf1RNUjXmQGjmQrQLvJHs9SNkvDJEsRVFPkfSQUwGz",`
`3`	`3`	`"metadata": {`
`4`	`4`	`"name": "ephemeral_vrf",`
`5`	`5`	`"version": "0.1.0",`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,4 @@ pub mod prelude {`
`16`	`16`
`17`	`17`	`use steel::*;`
`18`	`18`
`19`		`-declare_id!("VrffXU38S8MzqTtTYQG3M8GNwheKH8n77HVEZUdakH8");`
	`19`	`+declare_id!("Vrf1RNUjXmQGjmQrQLvJHs9SNkvDJEsRVFPkfSQUwGz");`