Skip to content

impl burning of gas, add caller_token to AccountMeta of Cancel operation #206

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

Merged
s-medvedev merged 10 commits into from
Sep 24, 2021
Merged

impl burning of gas, add caller_token to AccountMeta of Cancel operation #206

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9cfd5c9
impl burning of gas, add caller_token to AccountMeta of Cancel operation
sinev-valentine Sep 3, 2021
d437d62
fix last commit
sinev-valentine Sep 3, 2021
aa76943
fix cancel
sinev-valentine Sep 3, 2021
8356ad1
rollback account_meta changes
sinev-valentine Sep 3, 2021
a6affab
fix test_caseSuccessRunOtherTransactionAfterCancel
sinev-valentine Sep 3, 2021
db9301a
replace burn to transfer
sinev-valentine Sep 7, 2021
939f937
comments apply: add caller_token to Cancel instuction
sinev-valentine Sep 17, 2021
b17eb0c
fix last commit
sinev-valentine Sep 20, 2021
b38e911
Merge branch 'develop' into 180_burn_gas_during_cancel
sinev-valentine Sep 24, 2021
62e5e50
fix merge from develop
sinev-valentine Sep 24, 2021
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
Prev Previous commit
Next Next commit
fix cancel
  • Loading branch information
@sinev-valentine
sinev-valentine committed Sep 3, 2021
commit aa7694391eb7091a9995e6fed1768c5b54a6633d
8 changes: 4 additions & 4 deletions evm_loader/program/src/entrypoint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,13 +538,13 @@ fn process_instruction<'a>(
}


let mut storage = StorageAccount::restore(storage_info, operator_sol_info).map_err(|err| {
let storage = StorageAccount::restore(storage_info, operator_sol_info).map_err(|err| {
if err == ProgramError::InvalidAccountData {EvmLoaderError::StorageAccountUninitialized.into()}
else {err}
})?;
storage.check_accounts(program_id, trx_accounts)?;

let mut account_storage = ProgramAccountStorage::new(program_id, trx_accounts)?;
let account_storage = ProgramAccountStorage::new(program_id, trx_accounts)?;
let mut caller_info_data = AccountData::unpack(&account_storage.get_caller_account_info().ok_or_else(||E!(ProgramError::InvalidArgument))?.data.borrow())?;
match caller_info_data {
AccountData::Account(ref mut acc) => {
Expand All @@ -560,10 +560,10 @@ fn process_instruction<'a>(
_ => return Err!(ProgramError::InvalidAccountData),
};

let backend = SolanaBackend::new(&mut account_storage, Some(trx_accounts));
let backend = SolanaBackend::new(&account_storage, Some(trx_accounts));
debug_print!(" backend initialized");

let executor = Machine::restore(&mut storage, backend);
let executor = Machine::restore(&storage, backend);
debug_print!("Executor restored");

let executor_state = executor.into_state();
Expand Down