This repository has been archived by the owner on Jul 5, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 854
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement some opcodes in bus-mapping (#167)
- Implement all the opcodes already implemented in the circuit, and some
more.
- Add convencience `map` methods to StackAddress and MemoryAddress.
- New implemented opcodes in bus-mapping:
- All unary opcodes: ISZERO, NOT.
- All binary opcodes: ADD, SUB, MUL, DIV, SDIV, MOD, SMOD,
SIGNEXTEND, LT, GT, SLT, SGT, EQ, AND, OR, XOR, BYTE, SHL, SHR,
SAR.
- All ternary opcodes: ADDMOD, MULMOD.
- MSTORE
- PC
- JUMPDEST
- PUSH2..32
- DUP1..16
- SWAP1..16- Loading branch information
Showing
14 changed files
with
910 additions
and
108 deletions.
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| use super::Opcode; | ||
| use crate::circuit_input_builder::CircuitInputStateRef; | ||
| use crate::eth_types::GethExecStep; | ||
| use crate::{ | ||
| operation::{StackOp, RW}, | ||
| Error, | ||
| }; | ||
|
|
||
| /// Placeholder structure used to implement [`Opcode`] trait over it corresponding to the | ||
| /// `OpcodeId::DUP*` `OpcodeId`. | ||
| #[derive(Debug, Copy, Clone)] | ||
| pub(crate) struct Dup<const N: usize>; | ||
|
|
||
| impl<const N: usize> Opcode for Dup<N> { | ||
| fn gen_associated_ops( | ||
| state: &mut CircuitInputStateRef, | ||
| steps: &[GethExecStep], | ||
| ) -> Result<(), Error> { | ||
| let step = &steps[0]; | ||
|
|
||
| let stack_value_read = step.stack.nth_last(N - 1)?; | ||
| let stack_position = step.stack.nth_last_filled(N - 1); | ||
| state.push_op(StackOp::new(RW::READ, stack_position, stack_value_read)); | ||
|
|
||
| state.push_op(StackOp::new( | ||
| RW::WRITE, | ||
| step.stack.last_filled().map(|a| a - 1), | ||
| stack_value_read, | ||
| )); | ||
|
|
||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod dup_tests { | ||
| use super::*; | ||
| use crate::{ | ||
| bytecode, | ||
| circuit_input_builder::{ | ||
| CircuitInputBuilder, ExecStep, Transaction, TransactionContext, | ||
| }, | ||
| evm::StackAddress, | ||
| mock, word, | ||
| }; | ||
| use pretty_assertions::assert_eq; | ||
|
|
||
| #[test] | ||
| fn dup_opcode_impl() -> Result<(), Error> { | ||
| let code = bytecode! { | ||
| PUSH1(0x1) | ||
| PUSH1(0x2) | ||
| PUSH1(0x3) | ||
| #[start] // [1,2,3] | ||
| DUP1 // [1,2,3,3] | ||
| DUP3 // [1,2,3,3,2] | ||
| DUP5 // [1,2,3,3,2,1] | ||
| STOP | ||
| }; | ||
|
|
||
| // Get the execution steps from the external tracer | ||
| let block = | ||
| mock::BlockData::new_single_tx_trace_code_at_start(&code).unwrap(); | ||
|
|
||
| let mut builder = CircuitInputBuilder::new( | ||
| block.eth_block.clone(), | ||
| block.block_ctants.clone(), | ||
| ); | ||
| builder.handle_tx(&block.eth_tx, &block.geth_trace).unwrap(); | ||
|
|
||
| let mut test_builder = CircuitInputBuilder::new( | ||
| block.eth_block, | ||
| block.block_ctants.clone(), | ||
| ); | ||
| let mut tx = Transaction::new(&block.eth_tx); | ||
| let mut tx_ctx = TransactionContext::new(&block.eth_tx); | ||
|
|
||
| // Generate steps corresponding to DUP1, DUP3, DUP5 | ||
| for (i, word) in [word!("0x3"), word!("0x2"), word!("0x1")] | ||
| .iter() | ||
| .enumerate() | ||
| { | ||
| let mut step = ExecStep::new( | ||
| &block.geth_trace.struct_logs[i], | ||
| test_builder.block_ctx.gc, | ||
| ); | ||
| let mut state_ref = | ||
| test_builder.state_ref(&mut tx, &mut tx_ctx, &mut step); | ||
|
|
||
| state_ref.push_op(StackOp::new( | ||
| RW::READ, | ||
| StackAddress(1024 - 3 + i), | ||
| *word, | ||
| )); | ||
|
|
||
| state_ref.push_op(StackOp::new( | ||
| RW::WRITE, | ||
| StackAddress(1024 - 4 - i), | ||
| *word, | ||
| )); | ||
|
|
||
| tx.steps_mut().push(step); | ||
| } | ||
|
|
||
| test_builder.block.txs_mut().push(tx); | ||
|
|
||
| // Compare first 3 steps bus mapping instance | ||
| for i in 0..3 { | ||
| assert_eq!( | ||
| builder.block.txs()[0].steps()[i].bus_mapping_instance, | ||
| test_builder.block.txs()[0].steps()[i].bus_mapping_instance | ||
| ); | ||
| } | ||
| // Compare containers | ||
| assert_eq!(builder.block.container, test_builder.block.container); | ||
|
|
||
| Ok(()) | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| use super::Opcode; | ||
| use crate::circuit_input_builder::CircuitInputStateRef; | ||
| use crate::eth_types::GethExecStep; | ||
| use crate::Error; | ||
|
|
||
| /// Placeholder structure used to implement [`Opcode`] trait over it corresponding to the | ||
| /// [`OpcodeId::JUMPDEST`](crate::evm::OpcodeId::JUMPDEST) `OpcodeId`. | ||
| #[derive(Debug, Copy, Clone)] | ||
| pub(crate) struct Jumpdest; | ||
|
|
||
| impl Opcode for Jumpdest { | ||
| fn gen_associated_ops( | ||
| _state: &mut CircuitInputStateRef, | ||
| _steps: &[GethExecStep], | ||
| ) -> Result<(), Error> { | ||
| // Jumpdest does not generate any operations | ||
| Ok(()) | ||
| } | ||
| } |
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
Oops, something went wrong.