Skip to content
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

Allow custom nonce #381

Merged
merged 2 commits into from
Mar 17, 2021
+3 −1
Merged

Allow custom nonce #381

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f33a6f
Allow custom nonce
rickycodes Mar 16, 2021
f9d0072
fix lint
rickycodes Mar 16, 2021
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
Next Next commit
Allow custom nonce
@rickycodes
rickycodes committed Mar 17, 2021
commit 8f33a6ff51fef171b0fad93bfc94a9ecc03e5aa3
3 changes: 2 additions & 1 deletion src/transaction/TransactionController.ts
View file
Original file line number Diff line number Diff line change
@@ -457,6 +457,7 @@ export class TransactionController extends BaseController<TransactionConfig, Tra
const currentChainId = network?.state?.provider?.chainId;
const index = transactions.findIndex(({ id }) => transactionID === id);
const transactionMeta = transactions[index];
const { nonce } = transactionMeta.transaction;

try {
const { from } = transactionMeta.transaction;
@@ -471,7 +472,7 @@ export class TransactionController extends BaseController<TransactionConfig, Tra
}

transactionMeta.status = 'approved';
transactionMeta.transaction.nonce = await query(this.ethQuery, 'getTransactionCount', [from, 'pending']);
transactionMeta.transaction.nonce = nonce || await query(this.ethQuery, 'getTransactionCount', [from, 'pending']);
transactionMeta.transaction.chainId = parseInt(currentChainId, undefined);

const ethTransaction = new Transaction({ ...transactionMeta.transaction });