change naming

CHANGELOG.md

@@ -1,4 +1,4 @@
-### [0.3.0](https://github.com/ElvenTools/elven-tools-sft-smart-contract/releases/tag/v0.3.0) (2023-08-01)
+### [0.3.0](https://github.com/ElvenTools/elven-tools-sft-smart-contract/releases/tag/v0.3.0) (2023-08-03)
 - add pause/start buying SFTs endpoint
 - add change max tokens per address endpoint
 - respect max tokens per nonce and address setting when buying

README.md

@@ -27,8 +27,9 @@ Setup steps with the CLI:
 5. `elven-tools sft-minter set-roles`
 7. `elven-tools sft-minter create`  
 8. `elven-tools sft-minter start-selling`
----then---  
-- Check all available interaction commands: [SFT minter commands](https://www.elven.tools/docs/cli-commands.html#sft-minter-commands)
+---then---
+9. `elven-tools sft-minter buy` 
+10. check all available interaction commands: [SFT minter commands](https://www.elven.tools/docs/cli-commands.html#sft-minter-commands)
 
 (more to come, check the kanban todo [board](https://github.com/orgs/ElvenTools/projects/8))
 

output/elven-tools-sft-minter.abi.json

@@ -58,7 +58,7 @@
             ]
         },
         {
-            "name": "getTokensPerAddressTotal",
+            "name": "getAmountPerAddressTotal",
             "mutability": "readonly",
             "inputs": [
                 {
@@ -189,7 +189,7 @@
             "outputs": []
         },
         {
-            "name": "setNewTokensLimitPerAddress",
+            "name": "setNewAmountLimitPerAddress",
             "onlyOwner": true,
             "mutability": "mutable",
             "inputs": [

src/operations.rs

@@ -34,7 +34,7 @@ pub trait Operations: storage::Storage {
 
         let caller = self.blockchain().get_caller();
 
-        let tokens_per_address = self.tokens_per_address_total(token_nonce, &caller).get();
+        let tokens_per_address = self.amount_per_address_total(token_nonce, &caller).get();
         let tokens_limit_per_address = token_tag.max_per_address;
 
         let tokens_left_to_mint: BigUint;
@@ -76,10 +76,10 @@ pub trait Operations: storage::Storage {
         self.send()
             .direct(&owner, &payment_token, payment_nonce, &payment_amount);
 
-        let tokens_per_address_total = self.tokens_per_address_total(token_nonce, &caller).get();
+        let amount_per_address_total = self.amount_per_address_total(token_nonce, &caller).get();
 
-        self.tokens_per_address_total(token_nonce, &caller)
-            .set(tokens_per_address_total + amount_of_tokens);
+        self.amount_per_address_total(token_nonce, &caller)
+            .set(amount_per_address_total + amount_of_tokens);
     }
 
     // As an owner, claim Smart Contract balance - temporary solution for royalities, the SC has to be payable to be able to get royalties
@@ -114,8 +114,8 @@ pub trait Operations: storage::Storage {
     }
 
     #[only_owner]
-    #[endpoint(setNewTokensLimitPerAddress)]
-    fn set_new_tokens_limit_per_address(&self, token_nonce: u64, limit: BigUint) {
+    #[endpoint(setNewAmountLimitPerAddress)]
+    fn set_new_amount_limit_per_address(&self, token_nonce: u64, limit: BigUint) {
         let token_tag = self.token_tag(token_nonce).get();
 
         let new_token_tag = TokenTag {

src/storage.rs

@@ -23,9 +23,9 @@ pub trait Storage {
     #[storage_mapper("paused")]
     fn paused(&self, token_nonce: u64) -> SingleValueMapper<bool>;
 
-    #[view(getTokensPerAddressTotal)]
-    #[storage_mapper("tokensPerAddressTotal")]
-    fn tokens_per_address_total(
+    #[view(getAmountPerAddressTotal)]
+    #[storage_mapper("amountPerAddressTotal")]
+    fn amount_per_address_total(
         &self,
         token_nonce: u64,
         address: &ManagedAddress,

tests/elven_tools_sft_minter_sc_rust_test.rs

@@ -133,7 +133,7 @@ fn sft_minter_test() {
     setup
         .b_mock
         .execute_query(&setup.contract_wrapper, |sc| {
-            let query_result = sc.tokens_per_address_total(01u64, &managed_address!(&user_address)).get();
+            let query_result = sc.amount_per_address_total(01u64, &managed_address!(&user_address)).get();
 
             assert_eq!(query_result, managed_biguint!(2));
         })
@@ -216,7 +216,7 @@ fn sft_minter_test() {
             &setup.contract_wrapper,
             &rust_biguint!(0u64),
             |sc| {
-                sc.set_new_tokens_limit_per_address(01u64, managed_biguint!(20));
+                sc.set_new_amount_limit_per_address(01u64, managed_biguint!(20));
             },
         )
         .assert_ok();

wasm/src/lib.rs

@@ -22,14 +22,14 @@ multiversx_sc_wasm_adapter::endpoints! {
         getCollectionTokenId => collection_token_id
         getCollectionTokenName => collection_token_name
         isPaused => paused
-        getTokensPerAddressTotal => tokens_per_address_total
+        getAmountPerAddressTotal => amount_per_address_total
         issueToken => issue_token
         setLocalRoles => set_local_roles
         createToken => create_token
         buy => buy
         claimScFunds => claim_sc_funds
         setNewPrice => set_new_price
-        setNewTokensLimitPerAddress => set_new_tokens_limit_per_address
+        setNewAmountLimitPerAddress => set_new_amount_limit_per_address
         pauseSelling => pause_selling
         startSelling => start_selling
         getPrice => get_price