Feat/sdk compatibility (#13)

* chore: improve sdk compatibility

* chore: refactor

Author: GabrielePicco

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "magic-domain-program"
 description = "Domain registration program for Ephemeral Rollups"
-version = "0.0.1"
+version = "0.1.0"
 authors = ["Magicblock Labs <dev@magicblock.gg>"]
 edition = "2021"
 license = "MIT"
@@ -17,21 +17,24 @@ name = "mdp"
 
 [dependencies]
 # solana
-solana-program = { version = "^2, <3" }
-security-txt = { version = "1.1.1", package = "solana-security-txt", optional = true }
+solana-program = { version = ">=1.6" }
+solana-system-interface = { version = ">=1", features = ["bincode"]}
+security-txt = { version = ">=1", package = "solana-security-txt", optional = true }
 
 # serialization/deserialization
-borsh = { version = "1", features = [ "derive" ] }
-bytemuck_derive = "<=1.8"
+borsh = { version = ">=1", features = [ "derive" ] }
+bytemuck_derive = ">=1"
 
 [dev-dependencies]
-program-test = { package = "solana-program-test", version = "^2, <3" }
-sdk = { package = "solana-sdk", version = "^2, <3" }
-tokio = { version = "1.0", features = [ "macros", "rt" ] }
+solana-sdk = { version = ">=1.6" }
+solana-program-test = { version = ">=1.6" }
+tokio = { version = ">=1", features = [ "macros", "rt" ] }
 
 [features]
 entrypoint = ["security-txt"]
 default = ["entrypoint"]
+disable-realloc = []
+modular-sdk = []
 
 
 

Cargo.toml

@@ -10,6 +10,7 @@ pub mod state;
 pub mod entrypoint;
 #[cfg(feature = "entrypoint")]
 mod processors;
+mod solana_compact;
 
 declare_id!("DmnRGfyyftzacFb1XadYhWF6vWqXwtQk5tbr6XgR3BA1");
 

src/lib.rs

@@ -1,15 +1,15 @@
 use borsh::BorshSerialize;
+use solana_compact::solana::system_instruction::create_account;
 use solana_program::msg;
 use solana_program::{
     account_info::{next_account_info, AccountInfo},
     program::invoke_signed,
     program_error::ProgramError,
     rent::Rent,
-    system_instruction::create_account,
     sysvar::Sysvar,
 };
 
-use crate::{state::record::ErRecord, ID};
+use crate::{solana_compact, state::record::ErRecord, ID};
 
 /// Registers ER node in domain registry, by creating a record (PDA) with all the relevant ER information
 pub fn process_registration<'a>(

src/processors/register.rs

@@ -4,10 +4,11 @@ use solana_program::{
     program::invoke,
     program_error::ProgramError,
     rent::Rent,
-    system_instruction,
     sysvar::Sysvar,
 };
 
+use crate::solana_compact::resize;
+use crate::solana_compact::solana::system_instruction;
 use crate::{instructions::sync::SyncInstruction, state::record::ErRecord, ID};
 
 /// Synchronize updated ER information with existing domain registry record
@@ -76,7 +77,7 @@ pub fn process_sync_record<'a>(
         **pda_account.try_borrow_mut_lamports()? -= rent_old - rent_new;
         **payer.try_borrow_mut_lamports()? += rent_old - rent_new;
     }
-    pda_account.realloc(new_size, false)?;
+    resize(pda_account, new_size)?;
     data = pda_account.try_borrow_mut_data()?;
     record.serialize(&mut *data)?;
 

src/processors/sync.rs

@@ -6,6 +6,7 @@ use solana_program::{
     program_error::ProgramError,
 };
 
+use crate::solana_compact::resize;
 use crate::state::record::ErRecord;
 use crate::ID;
 
@@ -65,7 +66,7 @@ pub fn process_unregistration<'a>(
     **pda_account.try_borrow_mut_lamports()? = 0;
 
     pda_account.assign(system_program.key);
-    pda_account.realloc(0, false)?;
+    resize(pda_account, 0)?;
 
     Ok(())
 }

src/processors/unregister.rs

@@ -0,0 +1,26 @@
+use solana_program::account_info::AccountInfo;
+use solana_program::entrypoint::ProgramResult;
+
+#[inline(always)]
+pub fn resize(target_account: &AccountInfo, new_len: usize) -> ProgramResult {
+    #[cfg(not(feature = "disable-realloc"))]
+    {
+        #[allow(deprecated)]
+        target_account.realloc(new_len, false)
+    }
+
+    #[cfg(feature = "disable-realloc")]
+    {
+        target_account.resize(new_len)
+    }
+}
+
+#[cfg(not(feature = "modular-sdk"))]
+pub mod solana {
+    pub use solana_program::system_instruction;
+}
+
+#[cfg(feature = "modular-sdk")]
+pub mod solana {
+    pub use solana_system_interface::instruction as system_instruction;
+}

src/solana_compact.rs

@@ -7,8 +7,8 @@ use mdp::{
         version::v0::RecordV0,
     },
 };
-use program_test::{BanksClient, BanksClientError, ProgramTest};
-use sdk::{
+use solana_program_test::{BanksClient, BanksClientError, ProgramTest};
+use solana_sdk::{
     account::Account,
     instruction::{AccountMeta, Instruction as SolanaInstruction},
     native_token::LAMPORTS_PER_SOL,

tests/common.rs

@@ -4,7 +4,7 @@ use mdp::state::{
     features::{Feature, FeaturesSet},
     record::ErRecord,
 };
-use sdk::{account::Account, signer::Signer};
+use solana_sdk::{account::Account, signer::Signer};
 
 pub mod common;
 

tests/test_registration.rs

@@ -1,7 +1,7 @@
 use borsh::BorshDeserialize;
 use common::TestEnv;
 use mdp::state::{record::ErRecord, status::ErStatus};
-use sdk::account::Account;
+use solana_sdk::account::Account;
 
 pub mod common;