Skip to content

Cancel + Retry Tx Fixed #311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 21, 2023
Merged

Cancel + Retry Tx Fixed #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d4943f
fixed cancel & retrying with 1.2x gas values
farhanW3 Nov 21, 2023
326c313
multiplying retryTx gas values 2x
farhanW3 Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/server/utils/transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ export const cancelTransactionAndUpdate = async ({
data: "0x",
value: "0x00",
nonce: txData.nonce!,
...gasOverrides,
maxFeePerGas: BigNumber.from(gasOverrides.maxFeePerGas).mul(2),
maxPriorityFeePerGas: BigNumber.from(
gasOverrides.maxPriorityFeePerGas,
Expand Down
8 changes: 3 additions & 5 deletions src/worker/tasks/retryTx.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { getDefaultGasOverrides } from "@thirdweb-dev/sdk";
import { ethers } from "ethers";
import { BigNumber } from "ethers/lib/ethers";
import { prisma } from "../../db/client";
import { getConfiguration } from "../../db/configuration/getConfiguration";
import { getTxToRetry } from "../../db/transactions/getTxToRetry";
Expand Down Expand Up @@ -45,10 +44,6 @@ export const retryTx = async () => {

// TODO: We should still retry anyway
const gasOverrides = await getDefaultGasOverrides(sdk.getProvider());
if (gasOverrides.maxFeePerGas?.lte(BigNumber.from(tx.maxFeePerGas))) {
// If the current blockchain gas fees are lower than the transaction, wait
return;
}

if (tx.retryGasValues) {
// If a retry has been triggered manually
Expand Down Expand Up @@ -77,6 +72,9 @@ export const retryTx = async () => {
nonce: tx.nonce!,
value: tx.value!,
...gasOverrides,
gasPrice: gasOverrides.gasPrice?.mul(2),
maxFeePerGas: gasOverrides.maxFeePerGas?.mul(2),
maxPriorityFeePerGas: gasOverrides.maxPriorityFeePerGas?.mul(2),
});
} catch (err: any) {
logger.worker.warn(
Expand Down