Skip to content

Update calldata.rs #1174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update calldata.rs #1174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions sdk/rust-sdk/src/blockchain/calldata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! Calldata module for FHEVM SDK

use crate::Result;
use crate::decryption::user::UserDecryptRequest;
use crate::Result;
use alloy::primitives::{Address, Bytes, FixedBytes, U256};
use alloy::sol_types::SolCall;
use fhevm_gateway_bindings::decryption::Decryption::{
Expand All @@ -13,9 +13,9 @@ use tracing::info;

pub fn public_decryption_req(handles: Vec<FixedBytes<32>>) -> Result<Bytes> {
info!("Generating public decryption request calldata");
let extra_data = Bytes::new(); // Empty extra_data for now
let calldata = publicDecryptionRequestCall::new((handles, extra_data)).abi_encode();
Ok(Bytes::from(calldata))
// Extra data is empty for now
let calldata = publicDecryptionRequestCall::new((handles, Bytes::new())).abi_encode();
Ok(calldata)
}

/// Generates calldata for user decryption.
Expand All @@ -25,7 +25,6 @@ pub fn user_decryption_req(
) -> Result<Bytes> {
info!("Generating user decryption request calldata");

let extra_data = Bytes::new(); // Empty extra_data for now
let call = userDecryptionRequestCall::new((
user_decrypt_request.ct_handle_contract_pairs,
user_decrypt_request.request_validity,
Expand All @@ -36,12 +35,12 @@ pub fn user_decryption_req(
user_decrypt_request.user_address,
user_decrypt_request.public_key,
user_decrypt_request.signature,
extra_data,
Bytes::new(), // extraData (empty for now)
));

let calldata = userDecryptionRequestCall::abi_encode(&call);

Ok(Bytes::from(calldata))
// FIX: use instance method; abi_encode() returns alloy::primitives::Bytes directly.
let calldata = call.abi_encode();
Ok(calldata)
}

/// Computes calldata for verifyProofRequest function
Expand All @@ -58,13 +57,15 @@ pub fn verify_proof_req(
ciphertext_with_zkproof: Bytes,
) -> Result<Bytes> {
info!("Generating verification proof request calldata");

let request_call = InputVerification::verifyProofRequestCall {
contractChainId: U256::from(contract_chain_id),
contractAddress: contract_address,
userAddress: user_address,
ciphertextWithZKProof: ciphertext_with_zkproof,
extraData: Bytes::new(), // Empty extra_data for now
};

let calldata = request_call.abi_encode();
Ok(Bytes::from(calldata))
Ok(calldata)
}