Merge pull request #270 from aeternity/fix-contract-call

Fix printing details of static call and improve tests

Author: davidyuk

.mocharc.cjs

@@ -1,4 +1,4 @@
 module.exports = {
   recursive: true,
-  timeout: '4s',
+  timeout: '3s',
 };

src/actions/aens.js

@@ -1,4 +1,4 @@
-import { isAddressValid, getDefaultPointerKey } from '@aeternity/aepp-sdk';
+import { isAddressValid, getDefaultPointerKey, isAuctionName } from '@aeternity/aepp-sdk';
 import { initSdkByWalletFile } from '../utils/cli.js';
 import { printTransaction } from '../utils/print.js';
 import { getNameEntry, validateName } from '../utils/helpers.js';
@@ -127,6 +127,11 @@ export async function fullClaim(walletPath, name, options) {
     nameFee,
   });
 
+  if (isAuctionName(name)) {
+    await printTransaction(nameInstance, json, aeSdk);
+    return;
+  }
+
   nonce = nonce && nonce + 1;
   const updateTx = await nameInstance.update(
     { account_pubkey: aeSdk.address },

src/actions/contract.js

@@ -122,9 +122,17 @@ export async function call(fn, args, walletPath, options) {
   });
   if (json) print(callResult);
   else {
-    await printTransaction(callResult.txData, json, aeSdk);
+    await printTransaction(
+      callStatic
+        ? { ...callResult, type: 'ContractCallTx', blockHash: 'N/A', signatures: 'N/A' }
+        : callResult.txData,
+      json,
+      aeSdk,
+    );
     print('----------------------Call info-----------------------');
-    const gasCoins = BigInt(callResult.result.gasUsed) * callResult.txData.tx.gasPrice;
+    const gasCoins =
+      BigInt(callResult.result.gasUsed) *
+      (callStatic ? BigInt(callResult.tx.gasPrice) : callResult.txData.tx.gasPrice);
     printTable([
       ['Gas used', `${callResult.result.gasUsed} (${formatCoins(gasCoins)})`],
       ['Return value (encoded)', callResult.result.returnValue],

src/utils/print.js

@@ -1,5 +1,11 @@
 import { Encoding, unpackTx, AbiVersion, VmVersion } from '@aeternity/aepp-sdk';
-import { decode, formatCoins, formatTtl as formatTtlUnbound, formatSeconds } from './helpers.js';
+import {
+  decode,
+  formatCoins,
+  formatTtl as formatTtlUnbound,
+  formatSeconds,
+  formatBlocks,
+} from './helpers.js';
 
 const JsonStringifyEs = (object, spaced) =>
   JSON.stringify(
@@ -81,10 +87,11 @@ function printTransactionSync(_tx, json, currentHeight) {
     txFieldRow(tx, 'Caller address', 'callerId'),
     // name
     txFieldRow(tx, 'Name ID', 'nameId'),
-    txFieldRow(tx, 'Name TTL', 'nameTtl', formatTtl),
+    txFieldRow(tx, 'Name TTL', 'nameTtl', formatBlocks),
     txFieldRow(tx, 'Name', 'name'),
     txFieldRow(tx, 'Name fee', 'nameFee', formatCoins),
     txFieldRow(tx, 'Name salt', 'nameSalt'),
+    txFieldRow(tx, 'Name salt', 'salt'),
   ];
 
   if ('pointers' in tx) {

test/account.js

@@ -1,11 +1,12 @@
 import fs from 'fs-extra';
 import { before, describe, it } from 'mocha';
-import { expect } from 'chai';
+import { expect, should } from 'chai';
 import prompts from 'prompts';
 import { resolve } from 'path';
 import { getSdk, executeProgram, WALLET_NAME } from './index.js';
 import { expectToMatchLines, toMatch } from './utils.js';
 
+should();
 const executeAccount = executeProgram.bind(null, 'account');
 const walletName = 'test-artifacts/test-wallet.json';