update

rainlanguage · Jan 27, 2025 · 5d527e7 · 5d527e7
1 parent 224dc45
commit 5d527e7
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 42 deletions.
diff --git a/src/modes/index.ts b/src/modes/index.ts
@@ -146,3 +146,22 @@ export async function findOpp({
         throw result;
     }
 }
+
+/**
+ * Records gas estimates for otel span attributes
+ */
+export function recordGasEstAttrs(
+    spanAttributes: Record<string, any>,
+    estimation: any,
+    config: BotConfig,
+    headroom: boolean,
+) {
+    const header = headroom ? "headroom" : "final";
+    spanAttributes[`gasEst.${header}.gasLimit`] = estimation.gas.toString();
+    spanAttributes[`gasEst.${header}.totalCost`] = estimation.totalGasCost.toString();
+    spanAttributes[`gasEst.${header}.gasPrice`] = estimation.gasPrice.toString();
+    if (config.isSpecialL2) {
+        spanAttributes[`gasEst.${header}.l1Cost`] = estimation.l1Cost.toString();
+        spanAttributes[`gasEst.${header}.l1GasPrice`] = estimation.l1GasPrice.toString();
+    }
+}
diff --git a/src/modes/interOrderbook.ts b/src/modes/interOrderbook.ts
@@ -1,3 +1,4 @@
+import { recordGasEstAttrs } from ".";
 import { orderbookAbi } from "../abis";
 import { estimateGasCost } from "../gas";
 import { BigNumber, Contract, ethers } from "ethers";
@@ -121,13 +122,7 @@ export async function dryrun({
         gasLimit = ethers.BigNumber.from(estimation.gas).mul(config.gasLimitMultiplier).div(100);
 
         // include dryrun headroom gas estimation in otel logs
-        spanAttributes["gasEst.headroom.gasLimit"] = estimation.gas.toString();
-        spanAttributes["gasEst.headroom.totalCost"] = estimation.totalGasCost.toString();
-        spanAttributes["gasEst.headroom.gasPrice"] = estimation.gasPrice.toString();
-        if (config.isSpecialL2) {
-            spanAttributes["gasEst.headroom.l1Cost"] = estimation.l1Cost.toString();
-            spanAttributes["gasEst.headroom.l1GasPrice"] = estimation.l1GasPrice.toString();
-        }
+        recordGasEstAttrs(spanAttributes, estimation, config, true);
     } catch (e) {
         const isNodeError = containsNodeError(e as BaseError);
         const errMsg = errorSnapshot("", e);
@@ -197,13 +192,7 @@ export async function dryrun({
             gasCost = gasLimit.mul(gasPrice).add(estimation.l1Cost);
 
             // include dryrun final gas estimation in otel logs
-            spanAttributes["gasEst.final.gasLimit"] = estimation.gas.toString();
-            spanAttributes["gasEst.final.totalCost"] = estimation.totalGasCost.toString();
-            spanAttributes["gasEst.final.gasPrice"] = estimation.gasPrice.toString();
-            if (config.isSpecialL2) {
-                spanAttributes["gasEst.final.l1Cost"] = estimation.l1Cost.toString();
-                spanAttributes["gasEst.final.l1GasPrice"] = estimation.l1GasPrice.toString();
-            }
+            recordGasEstAttrs(spanAttributes, estimation, config, false);
             task.evaluable.bytecode = await parseRainlang(
                 await getBountyEnsureRainlang(
                     ethers.utils.parseUnits(inputToEthPrice),

diff --git a/src/modes/intraOrderbook.ts b/src/modes/intraOrderbook.ts
@@ -1,3 +1,4 @@
+import { recordGasEstAttrs } from ".";
 import { orderbookAbi } from "../abis";
 import { estimateGasCost } from "../gas";
 import { BigNumber, ethers } from "ethers";
@@ -119,13 +120,7 @@ export async function dryrun({
         gasLimit = ethers.BigNumber.from(estimation.gas).mul(config.gasLimitMultiplier).div(100);
 
         // include dryrun headroom gas estimation in otel logs
-        spanAttributes["gasEst.headroom.gasLimit"] = estimation.gas.toString();
-        spanAttributes["gasEst.headroom.totalCost"] = estimation.totalGasCost.toString();
-        spanAttributes["gasEst.headroom.gasPrice"] = estimation.gasPrice.toString();
-        if (config.isSpecialL2) {
-            spanAttributes["gasEst.headroom.l1Cost"] = estimation.l1Cost.toString();
-            spanAttributes["gasEst.headroom.l1GasPrice"] = estimation.l1GasPrice.toString();
-        }
+        recordGasEstAttrs(spanAttributes, estimation, config, true);
     } catch (e) {
         // reason, code, method, transaction, error, stack, message
         const isNodeError = containsNodeError(e as BaseError);
@@ -205,13 +200,7 @@ export async function dryrun({
             gasCost = gasLimit.mul(gasPrice).add(estimation.l1Cost);
 
             // include dryrun final gas estimation in otel logs
-            spanAttributes["gasEst.final.gasLimit"] = estimation.gas.toString();
-            spanAttributes["gasEst.final.totalCost"] = estimation.totalGasCost.toString();
-            spanAttributes["gasEst.final.gasPrice"] = estimation.gasPrice.toString();
-            if (config.isSpecialL2) {
-                spanAttributes["gasEst.final.l1Cost"] = estimation.l1Cost.toString();
-                spanAttributes["gasEst.final.l1GasPrice"] = estimation.l1GasPrice.toString();
-            }
+            recordGasEstAttrs(spanAttributes, estimation, config, false);
             task.evaluable.bytecode = await parseRainlang(
                 await getWithdrawEnsureRainlang(
                     signer.account.address,

diff --git a/src/modes/routeProcessor.ts b/src/modes/routeProcessor.ts
@@ -1,3 +1,4 @@
+import { recordGasEstAttrs } from ".";
 import { Token } from "sushi/currency";
 import { estimateGasCost } from "../gas";
 import { ChainId, DataFetcher, Router } from "sushi";
@@ -190,13 +191,7 @@ export async function dryrun({
                 .div(100);
 
             // include dryrun headroom gas estimation in otel logs
-            spanAttributes["gasEst.headroom.gasLimit"] = estimation.gas.toString();
-            spanAttributes["gasEst.headroom.totalCost"] = estimation.totalGasCost.toString();
-            spanAttributes["gasEst.headroom.gasPrice"] = estimation.gasPrice.toString();
-            if (config.isSpecialL2) {
-                spanAttributes["gasEst.headroom.l1Cost"] = estimation.l1Cost.toString();
-                spanAttributes["gasEst.headroom.l1GasPrice"] = estimation.l1GasPrice.toString();
-            }
+            recordGasEstAttrs(spanAttributes, estimation, config, true);
         } catch (e) {
             // reason, code, method, transaction, error, stack, message
             const isNodeError = containsNodeError(e as BaseError);
@@ -268,13 +263,7 @@ export async function dryrun({
                 gasCost = gasLimit.mul(gasPrice).add(estimation.l1Cost);
 
                 // include dryrun final gas estimation in otel logs
-                spanAttributes["gasEst.final.gasLimit"] = estimation.gas.toString();
-                spanAttributes["gasEst.final.totalCost"] = estimation.totalGasCost.toString();
-                spanAttributes["gasEst.final.gasPrice"] = estimation.gasPrice.toString();
-                if (config.isSpecialL2) {
-                    spanAttributes["gasEst.final.l1Cost"] = estimation.l1Cost.toString();
-                    spanAttributes["gasEst.final.l1GasPrice"] = estimation.l1GasPrice.toString();
-                }
+                recordGasEstAttrs(spanAttributes, estimation, config, false);
                 task.evaluable.bytecode = await parseRainlang(
                     await getBountyEnsureRainlang(
                         ethers.utils.parseUnits(ethPrice),