[ABW-3899] Create subintent API (#255)

* logic

* version bump

* tests

* Update README.md

* Update README.md

* Add more extensions

* updates after feedback

---------

Co-authored-by: micbakos-rdx <[email protected]>

README.md

@@ -36,6 +36,16 @@ xcode-select --install
 
 Or install `Xcode` from App Store
 
+After installing, you should run the following command to verify the SDK path is set to the Xcode app under `Applications`.
+```sh
+$ xcrun --show-sdk-path
+/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
+```
+If it doesn't point to the expected path (and instead points to something like `/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk`), make sure you have the PATH exported on your profile (e.g. `.zshrc`):
+```
+export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+```
+
 ### Kotlin
 
 ```sh

crates/sargon-uniffi/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "sargon-uniffi"
 # Don't forget to update version in crates/sargon/Cargo.toml
-version = "1.1.45"
+version = "1.1.46"
 edition = "2021"
 build = "build.rs"
 

crates/sargon-uniffi/src/core/error/common_error.rs

@@ -728,6 +728,9 @@ pub enum CommonError {
 
     #[error("Failed to decompile bytes into Subintent")]
     FailedToDecompileBytesIntoSubintent = 10205,
+
+    #[error("Subintent has already expired")]
+    SubintentExpired = 10206,
 }
 
 #[uniffi::export]

crates/sargon-uniffi/src/radix_connect/wallet_interaction/dapp_wallet_interaction/dapp_to_wallet/interaction_items/pre_authorization/subintent.rs

@@ -11,5 +11,5 @@ pub struct DappToWalletInteractionSubintentRequestItem {
 
     pub message: Option<String>,
 
-    pub expiration: Option<DappToWalletInteractionSubintentExpiration>,
+    pub expiration: DappToWalletInteractionSubintentExpiration,
 }

crates/sargon-uniffi/src/system/sargon_os/mod.rs

@@ -1,3 +1,4 @@
+mod pre_authorization;
 mod profile_state_holder;
 mod sargon_os;
 mod sargon_os_accounts;

crates/sargon-uniffi/src/system/sargon_os/pre_authorization/mod.rs

@@ -0,0 +1 @@
+mod sargon_os_create_subintent;

crates/sargon-uniffi/src/system/sargon_os/pre_authorization/sargon_os_create_subintent.rs

@@ -0,0 +1,26 @@
+use crate::prelude::*;
+
+// ==================
+// Create Subintent
+// ==================
+#[uniffi::export]
+impl SargonOS {
+    /// Creates a Subintent given its discriminator, manifest and expiration.
+    pub async fn create_subintent(
+        &self,
+        intent_discriminator: IntentDiscriminator,
+        subintent_manifest: SubintentManifest,
+        expiration: DappToWalletInteractionSubintentExpiration,
+        message: Option<String>,
+    ) -> Result<Subintent> {
+        self.wrapped
+            .create_subintent(
+                intent_discriminator.into_internal(),
+                subintent_manifest.into_internal(),
+                expiration.into_internal(),
+                message,
+            )
+            .await
+            .into_result()
+    }
+}

crates/sargon-uniffi/src/wrapped_radix_engine_toolkit/low_level/v2/transaction_manifest_v2/subintent_manifest.rs

@@ -45,6 +45,13 @@ pub fn subintent_manifest_string(manifest: &SubintentManifest) -> String {
     manifest.into_internal().manifest_string()
 }
 
+#[uniffi::export]
+pub fn subintent_manifest_summary(
+    manifest: &SubintentManifest,
+) -> ManifestSummary {
+    manifest.into_internal().summary().unwrap().into()
+}
+
 #[uniffi::export]
 pub fn subintent_manifest_involved_resource_addresses(
     manifest: &SubintentManifest,

crates/sargon/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "sargon"
 # Don't forget to update version in crates/sargon-uniffi/Cargo.toml
-version = "1.1.45"
+version = "1.1.46"
 edition = "2021"
 build = "build.rs"
 

crates/sargon/src/core/error/common_error.rs

@@ -725,6 +725,9 @@ pub enum CommonError {
 
     #[error("Failed to decompile bytes into Subintent")]
     FailedToDecompileBytesIntoSubintent = 10205,
+
+    #[error("Subintent has already expired")]
+    SubintentExpired = 10206,
 }
 
 impl CommonError {

crates/sargon/src/core/types/epoch.rs

@@ -29,6 +29,10 @@ impl Epoch {
     pub fn window_end_from_start(start: Self) -> Self {
         Self::new(start.0 + Self::DEFAULT_EPOCH_WINDOW_SIZE)
     }
+
+    pub fn adding(&self, amount: u64) -> Self {
+        Self::new(self.0 + amount)
+    }
 }
 
 impl From<u64> for Epoch {
@@ -97,4 +101,10 @@ mod tests {
         test(2);
         test(1337);
     }
+
+    #[test]
+    fn adding() {
+        let sut = Epoch(10);
+        assert_eq!(sut.adding(5), Epoch(15));
+    }
 }

crates/sargon/src/core/types/instant.rs

@@ -43,6 +43,16 @@ impl From<ScryptoInstant> for Instant {
     }
 }
 
+impl From<Timestamp> for Instant {
+    fn from(value: Timestamp) -> Self {
+        let seconds_since_unix_epoch =
+            value.duration_since(Timestamp::UNIX_EPOCH).as_seconds_f64() as i64;
+        Self {
+            seconds_since_unix_epoch,
+        }
+    }
+}
+
 impl HasSampleValues for Instant {
     fn sample() -> Self {
         Self::from(0)
@@ -98,4 +108,15 @@ mod tests {
         test(2);
         test(1337);
     }
+
+    #[test]
+    fn from_timestamp() {
+        let timestamp = Timestamp::now_utc();
+        let seconds_since_unix_epoch = timestamp
+            .duration_since(Timestamp::UNIX_EPOCH)
+            .as_seconds_f64() as i64;
+        let instant = Instant::from(timestamp);
+
+        assert_eq!(instant.seconds_since_unix_epoch, seconds_since_unix_epoch);
+    }
 }

crates/sargon/src/core/utils/constants.rs

@@ -0,0 +1,9 @@
+// 5 minutes
+pub const EPOCH_DURATION_IN_SECONDS: u64 = 300;
+
+// As per the transaction validation configuration, epoch diff should be less than 1 month.
+pub const MAX_EPOCH_DIFF: u64 = 30 * 24 * 60 * 60 / EPOCH_DURATION_IN_SECONDS;
+
+// 1 epoch for the fact that it's min_inclusive and max_exclusive;
+// 1 more for the fact that we might be very close to the end of the epoch already
+pub const MIN_EPOCH_DIFF: u64 = 2;

crates/sargon/src/core/utils/mod.rs

@@ -1,9 +1,11 @@
+mod constants;
 mod factory;
 mod image_url_utils;
 mod logged_panic;
 mod serialization;
 mod string_utils;
 
+pub use constants::*;
 pub use factory::*;
 pub use image_url_utils::*;
 pub use logged_panic::*;

crates/sargon/src/radix_connect/wallet_interaction/dapp_wallet_interaction/dapp_to_wallet/interaction_items/pre_authorization/subintent.rs

@@ -13,16 +13,15 @@ pub struct DappToWalletInteractionSubintentRequestItem {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub message: Option<String>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub expiration: Option<DappToWalletInteractionSubintentExpiration>,
+    pub expiration: DappToWalletInteractionSubintentExpiration,
 }
 
 impl DappToWalletInteractionSubintentRequestItem {
     pub fn new(
         version: impl Into<SubintentVersion>,
         unvalidated_manifest: impl Into<UnvalidatedSubintentManifest>,
         message: impl Into<Option<String>>,
-        expiration: impl Into<Option<DappToWalletInteractionSubintentExpiration>>,
+        expiration: impl Into<DappToWalletInteractionSubintentExpiration>,
     ) -> Self {
         Self {
             version: version.into(),

crates/sargon/src/system/sargon_os/mod.rs

@@ -1,3 +1,4 @@
+mod pre_authorization;
 mod profile_state_holder;
 mod sargon_os;
 mod sargon_os_accounts;
@@ -7,6 +8,7 @@ mod sargon_os_profile;
 mod sargon_os_security_structures;
 mod transactions;
 
+pub use pre_authorization::*;
 pub use profile_state_holder::*;
 pub use sargon_os::*;
 pub use sargon_os_accounts::*;

crates/sargon/src/system/sargon_os/pre_authorization/mod.rs

@@ -0,0 +1,3 @@
+mod sargon_os_create_subintent;
+
+pub use sargon_os_create_subintent::*;