fix errors
This commit is contained in:
47
Cargo.lock
generated
47
Cargo.lock
generated
@@ -1694,7 +1694,7 @@ dependencies = [
|
|||||||
"solana-last-restart-slot",
|
"solana-last-restart-slot",
|
||||||
"solana-loader-v3-interface",
|
"solana-loader-v3-interface",
|
||||||
"solana-loader-v4-interface",
|
"solana-loader-v4-interface",
|
||||||
"solana-message 3.1.0",
|
"solana-message",
|
||||||
"solana-native-token",
|
"solana-native-token",
|
||||||
"solana-nonce",
|
"solana-nonce",
|
||||||
"solana-nonce-account",
|
"solana-nonce-account",
|
||||||
@@ -1717,7 +1717,7 @@ dependencies = [
|
|||||||
"solana-system-program",
|
"solana-system-program",
|
||||||
"solana-sysvar 3.1.1",
|
"solana-sysvar 3.1.1",
|
||||||
"solana-sysvar-id",
|
"solana-sysvar-id",
|
||||||
"solana-transaction 3.1.0",
|
"solana-transaction",
|
||||||
"solana-transaction-context",
|
"solana-transaction-context",
|
||||||
"solana-transaction-error",
|
"solana-transaction-error",
|
||||||
"thiserror 2.0.18",
|
"thiserror 2.0.18",
|
||||||
@@ -3050,20 +3050,6 @@ dependencies = [
|
|||||||
"solana-transaction-error",
|
"solana-transaction-error",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "solana-message"
|
|
||||||
version = "4.2.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "705bae842f1d02819db46ae9051613d78576c7cdabc0edb5cba4d7fe9482acaf"
|
|
||||||
dependencies = [
|
|
||||||
"solana-address 2.6.1",
|
|
||||||
"solana-hash 4.4.0",
|
|
||||||
"solana-instruction",
|
|
||||||
"solana-sanitize",
|
|
||||||
"solana-sdk-ids",
|
|
||||||
"solana-transaction-error",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solana-msg"
|
name = "solana-msg"
|
||||||
version = "3.1.0"
|
version = "3.1.0"
|
||||||
@@ -3567,11 +3553,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "be3250a278a769ba59059e13d0f16c2aba0ca1de7595fb0e02556091751560c8"
|
checksum = "be3250a278a769ba59059e13d0f16c2aba0ca1de7595fb0e02556091751560c8"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"solana-hash 3.1.0",
|
"solana-hash 3.1.0",
|
||||||
"solana-message 3.1.0",
|
"solana-message",
|
||||||
"solana-pubkey 3.0.0",
|
"solana-pubkey 3.0.0",
|
||||||
"solana-sdk-ids",
|
"solana-sdk-ids",
|
||||||
"solana-signature",
|
"solana-signature",
|
||||||
"solana-transaction 3.1.0",
|
"solana-transaction",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3728,7 +3714,7 @@ dependencies = [
|
|||||||
"solana-hash 4.4.0",
|
"solana-hash 4.4.0",
|
||||||
"solana-instruction",
|
"solana-instruction",
|
||||||
"solana-instruction-error",
|
"solana-instruction-error",
|
||||||
"solana-message 3.1.0",
|
"solana-message",
|
||||||
"solana-sanitize",
|
"solana-sanitize",
|
||||||
"solana-sdk-ids",
|
"solana-sdk-ids",
|
||||||
"solana-short-vec",
|
"solana-short-vec",
|
||||||
@@ -3737,23 +3723,6 @@ dependencies = [
|
|||||||
"solana-transaction-error",
|
"solana-transaction-error",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "solana-transaction"
|
|
||||||
version = "4.1.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "47d105ecce084206697230226c6b2230401c220feb4dc63e1274d58b38969292"
|
|
||||||
dependencies = [
|
|
||||||
"solana-address 2.6.1",
|
|
||||||
"solana-hash 4.4.0",
|
|
||||||
"solana-instruction",
|
|
||||||
"solana-instruction-error",
|
|
||||||
"solana-message 4.2.1",
|
|
||||||
"solana-sanitize",
|
|
||||||
"solana-sdk-ids",
|
|
||||||
"solana-signature",
|
|
||||||
"solana-transaction-error",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "solana-transaction-context"
|
name = "solana-transaction-context"
|
||||||
version = "3.1.14"
|
version = "3.1.14"
|
||||||
@@ -3835,7 +3804,7 @@ dependencies = [
|
|||||||
"solana-sdk-ids",
|
"solana-sdk-ids",
|
||||||
"solana-signer",
|
"solana-signer",
|
||||||
"solana-slot-hashes",
|
"solana-slot-hashes",
|
||||||
"solana-transaction 3.1.0",
|
"solana-transaction",
|
||||||
"solana-transaction-context",
|
"solana-transaction-context",
|
||||||
"solana-vote-interface",
|
"solana-vote-interface",
|
||||||
"thiserror 2.0.18",
|
"thiserror 2.0.18",
|
||||||
@@ -3956,9 +3925,9 @@ dependencies = [
|
|||||||
"litesvm",
|
"litesvm",
|
||||||
"pyth-solana-receiver-sdk",
|
"pyth-solana-receiver-sdk",
|
||||||
"solana-keypair",
|
"solana-keypair",
|
||||||
"solana-message 4.2.1",
|
"solana-message",
|
||||||
"solana-signer",
|
"solana-signer",
|
||||||
"solana-transaction 4.1.3",
|
"solana-transaction",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ pyth-solana-receiver-sdk = "1.2.0"
|
|||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
litesvm = "0.12.0"
|
litesvm = "0.12.0"
|
||||||
solana-message = "4.2.1"
|
solana-message = "3.1.0"
|
||||||
solana-transaction = "4.1.3"
|
solana-transaction = "3.1.0"
|
||||||
solana-signer = "3.0.1"
|
solana-signer = "3.0.1"
|
||||||
solana-keypair = "3.1.2"
|
solana-keypair = "3.1.2"
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ use anchor_lang::{
|
|||||||
solana_program::{instruction::Instruction, system_program},
|
solana_program::{instruction::Instruction, system_program},
|
||||||
AccountDeserialize, InstructionData, ToAccountMetas,
|
AccountDeserialize, InstructionData, ToAccountMetas,
|
||||||
};
|
};
|
||||||
use litesvm::LiteSVM;
|
use litesvm::{types::TransactionResult, LiteSVM};
|
||||||
use solana_keypair::Keypair;
|
use solana_keypair::Keypair;
|
||||||
use solana_message::{Message, VersionedMessage};
|
use solana_message::{Message, VersionedMessage};
|
||||||
use solana_signer::Signer;
|
use solana_signer::Signer;
|
||||||
@@ -81,13 +81,11 @@ pub fn try_send(
|
|||||||
svm: &mut LiteSVM,
|
svm: &mut LiteSVM,
|
||||||
ixs: &[Instruction],
|
ixs: &[Instruction],
|
||||||
signers: &[&Keypair],
|
signers: &[&Keypair],
|
||||||
) -> Result<(), Box<dyn std::error::Error>> {
|
) -> TransactionResult {
|
||||||
let blockhash = svm.latest_blockhash();
|
let blockhash = svm.latest_blockhash();
|
||||||
let msg = Message::new_with_blockhash(ixs, Some(&signers[0].pubkey()), &blockhash);
|
let msg = Message::new_with_blockhash(ixs, Some(&signers[0].pubkey()), &blockhash);
|
||||||
let tx = VersionedTransaction::try_new(VersionedMessage::Legacy(msg), signers)
|
let tx = VersionedTransaction::try_new(VersionedMessage::Legacy(msg), signers).unwrap();
|
||||||
.map_err(|e| Box::new(e) as Box<dyn std::error::Error>)?;
|
|
||||||
svm.send_transaction(tx)
|
svm.send_transaction(tx)
|
||||||
.map_err(|e| Box::new(e) as Box<dyn std::error::Error>)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Listing instruction builders ---
|
// --- Listing instruction builders ---
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
mod common;
|
mod common;
|
||||||
use common::*;
|
use common::*;
|
||||||
|
use solana_signer::Signer;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn seller_can_create_sol_only_listing() {
|
fn seller_can_create_sol_only_listing() {
|
||||||
|
|||||||
Reference in New Issue
Block a user