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

Refactor Engine::get_state #99

Merged
merged 1 commit into from
May 20, 2021
Merged

Refactor Engine::get_state #99

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 20 additions & 5 deletions src/engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,20 @@ impl ExitIntoResult for ExitReason {
}
}

pub enum EngineStateError {
NotFound,
DeserializationFailed,
}

impl AsRef<[u8]> for EngineStateError {
fn as_ref(&self) -> &[u8] {
match self {
Self::NotFound => b"ERR_STATE_NOT_FOUND",
Self::DeserializationFailed => b"ERR_STATE_CORRUPTED",
}
}
}

/// Engine internal state, mostly configuration.
/// Should not contain anything large or enumerable.
#[derive(BorshSerialize, BorshDeserialize, Default)]
Expand Down Expand Up @@ -134,8 +148,8 @@ const CONFIG: &Config = &Config::istanbul();
const STATE_KEY: &[u8; 5] = b"STATE";

impl Engine {
pub fn new(origin: Address) -> Self {
Self::new_with_state(Engine::get_state(), origin)
pub fn new(origin: Address) -> Result<Self, EngineStateError> {
Engine::get_state().map(|state| Self::new_with_state(state, origin))
}

pub fn new_with_state(state: EngineState, origin: Address) -> Self {
Expand All @@ -151,10 +165,11 @@ impl Engine {
}

/// Fails if state is not found.
pub fn get_state() -> EngineState {
pub fn get_state() -> Result<EngineState, EngineStateError> {
match sdk::read_storage(&bytes_to_key(KeyPrefix::Config, STATE_KEY)) {
None => Default::default(),
Some(bytes) => EngineState::try_from_slice(&bytes).expect("ERR_DESER"),
None => Err(EngineStateError::NotFound),
Some(bytes) => EngineState::try_from_slice(&bytes)
.map_err(|_| EngineStateError::DeserializationFailed),
}
}

Expand Down
34 changes: 17 additions & 17 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ mod contract {
/// Should be called on deployment.
#[no_mangle]
pub extern "C" fn new() {
let state = Engine::get_state();
if !state.owner_id.is_empty() {
if let Ok(state) = Engine::get_state() {
require_owner_only(&state);
}

let args: NewCallArgs = sdk::read_input_borsh().sdk_unwrap();
Engine::set_state(args.into());
}
Expand All @@ -95,26 +95,26 @@ mod contract {
/// Get owner account id for this contract.
#[no_mangle]
pub extern "C" fn get_owner() {
let state = Engine::get_state();
let state = Engine::get_state().sdk_unwrap();
sdk::return_output(state.owner_id.as_bytes());
}

/// Get bridge prover id for this contract.
#[no_mangle]
pub extern "C" fn get_bridge_prover() {
let state = Engine::get_state();
let state = Engine::get_state().sdk_unwrap();
sdk::return_output(state.bridge_prover_id.as_bytes());
}

/// Get chain id for this contract.
#[no_mangle]
pub extern "C" fn get_chain_id() {
sdk::return_output(&Engine::get_state().chain_id)
sdk::return_output(&Engine::get_state().sdk_unwrap().chain_id)
}

#[no_mangle]
pub extern "C" fn get_upgrade_index() {
let state = Engine::get_state();
let state = Engine::get_state().sdk_unwrap();
let index = sdk::read_u64(&bytes_to_key(KeyPrefix::Config, CODE_STAGE_KEY))
.sdk_expect("ERR_NO_UPGRADE")
.sdk_unwrap();
Expand All @@ -124,7 +124,7 @@ mod contract {
/// Stage new code for deployment.
#[no_mangle]
pub extern "C" fn stage_upgrade() {
let state = Engine::get_state();
let state = Engine::get_state().sdk_unwrap();
require_owner_only(&state);
sdk::read_input_and_store(&bytes_to_key(KeyPrefix::Config, CODE_KEY));
sdk::write_storage(
Expand All @@ -136,7 +136,7 @@ mod contract {
/// Deploy staged upgrade.
#[no_mangle]
pub extern "C" fn deploy_upgrade() {
let state = Engine::get_state();
let state = Engine::get_state().sdk_unwrap();
let index = sdk::read_u64(&bytes_to_key(KeyPrefix::Config, CODE_STAGE_KEY))
.sdk_expect("ERR_NO_UPGRADE")
.sdk_unwrap();
Expand All @@ -154,7 +154,7 @@ mod contract {
#[no_mangle]
pub extern "C" fn deploy_code() {
let input = sdk::read_input();
let mut engine = Engine::new(predecessor_address());
let mut engine = Engine::new(predecessor_address()).sdk_unwrap();
Engine::deploy_code_with_input(&mut engine, input)
.map(|res| res.try_to_vec().sdk_expect("ERR_SERIALIZE"))
.sdk_process();
Expand All @@ -165,7 +165,7 @@ mod contract {
#[no_mangle]
pub extern "C" fn call() {
let args: FunctionCallArgs = sdk::read_input_borsh().sdk_unwrap();
let mut engine = Engine::new(predecessor_address());
let mut engine = Engine::new(predecessor_address()).sdk_unwrap();
Engine::call_with_args(&mut engine, args)
.map(|res| res.try_to_vec().sdk_expect("ERR_SERIALIZE"))
.sdk_process();
Expand All @@ -183,7 +183,7 @@ mod contract {
let signed_transaction =
EthSignedTransaction::decode(&Rlp::new(&input)).sdk_expect("ERR_INVALID_TX");

let state = Engine::get_state();
let state = Engine::get_state().sdk_unwrap();

// Validate the chain ID, if provided inside the signature:
if let Some(chain_id) = signed_transaction.chain_id() {
Expand Down Expand Up @@ -219,7 +219,7 @@ mod contract {
#[no_mangle]
pub extern "C" fn meta_call() {
let input = sdk::read_input();
let state = Engine::get_state();
let state = Engine::get_state().sdk_unwrap();
let domain_separator = crate::meta_parsing::near_erc712_domain(U256::from(state.chain_id));
let meta_call_args = crate::meta_parsing::parse_meta_call(
&domain_separator,
Expand Down Expand Up @@ -248,7 +248,7 @@ mod contract {
let input = sdk::read_input();
let dest_address = Address::from_slice(&input);
let source_address = predecessor_address();
let engine = Engine::new(source_address);
let engine = Engine::new(source_address).sdk_unwrap();

engine.increment_nonce(&source_address);

Expand All @@ -260,7 +260,7 @@ mod contract {
pub extern "C" fn register_relayer() {
let relayer_address = sdk::read_input_arr20().sdk_unwrap();

let mut engine = Engine::new(predecessor_address());
let mut engine = Engine::new(predecessor_address()).sdk_unwrap();
engine.register_relayer(
sdk::predecessor_account_id().as_slice(),
Address(relayer_address),
Expand All @@ -287,7 +287,7 @@ mod contract {
#[no_mangle]
pub extern "C" fn view() {
let args: ViewCallArgs = sdk::read_input_borsh().sdk_unwrap();
let engine = Engine::new(Address::from_slice(&args.sender));
let engine = Engine::new(Address::from_slice(&args.sender)).sdk_unwrap();
let result = Engine::view_with_args(&engine, args);
result.sdk_process()
}
Expand Down Expand Up @@ -327,7 +327,7 @@ mod contract {
#[cfg(feature = "evm_bully")]
#[no_mangle]
pub extern "C" fn begin_chain() {
let mut state = Engine::get_state();
let mut state = Engine::get_state().sdk_unwrap();
require_owner_only(&state);
let input = sdk::read_input();
let args: BeginBlockArgs = sdk::read_input_borsh().sdk_unwrap();
Expand All @@ -347,7 +347,7 @@ mod contract {
#[cfg(feature = "evm_bully")]
#[no_mangle]
pub extern "C" fn begin_block() {
let state = Engine::get_state();
let state = Engine::get_state().sdk_unwrap();
require_owner_only(&state);
let input = sdk::read_input();
let _args: BeginBlockArgs = sdk::read_input_borsh().sdk_unwrap();
Expand Down