Fix rebase

Author: febo

Cargo.lock

@@ -7,9 +7,6 @@ use crate::{
     error::ProgramError,
     Address, BPF_ALIGN_OF_U128,
 };
-use solana_address::Address;
-
-use crate::{program_error::ProgramError, BPF_ALIGN_OF_U128, NON_DUP_MARKER};
 
 /// Declare the lazy program entrypoint.
 ///

sdk/pinocchio/src/entrypoint/lazy.rs

@@ -21,9 +21,6 @@ use crate::{
     account::{Account, AccountView, MAX_PERMITTED_DATA_INCREASE},
     Address, BPF_ALIGN_OF_U128, MAX_TX_ACCOUNTS,
 };
-use solana_address::Address;
-
-use crate::{BPF_ALIGN_OF_U128, NON_DUP_MARKER};
 
 /// Start address of the memory region used for program heap.
 pub const HEAP_START_ADDRESS: u64 = 0x300000000;

sdk/pinocchio/src/entrypoint/mod.rs

@@ -10,7 +10,6 @@ use crate::{
     sysvars::Sysvar,
     Address,
 };
-use solana_address::Address;
 
 /// The ID of the rent sysvar.
 pub const RENT_ID: Address = Address::new_from_array([