Merge pull request #87 from Itheum/d-david

update dependencies + different view method for different token type (nft/sft)
Itheum · Jan 12, 2024 · 4428a81 · 4428a81
2 parents 007983e + e7fa997
commit 4428a81
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 72 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "jest": "29.7.0",
     "ts-jest": "29.1.1",
     "tslint": "6.1.3",
-    "typedoc": "0.25.4",
+    "typedoc": "0.25.7",
     "typescript": "5.3.3"
   },
   "repository": {

diff --git a/src/abis/data-nft-lease.abi.json b/src/abis/data-nft-lease.abi.json
@@ -468,36 +468,16 @@
             ]
         },
         {
-            "name": "getSftsFrozenForAddress",
+            "name": "getFrozenNonces",
             "mutability": "readonly",
-            "inputs": [
-                {
-                    "name": "address",
-                    "type": "Address"
-                }
-            ],
+            "inputs": [],
             "outputs": [
                 {
                     "type": "variadic<u64>",
                     "multi_result": true
                 }
             ]
         },
-        {
-            "name": "getFrozenCount",
-            "mutability": "readonly",
-            "inputs": [
-                {
-                    "name": "address",
-                    "type": "Address"
-                }
-            ],
-            "outputs": [
-                {
-                    "type": "u32"
-                }
-            ]
-        },
         {
             "name": "isWhiteListEnabled",
             "mutability": "readonly",
@@ -792,13 +772,8 @@
             ]
         },
         {
-            "identifier": "frozenSftsPerAddress",
+            "identifier": "frozenNfts",
             "inputs": [
-                {
-                    "name": "address",
-                    "type": "Address",
-                    "indexed": true
-                },
                 {
                     "name": "nonce",
                     "type": "u64",
@@ -807,13 +782,8 @@
             ]
         },
         {
-            "identifier": "unfrozenSftsPerAddress",
+            "identifier": "unfrozenNfts",
             "inputs": [
-                {
-                    "name": "address",
-                    "type": "Address",
-                    "indexed": true
-                },
                 {
                     "name": "nonce",
                     "type": "u64",
@@ -1040,6 +1010,41 @@
                     "indexed": true
                 }
             ]
+        },
+        {
+            "identifier": "claimRoyalties",
+            "inputs": [
+                {
+                    "name": "claim_address",
+                    "type": "Address",
+                    "indexed": true
+                },
+                {
+                    "name": "token_identifier",
+                    "type": "EgldOrEsdtTokenIdentifier",
+                    "indexed": true
+                },
+                {
+                    "name": "nonce",
+                    "type": "u64",
+                    "indexed": true
+                },
+                {
+                    "name": "amount",
+                    "type": "BigUint",
+                    "indexed": true
+                },
+                {
+                    "name": "tax",
+                    "type": "BigUint",
+                    "indexed": true
+                },
+                {
+                    "name": "tax_address",
+                    "type": "Address",
+                    "indexed": true
+                }
+            ]
         }
     ],
     "hasCallback": true,

diff --git a/src/minter.ts b/src/minter.ts
@@ -137,35 +137,6 @@ export abstract class Minter {
     }
   }
 
-  /**
-   * Retrieves a list of nonces that are frozen for address
-   * @param address The address to check
-   */
-  async viewAddressFrozenNonces(address: IAddress): Promise<number[]> {
-    const interaction = this.contract.methodsExplicit.getSftsFrozenForAddress([
-      new AddressValue(address)
-    ]);
-    const query = interaction.buildQuery();
-    const queryResponse = await this.networkProvider.queryContract(query);
-    const endpointDefinition = interaction.getEndpoint();
-    const { firstValue, returnCode } = new ResultsParser().parseQueryResponse(
-      queryResponse,
-      endpointDefinition
-    );
-    if (returnCode.isSuccess()) {
-      const returnValue = firstValue?.valueOf();
-      const frozenNonces: number[] = returnValue.map((nonce: any) =>
-        nonce.toNumber()
-      );
-      return frozenNonces;
-    } else {
-      throw new ErrContractQuery(
-        'viewAddressFrozenNonces',
-        returnCode.toString()
-      );
-    }
-  }
-
   /**
    *  Creates a `burn` transaction
    * @param senderAddress the address of the user

diff --git a/src/nft-minter.ts b/src/nft-minter.ts
@@ -486,6 +486,29 @@ export class NftMinter extends Minter {
     }
   }
 
+  /**
+   * Retrieves a list of nonces that are frozen
+   */
+  async viewFrozenNonces(): Promise<number[]> {
+    const interaction = this.contract.methodsExplicit.getFrozenNonces();
+    const query = interaction.buildQuery();
+    const queryResponse = await this.networkProvider.queryContract(query);
+    const endpointDefinition = interaction.getEndpoint();
+    const { firstValue, returnCode } = new ResultsParser().parseQueryResponse(
+      queryResponse,
+      endpointDefinition
+    );
+    if (returnCode.isSuccess()) {
+      const returnValue = firstValue?.valueOf();
+      const frozenNonces: number[] = returnValue.map((nonce: any) =>
+        nonce.toNumber()
+      );
+      return frozenNonces;
+    } else {
+      throw new ErrContractQuery('viewFrozenNonces', returnCode.toString());
+    }
+  }
+
   /**
    * Retrieves the address with update attributes roles for contract collection
    */

diff --git a/src/sft-minter.ts b/src/sft-minter.ts
@@ -93,6 +93,35 @@ export class SftMinter extends Minter {
     }
   }
 
+  /**
+   * Retrieves a list of nonces that are frozen for address
+   * @param address The address to check
+   */
+  async viewAddressFrozenNonces(address: IAddress): Promise<number[]> {
+    const interaction = this.contract.methodsExplicit.getSftsFrozenForAddress([
+      new AddressValue(address)
+    ]);
+    const query = interaction.buildQuery();
+    const queryResponse = await this.networkProvider.queryContract(query);
+    const endpointDefinition = interaction.getEndpoint();
+    const { firstValue, returnCode } = new ResultsParser().parseQueryResponse(
+      queryResponse,
+      endpointDefinition
+    );
+    if (returnCode.isSuccess()) {
+      const returnValue = firstValue?.valueOf();
+      const frozenNonces: number[] = returnValue.map((nonce: any) =>
+        nonce.toNumber()
+      );
+      return frozenNonces;
+    } else {
+      throw new ErrContractQuery(
+        'viewAddressFrozenNonces',
+        returnCode.toString()
+      );
+    }
+  }
+
   /**
    * Creates an initialize contract transaction for the contract
    * @param senderAddress The address of the sender, must be the admin of the contract