Convert toolkit to use the toolkit receipt

Author: 0xOmarA

Cargo.lock

@@ -13,6 +13,7 @@ radix-engine = { workspace = true }
 radix-engine-interface = { workspace = true }
 radix-substate-store-queries = { workspace = true }
 radix-transactions = { workspace = true }
+native-radix-engine-toolkit = { workspace = true }
 
 # Core Radix Engine Toolkit
 radix-engine-toolkit = { path = "../radix-engine-toolkit" }
@@ -22,6 +23,7 @@ uniffi = { git = "https://github.com/0xOmarA/uniffi-rs", tag = "v0.25.4", featur
 hex = "0.4.3"
 thiserror = "1.0.50"
 paste = "1.0.12"
+serde_json = "1.0.127"
 
 [build-dependencies]
 # The UniFFI crate for generating bindings to other languages

crates/radix-engine-toolkit-uniffi/Cargo.toml

@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+use native_radix_engine_toolkit::receipt::{
+    RuntimeToolkitTransactionReceipt, SerializableToolkitTransactionReceipt,
+};
 use sbor::Versioned;
 
 use crate::prelude::*;
@@ -98,16 +101,23 @@ impl TransactionManifest {
     pub fn execution_summary(
         &self,
         network_id: u8,
-        encoded_receipt: Vec<u8>,
+        toolkit_receipt: String,
     ) -> Result<ExecutionSummary> {
         let native = self.clone().to_native();
-        let versioned_transaction_receipt = native_scrypto_decode::<
-            NativeVersionedTransactionReceipt,
-        >(&encoded_receipt)?;
-        let receipt = versioned_transaction_receipt
-            .as_latest_version()
-            .ok_or(RadixEngineToolkitError::InvalidReceipt)?;
-
+        let network_definition =
+            core_network_definition_from_network_id(network_id);
+        let receipt = serde_json::from_str::<
+            SerializableToolkitTransactionReceipt,
+        >(&toolkit_receipt)
+        .ok()
+        .and_then(|receipt| {
+            receipt
+                .into_runtime_receipt(&NativeAddressBech32Decoder::new(
+                    &network_definition,
+                ))
+                .ok()
+        })
+        .ok_or(RadixEngineToolkitError::InvalidReceipt)?;
         core_manifest_execution_summary(&native, &receipt)
             .map_err(|_| RadixEngineToolkitError::InvalidReceipt)
             .map(|summary| ExecutionSummary::from_native(summary, network_id))?
@@ -233,9 +243,10 @@ impl ResourceSpecifier {
         resource_address: &NativeResourceAddress,
         network_id: u8,
     ) -> ResourceSpecifier {
-        let address = Arc::new(
-            Address::from_typed_node_id(*resource_address, network_id)
-        );
+        let address = Arc::new(Address::from_typed_node_id(
+            *resource_address,
+            network_id,
+        ));
         match native {
             NativeLockerResourceSpecifier::Fungible(amount) => {
                 ResourceSpecifier::Amount {
@@ -820,14 +831,13 @@ impl ExecutionSummary {
                 .collect(),
             fee_locks: FeeLocks::from_native(&native.fee_locks),
             fee_summary: FeeSummary::from_native(&native.fee_summary),
-            detailed_classification:
-                native
-                    .detailed_classification
-                    .into_iter()
-                    .map(|item| {
-                        DetailedManifestClass::from_native(item, network_id)
-                    })
-                    .collect(),
+            detailed_classification: native
+                .detailed_classification
+                .into_iter()
+                .map(|item| {
+                    DetailedManifestClass::from_native(item, network_id)
+                })
+                .collect(),
             newly_created_non_fungibles: native
                 .newly_created_non_fungibles
                 .into_iter()
@@ -1333,20 +1343,17 @@ impl From<CoreNonFungibleResourceIndicator> for NonFungibleResourceIndicator {
             CoreNonFungibleResourceIndicator::ByAmount {
                 amount,
                 predicted_ids,
-            } => {
-                NonFungibleResourceIndicator::ByAmount {
-                    amount: Arc::new(Decimal(amount)),
-                    predicted_ids: PredictedNonFungibleIds {
-                        value: predicted_ids
-                            .value
-                            .into_iter()
-                            .map(Into::into)
-                            .collect(),
-                        instruction_index: predicted_ids.instruction_index
-                            as u64,
-                    },
-                }
-            }
+            } => NonFungibleResourceIndicator::ByAmount {
+                amount: Arc::new(Decimal(amount)),
+                predicted_ids: PredictedNonFungibleIds {
+                    value: predicted_ids
+                        .value
+                        .into_iter()
+                        .map(Into::into)
+                        .collect(),
+                    instruction_index: predicted_ids.instruction_index as u64,
+                },
+            },
             CoreNonFungibleResourceIndicator::ByIds(ids) => {
                 NonFungibleResourceIndicator::ByIds {
                     ids: ids.into_iter().map(Into::into).collect(),

crates/radix-engine-toolkit-uniffi/src/transaction/manifest.rs

@@ -15,6 +15,7 @@ radix-substate-store-impls = { workspace = true }
 radix-substate-store-queries = { workspace = true }
 radix-substate-store-interface = { workspace = true }
 radix-transactions = { workspace = true }
+native-radix-engine-toolkit = { workspace = true }
 
 # Bech32 encoding and decoding of addresses. Used for the Olympia <-> Babylon address derivations.
 bech32 = { version = "0.9.1" }

crates/radix-engine-toolkit/Cargo.toml

@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+use native_radix_engine_toolkit::receipt::RuntimeToolkitTransactionReceipt;
 use radix_common::prelude::*;
 use radix_engine_interface::blueprints::access_controller::*;
 use radix_engine_interface::blueprints::account::*;
@@ -227,7 +228,7 @@ pub fn summary(manifest: &TransactionManifestV1) -> ManifestSummary {
 
 pub fn execution_summary(
     manifest: &TransactionManifestV1,
-    receipt: &TransactionReceipt,
+    receipt: &RuntimeToolkitTransactionReceipt,
 ) -> Result<ExecutionSummary, TransactionTypesError> {
     crate::transaction_types::execution_summary(manifest, receipt)
 }

crates/radix-engine-toolkit/src/functions/manifest.rs

@@ -19,8 +19,8 @@
 //! any of the implementation details of how the module finds and determines
 //! the transaction types.
 
+use native_radix_engine_toolkit::receipt::RuntimeToolkitTransactionReceipt;
 use radix_common::prelude::*;
-use radix_engine::transaction::*;
 use radix_substate_store_queries::typed_substate_layout::*;
 use radix_transactions::prelude::*;
 
@@ -84,47 +84,44 @@ pub fn summary(manifest: &TransactionManifestV1) -> ManifestSummary {
     let reserved_instructions = reserved_instructions_detector.output();
     let (account_withdraws, account_deposits) =
         account_resource_movements_detector.output();
-    let classification =
-        [
-            (
-                ManifestClass::General,
-                general_transaction_detector.is_valid(),
-            ),
-            (
-                ManifestClass::Transfer,
-                transfer_transaction_detector.is_valid(),
-            ),
-            (
-                ManifestClass::PoolContribution,
-                pool_contribution_detector.is_valid(),
-            ),
-            (
-                ManifestClass::PoolRedemption,
-                pool_redemption_detector.is_valid(),
-            ),
-            (
-                ManifestClass::ValidatorStake,
-                validator_stake_detector.is_valid(),
-            ),
-            (
-                ManifestClass::ValidatorUnstake,
-                validator_unstake_detector.is_valid(),
-            ),
-            (
-                ManifestClass::ValidatorClaim,
-                validator_claim_detector.is_valid(),
-            ),
-            (
-                ManifestClass::AccountDepositSettingsUpdate,
-                accounts_settings_detector.is_valid(),
-            ),
-        ]
-        .into_iter()
-        .filter_map(
-            |(class, is_valid)| if is_valid { Some(class) } else { None },
-        )
-        .rev()
-        .collect::<IndexSet<ManifestClass>>();
+    let classification = [
+        (
+            ManifestClass::General,
+            general_transaction_detector.is_valid(),
+        ),
+        (
+            ManifestClass::Transfer,
+            transfer_transaction_detector.is_valid(),
+        ),
+        (
+            ManifestClass::PoolContribution,
+            pool_contribution_detector.is_valid(),
+        ),
+        (
+            ManifestClass::PoolRedemption,
+            pool_redemption_detector.is_valid(),
+        ),
+        (
+            ManifestClass::ValidatorStake,
+            validator_stake_detector.is_valid(),
+        ),
+        (
+            ManifestClass::ValidatorUnstake,
+            validator_unstake_detector.is_valid(),
+        ),
+        (
+            ManifestClass::ValidatorClaim,
+            validator_claim_detector.is_valid(),
+        ),
+        (
+            ManifestClass::AccountDepositSettingsUpdate,
+            accounts_settings_detector.is_valid(),
+        ),
+    ]
+    .into_iter()
+    .filter_map(|(class, is_valid)| if is_valid { Some(class) } else { None })
+    .rev()
+    .collect::<IndexSet<ManifestClass>>();
 
     ManifestSummary {
         presented_proofs,
@@ -140,10 +137,10 @@ pub fn summary(manifest: &TransactionManifestV1) -> ManifestSummary {
 
 pub fn execution_summary(
     manifest: &TransactionManifestV1,
-    receipt: &TransactionReceipt,
+    receipt: &RuntimeToolkitTransactionReceipt,
 ) -> Result<ExecutionSummary, TransactionTypesError> {
     // Attempt to create a tx types receipt from the passed receipt
-    let receipt = TransactionTypesReceipt::new(receipt)
+    let receipt = TransactionTypesReceipt::new(&receipt)
         .ok_or(TransactionTypesError::InvalidReceipt)?;
 
     // Settings up the various detectors
@@ -207,9 +204,9 @@ pub fn execution_summary(
         general_transaction_detector
             .output()
             .map(|_| DetailedManifestClass::General),
-        transfer_transaction_detector.output().map(
-            |is_one_to_one| DetailedManifestClass::Transfer { is_one_to_one }
-        ),
+        transfer_transaction_detector.output().map(|is_one_to_one| {
+            DetailedManifestClass::Transfer { is_one_to_one }
+        }),
         pool_contribution_detector.output().map(
             |(pool_addresses, pool_contributions)| {
                 DetailedManifestClass::PoolContribution {
@@ -317,16 +314,8 @@ pub fn execution_summary(
     .rev()
     .collect::<Vec<DetailedManifestClass>>();
 
-    let fee_locks = FeeLocks {
-        lock: receipt.execution_trace().fee_locks.lock,
-        contingent_lock: receipt.execution_trace().fee_locks.contingent_lock,
-    };
-    let fee_summary = FeeSummary {
-        execution_cost: receipt.fee_summary.total_execution_cost_in_xrd,
-        finalization_cost: receipt.fee_summary.total_finalization_cost_in_xrd,
-        storage_expansion_cost: receipt.fee_summary.total_storage_cost_in_xrd,
-        royalty_cost: receipt.fee_summary.total_royalty_cost_in_xrd,
-    };
+    let fee_locks = receipt.fee_locks();
+    let fee_summary = receipt.fee_summary();
 
     Ok(ExecutionSummary {
         account_withdraws,