init

rainlanguage · Nov 12, 2024 · b424a80 · b424a80
1 parent 64cce4d
commit b424a80
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/src/error.ts b/src/error.ts
@@ -1,9 +1,9 @@
 import {
     BaseError,
     RpcRequestError,
-    InvalidInputRpcError,
+    // InvalidInputRpcError,
     ExecutionRevertedError,
-    TransactionRejectedRpcError,
+    // TransactionRejectedRpcError,
 } from "viem";
 
 /**
@@ -46,8 +46,8 @@ export function errorSnapshot(header: string, err: any): string {
 export function containsNodeError(err: BaseError): boolean {
     try {
         return (
-            err instanceof TransactionRejectedRpcError ||
-            err instanceof InvalidInputRpcError ||
+            // err instanceof TransactionRejectedRpcError ||
+            // err instanceof InvalidInputRpcError ||
             err instanceof ExecutionRevertedError ||
             (err instanceof RpcRequestError && err.code === ExecutionRevertedError.code) ||
             ("cause" in err && containsNodeError(err.cause as any))

diff --git a/src/processOrders.ts b/src/processOrders.ts
@@ -619,6 +619,19 @@ export async function processPair(args: {
     // submit the tx
     let txhash, txUrl;
     try {
+        // const gasPriceBigInt = await viemClient.getGasPrice();
+        // const nonce = await viemClient.getTransactionCount({
+        //     blockTag: "latest",
+        //     address:
+        //         flashbotSigner !== undefined
+        //             ? flashbotSigner.account.address
+        //             : signer.account.address,
+        // });
+        // rawtx.gasPrice = (gasPriceBigInt * 107n) / 100n;
+        // if (flashbotSigner) {
+        //     rawtx.gas = await flashbotSigner.estimateGas(rawtx);
+        // }
+        // rawtx.nonce = nonce;
         txhash =
             flashbotSigner !== undefined
                 ? await flashbotSigner.sendTransaction(rawtx)
@@ -637,7 +650,7 @@ export async function processPair(args: {
             },
             withBigintSerializer,
         );
-        spanAttributes["txNoneNodeError"] = containsNodeError(e as BaseError);
+        spanAttributes["txNoneNodeError"] = !containsNodeError(e as BaseError);
         result.error = e;
         result.reason = ProcessPairHaltReason.TxFailed;
         throw result;
@@ -775,7 +788,7 @@ export async function processPair(args: {
             result.report.actualGasCost = ethers.utils.formatUnits(actualGasCost);
         }
         result.error = e;
-        spanAttributes["txNoneNodeError"] = containsNodeError(e);
+        spanAttributes["txNoneNodeError"] = !containsNodeError(e);
         result.reason = ProcessPairHaltReason.TxMineFailed;
         throw result;
     }

diff --git a/src/types.ts b/src/types.ts
@@ -183,6 +183,7 @@ export type RawTx = {
     data: `0x${string}`;
     gasPrice?: bigint;
     gas?: bigint;
+    nonce?: number;
 };
 
 export type DryrunValue = {