Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add RUES dispatch #1704

Merged
merged 5 commits into from
May 15, 2024
Merged

Add RUES dispatch #1704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef4def4
rusk: add scaffold for RUES dispatch
May 1, 2024
6cf5b07
rusk: upgrade `hyper` and `tungstenite`
May 2, 2024
5865830
rusk: (de)serialize RUES events properly
May 6, 2024
bdf80b3
rusk: process dispatched events
May 2, 2024
63d0b6e
rusk: remove errant comment
May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions rusk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,14 @@ dusk-bytes = "0.1"
kadcast = "0.6.0-rc"
dusk-wallet-core = "0.25.0-phoenix.0.26"
phoenix-core = { version = "0.26", default-features = false, features = ["rkyv-impl", "alloc"] }
tungstenite = "0.20"
hyper-tungstenite = "0.11"
hyper = { version = "0.14", features = ["server", "stream", "http1", "http2"] }

tokio-stream = "0.1"
pin-project = "1"
tungstenite = "0.21"
hyper-tungstenite = "0.13"
hyper = { version = "1", features = ["server", "http1", "http2"] }
hyper-util = { version = "0.1", features = ["server", "http1", "http2"] }
http-body-util = "0.1"

tokio-stream = { version = "0.1", features = ["sync"] }
tokio-util = { version = "0.7", features = ["rt"] }
tokio-rustls = "0.25"
rustls-pemfile = "2"
Expand Down Expand Up @@ -86,7 +89,7 @@ futures = { version = "0.3", optional = true }

[dev-dependencies]
test-context = "0.1"
reqwest = "0.11"
reqwest = "0.12"
rusk-recovery = { version = "0.6", path = "../rusk-recovery", features = ["state"] }
ff = { version = "0.13", default-features = false }
rusk-prover = { version = "0.3", path = "../rusk-prover", features = ["no_random"] }
Expand Down
4 changes: 2 additions & 2 deletions rusk/src/lib/chain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use node::network::Kadcast;
use rusk_abi::dusk::{dusk, Dusk};
use rusk_abi::VM;

use crate::http::ContractEvent;
use crate::http::RuesEvent;

pub const MINIMUM_STAKE: Dusk = dusk(1000.0);

Expand All @@ -36,7 +36,7 @@ pub struct Rusk {
dir: PathBuf,
pub(crate) generation_timeout: Option<Duration>,
pub(crate) feeder_gas_limit: u64,
pub(crate) event_sender: broadcast::Sender<ContractEvent>,
pub(crate) event_sender: broadcast::Sender<RuesEvent>,
}

#[derive(Clone)]
Expand Down
4 changes: 2 additions & 2 deletions rusk/src/lib/chain/rusk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use rusk_profile::to_rusk_state_id_path;
use tokio::sync::broadcast;

use super::{coinbase_value, emission_amount, Rusk, RuskTip};
use crate::http::ContractEvent;
use crate::http::RuesEvent;
use crate::{Error, Result};

pub static DUSK_KEY: LazyLock<StakePublicKey> = LazyLock::new(|| {
Expand All @@ -44,7 +44,7 @@ impl Rusk {
dir: P,
generation_timeout: Option<Duration>,
feeder_gas_limit: u64,
event_sender: broadcast::Sender<ContractEvent>,
event_sender: broadcast::Sender<RuesEvent>,
) -> Result<Self> {
let dir = dir.as_ref();
let commit_id_path = to_rusk_state_id_path(dir);
Expand Down
Loading
Loading