Skip to content

Commit

Permalink
Merge branch 'main' into ab/fix-process-compose-logs
Browse files Browse the repository at this point in the history
  • Loading branch information
sveitser authored Mar 7, 2025
2 parents 6aa494a + ccde27c commit 1caa251
Show file tree
Hide file tree
Showing 21 changed files with 867 additions and 89 deletions.
27 changes: 13 additions & 14 deletions .github/workflows/cargo-features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,34 +20,33 @@ concurrency:
jobs:
cargo-features:
runs-on: ubuntu-latest
strategy:
matrix:
command:
- just check-features-ci
- just check-features-ci --tests
steps:
- uses: taiki-e/install-action@cargo-hack
- uses: taiki-e/install-action@just

- name: Checkout Repository
uses: actions/checkout@v4

- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main
with:
tool-cache: false
android: true
dotnet: true
haskell: true
tool-cache: false
dotnet: false
haskell: false
large-packages: false
docker-images: false
swap-storage: false

# Note: this job doesn't use a cache on purpose because it mostly compiles
# the crates in this repo over and over again with different feature
# combinations. Adding caching would not speed it up much and further
# contribute to our cache usage.

# Includes checks for `--no-default-features` and `--all-features` as well
# as each individual feature enabled.
- name: Check compilation for feature combinations
run: |
cargo hack check --feature-powerset --exclude hotshot --exclude hotshot-builder-api --exclude hotshot-task-impls --exclude hotshot-macros --exclude hotshot-events-service --exclude hotshot-utils --exclude hotshot-orchestrator --exclude hotshot-query-service --exclude hotshot-stake-table --exclude hotshot-state-prover --exclude hotshot-task --exclude hotshot-testing --exclude hotshot-types --exclude hotshot-libp2p-networking --exclude hotshot-contract-adapter --exclude hotshot-example-types --exclude vid
- name: Check compilation for feature combinations (--tests)
# combinations. The target directory gets really large. Adding caching
# would not speed it up much and further contribute to our cache usage.
- name: Check compilation feature combinations
run: |
cargo hack check --feature-powerset --tests --exclude hotshot --exclude hotshot-builder-api --exclude hotshot-task-impls --exclude hotshot-macros --exclude hotshot-events-service --exclude hotshot-utils --exclude hotshot-orchestrator --exclude hotshot-query-service --exclude hotshot-stake-table --exclude hotshot-state-prover --exclude hotshot-task --exclude hotshot-testing --exclude hotshot-types --exclude hotshot-libp2p-networking --exclude hotshot-contract-adapter --exclude hotshot-example-types --exclude vid
${{ matrix.command }}
2 changes: 1 addition & 1 deletion .github/workflows/contracts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- uses: Swatinem/rust-cache@v2
name: Enable Rust Caching
with:
prefix-key: v2-rust
prefix-key: v2-rust-${{ hashFiles('flake.*') }}

- name: Check toolchain versions
run: nix develop --accept-flake-config -c ./scripts/show-toolchain-versions
Expand Down
6 changes: 1 addition & 5 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,4 @@
# later match takes precedence, they will be requested for review when someone
# opens a pull request.

* @nomaxg @philippecamacho @ImJeremyHe @sveitser @jbearer @tbro @imabdulbasit

# Dependabot PRs
*.toml @nomaxg @philippecamacho @ImJeremyHe @sveitser
*.lock @nomaxg @philippecamacho @ImJeremyHe @sveitser
* @sveitser @jbearer @tbro @imabdulbasit @ss-es @pls148 @bfish713 @rob-maron @lukaszrzasik
29 changes: 13 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
# Espresso Sequencer
# Espresso Network

[![Build](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/build.yml/badge.svg)](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/build.yml)
[![Test](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/test.yml/badge.svg)](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/test.yml)
[![Docs rust](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/doc-rust.yml/badge.svg)](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/doc-rust.yml)
[![Contracts](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/contracts.yml/badge.svg)](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/contracts.yml)
[![Lint](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/lint.yml/badge.svg)](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/lint.yml)
[![Audit](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/audit.yml/badge.svg)](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/audit.yml)
[![Ubuntu](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/ubuntu-install-without-nix.yml/badge.svg)](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/ubuntu-install-without-nix.yml)
[![Build without lockfile](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/build-without-lockfile.yml/badge.svg)](https://github.com/EspressoSystems/espresso-sequencer/actions/workflows/build-without-lockfile.yml)
[![Coverage Status](https://coveralls.io/repos/github/EspressoSystems/espresso-sequencer/badge.svg?branch=main)](https://coveralls.io/github/EspressoSystems/espresso-sequencer?branch=main)
[![Build](https://github.com/EspressoSystems/espresso-network/actions/workflows/build.yml/badge.svg)](https://github.com/EspressoSystems/espresso-network/actions/workflows/build.yml)
[![Test](https://github.com/EspressoSystems/espresso-network/actions/workflows/test.yml/badge.svg)](https://github.com/EspressoSystems/espresso-network/actions/workflows/test.yml)
[![Docs rust](https://github.com/EspressoSystems/espresso-network/actions/workflows/doc-rust.yml/badge.svg)](https://github.com/EspressoSystems/espresso-network/actions/workflows/doc-rust.yml)
[![Contracts](https://github.com/EspressoSystems/espresso-network/actions/workflows/contracts.yml/badge.svg)](https://github.com/EspressoSystems/espresso-network/actions/workflows/contracts.yml)
[![Lint](https://github.com/EspressoSystems/espresso-network/actions/workflows/lint.yml/badge.svg)](https://github.com/EspressoSystems/espresso-network/actions/workflows/lint.yml)
[![Audit](https://github.com/EspressoSystems/espresso-network/actions/workflows/audit.yml/badge.svg)](https://github.com/EspressoSystems/espresso-network/actions/workflows/audit.yml)
[![Ubuntu](https://github.com/EspressoSystems/espresso-network/actions/workflows/ubuntu-install-without-nix.yml/badge.svg)](https://github.com/EspressoSystems/espresso-network/actions/workflows/ubuntu-install-without-nix.yml)
[![Build without lockfile](https://github.com/EspressoSystems/espresso-network/actions/workflows/build-without-lockfile.yml/badge.svg)](https://github.com/EspressoSystems/espresso-network/actions/workflows/build-without-lockfile.yml)
[![Coverage Status](https://coveralls.io/repos/github/EspressoSystems/espresso-network/badge.svg?branch=main)](https://coveralls.io/github/EspressoSystems/espresso-network?branch=main)

The Espresso Sequencer offers rollups credible neutrality and enhanced interoperability, without compromising on scale.
Consisting of a data availability solution and a decentralized network of nodes that sequences transactions, layer-2
rollups can leverage the Espresso Sequencer to give developers and end users fast confirmations, low (and fair) fees,
and robust infrastructure.
The Espresso Network is the global confirmation layer for rollups in the Ethereum ecosystem. Espresso's [global confirmation layer(GCL)](https://docs.espressosys.com/network) provides agreement on inputs to a collection of composable blockchains, providing a high trust, fast, and verifiable way to process inputs on any chain, providing fast confirmations in return.

[Official Documentation](https://docs.espressosys.com/sequencer/espresso-sequencer-architecture/readme)
[Official Documentation](https://docs.espressosys.com/network/)

### Architecture

Expand All @@ -36,7 +33,7 @@ a dockerized Espresso Sequencer network with an example Layer 2 rollup applicati

# Development

- Obtain code: `git clone git@github.com:EspressoSystems/espresso-sequencer`.
- Obtain code: `git clone git@github.com:EspressoSystems/espresso-network`.
- Make sure [nix](https://nixos.org/download.html) is installed.
- Activate the environment with `nix-shell`, or `nix develop`, or `direnv allow` if using [direnv](https://direnv.net/).
- For installation without nix please see [ubuntu.md](./doc/ubuntu.md).
Expand Down
9 changes: 9 additions & 0 deletions contract-bindings-alloy/src/erc1967proxy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ pub mod ERC1967Proxy {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct AddressEmptyCode {
#[allow(missing_docs)]
pub target: alloy::sol_types::private::Address,
}
#[allow(
Expand Down Expand Up @@ -189,6 +190,7 @@ pub mod ERC1967Proxy {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct ERC1967InvalidImplementation {
#[allow(missing_docs)]
pub implementation: alloy::sol_types::private::Address,
}
#[allow(
Expand Down Expand Up @@ -479,7 +481,9 @@ pub mod ERC1967Proxy {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct constructorCall {
#[allow(missing_docs)]
pub implementation: alloy::sol_types::private::Address,
#[allow(missing_docs)]
pub _data: alloy::sol_types::private::Bytes,
}
const _: () = {
Expand Down Expand Up @@ -550,9 +554,13 @@ pub mod ERC1967Proxy {
};
///Container for all the [`ERC1967Proxy`](self) custom errors.
pub enum ERC1967ProxyErrors {
#[allow(missing_docs)]
AddressEmptyCode(AddressEmptyCode),
#[allow(missing_docs)]
ERC1967InvalidImplementation(ERC1967InvalidImplementation),
#[allow(missing_docs)]
ERC1967NonPayable(ERC1967NonPayable),
#[allow(missing_docs)]
FailedInnerCall(FailedInnerCall),
}
#[automatically_derived]
Expand Down Expand Up @@ -710,6 +718,7 @@ pub mod ERC1967Proxy {
}
///Container for all the [`ERC1967Proxy`](self) events.
pub enum ERC1967ProxyEvents {
#[allow(missing_docs)]
Upgraded(Upgraded),
}
#[automatically_derived]
Expand Down
53 changes: 53 additions & 0 deletions contract-bindings-alloy/src/feecontract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@ pub mod FeeContract {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct AddressEmptyCode {
#[allow(missing_docs)]
pub target: alloy::sol_types::private::Address,
}
#[allow(
Expand Down Expand Up @@ -660,6 +661,7 @@ pub mod FeeContract {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct ERC1967InvalidImplementation {
#[allow(missing_docs)]
pub implementation: alloy::sol_types::private::Address,
}
#[allow(
Expand Down Expand Up @@ -1148,6 +1150,7 @@ pub mod FeeContract {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct OwnableInvalidOwner {
#[allow(missing_docs)]
pub owner: alloy::sol_types::private::Address,
}
#[allow(
Expand Down Expand Up @@ -1214,6 +1217,7 @@ pub mod FeeContract {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct OwnableUnauthorizedAccount {
#[allow(missing_docs)]
pub account: alloy::sol_types::private::Address,
}
#[allow(
Expand Down Expand Up @@ -1340,6 +1344,7 @@ pub mod FeeContract {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct UUPSUnsupportedProxiableUUID {
#[allow(missing_docs)]
pub slot: alloy::sol_types::private::FixedBytes<32>,
}
#[allow(
Expand Down Expand Up @@ -2095,6 +2100,7 @@ pub mod FeeContract {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct UPGRADE_INTERFACE_VERSIONReturn {
#[allow(missing_docs)]
pub _0: alloy::sol_types::private::String,
}
#[allow(
Expand Down Expand Up @@ -2201,12 +2207,14 @@ pub mod FeeContract {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct balancesCall {
#[allow(missing_docs)]
pub user: alloy::sol_types::private::Address,
}
///Container type for the return parameters of the [`balances(address)`](balancesCall) function.
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct balancesReturn {
#[allow(missing_docs)]
pub amount: alloy::sol_types::private::primitives::aliases::U256,
}
#[allow(
Expand Down Expand Up @@ -2317,6 +2325,7 @@ pub mod FeeContract {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct depositCall {
#[allow(missing_docs)]
pub user: alloy::sol_types::private::Address,
}
///Container type for the return parameters of the [`deposit(address)`](depositCall) function.
Expand Down Expand Up @@ -2435,8 +2444,11 @@ pub mod FeeContract {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct getVersionReturn {
#[allow(missing_docs)]
pub majorVersion: u8,
#[allow(missing_docs)]
pub minorVersion: u8,
#[allow(missing_docs)]
pub patchVersion: u8,
}
#[allow(
Expand Down Expand Up @@ -2555,6 +2567,7 @@ pub mod FeeContract {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct initializeCall {
#[allow(missing_docs)]
pub multisig: alloy::sol_types::private::Address,
}
///Container type for the return parameters of the [`initialize(address)`](initializeCall) function.
Expand Down Expand Up @@ -2673,6 +2686,7 @@ pub mod FeeContract {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct maxDepositAmountReturn {
#[allow(missing_docs)]
pub _0: alloy::sol_types::private::primitives::aliases::U256,
}
#[allow(
Expand Down Expand Up @@ -2783,6 +2797,7 @@ pub mod FeeContract {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct minDepositAmountReturn {
#[allow(missing_docs)]
pub _0: alloy::sol_types::private::primitives::aliases::U256,
}
#[allow(
Expand Down Expand Up @@ -2893,6 +2908,7 @@ pub mod FeeContract {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct ownerReturn {
#[allow(missing_docs)]
pub _0: alloy::sol_types::private::Address,
}
#[allow(
Expand Down Expand Up @@ -3003,6 +3019,7 @@ pub mod FeeContract {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct proxiableUUIDReturn {
#[allow(missing_docs)]
pub _0: alloy::sol_types::private::FixedBytes<32>,
}
#[allow(
Expand Down Expand Up @@ -3217,6 +3234,7 @@ pub mod FeeContract {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct transferOwnershipCall {
#[allow(missing_docs)]
pub newOwner: alloy::sol_types::private::Address,
}
///Container type for the return parameters of the [`transferOwnership(address)`](transferOwnershipCall) function.
Expand Down Expand Up @@ -3331,7 +3349,9 @@ pub mod FeeContract {
#[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)]
#[derive(Clone)]
pub struct upgradeToAndCallCall {
#[allow(missing_docs)]
pub newImplementation: alloy::sol_types::private::Address,
#[allow(missing_docs)]
pub data: alloy::sol_types::private::Bytes,
}
///Container type for the return parameters of the [`upgradeToAndCall(address,bytes)`](upgradeToAndCallCall) function.
Expand Down Expand Up @@ -3456,17 +3476,29 @@ pub mod FeeContract {
};
///Container for all the [`FeeContract`](self) function calls.
pub enum FeeContractCalls {
#[allow(missing_docs)]
UPGRADE_INTERFACE_VERSION(UPGRADE_INTERFACE_VERSIONCall),
#[allow(missing_docs)]
balances(balancesCall),
#[allow(missing_docs)]
deposit(depositCall),
#[allow(missing_docs)]
getVersion(getVersionCall),
#[allow(missing_docs)]
initialize(initializeCall),
#[allow(missing_docs)]
maxDepositAmount(maxDepositAmountCall),
#[allow(missing_docs)]
minDepositAmount(minDepositAmountCall),
#[allow(missing_docs)]
owner(ownerCall),
#[allow(missing_docs)]
proxiableUUID(proxiableUUIDCall),
#[allow(missing_docs)]
renounceOwnership(renounceOwnershipCall),
#[allow(missing_docs)]
transferOwnership(transferOwnershipCall),
#[allow(missing_docs)]
upgradeToAndCall(upgradeToAndCallCall),
}
#[automatically_derived]
Expand Down Expand Up @@ -3784,20 +3816,35 @@ pub mod FeeContract {
}
///Container for all the [`FeeContract`](self) custom errors.
pub enum FeeContractErrors {
#[allow(missing_docs)]
AddressEmptyCode(AddressEmptyCode),
#[allow(missing_docs)]
DepositTooLarge(DepositTooLarge),
#[allow(missing_docs)]
DepositTooSmall(DepositTooSmall),
#[allow(missing_docs)]
ERC1967InvalidImplementation(ERC1967InvalidImplementation),
#[allow(missing_docs)]
ERC1967NonPayable(ERC1967NonPayable),
#[allow(missing_docs)]
FailedInnerCall(FailedInnerCall),
#[allow(missing_docs)]
FunctionDoesNotExist(FunctionDoesNotExist),
#[allow(missing_docs)]
InvalidInitialization(InvalidInitialization),
#[allow(missing_docs)]
InvalidUserAddress(InvalidUserAddress),
#[allow(missing_docs)]
NoFunctionCalled(NoFunctionCalled),
#[allow(missing_docs)]
NotInitializing(NotInitializing),
#[allow(missing_docs)]
OwnableInvalidOwner(OwnableInvalidOwner),
#[allow(missing_docs)]
OwnableUnauthorizedAccount(OwnableUnauthorizedAccount),
#[allow(missing_docs)]
UUPSUnauthorizedCallContext(UUPSUnauthorizedCallContext),
#[allow(missing_docs)]
UUPSUnsupportedProxiableUUID(UUPSUnsupportedProxiableUUID),
}
#[automatically_derived]
Expand Down Expand Up @@ -4209,11 +4256,17 @@ pub mod FeeContract {
}
///Container for all the [`FeeContract`](self) events.
pub enum FeeContractEvents {
#[allow(missing_docs)]
Deposit(Deposit),
#[allow(missing_docs)]
Initialized(Initialized),
#[allow(missing_docs)]
Log(Log),
#[allow(missing_docs)]
OwnershipTransferred(OwnershipTransferred),
#[allow(missing_docs)]
Upgrade(Upgrade),
#[allow(missing_docs)]
Upgraded(Upgraded),
}
#[automatically_derived]
Expand Down
Loading

0 comments on commit 1caa251

Please sign in to comment.