Skip to content

Commit

Permalink
Merge branch 'main' into rf/interop-types
Browse files Browse the repository at this point in the history
  • Loading branch information
refcell authored Jan 3, 2025
2 parents cff627b + 7cbfa1f commit 9249381
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ jobs:
submodules: true
- uses: dtolnay/rust-toolchain@stable
with:
target: wasm32-wasi
target: wasm32-wasip1
- uses: taiki-e/install-action@cargo-hack
- uses: Swatinem/rust-cache@v2
with:
cache-on-failure: true
- name: cargo hack
run: |
cargo hack build --workspace --target wasm32-wasi --exclude op-alloy-network --exclude op-alloy-rpc-types --exclude op-alloy-rpc-jsonrpsee --exclude op-alloy-provider
cargo hack build --workspace --target wasm32-wasip1 --exclude op-alloy-network --exclude op-alloy-rpc-types --exclude op-alloy-provider
no-std:
runs-on: ubuntu-latest
Expand Down
7 changes: 7 additions & 0 deletions crates/rpc-jsonrpsee/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ alloy-primitives.workspace = true
jsonrpsee.workspace = true

[features]
default = ["std"]
std = [
"op-alloy-rpc-types/std",
"op-alloy-rpc-types-engine/std",
"alloy-eips/std",
"alloy-primitives/std",
]
client = [
"jsonrpsee/client",
"jsonrpsee/async-client",
Expand Down
3 changes: 3 additions & 0 deletions crates/rpc-jsonrpsee/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@
)]
#![cfg_attr(not(test), warn(unused_crate_dependencies))]
#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
#![cfg_attr(not(feature = "std"), no_std)]

extern crate alloc;

pub mod traits;
4 changes: 3 additions & 1 deletion crates/rpc-jsonrpsee/src/traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@

//! Rollup Node
use alloc::{boxed::Box, string::String, vec::Vec};
use core::net::IpAddr;

use alloy_eips::BlockNumberOrTag;
use alloy_primitives::{B256, U64};
use jsonrpsee::{core::RpcResult, proc_macros::rpc};
use op_alloy_rpc_types::{
OutputResponse, PeerDump, PeerInfo, PeerStats, RollupConfig, SafeHeadResponse, SyncStatus,
};
use op_alloy_rpc_types_engine::{ProtocolVersion, SuperchainSignal};
use std::net::IpAddr;

/// Optimism specified rpc interface.
///
Expand Down

0 comments on commit 9249381

Please sign in to comment.