Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to hotshot rc-0.5.67 / marketplace #1784

Merged
merged 32 commits into from
Jul 30, 2024
Merged

Update to hotshot rc-0.5.67 / marketplace #1784

Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7d813b0
update header::new
tbro Jul 24, 2024
e5507e3
Update to hotshot rc-0.5.66
tbro Jul 25, 2024
ee3aa28
update query-service
tbro Jul 26, 2024
f04b89f
Cargo.lock
tbro Jul 26, 2024
ff07652
cargo fmt
tbro Jul 26, 2024
ab55cf1
fix test
tbro Jul 26, 2024
89dc892
BlockMerkleTree should take Header enum
tbro Jul 26, 2024
2e1e213
bump some versions
tbro Jul 26, 2024
17ed30f
compilage
tbro Jul 26, 2024
23c2769
clippy
tbro Jul 26, 2024
0906697
lint
imabdulbasit Jul 25, 2024
8a2d6c2
lint tests
tbro Jul 26, 2024
c90c91e
fix pre-commit errors
tbro Jul 26, 2024
cafa8c9
Bump deps
QuentinI Jul 26, 2024
1a8f66e
fix charge_tx test
tbro Jul 29, 2024
faf9631
revert 1a8f66ec4aa0f0887327965aba110b83ac0d10f7
tbro Jul 29, 2024
30ebfc1
disable tx charge test for now
tbro Jul 29, 2024
85b8834
update reference headers for v3
tbro Jul 29, 2024
4e3b484
add `validate_builder_fee` test
tbro Jul 30, 2024
e7cf690
Merge remote-tracking branch 'origin/main' into tb/marketplace/update…
tbro Jul 30, 2024
908981a
remove duplicate lint thing
tbro Jul 30, 2024
def8b8b
conflict
tbro Jul 30, 2024
8205703
cargo sort
tbro Jul 30, 2024
bf97214
conflict
tbro Jul 30, 2024
6756e31
explicity test marketplace function
tbro Jul 30, 2024
c4a9a8e
Accept any signature verification that succeeds
tbro Jul 30, 2024
08e79cc
typo
tbro Jul 30, 2024
d4af112
Copy reference test changes from #1792
tbro Jul 30, 2024
f88f66a
revert unversioned data files
tbro Jul 30, 2024
212d82c
larger default max_block_size
tbro Jul 30, 2024
2622660
fix the lint thing again
tbro Jul 30, 2024
cd69ecc
fix typo
tbro Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

71 changes: 36 additions & 35 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ edition = "2021"
resolver = "2"

members = [
"builder",
"contract-bindings",
"contracts/rust/adapter",
"contracts/rust/diff-test",
"contracts/rust/gen-vk-contract",
"hotshot-state-prover",
"sequencer",
"types",
"utils",
"builder",
"contract-bindings",
"contracts/rust/adapter",
"contracts/rust/diff-test",
"contracts/rust/gen-vk-contract",
"hotshot-state-prover",
"sequencer",
"types",
"utils",
]

[workspace.dependencies]
Expand All @@ -31,7 +31,7 @@ ark-poly = "0.4"
ark-serialize = "0.4"
ark-srs = "0.3.1"
async-compatibility-layer = { version = "1.1", default-features = false, features = [
"logging-utils",
"logging-utils",
] }
async-once-cell = "0.5"
async-std = { version = "1.12.0", features = ["attributes", "tokio1"] }
Expand All @@ -48,56 +48,57 @@ dotenvy = "0.15"
ethers = { version = "2.0", features = ["solc"] }
futures = "0.3"

hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.64" }
hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.67" }
# Hotshot imports
hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.64" }
hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", tag = "rc-0.1.36" }
hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "rc-0.1.35" }
hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.64" }
hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "rc-0.1.46" }
hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.64" }
hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.67" }
hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", tag = "rc-0.1.38" }
marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", rev = "c1e60e76893557f21e8aea7e86994ebe107b4914" }
hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "rc-0.1.37" }
hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.67" }
hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "rc-0.1.49" }
hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.67" }
hotshot-state-prover = { version = "0.1.0", path = "hotshot-state-prover" }
hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.64" }
hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.64" }
hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.64" }
hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.67" }
hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.67" }
hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.67" }
hotshot-contract-adapter = { version = "0.1.0", path = "contracts/rust/adapter" }
# Temporary, used to pull in the mock auction results provider
hotshot-example-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.64" }
hotshot-example-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.67" }

# Push CDN imports
cdn-broker = { git = "https://github.com/EspressoSystems/Push-CDN", features = [
"runtime-async-std",
"global-permits",
"runtime-async-std",
"global-permits",
], tag = "0.4.3", package = "cdn-broker" }
cdn-marshal = { git = "https://github.com/EspressoSystems/Push-CDN", features = [
"runtime-async-std",
"global-permits",
"runtime-async-std",
"global-permits",
], tag = "0.4.3", package = "cdn-marshal" }

jf-plonk = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = [
"test-apis",
"test-apis",
] }
jf-crhf = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5" }
jf-merkle-tree = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = [
"std",
"std",
] }
jf-signature = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = [
"std",
"std",
] }
jf-pcs = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = [
"std",
"parallel",
"std",
"parallel",
] }
jf-vid = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = [
"std",
"parallel",
"std",
"parallel",
] }
jf-rescue = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = [
"std",
"parallel",
"std",
"parallel",
] }
jf-relation = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = [
"std",
"std",
] }
jf-utils = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5" }
libp2p = { version = "0.53", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion builder/src/lib.rs
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ pub mod testing {
use async_trait::async_trait;
use committable::Committable;
use espresso_types::{
mock::MockStateCatchup, ChainConfig, Event, FeeAccount, L1Client, NodeState, PrivKey,
mock::MockStateCatchup, v0_3::ChainConfig, Event, FeeAccount, L1Client, NodeState, PrivKey,
PubKey, Transaction, ValidatedState,
};
use ethers::{
Expand Down
4 changes: 2 additions & 2 deletions builder/src/non_permissioned.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ use async_compatibility_layer::{
};
use async_std::sync::{Arc, RwLock};
use espresso_types::{
eth_signature_key::EthKeyPair, ChainConfig, FeeAmount, L1Client, NodeState, Payload, SeqTypes,
ValidatedState,
eth_signature_key::EthKeyPair, v0_3::ChainConfig, FeeAmount, L1Client, NodeState, Payload,
SeqTypes, ValidatedState,
};
use ethers::{
core::k256::ecdsa::SigningKey,
Expand Down
8 changes: 4 additions & 4 deletions data/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ commitments. The objects in this directory have well-known commitments. They ser
by the Espresso Sequencer, and can be used as test cases for ports of the serialization and commitment algorithms to
other languages.

The Rust module `espresso-types::reference_tests` contains test cases which are designed to fail if the serialization format
or commitment scheme for any of these data types changes. If you make a breaking change, you may need to update these
reference objects as well. Running those tests will also print out information about the commitments of these reference
objects, which can be useful for generating test cases for ports. To run them and get the output, use
The Rust module `espresso-types::reference_tests` contains test cases which are designed to fail if the serialization
format or commitment scheme for any of these data types changes. If you make a breaking change, you may need to update
these reference objects as well. Running those tests will also print out information about the commitments of these
reference objects, which can be useful for generating test cases for ports. To run them and get the output, use

```bash
cargo test --all-features -p espresso-types -- --nocapture --test-threads 1 reference_tests
Expand Down
7 changes: 7 additions & 0 deletions data/genesis/demo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,10 @@ base_fee = '1 wei'
max_block_size = '1mb'
fee_recipient = '0x0000000000000000000000000000000000000000'
fee_contract = '0xa15bb66138824a1c7167f5e85b957d04dd34e468'

[[upgrade]]
version = "0.4"
start_proposing_view = 5
stop_proposing_view = 15

[upgrade.marketplace]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can remove it for now as UpgradeType changes are in integrations PR

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that toml parsing will fail so yeah needs to be removed

Binary file modified data/messages.bin
View file
Open in desktop
Binary file not shown.
56 changes: 32 additions & 24 deletions data/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,41 @@
"_pd": null,
"data": {
"block_header": {
"block_merkle_tree_root": "MERKLE_COMM~AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAQA",
"builder_commitment": "BUILDER_COMMITMENT~tEvs0rxqOiMCvfe2R0omNNaphSlUiEDrb2q0IZpRcgA_",
"builder_signature": null,
"chain_config": {
"fields": {
"block_merkle_tree_root": "MERKLE_COMM~AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAQA",
"builder_commitment": "BUILDER_COMMITMENT~tEvs0rxqOiMCvfe2R0omNNaphSlUiEDrb2q0IZpRcgA_",
"builder_signature": null,
"chain_config": {
"Left": {
"base_fee": "0",
"chain_id": "35353",
"fee_contract": null,
"fee_recipient": "0x0000000000000000000000000000000000000000",
"max_block_size": "30720"
"chain_config": {
"Left": {
"base_fee": "0",
"chain_id": "35353",
"fee_contract": null,
"fee_recipient": "0x0000000000000000000000000000000000000000",
"max_block_size": "30720"
}
}
}
},
"fee_info": {
"account": "0x0000000000000000000000000000000000000000",
"amount": "0"
},
"fee_merkle_tree_root": "MERKLE_COMM~AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAKA",
"height": 0,
"l1_finalized": null,
"l1_head": 0,
"ns_table": {
"bytes": "AAAAAA=="
},
"fee_info": {
"account": "0x0000000000000000000000000000000000000000",
"amount": "0"
},
"fee_merkle_tree_root": "MERKLE_COMM~AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAKA",
"height": 0,
"l1_finalized": null,
"l1_head": 0,
"ns_table": {
"bytes": "AAAAAA=="
},
"payload_commitment": "HASH~AazstQer_ho1SqgGT0r10_Gs0BnjfbPBHJdSO3HHbp29",
"timestamp": 0
},
"payload_commitment": "HASH~AazstQer_ho1SqgGT0r10_Gs0BnjfbPBHJdSO3HHbp29",
"timestamp": 0
"version": {
"Version": {
"major": 0,
"minor": 2
}
}
},
"justify_qc": {
"_pd": null,
Expand Down
Binary file modified data/v2/header.bin
View file
Open in desktop
Binary file not shown.
Binary file added data/v3/chain_config.bin
View file
Open in desktop
Binary file not shown.
8 changes: 8 additions & 0 deletions data/v3/chain_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"base_fee": "0",
"bid_recipient": "0x0000000000000000000000000000000000000000",
"chain_id": "35353",
"fee_contract": "0x0000000000000000000000000000000000000000",
"fee_recipient": "0x0000000000000000000000000000000000000000",
"max_block_size": "10240"
}
Binary file modified data/v3/header.bin
View file
Open in desktop
Binary file not shown.
Loading
Loading