gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace Transaction::fee with a FeeCalculator

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-03-29 16:11:21 -06:00
parent 9369ea86ea
commit 7896e8288d
8 changed files with 127 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
sdk/src/fee_calculator.rs Normal file
View File

@ -0,0 +1,48 @@
use crate::message::Message;
#[derive(Default)]
pub struct FeeCalculator {
pub lamports_per_signature: u64,
}
impl FeeCalculator {
pub fn new(lamports_per_signature: u64) -> Self {
Self {
lamports_per_signature,
}
}
pub fn calculate_fee(&self, message: &Message) -> u64 {
self.lamports_per_signature * u64::from(message.num_required_signatures)
}
}
#[cfg(test)]
mod tests {
use super::*;
use crate::pubkey::Pubkey;
use crate::system_instruction::SystemInstruction;
#[test]
fn test_fee_calculator_calculate_fee() {
// Default: no fee.
let message = Message::new(vec![]);
assert_eq!(FeeCalculator::default().calculate_fee(&message), 0);
// No signature, no fee.
assert_eq!(FeeCalculator::new(1).calculate_fee(&message), 0);
// One signature, a fee.
let pubkey0 = Pubkey::new(&[0; 32]);
let pubkey1 = Pubkey::new(&[1; 32]);
let ix0 = SystemInstruction::new_move(&pubkey0, &pubkey1, 1);
let message = Message::new(vec![ix0]);
assert_eq!(FeeCalculator::new(2).calculate_fee(&message), 2);
// Two signatures, double the fee.
let ix0 = SystemInstruction::new_move(&pubkey0, &pubkey1, 1);
let ix1 = SystemInstruction::new_move(&pubkey1, &pubkey0, 1);
let message = Message::new(vec![ix0, ix1]);
assert_eq!(FeeCalculator::new(2).calculate_fee(&message), 4);
}
}

4
sdk/src/instruction.rs
View File

@ -67,7 +67,7 @@ impl InstructionError {
}
}
#[derive(Debug, PartialEq)]
#[derive(Debug, PartialEq, Clone)]
pub struct Instruction {
/// Pubkey of the instruction processor that executes this instruction
pub program_ids_index: Pubkey,
@ -93,7 +93,7 @@ impl Instruction {
}
/// Account metadata used to define Instructions
#[derive(Debug, PartialEq, Serialize, Deserialize)]
#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
pub struct AccountMeta {
/// An account's public key
pub pubkey: Pubkey,

1
sdk/src/lib.rs
View File

@ -1,5 +1,6 @@
pub mod account;
pub mod bpf_loader;
pub mod fee_calculator;
pub mod genesis_block;
pub mod hash;
pub mod instruction;

6
sdk/src/message.rs
View File

@ -81,9 +81,6 @@ pub struct Message {
/// The id of a recent ledger entry.
pub recent_blockhash: Hash,
/// The number of lamports paid for processing and storing of this transaction.
pub fee: u64,
/// All the program id keys used to execute this transaction's instructions
#[serde(with = "short_vec")]
pub program_ids: Vec<Pubkey>,
@ -99,7 +96,6 @@ impl Message {
num_required_signatures: u8,
account_keys: Vec<Pubkey>,
recent_blockhash: Hash,
fee: u64,
program_ids: Vec<Pubkey>,
instructions: Vec<CompiledInstruction>,
) -> Self {
@ -107,7 +103,6 @@ impl Message {
num_required_signatures,
account_keys,
recent_blockhash,
fee,
program_ids,
instructions,
}
@ -123,7 +118,6 @@ impl Message {
num_required_signatures,
signed_keys,
Hash::default(),
0,
program_ids,
instructions,
)

31
sdk/src/transaction.rs
View File

@ -49,7 +49,7 @@ pub enum TransactionError {
/// An atomic transaction
#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
pub struct Transaction {
/// A set of digital signatures of `account_keys`, `program_ids`, `recent_blockhash`, `fee` and `instructions`, signed by the first
/// A set of digital signatures of `account_keys`, `program_ids`, `recent_blockhash`, and `instructions`, signed by the first
/// signatures.len() keys of account_keys
#[serde(with = "short_vec")]
pub signatures: Vec<Signature>,
@ -85,10 +85,9 @@ impl Transaction {
from_keypairs: &[&T],
instructions: Vec<Instruction>,
recent_blockhash: Hash,
fee: u64,
_fee: u64,
) -> Transaction {
let mut message = Message::new(instructions);
message.fee = fee;
let message = Message::new(instructions);
Self::new(from_keypairs, message, recent_blockhash)
}
@ -104,7 +103,7 @@ impl Transaction {
from_keypairs: &[&T],
keys: &[Pubkey],
recent_blockhash: Hash,
fee: u64,
_fee: u64,
program_ids: Vec<Pubkey>,
instructions: Vec<CompiledInstruction>,
) -> Self {
@ -117,7 +116,6 @@ impl Transaction {
from_keypairs.len() as u8,
account_keys,
Hash::default(),
fee,
program_ids,
instructions,
);
@ -308,8 +306,7 @@ mod tests {
AccountMeta::new(to, false),
];
let instruction = Instruction::new(program_id, &(1u8, 2u8, 3u8), account_metas);
let mut message = Message::new(vec![instruction]);
message.fee = 99;
let message = Message::new(vec![instruction]);
Transaction::new(&[&keypair], message, Hash::default())
}
@ -352,19 +349,17 @@ mod tests {
let len_size = 1;
let num_required_sigs_size = 1;
let blockhash_size = size_of::<Hash>();
let fee_size = size_of::<u64>();
let expected_transaction_size = len_size
+ (tx.signatures.len() * size_of::<Signature>())
+ num_required_sigs_size
+ len_size
+ (tx.message.account_keys.len() * size_of::<Pubkey>())
+ blockhash_size
+ fee_size
+ len_size
+ (tx.message.program_ids.len() * size_of::<Pubkey>())
+ len_size
+ expected_instruction_size;
assert_eq!(expected_transaction_size, 222);
assert_eq!(expected_transaction_size, 214);
assert_eq!(
serialized_size(&tx).unwrap() as usize,
@ -380,16 +375,16 @@ mod tests {
assert_eq!(
serialize(&create_sample_transaction()).unwrap(),
vec![
1, 102, 197, 120, 176, 192, 35, 190, 233, 5, 135, 30, 114, 209, 105, 219, 212, 203,
242, 72, 150, 205, 68, 30, 188, 119, 31, 212, 40, 43, 88, 45, 239, 83, 45, 208,
103, 108, 239, 82, 185, 160, 161, 111, 112, 51, 254, 61, 254, 131, 206, 221, 117,
124, 50, 1, 6, 38, 218, 9, 95, 28, 46, 49, 5, 1, 2, 36, 100, 158, 252, 33, 161, 97,
1, 0, 30, 236, 164, 222, 77, 89, 244, 36, 92, 35, 192, 25, 100, 18, 61, 155, 111,
89, 189, 154, 90, 255, 217, 203, 105, 50, 243, 208, 179, 89, 146, 122, 222, 91, 34,
106, 93, 82, 147, 213, 223, 184, 32, 204, 61, 227, 227, 41, 211, 67, 5, 156, 236,
251, 178, 235, 234, 174, 123, 15, 26, 145, 3, 1, 2, 36, 100, 158, 252, 33, 161, 97,
185, 62, 89, 99, 195, 250, 249, 187, 189, 171, 118, 241, 90, 248, 14, 68, 219, 231,
62, 157, 5, 142, 27, 210, 117, 1, 1, 1, 4, 5, 6, 7, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9,
9, 9, 9, 9, 9, 9, 9, 8, 7, 6, 5, 4, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 99, 0, 0, 0, 0, 0, 0, 0,
1, 2, 2, 2, 4, 5, 6, 7, 8, 9, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 8, 7, 6,
5, 4, 2, 2, 2, 1, 0, 2, 0, 1, 3, 1, 2, 3
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 4, 5, 6, 7, 8,
9, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 8, 7, 6, 5, 4, 2, 2, 2, 1, 0, 2, 0,
1, 3, 1, 2, 3
]
);
}