* Align host addresses (#11384)
* Align host addresses
* support new program abi
* update epoch rollout
* Enforce aligned pointers in cross-program invocations
(cherry picked from commit 9290e561e1)
# Conflicts:
#	core/src/validator.rs
#	genesis-programs/src/lib.rs
#	programs/bpf_loader/src/deprecated.rs
#	programs/bpf_loader/src/lib.rs
#	sdk/src/entrypoint_native.rs
#	sdk/src/lib.rs
* resolve conflicts
* nudge
Co-authored-by: Jack May <jack@solana.com>
			
			
This commit is contained in:
		@@ -39,9 +39,8 @@ pub fn get_inflation(operating_mode: OperatingMode, epoch: Epoch) -> Option<Infl
 | 
			
		||||
        OperatingMode::Stable => match epoch {
 | 
			
		||||
            // No inflation at epoch 0
 | 
			
		||||
            0 => Some(Inflation::new_disabled()),
 | 
			
		||||
            // Inflation starts
 | 
			
		||||
            // The epoch of Epoch::MAX is a placeholder and is expected to be reduced in
 | 
			
		||||
            // a future hard fork.
 | 
			
		||||
            // Inflation starts The epoch of Epoch::MAX is a placeholder and is
 | 
			
		||||
            // expected to be reduced in a future hard fork.
 | 
			
		||||
            Epoch::MAX => Some(Inflation::default()),
 | 
			
		||||
            _ => None,
 | 
			
		||||
        },
 | 
			
		||||
@@ -57,8 +56,10 @@ fn get_programs(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<Progr
 | 
			
		||||
    match operating_mode {
 | 
			
		||||
        OperatingMode::Development => {
 | 
			
		||||
            if epoch == 0 {
 | 
			
		||||
                // Programs used for testing
 | 
			
		||||
                Some(vec![
 | 
			
		||||
                    Program::BuiltinLoader(solana_bpf_loader_program!()),
 | 
			
		||||
                    Program::BuiltinLoader(solana_bpf_loader_deprecated_program!()),
 | 
			
		||||
                    Program::Native(solana_vest_program!()),
 | 
			
		||||
                    Program::Native(solana_budget_program!()),
 | 
			
		||||
                    Program::Native(solana_exchange_program!()),
 | 
			
		||||
@@ -179,7 +180,7 @@ mod tests {
 | 
			
		||||
    fn test_development_programs() {
 | 
			
		||||
        assert_eq!(
 | 
			
		||||
            get_programs(OperatingMode::Development, 0).unwrap().len(),
 | 
			
		||||
            4
 | 
			
		||||
            5
 | 
			
		||||
        );
 | 
			
		||||
        assert!(get_programs(OperatingMode::Development, 1).is_none());
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user