[feature] hyperledger-iroha#3624: introduce general purpose permissio…

…n tokens

Signed-off-by: Marin Veršić <marin.versic101@gmail.com>

client/benches/tps/utils.rs

@@ -184,11 +184,10 @@ impl MeasurerUnit {
         ));
         self.client.submit_blocking(register_me)?;
 
-        let can_burn_my_asset = PermissionToken::new("can_burn_user_asset".parse()?)
-            .with_params([("asset_id".parse()?, asset_id.clone().into())]);
+        let can_burn_my_asset = PermissionToken::new("CanBurnUserAsset".to_owned(), asset_id);
         let allow_alice_to_burn_my_asset = GrantBox::new(can_burn_my_asset, alice_id.clone());
-        let can_transfer_my_asset = PermissionToken::new("can_transfer_user_asset".parse()?)
-            .with_params([("asset_id".parse()?, asset_id.clone().into())]);
+        let can_transfer_my_asset =
+            PermissionToken::new("CanTransferUserAsset".to_owned(), asset_id);
         let allow_alice_to_transfer_my_asset = GrantBox::new(can_transfer_my_asset, alice_id);
         let grant_tx = TransactionBuilder::new(account_id)
             .with_instructions([

client/tests/integration/asset.rs

@@ -259,8 +259,7 @@ fn find_rate_and_make_exchange_isi_should_succeed() {
 
     let grant_alice_asset_transfer_permission = |asset_id: AssetId, owner_keypair: KeyPair| {
         let allow_alice_to_transfer_asset = GrantBox::new(
-            PermissionToken::new("can_transfer_user_asset".parse().expect("Valid"))
-                .with_params([("asset_id".parse().expect("Valid"), asset_id.clone().into())]),
+            PermissionToken::new("CanTransferUserAsset".to_owned(), asset_id),
             alice_id.clone(),
         );
 

client/tests/integration/events/data.rs

@@ -3,7 +3,6 @@ use std::{fmt::Write as _, str::FromStr, sync::mpsc, thread};
 
 use eyre::Result;
 use iroha_data_model::{prelude::*, transaction::WasmSmartContract};
-use parity_scale_codec::Encode;
 use test_network::*;
 
 use crate::wasm::utils::wasm_template;
@@ -163,17 +162,8 @@ fn produce_multiple_events() -> Result<()> {
     // Registering role
     let alice_id = <Account as Identifiable>::Id::from_str("alice@wonderland")?;
     let role_id = <Role as Identifiable>::Id::from_str("TEST_ROLE")?;
-    let token_1 = PermissionToken::new(
-        "can_remove_key_value_in_user_account"
-            .parse()
-            .expect("valid"),
-    )
-    .with_params([(
-        "account_id".parse().expect("valid"),
-        alice_id.clone().into(),
-    )]);
-    let token_2 = PermissionToken::new("can_set_key_value_in_user_account".parse().expect("valid"))
-        .with_params([("account_id".parse().expect("valid"), alice_id.into())]);
+    let token_1 = PermissionToken::new("CanRemoveKeyValueInUserAccount".to_owned(), alice_id);
+    let token_2 = PermissionToken::new("CanSetKeyValueInUserAccount".to_owned(), alice_id);
     let role = iroha_data_model::role::Role::new(role_id.clone())
         .add_permission(token_1.clone())
         .add_permission(token_2.clone());
@@ -207,13 +197,13 @@ fn produce_multiple_events() -> Result<()> {
         WorldEvent::Domain(DomainEvent::Account(AccountEvent::PermissionAdded(
             AccountPermissionChanged {
                 account_id: bob_id.clone(),
-                permission_id: token_1.definition_id().clone(),
+                permission_id: token_1.definition_id.clone(),
             },
         ))),
         WorldEvent::Domain(DomainEvent::Account(AccountEvent::PermissionAdded(
             AccountPermissionChanged {
                 account_id: bob_id.clone(),
-                permission_id: token_2.definition_id().clone(),
+                permission_id: token_2.definition_id.clone(),
             },
         ))),
         WorldEvent::Domain(DomainEvent::Account(AccountEvent::RoleGranted(
@@ -225,13 +215,13 @@ fn produce_multiple_events() -> Result<()> {
         WorldEvent::Domain(DomainEvent::Account(AccountEvent::PermissionRemoved(
             AccountPermissionChanged {
                 account_id: bob_id.clone(),
-                permission_id: token_1.definition_id().clone(),
+                permission_id: token_1.definition_id,
             },
         ))),
         WorldEvent::Domain(DomainEvent::Account(AccountEvent::PermissionRemoved(
             AccountPermissionChanged {
                 account_id: bob_id.clone(),
-                permission_id: token_2.definition_id().clone(),
+                permission_id: token_2.definition_id,
             },
         ))),
         WorldEvent::Domain(DomainEvent::Account(AccountEvent::RoleRevoked(

client/tests/integration/permissions.rs

@@ -181,11 +181,7 @@ fn permissions_differ_not_only_by_names() {
     // Granting permission to Alice to modify metadata in Mouse's hats
     let mouse_hat_id = <Asset as Identifiable>::Id::new(hat_definition_id, mouse_id.clone());
     let allow_alice_to_set_key_value_in_hats = GrantBox::new(
-        PermissionToken::new("can_set_key_value_in_user_asset".parse().expect("Valid"))
-            .with_params([(
-                "asset_id".parse().expect("Valid"),
-                mouse_hat_id.clone().into(),
-            )]),
+        PermissionToken::new("CanSetKeyValueInUserAsset".to_owned(), mouse_hat_id),
         alice_id.clone(),
     );
 
@@ -219,8 +215,7 @@ fn permissions_differ_not_only_by_names() {
 
     // Granting permission to Alice to modify metadata in Mouse's shoes
     let allow_alice_to_set_key_value_in_shoes = GrantBox::new(
-        PermissionToken::new("can_set_key_value_in_user_asset".parse().expect("Valid"))
-            .with_params([("asset_id".parse().expect("Valid"), mouse_shoes_id.into())]),
+        PermissionToken::new("CanSetKeyValueInUserAsset".to_owned(), mouse_shoes_id),
         alice_id,
     );
 
@@ -242,23 +237,13 @@ fn permissions_differ_not_only_by_names() {
 mod token_parameters {
     use super::*;
 
-    static TEST_TOKEN_DEFINITION_ID: once_cell::sync::Lazy<
-        <PermissionTokenDefinition as Identifiable>::Id,
-    > = once_cell::sync::Lazy::new(|| {
-        <PermissionTokenDefinition as Identifiable>::Id::new(
-            "test_permission_token_definition".parse().expect("Valid"),
-        )
-    });
-
-    static NUMBER_PARAMETER_NAME: once_cell::sync::Lazy<Name> =
-        once_cell::sync::Lazy::new(|| "number".parse().expect("Valid"));
-    static STRING_PARAMETER_NAME: once_cell::sync::Lazy<Name> =
-        once_cell::sync::Lazy::new(|| "string".parse().expect("Valid"));
+    static TEST_TOKEN_DEFINITION_ID: once_cell::sync::Lazy<PermissionTokenId> =
+        once_cell::sync::Lazy::new(|| "TestPermissionTokenDefinition".parse().expect("Valid"));
 
     #[ignore = "ignore, more in #2851"]
     #[test]
     fn token_with_missing_parameters_is_not_accepted() {
-        let token = PermissionToken::new(TEST_TOKEN_DEFINITION_ID.clone());
+        let token = PermissionToken::new(TEST_TOKEN_DEFINITION_ID.clone(), ());
         let expect = "Expected to fail to grant permission token without parameters";
 
         run_grant_token_error_test(token.clone(), expect);
@@ -268,8 +253,7 @@ mod token_parameters {
     #[ignore = "ignore, more in #2851"]
     #[test]
     fn token_with_one_missing_parameter_is_not_accepted() {
-        let token = PermissionToken::new(TEST_TOKEN_DEFINITION_ID.clone())
-            .with_params([(NUMBER_PARAMETER_NAME.clone(), 1_u32.into())]);
+        let token = PermissionToken::new(TEST_TOKEN_DEFINITION_ID.clone(), 1_u32);
         let expect = "Expected to fail to grant permission token with one missing parameter";
 
         run_grant_token_error_test(token.clone(), expect);
@@ -279,13 +263,7 @@ mod token_parameters {
     #[ignore = "ignore, more in #2851"]
     #[test]
     fn token_with_changed_parameter_name_is_not_accepted() {
-        let token = PermissionToken::new(TEST_TOKEN_DEFINITION_ID.clone()).with_params([
-            (NUMBER_PARAMETER_NAME.clone(), 1_u32.into()),
-            (
-                "it's_a_trap".parse().expect("Valid"),
-                "test".to_owned().into(),
-            ),
-        ]);
+        let token = PermissionToken::new(TEST_TOKEN_DEFINITION_ID.clone(), (1_u32, "test"));
         let expect = "Expected to fail to grant permission token with one changed parameter";
 
         run_grant_token_error_test(token.clone(), expect);
@@ -295,14 +273,10 @@ mod token_parameters {
     #[ignore = "ignore, more in #2851"]
     #[test]
     fn token_with_extra_parameter_is_not_accepted() {
-        let token = PermissionToken::new(TEST_TOKEN_DEFINITION_ID.clone()).with_params([
-            (NUMBER_PARAMETER_NAME.clone(), 1_u32.into()),
-            (STRING_PARAMETER_NAME.clone(), "test".to_owned().into()),
-            (
-                "extra_param".parse().expect("Valid"),
-                "extra_test".to_owned().into(),
-            ),
-        ]);
+        let token = PermissionToken::new(
+            TEST_TOKEN_DEFINITION_ID.clone(),
+            (1_u32, "test", "extra_test"),
+        );
         let expect = "Expected to fail to grant permission token with extra parameter";
 
         run_grant_token_error_test(token.clone(), expect);
@@ -312,13 +286,10 @@ mod token_parameters {
     #[ignore = "ignore, more in #2851"]
     #[test]
     fn token_with_wrong_parameter_type_is_not_accepted() {
-        let token = PermissionToken::new(TEST_TOKEN_DEFINITION_ID.clone()).with_params([
-            (NUMBER_PARAMETER_NAME.clone(), 1_u32.into()),
-            (
-                STRING_PARAMETER_NAME.clone(),
-                Value::Name("test".parse().expect("Valid")),
-            ),
-        ]);
+        let token = PermissionToken::new(
+            TEST_TOKEN_DEFINITION_ID.clone(),
+            (91_u32, Value::Name("test".parse().expect("Valid"))),
+        );
         let expect = "Expected to fail to grant permission token with wrong parameter type";
 
         run_grant_token_error_test(token.clone(), expect);

client/tests/integration/queries/role.rs

@@ -124,17 +124,10 @@ fn find_roles_by_account_id() -> Result<()> {
         .iter()
         .cloned()
         .map(|role_id| {
-            RegisterBox::new(
-                Role::new(role_id).add_permission(
-                    PermissionToken::new(
-                        "can_set_key_value_in_user_account".parse().expect("Valid"),
-                    )
-                    .with_params([(
-                        "account_id".parse().expect("Valid"),
-                        alice_id.clone().into(),
-                    )]),
-                ),
-            )
+            RegisterBox::new(Role::new(role_id).add_permission(PermissionToken::new(
+                "CanSetKeyValueInUserAccount".to_owned(),
+                alice_id,
+            )))
         })
         .collect::<Vec<_>>();
     test_client.submit_all_blocking(register_roles)?;

client/tests/integration/roles.rs

@@ -5,6 +5,7 @@ use std::str::FromStr as _;
 use eyre::Result;
 use iroha_client::client;
 use iroha_data_model::prelude::*;
+use parity_scale_codec::Encode as _;
 use test_network::*;
 
 #[test]
@@ -25,7 +26,7 @@ fn register_role_with_empty_token_params() -> Result<()> {
     wait_for_genesis_committed(&vec![test_client.clone()], 0);
 
     let role_id = "root".parse().expect("Valid");
-    let token = PermissionToken::new("token".parse().expect("Valid"));
+    let token = PermissionToken::new("token".to_owned(), ());
     let role = Role::new(role_id).add_permission(token);
 
     test_client.submit(RegisterBox::new(role))?;
@@ -61,14 +62,14 @@ fn register_and_grant_role_for_metadata_access() -> Result<()> {
     // Registering role
     let role_id = <Role as Identifiable>::Id::from_str("ACCESS_TO_MOUSE_METADATA")?;
     let role = Role::new(role_id.clone())
-        .add_permission(
-            PermissionToken::new("can_set_key_value_in_user_account".parse()?)
-                .with_params([("account_id".parse()?, mouse_id.clone().into())]),
-        )
-        .add_permission(
-            PermissionToken::new("can_remove_key_value_in_user_account".parse()?)
-                .with_params([("account_id".parse()?, mouse_id.clone().into())]),
-        );
+        .add_permission(PermissionToken::new(
+            "CanSetKeyValueInUserAccount".to_owned(),
+            mouse_id,
+        ))
+        .add_permission(PermissionToken::new(
+            "CanRemoveKeyValueInUserAccount".to_owned(),
+            mouse_id,
+        ));
     let register_role = RegisterBox::new(role);
     test_client.submit_blocking(register_role)?;
 
@@ -108,12 +109,9 @@ fn unregistered_role_removed_from_account() -> Result<()> {
     test_client.submit_blocking(register_mouse)?;
 
     // Register root role
-    let register_role = RegisterBox::new(
-        Role::new(role_id.clone()).add_permission(
-            PermissionToken::new("can_set_key_value_in_user_account".parse()?)
-                .with_params([("account_id".parse()?, alice_id.into())]),
-        ),
-    );
+    let register_role = RegisterBox::new(Role::new(role_id.clone()).add_permission(
+        PermissionToken::new("CanSetKeyValueInUserAccount".to_owned(), alice_id),
+    ));
     test_client.submit_blocking(register_role)?;
 
     // Grant root role to Mouse

client/tests/integration/smartcontracts/Cargo.toml

@@ -28,4 +28,7 @@ codegen-units = 1   # Further reduces binary size but increases compilation time
 [workspace.dependencies]
 iroha_validator = { version = "=2.0.0-pre-rc.16", path = "../../../../wasm/validator", features = ["default-validator"] }
 iroha_wasm = { version = "=2.0.0-pre-rc.16", path = "../../../../wasm", features = ["debug"]}
+iroha_schema = { version = "=2.0.0-pre-rc.16", path = "../../../../schema" }
+
+parity-scale-codec = { version = "3.2.1", default-features = false }
 panic-halt = "0.2.0"

client/tests/integration/smartcontracts/mint_rose/src/lib.rs

@@ -13,10 +13,10 @@ use iroha_wasm::data_model::prelude::*;
 
 /// Mint 1 rose for authority
 #[iroha_wasm::main(params = "[authority]")]
-fn main(authority: <Account as Identifiable>::Id) {
-    let rose_definition_id = <AssetDefinition as Identifiable>::Id::from_str("rose#wonderland")
+fn main(authority: AccountId) {
+    let rose_definition_id = AssetDefinitionId::from_str("rose#wonderland")
         .dbg_expect("Failed to parse `rose#wonderland` asset definition id");
-    let rose_id = <Asset as Identifiable>::Id::new(rose_definition_id, authority);
+    let rose_id = AssetId::new(rose_definition_id, authority);
 
     MintBox::new(1_u32, rose_id)
         .execute()

client/tests/integration/smartcontracts/validator_with_admin/Cargo.toml

@@ -12,4 +12,6 @@ crate-type = ['cdylib']
 
 [dependencies]
 iroha_validator.workspace = true
+iroha_schema.workspace = true
+
 panic-halt.workspace = true

client/tests/integration/smartcontracts/validator_with_admin/src/lib.rs

@@ -2,8 +2,6 @@
 //! If authority is not `admin@admin` then [`DefaultValidator`] is used as a backup.
 #![no_std]
 
-extern crate alloc;
-
 use iroha_validator::{
     data_model::evaluate::{EvaluationError, ExpressionEvaluator},
     parse,
@@ -92,7 +90,7 @@ impl Visit for CustomValidator {
 }
 
 impl Validate for CustomValidator {
-    fn permission_tokens() -> Vec<PermissionTokenDefinition> {
+    fn permission_tokens() -> PermissionTokens {
         DefaultValidator::permission_tokens()
     }
 
@@ -116,7 +114,7 @@ impl ExpressionEvaluator for CustomValidator {
 
 /// Entrypoint to return permission token definitions defined in this validator.
 #[entrypoint]
-pub fn permission_tokens() -> Vec<PermissionTokenDefinition> {
+pub fn permission_tokens() -> PermissionTokens {
     CustomValidator::permission_tokens()
 }
 

client/tests/integration/smartcontracts/validator_with_custom_token/Cargo.toml

@@ -12,4 +12,7 @@ crate-type = ['cdylib']
 
 [dependencies]
 iroha_validator.workspace = true
+iroha_schema.workspace = true
+
+parity-scale-codec.workspace = true
 panic-halt.workspace = true