From 24f3516b029ecf3d5898403de43d7620f5e00d7d Mon Sep 17 00:00:00 2001
From: Dkwcs <pavlo.botnar@gmail.com>
Date: Mon, 25 Nov 2024 12:43:00 +0200
Subject: [PATCH 01/12] update readme

---
 docs/examples/move/nft_marketplace/README.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/examples/move/nft_marketplace/README.md b/docs/examples/move/nft_marketplace/README.md
index b0efd25e3ad..a7c30168663 100644
--- a/docs/examples/move/nft_marketplace/README.md
+++ b/docs/examples/move/nft_marketplace/README.md
@@ -56,10 +56,16 @@ iota client call \
     --type-args "$ITEM_FOR_MARKET_PACKAGE_ID::market_items::Jeans"
 ```
 
-### 6. Publish marketplac extension
+### 6. Publish rules and marketplace extension
+
+Publish Kiosk rules modules:
+```bash
+iota client publish iota/kiosk/Move.toml
+```
+
 Publish the nft_marketplace.move module:
 ```bash
-iota client publish`
+iota client publish iota/docs/examples/move/nft_marketplace/sources/nft_marketplace.move`
 ```
 
 ### 7. Install the Extension on the Kiosk

From 17b658292a70a39044c2c4c9155aa0b3ec7eee68 Mon Sep 17 00:00:00 2001
From: Dkwcs <pavlo.botnar@gmail.com>
Date: Tue, 26 Nov 2024 14:15:51 +0200
Subject: [PATCH 02/12] review comments fix, improving readme descroption,
 minor code refactoring

---
 docs/examples/move/nft_marketplace/Move.toml  |  1 -
 docs/examples/move/nft_marketplace/README.md  | 28 ++++++++++++-----
 .../sources/nft_marketplace.move              | 16 +++++++---
 .../sources/rental_extension.move             | 31 ++++++++++++++-----
 4 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/docs/examples/move/nft_marketplace/Move.toml b/docs/examples/move/nft_marketplace/Move.toml
index 045bb6a0158..11388926dfb 100644
--- a/docs/examples/move/nft_marketplace/Move.toml
+++ b/docs/examples/move/nft_marketplace/Move.toml
@@ -33,4 +33,3 @@ nft_marketplace = "0x0"
 # The dev-addresses section allows overwriting named addresses for the `--test`
 # and `--dev` modes.
 # alice = "0xB0B"
-
diff --git a/docs/examples/move/nft_marketplace/README.md b/docs/examples/move/nft_marketplace/README.md
index a7c30168663..8fc1e78b23b 100644
--- a/docs/examples/move/nft_marketplace/README.md
+++ b/docs/examples/move/nft_marketplace/README.md
@@ -4,13 +4,15 @@ The `nft_marketplace.move` module provides a straightforward implementation of a
 The `item_for_market.move` contains mocked item data for use within the marketplace.
 The `rental_extension.move` is an extension adds functionality to enable item rentals.
 
-
 ## Steps to Use the Marketplace
 
 ### 1. Connect to the Network
+
 Connect to the IOTA network (e.g., using a faucet to obtain tokens).
 
 ### 2. Install Kiosk
+
+By installation, we mean creating a Kiosk object and an OwnerCap, then transferring them to the caller.
 Run the following command to install the Kiosk module:
 
 ```bash
@@ -39,13 +41,17 @@ iota client call \
 
 After creation, export the following variables:
 
-- PACKAGE_ID
-- ITEM_ID
-- PUBLISHER_ID
+- `PACKAGE_ID`: The ID of the `market_items` package.
+- `ITEM_ID`: The ID of the published item (in this case, Jeans).
+- `PUBLISHER_ID`: The ID of the publisher object created during package publishing."
 
 ### 5. Create a Transfer Policy
 
+`TransferPolicy` is a generic shared object acting as a central authority enforcing everyone to check their purchase is valid against the defined policy before the purchased item is transferred to the buyers. Object is specified by concrete type.
+`default` function creates `TransferPolicy` object and an OwnerCap, then transferring them to the caller.
+
 Set up a transfer policy for the created item using the command:
+
 ```bash
 iota client call \                                   
     --package 0x2 \
@@ -59,18 +65,23 @@ iota client call \
 ### 6. Publish rules and marketplace extension
 
 Publish Kiosk rules modules:
+
 ```bash
 iota client publish iota/kiosk/Move.toml
 ```
 
 Publish the nft_marketplace.move module:
+
 ```bash
 iota client publish iota/docs/examples/move/nft_marketplace/sources/nft_marketplace.move`
 ```
 
 ### 7. Install the Extension on the Kiosk
 
+The install function enables installation of the Marketplace extension in a kiosk.
+Under the hood it invokes `kiosk_extension::add` that adds extension to the Kiosk via dynamic field.
 Install the marketplace extension on the created kiosk using the command:
+
 ```bash
 iota client call \
     --package $MARKETPLACE_ID \
@@ -82,6 +93,7 @@ iota client call \
 ### 8. Set a Price for the Item
 
 Set the price for the item:
+
 ```bash
 iota client call \
     --package $MARKETPLACE_ID \
@@ -89,11 +101,11 @@ iota client call \
     --function set_price \
     --args $KIOSK_ID $KIOSK_CAP_ID $ITEM_ID 50000 \
     --type-args "&ITEM_FOR_MARKET_PACKAGE_ID::market_items::Jeans"
-
 ```
 
 ### 9.(Optional) Set Royalties
 
+Royalties are a percentage of the item's price or revenue paid to the owner for the use or sale of their asset
 Set royalties for the item:
 
 ```bash
@@ -107,7 +119,10 @@ iota client call \
 
 ### 10. Buy an Item:
 
+Here, when we buy an item, we pay the owner the item's price. If the royalty rule is enabled, an additional royalty fee, calculated as a percentage of the initial item price, is also paid. Once both payments are completed, the item is transferred to the buyer.
+
 To purchase the item:
+
 ```bash
 iota client call \
     --package $MARKETPLACE \
@@ -115,5 +130,4 @@ iota client call \
     --function buy_item \
     --args $KIOSK_ID $ITEM_TRANS_POLICY_ID &ITEM_ID $COIN_ID \
     --type-args "ITEM_FOR_MARKET_PACKAGE_ID::market_items::Jeans"
-
-```
\ No newline at end of file
+```
diff --git a/docs/examples/move/nft_marketplace/sources/nft_marketplace.move b/docs/examples/move/nft_marketplace/sources/nft_marketplace.move
index b49b4979d53..b48c9096176 100644
--- a/docs/examples/move/nft_marketplace/sources/nft_marketplace.move
+++ b/docs/examples/move/nft_marketplace/sources/nft_marketplace.move
@@ -22,7 +22,7 @@ module nft_marketplace::nft_marketplace {
     const EObjectNotExist: u64 = 1;
 
     // === Constants ===
-    const PERMISSIONS: u128 = 11;
+    const ALLOW_PLACE_AND_LOCK: u128 = 11;
 
     /// Extension Key for Kiosk Marketplace extension.
     public struct Marketplace has drop {}
@@ -35,13 +35,15 @@ module nft_marketplace::nft_marketplace {
         price: u64,
     }
 
+    // === Public Functions ===
+    
     /// Enables someone to install the Marketplace extension in their Kiosk.
     public fun install(
         kiosk: &mut Kiosk,
         cap: &KioskOwnerCap,
         ctx: &mut TxContext,
     ) {
-        kiosk_extension::add(Marketplace {}, kiosk, cap, PERMISSIONS, ctx);
+        kiosk_extension::add(Marketplace {}, kiosk, cap, ALLOW_PLACE_AND_LOCK, ctx);
     }
 
     /// Remove the extension from the Kiosk. Can only be performed by the owner,
@@ -50,15 +52,19 @@ module nft_marketplace::nft_marketplace {
         kiosk_extension::remove<Marketplace>(kiosk, cap);
     }
 
+    /// Setup item royalty percentage
+    /// - amount_bp - the percentage of the purchase price to be paid as a
+    /// fee, denominated in basis points (100_00 = 100%, 1 = 0.01%).
+    /// - min_amount - the minimum amount to be paid as a fee if the relative
+    /// amount is lower than this setting.
     public fun setup_royalties<T: key + store>(policy: &mut TransferPolicy<T>, cap: &TransferPolicyCap<T>, amount_bp: u16, min_amount: u64, ctx: &mut TxContext) {
         royalty_rule::add<T>(policy, cap, amount_bp, min_amount);
     }
 
-    /// Buy listed item and pay royalties if needed
+    /// Buy listed item with the indicated price and pay royalties if needed
     public fun buy_item<T: key + store>(kiosk: &mut Kiosk, policy: &mut TransferPolicy<T>, item_id: object::ID, mut payment: Coin<IOTA>, ctx: &mut TxContext) {
         assert!(kiosk_extension::is_installed<Marketplace>(kiosk), EExtensionNotInstalled);
-        let item_price = take_from_bag<T, Listed>(kiosk,  Listed { id: item_id });
-        let ItemPrice { price } = item_price;
+        let ItemPrice { price } = take_from_bag<T, Listed>(kiosk,  Listed { id: item_id });
         let payment_amount = payment.split(price, ctx);
         let payment_amount_value = payment_amount.value();
         let (item, mut transfer_request) = purchase(kiosk, item_id, payment_amount);
diff --git a/docs/examples/move/nft_marketplace/sources/rental_extension.move b/docs/examples/move/nft_marketplace/sources/rental_extension.move
index 1bb4b2722f5..7599f9be54b 100644
--- a/docs/examples/move/nft_marketplace/sources/rental_extension.move
+++ b/docs/examples/move/nft_marketplace/sources/rental_extension.move
@@ -1,3 +1,11 @@
+/// NFT renting is a mechanism that allows individuals without ownership or possession of a specific 
+/// NFT to temporarily utilize or experience it. 
+/// The rental_extension module provides an API that facilitates lending or borrowing through the following operations:
+///  - List for renting
+///  - Delist from renting
+///  - Rent
+///  - Borrow by reference and borrow by value
+///  - Reclaim for the lender
 module nft_marketplace::rental_extension {
 
     // iota imports
@@ -26,7 +34,7 @@ module nft_marketplace::rental_extension {
     const ETotalPriceOverflow: u64 = 6;
 
     // === Constants ===
-    const PERMISSIONS: u128 = 11;
+    const ALLOW_PLACE_AND_LOCK: u128 = 11;
     const SECONDS_IN_A_DAY: u64 = 86400;
     const MAX_BASIS_POINTS: u16 = 10_000;
     const MAX_VALUE_U64: u64 = 0xff_ff_ff_ff__ff_ff_ff_ff;
@@ -93,13 +101,13 @@ module nft_marketplace::rental_extension {
 
     // === Public Functions ===
 
-    /// Enables someone to install the Marketplace extension in their Kiosk.
+    /// Enables someone to install the Rental extension in their Kiosk.
     public fun install(
         kiosk: &mut Kiosk,
         cap: &KioskOwnerCap,
         ctx: &mut TxContext,
     ) {
-        kiosk_extension::add(Rental {}, kiosk, cap, PERMISSIONS, ctx);
+        kiosk_extension::add(Rental {}, kiosk, cap, ALLOW_PLACE_AND_LOCK, ctx);
     }
 
      /// Remove the extension from the Kiosk. Can only be performed by the owner,
@@ -225,11 +233,7 @@ module nft_marketplace::rental_extension {
         let coin_value = coin.value();
         assert!(coin_value == total_price, ENotEnoughCoins);
 
-        // Calculate fees_amount using the given basis points amount (percentage), ensuring the
-        // result fits into a 64-bit unsigned integer.
-        let mut fees_amount = coin_value as u128;
-        fees_amount = fees_amount * (rental_policy.amount_bp as u128);
-        fees_amount = fees_amount / (MAX_BASIS_POINTS as u128);
+        let fees_amount = calculate_fees_amount(coin_value as u128, rental_policy.amount_bp as u128);
 
         let fees = coin.split(fees_amount as u64, ctx);
 
@@ -368,6 +372,17 @@ module nft_marketplace::rental_extension {
 
     // === Private Functions ===
 
+    // Calculate fees_amount using the given basis points amount (percentage), ensuring the
+    // result fits into a 64-bit unsigned integer.
+    fun calculate_fees_amount(coin_value: u128, rental_amount_bp: u128): u128 {
+
+        let mut fees_amount = coin_value as u128;
+        fees_amount = fees_amount * (rental_amount_bp as u128);
+        fees_amount = fees_amount / (MAX_BASIS_POINTS as u128);
+
+        fees_amount
+    }
+    
     fun take_from_bag<T: key + store, Key: store + copy + drop>(
         kiosk: &mut Kiosk,
         item: Key,

From 0eda47f0fc1fcc4edd9c5724acfb9d32d76dc152 Mon Sep 17 00:00:00 2001
From: Dkwcs <pavlo.botnar@gmail.com>
Date: Tue, 26 Nov 2024 14:25:03 +0200
Subject: [PATCH 03/12] ETotalPriceOverflow check moved to list method from the
 rent

---
 .../move/nft_marketplace/sources/rental_extension.move         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/examples/move/nft_marketplace/sources/rental_extension.move b/docs/examples/move/nft_marketplace/sources/rental_extension.move
index 7599f9be54b..4db493e356f 100644
--- a/docs/examples/move/nft_marketplace/sources/rental_extension.move
+++ b/docs/examples/move/nft_marketplace/sources/rental_extension.move
@@ -156,6 +156,7 @@ module nft_marketplace::rental_extension {
     ) {
         assert!(kiosk_extension::is_installed<Rental>(kiosk), EExtensionNotInstalled);
 
+        assert!(price_per_day * duration <= MAX_VALUE_U64, ETotalPriceOverflow);
         kiosk.set_owner(cap, ctx);
         kiosk.list<T>(cap, item_id, 0);
 
@@ -226,8 +227,6 @@ module nft_marketplace::rental_extension {
 
         let mut rentable = take_from_bag<T, Listed>(renter_kiosk, Listed { id: item_id });
 
-        let max_price_per_day = MAX_VALUE_U64 / rentable.duration;
-        assert!(rentable.price_per_day <= max_price_per_day, ETotalPriceOverflow);
         let total_price = rentable.price_per_day * rentable.duration;
 
         let coin_value = coin.value();

From c140b109511abe97a2388239e85d7a4a1675f8ab Mon Sep 17 00:00:00 2001
From: Pavlo Botnar <pavlo.botnar@gmail.com>
Date: Tue, 26 Nov 2024 14:28:58 +0200
Subject: [PATCH 04/12] Update
 docs/examples/move/nft_marketplace/sources/nft_marketplace.move

Co-authored-by: Mirko Zichichi <miker83z@proton.me>
---
 docs/examples/move/nft_marketplace/sources/nft_marketplace.move | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/move/nft_marketplace/sources/nft_marketplace.move b/docs/examples/move/nft_marketplace/sources/nft_marketplace.move
index b48c9096176..e6a07a1d07c 100644
--- a/docs/examples/move/nft_marketplace/sources/nft_marketplace.move
+++ b/docs/examples/move/nft_marketplace/sources/nft_marketplace.move
@@ -80,7 +80,7 @@ module nft_marketplace::nft_marketplace {
     }
 
 
-  public fun set_price<T: key + store>(
+    public fun set_price<T: key + store>(
         kiosk: &mut Kiosk,
         cap: &KioskOwnerCap,
         item: T,

From c056138b90e36c62132cdf3399be07ca89bc1d5f Mon Sep 17 00:00:00 2001
From: Dkwcs <pavlo.botnar@gmail.com>
Date: Tue, 26 Nov 2024 14:34:12 +0200
Subject: [PATCH 05/12] Minor code refactroing

---
 docs/examples/move/nft_marketplace/sources/item_for_market.move  | 1 +
 docs/examples/move/nft_marketplace/sources/nft_marketplace.move  | 1 -
 docs/examples/move/nft_marketplace/sources/rental_extension.move | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/examples/move/nft_marketplace/sources/item_for_market.move b/docs/examples/move/nft_marketplace/sources/item_for_market.move
index cfea0bfef5a..2a11e131717 100644
--- a/docs/examples/move/nft_marketplace/sources/item_for_market.move
+++ b/docs/examples/move/nft_marketplace/sources/item_for_market.move
@@ -1,3 +1,4 @@
+/// Module provides `mock` items for using them in nft_marketplace and rental extensions.
 module nft_marketplace::market_items {
     use iota::package;
     /// One Time Witness.
diff --git a/docs/examples/move/nft_marketplace/sources/nft_marketplace.move b/docs/examples/move/nft_marketplace/sources/nft_marketplace.move
index e6a07a1d07c..571302f2eec 100644
--- a/docs/examples/move/nft_marketplace/sources/nft_marketplace.move
+++ b/docs/examples/move/nft_marketplace/sources/nft_marketplace.move
@@ -105,7 +105,6 @@ module nft_marketplace::nft_marketplace {
         item_key: Key,
     ) : ItemPrice<T> {
         let ext_storage_mut = kiosk_extension::storage_mut(Marketplace {}, kiosk);
-        assert!(bag::contains(ext_storage_mut, item_key), EObjectNotExist);
         bag::remove<Key, ItemPrice<T>>(
             ext_storage_mut,
             item_key,
diff --git a/docs/examples/move/nft_marketplace/sources/rental_extension.move b/docs/examples/move/nft_marketplace/sources/rental_extension.move
index 4db493e356f..592beb2049e 100644
--- a/docs/examples/move/nft_marketplace/sources/rental_extension.move
+++ b/docs/examples/move/nft_marketplace/sources/rental_extension.move
@@ -387,7 +387,6 @@ module nft_marketplace::rental_extension {
         item: Key,
     ) : Rentable<T> {
         let ext_storage_mut = kiosk_extension::storage_mut(Rental {}, kiosk);
-        assert!(bag::contains(ext_storage_mut, item), EObjectNotExist);
         bag::remove<Key, Rentable<T>>(
             ext_storage_mut,
             item,

From 79a64126c273942fc5a025cd443e85b2dd0a1122 Mon Sep 17 00:00:00 2001
From: Dkwcs <pavlo.botnar@gmail.com>
Date: Tue, 26 Nov 2024 15:20:02 +0200
Subject: [PATCH 06/12] Minor fix

---
 docs/examples/move/nft_marketplace/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/examples/move/nft_marketplace/README.md b/docs/examples/move/nft_marketplace/README.md
index 8fc1e78b23b..2a9b4748dfc 100644
--- a/docs/examples/move/nft_marketplace/README.md
+++ b/docs/examples/move/nft_marketplace/README.md
@@ -105,7 +105,8 @@ iota client call \
 
 ### 9.(Optional) Set Royalties
 
-Royalties are a percentage of the item's price or revenue paid to the owner for the use or sale of their asset
+Royalties are a percentage of the item's price or revenue paid to the owner for the use or sale of their asset.
+
 Set royalties for the item:
 
 ```bash

From 97dc111570c30b5dba7ad9eca7b346a206cdf82d Mon Sep 17 00:00:00 2001
From: Dkwcs <pavlo.botnar@gmail.com>
Date: Wed, 27 Nov 2024 16:16:11 +0200
Subject: [PATCH 07/12] Fix review comments, improvements of bying flow

---
 docs/examples/move/nft_marketplace/README.md  | 127 ++++++++++++------
 ...em_for_market.move => clothing_store.move} |   6 +-
 .../sources/nft_marketplace.move              |  43 +++---
 .../sources/rental_extension.move             |   1 -
 4 files changed, 117 insertions(+), 60 deletions(-)
 rename docs/examples/move/nft_marketplace/sources/{item_for_market.move => clothing_store.move} (89%)

diff --git a/docs/examples/move/nft_marketplace/README.md b/docs/examples/move/nft_marketplace/README.md
index 2a9b4748dfc..8078004157c 100644
--- a/docs/examples/move/nft_marketplace/README.md
+++ b/docs/examples/move/nft_marketplace/README.md
@@ -22,28 +22,47 @@ iota client call \
     --function default
 ```
 
-### 3. Publish `item_for_market.move`
+### 3. Publish `nft_marketplace` package
+
+#### 3.1(Optional) Publish Kiosk rules modules if these are not present in the network you are using
+
+Publish Kiosk rules modules(package):
 
 ```bash
-iota client publish
+iota client publish iota/kiosk
 ```
 
-### 4. Create an Item
+After publishing, export the following variable:
+
+- `RULES_PACKAGE_ID`: The ID of rules package.
+
+#### 3.2 Publish marketplace extension
+
+Publish the nft_marketplace.move module:
+
+```bash
+iota client publish iota/docs/examples/move/nft_marketplace
+```
+
+After publishing, export the following variables:
+
+- `MARKETPLACE_PACKAGE_ID`: The ID of whole marketplace package.
+- `MARKETPLACE_PUBLISHER_ID`: The ID of the publisher object created during marketplace package publishing."
+
+### 4. Create an Clothing Store Item
 
 Create an item, for instance:
 
 ```bash
 iota client call \
-    --package $M_ITEMS_ID \
-    --module market_items \
+    --package $MARKETPLACE_PACKAGE_ID \
+    --module clothing_store \
     --function new_jeans
 ```
 
-After creation, export the following variables:
+After creation, export the following variable:
 
-- `PACKAGE_ID`: The ID of the `market_items` package.
-- `ITEM_ID`: The ID of the published item (in this case, Jeans).
-- `PUBLISHER_ID`: The ID of the publisher object created during package publishing."
+- `CLOTHING_STORE_ITEM_ID`: The ID of the published item (in this case, Jeans).
 
 ### 5. Create a Transfer Policy
 
@@ -58,25 +77,16 @@ iota client call \
     --module transfer_policy \
     --function default \
     --gas-budget 10000000 \
-    --args $PUBLISHER_ID \
-    --type-args "$ITEM_FOR_MARKET_PACKAGE_ID::market_items::Jeans"
+    --args $MARKETPLACE_PUBLISHER_ID \
+    --type-args "$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans"
 ```
 
-### 6. Publish rules and marketplace extension
-
-Publish Kiosk rules modules:
+After publishing, export the following variables:
 
-```bash
-iota client publish iota/kiosk/Move.toml
-```
+- `ITEM_TRANS_POLICY`: The ID of the item transfer policy object.
+- `ITEM_TRANS_POLICY_CAP`: The ID of the item transfer policy object owner capability"
 
-Publish the nft_marketplace.move module:
-
-```bash
-iota client publish iota/docs/examples/move/nft_marketplace/sources/nft_marketplace.move`
-```
-
-### 7. Install the Extension on the Kiosk
+### 6. Install the Extension on the Kiosk
 
 The install function enables installation of the Marketplace extension in a kiosk.
 Under the hood it invokes `kiosk_extension::add` that adds extension to the Kiosk via dynamic field.
@@ -84,26 +94,26 @@ Install the marketplace extension on the created kiosk using the command:
 
 ```bash
 iota client call \
-    --package $MARKETPLACE_ID \
+    --package $MARKETPLACE_PACKAGE_ID \
     --module nft_marketplace \
     --function install \
     --args $KIOSK_ID $KIOSK_CAP_ID
 ```
 
-### 8. Set a Price for the Item
+### 7. Set a Price for the Item
 
 Set the price for the item:
 
 ```bash
 iota client call \
-    --package $MARKETPLACE_ID \
+    --package $MARKETPLACE_PACKAGE_ID \
     --module nft_marketplace \
     --function set_price \
-    --args $KIOSK_ID $KIOSK_CAP_ID $ITEM_ID 50000 \
-    --type-args "&ITEM_FOR_MARKET_PACKAGE_ID::market_items::Jeans"
+    --args $KIOSK_ID $KIOSK_CAP_ID $CLOTHING_STORE_ITEM_ID 50000 \
+    --type-args "$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans"
 ```
 
-### 9.(Optional) Set Royalties
+### 8.(Optional) Set Royalties
 
 Royalties are a percentage of the item's price or revenue paid to the owner for the use or sale of their asset.
 
@@ -111,24 +121,59 @@ Set royalties for the item:
 
 ```bash
 iota client call \
-    --package $MARKETPLACE \
+    --package $MARKETPLACE_PACKAGE_ID \
     --module nft_marketplace \
     --function setup_royalties \
-    --args $ITEM_TRANS_POLICY_ID $ITEM_TRANS_POLICY_CAP_ID 5000 2000 \
-    --type-args "ITEM_FOR_MARKET_PACKAGE_ID::market_items::Jeans"
+    --args $ITEM_TRANS_POLICY $ITEM_TRANS_POLICY_CAP 5000 2000 \
+    --type-args "$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans"
 ```
 
-### 10. Buy an Item:
+### 9. Buy an Item:
 
-Here, when we buy an item, we pay the owner the item's price. If the royalty rule is enabled, an additional royalty fee, calculated as a percentage of the initial item price, is also paid. Once both payments are completed, the item is transferred to the buyer.
+#### 9.1 Get the Item Price:
+
+```bash
+iota client ptb \
+--move-call $MARKETPLACE_PACKAGE_ID::nft_marketplace::get_item_price "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" @$KIOSK_ID @$CLOTHING_STORE_ITEM_ID --assign item_price \
+```
+
+#### 9.2(Optional) Calculate rolyalties of the Item:
+
+```bash
+--move-call $RULES_PACKAGE_ID::royalty_rule::fee_amount "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" @$ITEM_TRANS_POLICY item_price --assign royalties_amount \
+```
+
+#### 9.3 Create a payment coin with a specific amount (price + optional royalties):
+
+```bash
+--split-coins gas "[item_price, royalties_amount]" --assign payment_coins \
+--merge-coins payment_coins.0 "[payment_coins.1]" \
+```
+
+#### 9.4 Buy an Item using `payment_coins.0`:
+
+Here, when we buy an item, we pay the owner the item's price. If the royalty rule is enabled, an additional royalty fee, calculated as a percentage of the initial item price, is also paid. Once both payments are completed, the item is ready for transferring to the buyer.
 
 To purchase the item:
 
 ```bash
-iota client call \
-    --package $MARKETPLACE \
-    --module nft_marketplace \
-    --function buy_item \
-    --args $KIOSK_ID $ITEM_TRANS_POLICY_ID &ITEM_ID $COIN_ID \
-    --type-args "ITEM_FOR_MARKET_PACKAGE_ID::market_items::Jeans"
+--move-call $MARKETPLACE_PACKAGE_ID::nft_marketplace::buy_item "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" @$KIOSK_ID @$ITEM_TRANS_POLICY @$CLOTHING_STORE_ITEM_ID payment_coins.0 --assign purchased_item
+```
+
+#### 9.5 Transfer an Item to the buyer:
+
+```bash
+--move-call 0x2::transfer::public_transfer "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" purchased_item @<buyer address> \
+```
+
+The final purchase PTB request, including royalties, should look like this:
+
+```bash
+iota client ptb \
+--move-call $MARKETPLACE_PACKAGE_ID::nft_marketplace::get_item_price "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" @$KIOSK_ID @$CLOTHING_STORE_ITEM_ID --assign item_price \
+--move-call $RULES_PACKAGE_ID::royalty_rule::fee_amount "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" @$ITEM_TRANS_POLICY item_price --assign royalties_amount \
+--split-coins gas "[item_price, royalties_amount]" --assign payment_coins \
+--merge-coins payment_coins.0 "[payment_coins.1]" \
+--move-call $MARKETPLACE_PACKAGE_ID::nft_marketplace::buy_item "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" @$KIOSK_ID @$ITEM_TRANS_POLICY @$CLOTHING_STORE_ITEM_ID payment_coins.0 --assign purchased_item \
+--move-call 0x2::transfer::public_transfer "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" purchased_item @<buyer address>
 ```
diff --git a/docs/examples/move/nft_marketplace/sources/item_for_market.move b/docs/examples/move/nft_marketplace/sources/clothing_store.move
similarity index 89%
rename from docs/examples/move/nft_marketplace/sources/item_for_market.move
rename to docs/examples/move/nft_marketplace/sources/clothing_store.move
index 2a11e131717..55294e84d75 100644
--- a/docs/examples/move/nft_marketplace/sources/item_for_market.move
+++ b/docs/examples/move/nft_marketplace/sources/clothing_store.move
@@ -1,11 +1,11 @@
 /// Module provides `mock` items for using them in nft_marketplace and rental extensions.
-module nft_marketplace::market_items {
+module nft_marketplace::clothing_store {
     use iota::package;
     /// One Time Witness.
-    public struct MARKET_ITEMS has drop {}
+    public struct CLOTHING_STORE has drop {}
 
 
-    fun init(otw: MARKET_ITEMS, ctx: &mut TxContext) {
+    fun init(otw: CLOTHING_STORE, ctx: &mut TxContext) {
         package::claim_and_keep(otw, ctx)
     }
 
diff --git a/docs/examples/move/nft_marketplace/sources/nft_marketplace.move b/docs/examples/move/nft_marketplace/sources/nft_marketplace.move
index 571302f2eec..f34e6c36b66 100644
--- a/docs/examples/move/nft_marketplace/sources/nft_marketplace.move
+++ b/docs/examples/move/nft_marketplace/sources/nft_marketplace.move
@@ -10,16 +10,13 @@ module nft_marketplace::nft_marketplace {
     };
 
     // rules imports
-    // use kiosk::floor_price_rule::Rule as FloorPriceRule;
-    // use kiosk::personal_kiosk_rule::Rule as PersonalRule;
     use kiosk::royalty_rule::Rule as RoyaltyRule;
     use kiosk::royalty_rule;
-    // use kiosk::witness_rule::Rule as WitnessRule;
 
 
     // === Errors ===
     const EExtensionNotInstalled: u64 = 0;
-    const EObjectNotExist: u64 = 1;
+    const EWrongPaymentRoyalties: u64 = 1;
 
     // === Constants ===
     const ALLOW_PLACE_AND_LOCK: u128 = 11;
@@ -30,7 +27,7 @@ module nft_marketplace::nft_marketplace {
     /// Used as a key for the item that has been up for sale that's placed in the Extension's Bag.
     public struct Listed has store, copy, drop { id: ID }
     
-    public struct ItemPrice<T: key + store> has store {
+    public struct ItemPrice<phantom T: key + store> has store {
         /// Total amount of time offered for renting in days.
         price: u64,
     }
@@ -62,21 +59,23 @@ module nft_marketplace::nft_marketplace {
     }
 
     /// Buy listed item with the indicated price and pay royalties if needed
-    public fun buy_item<T: key + store>(kiosk: &mut Kiosk, policy: &mut TransferPolicy<T>, item_id: object::ID, mut payment: Coin<IOTA>, ctx: &mut TxContext) {
+    public fun buy_item<T: key + store>(kiosk: &mut Kiosk, policy: &mut TransferPolicy<T>, item_id: object::ID, mut payment: Coin<IOTA>, ctx: &mut TxContext): T {
         assert!(kiosk_extension::is_installed<Marketplace>(kiosk), EExtensionNotInstalled);
         let ItemPrice { price } = take_from_bag<T, Listed>(kiosk,  Listed { id: item_id });
-        let payment_amount = payment.split(price, ctx);
-        let payment_amount_value = payment_amount.value();
-        let (item, mut transfer_request) = purchase(kiosk, item_id, payment_amount);
+        
+        let payment_amount_value = payment.value();
+        let coin_price = payment.split(price, ctx);
+        
+        let (item, mut transfer_request) = purchase(kiosk, item_id, coin_price);
         if (policy.has_rule<T, RoyaltyRule>()) { 
-            let royalties_value = royalty_rule::fee_amount(policy, payment_amount_value);
-            let royalties_coin = payment.split(royalties_value, ctx);
-            royalty_rule::pay(policy, &mut transfer_request, royalties_coin);
+            let royalties_value = royalty_rule::fee_amount(policy, price);
+            assert!(payment_amount_value == price + royalties_value, EWrongPaymentRoyalties);
+            royalty_rule::pay(policy, &mut transfer_request, payment);
+        } else {
+            payment.destroy_zero();
         };
         transfer_policy::confirm_request(policy, transfer_request);
-        transfer::public_transfer<T>(item, ctx.sender());
-        // Send a leftover back to buyer
-        transfer::public_transfer(payment, ctx.sender());
+        item
     }
 
 
@@ -98,6 +97,20 @@ module nft_marketplace::nft_marketplace {
     }
 
 
+    public fun get_item_price<T: key + store>(
+        kiosk: &Kiosk,
+        item_id: ID,
+    ) : u64 {
+        let storage_ref = kiosk_extension::storage(Marketplace {}, kiosk);
+        let ItemPrice { price } = bag::borrow<Listed, ItemPrice<T>>(
+            storage_ref,
+            Listed { id: item_id },
+        );
+
+        *price
+    }
+
+
     // === Private Functions ===
 
     fun take_from_bag<T: key + store, Key: store + copy + drop>(
diff --git a/docs/examples/move/nft_marketplace/sources/rental_extension.move b/docs/examples/move/nft_marketplace/sources/rental_extension.move
index 592beb2049e..f8502c11dc6 100644
--- a/docs/examples/move/nft_marketplace/sources/rental_extension.move
+++ b/docs/examples/move/nft_marketplace/sources/rental_extension.move
@@ -30,7 +30,6 @@ module nft_marketplace::rental_extension {
     const ENotEnoughCoins: u64 = 2;
     const EInvalidKiosk: u64 = 3;
     const ERentingPeriodNotOver: u64 = 4;
-    const EObjectNotExist: u64 = 5;
     const ETotalPriceOverflow: u64 = 6;
 
     // === Constants ===

From 2c859cfa6780483a7d475ac24f164fe5de5f9a7a Mon Sep 17 00:00:00 2001
From: Dkwcs <pavlo.botnar@gmail.com>
Date: Wed, 27 Nov 2024 16:20:02 +0200
Subject: [PATCH 08/12] Minor space fixes

---
 docs/examples/move/nft_marketplace/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/examples/move/nft_marketplace/README.md b/docs/examples/move/nft_marketplace/README.md
index 8078004157c..3a6f8c04eb5 100644
--- a/docs/examples/move/nft_marketplace/README.md
+++ b/docs/examples/move/nft_marketplace/README.md
@@ -16,7 +16,7 @@ By installation, we mean creating a Kiosk object and an OwnerCap, then transferr
 Run the following command to install the Kiosk module:
 
 ```bash
-iota client call \                                   
+iota client call \
     --package 0x2 \
     --module kiosk \
     --function default
@@ -72,7 +72,7 @@ After creation, export the following variable:
 Set up a transfer policy for the created item using the command:
 
 ```bash
-iota client call \                                   
+iota client call \
     --package 0x2 \
     --module transfer_policy \
     --function default \

From eb830f7e57a9d2fe0a560020fa3feebf7d7574df Mon Sep 17 00:00:00 2001
From: Pavlo Botnar <pavlo.botnar@gmail.com>
Date: Wed, 27 Nov 2024 16:59:05 +0200
Subject: [PATCH 09/12] Update
 docs/examples/move/nft_marketplace/sources/clothing_store.move

Co-authored-by: Mirko Zichichi <miker83z@proton.me>
---
 docs/examples/move/nft_marketplace/sources/clothing_store.move | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/examples/move/nft_marketplace/sources/clothing_store.move b/docs/examples/move/nft_marketplace/sources/clothing_store.move
index 55294e84d75..6c0f5636ed2 100644
--- a/docs/examples/move/nft_marketplace/sources/clothing_store.move
+++ b/docs/examples/move/nft_marketplace/sources/clothing_store.move
@@ -1,4 +1,5 @@
 /// Module provides `mock` items for using them in nft_marketplace and rental extensions.
+#[allow(lint(self_transfer))]
 module nft_marketplace::clothing_store {
     use iota::package;
     /// One Time Witness.

From 6535b5ccfa9843afd274efd30a41435fa18f193c Mon Sep 17 00:00:00 2001
From: Pavlo Botnar <pavlo.botnar@gmail.com>
Date: Wed, 27 Nov 2024 16:59:18 +0200
Subject: [PATCH 10/12] Update
 docs/examples/move/nft_marketplace/sources/nft_marketplace.move

Co-authored-by: Mirko Zichichi <miker83z@proton.me>
---
 docs/examples/move/nft_marketplace/sources/nft_marketplace.move | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/move/nft_marketplace/sources/nft_marketplace.move b/docs/examples/move/nft_marketplace/sources/nft_marketplace.move
index f34e6c36b66..6c994dadce3 100644
--- a/docs/examples/move/nft_marketplace/sources/nft_marketplace.move
+++ b/docs/examples/move/nft_marketplace/sources/nft_marketplace.move
@@ -54,7 +54,7 @@ module nft_marketplace::nft_marketplace {
     /// fee, denominated in basis points (100_00 = 100%, 1 = 0.01%).
     /// - min_amount - the minimum amount to be paid as a fee if the relative
     /// amount is lower than this setting.
-    public fun setup_royalties<T: key + store>(policy: &mut TransferPolicy<T>, cap: &TransferPolicyCap<T>, amount_bp: u16, min_amount: u64, ctx: &mut TxContext) {
+    public fun setup_royalties<T: key + store>(policy: &mut TransferPolicy<T>, cap: &TransferPolicyCap<T>, amount_bp: u16, min_amount: u64) {
         royalty_rule::add<T>(policy, cap, amount_bp, min_amount);
     }
 

From 4c8441c647bc58a0676586254bef631157add710 Mon Sep 17 00:00:00 2001
From: Dkwcs <pavlo.botnar@gmail.com>
Date: Thu, 28 Nov 2024 12:02:19 +0200
Subject: [PATCH 11/12] Add tests for nft_marketplace package

---
 docs/examples/move/nft_marketplace/README.md  |  18 +-
 .../sources/clothing_store.move               |   2 +-
 ...tplace.move => marketplace_extension.move} |   4 +-
 .../sources/rental_extension.move             |   3 +-
 .../tests/marketplace_extension_tests.move    | 223 +++++++++++
 .../tests/nft_marketplace_tests.move          |  19 -
 .../tests/rental_extension_tests.move         | 362 ++++++++++++++++++
 .../move/nft_marketplace/tests/utils.move     |  24 ++
 8 files changed, 624 insertions(+), 31 deletions(-)
 rename docs/examples/move/nft_marketplace/sources/{nft_marketplace.move => marketplace_extension.move} (96%)
 create mode 100644 docs/examples/move/nft_marketplace/tests/marketplace_extension_tests.move
 delete mode 100644 docs/examples/move/nft_marketplace/tests/nft_marketplace_tests.move
 create mode 100644 docs/examples/move/nft_marketplace/tests/rental_extension_tests.move
 create mode 100644 docs/examples/move/nft_marketplace/tests/utils.move

diff --git a/docs/examples/move/nft_marketplace/README.md b/docs/examples/move/nft_marketplace/README.md
index 3a6f8c04eb5..c44b4c71132 100644
--- a/docs/examples/move/nft_marketplace/README.md
+++ b/docs/examples/move/nft_marketplace/README.md
@@ -1,6 +1,6 @@
 # Marketplace Guide
 
-The `nft_marketplace.move` module provides a straightforward implementation of a marketplace extension. To utilize it, follow the steps outlined below.
+The `marketplace_extension.move` module provides a straightforward implementation of a marketplace extension. To utilize it, follow the steps outlined below.
 The `item_for_market.move` contains mocked item data for use within the marketplace.
 The `rental_extension.move` is an extension adds functionality to enable item rentals.
 
@@ -38,7 +38,7 @@ After publishing, export the following variable:
 
 #### 3.2 Publish marketplace extension
 
-Publish the nft_marketplace.move module:
+Publish the marketplace_extension.move module:
 
 ```bash
 iota client publish iota/docs/examples/move/nft_marketplace
@@ -95,7 +95,7 @@ Install the marketplace extension on the created kiosk using the command:
 ```bash
 iota client call \
     --package $MARKETPLACE_PACKAGE_ID \
-    --module nft_marketplace \
+    --module marketplace_extension \
     --function install \
     --args $KIOSK_ID $KIOSK_CAP_ID
 ```
@@ -107,7 +107,7 @@ Set the price for the item:
 ```bash
 iota client call \
     --package $MARKETPLACE_PACKAGE_ID \
-    --module nft_marketplace \
+    --module marketplace_extension \
     --function set_price \
     --args $KIOSK_ID $KIOSK_CAP_ID $CLOTHING_STORE_ITEM_ID 50000 \
     --type-args "$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans"
@@ -122,7 +122,7 @@ Set royalties for the item:
 ```bash
 iota client call \
     --package $MARKETPLACE_PACKAGE_ID \
-    --module nft_marketplace \
+    --module marketplace_extension \
     --function setup_royalties \
     --args $ITEM_TRANS_POLICY $ITEM_TRANS_POLICY_CAP 5000 2000 \
     --type-args "$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans"
@@ -134,7 +134,7 @@ iota client call \
 
 ```bash
 iota client ptb \
---move-call $MARKETPLACE_PACKAGE_ID::nft_marketplace::get_item_price "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" @$KIOSK_ID @$CLOTHING_STORE_ITEM_ID --assign item_price \
+--move-call $MARKETPLACE_PACKAGE_ID::marketplace_extension::get_item_price "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" @$KIOSK_ID @$CLOTHING_STORE_ITEM_ID --assign item_price \
 ```
 
 #### 9.2(Optional) Calculate rolyalties of the Item:
@@ -157,7 +157,7 @@ Here, when we buy an item, we pay the owner the item's price. If the royalty rul
 To purchase the item:
 
 ```bash
---move-call $MARKETPLACE_PACKAGE_ID::nft_marketplace::buy_item "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" @$KIOSK_ID @$ITEM_TRANS_POLICY @$CLOTHING_STORE_ITEM_ID payment_coins.0 --assign purchased_item
+--move-call $MARKETPLACE_PACKAGE_ID::marketplace_extension::buy_item "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" @$KIOSK_ID @$ITEM_TRANS_POLICY @$CLOTHING_STORE_ITEM_ID payment_coins.0 --assign purchased_item
 ```
 
 #### 9.5 Transfer an Item to the buyer:
@@ -170,10 +170,10 @@ The final purchase PTB request, including royalties, should look like this:
 
 ```bash
 iota client ptb \
---move-call $MARKETPLACE_PACKAGE_ID::nft_marketplace::get_item_price "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" @$KIOSK_ID @$CLOTHING_STORE_ITEM_ID --assign item_price \
+--move-call $MARKETPLACE_PACKAGE_ID::marketplace_extension::get_item_price "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" @$KIOSK_ID @$CLOTHING_STORE_ITEM_ID --assign item_price \
 --move-call $RULES_PACKAGE_ID::royalty_rule::fee_amount "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" @$ITEM_TRANS_POLICY item_price --assign royalties_amount \
 --split-coins gas "[item_price, royalties_amount]" --assign payment_coins \
 --merge-coins payment_coins.0 "[payment_coins.1]" \
---move-call $MARKETPLACE_PACKAGE_ID::nft_marketplace::buy_item "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" @$KIOSK_ID @$ITEM_TRANS_POLICY @$CLOTHING_STORE_ITEM_ID payment_coins.0 --assign purchased_item \
+--move-call $MARKETPLACE_PACKAGE_ID::marketplace_extension::buy_item "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" @$KIOSK_ID @$ITEM_TRANS_POLICY @$CLOTHING_STORE_ITEM_ID payment_coins.0 --assign purchased_item \
 --move-call 0x2::transfer::public_transfer "<$MARKETPLACE_PACKAGE_ID::clothing_store::Jeans>" purchased_item @<buyer address>
 ```
diff --git a/docs/examples/move/nft_marketplace/sources/clothing_store.move b/docs/examples/move/nft_marketplace/sources/clothing_store.move
index 6c0f5636ed2..050c8f93a75 100644
--- a/docs/examples/move/nft_marketplace/sources/clothing_store.move
+++ b/docs/examples/move/nft_marketplace/sources/clothing_store.move
@@ -1,4 +1,4 @@
-/// Module provides `mock` items for using them in nft_marketplace and rental extensions.
+/// Module provides `mock` items for using them in marketplace and rental extensions.
 #[allow(lint(self_transfer))]
 module nft_marketplace::clothing_store {
     use iota::package;
diff --git a/docs/examples/move/nft_marketplace/sources/nft_marketplace.move b/docs/examples/move/nft_marketplace/sources/marketplace_extension.move
similarity index 96%
rename from docs/examples/move/nft_marketplace/sources/nft_marketplace.move
rename to docs/examples/move/nft_marketplace/sources/marketplace_extension.move
index 6c994dadce3..54113826d0d 100644
--- a/docs/examples/move/nft_marketplace/sources/nft_marketplace.move
+++ b/docs/examples/move/nft_marketplace/sources/marketplace_extension.move
@@ -1,4 +1,4 @@
-module nft_marketplace::nft_marketplace {
+module nft_marketplace::marketplace_extension {
     // iota imports
     use iota::{
         kiosk::{Kiosk, KioskOwnerCap, purchase},
@@ -17,6 +17,7 @@ module nft_marketplace::nft_marketplace {
     // === Errors ===
     const EExtensionNotInstalled: u64 = 0;
     const EWrongPaymentRoyalties: u64 = 1;
+    const ENotEnoughPaymentAmount: u64 = 2;
 
     // === Constants ===
     const ALLOW_PLACE_AND_LOCK: u128 = 11;
@@ -64,6 +65,7 @@ module nft_marketplace::nft_marketplace {
         let ItemPrice { price } = take_from_bag<T, Listed>(kiosk,  Listed { id: item_id });
         
         let payment_amount_value = payment.value();
+        assert!(payment_amount_value >= price, ENotEnoughPaymentAmount);
         let coin_price = payment.split(price, ctx);
         
         let (item, mut transfer_request) = purchase(kiosk, item_id, coin_price);
diff --git a/docs/examples/move/nft_marketplace/sources/rental_extension.move b/docs/examples/move/nft_marketplace/sources/rental_extension.move
index f8502c11dc6..e971e79b210 100644
--- a/docs/examples/move/nft_marketplace/sources/rental_extension.move
+++ b/docs/examples/move/nft_marketplace/sources/rental_extension.move
@@ -155,7 +155,8 @@ module nft_marketplace::rental_extension {
     ) {
         assert!(kiosk_extension::is_installed<Rental>(kiosk), EExtensionNotInstalled);
 
-        assert!(price_per_day * duration <= MAX_VALUE_U64, ETotalPriceOverflow);
+        let max_price_per_day = MAX_VALUE_U64 / duration;
+        assert!(price_per_day <= max_price_per_day, ETotalPriceOverflow);
         kiosk.set_owner(cap, ctx);
         kiosk.list<T>(cap, item_id, 0);
 
diff --git a/docs/examples/move/nft_marketplace/tests/marketplace_extension_tests.move b/docs/examples/move/nft_marketplace/tests/marketplace_extension_tests.move
new file mode 100644
index 00000000000..d0e97eb016a
--- /dev/null
+++ b/docs/examples/move/nft_marketplace/tests/marketplace_extension_tests.move
@@ -0,0 +1,223 @@
+
+#[test_only]
+module nft_marketplace::marketplace_extension_tests {
+
+    use nft_marketplace::test_utils::{create_kiosk, create_transfer_policy};
+    use kiosk::royalty_rule as royalty_rule;
+    use nft_marketplace::marketplace_extension::Self;
+    use iota::{
+        iota::IOTA,
+        coin::Coin,
+        kiosk::Kiosk,
+        kiosk_test_utils,
+        package::Self,
+        test_scenario::{Self as ts, Scenario},
+        transfer_policy::{TransferPolicy, TransferPolicyCap}
+    };
+
+    const CREATOR: address = @0xCCCC;
+    const SELLER: address = @0xAAAA;
+    const BUYER: address = @0xBBBB;
+
+    public struct T has key, store { id: UID }
+    public struct WITNESS has drop {}
+
+
+    // ==================== Happy path scenarios ====================
+
+    #[test]
+    fun test_buy_item_without_royalties() {
+        let mut ts = ts::begin(SELLER);
+
+        let item = T { id: object::new(ts.ctx()) };
+        let item_id = object::id(&item);
+
+        let witness = WITNESS {};
+        let publisher = package::test_claim(witness, ts.ctx());
+
+        let seller_kiosk_id = create_kiosk(SELLER, ts.ctx());
+        let item_price = 50000;
+
+        create_transfer_policy<T>( CREATOR, &publisher, ts.ctx());
+        install_ext(&mut ts, SELLER, seller_kiosk_id);
+        setup_price<T>(&mut ts, SELLER, seller_kiosk_id, item, item_price);
+        let payment = kiosk_test_utils::get_iota(item_price, ts.ctx());
+        buy<T>(&mut ts, BUYER, seller_kiosk_id, item_id, payment);
+
+        publisher.burn_publisher();
+        ts.end();
+    }
+
+    #[test]
+    fun test_buy_item_with_royalties() {
+        let mut ts = ts::begin(SELLER);
+
+        let item = T { id: object::new(ts.ctx()) };
+        let item_id = object::id(&item);
+
+        let witness = WITNESS {};
+        let publisher = package::test_claim(witness, ts.ctx());
+
+        let seller_kiosk_id = create_kiosk(SELLER, ts.ctx());
+        let item_price = 50000;
+        let royalty_amount_bp = 5000;
+        let royalty_min_amount = 2000;
+        create_transfer_policy<T>( CREATOR, &publisher, ts.ctx());
+        add_royalty_rule(&mut ts, CREATOR, royalty_amount_bp, royalty_min_amount);
+        install_ext(&mut ts, SELLER, seller_kiosk_id);
+        setup_price<T>(&mut ts, SELLER, seller_kiosk_id, item, item_price);
+        let mut payment = kiosk_test_utils::get_iota(item_price, ts.ctx());
+        let royalty_amount_to_pay = get_royalty_fee_amount(&ts, item_price);
+        let royalties_coin = kiosk_test_utils::get_iota(royalty_amount_to_pay, ts.ctx());
+        payment.join(royalties_coin);
+        buy<T>(&mut ts, BUYER, seller_kiosk_id, item_id, payment);
+
+        publisher.burn_publisher();
+        ts.end();
+    }
+
+    #[test]
+    fun test_get_item_price() {
+        let mut ts = ts::begin(SELLER);
+
+        let item = T { id: object::new(ts.ctx()) };
+        let item_id = object::id(&item);
+
+        let seller_kiosk_id = create_kiosk(SELLER, ts.ctx());
+        let item_price = 50000;
+
+        install_ext(&mut ts, SELLER, seller_kiosk_id);
+        setup_price<T>(&mut ts, SELLER, seller_kiosk_id, item, item_price);
+        ts.next_tx(SELLER);
+        let kiosk: Kiosk = ts.take_shared_by_id(seller_kiosk_id);
+        let storage_item_price = marketplace_extension::get_item_price<T>(&kiosk, item_id);
+      
+        assert!(storage_item_price == item_price);
+
+        ts::return_shared(kiosk);
+        ts.end();
+    }
+
+    // ==================== Negative scenarios ====================
+
+    #[test]
+    #[expected_failure(abort_code = marketplace_extension::EWrongPaymentRoyalties)]
+    fun test_buy_item_with_royalties_wrong_royalties_amount() {
+        let mut ts = ts::begin(SELLER);
+
+        let item = T { id: object::new(ts.ctx()) };
+        let item_id = object::id(&item);
+
+        let witness = WITNESS {};
+        let publisher = package::test_claim(witness, ts.ctx());
+
+        let seller_kiosk_id = create_kiosk(SELLER, ts.ctx());
+        let item_price = 50000;
+        let royalty_amount_bp = 5000;
+        let royalty_min_amount = 2000;
+        create_transfer_policy<T>( CREATOR, &publisher, ts.ctx());
+        add_royalty_rule(&mut ts, CREATOR, royalty_amount_bp, royalty_min_amount);
+        install_ext(&mut ts, SELLER, seller_kiosk_id);
+        setup_price<T>(&mut ts, SELLER, seller_kiosk_id, item, item_price);
+        let mut payment = kiosk_test_utils::get_iota(item_price, ts.ctx());
+        let royalty_amount_to_pay = get_royalty_fee_amount(&ts, 1000);
+        let royalties_coin = kiosk_test_utils::get_iota(royalty_amount_to_pay, ts.ctx());
+        payment.join(royalties_coin);
+        buy<T>(&mut ts, BUYER, seller_kiosk_id, item_id, payment);
+
+        publisher.burn_publisher();
+        ts.end();
+    }
+
+    #[test]
+    #[expected_failure(abort_code = marketplace_extension::ENotEnoughPaymentAmount)]
+    fun test_buy_item_without_royalties_wrong_price() {
+        let mut ts = ts::begin(SELLER);
+
+        let item = T { id: object::new(ts.ctx()) };
+        let item_id = object::id(&item);
+
+        let witness = WITNESS {};
+        let publisher = package::test_claim(witness, ts.ctx());
+
+        let seller_kiosk_id = create_kiosk(SELLER, ts.ctx());
+        let item_price = 50000;
+
+        create_transfer_policy<T>( CREATOR, &publisher, ts.ctx());
+        install_ext(&mut ts, SELLER, seller_kiosk_id);
+        setup_price<T>(&mut ts, SELLER, seller_kiosk_id, item, item_price);
+        let payment = kiosk_test_utils::get_iota(40000, ts.ctx());
+        buy<T>(&mut ts, BUYER, seller_kiosk_id, item_id, payment);
+
+        publisher.burn_publisher();
+        ts.end();
+    }
+
+    #[test]
+    #[expected_failure(abort_code = marketplace_extension::EExtensionNotInstalled)]
+    fun test_set_price_without_extension() {
+        let mut ts = ts::begin(SELLER);
+
+        let item = T { id: object::new(ts.ctx()) };
+
+        let seller_kiosk_id = create_kiosk(SELLER, ts.ctx());
+        let item_price = 50000;
+
+        setup_price<T>(&mut ts, SELLER, seller_kiosk_id, item, item_price);
+
+        ts.end();
+    }
+    // ==================== Helper methods ====================
+
+
+    fun setup_price<T: key + store>(ts: &mut Scenario, sender: address, seller_kiosk_id: ID, item: T, price: u64) {
+        ts.next_tx(sender);
+        let mut kiosk: Kiosk = ts.take_shared_by_id(seller_kiosk_id);
+        let kiosk_cap = ts.take_from_sender();
+
+        marketplace_extension::set_price<T>(&mut kiosk, &kiosk_cap, item, price);
+
+        ts::return_shared(kiosk);
+        ts.return_to_sender(kiosk_cap);
+    }
+
+    fun install_ext(ts: &mut Scenario, sender: address, kiosk_id: ID) {
+        ts.next_tx(sender);
+        let mut kiosk: Kiosk = ts.take_shared_by_id(kiosk_id);
+        let kiosk_cap = ts.take_from_sender();
+
+        marketplace_extension::install(&mut kiosk, &kiosk_cap, ts.ctx());
+
+        ts::return_shared(kiosk);
+        ts.return_to_sender(kiosk_cap);
+    }
+
+    fun buy<T: key + store>(ts: &mut Scenario, buyer: address, seller_kiosk_id: ID, item_id: ID, payment: Coin<IOTA>) {
+        ts.next_tx(buyer);
+        let mut kiosk: Kiosk = ts.take_shared_by_id(seller_kiosk_id);
+        let mut policy: TransferPolicy<T> = ts.take_shared();
+
+        let item = marketplace_extension::buy_item<T>(&mut kiosk, &mut policy, item_id, payment, ts.ctx());
+        transfer::public_transfer<T>(item, buyer);
+        ts::return_shared(kiosk);
+        ts::return_shared(policy);
+     }
+
+    fun add_royalty_rule(ts: &mut Scenario, sender: address, amount_bp: u16, min_amount: u64) {
+        ts.next_tx(sender);
+        let mut transfer_policy: TransferPolicy<T> = ts.take_shared();
+        let policy_cap: TransferPolicyCap<T> = ts.take_from_sender();
+
+        marketplace_extension::setup_royalties(&mut transfer_policy, &policy_cap, amount_bp, min_amount);
+
+        ts::return_shared(transfer_policy);
+        ts.return_to_sender(policy_cap);
+    }
+
+    fun get_royalty_fee_amount(ts: &Scenario, price: u64): u64 {
+        let transfer_policy: TransferPolicy<T> = ts.take_shared();
+        let royalty_fee = royalty_rule::fee_amount(&transfer_policy, price);
+        ts::return_shared(transfer_policy);
+        royalty_fee
+    }
+}
\ No newline at end of file
diff --git a/docs/examples/move/nft_marketplace/tests/nft_marketplace_tests.move b/docs/examples/move/nft_marketplace/tests/nft_marketplace_tests.move
deleted file mode 100644
index 614ef2a0778..00000000000
--- a/docs/examples/move/nft_marketplace/tests/nft_marketplace_tests.move
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-#[test_only]
-module nft_marketplace::nft_marketplace_tests {
-    // uncomment this line to import the module
-    // use nft_marketplace::nft_marketplace;
-
-    const ENotImplemented: u64 = 0;
-
-    #[test]
-    fun test_nft_marketplace() {
-        // pass
-    }
-
-    #[test, expected_failure(abort_code = ::nft_marketplace::nft_marketplace_tests::ENotImplemented)]
-    fun test_nft_marketplace_fail() {
-        abort ENotImplemented
-    }
-}
-*/
diff --git a/docs/examples/move/nft_marketplace/tests/rental_extension_tests.move b/docs/examples/move/nft_marketplace/tests/rental_extension_tests.move
new file mode 100644
index 00000000000..8fabfd78d7d
--- /dev/null
+++ b/docs/examples/move/nft_marketplace/tests/rental_extension_tests.move
@@ -0,0 +1,362 @@
+
+#[test_only]
+module nft_marketplace::rental_extension_tests {
+
+    use kiosk::kiosk_lock_rule as lock_rule;
+    use nft_marketplace::test_utils::{create_kiosk, create_transfer_policy};
+    use nft_marketplace::rental_extension::{Self, ProtectedTP, RentalPolicy};
+    use iota::{
+        clock::{Self, Clock},
+        kiosk::{Kiosk, KioskOwnerCap},
+        kiosk_test_utils,
+        package::{Self, Publisher},
+        test_scenario::{Self as ts, Scenario},
+        transfer_policy::{TransferPolicy, TransferPolicyCap}
+    };
+
+    const CREATOR: address = @0xCCCC;
+    const RENTER: address = @0xAAAA;
+    const BORROWER: address = @0xBBBB;
+    const THIEF: address = @0xDDDD;
+
+    public struct T has key, store { id: UID }
+    public struct WITNESS has drop {}
+
+
+// ==================== Happy path scenarios ====================
+
+    #[test]
+    fun test_rent_with_extension() {
+        let mut ts = ts::begin(BORROWER);
+
+        let item = T { id: object::new(ts.ctx()) };
+        let item_id = object::id(&item);
+
+        let clock = clock::create_for_testing(ts.ctx());
+
+        let witness = WITNESS {};
+        let publisher = package::test_claim(witness, ts.ctx());
+
+        let renter_kiosk_id = create_kiosk(RENTER, ts.ctx());
+        let borrower_kiosk_id = create_kiosk(BORROWER, ts.ctx());
+
+        setup(&mut ts, RENTER, &publisher, 50);
+        install_ext(&mut ts, RENTER, renter_kiosk_id);
+        place_in_kiosk(&mut ts, RENTER, renter_kiosk_id, item);
+        list_for_rent(&mut ts, RENTER, renter_kiosk_id, item_id, 10, 10);
+        install_ext(&mut ts, BORROWER, borrower_kiosk_id);
+        rent(&mut ts, BORROWER, renter_kiosk_id, borrower_kiosk_id, item_id, 100, &clock);
+
+        clock.destroy_for_testing();
+        publisher.burn_publisher();
+        ts.end();
+    }
+
+    #[test]
+    fun test_reclaim() {
+        let mut ts = ts::begin(BORROWER);
+
+        let item = T { id: object::new(ts.ctx()) };
+        let item_id = object::id(&item);
+
+        let mut clock = clock::create_for_testing(ts.ctx());
+
+        let witness = WITNESS {};
+        let publisher = package::test_claim(witness, ts.ctx());
+
+        let renter_kiosk_id = create_kiosk(RENTER, ts.ctx());
+        let borrower_kiosk_id = create_kiosk(BORROWER, ts.ctx());
+
+        create_transfer_policy<T>( CREATOR, &publisher, ts.ctx());
+        setup(&mut ts, RENTER, &publisher, 50);
+        place_in_kiosk(&mut ts, RENTER, renter_kiosk_id, item);
+        install_ext(&mut ts, RENTER, renter_kiosk_id);
+        list_for_rent(&mut ts, RENTER, renter_kiosk_id, item_id, 10, 10);
+        install_ext(&mut ts, BORROWER, borrower_kiosk_id);
+        rent(&mut ts, BORROWER, renter_kiosk_id, borrower_kiosk_id, item_id, 100, &clock);
+        reclaim(&mut ts, RENTER, renter_kiosk_id, borrower_kiosk_id, item_id, 432000000, &mut clock);
+
+        clock.destroy_for_testing();
+        publisher.burn_publisher();
+        ts.end();
+    }
+
+    // ==================== Negative scenarios ====================
+
+    #[test]
+    #[expected_failure(abort_code = rental_extension::EExtensionNotInstalled)]
+    fun test_rent_without_extension() {
+        let mut ts = ts::begin(BORROWER);
+
+        let item = T { id: object::new(ts.ctx()) };
+        let item_id = object::id(&item);
+
+        let clock = clock::create_for_testing(ts.ctx());
+
+        let witness = WITNESS {};
+        let publisher = package::test_claim(witness, ts.ctx());
+
+        let renter_kiosk_id = create_kiosk(RENTER, ts.ctx());
+        let borrower_kiosk_id = create_kiosk(BORROWER, ts.ctx());
+
+        setup(&mut ts, RENTER, &publisher, 50);
+        place_in_kiosk(&mut ts, RENTER, renter_kiosk_id, item);
+        install_ext(&mut ts, RENTER, renter_kiosk_id);
+        list_for_rent(&mut ts, RENTER, renter_kiosk_id, item_id, 10, 10);
+        rent(&mut ts, BORROWER, renter_kiosk_id, borrower_kiosk_id, item_id, 100, &clock);
+        abort 0xbad
+    }
+
+    #[test]
+    #[expected_failure(abort_code = rental_extension::ENotEnoughCoins)]
+    fun test_rent_with_not_enough_coins() {
+        let mut ts = ts::begin(BORROWER);
+
+        let item = T { id: object::new(ts.ctx()) };
+        let item_id = object::id(&item);
+
+        let clock = clock::create_for_testing(ts.ctx());
+
+        let witness = WITNESS {};
+        let publisher = package::test_claim(witness, ts.ctx());
+
+        let renter_kiosk_id = create_kiosk(RENTER, ts.ctx());
+        let borrower_kiosk_id = create_kiosk(BORROWER, ts.ctx());
+
+        setup(&mut ts, RENTER, &publisher, 50);
+        place_in_kiosk(&mut ts, RENTER, renter_kiosk_id, item);
+        install_ext(&mut ts, RENTER, renter_kiosk_id);
+        list_for_rent(&mut ts, RENTER, renter_kiosk_id, item_id, 10, 10);
+        install_ext(&mut ts, BORROWER, borrower_kiosk_id);
+        rent(&mut ts, BORROWER, renter_kiosk_id, borrower_kiosk_id, item_id, 10, &clock);
+        abort 0xbad
+    }
+
+    #[test]
+    #[expected_failure(abort_code = rental_extension::ETotalPriceOverflow)]
+    fun test_rent_with_overflow() {
+        let mut ts = ts::begin(BORROWER);
+
+        let item = T { id: object::new(ts.ctx()) };
+        let item_id = object::id(&item);
+
+        let clock = clock::create_for_testing(ts.ctx());
+
+        let witness = WITNESS {};
+        let publisher = package::test_claim(witness, ts.ctx());
+
+        let renter_kiosk_id = create_kiosk(RENTER, ts.ctx());
+        let borrower_kiosk_id = create_kiosk(BORROWER, ts.ctx());
+
+        setup(&mut ts, RENTER, &publisher, 50);
+        place_in_kiosk(&mut ts, RENTER, renter_kiosk_id, item);
+        install_ext(&mut ts, RENTER, renter_kiosk_id);
+        list_for_rent(&mut ts, RENTER, renter_kiosk_id, item_id, 100, 1844674407370955160);
+        install_ext(&mut ts, BORROWER, borrower_kiosk_id);
+        rent(&mut ts, BORROWER, renter_kiosk_id, borrower_kiosk_id, item_id, 100, &clock);
+        abort 0xbad
+    }
+
+    #[test]
+    fun test_reclaim_locked() {
+        let mut ts = ts::begin(RENTER);
+
+        let item = T { id: object::new(ts.ctx()) };
+        let item_id = object::id(&item);
+
+        let mut clock = clock::create_for_testing(ts.ctx());
+
+        let witness = WITNESS {};
+        let publisher = package::test_claim(witness, ts.ctx());
+
+        let renter_kiosk_id = create_kiosk(RENTER, ts.ctx());
+        let borrower_kiosk_id = create_kiosk(BORROWER, ts.ctx());
+
+        create_transfer_policy<T>(CREATOR, &publisher, ts.ctx());
+        add_lock_rule(&mut ts, CREATOR);
+        setup(&mut ts, RENTER, &publisher, 50);
+        lock_in_kiosk(&mut ts, RENTER, renter_kiosk_id, item);
+        install_ext(&mut ts, RENTER, renter_kiosk_id);
+        list_for_rent(&mut ts, RENTER, renter_kiosk_id, item_id, 10, 10);
+        install_ext(&mut ts, BORROWER, borrower_kiosk_id);
+        rent(&mut ts, BORROWER, renter_kiosk_id, borrower_kiosk_id, item_id, 100, &clock);
+        reclaim(&mut ts, RENTER, renter_kiosk_id, borrower_kiosk_id, item_id, 432000000, &mut clock);
+
+        clock.destroy_for_testing();
+        publisher.burn_publisher();
+        ts.end();
+    }
+
+    #[test]
+    #[expected_failure(abort_code = rental_extension::EInvalidKiosk)]
+    fun test_reclaim_wrong_kiosk() {
+        let mut ts = ts::begin(BORROWER);
+
+        let item = T { id: object::new(ts.ctx()) };
+        let item_id = object::id(&item);
+
+        let mut clock = clock::create_for_testing(ts.ctx());
+
+        let witness = WITNESS {};
+        let publisher = package::test_claim(witness, ts.ctx());
+
+        let renter_kiosk_id = create_kiosk(RENTER, ts.ctx());
+        let borrower_kiosk_id = create_kiosk(BORROWER, ts.ctx());
+        let thief_kiosk_id = create_kiosk(THIEF, ts.ctx());
+
+        create_transfer_policy<T>(CREATOR, &publisher, ts.ctx());
+        setup(&mut ts, RENTER, &publisher, 50);
+        place_in_kiosk(&mut ts, RENTER, renter_kiosk_id, item);
+        install_ext(&mut ts, RENTER, renter_kiosk_id);
+        list_for_rent(&mut ts, RENTER, renter_kiosk_id, item_id, 10, 10);
+        install_ext(&mut ts, BORROWER, borrower_kiosk_id);
+        rent(&mut ts, BORROWER, renter_kiosk_id, borrower_kiosk_id, item_id, 100, &clock);
+        install_ext(&mut ts, THIEF, thief_kiosk_id);
+        reclaim(&mut ts, RENTER, thief_kiosk_id, borrower_kiosk_id, item_id, 432000000, &mut clock);
+        abort 0xbad
+    }
+
+    // ==================== Helper methods ====================
+
+    fun place_in_kiosk(ts: &mut Scenario, sender: address, kiosk_id: ID, item: T) {
+        ts.next_tx(sender);
+        let mut kiosk: Kiosk = ts.take_shared_by_id(kiosk_id);
+        let kiosk_cap: KioskOwnerCap = ts.take_from_sender();
+
+        kiosk.place(&kiosk_cap, item);
+
+        ts::return_shared(kiosk);
+        ts.return_to_sender(kiosk_cap);
+    }
+
+
+    fun list_for_rent(
+        ts: &mut Scenario,
+        sender: address,
+        kiosk_id: ID,
+        item_id: ID,
+        duration: u64,
+        price: u64,
+    ) {
+        ts.next_tx(sender);
+        let mut kiosk: Kiosk = ts.take_shared_by_id(kiosk_id);
+        let kiosk_cap: KioskOwnerCap = ts.take_from_sender();
+        let protected_tp: ProtectedTP<T> = ts.take_shared();
+
+        rental_extension::list(
+            &mut kiosk,
+            &kiosk_cap,
+            &protected_tp,
+            item_id,
+            duration,
+            price,
+            ts.ctx(),
+        );
+
+        ts::return_shared(kiosk);
+        ts.return_to_sender(kiosk_cap);
+        ts::return_shared(protected_tp);
+    }
+
+    fun rent(
+        ts: &mut Scenario,
+        sender: address,
+        renter_kiosk_id: ID,
+        borrower_kiosk_id: ID,
+        item_id: ID,
+        coin_amount: u64,
+        clock: &Clock,
+    ) {
+        ts.next_tx(sender);
+
+        let mut borrower_kiosk: Kiosk = ts.take_shared_by_id(borrower_kiosk_id);
+        let mut renter_kiosk: Kiosk = ts.take_shared_by_id(renter_kiosk_id);
+        let mut rental_policy: RentalPolicy<T> = ts.take_shared();
+
+        let coin = kiosk_test_utils::get_iota(coin_amount, ts.ctx());
+
+        rental_extension::rent<T>(
+            &mut renter_kiosk,
+            &mut borrower_kiosk,
+            &mut rental_policy,
+            item_id,
+            coin,
+            clock,
+            ts.ctx(),
+        );
+
+        ts::return_shared(borrower_kiosk);
+        ts::return_shared(renter_kiosk);
+        ts::return_shared(rental_policy);
+    }
+
+    fun setup(ts: &mut Scenario, sender: address, publisher: &Publisher, amount_bp: u64) {
+        ts.next_tx(sender);
+        rental_extension::setup_renting<T>(publisher, amount_bp, ts.ctx());
+    }
+
+    fun reclaim(
+        ts: &mut Scenario,
+        sender: address,
+        renter_kiosk_id: ID,
+        borrower_kiosk_id: ID,
+        item_id: ID,
+        tick: u64,
+        clock: &mut Clock,
+    ) {
+        ts.next_tx(sender);
+        let mut borrower_kiosk: Kiosk = ts.take_shared_by_id(borrower_kiosk_id);
+        let mut renter_kiosk: Kiosk = ts.take_shared_by_id(renter_kiosk_id);
+        let policy: TransferPolicy<T> = ts.take_shared();
+
+        clock.increment_for_testing(tick);
+        rental_extension::reclaim(
+            &mut renter_kiosk,
+            &mut borrower_kiosk,
+            &policy,
+            clock,
+            item_id,
+            ts.ctx(),
+        );
+
+        ts::return_shared(policy);
+        ts::return_shared(borrower_kiosk);
+        ts::return_shared(renter_kiosk);
+    }
+
+    fun add_lock_rule(ts: &mut Scenario, sender: address) {
+        ts.next_tx(sender);
+        let mut transfer_policy: TransferPolicy<T> = ts.take_shared();
+        let policy_cap: TransferPolicyCap<T> = ts.take_from_sender();
+
+        lock_rule::add(&mut transfer_policy, &policy_cap);
+
+        ts::return_shared(transfer_policy);
+        ts.return_to_sender(policy_cap);
+    }
+
+    fun lock_in_kiosk(ts: &mut Scenario, sender: address, kiosk_id: ID, item: T) {
+        ts.next_tx(sender);
+
+        let mut kiosk: Kiosk = ts.take_shared_by_id(kiosk_id);
+        let kiosk_cap: KioskOwnerCap = ts.take_from_sender();
+        let transfer_policy: TransferPolicy<T> = ts.take_shared();
+
+        kiosk.lock(&kiosk_cap, &transfer_policy, item);
+
+        ts::return_shared(kiosk);
+        ts.return_to_sender(kiosk_cap);
+        ts::return_shared(transfer_policy);
+    }
+
+    fun install_ext(ts: &mut Scenario, sender: address, kiosk_id: ID) {
+        ts.next_tx(sender);
+        let mut kiosk: Kiosk = ts.take_shared_by_id(kiosk_id);
+        let kiosk_cap = ts.take_from_sender();
+
+        rental_extension::install(&mut kiosk, &kiosk_cap, ts.ctx());
+
+        ts::return_shared(kiosk);
+        ts.return_to_sender(kiosk_cap);
+}
+}
diff --git a/docs/examples/move/nft_marketplace/tests/utils.move b/docs/examples/move/nft_marketplace/tests/utils.move
new file mode 100644
index 00000000000..01498370bcc
--- /dev/null
+++ b/docs/examples/move/nft_marketplace/tests/utils.move
@@ -0,0 +1,24 @@
+#[test_only]
+module nft_marketplace::test_utils {
+    use iota::{
+        kiosk_test_utils,
+        package::Publisher,
+        transfer_policy::Self
+    };
+
+
+    public fun create_transfer_policy<T>(sender: address, publisher: &Publisher, ctx: &mut TxContext) {
+        let (transfer_policy, policy_cap) = transfer_policy::new<T>(publisher, ctx);
+        transfer::public_share_object(transfer_policy);
+        transfer::public_transfer(policy_cap, sender);
+    }
+
+    public fun create_kiosk(sender: address, ctx: &mut TxContext): ID {
+        let (kiosk, kiosk_cap) = kiosk_test_utils::get_kiosk(ctx);
+        let kiosk_id = object::id(&kiosk);
+        transfer::public_share_object(kiosk);
+        transfer::public_transfer(kiosk_cap, sender);
+
+        kiosk_id
+}
+}
\ No newline at end of file

From 340cb12351b8440f18aab670cd893189c2d5422a Mon Sep 17 00:00:00 2001
From: Dkwcs <pavlo.botnar@gmail.com>
Date: Thu, 28 Nov 2024 12:05:06 +0200
Subject: [PATCH 12/12] Add minor comments to the buy_item method

---
 .../sources/marketplace_extension.move         | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/docs/examples/move/nft_marketplace/sources/marketplace_extension.move b/docs/examples/move/nft_marketplace/sources/marketplace_extension.move
index 54113826d0d..0531c5488a3 100644
--- a/docs/examples/move/nft_marketplace/sources/marketplace_extension.move
+++ b/docs/examples/move/nft_marketplace/sources/marketplace_extension.move
@@ -62,20 +62,34 @@ module nft_marketplace::marketplace_extension {
     /// Buy listed item with the indicated price and pay royalties if needed
     public fun buy_item<T: key + store>(kiosk: &mut Kiosk, policy: &mut TransferPolicy<T>, item_id: object::ID, mut payment: Coin<IOTA>, ctx: &mut TxContext): T {
         assert!(kiosk_extension::is_installed<Marketplace>(kiosk), EExtensionNotInstalled);
+
+        // Get item price
         let ItemPrice { price } = take_from_bag<T, Listed>(kiosk,  Listed { id: item_id });
-        
+
+        // Compute the value of the coin in input
         let payment_amount_value = payment.value();
+
+        // If the payment_amount_value is less than the item price, the request is invalid.
         assert!(payment_amount_value >= price, ENotEnoughPaymentAmount);
+
+        // Prepare the payment coin for the purchase (if no royalties are present then the
+        // remaining balance will be 0 after this operation)
         let coin_price = payment.split(price, ctx);
-        
+
+        // Purchase and create the transfer request
         let (item, mut transfer_request) = purchase(kiosk, item_id, coin_price);
+
+        // If the royalty is present, then update the request with a royalty payment
         if (policy.has_rule<T, RoyaltyRule>()) { 
             let royalties_value = royalty_rule::fee_amount(policy, price);
             assert!(payment_amount_value == price + royalties_value, EWrongPaymentRoyalties);
             royalty_rule::pay(policy, &mut transfer_request, payment);
         } else {
+            // Else clean the input coin (if the input payment amount is not exact, this will fail)
             payment.destroy_zero();
         };
+
+        // Confirm the request
         transfer_policy::confirm_request(policy, transfer_request);
         item
     }