Update to hotshot rc-0.5.67 / marketplace

Cargo.toml

@@ -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]
@@ -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"] }
@@ -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 }

builder/src/lib.rs

@@ -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::{

builder/src/non_permissioned.rs

@@ -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,

data/README.md

@@ -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

hotshot-state-prover/src/circuit.rs

@@ -123,14 +123,14 @@ impl AsRef<[Variable]> for LightClientStateVar {
 /// - a list of schnorr signatures of the updated states (`Vec<SchnorrSignature>`), default if the node doesn't sign the state
 /// - updated light client state (`(view_number, block_height, block_comm_root, fee_ledger_comm, stake_table_comm)`)
 /// - a quorum threshold
-/// Lengths of input vectors should not exceed the `stake_table_capacity`.
-/// The list of stake table entries, bit indicators and signatures will be padded to the `stake_table_capacity`.
-/// It checks that
+///   Lengths of input vectors should not exceed the `stake_table_capacity`.
+///   The list of stake table entries, bit indicators and signatures will be padded to the `stake_table_capacity`.
+///   It checks that
 /// - the vector that indicates who signed is a bit vector
 /// - the signers' accumulated weight exceeds the quorum threshold
 /// - the stake table corresponds to the one committed in the light client state
 /// - all Schnorr signatures over the light client state are valid
-/// and returns
+///   and returns
 /// - A circuit for proof generation
 /// - A list of public inputs for verification
 /// - A `PlonkError` if any error happens when building the circuit

hotshot-state-prover/src/snark.rs

@@ -43,7 +43,7 @@ pub fn preprocess(
 /// - updated light client state (`(view_number, block_height, block_comm_root, fee_ledger_comm, stake_table_comm)`)
 /// - a bit vector indicates the signers
 /// - a quorum threshold
-/// Returns error or a pair `(proof, public_inputs)` asserting that
+///   Returns error or a pair `(proof, public_inputs)` asserting that
 /// - the signer's accumulated weight exceeds the quorum threshold
 /// - the stake table corresponds to the one committed in the light client state
 /// - all schnorr signatures over the light client state are valid

sequencer/Cargo.toml

@@ -11,6 +11,9 @@ testing = ["hotshot-testing"]
 libp2p = []
 benchmarking = []
 
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(async_executor_impl, values("async-std", "tokio"))'] }
+
 [[bin]]
 name = "espresso-dev-node"
 required-features = ["testing"]

sequencer/src/api.rs

@@ -8,7 +8,7 @@ use committable::Commitment;
 use data_source::{CatchupDataSource, SubmitDataSource};
 use derivative::Derivative;
 use espresso_types::{
-    v0::traits::SequencerPersistence, AccountQueryData, BlockMerkleTree, ChainConfig,
+    v0::traits::SequencerPersistence, v0_3::ChainConfig, AccountQueryData, BlockMerkleTree,
     FeeAccountProof, NodeState, PubKey, Transaction,
 };
 use ethers::prelude::Address;

sequencer/src/api/data_source.rs

@@ -5,7 +5,8 @@ use async_trait::async_trait;
 use committable::Commitment;
 use espresso_types::{
     v0::traits::{PersistenceOptions, SequencerPersistence},
-    ChainConfig, PubKey, Transaction,
+    v0_3::ChainConfig,
+    PubKey, Transaction,
 };
 use ethers::prelude::Address;
 use futures::future::Future;

sequencer/src/api/sql.rs

@@ -1,7 +1,7 @@
 use anyhow::{bail, Context};
 use async_trait::async_trait;
 use committable::Commitment;
-use espresso_types::{BlockMerkleTree, ChainConfig, FeeAccountProof, FeeMerkleTree};
+use espresso_types::{v0_3::ChainConfig, BlockMerkleTree, FeeAccountProof, FeeMerkleTree};
 use ethers::prelude::Address;
 use futures::FutureExt;
 use hotshot_query_service::{

sequencer/src/bin/nasty-client.rs

@@ -31,7 +31,7 @@ use clap::Parser;
 use committable::Committable;
 use derivative::Derivative;
 use es_version::{SequencerVersion, SEQUENCER_VERSION};
-use espresso_types::{BlockMerkleTree, FeeMerkleTree, Header, SeqTypes};
+use espresso_types::{v0_3::IterableFeeInfo, BlockMerkleTree, FeeMerkleTree, Header, SeqTypes};
 use futures::{
     future::{FutureExt, TryFuture, TryFutureExt},
     stream::{Peekable, StreamExt},
@@ -929,7 +929,10 @@ impl ResourceManager<Header> {
                     .await
             })
             .await?;
-        let builder_address = builder_header.fee_info().account();
+
+        // Since we have multiple fee accounts, we need to select one.
+        let accounts = builder_header.fee_info().accounts();
+        let builder_address = accounts.first().unwrap();
 
         // Get the header of the state snapshot we're going to query so we can later verify our
         // results.