feat!: use the main contracttraits PR

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["admin_sep", "admin", "admin_v2"]
 
 [workspace.dependencies]
-soroban-sdk = { git = "https://github.com/ahalabs/rs-soroban-sdk", rev = "5a99659f1483c926ff87ea45f8823b8c00dc4cbd" }
+soroban-sdk = "23.4.0"
 
 [profile.contracts]
 inherits = "release"

admin/src/lib.rs

@@ -1,22 +1,22 @@
 #![no_std]
 
-use admin_sep::{Administratable, Upgradable};
+use admin_sep::*;
 use soroban_sdk::{Address, Env, contract, contractimpl};
 
 #[contract]
 pub struct Contract;
 
 #[contractimpl]
 impl Contract {
-    pub fn __constructor(env: &Env, admin: &Address) {
+    pub fn __constructor(env: &Env, admin: Address) {
         Self::set_admin(env, admin);
     }
 }
 
-#[contractimpl]
+#[contractimpl(contracttrait)]
 impl Administratable for Contract {}
 
-#[contractimpl]
+#[contractimpl(contracttrait)]
 impl Upgradable for Contract {}
 
 mod test;

admin_sep/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "admin-sep"
-version = "0.0.0"
+version = "0.0.1"
 edition = "2024"
-publish = false
+publish = true
 rust-version = "1.87.0"
 
 [lib]

admin_sep/src/administratable.rs

@@ -4,25 +4,29 @@ use soroban_sdk::{Address, Env, Symbol, contracttrait, symbol_short};
 #[contracttrait]
 pub trait Administratable {
     fn admin(env: &Env) -> soroban_sdk::Address {
-        unsafe { Self::admin_from_storage(env).unwrap_unchecked() }
+        unsafe { admin_from_storage(env).unwrap_unchecked() }
     }
 
-    fn set_admin(env: &Env, new_admin: &soroban_sdk::Address) {
-        if let Some(owner) = Self::admin_from_storage(env) {
+    fn set_admin(env: &Env, new_admin: soroban_sdk::Address) {
+        if let Some(owner) = admin_from_storage(env) {
             owner.require_auth();
         }
-        env.storage().instance().set(STORAGE_KEY, new_admin);
+        env.storage().instance().set(STORAGE_KEY, &new_admin);
     }
+}
+
+pub trait AdministratableExtension: Administratable {
+    fn require_admin(env: &Env);
+}
 
-    #[internal]
+impl<T: Administratable> AdministratableExtension for T {
     fn require_admin(env: &Env) {
         Self::admin(env).require_auth();
     }
+}
 
-    #[internal]
-    fn admin_from_storage(env: &Env) -> Option<Address> {
-        env.storage().instance().get(STORAGE_KEY)
-    }
+fn admin_from_storage(env: &Env) -> Option<Address> {
+    env.storage().instance().get(STORAGE_KEY)
 }
 
 pub const STORAGE_KEY: &Symbol = &symbol_short!("ADMIN");

admin_sep/src/upgradable.rs

@@ -1,8 +1,8 @@
-use crate::Administratable;
+use crate::AdministratableExtension;
 use soroban_sdk::contracttrait;
 
 #[contracttrait]
-pub trait Upgradable: Administratable {
+pub trait Upgradable: AdministratableExtension {
     /// Upgrades the contract to a new hash.
     /// Admin Only.
     fn upgrade(env: &soroban_sdk::Env, new_wasm_hash: soroban_sdk::BytesN<32>) {

admin_v2/src/lib.rs

@@ -1,15 +1,14 @@
 #![no_std]
 
+use admin_sep::*;
 use soroban_sdk::{Address, Env, contract, contractimpl};
 
-use admin_sep::{Administratable, Upgradable};
-
 #[contract]
 pub struct Contract;
 
 #[contractimpl]
 impl Contract {
-    pub fn __constructor(env: &Env, admin: &Address) {
+    pub fn __constructor(env: &Env, admin: Address) {
         Self::set_admin(env, admin);
     }
 
@@ -18,10 +17,10 @@ impl Contract {
     }
 }
 
-#[contractimpl]
+#[contractimpl(contracttrait)]
 impl Administratable for Contract {}
 
-#[contractimpl]
+#[contractimpl(contracttrait)]
 impl Upgradable for Contract {}
 
 mod test;