Skip to content

Commit

Permalink
Merge branch 'main' into fix-typo
Browse files Browse the repository at this point in the history
  • Loading branch information
pls148 authored Jan 6, 2025
2 parents 72c8760 + f68a58e commit 248e077
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ and robust infrastructure.
[Official Documentation](https://docs.espressosys.com/sequencer/espresso-sequencer-architecture/readme)

### Architecture
The diagram below shows how the Espresso Confirmation Layer fits into the rollup
centric Ethereum ecosystem. See [Architecture](./doc/architecture.md) for details.

![Architecture](./doc/espresso-overview.svg)
The diagram below shows how the Espresso Confirmation Layer fits into the rollup centric Ethereum ecosystem. See
[Architecture](./doc/architecture.md) for details.

![Architecture](./doc/espresso-overview.svg)

#### ZK rollups integration

Expand All @@ -43,9 +43,8 @@ a dockerized Espresso Sequencer network with an example Layer 2 rollup applicati

## Documentation

The rust code documentation can be found at
[sequencer.docs.espressosys.com](https://sequencer.docs.espressosys.com). Please note the disclaimer about API
stability at the end of the readme.
The rust code documentation can be found at [sequencer.docs.espressosys.com](https://sequencer.docs.espressosys.com).
Please note the disclaimer about API stability at the end of the readme.

To generate the documentation locally and view it in the browser, run

Expand Down Expand Up @@ -120,7 +119,7 @@ forge build
To run the tests

```shell
forge test
just sol-test
```

In order to avoid constant warnings about checksum mismatches with [svm-rs](https://github.com/roynalnaruto/svm-rs)
Expand Down
2 changes: 1 addition & 1 deletion doc/espresso-dev-node.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker run ghcr.io/espressosystems/espresso-sequencer/espresso-dev-node:main

| Name | Type | Environment Variable | Default Value | Description |
| ------------------------------- | --------------- | -------------------------------------------- | ------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `rpc_url` | `Option<Url>` | `ESPRESSO_SEQUENCER_L1_PROVIDER` | Automatically launched Avil node if not provided. | The JSON-RPC endpoint of the L1. If not provided, an Avil node will be launched automatically. |
| `rpc_url` | `Option<Url>` | `ESPRESSO_SEQUENCER_L1_PROVIDER` | Automatically launched Anvil node if not provided. | The JSON-RPC endpoint of the L1. If not provided, an Anvil node will be launched automatically. |
| `mnemonic` | `String` | `ESPRESSO_SEQUENCER_ETH_MNEMONIC` | `test test test test test test test test test test test junk` | Mnemonic for an L1 wallet. This wallet is used to deploy the contracts, so the account indicated by`ACCOUNT_INDEX` must be funded with ETH. |
| `account_index` | `u32` | `ESPRESSO_DEPLOYER_ACCOUNT_INDEX` | `0` | Account index of the L1 wallet generated from`MNEMONIC`. Used when deploying contracts. |
| `sequencer_api_port` | `u16` | `ESPRESSO_SEQUENCER_API_PORT` | Required | Port that the HTTP API will use. |
Expand Down
4 changes: 3 additions & 1 deletion sequencer/src/api/sql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,9 @@ async fn load_frontier<Mode: TransactionMode>(
) -> anyhow::Result<BlocksFrontier> {
tx.get_path(
Snapshot::<SeqTypes, BlockMerkleTree, { BlockMerkleTree::ARITY }>::Index(height),
height - 1,
height
.checked_sub(1)
.ok_or(anyhow::anyhow!("Subtract with overflow ({height})!"))?,
)
.await
.context(format!("fetching frontier at height {height}"))
Expand Down

0 comments on commit 248e077

Please sign in to comment.