fix: integrate revenue module into workspace contract structure

- Fix contracts/Cargo.toml: remove duplicate [package] section,
  make it a proper workspace root only
- Move revenue module from contracts/src/ to contracts/subscription/src/
  adapted for the new storage-contract delegation pattern
- Add revenue StorageKey variants to contracts/types/src/lib.rs:
  RevenueRecognitionRule, RevenueSchedule, RevenueDeferredBalance,
  RevenueRecognisedBalance, RevenueMerchantSubscriptions
- Hook revenue schedule generation into charge_subscription in
  contracts/subscription/src/lib.rs
- Add revenue public API to SubTrackrSubscription:
  set_revenue_rule, recognize_revenue, get_deferred_revenue,
  get_revenue_schedule
- Fix clippy::manual_div_ceil in revenue.rs (use .div_ceil())
- Add #[allow(clippy::too_many_arguments)] to subscription and proxy
  crates (pre-existing upstream issue with Soroban contractimpl macro)
- Remove obsolete contracts/src/ directory
- All workspace tests pass, cargo fmt --check clean, clippy -D warnings clean

Author: od-hunter

contracts/Cargo.toml

@@ -1,20 +1,3 @@
-[package]
-name = "subtrackr-subscription"
-version = "0.2.0"
-edition = "2021"
-authors = ["SubTrackr Team"]
-description = "SubTrackr subscription implementation contract (Soroban)"
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[dependencies]
-soroban-sdk = "21.0.0"
-subtrackr-types = { path = "../types" }
-
-[dev-dependencies]
-soroban-sdk = { version = "21.0.0", features = ["testutils"] }
-arbitrary = { version = "1.3", features = ["derive"] }
 [workspace]
 resolver = "2"
 members = [

contracts/proxy/src/lib.rs

@@ -1,4 +1,5 @@
 #![no_std]
+#![allow(clippy::too_many_arguments)]
 
 mod storage;
 
@@ -13,11 +14,7 @@ fn current_proxy_address(env: &Env) -> Address {
     env.current_contract_address()
 }
 
-fn invoke_impl<T: TryFromVal<Env, Val>>(
-    env: &Env,
-    func: &str,
-    args: Vec<Val>,
-) -> T {
+fn invoke_impl<T: TryFromVal<Env, Val>>(env: &Env, func: &str, args: Vec<Val>) -> T {
     let impl_addr = proxy_storage::implementation(env);
     env.invoke_contract(&impl_addr, &soroban_sdk::Symbol::new(env, func), args)
 }
@@ -92,11 +89,7 @@ impl UpgradeableProxy {
         let target_version: u32 = env.invoke_contract(
             &implementation,
             &soroban_sdk::Symbol::new(&env, "get_version"),
-            soroban_sdk::vec![
-                &env,
-                proxy_addr.into_val(&env),
-                storage.into_val(&env)
-            ],
+            soroban_sdk::vec![&env, proxy_addr.into_val(&env), storage.into_val(&env)],
         );
         proxy_storage::set_version(&env, target_version);
     }
@@ -133,13 +126,13 @@ impl UpgradeableProxy {
         // Basic interface validation: ensure new implementation supports expected interface.
         let proxy_addr = current_proxy_address(&env);
         let storage_addr = proxy_storage::storage_address(&env);
-        let args: Vec<Val> = soroban_sdk::vec![
-            &env,
-            proxy_addr.into_val(&env),
-            storage_addr.into_val(&env)
-        ];
-        let _target_version: u32 =
-            env.invoke_contract(&implementation, &soroban_sdk::Symbol::new(&env, "get_version"), args);
+        let args: Vec<Val> =
+            soroban_sdk::vec![&env, proxy_addr.into_val(&env), storage_addr.into_val(&env)];
+        let _target_version: u32 = env.invoke_contract(
+            &implementation,
+            &soroban_sdk::Symbol::new(&env, "get_version"),
+            args,
+        );
 
         proxy_storage::set_scheduled_upgrade(
             &env,
@@ -194,7 +187,10 @@ impl UpgradeableProxy {
         );
 
         let now = env.ledger().timestamp();
-        assert!(now >= scheduled.execute_after, "Upgrade timelock not expired");
+        assert!(
+            now >= scheduled.execute_after,
+            "Upgrade timelock not expired"
+        );
 
         let proxy_addr = current_proxy_address(&env);
         let storage_addr = proxy_storage::storage_address(&env);
@@ -471,12 +467,7 @@ impl UpgradeableProxy {
         );
     }
 
-    pub fn pause_by_subscriber(
-        env: Env,
-        subscriber: Address,
-        subscription_id: u64,
-        duration: u64,
-    ) {
+    pub fn pause_by_subscriber(env: Env, subscriber: Address, subscription_id: u64, duration: u64) {
         let proxy_addr = current_proxy_address(&env);
         let storage_addr = proxy_storage::storage_address(&env);
         invoke_impl::<()>(

contracts/proxy/src/storage.rs

@@ -80,7 +80,9 @@ pub(crate) fn set_rollback_delay_secs(env: &Env, delay_secs: u64) {
 }
 
 pub(crate) fn scheduled_upgrade(env: &Env) -> Option<ScheduledUpgrade> {
-    env.storage().instance().get(&StorageKey::ProxyScheduledUpgrade)
+    env.storage()
+        .instance()
+        .get(&StorageKey::ProxyScheduledUpgrade)
 }
 
 pub(crate) fn set_scheduled_upgrade(env: &Env, upgrade: &ScheduledUpgrade) {
@@ -90,7 +92,9 @@ pub(crate) fn set_scheduled_upgrade(env: &Env, upgrade: &ScheduledUpgrade) {
 }
 
 pub(crate) fn clear_scheduled_upgrade(env: &Env) {
-    env.storage().instance().remove(&StorageKey::ProxyScheduledUpgrade);
+    env.storage()
+        .instance()
+        .remove(&StorageKey::ProxyScheduledUpgrade);
 }
 
 pub(crate) fn previous_count(env: &Env) -> u32 {
@@ -112,9 +116,10 @@ pub(crate) fn previous_top(env: &Env) -> Option<Address> {
 
 pub(crate) fn push_previous(env: &Env, implementation: &Address) {
     let count = previous_count(env);
-    env.storage()
-        .instance()
-        .set(&StorageKey::ProxyPreviousImplementation(count), implementation);
+    env.storage().instance().set(
+        &StorageKey::ProxyPreviousImplementation(count),
+        implementation,
+    );
     env.storage()
         .instance()
         .set(&StorageKey::ProxyPreviousImplementationCount, &(count + 1));