diff --git a/.github/workflows/monero-tests.yaml b/.github/workflows/monero-tests.yaml index c558d04f1..1901b256f 100644 --- a/.github/workflows/monero-tests.yaml +++ b/.github/workflows/monero-tests.yaml @@ -66,7 +66,6 @@ jobs: GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-simple-request-rpc --test '*' GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-wallet --test '*' GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-wallet-util --test '*' - GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai-verify-chain --test '*' - name: Run Integration Tests # Don't run if the the tests workflow also will @@ -76,4 +75,3 @@ jobs: GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-simple-request-rpc --test '*' GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-wallet --all-features --test '*' GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-wallet-util --all-features --test '*' - GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai-verify-chain --test '*' diff --git a/orchestration/src/coins/monero.rs b/orchestration/src/coins/monero.rs index a6a05bb94..7318e3e33 100644 --- a/orchestration/src/coins/monero.rs +++ b/orchestration/src/coins/monero.rs @@ -69,14 +69,7 @@ CMD ["/run.sh"] } pub fn monero(orchestration_path: &Path, network: Network) { - monero_internal( - network, - Os::Debian, - orchestration_path, - "monero", - "monerod", - "18080 18081", - ) + monero_internal(network, Os::Debian, orchestration_path, "monero", "monerod", "18080 18081") } pub fn monero_wallet_rpc(orchestration_path: &Path) { diff --git a/processor/src/networks/monero.rs b/processor/src/networks/monero.rs index c3534d67b..37ef242d1 100644 --- a/processor/src/networks/monero.rs +++ b/processor/src/networks/monero.rs @@ -292,8 +292,8 @@ impl Monero { fees.sort(); let fee = fees.get(fees.len() / 2).copied().unwrap_or(0); - // TODO: Set a sane minimum fee - Ok(FeeRate::new(fee.max(1500000), 10000).unwrap()) + // TODO: Set a sane minimum/maximum fee + Ok(FeeRate::new(fee.min(50_000).max(5_000_000), 10000).unwrap()) } async fn make_signable_transaction(