move gasEstimation in publicJsonProvider

massalabs · Feb 17, 2025 · ba651d3 · ba651d3
1 parent 6bf0457
commit ba651d3
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 28 deletions.
diff --git a/src/provider/jsonRpcProvider/jsonRpcProvider.ts b/src/provider/jsonRpcProvider/jsonRpcProvider.ts
@@ -2,7 +2,6 @@ import {
   CallSCParams,
   DeploySCParams,
   ExecuteScParams,
-  GAS_ESTIMATION_TOLERANCE,
   Provider,
   ReadSCData,
   ReadSCParams,
@@ -13,7 +12,6 @@ import {
   Address,
   MAX_GAS_CALL,
   MIN_GAS_CALL,
-  minBigInt,
   populateDatastore,
   PublicAPI,
   PublicApiUrl,
@@ -35,7 +33,6 @@ import {
   OperationManager,
 } from '../../operation/operationManager'
 import { execute } from '../../basicElements/bytecode'
-import { U64_t } from '../../basicElements/serializers/number/u64'
 import { ErrorMaxGas, ErrorInsufficientBalance } from '../../errors'
 import { JsonRpcPublicProvider } from './jsonRpcPublicProvider'
 
@@ -287,30 +284,6 @@ export class JsonRpcProvider extends JsonRpcPublicProvider implements Provider {
     return manager.send(details)
   }
 
-  /**
-   * Returns the gas estimation for a given function.
-   *
-   * @remarks To avoid running out of gas, the gas estimation is increased by 20%.
-   *
-   * @param params - callSCParams.
-   * @throws If the read operation returns an error.
-   * @returns The gas estimation for the function.
-   */
-  protected async getGasEstimation(params: CallSCParams): Promise<U64_t> {
-    const result = await this.readSC(params)
-
-    if (result.info.error) {
-      throw new Error(result.info.error)
-    }
-
-    const gasCost = BigInt(result.info.gasCost)
-    return minBigInt(
-      // eslint-disable-next-line @typescript-eslint/no-magic-numbers
-      gasCost + (gasCost * GAS_ESTIMATION_TOLERANCE) / 100n,
-      MAX_GAS_CALL
-    )
-  }
-
   protected async checkAccountBalance(coins: Mas): Promise<void> {
     if (coins > 0n) {
       const balance = await this.client.getBalance(

diff --git a/src/provider/jsonRpcProvider/jsonRpcPublicProvider.ts b/src/provider/jsonRpcProvider/jsonRpcPublicProvider.ts
@@ -1,10 +1,18 @@
-import { NodeStatusInfo, PublicProvider, ReadSCData, ReadSCParams } from '..'
+import {
+  GAS_ESTIMATION_TOLERANCE,
+  NodeStatusInfo,
+  PublicProvider,
+  ReadSCData,
+  ReadSCParams,
+} from '..'
 import {
   Account,
   CHAIN_ID,
   DatastoreEntry,
   EventFilter,
   Mas,
+  MAX_GAS_CALL,
+  minBigInt,
   Network,
   NetworkName,
   PublicAPI,
@@ -14,6 +22,7 @@ import {
 import { rpcTypes as t } from '../../generated'
 import { OperationStatus } from '../../operation'
 import { formatNodeStatusObject } from '../../client/formatObjects'
+import { U64_t } from '../../basicElements/serializers/number/u64'
 
 export class JsonRpcPublicProvider implements PublicProvider {
   constructor(public client: PublicAPI) {}
@@ -113,4 +122,32 @@ export class JsonRpcPublicProvider implements PublicProvider {
     const entries: DatastoreEntry[] = keys.map((key) => ({ address, key }))
     return this.client.getDatastoreEntries(entries, final)
   }
+
+  /**
+   * Returns the gas estimation for a given function.
+   *
+   * @remarks To avoid running out of gas, the gas estimation is increased by 20%.
+   *
+   * @param params - ReadSCParams. caller must be provided
+   * @throws If the read operation returns an error.
+   * @returns The gas estimation for the operation execution.
+   */
+  public async getGasEstimation(params: ReadSCParams): Promise<U64_t> {
+    if (!params.caller) {
+      throw new Error('Caller must be provided for gas estimation')
+    }
+
+    const result = await this.readSC(params)
+
+    if (result.info.error) {
+      throw new Error(result.info.error)
+    }
+
+    const gasCost = BigInt(result.info.gasCost)
+    return minBigInt(
+      // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+      gasCost + (gasCost * GAS_ESTIMATION_TOLERANCE) / 100n,
+      MAX_GAS_CALL
+    )
+  }
 }