From c36474d58514605cff0e1dc88cee088efaa9056d Mon Sep 17 00:00:00 2001 From: Georgi Tsonev Date: Mon, 30 Sep 2024 16:06:07 +0300 Subject: [PATCH] fix gas formatting methods --- packages/near-sdk-js/lib/cli/cli.js | 3 ++- packages/near-sdk-js/lib/cli/utils.js | 3 ++- packages/near-sdk-js/src/cli/cli.ts | 3 ++- packages/near-sdk-js/src/cli/utils.ts | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/near-sdk-js/lib/cli/cli.js b/packages/near-sdk-js/lib/cli/cli.js index 0d255dea..6396dbaf 100755 --- a/packages/near-sdk-js/lib/cli/cli.js +++ b/packages/near-sdk-js/lib/cli/cli.js @@ -290,6 +290,7 @@ async function processMethod(account, contract, method, params) { Params: parsedParams, TotalGas: formatGas(tx.result.transaction_outcome.outcome.gas_burnt + tx.result.receipts_outcome[0].outcome.gas_burnt + - tx.result.receipts_outcome[1].outcome.gas_burnt) + // TODO: remove after near-workspaces is updated + (tx.result.receipts_outcome[1].outcome.gas_burnt || 0)) }; } diff --git a/packages/near-sdk-js/lib/cli/utils.js b/packages/near-sdk-js/lib/cli/utils.js index 31cec769..77f6c61e 100644 --- a/packages/near-sdk-js/lib/cli/utils.js +++ b/packages/near-sdk-js/lib/cli/utils.js @@ -100,7 +100,8 @@ export function parseNamedArgs(args) { export function logTotalGas(r) { console.log('Total gas used: ', formatGas(r.result.transaction_outcome.outcome.gas_burnt + r.result.receipts_outcome[0].outcome.gas_burnt + - r.result.receipts_outcome[1].outcome.gas_burnt), '\n'); + // TODO: remove after near-workspaces is updated + (r.result.receipts_outcome[1].outcome.gas_burnt || 0)), '\n'); } export function formatGas(gas) { if (gas < 10 ** 12) { diff --git a/packages/near-sdk-js/src/cli/cli.ts b/packages/near-sdk-js/src/cli/cli.ts index 09ce800c..cf3b11ca 100644 --- a/packages/near-sdk-js/src/cli/cli.ts +++ b/packages/near-sdk-js/src/cli/cli.ts @@ -467,7 +467,8 @@ async function processMethod(account, contract, method, params) { TotalGas: formatGas( tx.result.transaction_outcome.outcome.gas_burnt + tx.result.receipts_outcome[0].outcome.gas_burnt + - tx.result.receipts_outcome[1].outcome.gas_burnt + // TODO: remove after near-workspaces is updated + (tx.result.receipts_outcome[1].outcome.gas_burnt || 0) ) } } \ No newline at end of file diff --git a/packages/near-sdk-js/src/cli/utils.ts b/packages/near-sdk-js/src/cli/utils.ts index 0eb5231b..dd5956ae 100644 --- a/packages/near-sdk-js/src/cli/utils.ts +++ b/packages/near-sdk-js/src/cli/utils.ts @@ -152,7 +152,8 @@ export function logTotalGas(r) { formatGas( r.result.transaction_outcome.outcome.gas_burnt + r.result.receipts_outcome[0].outcome.gas_burnt + - r.result.receipts_outcome[1].outcome.gas_burnt + // TODO: remove after near-workspaces is updated + (r.result.receipts_outcome[1].outcome.gas_burnt || 0) ), '\n' );