feat: Use stateful instruction in AUTH #22
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fgimenez
force-pushed
the
fgimenez/use-stateful-instruction-in-auth
branch
from
d93216c
to
0d4bedd
Compare
fgimenez
commented
Mar 22, 2024
mattsse
requested changes
Mar 22, 2024
fgimenez
force-pushed
the
fgimenez/use-stateful-instruction-in-auth
branch
from
f27d596
to
0056c71
Compare
fgimenez
added
C-enhancement
fgimenez
force-pushed
the
fgimenez/use-stateful-instruction-in-auth
branch
from
691ae79
to
7ed825b
Compare
fgimenez
force-pushed
the
fgimenez/use-stateful-instruction-in-auth
branch
from
7ed825b
to
08f6307
Compare
mattsse
reviewed
Mar 25, 2024
crates/instructions/src/eip3074.rs
Outdated
| }; | ||
|
|
||
| ctx.set_named_variable(AUTORIZED_VAR_NAME, Vec::from(to_persist_authority)); |
There was a problem hiding this comment.
I see we're setting this but, we don't read from it yet?
There was a problem hiding this comment.
authcall will read from this, auth doesn't afaik
Rjected
approved these changes
Mar 26, 2024
| interp.shared_memory.resize(rounded_size); | ||
| } | ||
| } | ||
| resize_memory!(interp, offset, length); |
Comment on lines
+4
to
+12
| /// Context variables to be used in instructions. The data set here is expected | ||
| /// to live for the duration of a single transaction. | ||
| /// Similar to TStore for arbitrary data. | ||
| pub struct InstructionsContext { | ||
| /// Contains the actual variables. Is meant to be accessed both for reads | ||
| /// and writes using interior mutability, so that the Instruction and | ||
| /// BoxedInstruction signatures are observed. | ||
| inner: Rc<RefCell<HashMap<&'static str, Vec<u8>>>>, | ||
| } |
Comment on lines
+55
to
+100
| let to_addr = address!("ffffffffffffffffffffffffffffffffffffffff"); | ||
|
|
||
| // initialize the custom context and make sure it's None for a given key | ||
| let custom_context = InstructionsContext::default(); | ||
| let key = "my-key"; | ||
| assert_eq!(custom_context.get(key), None); | ||
|
|
||
| let to_capture_instructions = custom_context.clone(); | ||
| let to_capture_post_execution = custom_context.clone(); | ||
| let mut evm = Evm::builder() | ||
| .with_db(InMemoryDB::default()) | ||
| .modify_db(|db| { | ||
| db.insert_account_info(to_addr, AccountInfo::new(U256::ZERO, 0, code_hash, code)) | ||
| }) | ||
| .modify_tx_env(|tx| tx.transact_to = TransactTo::Call(to_addr)) | ||
| .append_handler_register_box(Box::new(move |handler| { | ||
| let writer_context = to_capture_instructions.clone(); | ||
| let writer_instruction = Box::new( | ||
| move |_interp: &mut Interpreter, _host: &mut Evm<'_, (), InMemoryDB>| { | ||
| // write into the context variable. | ||
| writer_context.set(key, vec![0x01, 0x02]); | ||
| }, | ||
| ); | ||
| let reader_context = to_capture_instructions.clone(); | ||
| let reader_instruction = Box::new( | ||
| move |_interp: &mut Interpreter, _host: &mut Evm<'_, (), InMemoryDB>| { | ||
| // read from context variable and clear. | ||
| assert_eq!(reader_context.get(key).unwrap(), vec![0x01, 0x02]); | ||
| }, | ||
| ); | ||
|
|
||
| let mut table = handler.take_instruction_table(); | ||
| table = table.map(|mut table| { | ||
| table.insert_boxed(0xEE, writer_instruction); | ||
| table.insert_boxed(0xEF, reader_instruction); | ||
| table | ||
| }); | ||
| handler.instruction_table = table; | ||
|
|
||
| let post_execution_context = to_capture_post_execution.clone(); | ||
| #[allow(clippy::arc_with_non_send_sync)] | ||
| { | ||
| handler.post_execution.end = Arc::new(move |_, outcome: _| { | ||
| post_execution_context.clear(); | ||
| outcome | ||
| }); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Towards #5
Includes the changes from bluealloy/revm#1194 to use stateful instructions.
CustomContextwith an address for bothAUTHandAUTHCALLAUTHimplementation to modify the context's address with the extracted authority (default address if the process failed).