Skip to content

Commit

Permalink
Merge branch 'main' into ma/simple-stake-table
Browse files Browse the repository at this point in the history
  • Loading branch information
sveitser authored Dec 10, 2024
2 parents 77ff146 + 685a380 commit 3f687e5
Show file tree
Hide file tree
Showing 38 changed files with 710 additions and 796 deletions.
5 changes: 3 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ ESPRESSO_SEQUENCER_MAX_CONNECTIONS=25
ESPRESSO_SEQUENCER_STORAGE_PATH=/store/sequencer
ESPRESSO_SEQUENCER_GENESIS_FILE=/genesis/demo.toml
ESPRESSO_SEQUENCER_L1_PORT=8545
ESPRESSO_SEQUENCER_L1_POLLING_INTERVAL=100ms
ESPRESSO_SEQUENCER_L1_WS_PORT=8546
ESPRESSO_SEQUENCER_L1_PROVIDER=http://demo-l1-network:${ESPRESSO_SEQUENCER_L1_PORT}
ESPRESSO_SEQUENCER_L1_WS_PROVIDER=ws://demo-l1-network:${ESPRESSO_SEQUENCER_L1_WS_PORT}
Expand Down Expand Up @@ -150,5 +151,5 @@ INTEGRATION_TEST_PROTO=http
# `03`, marketplace upgrade will be tested.
INTEGRATION_TEST_SEQUENCER_VERSION=02

# max database connections
ESPRESSO_SEQUENCER_DATABASE_MAX_CONNECTIONS=25
# max database connections
ESPRESSO_SEQUENCER_DATABASE_MAX_CONNECTIONS=25
14 changes: 13 additions & 1 deletion Cargo.lock

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

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ ark-poly = "0.4"
ark-serialize = "0.4"
ark-srs = "0.3.1"
async-broadcast = "0.7.0"
async-channel = "2"
async-lock = "3"
async-once-cell = "0.5"
async-trait = "0.1"
Expand Down Expand Up @@ -125,6 +126,7 @@ thiserror = "1.0.69"
tracing = "0.1"
bytesize = "1.3"
itertools = "0.12"
priority-queue = "2"
rand_chacha = "0.3"
rand_distr = "0.4"
reqwest = "0.12"
Expand Down
2 changes: 2 additions & 0 deletions builder/src/non_permissioned.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use hotshot_types::{
data::{fake_commitment, ViewNumber},
traits::{
block_contents::{vid_commitment, GENESIS_VID_NUM_STORAGE_NODES},
metrics::NoMetrics,
node_implementation::Versions,
EncodeBytes,
},
Expand Down Expand Up @@ -53,6 +54,7 @@ pub async fn build_instance_state<V: Versions>(
Arc::new(StatePeers::<SequencerApiVersion>::from_urls(
state_peers,
Default::default(),
&NoMetrics,
)),
V::Base::VERSION,
);
Expand Down
Binary file removed data/chain_config.bin
Binary file not shown.
7 changes: 0 additions & 7 deletions data/chain_config.json

This file was deleted.

Binary file removed data/fee_info.bin
Binary file not shown.
4 changes: 0 additions & 4 deletions data/fee_info.json

This file was deleted.

Binary file removed data/header.bin
Binary file not shown.
Binary file removed data/l1_block.bin
Binary file not shown.
Binary file removed data/messages.bin
Binary file not shown.
Loading

0 comments on commit 3f687e5

Please sign in to comment.