Crates.io release 0.131.0 rc.2 (#41)

Signed-off-by: Danil <deniallugo@gmail.com>
Co-authored-by: Danil <deniallugo@gmail.com>
Co-authored-by: Yury Akudovich <ya@matterlabs.dev>
Co-authored-by: pompon0 <pompon.pompon@gmail.com>

.github/workflows/cargo-license.yaml

@@ -1,5 +1,5 @@
-name: Cargo license check
-on: pull_request
+name: CI
+on: [push, pull_request]
 jobs:
   cargo-deny:
     runs-on: ubuntu-latest

Cargo.toml

@@ -1,8 +1,14 @@
 [package]
 name = "zk_evm"
-version = "1.3.1"
+version = "0.131.0-rc.2"
 edition = "2021"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
+homepage = "https://zksync.io/"
+repository = "https://github.com/matter-labs/era-zk_evm"
+license = "MIT OR Apache-2.0"
+keywords = ["blockchain", "zksync"]
+categories = ["cryptography"]
+description = "ZKsync out-of-circuit EraEVM implementation"
 
 resolver = "2"
 
@@ -13,13 +19,12 @@ num = { version = "0.4"}
 
 # These dependencies are intentionally pinned to a git commit,
 # so that they don't block upgradeability of dependencies upstream.
-sha3 = { git = "https://github.com/RustCrypto/hashes.git", rev = "7a187e934c1f6c68e4b4e5cf37541b7a0d64d303" }
-sha2 = { git = "https://github.com/RustCrypto/hashes.git", rev = "1731ced4a116d61ba9dc6ee6d0f38fb8102e357a" }
-blake2 = { git = "https://github.com/RustCrypto/hashes.git", rev = "1f727ce37ff40fa0cce84eb8543a45bdd3ca4a4e" }
+sha3 = { package = "sha3_ce", version = "=0.10.6" }
+sha2 = { package = "sha2_ce", version = "=0.10.6" }
+blake2 = { package = "blake2_ce", version = "=0.10.6" }
 k256 = { version = "0.11", features = ["arithmetic", "ecdsa"] }
 static_assertions = "1"
-zkevm_opcode_defs = { git = "https://github.com/matter-labs/era-zkevm_opcode_defs.git", branch = "v1.3.1" }
-# zkevm_opcode_defs = {path = "../zkevm_opcode_defs"}
+zkevm_opcode_defs = "=0.131.0"
 lazy_static = "1.4"
 
 [dev-dependencies]

src/opcodes/execution/add.rs

@@ -2,7 +2,6 @@ use super::*;
 
 impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
     pub fn add_opcode_apply<
-        'a,
         S: crate::abstractions::Storage,
         M: crate::abstractions::Memory,
         EV: crate::abstractions::EventSink,
@@ -11,7 +10,7 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
         WT: crate::witness_trace::VmWitnessTracer<N, E>,
     >(
         &self,
-        vm_state: &mut VmState<'a, S, M, EV, PP, DP, WT, N, E>,
+        vm_state: &mut VmState<S, M, EV, PP, DP, WT, N, E>,
         prestate: PreState<N, E>,
     ) {
         let PreState {

src/opcodes/execution/binop.rs

@@ -3,7 +3,6 @@ use zkevm_opcode_defs::{BinopOpcode, Opcode};
 
 impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
     pub fn binop_opcode_apply<
-        'a,
         S: crate::abstractions::Storage,
         M: crate::abstractions::Memory,
         EV: crate::abstractions::EventSink,
@@ -12,7 +11,7 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
         WT: crate::witness_trace::VmWitnessTracer<N, E>,
     >(
         &self,
-        vm_state: &mut VmState<'a, S, M, EV, PP, DP, WT, N, E>,
+        vm_state: &mut VmState<S, M, EV, PP, DP, WT, N, E>,
         prestate: PreState<N, E>,
     ) {
         let PreState {

src/opcodes/execution/context.rs

@@ -4,7 +4,6 @@ use zkevm_opcode_defs::{ContextOpcode, Opcode};
 
 impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
     pub fn context_opcode_apply<
-        'a,
         S: crate::abstractions::Storage,
         M: crate::abstractions::Memory,
         EV: crate::abstractions::EventSink,
@@ -13,7 +12,7 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
         WT: crate::witness_trace::VmWitnessTracer<N, E>,
     >(
         &self,
-        vm_state: &mut VmState<'a, S, M, EV, PP, DP, WT, N, E>,
+        vm_state: &mut VmState<S, M, EV, PP, DP, WT, N, E>,
         prestate: PreState<N, E>,
     ) {
         let PreState {

src/opcodes/execution/div.rs

@@ -2,7 +2,6 @@ use super::*;
 
 impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
     pub fn div_opcode_apply<
-        'a,
         S: crate::abstractions::Storage,
         M: crate::abstractions::Memory,
         EV: crate::abstractions::EventSink,
@@ -11,7 +10,7 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
         WT: crate::witness_trace::VmWitnessTracer<N, E>,
     >(
         &self,
-        vm_state: &mut VmState<'a, S, M, EV, PP, DP, WT, N, E>,
+        vm_state: &mut VmState<S, M, EV, PP, DP, WT, N, E>,
         prestate: PreState<N, E>,
     ) {
         let PreState {

src/opcodes/execution/far_call.rs

@@ -28,7 +28,6 @@ use zkevm_opcode_defs::{FarCallABI, FarCallForwardPageType, FarCallOpcode, FatPo
 
 impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
     pub fn far_call_opcode_apply<
-        'a,
         S: crate::abstractions::Storage,
         M: crate::abstractions::Memory,
         EV: crate::abstractions::EventSink,
@@ -37,7 +36,7 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
         WT: crate::witness_trace::VmWitnessTracer<N, E>,
     >(
         &self,
-        vm_state: &mut VmState<'a, S, M, EV, PP, DP, WT, N, E>,
+        vm_state: &mut VmState<S, M, EV, PP, DP, WT, N, E>,
         prestate: PreState<N, E>,
     ) {
         let PreState {

src/opcodes/execution/jump.rs

@@ -2,7 +2,6 @@ use super::*;
 
 impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
     pub fn jump_opcode_apply<
-        'a,
         S: crate::abstractions::Storage,
         M: crate::abstractions::Memory,
         EV: crate::abstractions::EventSink,
@@ -11,7 +10,7 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
         WT: crate::witness_trace::VmWitnessTracer<N, E>,
     >(
         &self,
-        vm_state: &mut VmState<'a, S, M, EV, PP, DP, WT, N, E>,
+        vm_state: &mut VmState<S, M, EV, PP, DP, WT, N, E>,
         prestate: PreState<N, E>,
     ) {
         let PreState {

src/opcodes/execution/log.rs

@@ -10,7 +10,6 @@ use zkevm_opcode_defs::system_params::{
 
 impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
     pub fn log_opcode_apply<
-        'a,
         S: crate::abstractions::Storage,
         M: crate::abstractions::Memory,
         EV: crate::abstractions::EventSink,
@@ -19,7 +18,7 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
         WT: crate::witness_trace::VmWitnessTracer<N, E>,
     >(
         &self,
-        vm_state: &mut VmState<'a, S, M, EV, PP, DP, WT, N, E>,
+        vm_state: &mut VmState<S, M, EV, PP, DP, WT, N, E>,
         prestate: PreState<N, E>,
     ) {
         let PreState {

src/opcodes/execution/mul.rs

@@ -2,7 +2,6 @@ use super::*;
 
 impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
     pub fn mul_opcode_apply<
-        'a,
         S: crate::abstractions::Storage,
         M: crate::abstractions::Memory,
         EV: crate::abstractions::EventSink,
@@ -11,7 +10,7 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
         WT: crate::witness_trace::VmWitnessTracer<N, E>,
     >(
         &self,
-        vm_state: &mut VmState<'a, S, M, EV, PP, DP, WT, N, E>,
+        vm_state: &mut VmState<S, M, EV, PP, DP, WT, N, E>,
         prestate: PreState<N, E>,
     ) {
         let PreState {

src/opcodes/execution/near_call.rs

@@ -4,7 +4,6 @@ use super::*;
 
 impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
     pub fn near_call_opcode_apply<
-        'a,
         S: crate::abstractions::Storage,
         M: crate::abstractions::Memory,
         EV: crate::abstractions::EventSink,
@@ -13,7 +12,7 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
         WT: crate::witness_trace::VmWitnessTracer<N, E>,
     >(
         &self,
-        vm_state: &mut VmState<'a, S, M, EV, PP, DP, WT, N, E>,
+        vm_state: &mut VmState<S, M, EV, PP, DP, WT, N, E>,
         prestate: PreState<N, E>,
     ) {
         let PreState { src0, new_pc, .. } = prestate;

src/opcodes/execution/noop.rs

@@ -2,7 +2,6 @@ use super::*;
 
 impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
     pub fn noop_opcode_apply<
-        'a,
         S: crate::abstractions::Storage,
         M: crate::abstractions::Memory,
         EV: crate::abstractions::EventSink,
@@ -11,7 +10,7 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
         WT: crate::witness_trace::VmWitnessTracer<N, E>,
     >(
         &self,
-        vm_state: &mut VmState<'a, S, M, EV, PP, DP, WT, N, E>,
+        vm_state: &mut VmState<S, M, EV, PP, DP, WT, N, E>,
         prestate: PreState<N, E>,
     ) {
         let PreState { new_pc, .. } = prestate;

src/opcodes/execution/ptr.rs

@@ -4,7 +4,6 @@ use zkevm_opcode_defs::{FatPointer, Opcode, PtrOpcode};
 
 impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
     pub fn ptr_opcode_apply<
-        'a,
         S: crate::abstractions::Storage,
         M: crate::abstractions::Memory,
         EV: crate::abstractions::EventSink,
@@ -13,7 +12,7 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
         WT: crate::witness_trace::VmWitnessTracer<N, E>,
     >(
         &self,
-        vm_state: &mut VmState<'a, S, M, EV, PP, DP, WT, N, E>,
+        vm_state: &mut VmState<S, M, EV, PP, DP, WT, N, E>,
         prestate: PreState<N, E>,
     ) {
         let PreState {

src/opcodes/execution/ret.rs

@@ -6,7 +6,6 @@ use zkevm_opcode_defs::{FatPointer, Opcode, RetABI, RetForwardPageType, RetOpcod
 
 impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
     pub fn ret_opcode_apply<
-        'a,
         S: crate::abstractions::Storage,
         M: crate::abstractions::Memory,
         EV: crate::abstractions::EventSink,
@@ -15,7 +14,7 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
         WT: crate::witness_trace::VmWitnessTracer<N, E>,
     >(
         &self,
-        vm_state: &mut VmState<'a, S, M, EV, PP, DP, WT, N, E>,
+        vm_state: &mut VmState<S, M, EV, PP, DP, WT, N, E>,
         prestate: PreState<N, E>,
     ) {
         let PreState { src0, .. } = prestate;

src/opcodes/execution/shift.rs

@@ -6,7 +6,6 @@ use zkevm_opcode_defs::{Opcode, ShiftOpcode};
 
 impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
     pub fn shift_opcode_apply<
-        'a,
         S: crate::abstractions::Storage,
         M: crate::abstractions::Memory,
         EV: crate::abstractions::EventSink,
@@ -15,7 +14,7 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
         WT: crate::witness_trace::VmWitnessTracer<N, E>,
     >(
         &self,
-        vm_state: &mut VmState<'a, S, M, EV, PP, DP, WT, N, E>,
+        vm_state: &mut VmState<S, M, EV, PP, DP, WT, N, E>,
         prestate: PreState<N, E>,
     ) {
         let PreState {

src/opcodes/execution/sub.rs

@@ -2,7 +2,6 @@ use super::*;
 
 impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
     pub fn sub_opcode_apply<
-        'a,
         S: crate::abstractions::Storage,
         M: crate::abstractions::Memory,
         EV: crate::abstractions::EventSink,
@@ -11,7 +10,7 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
         WT: crate::witness_trace::VmWitnessTracer<N, E>,
     >(
         &self,
-        vm_state: &mut VmState<'a, S, M, EV, PP, DP, WT, N, E>,
+        vm_state: &mut VmState<S, M, EV, PP, DP, WT, N, E>,
         prestate: PreState<N, E>,
     ) {
         let PreState {

src/opcodes/execution/uma.rs

@@ -23,7 +23,6 @@ bitflags! {
 
 impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
     pub fn uma_opcode_apply<
-        'a,
         S: crate::abstractions::Storage,
         M: crate::abstractions::Memory,
         EV: crate::abstractions::EventSink,
@@ -32,7 +31,7 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
         WT: crate::witness_trace::VmWitnessTracer<N, E>,
     >(
         &self,
-        vm_state: &mut VmState<'a, S, M, EV, PP, DP, WT, N, E>,
+        vm_state: &mut VmState<S, M, EV, PP, DP, WT, N, E>,
         prestate: PreState<N, E>,
     ) {
         let PreState {

src/opcodes/parsing.rs

@@ -45,7 +45,6 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
     }
 
     pub fn apply<
-        'a,
         S: crate::abstractions::Storage,
         M: crate::abstractions::Memory,
         EV: crate::abstractions::EventSink,
@@ -54,7 +53,7 @@ impl<const N: usize, E: VmEncodingMode<N>> DecodedOpcode<N, E> {
         WT: crate::witness_trace::VmWitnessTracer<N, E>,
     >(
         &self,
-        vm_state: &mut VmState<'a, S, M, EV, PP, DP, WT, N, E>,
+        vm_state: &mut VmState<S, M, EV, PP, DP, WT, N, E>,
         prestate: PreState<N, E>,
     ) {
         use zkevm_opcode_defs::Opcode;