Update global workspace config (#14)

0xPolygonZero · Feb 13, 2024 · c910e54 · c910e54
1 parent 563d2cc
commit c910e54
Show file tree

Hide file tree

Showing 48 changed files with 157 additions and 556 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,9 +53,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install nightly toolchain
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: nightly-2024-02-01
+        uses: dtolnay/rust-toolchain@nightly
 
       - name: Set up rust cache
         uses: Swatinem/rust-cache@v2
@@ -80,9 +78,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install nightly toolchain
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: nightly-2024-02-01
+        uses: dtolnay/rust-toolchain@nightly
 
       - name: Set up rust cache
         uses: Swatinem/rust-cache@v2
@@ -107,9 +103,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install nightly toolchain
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: nightly-2024-02-01
+        uses: dtolnay/rust-toolchain@nightly
 
       - name: Set up rust cache
         uses: Swatinem/rust-cache@v2
@@ -134,15 +128,14 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install nightly toolchain
-        uses: dtolnay/rust-toolchain@master
+        uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2024-02-01
-          components: rustfmt, clippy
+            components: rustfmt, clippy
 
       - name: Set up rust cache
         uses: Swatinem/rust-cache@v2
         with:
-          cache-on-failure: true
+            cache-on-failure: true
 
       - name: Run cargo fmt
         run: cargo fmt --all --check

diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,21 @@ members = ["mpt_trie", "proof_gen", "trace_decoder", "evm_arithmetization"]
 resolver = "2"
 
 [workspace.dependencies]
+bytes = "1.5.0"
+enum-as-inner = "0.6.0"
 ethereum-types = "0.14.1"
+hex = "0.4.3"
+hex-literal = "0.4.1"
+keccak-hash = "0.10.0"
 log = "0.4.20"
-plonky2_evm = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "265d46a96ecfec49a32973f66f8aa811586c5d4a" }
+num = "0.4.1"
+rlp = "0.5.2"
+rlp-derive = "0.1.0"
 serde = "1.0.166"
+
+[workspace.package]
+edition = "2021"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/0xPolygonZero/zk_evm"
+homepage = "https://github.com/0xPolygonZero/zk_evm"
+keywords = ["cryptography", "SNARK", "PLONK", "FRI", "plonky2", "EVM", "ETHEREUM"]
diff --git a/evm_arithmetization/Cargo.toml b/evm_arithmetization/Cargo.toml
@@ -2,27 +2,27 @@
 name = "evm_arithmetization"
 description = "Implementation of STARKs for the Ethereum Virtual Machine"
 version = "0.1.0"
-license = "MIT or Apache-2.0"
 authors = ["Daniel Lubarov <[email protected]>", "William Borgeaud <[email protected]>"]
 readme = "README.md"
-repository = "https://github.com/0xPolygonZero/zk_evm"
-keywords = ["EVM", "STARK", "Ethereum"]
 categories = ["cryptography"]
-edition = "2021"
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+homepage.workspace = true
+keywords.workspace = true
 
 [dependencies]
 anyhow = "1.0.40"
-bytes = "1.4.0"
+bytes = { workspace = true }
 env_logger = "0.10.0"
-eth_trie_utils = { git = "https://github.com/0xPolygonZero/eth_trie_utils.git", rev = "7fc3c3f54b3cec9c6fc5ffc5230910bd1cb77f76" }
 ethereum-types = "0.14.0"
-hex = { version = "0.4.3", optional = true }
-hex-literal = "0.4.1"
+hex = { workspace = true, optional = true }
+hex-literal = { workspace = true }
 itertools = "0.11.0"
-keccak-hash = "0.10.0"
-log = "0.4.14"
+keccak-hash = { workspace = true }
+log = { workspace = true }
 plonky2_maybe_rayon = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "710225c9e0ac5822b2965ce74951cf000bbb8a2c" }
-num = "0.4.0"
+num = { workspace = true }
 num-bigint = "0.4.3"
 once_cell = "1.13.0"
 pest = "2.1.3"
@@ -32,20 +32,23 @@ plonky2_util = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "71
 starky = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "710225c9e0ac5822b2965ce74951cf000bbb8a2c" }
 rand = "0.8.5"
 rand_chacha = "0.3.1"
-rlp = "0.5.1"
-rlp-derive = "0.1.0"
-serde = { version = "1.0.144", features = ["derive"] }
+rlp = { workspace = true }
+rlp-derive = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
 static_assertions = "1.1.0"
 hashbrown = { version = "0.14.0" }
 tiny-keccak = "2.0.2"
 serde_json = "1.0"
 
+# Local dependencies
+mpt_trie = { version = "0.1.0", path = "../mpt_trie" }
+
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 jemallocator = "0.5.0"
 
 [dev-dependencies]
 criterion = "0.5.1"
-hex = "0.4.3"
+hex = { workspace = true }
 ripemd = "0.1.3"
 sha2 = "0.10.6"
 

diff --git a/evm_arithmetization/LICENSE-APACHE b/evm_arithmetization/LICENSE-APACHE
diff --git a/evm_arithmetization/LICENSE-MIT b/evm_arithmetization/LICENSE-MIT
diff --git a/evm_arithmetization/src/cpu/kernel/constants/trie_type.rs b/evm_arithmetization/src/cpu/kernel/constants/trie_type.rs
@@ -1,6 +1,6 @@
 use core::ops::Deref;
 
-use eth_trie_utils::partial_trie::HashedPartialTrie;
+use mpt_trie::partial_trie::HashedPartialTrie;
 
 use crate::Node;
 

diff --git a/evm_arithmetization/src/cpu/kernel/interpreter.rs b/evm_arithmetization/src/cpu/kernel/interpreter.rs
@@ -5,9 +5,9 @@ use core::ops::Range;
 use std::collections::{BTreeSet, HashMap};
 
 use anyhow::{anyhow, bail};
-use eth_trie_utils::partial_trie::PartialTrie;
 use ethereum_types::{BigEndianHash, H160, H256, U256, U512};
 use keccak_hash::keccak;
+use mpt_trie::partial_trie::PartialTrie;
 use plonky2::field::goldilocks_field::GoldilocksField;
 use plonky2::field::types::Field;
 

diff --git a/evm_arithmetization/src/cpu/kernel/tests/account_code.rs b/evm_arithmetization/src/cpu/kernel/tests/account_code.rs
@@ -1,11 +1,11 @@
 use std::collections::HashMap;
 
 use anyhow::Result;
-use eth_trie_utils::nibbles::Nibbles;
-use eth_trie_utils::partial_trie::{HashedPartialTrie, PartialTrie};
 use ethereum_types::{Address, BigEndianHash, H256, U256};
 use hex_literal::hex;
 use keccak_hash::keccak;
+use mpt_trie::nibbles::Nibbles;
+use mpt_trie::partial_trie::{HashedPartialTrie, PartialTrie};
 use plonky2::field::goldilocks_field::GoldilocksField as F;
 use plonky2::field::types::Field;
 use rand::{thread_rng, Rng};

diff --git a/evm_arithmetization/src/cpu/kernel/tests/add11.rs b/evm_arithmetization/src/cpu/kernel/tests/add11.rs
@@ -1,11 +1,11 @@
 use std::collections::HashMap;
 use std::str::FromStr;
 
-use eth_trie_utils::nibbles::Nibbles;
-use eth_trie_utils::partial_trie::{HashedPartialTrie, Node, PartialTrie};
 use ethereum_types::{Address, BigEndianHash, H256};
 use hex_literal::hex;
 use keccak_hash::keccak;
+use mpt_trie::nibbles::Nibbles;
+use mpt_trie::partial_trie::{HashedPartialTrie, Node, PartialTrie};
 use plonky2::field::goldilocks_field::GoldilocksField as F;
 
 use crate::cpu::kernel::aggregator::KERNEL;

diff --git a/evm_arithmetization/src/cpu/kernel/tests/balance.rs b/evm_arithmetization/src/cpu/kernel/tests/balance.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
-use eth_trie_utils::partial_trie::{HashedPartialTrie, PartialTrie};
 use ethereum_types::{Address, BigEndianHash, H256, U256};
 use keccak_hash::keccak;
+use mpt_trie::partial_trie::{HashedPartialTrie, PartialTrie};
 use plonky2::field::goldilocks_field::GoldilocksField as F;
 use plonky2::field::types::Field;
 use rand::{thread_rng, Rng};