Skip to content

Commit

Permalink
Update monero-wallet-rpc to 0.18.3.1 to enable further testing of fee…
Browse files Browse the repository at this point in the history
… code

0.18.3.1 includes monero-project/monero#8882, a
necessary requirement. Doesn't bump any of the nodes due to 0.18.3.0 being
recently released, without clear reason to update.
  • Loading branch information
kayabaNerve committed Oct 4, 2023
1 parent 4ee65ed commit 7984b82
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/actions/monero-wallet-rpc/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ inputs:
version:
description: "Version to download and run"
required: false
default: v0.18.2.0
default: v0.18.3.1

runs:
using: "composite"
Expand Down
18 changes: 8 additions & 10 deletions coins/monero/tests/wallet2_compatibility.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use monero_serai::{
wallet::{
address::{Network, AddressSpec, SubaddressIndex, MoneroAddress},
extra::{MAX_TX_EXTRA_NONCE_SIZE, Extra},
Scanner,
Scanner, FeePriority,
},
};

Expand Down Expand Up @@ -88,13 +88,12 @@ async fn from_wallet_rpc_to_self(spec: AddressSpec) {
.unwrap();
let tx_hash = hex::decode(tx.tx_hash).unwrap().try_into().unwrap();

// TODO: Needs https://github.com/monero-project/monero/pull/8882
// let fee_rate = daemon_rpc
// // Uses `FeePriority::Low` instead of `FeePriority::Lowest` because wallet RPC
// // adjusts `monero_rpc::TransferPriority::Default` up by 1
// .get_fee(daemon_rpc.get_protocol().await.unwrap(), FeePriority::Low)
// .await
// .unwrap();
let fee_rate = daemon_rpc
// Uses `FeePriority::Low` instead of `FeePriority::Lowest` because wallet RPC
// adjusts `monero_rpc::TransferPriority::Default` up by 1
.get_fee(daemon_rpc.get_protocol().await.unwrap(), FeePriority::Low)
.await
.unwrap();

// unlock it
runner::mine_until_unlocked(&daemon_rpc, &wallet_rpc_addr, tx_hash).await;
Expand All @@ -109,8 +108,7 @@ async fn from_wallet_rpc_to_self(spec: AddressSpec) {
let tx = daemon_rpc.get_transaction(tx_hash).await.unwrap();
let output = scanner.scan_transaction(&tx).not_locked().swap_remove(0);

// TODO: Needs https://github.com/monero-project/monero/pull/8882
// runner::check_weight_and_fee(&tx, fee_rate);
runner::check_weight_and_fee(&tx, fee_rate);

match spec {
AddressSpec::Subaddress(index) => assert_eq!(output.metadata.subaddress, Some(index)),
Expand Down

0 comments on commit 7984b82

Please sign in to comment.