diff --git a/src/bearbyWallet/BearbyAccount.ts b/src/bearbyWallet/BearbyAccount.ts index 28363a62..bf6255f0 100644 --- a/src/bearbyWallet/BearbyAccount.ts +++ b/src/bearbyWallet/BearbyAccount.ts @@ -139,6 +139,11 @@ export class BearbyAccount implements Provider { } } + private async minimalFee(): Promise { + const { minimalFee } = await this.networkInfos(); + return minimalFee; + } + public async callSC(params: CallSCParams): Promise { // await this.connect(); @@ -146,11 +151,7 @@ export class BearbyAccount implements Provider { const unsafeParameters = args instanceof Uint8Array ? args : Uint8Array.from(args.serialize()); - let fee = params?.fee; - if (!fee) { - const { minimalFee } = await this.networkInfos(); - fee = minimalFee; - } + let fee = params?.fee ?? (await this.minimalFee()); try { const operationId = await web3.contract.call({ @@ -179,11 +180,7 @@ export class BearbyAccount implements Provider { const unsafeParameters = args instanceof Uint8Array ? args : Uint8Array.from(args.serialize()); - let fee = params?.fee; - if (!fee) { - const { minimalFee } = await this.networkInfos(); - fee = minimalFee; - } + let fee = params?.fee ?? (await this.minimalFee()); try { // const res = await web3.contract.readSmartContract({ diff --git a/src/bearbyWallet/utils/network.ts b/src/bearbyWallet/utils/network.ts index b8f6fea1..e40ea0d9 100644 --- a/src/bearbyWallet/utils/network.ts +++ b/src/bearbyWallet/utils/network.ts @@ -1,5 +1,5 @@ import { web3 } from '@hicaru/bearby.js'; -import { Network } from '@massalabs/massa-web3'; +import { Mas, Network } from '@massalabs/massa-web3'; export const networkInfos = async (): Promise => { const { net } = await web3.wallet.network; @@ -12,6 +12,6 @@ export const networkInfos = async (): Promise => { return { name: net, chainId: res.result.chain_id, - minimalFee: res.result.minimal_fee, + minimalFee: Mas.fromString(res.result.minimal_fee), }; };