Fix inaccurate cost calculation (#1430)

* fix inaccurate cost calculation Signed-off-by: Petar Tonev <petar.tonev@limechain.tech> * rename misleading comment Signed-off-by: Petar Tonev <petar.tonev@limechain.tech> --------- Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
hiero-ledger · Feb 1, 2023 · 8122867 · 8122867
1 parent b585214
commit 8122867
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/examples/create-stateful-contract.js b/examples/create-stateful-contract.js
@@ -155,8 +155,7 @@ async function main() {
         .setGas(75000)
         // Set the function to call on the contract
         .setFunction("get_message")
-        // Set the query payment explicitly since sometimes automatic payment calculated
-        // is too low
+        // Set query payment explicitly
         .setQueryPayment(new Hbar(3))
         .executeWithSigner(wallet);
 

diff --git a/src/query/Query.js b/src/query/Query.js
@@ -173,7 +173,7 @@ export default class Query extends Executable {
      * @param {import("../client/Client.js").default<Channel, *>} client
      * @returns {Promise<Hbar>}
      */
-    getCost(client) {
+    async getCost(client) {
         // The node account IDs must be set to execute a cost query
         if (this._nodeAccountIds.isEmpty) {
             this._nodeAccountIds.setList(
@@ -187,8 +187,9 @@ export default class Query extends Executable {
 
         // Change the timestamp. Should we be doing this?
         this._timestamp = Date.now();
+        const cost = await COST_QUERY[0](this).execute(client);
 
-        return COST_QUERY[0](this).execute(client);
+        return Hbar.fromString(cost.toBigNumber().plus(0.001).toString());
     }
 
     /**
@@ -343,9 +344,7 @@ export default class Query extends Executable {
         // Not sure if we should be overwritting this field tbh.
         this._timestamp = Date.now();
 
-        if (!this._nodeAccountIds.locked) {
-            return;
-        }
+        this._nodeAccountIds.setLocked();
 
         // Generate the payment transactions
         for (const node of this._nodeAccountIds.list) {
@@ -357,7 +356,7 @@ export default class Query extends Executable {
                     ),
                     node,
                     this._isPaymentRequired() ? this._operator : null,
-                    /** @type {Hbar} */ (cost)
+                    /** @type {Hbar} */ (this._queryPayment)
                 )
             );
         }