update

rainlanguage · Nov 6, 2024 · 02942a2 · 02942a2
1 parent 6058195
commit 02942a2
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/src/modes/index.ts b/src/modes/index.ts
@@ -116,19 +116,25 @@ export async function findOpp({
             );
         }
         if (
+            (allResults[0] as any)?.reason !== undefined &&
             "value" in (allResults[0] as any).reason &&
+            (allResults[0] as any)?.reason?.value !== undefined &&
             "noneNodeError" in (allResults[0] as any).reason.value
         ) {
             result.noneNodeError = (allResults[0] as any).reason.value.noneNodeError;
         } else if (
             result.noneNodeError === undefined &&
+            (allResults[1] as any)?.reason !== undefined &&
             "value" in (allResults[1] as any).reason &&
+            (allResults[1] as any)?.reason?.value !== undefined &&
             "noneNodeError" in (allResults[1] as any).reason.value
         ) {
             result.noneNodeError = (allResults[1] as any).reason.value.noneNodeError;
         } else if (
             result.noneNodeError === undefined &&
+            (allResults[2] as any)?.reason !== undefined &&
             "value" in (allResults[2] as any).reason &&
+            (allResults[2] as any)?.reason?.value !== undefined &&
             "noneNodeError" in (allResults[2] as any).reason.value
         ) {
             result.noneNodeError = (allResults[2] as any).reason.value.noneNodeError;

diff --git a/src/processOrders.ts b/src/processOrders.ts
@@ -577,7 +577,10 @@ export async function processPair(args: {
         for (const attrKey in e.spanAttributes) {
             spanAttributes["details." + attrKey] = e.spanAttributes[attrKey];
         }
-        result.error = e?.noneNodeError;
+        if (e?.noneNodeError) {
+            spanAttributes["details.noneNoneError"] = true;
+            result.error = e.noneNodeError;
+        }
         result.report = {
             status: ProcessPairReportStatus.NoOpportunity,
             tokenPair: pair,

diff --git a/test/mode-interOrderbook.test.js b/test/mode-interOrderbook.test.js
@@ -143,7 +143,10 @@ describe("Test inter-orderbook dryrun", async function () {
             assert.fail("expected to reject, but resolved");
         } catch (error) {
             const expected = {
-                value: undefined,
+                value: {
+                    estimatedProfit: ethers.constants.Zero,
+                    noneNodeError: `\nReason: ${ethers.errors.UNPREDICTABLE_GAS_LIMIT}`,
+                },
                 reason: undefined,
                 spanAttributes: {
                     maxInput: vaultBalance.toString(),

diff --git a/test/mode-intraOrderbook.test.js b/test/mode-intraOrderbook.test.js
@@ -142,7 +142,10 @@ describe("Test intra-orderbook dryrun", async function () {
             assert.fail("expected to reject, but resolved");
         } catch (error) {
             const expected = {
-                value: undefined,
+                value: {
+                    estimatedProfit: ethers.constants.Zero,
+                    noneNodeError: `\nReason: ${ethers.errors.UNPREDICTABLE_GAS_LIMIT}`,
+                },
                 reason: undefined,
                 spanAttributes: {
                     blockNumber: oppBlockNumber,

diff --git a/test/mode-routeProcessor.test.js b/test/mode-routeProcessor.test.js
@@ -214,7 +214,10 @@ describe("Test route processor dryrun", async function () {
                 from: signer.account.address,
             };
             const expected = {
-                value: undefined,
+                value: {
+                    estimatedProfit: ethers.constants.Zero,
+                    noneNodeError: `\nReason: ${ethers.errors.UNPREDICTABLE_GAS_LIMIT}`,
+                },
                 reason: RouteProcessorDryrunHaltReason.NoOpportunity,
                 spanAttributes: {
                     marketPrice: formatUnits(getCurrentPrice(vaultBalance)),