absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-12 05:59:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Protocol to monero-wallet

Browse Source
This commit is contained in:
Luke Parker
2024-06-21 14:14:15 -04:00
parent 6f61861d4b
commit b5b9d4a871
14 changed files with 233 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coins/monero/wallet/tests/decoys.rs
View File

@@ -1,6 +1,6 @@
use monero_simple_request_rpc::SimpleRequestRpc;
use monero_wallet::{
monero::{transaction::Transaction, Protocol, DEFAULT_LOCK_WINDOW},
monero::{transaction::Transaction, DEFAULT_LOCK_WINDOW},
rpc::{OutputResponse, Rpc},
SpendableOutput,
};

8
coins/monero/wallet/tests/runner.rs
View File

@@ -109,9 +109,6 @@ pub async fn rpc() -> SimpleRequestRpc {
// Mine 40 blocks to ensure decoy availability
rpc.generate_blocks(&addr, 40).await.unwrap();
// Make sure we recognize the protocol
rpc.get_protocol().await.unwrap();
rpc
}
@@ -171,6 +168,7 @@ macro_rules! test {
};
use monero_wallet::{
Protocol,
address::{Network, AddressSpec},
ViewPair, Scanner, Change, DecoySelection, Decoys, FeePriority,
SignableTransaction, SignableTransactionBuilder,
@@ -212,11 +210,11 @@ macro_rules! test {
let miner_tx = get_miner_tx_output(&rpc, &view).await;
let protocol = rpc.get_protocol().await.unwrap();
let protocol = Protocol::try_from(rpc.get_protocol().await.unwrap()).unwrap();
let builder = SignableTransactionBuilder::new(
protocol,
rpc.get_fee_rate(protocol, FeePriority::Unimportant).await.unwrap(),
rpc.get_fee_rate(FeePriority::Unimportant).await.unwrap(),
Change::new(
&ViewPair::new(
&Scalar::random(&mut OsRng) * ED25519_BASEPOINT_TABLE,

9
coins/monero/wallet/tests/send.rs
View File

@@ -2,10 +2,7 @@ use rand_core::OsRng;
use monero_simple_request_rpc::SimpleRequestRpc;
use monero_wallet::{
monero::{transaction::Transaction, Protocol},
rpc::Rpc,
extra::Extra,
address::SubaddressIndex,
monero::transaction::Transaction, Protocol, rpc::Rpc, extra::Extra, address::SubaddressIndex,
ReceivedOutput, SpendableOutput, DecoySelection, Decoys, SignableTransactionBuilder,
};
@@ -109,7 +106,7 @@ test!(
let mut builder = SignableTransactionBuilder::new(
protocol,
rpc.get_fee_rate(protocol, FeePriority::Unimportant).await.unwrap(),
rpc.get_fee_rate(FeePriority::Unimportant).await.unwrap(),
Change::new(&change_view, false),
);
add_inputs(protocol, &rpc, vec![outputs.first().unwrap().clone()], &mut builder).await;
@@ -293,7 +290,7 @@ test!(
let mut builder = SignableTransactionBuilder::new(
protocol,
rpc.get_fee_rate(protocol, FeePriority::Unimportant).await.unwrap(),
rpc.get_fee_rate(FeePriority::Unimportant).await.unwrap(),
Change::fingerprintable(None),
);
add_inputs(protocol, &rpc, vec![outputs.first().unwrap().clone()], &mut builder).await;

2
coins/monero/wallet/tests/wallet2_compatibility.rs
View File

@@ -92,7 +92,7 @@ async fn from_wallet_rpc_to_self(spec: AddressSpec) {
// TODO: Needs https://github.com/monero-project/monero/pull/9260
// let fee_rate = daemon_rpc
// .get_fee_rate(daemon_rpc.get_protocol().await.unwrap(), FeePriority::Unimportant)
// .get_fee_rate(FeePriority::Unimportant)
// .await
// .unwrap();