Cherry pick 966 964 (#970)

* 993-Request-ID-is-missing-from-some-mirror-node-relay-logs.  This was… (#964)

993-Request-ID-is-missing-from-some-mirror-node-relay-logs.  This was resolved by adding the requestId to the getAccount
call in the eth_estimateGas call to the mirror node client.

Signed-off-by: ebadiere <[email protected]>

* Enhance logs when calling eth_sendRawTransaction to include from and … (#966)

* Enhance logs when calling eth_sendRawTransaction to include from and to fields besides the raw transaction

Signed-off-by: Alfredo Gutierrez <[email protected]>

---------

Signed-off-by: ebadiere <[email protected]>
Signed-off-by: Alfredo Gutierrez <[email protected]>
Co-authored-by: Eric Badiere <[email protected]>
Co-authored-by: Alfredo Gutierrez <[email protected]>

Author: 3 people

packages/relay/src/lib/eth.ts

@@ -335,7 +335,7 @@ export class EthImpl implements Eth {
       const accountCacheKey = `account_${transaction.to}`;
       let toAccount: object | null = this.cache.get(accountCacheKey);
       if (!toAccount) {
-        toAccount = await this.mirrorNodeClient.getAccount(transaction.to);
+        toAccount = await this.mirrorNodeClient.getAccount(transaction.to, requestId);
       }
 
       // when account exists return default base gas, otherwise return the minimum amount of gas to create an account entity
@@ -916,13 +916,17 @@ export class EthImpl implements Eth {
   async sendRawTransaction(transaction: string, requestId?: string): Promise<string | JsonRpcError> {
     const requestIdPrefix = formatRequestIdMessage(requestId);
     let interactingEntity = '';
-    this.logger.trace(`${requestIdPrefix} sendRawTransaction(transaction=${transaction})`);
+    let originatingAddress = '';
     try {
       const parsedTx = Precheck.parseTxIfNeeded(transaction);
       interactingEntity = parsedTx.to ? parsedTx.to.toString() : '';
+      originatingAddress = parsedTx.from ? parsedTx.from.toString() : '';
+      this.logger.trace(`${requestIdPrefix} sendRawTransaction(from=${originatingAddress}, to=${interactingEntity}, transaction=${transaction})`);
+
       const gasPrice = Number(await this.gasPrice(requestId));
       await this.precheck.sendRawTransactionCheck(parsedTx, gasPrice, requestId);
     } catch (e: any) {
+      this.logger.warn(`${requestIdPrefix} Error on precheck sendRawTransaction(from=${originatingAddress}, to=${interactingEntity}, transaction=${transaction})`);
       throw this.genericErrorHandler(e);
     }