Merge pull request #133 from radixdlt/feature/extract-addresses-from-…

…access-rules

Extract addresses from access rules

.github/workflows/build.yml

@@ -40,7 +40,7 @@ jobs:
     - name: Install Rust Toolchain
       uses: RDXWorks-actions/toolchain@master
       with:
-        toolchain: nightly-2024-02-01
+        toolchain: nightly-2025-01-26
         default: true
         profile: minimal
     # - name: Run sccache-cache
@@ -113,7 +113,7 @@ jobs:
       - name: Install Rust Toolchain
         uses: RDXWorks-actions/toolchain@master
         with:
-          toolchain: nightly-2024-02-01
+          toolchain: nightly-2025-01-26
           default: true
           profile: minimal
           target: ${{ matrix.build-target.target-triple }}

.github/workflows/release-kotlin.yml

@@ -33,20 +33,20 @@ jobs:
         uses: RDXWorks-actions/checkout@main
       - name: Install Rust Target
         run: |
-          # Install nightly-2024-02-01 
-          rustup toolchain install nightly-2024-02-01
+          # Install nightly-2025-01-26 
+          rustup toolchain install nightly-2025-01-26
 
           # Update both toolchains
-          rustup update nightly-2024-07-30
-          rustup update nightly-2024-02-01
+          rustup update nightly-2025-01-26
+          rustup update nightly-2025-01-26
 
           # Add target
           rustup target install ${{ matrix.build-target.target-triple }}
-          rustup +nightly-2024-02-01 target install ${{ matrix.build-target.target-triple }}
+          rustup +nightly-2025-01-26 target install ${{ matrix.build-target.target-triple }}
 
-          # Install the nightly-2024-02-01 toolchain of the target of this machine.
+          # Install the nightly-2025-01-26 toolchain of the target of this machine.
           DEFAULT_TARGET=$(rustc -vV | sed -n 's|host: ||p')
-          rustup component add rust-src --toolchain nightly-2024-02-01-$DEFAULT_TARGET
+          rustup component add rust-src --toolchain nightly-2025-01-26-$DEFAULT_TARGET
       - name: Build dependencies (x86_64-pc-windows-gnu)
         if: ${{ matrix.build-target.target-triple == 'x86_64-pc-windows-gnu' }}
         run: |

.github/workflows/test.yml

@@ -33,7 +33,7 @@ jobs:
     - name: Install Rust Toolchain
       uses: RDXWorks-actions/toolchain@master
       with:
-        toolchain: nightly-2024-07-30
+        toolchain: nightly-2025-01-26
         default: true
         components: rustfmt, clippy
     - name: Install cargo nextest
@@ -79,7 +79,7 @@ jobs:
     - name: Install Rust Toolchain
       uses: RDXWorks-actions/toolchain@master
       with:
-        toolchain: nightly-2024-07-30
+        toolchain: nightly-2025-01-26
         default: true
         profile: minimal
     - name: Cargo Check
@@ -91,7 +91,7 @@ jobs:
     - name: Install Rust Toolchain
       uses: RDXWorks-actions/toolchain@master
       with:
-        toolchain: nightly-2024-07-30
+        toolchain: nightly-2025-01-26
         default: true
         components: rustfmt, clippy
     - name: Clippy Check

crates/generator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "generator"
-version = "2.2.0-dev2"
+version = "2.2.2"
 edition = "2021"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "radix-engine-toolkit-json"
-version = "2.2.0-dev2"
+version = "2.2.2"
 edition = "2021"
 
 [dependencies]

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

@@ -1,6 +1,6 @@
 [package]
 name = "radix-engine-toolkit-uniffi"
-version = "2.2.0-dev2"
+version = "2.2.2"
 edition = "2021"
 build = "build.rs"
 

crates/radix-engine-toolkit-uniffi/src/blueprints/metadata.rs

@@ -44,10 +44,13 @@ impl ToNative for MetadataInit {
                     None => None,
                 };
 
-                Ok((key, NativeKeyValueStoreInitEntry::<NativeMetadataValue> {
-                    lock: value.lock,
-                    value: metadata,
-                }))
+                Ok((
+                    key,
+                    NativeKeyValueStoreInitEntry::<NativeMetadataValue> {
+                        lock: value.lock,
+                        value: metadata,
+                    },
+                ))
             })
             .collect::<Result<
                 IndexMap<

crates/radix-engine-toolkit-uniffi/src/builder/manifest_builder/builder_v1.rs

@@ -18,7 +18,7 @@
 #![allow(clippy::too_many_arguments)]
 
 use crate::prelude::*;
-use radix_common::prelude::{FromPublicKey, to_manifest_value};
+use radix_common::prelude::{to_manifest_value, FromPublicKey};
 
 #[derive(Debug, Clone, Object, Default)]
 pub struct ManifestV1Builder {

crates/radix-engine-toolkit-uniffi/src/builder/manifest_builder/builder_v2.rs

@@ -18,7 +18,7 @@
 #![allow(clippy::too_many_arguments)]
 
 use crate::prelude::*;
-use radix_common::prelude::{FromPublicKey, to_manifest_value};
+use radix_common::prelude::{to_manifest_value, FromPublicKey};
 
 #[derive(Debug, Clone, Object)]
 pub struct ManifestV2Builder {

crates/radix-engine-toolkit-uniffi/src/common/access_rules.rs

@@ -24,6 +24,14 @@ pub struct AccessRule(pub NativeAccessRule);
 
 #[uniffi::export]
 impl AccessRule {
+    #[uniffi::constructor]
+    pub fn from_scrypto_sbor_payload(payload: Vec<u8>) -> Result<Arc<Self>> {
+        native_scrypto_decode(&payload)
+            .map_err(RadixEngineToolkitError::from)
+            .map(Self)
+            .map(Arc::new)
+    }
+
     #[uniffi::constructor]
     pub fn require(
         resource_or_non_fungible: ResourceOrNonFungible,
@@ -158,6 +166,17 @@ impl AccessRule {
         };
         Arc::new(AccessRule(access_rule))
     }
+
+    pub fn extract_entities(
+        &self,
+        network_id: u8,
+    ) -> Vec<ResourceOrNonFungible> {
+        let extraced_entities = core_extract_entities(&self.0);
+        extraced_entities
+            .into_iter()
+            .map(|item| ResourceOrNonFungible::from_native(item, network_id))
+            .collect()
+    }
 }
 
 #[derive(Clone, Debug, Enum, Hash, PartialEq, Eq)]

crates/radix-engine-toolkit-uniffi/src/common/non_fungible.rs

@@ -93,22 +93,35 @@ impl NonFungibleGlobalId {
     }
 
     #[uniffi::constructor]
-    pub fn global_caller_badge(
+    pub fn global_caller_badge_from_global_address(
         component_address: Arc<Address>,
         network_id: u8,
     ) -> Result<Arc<Self>> {
-        derive_global_caller_non_fungible_global_id_from_component_address(
+        derive_global_caller_non_fungible_global_id_from_global_address(
             component_address,
             network_id,
         )
     }
 
+    #[uniffi::constructor]
+    pub fn global_caller_badge_from_blueprint_id(
+        package_address: Arc<Address>,
+        blueprint_name: String,
+        network_id: u8,
+    ) -> Result<Arc<Self>> {
+        derive_global_caller_non_fungible_global_id_from_blueprint_id(
+            package_address,
+            blueprint_name,
+            network_id,
+        )
+    }
+
     #[uniffi::constructor]
     pub fn package_of_direct_caller_badge(
         package_address: Arc<Address>,
         network_id: u8,
     ) -> Result<Arc<Self>> {
-        derive_package_of_direct_caller_non_fungible_global_id_from_component_address(
+        derive_package_of_direct_caller_non_fungible_global_id_from_package_address(
             package_address, network_id,
         )
     }
@@ -130,6 +143,14 @@ impl NonFungibleGlobalId {
             NativeAddressBech32Encoder::new(&network_definition);
         self.0.to_canonical_string(&bech32_encoder)
     }
+
+    pub fn is_global_caller_badge(&self) -> bool {
+        self.0.resource_address() == NATIVE_GLOBAL_CALLER_RESOURCE
+    }
+
+    pub fn is_package_of_direct_caller_badge(&self) -> bool {
+        self.0.resource_address() == NATIVE_PACKAGE_OF_DIRECT_CALLER_RESOURCE
+    }
 }
 
 #[derive(Clone, Debug, Enum, Hash, PartialEq, Eq)]

crates/radix-engine-toolkit-uniffi/src/derive/functions.rs

@@ -58,15 +58,14 @@ pub fn derive_signature_badge_non_fungible_global_id_from_public_key(
 }
 
 #[uniffi::export]
-pub fn derive_global_caller_non_fungible_global_id_from_component_address(
-    component_address: Arc<Address>,
+pub fn derive_global_caller_non_fungible_global_id_from_global_address(
+    global_address: Arc<Address>,
     network_id: u8,
 ) -> Result<Arc<NonFungibleGlobalId>> {
-    let component_address =
-        NativeComponentAddress::try_from(*component_address)?;
+    let global_address = NativeGlobalAddress::try_from(*global_address)?;
     let non_fungible_global_id =
-        core_global_caller_non_fungible_global_id_from_component_address(
-            component_address,
+        core_global_caller_non_fungible_global_id_from_global_address(
+            global_address,
         );
     Ok(Arc::new(NonFungibleGlobalId(
         non_fungible_global_id,
@@ -75,12 +74,33 @@ pub fn derive_global_caller_non_fungible_global_id_from_component_address(
 }
 
 #[uniffi::export]
-pub fn derive_package_of_direct_caller_non_fungible_global_id_from_component_address(
+pub fn derive_global_caller_non_fungible_global_id_from_blueprint_id(
     package_address: Arc<Address>,
+    blueprint_name: String,
     network_id: u8,
 ) -> Result<Arc<NonFungibleGlobalId>> {
     let package_address = NativePackageAddress::try_from(*package_address)?;
-    let non_fungible_global_id = core_package_of_direct_caller_non_fungible_global_id_from_component_address(package_address);
+    let blueprint_id = NativeBlueprintId {
+        package_address,
+        blueprint_name,
+    };
+    let non_fungible_global_id =
+        core_global_caller_non_fungible_global_id_from_blueprint_id(
+            blueprint_id,
+        );
+    Ok(Arc::new(NonFungibleGlobalId(
+        non_fungible_global_id,
+        network_id,
+    )))
+}
+
+#[uniffi::export]
+pub fn derive_package_of_direct_caller_non_fungible_global_id_from_package_address(
+    package_address: Arc<Address>,
+    network_id: u8,
+) -> Result<Arc<NonFungibleGlobalId>> {
+    let package_address = NativePackageAddress::try_from(*package_address)?;
+    let non_fungible_global_id = core_package_of_direct_caller_non_fungible_global_id_from_package_address(package_address);
     Ok(Arc::new(NonFungibleGlobalId(
         non_fungible_global_id,
         network_id,
@@ -146,3 +166,12 @@ pub fn derive_olympia_account_address_from_public_key(
     );
     Ok(Arc::new(OlympiaAddress(address)))
 }
+
+#[uniffi::export]
+pub fn public_key_hash_from_public_key(
+    public_key: PublicKey,
+) -> Result<PublicKeyHash> {
+    let public_key = NativePublicKey::try_from(public_key)?;
+    let public_key_hash = core_public_key_hash_from_public_key(&public_key);
+    Ok(public_key_hash.into())
+}

crates/radix-engine-toolkit-uniffi/src/error.rs

@@ -122,7 +122,9 @@ pub enum RadixEngineToolkitError {
     #[error("The static analysis of the manifest failed: {error}")]
     StaticAnalysisFailed { error: String },
 
-    #[error("Not all of the builder items were specified, progressing failed.")]
+    #[error(
+        "Not all of the builder items were specified, progressing failed."
+    )]
     NotAllBuilderItemsWereSpecified,
 
     #[error("Validation of manifest failed: {error}")]

crates/radix-engine-toolkit-uniffi/src/internal_prelude.rs

@@ -40,8 +40,10 @@ mod core {
         preallocated_account_address_from_public_key as core_preallocated_account_address_from_public_key,
         preallocated_identity_address_from_public_key as core_preallocated_identity_address_from_public_key,
         preallocated_signature_non_fungible_global_id_from_public_key as core_preallocated_signature_non_fungible_global_id_from_public_key,
-        global_caller_non_fungible_global_id_from_component_address as core_global_caller_non_fungible_global_id_from_component_address,
-        package_of_direct_caller_non_fungible_global_id_from_component_address as core_package_of_direct_caller_non_fungible_global_id_from_component_address,
+        global_caller_non_fungible_global_id_from_global_address as core_global_caller_non_fungible_global_id_from_global_address,
+        global_caller_non_fungible_global_id_from_blueprint_id as core_global_caller_non_fungible_global_id_from_blueprint_id,
+        public_key_hash_from_public_key as core_public_key_hash_from_public_key,
+        package_of_direct_caller_non_fungible_global_id_from_package_address as core_package_of_direct_caller_non_fungible_global_id_from_package_address,
         preallocated_account_address_from_olympia_account_address as core_preallocated_account_address_from_olympia_account_address,
         resource_address_from_olympia_resource_address as core_resource_address_from_olympia_resource_address,
         public_key_from_olympia_account_address as core_public_key_from_olympia_account_address,
@@ -58,6 +60,9 @@ mod core {
     pub use radix_engine_toolkit::functions::utils::{
         decode_transaction_id as core_decode_transaction_id
     };
+    pub use radix_engine_toolkit::functions::access_rule::{
+        extract_entities as core_extract_entities
+    };
     pub use radix_engine_toolkit::functions::transaction_v1::manifest::{
         to_payload_bytes as core_transaction_v1_manifest_to_payload_bytes,
         from_payload_bytes as core_transaction_v1_manifest_from_payload_bytes,
@@ -83,6 +88,7 @@ mod core {
         to_payload_bytes as core_transaction_v1_notarized_transaction_to_payload_bytes,
         from_payload_bytes as core_transaction_v1_notarized_transaction_from_payload_bytes,
         statically_validate as core_transaction_v1_notarized_transaction_statically_validate,
+        extract_signer_public_keys as core_transaction_v1_notarized_transaction_extract_signer_public_keys,
     };
     pub use radix_engine_toolkit::functions::transaction_v2::instructions::{
         extract_addresses as core_transaction_v2_instructions_extract_addresses,
@@ -123,6 +129,7 @@ mod core {
         to_payload_bytes as core_transaction_v2_notarized_transaction_to_payload_bytes,
         from_payload_bytes as core_transaction_v2_notarized_transaction_from_payload_bytes,
         statically_validate as core_transaction_v2_notarized_transaction_statically_validate,
+        extract_signer_public_keys as core_transaction_v2_notarized_transaction_extract_signer_public_keys,
     };
     pub use radix_engine_toolkit::functions::transaction_v2::partial_transaction::{
         hash as core_transaction_v2_partial_transaction_hash,

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

@@ -32,6 +32,6 @@ impl From<NativeManifestBlobRef> for ManifestBlobRef {
 
 impl From<ManifestBlobRef> for NativeManifestBlobRef {
     fn from(value: ManifestBlobRef) -> Self {
-        Self(value.value.0.0)
+        Self(value.value.0 .0)
     }
 }

crates/radix-engine-toolkit-uniffi/src/transaction_v1/notarized_transaction.rs

@@ -104,6 +104,14 @@ impl NotarizedTransactionV1 {
         )
         .map_err(Into::into)
     }
+
+    pub fn signer_public_keys(&self) -> Result<Vec<PublicKey>> {
+        core_transaction_v1_notarized_transaction_extract_signer_public_keys(
+            &self.clone().try_into()?,
+        )
+        .map_err(Into::into)
+        .map(|value| value.into_iter().map(Into::into).collect())
+    }
 }
 
 impl From<NativeNotarizedTransactionV1> for NotarizedTransactionV1 {