logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-11 10:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
plonky2/evm/src/cpu/kernel/aggregator.rs

183 lines
8.6 KiB
Rust
Raw Normal View History

Parse and assemble kernel functions (#567) * Parse and assemble kernel functions Written in "EVM++" assembly. Later on we will add some priviledged opcodes (in unused opcode ordinals), making it an extension of EVM bytecode. I don't think there's much of a standard for EVM assembly, but I loosely based the syntax on this [proposal](https://gist.github.com/axic/17ddbbce4738ccf4040d30cbb5de484e). * PR feedback * tweaks for consistency * terminology tweaks * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org>
2022-06-20 20:32:29 -07:00
//! Loads each kernel assembly file and concatenates them.
use itertools::Itertools;
Continue work on bootstrapping The kernel is hashed using a Keccak based sponge for now. We could switch to Poseidon later if our kernel grows too large. Note that we use simple zero-padding (pad0*) instead of the standard pad10* rule. It's simpler, and we don't care that the prover can add extra 0s at the end of the code. The program counter can never reach those bytes, and even if it could, they'd be 0 anyway given the EVM's zero-initialization rule. In one CPU row, we can do a whole Keccak hash (via the CTL), absorbing 136 bytes. But we can't actually bootstrap that many bytes of kernel code in one row, because we're also limited by memory bandwidth. Currently we can write 4 bytes of the kernel to memory in one row. So we treat the `keccak_input_limbs` columns as a buffer. We gradually fill up this buffer, 4 bytes (one `u32` word) at a time. Every `136 / 4 = 34` rows, the buffer will be full, so at that point we activate the Keccak CTL to absorb the buffer.
2022-07-14 11:31:47 -07:00
use once_cell::sync::Lazy;
Parse and assemble kernel functions (#567) * Parse and assemble kernel functions Written in "EVM++" assembly. Later on we will add some priviledged opcodes (in unused opcode ordinals), making it an extension of EVM bytecode. I don't think there's much of a standard for EVM assembly, but I loosely based the syntax on this [proposal](https://gist.github.com/axic/17ddbbce4738ccf4040d30cbb5de484e). * PR feedback * tweaks for consistency * terminology tweaks * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org>
2022-06-20 20:32:29 -07:00
use super::assembler::{assemble, Kernel};
More constants for kernel ASM - `GlobalMetadata` - offsets for global kernel variables in memory - `ContextMetadata` - offsets for context-specific kernel variables in memory - `GAS_CONSTANTS`, based on the yellowpaper Also move constants to a separate module since `aggregator` was getting long.
2022-08-01 14:49:28 -07:00
use crate::cpu::kernel::constants::evm_constants;
Parse and assemble kernel functions (#567) * Parse and assemble kernel functions Written in "EVM++" assembly. Later on we will add some priviledged opcodes (in unused opcode ordinals), making it an extension of EVM bytecode. I don't think there's much of a standard for EVM assembly, but I loosely based the syntax on this [proposal](https://gist.github.com/axic/17ddbbce4738ccf4040d30cbb5de484e). * PR feedback * tweaks for consistency * terminology tweaks * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org>
2022-06-20 20:32:29 -07:00
use crate::cpu::kernel::parser::parse;
Continue work on bootstrapping The kernel is hashed using a Keccak based sponge for now. We could switch to Poseidon later if our kernel grows too large. Note that we use simple zero-padding (pad0*) instead of the standard pad10* rule. It's simpler, and we don't care that the prover can add extra 0s at the end of the code. The program counter can never reach those bytes, and even if it could, they'd be 0 anyway given the EVM's zero-initialization rule. In one CPU row, we can do a whole Keccak hash (via the CTL), absorbing 136 bytes. But we can't actually bootstrap that many bytes of kernel code in one row, because we're also limited by memory bandwidth. Currently we can write 4 bytes of the kernel to memory in one row. So we treat the `keccak_input_limbs` columns as a buffer. We gradually fill up this buffer, 4 bytes (one `u32` word) at a time. Every `136 / 4 = 34` rows, the buffer will be full, so at that point we activate the Keccak CTL to absorb the buffer.
2022-07-14 11:31:47 -07:00
pub static KERNEL: Lazy<Kernel> = Lazy::new(combined_kernel);
Parse and assemble kernel functions (#567) * Parse and assemble kernel functions Written in "EVM++" assembly. Later on we will add some priviledged opcodes (in unused opcode ordinals), making it an extension of EVM bytecode. I don't think there's much of a standard for EVM assembly, but I loosely based the syntax on this [proposal](https://gist.github.com/axic/17ddbbce4738ccf4040d30cbb5de484e). * PR feedback * tweaks for consistency * terminology tweaks * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org>
2022-06-20 20:32:29 -07:00
pub(crate) fn combined_kernel() -> Kernel {
let files = vec![
Gas fees go to coinbase
2023-03-12 21:35:04 -07:00
"global jumped_to_0: PANIC",
"global jumped_to_1: PANIC",
basic bignum
2023-02-10 16:31:35 -08:00
include_str!("asm/bignum/add.asm"),
addmul initial
2023-02-13 12:53:49 -08:00
include_str!("asm/bignum/addmul.asm"),
ge -> cmp and returns 0, 1, -1
2023-03-15 13:28:00 -07:00
include_str!("asm/bignum/cmp.asm"),
check for special cases and align with yellow paper
2023-04-19 14:55:19 -07:00
include_str!("asm/bignum/isone.asm"),
basic bignum
2023-02-10 16:31:35 -08:00
include_str!("asm/bignum/iszero.asm"),
modmul and modexp
2023-03-07 15:15:20 -08:00
include_str!("asm/bignum/modexp.asm"),
include_str!("asm/bignum/modmul.asm"),
basic bignum
2023-02-10 16:31:35 -08:00
include_str!("asm/bignum/mul.asm"),
include_str!("asm/bignum/shr.asm"),
include_str!("asm/bignum/util.asm"),
Misc EVM fixes
2023-03-06 21:57:51 -08:00
include_str!("asm/core/call.asm"),
Fix CALL gas (#1030) * Fix call gas + precompiles can be non-existent * Memory expansion before call gas * Minor * Add call_gas.asm * EIP-2200: If gasleft is less than or equal to gas stipend, fail the current call frame with ‘out of gas’ exception.
2023-05-11 14:45:32 +02:00
include_str!("asm/core/call_gas.asm"),
Core transaction processing logic With lots of TODOs to fill in afterward; this is just a start.
2022-07-28 15:46:36 -07:00
include_str!("asm/core/create.asm"),
include_str!("asm/core/create_addresses.asm"),
Rework CREATE, CREATE2 syscalls The old code was outdated in various ways, e.g. it was trying to share code with contract-creation txns, so I would ignore the diff and just look at the new code. Still a bunch of TODOs left here, like actually saving code that's returned.
2023-03-23 16:26:42 -07:00
include_str!("asm/core/create_contract_account.asm"),
Couple fixes & minor refactor
2023-03-19 22:35:53 -07:00
include_str!("asm/core/gas.asm"),
Core transaction processing logic With lots of TODOs to fill in afterward; this is just a start.
2022-07-28 15:46:36 -07:00
include_str!("asm/core/intrinsic_gas.asm"),
Save columns by verifying invalid opcodes in software (#701) * Save columns by verifying invalid opcodes in software * Autogenerate invalid opcode bitfield (Daniel comment) * Remove unnecessary panic label
2022-08-30 13:06:03 -07:00
include_str!("asm/core/invalid.asm"),
Kernel code to do jumpdest analysis
2022-11-20 12:46:15 -08:00
include_str!("asm/core/jumpdest_analysis.asm"),
Core transaction processing logic With lots of TODOs to fill in afterward; this is just a start.
2022-07-28 15:46:36 -07:00
include_str!("asm/core/nonce.asm"),
include_str!("asm/core/process_txn.asm"),
Combine all syscalls into one flag (#802) * Combine all syscalls into one flag * Minor: typo * Daniel PR comments
2022-11-07 12:29:28 -08:00
include_str!("asm/core/syscall.asm"),
include_str!("asm/core/syscall_stubs.asm"),
Core transaction processing logic With lots of TODOs to fill in afterward; this is just a start.
2022-07-28 15:46:36 -07:00
include_str!("asm/core/terminate.asm"),
include_str!("asm/core/transfer.asm"),
include_str!("asm/core/util.asm"),
Access lists (#937) * Working linear search * Working linear search for storage keys * Macros * Gas for wextaccount * Add origin and to to the access list * Handle precompiles * Fixes * Other opcodes * Access list SLOAD * Minor * Add TODO for SSTORE * Comments * Clippy * Minor * PR feedback: cold_access * PR feedback: simplify insert_accessed_addresses_no_return macro * Fix sys_selfdestruct * Store length in global metadata and store arrays in kernel memory * Truncate address in all *CALL syscalls
2023-03-23 20:22:25 +01:00
include_str!("asm/core/access_lists.asm"),
Implement LOG* gas and remove panic (#1054) * Implement LOG* gas and remove panic * Remove stubs
2023-05-24 10:29:34 +02:00
include_str!("asm/core/log.asm"),
Self-destruct list (#948)
2023-04-01 07:29:22 +02:00
include_str!("asm/core/selfdestruct_list.asm"),
Journal of state changes + state reversion (#1028) * Add segments and global metadata * Add journal asm files * Start revert * Revert access lists * Revert balance transfer * Revert code change * Revert nonce change * Revert storage change * Checkpoints * Add some journal entries * Add some journal entries * Add some journal entries * Fix revert * Checkpoint in sys_call * Minor * PR feedback * More checkpoints * Fix checkpoint check * Minor * Checkpoints in precompiles * Storage change checkpoint * Add touched addresses * Add touched addresses revert * Add touched addresses journal events * Delete all empty touch addresses * Implement selfdestruct * Update aggregator.rs
2023-05-12 13:04:46 +02:00
include_str!("asm/core/touched_addresses.asm"),
Precompiles interface (#983) * Start * Some sha256 test passing * precompiles folder * Files reorg * Progress * Minor * Start of sha2 interface * All call opcodes * ecrec * rip160 * Fix copy_returndata_to_mem * id * bn_add * bn_mul * TODOs for snarkv and blake2 * Comments * Use charge_gas_const when possible * Minor * Minor * Minor * PR feedback
2023-04-14 12:20:28 +02:00
include_str!("asm/core/precompiles/main.asm"),
include_str!("asm/core/precompiles/ecrec.asm"),
include_str!("asm/core/precompiles/sha256.asm"),
include_str!("asm/core/precompiles/rip160.asm"),
include_str!("asm/core/precompiles/id.asm"),
include_str!("asm/core/precompiles/expmod.asm"),
include_str!("asm/core/precompiles/bn_add.asm"),
include_str!("asm/core/precompiles/bn_mul.asm"),
include_str!("asm/core/precompiles/snarkv.asm"),
include_str!("asm/core/precompiles/blake2_f.asm"),
tests pass
2023-03-22 09:55:35 -07:00
include_str!("asm/curve/bls381/util.asm"),
miller loop
2022-11-29 20:43:49 -08:00
include_str!("asm/curve/bn254/curve_arithmetic/constants.asm"),
reorg
2022-11-17 13:18:13 -08:00
include_str!("asm/curve/bn254/curve_arithmetic/curve_add.asm"),
include_str!("asm/curve/bn254/curve_arithmetic/curve_mul.asm"),
reorg
2023-04-19 10:40:39 -07:00
include_str!("asm/curve/bn254/curve_arithmetic/final_exponent.asm"),
fix pairing code after big BN PR merge
2023-02-13 11:41:13 -08:00
include_str!("asm/curve/bn254/curve_arithmetic/glv.asm"),
reorg
2023-04-19 10:40:39 -07:00
include_str!("asm/curve/bn254/curve_arithmetic/miller_loop.asm"),
fix pairing code after big BN PR merge
2023-02-13 11:41:13 -08:00
include_str!("asm/curve/bn254/curve_arithmetic/msm.asm"),
reorg
2023-04-19 10:40:39 -07:00
include_str!("asm/curve/bn254/curve_arithmetic/pairing.asm"),
fix pairing code after big BN PR merge
2023-02-13 11:41:13 -08:00
include_str!("asm/curve/bn254/curve_arithmetic/precomputation.asm"),
twisted check
2023-04-19 23:06:02 -07:00
include_str!("asm/curve/bn254/curve_arithmetic/twisted_curve.asm"),
naming for global labels
2023-02-05 17:40:04 -08:00
include_str!("asm/curve/bn254/field_arithmetic/degree_6_mul.asm"),
include_str!("asm/curve/bn254/field_arithmetic/degree_12_mul.asm"),
tate
2022-11-28 14:56:36 -08:00
include_str!("asm/curve/bn254/field_arithmetic/frobenius.asm"),
reorg
2023-04-19 10:40:39 -07:00
include_str!("asm/curve/bn254/field_arithmetic/inverse.asm"),
improved prover input and test api
2023-01-21 13:19:07 +07:00
include_str!("asm/curve/bn254/field_arithmetic/util.asm"),
Add a asm/curve/ directory
2022-07-30 22:24:11 -07:00
include_str!("asm/curve/common.asm"),
include_str!("asm/curve/secp256k1/curve_add.asm"),
Move ecrecover
2022-07-31 09:24:04 -07:00
include_str!("asm/curve/secp256k1/ecrecover.asm"),
Add a asm/curve/ directory
2022-07-30 22:24:11 -07:00
include_str!("asm/curve/secp256k1/inverse_scalar.asm"),
Move ecrecover
2022-07-31 09:24:04 -07:00
include_str!("asm/curve/secp256k1/lift_x.asm"),
include_str!("asm/curve/secp256k1/moddiv.asm"),
Optimize `ecrecover` ASM (#840) * windowed mul * Working * Window of 4 bits * Fix * Comments * Unroll loop * Unroll loop * remove global * Minor * Minor * Implement `CALLVALUE, CALLDATALOAD, CALLDATASIZE, CALLDATACOPY` in interpreter * Minor * Doesn't work * Minor * Minor * wnaf msm * Working hardcoded values: 28657 opcodes * Working wnaf * Small wnaf optim * Precompute works * Working together * Bump to 129 bits * Working glv decomposition * Working MSM with GLV * Almost working * Working * ECC test folder * Working with real sig data * Fix tests + Clippy * Minor * Cleaning * Comments * Cleaning * Smaller glv test file * Print opcode count at the end of interpreter run * More constants * Add z3 proof that the GLV scalars are 129-bit or less * Minor change to z3 proof * Minor * Hamish's suggestion * Working * Cleaning * Clippy * PR feedback * Minor PR feedback
2023-01-31 19:23:54 +01:00
include_str!("asm/curve/secp256k1/glv.asm"),
include_str!("asm/curve/secp256k1/precomputation.asm"),
Optimize `ecMul` precompile (scalar multiplication on BN254) (#852) * windowed mul * Working * Window of 4 bits * Fix * Comments * Unroll loop * Unroll loop * remove global * Minor * Minor * Implement `CALLVALUE, CALLDATALOAD, CALLDATASIZE, CALLDATACOPY` in interpreter * Minor * Doesn't work * Minor * Minor * wnaf msm * Working hardcoded values: 28657 opcodes * Working wnaf * Small wnaf optim * Precompute works * Working together * Bump to 129 bits * Working glv decomposition * Working MSM with GLV * Almost working * Working * ECC test folder * Working with real sig data * Fix tests + Clippy * Minor * Cleaning * Comments * Cleaning * Smaller glv test file * Print opcode count at the end of interpreter run * More constants * Add z3 proof that the GLV scalars are 129-bit or less * Minor change to z3 proof * Move files and renaming fns * Testing * Fix BN GLV * BN precompute table * Working precompute * Working bn tests * Working * Minor * Minor * Use MULFP254 * Minor * Merge conflicts * Remove unused asm file * ECC fns renaming (#874) * PR feedback
2023-02-13 20:11:32 +01:00
include_str!("asm/curve/wnaf.asm"),
alphabetical
2022-10-03 14:10:10 -07:00
include_str!("asm/exp.asm"),
alphabetical
2022-10-18 10:42:11 -04:00
include_str!("asm/halt.asm"),
fixed blake2_f, and testing
2023-04-24 16:58:57 -07:00
include_str!("asm/hash/blake2/addresses.asm"),
include_str!("asm/hash/blake2/blake2_f.asm"),
rename blake2b
2023-04-25 14:55:44 -07:00
// include_str!("asm/hash/blake2/blake2b.asm"),
fixed blake2_f, and testing
2023-04-24 16:58:57 -07:00
// include_str!("asm/hash/blake2/compression.asm"),
include_str!("asm/hash/blake2/g_functions.asm"),
include_str!("asm/hash/blake2/hash.asm"),
include_str!("asm/hash/blake2/iv.asm"),
include_str!("asm/hash/blake2/ops.asm"),
include_str!("asm/hash/blake2/permutations.asm"),
blake initial
2022-12-09 09:34:12 -08:00
include_str!("asm/hash/ripemd/box.asm"),
include_str!("asm/hash/ripemd/compression.asm"),
include_str!("asm/hash/ripemd/constants.asm"),
include_str!("asm/hash/ripemd/functions.asm"),
include_str!("asm/hash/ripemd/main.asm"),
include_str!("asm/hash/ripemd/update.asm"),
include_str!("asm/hash/sha2/compression.asm"),
include_str!("asm/hash/sha2/constants.asm"),
remove blake storage
2023-02-15 19:11:22 -08:00
include_str!("asm/hash/sha2/main.asm"),
blake initial
2022-12-09 09:34:12 -08:00
include_str!("asm/hash/sha2/message_schedule.asm"),
include_str!("asm/hash/sha2/ops.asm"),
include_str!("asm/hash/sha2/temp_words.asm"),
include_str!("asm/hash/sha2/write_length.asm"),
Main function, txn processing loop
2022-09-29 23:09:32 -07:00
include_str!("asm/main.asm"),
Split up memory asm and add more helper functions
2022-08-03 22:09:36 -07:00
include_str!("asm/memory/core.asm"),
include_str!("asm/memory/memcpy.asm"),
basic bignum
2023-02-10 16:31:35 -08:00
include_str!("asm/memory/memset.asm"),
Packing memory operations
2022-08-03 22:54:17 -07:00
include_str!("asm/memory/metadata.asm"),
include_str!("asm/memory/packing.asm"),
Fixes to get test_simple_transfer working
2022-12-06 23:05:47 -08:00
include_str!("asm/memory/syscalls.asm"),
Split up memory asm and add more helper functions
2022-08-03 22:09:36 -07:00
include_str!("asm/memory/txn_fields.asm"),
MPT storage logic
2022-10-17 11:31:08 -07:00
include_str!("asm/mpt/accounts.asm"),
More directories for MPT logic
2022-10-16 22:55:09 -07:00
include_str!("asm/mpt/delete/delete.asm"),
MPT deletion (#1025) * First try * Fixes * Fix sstore * Comments * Clippy * Fix aggregator.rs * PR feedback
2023-05-11 14:56:10 +02:00
include_str!("asm/mpt/delete/delete_branch.asm"),
include_str!("asm/mpt/delete/delete_extension.asm"),
More directories for MPT logic
2022-10-16 22:55:09 -07:00
include_str!("asm/mpt/hash/hash.asm"),
include_str!("asm/mpt/hash/hash_trie_specific.asm"),
MPT hashing logic, part 1
2022-09-30 13:04:16 -07:00
include_str!("asm/mpt/hex_prefix.asm"),
More directories for MPT logic
2022-10-16 22:55:09 -07:00
include_str!("asm/mpt/insert/insert.asm"),
include_str!("asm/mpt/insert/insert_extension.asm"),
include_str!("asm/mpt/insert/insert_leaf.asm"),
include_str!("asm/mpt/insert/insert_trie_specific.asm"),
include_str!("asm/mpt/load/load.asm"),
include_str!("asm/mpt/load/load_trie_specific.asm"),
Basic MPT logic For now this contains most of the basic framework/structure. Logic for things like insertions will come later.
2022-09-18 09:45:31 -07:00
include_str!("asm/mpt/read.asm"),
MPT storage logic
2022-10-17 11:31:08 -07:00
include_str!("asm/mpt/storage/storage_read.asm"),
include_str!("asm/mpt/storage/storage_write.asm"),
Basic MPT logic For now this contains most of the basic framework/structure. Logic for things like insertions will come later.
2022-09-18 09:45:31 -07:00
include_str!("asm/mpt/util.asm"),
alphabetical
2022-10-03 14:10:10 -07:00
include_str!("asm/rlp/decode.asm"),
Fixes to get test_simple_transfer working
2022-12-06 23:05:47 -08:00
include_str!("asm/rlp/encode.asm"),
Doubly RLP-encode storage values
2023-04-03 21:35:08 -07:00
include_str!("asm/rlp/encode_rlp_scalar.asm"),
Fixes to get test_simple_transfer working
2022-12-06 23:05:47 -08:00
include_str!("asm/rlp/encode_rlp_string.asm"),
Unroll num_bytes Since it's in some code paths where speed is critical.
2022-10-03 14:40:49 -07:00
include_str!("asm/rlp/num_bytes.asm"),
alphabetical
2022-10-03 14:10:10 -07:00
include_str!("asm/rlp/read_to_memory.asm"),
EVM shift left/right operations (#801) * First parts of shift implementation. * Disable range check errors. * Tidy up ASM. * Update comments; fix some .sum() expressions. * First full draft of shift left/right. * Missed a +1. * Clippy. * Address Jacqui's comments. * Add comment. * Fix missing filter. * Address second round of comments from Jacqui.
2022-11-09 10:47:15 +11:00
include_str!("asm/shift.asm"),
Signed operations as syscalls (#933) * Implement syscalls for BYTE, SIGNEXTEND, SAR, SLT and SGT. * Implement SDIV and SMOD; minor documentation and tidying. * Implement EXP. * Add sys_byte to the syscall jumptable. * Test suite for signed syscalls. * Handle `EXIT_KERNEL` "properly". * Add gas charges; rename label. * Uppercase all opcodes. * Add test for BYTE; fix bug in BYTE. * Calculate and charge gas for calling `EXP`. * Fix gas calculation for `exponent = 0`. * Address Jacqui's comments. * Remove BYTE syscall as it will be implemented natively. * Oops, forgot to remove this bit.
2023-03-30 05:56:01 +11:00
include_str!("asm/signed.asm"),
Journal of state changes + state reversion (#1028) * Add segments and global metadata * Add journal asm files * Start revert * Revert access lists * Revert balance transfer * Revert code change * Revert nonce change * Revert storage change * Checkpoints * Add some journal entries * Add some journal entries * Add some journal entries * Fix revert * Checkpoint in sys_call * Minor * PR feedback * More checkpoints * Fix checkpoint check * Minor * Checkpoints in precompiles * Storage change checkpoint * Add touched addresses * Add touched addresses revert * Add touched addresses journal events * Delete all empty touch addresses * Implement selfdestruct * Update aggregator.rs
2023-05-12 13:04:46 +02:00
include_str!("asm/journal/journal.asm"),
include_str!("asm/journal/account_loaded.asm"),
include_str!("asm/journal/account_destroyed.asm"),
include_str!("asm/journal/account_touched.asm"),
include_str!("asm/journal/balance_transfer.asm"),
include_str!("asm/journal/nonce_change.asm"),
include_str!("asm/journal/storage_change.asm"),
include_str!("asm/journal/storage_loaded.asm"),
include_str!("asm/journal/code_change.asm"),
Add refund journal event and checkpoint after access address event (#1040)
2023-05-16 14:36:17 +02:00
include_str!("asm/journal/refund.asm"),
Minor fixes to returndata and create (#1043) * Fix returndata * Add AccountCreated event * returndatacopy_afterFailing_create.json passes * Fix
2023-05-17 10:06:12 +02:00
include_str!("asm/journal/account_created.asm"),
Journal of state changes + state reversion (#1028) * Add segments and global metadata * Add journal asm files * Start revert * Revert access lists * Revert balance transfer * Revert code change * Revert nonce change * Revert storage change * Checkpoints * Add some journal entries * Add some journal entries * Add some journal entries * Fix revert * Checkpoint in sys_call * Minor * PR feedback * More checkpoints * Fix checkpoint check * Minor * Checkpoints in precompiles * Storage change checkpoint * Add touched addresses * Add touched addresses revert * Add touched addresses journal events * Delete all empty touch addresses * Implement selfdestruct * Update aggregator.rs
2023-05-12 13:04:46 +02:00
include_str!("asm/journal/revert.asm"),
Misc EVM fixes
2023-02-25 07:59:51 -08:00
include_str!("asm/transactions/common_decoding.asm"),
Transaction (RLP) parsing Will add tests once we have the interpreter support for other segmnets.
2022-07-06 19:47:58 -07:00
include_str!("asm/transactions/router.asm"),
include_str!("asm/transactions/type_0.asm"),
include_str!("asm/transactions/type_1.asm"),
include_str!("asm/transactions/type_2.asm"),
Move couple asm files
2022-07-31 09:28:16 -07:00
include_str!("asm/util/assertions.asm"),
include_str!("asm/util/basic_macros.asm"),
MPT storage logic
2022-10-17 11:31:08 -07:00
include_str!("asm/util/keccak.asm"),
expmod precompile
2023-04-25 17:19:44 -07:00
include_str!("asm/util/math.asm"),
Finish extcodecopy
2022-10-21 18:11:27 +02:00
include_str!("asm/account_code.asm"),
Balance
2022-10-28 11:15:43 +02:00
include_str!("asm/balance.asm"),
Parse and assemble kernel functions (#567) * Parse and assemble kernel functions Written in "EVM++" assembly. Later on we will add some priviledged opcodes (in unused opcode ordinals), making it an extension of EVM bytecode. I don't think there's much of a standard for EVM assembly, but I loosely based the syntax on this [proposal](https://gist.github.com/axic/17ddbbce4738ccf4040d30cbb5de484e). * PR feedback * tweaks for consistency * terminology tweaks * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org>
2022-06-20 20:32:29 -07:00
];
let parsed_files = files.iter().map(|f| parse(f)).collect_vec();
Some simple optimization rules Depends on #647.
2022-07-25 09:36:26 -07:00
assemble(parsed_files, evm_constants(), true)
Parse and assemble kernel functions (#567) * Parse and assemble kernel functions Written in "EVM++" assembly. Later on we will add some priviledged opcodes (in unused opcode ordinals), making it an extension of EVM bytecode. I don't think there's much of a standard for EVM assembly, but I loosely based the syntax on this [proposal](https://gist.github.com/axic/17ddbbce4738ccf4040d30cbb5de484e). * PR feedback * tweaks for consistency * terminology tweaks * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org>
2022-06-20 20:32:29 -07:00
}
#[cfg(test)]
mod tests {
fmt
2022-08-08 11:37:35 -07:00
use env_logger::{try_init_from_env, Env, DEFAULT_FILTER_ENV};
Have `make_kernel` log the size of each (assembled) file For now it doesn't log filenames, but we can compare against the list of filenames in `combined_kernel`. Current output: ``` [DEBUG plonky2_evm::cpu::kernel::assembler] Assembled file size: 0 bytes [DEBUG plonky2_evm::cpu::kernel::assembler] Assembled file size: 49 bytes [DEBUG plonky2_evm::cpu::kernel::assembler] Assembled file size: 387 bytes [DEBUG plonky2_evm::cpu::kernel::assembler] Assembled file size: 27365 bytes [DEBUG plonky2_evm::cpu::kernel::assembler] Assembled file size: 0 bytes [DEBUG plonky2_evm::cpu::kernel::assembler] Assembled file size: 11 bytes [DEBUG plonky2_evm::cpu::kernel::assembler] Assembled file size: 7 bytes [DEBUG plonky2_evm::cpu::kernel::aggregator::tests] Total kernel size: 27819 bytes ``` This shows that most of our kernel code is from `curve_add.asm`, which makes sense since it invovles a couple uses of the large `inverse` macro. Thankfully that will be replaced at some point.
2022-07-13 09:53:44 -07:00
use log::debug;
EC ops test
2022-07-07 18:06:24 +02:00
message schedule progress
2022-08-01 16:36:36 -07:00
use crate::cpu::kernel::aggregator::combined_kernel;
Parse and assemble kernel functions (#567) * Parse and assemble kernel functions Written in "EVM++" assembly. Later on we will add some priviledged opcodes (in unused opcode ordinals), making it an extension of EVM bytecode. I don't think there's much of a standard for EVM assembly, but I loosely based the syntax on this [proposal](https://gist.github.com/axic/17ddbbce4738ccf4040d30cbb5de484e). * PR feedback * tweaks for consistency * terminology tweaks * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org>
2022-06-20 20:32:29 -07:00
#[test]
fn make_kernel() {
fix
2022-07-31 09:22:13 -07:00
let _ = try_init_from_env(Env::default().filter_or(DEFAULT_FILTER_ENV, "debug"));
Have `make_kernel` log the size of each (assembled) file For now it doesn't log filenames, but we can compare against the list of filenames in `combined_kernel`. Current output: ``` [DEBUG plonky2_evm::cpu::kernel::assembler] Assembled file size: 0 bytes [DEBUG plonky2_evm::cpu::kernel::assembler] Assembled file size: 49 bytes [DEBUG plonky2_evm::cpu::kernel::assembler] Assembled file size: 387 bytes [DEBUG plonky2_evm::cpu::kernel::assembler] Assembled file size: 27365 bytes [DEBUG plonky2_evm::cpu::kernel::assembler] Assembled file size: 0 bytes [DEBUG plonky2_evm::cpu::kernel::assembler] Assembled file size: 11 bytes [DEBUG plonky2_evm::cpu::kernel::assembler] Assembled file size: 7 bytes [DEBUG plonky2_evm::cpu::kernel::aggregator::tests] Total kernel size: 27819 bytes ``` This shows that most of our kernel code is from `curve_add.asm`, which makes sense since it invovles a couple uses of the large `inverse` macro. Thankfully that will be replaced at some point.
2022-07-13 09:53:44 -07:00
Parse and assemble kernel functions (#567) * Parse and assemble kernel functions Written in "EVM++" assembly. Later on we will add some priviledged opcodes (in unused opcode ordinals), making it an extension of EVM bytecode. I don't think there's much of a standard for EVM assembly, but I loosely based the syntax on this [proposal](https://gist.github.com/axic/17ddbbce4738ccf4040d30cbb5de484e). * PR feedback * tweaks for consistency * terminology tweaks * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org>
2022-06-20 20:32:29 -07:00
// Make sure we can parse and assemble the entire kernel.
Macros with arguments (#595) * Macros with arguments See `basic_macros.rs` for an example. * rename
2022-07-07 08:59:53 -07:00
let kernel = combined_kernel();
fix
2022-07-30 22:31:07 -07:00
debug!("Total kernel size: {} bytes", kernel.code.len());
Parse and assemble kernel functions (#567) * Parse and assemble kernel functions Written in "EVM++" assembly. Later on we will add some priviledged opcodes (in unused opcode ordinals), making it an extension of EVM bytecode. I don't think there's much of a standard for EVM assembly, but I loosely based the syntax on this [proposal](https://gist.github.com/axic/17ddbbce4738ccf4040d30cbb5de484e). * PR feedback * tweaks for consistency * terminology tweaks * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> * Update evm/src/cpu/kernel/opcodes.rs Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org> Co-authored-by: Jacqueline Nabaglo <jakub@mirprotocol.org>
2022-06-20 20:32:29 -07:00
}
}
Reference in New Issue Copy Permalink