Get the repo to compile again

This commit is contained in:
Luke Parker
2024-06-23 10:08:51 -04:00
parent 11dba9173f
commit 0b20004ba1
40 changed files with 1452 additions and 777 deletions

View File

@@ -349,7 +349,8 @@ async fn mint_and_burn_test() {
{
use curve25519_dalek::{constants::ED25519_BASEPOINT_POINT, scalar::Scalar};
use monero_wallet::{
monero::{io::decompress_point, transaction::Timelock},
io::decompress_point,
transaction::Timelock,
Protocol,
rpc::Rpc,
ViewPair, Scanner, DecoySelection, Decoys, Change, FeePriority, SignableTransaction,
@@ -582,7 +583,7 @@ async fn mint_and_burn_test() {
// Verify the received Monero TX
{
use monero_wallet::{rpc::Rpc, ViewPair, Scanner};
use monero_wallet::{transaction::Transaction, rpc::Rpc, ViewPair, Scanner};
let rpc = handles[0].monero(&ops).await;
let mut scanner = Scanner::from_view(
ViewPair::new(monero_spend, Zeroizing::new(monero_view)),
@@ -603,7 +604,10 @@ async fn mint_and_burn_test() {
assert_eq!(block.txs.len(), 1);
let tx = rpc.get_transaction(block.txs[0]).await.unwrap();
let tx_fee = tx.rct_signatures.base.fee;
let tx_fee = match &tx {
Transaction::V2 { proofs: Some(proofs), .. } => proofs.base.fee,
_ => panic!("fetched TX wasn't a signed V2 TX"),
};
assert_eq!(outputs[0].commitment().amount, 1_000_000_000_000 - tx_fee);
found = true;

View File

@@ -35,14 +35,4 @@ dkg = { path = "../../crypto/dkg", default-features = false }
bitcoin-serai = { path = "../../coins/bitcoin", default-features = false, features = ["hazmat"] }
monero-io = { path = "../../coins/monero/io", default-features = false }
monero-generators = { path = "../../coins/monero/generators", default-features = false }
monero-primitives = { path = "../../coins/monero/primitives", default-features = false }
monero-mlsag = { path = "../../coins/monero/ringct/mlsag", default-features = false }
monero-clsag = { path = "../../coins/monero/ringct/clsag", default-features = false }
monero-bulletproofs = { path = "../../coins/monero/ringct/bulletproofs", default-features = false }
monero-serai = { path = "../../coins/monero", default-features = false }
monero-rpc = { path = "../../coins/monero/rpc", default-features = false }
monero-seed = { path = "../../coins/monero/wallet/seed", default-features = false }
monero-polyseed = { path = "../../coins/monero/wallet/polyseed", default-features = false }
monero-wallet = { path = "../../coins/monero/wallet", default-features = false }
monero-wallet-util = { path = "../../coins/monero/wallet/util", default-features = false, features = ["compile-time-generators"] }

View File

@@ -20,12 +20,4 @@ pub use frost_schnorrkel;
pub use bitcoin_serai;
pub use monero_io;
pub use monero_generators;
pub use monero_primitives;
pub use monero_mlsag;
pub use monero_clsag;
pub use monero_bulletproofs;
pub use monero_serai;
pub use monero_rpc;
pub use monero_wallet;
pub use monero_wallet_util;

View File

@@ -579,7 +579,7 @@ impl Coordinator {
}
NetworkId::Monero => {
use monero_simple_request_rpc::SimpleRequestRpc;
use monero_wallet::{rpc::Rpc, monero::transaction::Transaction};
use monero_wallet::{transaction::Transaction, rpc::Rpc};
let rpc = SimpleRequestRpc::new(rpc_url)
.await

View File

@@ -437,8 +437,8 @@ impl Wallet {
use curve25519_dalek::constants::ED25519_BASEPOINT_POINT;
use monero_simple_request_rpc::SimpleRequestRpc;
use monero_wallet::{
io::decompress_point,
rpc::Rpc,
monero::io::decompress_point,
Protocol,
address::{Network, AddressType, AddressMeta, Address},
SpendableOutput, DecoySelection, Decoys, Change, FeePriority, Scanner,