Skip to content
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

Jump to bottom

Get event-related data in a non-failing way #464

Merged
merged 1 commit into from
Jun 5, 2024
Merged

Get event-related data in a non-failing way #464

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion examples/.env.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# .env file used by Livenet integration. You can use multiple .env files to manage deploys on multiple chains
# by naming them casper-test.env, casper-livenet.env, etc. and calling the deploy script with the name of the
# ennviroment provided in the "ODRA_CASPER_LIVENET_ENV" variable. For example:
# ODRA_CASPER_LIVENET_ENV=casper-test cargo run --bin livenet_tests --feature livenet
# ODRA_CASPER_LIVENET_ENV=casper-test cargo run --bin livenet_tests --features livenet
# This will load integration.env file first, and then fill the missing values with the values from casper-test.env.

# Path to the secret key of the account that will be used to deploy the contracts.
Expand Down
1 change: 1 addition & 0 deletions odra-casper/livenet-env/src/livenet_contract_env.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ impl ContractContext for LivenetContractEnv {
self.casper_client
.borrow()
.get_value(self.callstack.borrow().current().address(), key)
.ok()
}

fn set_value(&self, _key: &[u8], _value: Bytes) {
Expand Down
5 changes: 4 additions & 1 deletion odra-casper/livenet-env/src/livenet_host.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,10 @@ impl HostContext for LivenetHost {
}

fn get_events_count(&self, contract_address: &Address) -> u32 {
self.casper_client.borrow().events_count(contract_address)
self.casper_client
.borrow()
.events_count(contract_address)
.unwrap_or_default()
}

fn call_contract(
Expand Down
1 change: 1 addition & 0 deletions odra-casper/rpc-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ dotenv = "0.15.0"
prettycli = "0.1.1"
thiserror = "1.0.40"
bytes = "1.5.0"
anyhow = "1.0.86"
119 changes: 64 additions & 55 deletions odra-casper/rpc-client/src/casper_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
//! Client for interacting with Casper node.
use std::{fs, path::PathBuf, str::from_utf8_unchecked, time::Duration};

use anyhow::Context;
use casper_execution_engine::core::engine_state::ExecutableDeployItem;
use casper_hashing::Digest;
use itertools::Itertools;
use jsonrpc_lite::JsonRpc;
use odra_core::OdraResult;
use serde::de::DeserializeOwned;
use serde_json::{json, Value};

use anyhow::Result;
use odra_core::casper_types::{sign, URef};
use odra_core::{
casper_types::{
Expand All @@ -16,7 +19,7 @@ use odra_core::{
Key as CasperKey, PublicKey, RuntimeArgs, SecretKey, TimeDiff, Timestamp, U512
},
consts::*,
Address, CallDef, ExecutionError, OdraError, OdraResult
Address, CallDef, ExecutionError, OdraError
};

use crate::casper_node_port::query_balance::{
Expand Down Expand Up @@ -111,7 +114,7 @@ impl CasperClient {
}

/// Gets a value from the storage
pub fn get_value(&self, address: &Address, key: &[u8]) -> Option<Bytes> {
pub fn get_value(&self, address: &Address, key: &[u8]) -> Result<Bytes> {
self.query_state_dictionary(address, unsafe { from_utf8_unchecked(key) })
}

Expand Down Expand Up @@ -248,18 +251,16 @@ impl CasperClient {
}

/// Get the event bytes from storage
pub fn get_event(&self, contract_address: &Address, index: u32) -> Result<Bytes, OdraError> {
let event_bytes: Bytes =
self.query_dict(contract_address, "__events".to_string(), index.to_string())?;
Ok(event_bytes)
pub fn get_event(&self, contract_address: &Address, index: u32) -> OdraResult<Bytes> {
self.query_dict(contract_address, "__events".to_string(), index.to_string())
}

/// Get the events count from storage
pub fn events_count(&self, contract_address: &Address) -> u32 {
let uref = self
.query_contract_named_key(contract_address, "__events_length")
.unwrap();
self.query_uref(uref).unwrap()
pub fn events_count(&self, contract_address: &Address) -> Option<u32> {
match self.query_contract_named_key(contract_address, "__events_length") {
Ok(uref) => self.query_uref(uref).ok(),
Err(_) => None
}
}

/// Query the node for the current state root hash.
Expand All @@ -281,9 +282,11 @@ impl CasperClient {
contract_address: &Address,
dictionary_name: String,
dictionary_item_key: String
) -> Result<T, OdraError> {
) -> OdraResult<T> {
let state_root_hash = self.get_state_root_hash();
let contract_hash = self.query_global_state_for_contract_hash(contract_address);
let contract_hash = self
.query_global_state_for_contract_hash(contract_address)
.map_err(|_| OdraError::ExecutionError(ExecutionError::TypeMismatch))?;
let contract_hash = contract_hash
.to_formatted_string()
.replace("contract-", "hash-");
Expand All @@ -306,10 +309,9 @@ impl CasperClient {
);
let result: GetDictionaryItemResult = self.post_request(request);
match result.stored_value {
CLValue(value) => {
let return_value: T = value.into_t().unwrap();
Ok(return_value)
}
CLValue(value) => value
.into_t()
.map_err(|_| OdraError::ExecutionError(ExecutionError::UnwrapError)),
_ => Err(OdraError::ExecutionError(ExecutionError::TypeMismatch))
}
}
Expand All @@ -319,9 +321,11 @@ impl CasperClient {
contract_address: &Address,
dictionary_name: String,
dictionary_item_key: String
) -> Result<Bytes, OdraError> {
) -> OdraResult<Bytes> {
let state_root_hash = self.get_state_root_hash();
let contract_hash = self.query_global_state_for_contract_hash(contract_address);
let contract_hash = self
.query_global_state_for_contract_hash(contract_address)
.map_err(|_| OdraError::ExecutionError(ExecutionError::TypeMismatch))?;
let contract_hash = contract_hash
.to_formatted_string()
.replace("contract-", "hash-");
Expand All @@ -344,10 +348,7 @@ impl CasperClient {
);
let result: GetDictionaryItemResult = self.post_request(request);
match result.stored_value {
CLValue(value) => {
let return_value: Bytes = Bytes::from(value.inner_bytes().as_slice());
Ok(return_value)
}
CLValue(value) => Ok(value.inner_bytes().as_slice().into()),
_ => Err(OdraError::ExecutionError(ExecutionError::TypeMismatch))
}
}
Expand All @@ -357,10 +358,10 @@ impl CasperClient {
&self,
contract_address: &Address,
key: T
) -> Option<URef> {
) -> Result<URef> {
let contract_state =
self.query_global_state_path(contract_address, key.as_ref().to_string());
let uref_str = match contract_state.as_ref().unwrap().stored_value.clone() {
self.query_global_state_path(contract_address, key.as_ref().to_string())?;
let uref_str = match contract_state.stored_value.clone() {
Contract(contract) => contract.named_keys().find_map(|named_key| {
if named_key.name == key.as_ref() {
Some(named_key.key.clone())
Expand All @@ -370,14 +371,14 @@ impl CasperClient {
}),
_ => panic!("Not a contract")
}
.unwrap_or_else(|| {
panic!(
.ok_or_else(|| {
anyhow::anyhow!(
"Couldn't get named key {} from contract state at address {:?}",
key.as_ref(),
contract_address
)
});
URef::from_formatted_str(&uref_str).ok()
})?;
URef::from_formatted_str(&uref_str).map_err(|_| anyhow::anyhow!("Invalid URef format"))
}

/// Query the node for the deploy state.
Expand Down Expand Up @@ -428,15 +429,19 @@ impl CasperClient {
}

/// Find the contract hash by the contract package hash.
fn query_global_state_for_contract_hash(&self, address: &Address) -> ContractHash {
let key = CasperKey::Hash(address.as_contract_package_hash().unwrap().value());
fn query_global_state_for_contract_hash(&self, address: &Address) -> Result<ContractHash> {
let contract_package_hash = address
.as_contract_package_hash()
.context("Not a contract package hash")?;
let key = CasperKey::Hash(contract_package_hash.value());
let result = self.query_global_state(&key);
let result_as_json = serde_json::to_value(result).unwrap();
let result_as_json = serde_json::to_value(result).context("Couldn't parse result")?;
let contract_hash: &str = result_as_json["stored_value"]["ContractPackage"]["versions"][0]
["contract_hash"]
.as_str()
.unwrap();
ContractHash::from_formatted_str(contract_hash).unwrap()
.context("Couldn't get contract hash")?;
ContractHash::from_formatted_str(contract_hash)
.map_err(|_| anyhow::anyhow!("Invalid contract hash format"))
}

/// Deploy the contract.
Expand Down Expand Up @@ -476,7 +481,7 @@ impl CasperClient {
&self,
addr: Address,
call_def: CallDef
) -> Result<Bytes, OdraError> {
) -> OdraResult<Bytes> {
log::info(format!(
"Calling {:?} with entrypoint \"{}\" through proxy.",
addr.to_string(),
Expand Down Expand Up @@ -561,8 +566,8 @@ impl CasperClient {
&self,
address: &Address,
_path: String
) -> Option<QueryGlobalStateResult> {
let hash = self.query_global_state_for_contract_hash(address);
) -> Result<QueryGlobalStateResult> {
let hash = self.query_global_state_for_contract_hash(address)?;
let key = CasperKey::Hash(hash.value());
let state_root_hash = self.get_state_root_hash();
let params = QueryGlobalStateParams {
Expand All @@ -578,7 +583,7 @@ impl CasperClient {
"id": 1,
}
);
self.post_request(request)
Ok(self.post_request(request))
}

fn query_global_state(&self, key: &CasperKey) -> QueryGlobalStateResult {
Expand All @@ -599,9 +604,9 @@ impl CasperClient {
self.post_request(request)
}

fn query_state_dictionary(&self, address: &Address, key: &str) -> Option<Bytes> {
fn query_state_dictionary(&self, address: &Address, key: &str) -> Result<Bytes> {
let state_root_hash = self.get_state_root_hash();
let contract_hash = self.query_global_state_for_contract_hash(address);
let contract_hash = self.query_global_state_for_contract_hash(address)?;
let contract_hash = contract_hash
.to_formatted_string()
.replace("contract-", "hash-");
Expand All @@ -623,32 +628,36 @@ impl CasperClient {
}
);
let result: Option<GetDictionaryItemResult> = self.post_request(request);
result.map(|result| {
let result_as_json = serde_json::to_value(result).unwrap();
let result = result_as_json["stored_value"]["CLValue"]["bytes"]
.as_str()
.unwrap();
let bytes = hex::decode(result).unwrap();
let (value, _) = FromBytes::from_bytes(&bytes).unwrap();
value
})
result
.context("Couldn't get dictionary item")
.and_then(|result| {
let result_as_json =
serde_json::to_value(result).context("Couldn't parse result")?;
let result = result_as_json["stored_value"]["CLValue"]["bytes"]
.as_str()
.context("Couldn't get bytes")?;
let bytes = hex::decode(result).context("Couldn't decode bytes")?;
let (value, _) = FromBytes::from_bytes(&bytes)
.map_err(|_| anyhow::anyhow!("Couldn't parse bytes"))?;

Ok(value)
})
}

fn query_uref<T: CLTyped + FromBytes>(&self, uref: URef) -> OdraResult<T> {
let result = self.query_global_state(&CasperKey::URef(uref));
match result.stored_value {
CLValue(value) => {
let return_value: T = value.into_t().unwrap();
Ok(return_value)
}
CLValue(value) => value
.into_t()
.map_err(|_| OdraError::ExecutionError(ExecutionError::UnwrapError)),
_ => Err(OdraError::ExecutionError(ExecutionError::TypeMismatch))
}
}

fn query_uref_bytes(&self, uref: URef) -> OdraResult<Bytes> {
let result = self.query_global_state(&CasperKey::URef(uref));
match result.stored_value {
CLValue(value) => Ok(Bytes::from(value.inner_bytes().as_slice())),
CLValue(value) => Ok(value.inner_bytes().as_slice().into()),
_ => Err(OdraError::ExecutionError(ExecutionError::TypeMismatch))
}
}
Expand Down
Loading