blockworks-foundation
/
sbv2-solana
mirror of https://github.com/blockworks-foundation/sbv2-solana.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cp

This commit is contained in:
Mitch Gildenberg 2023-07-05 21:05:49 -04:00
parent 3dda06f739
commit fd95f4d504
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust/switchboard-solana/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "switchboard-solana" name = "switchboard-solana"
version = "0.8.4" version = "0.8.5"
edition = "2021" edition = "2021"
description = "A Rust library to interact with Switchboard accounts." description = "A Rust library to interact with Switchboard accounts."
readme = "README.md" readme = "README.md"

13
rust/switchboard-solana/src/client/function_runner.rs
View File

@ -21,9 +21,9 @@ pub struct FunctionRunner {
pub signer: Pubkey, pub signer: Pubkey,
pub function: Pubkey, pub function: Pubkey,
pub function_data: FunctionAccountData, pub function_data: Box<FunctionAccountData>,
pub fn_request_key: Pubkey, pub fn_request_key: Pubkey,
pub fn_request_data: Vec<u8>, pub fn_request_data: Box<FunctionRequestAccountData>,
pub quote: Pubkey, pub quote: Pubkey,
pub payer: Pubkey, pub payer: Pubkey,
pub verifier: Pubkey, pub verifier: Pubkey,
@ -52,9 +52,8 @@ impl FunctionRunner {
let function_data = *bytemuck::try_from_bytes(&hex::decode( let function_data = *bytemuck::try_from_bytes(&hex::decode(
env::var("FUNCTION_DATA").unwrap()).unwrap()).unwrap(); env::var("FUNCTION_DATA").unwrap()).unwrap()).unwrap();
let fn_request_key = load_env_pubkey("FUNCTION_REQUEST_KEY").unwrap_or_default(); let fn_request_key = load_env_pubkey("FUNCTION_REQUEST_KEY").unwrap_or_default();
let fn_request_data = Vec::new(); let fn_request_data = FunctionRequestAccountData::try_from_slice(&hex::decode(env::var("FUNCTION_REQUEST_DATA")
// let fn_request_data = bytemuck::try_from_bytes(hex::decode(env::var("FUNCTION_REQUEST_DATA") .unwrap_or_default()).unwrap_or_default()).unwrap_or_default();
// .unwrap_or_default()).unwrap_or_default()).unwrap_or_default();
let payer = load_env_pubkey("PAYER")?; let payer = load_env_pubkey("PAYER")?;
let verifier = load_env_pubkey("VERIFIER")?; let verifier = load_env_pubkey("VERIFIER")?;
let reward_receiver = load_env_pubkey("REWARD_RECEIVER")?; let reward_receiver = load_env_pubkey("REWARD_RECEIVER")?;
@ -69,9 +68,9 @@ impl FunctionRunner {
signer_keypair, signer_keypair,
signer, signer,
function, function,
function_data, function_data: Box::new(function_data),
fn_request_key, fn_request_key,
fn_request_data, fn_request_data: Box::new(fn_request_data),
quote, quote,
payer, payer,
verifier, verifier,