Skip to content

Rename rawTransaction to rawTx in the persisted transaction metadata #1624

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
vinistevam merged 2 commits into from
Sep 6, 2023
Merged

Rename rawTransaction to rawTx in the persisted transaction metadata #1624

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
4cfe84b
Rename rawTransaction to rawTx
vinistevam Aug 23, 2023
3dfe6b1
Merge branch 'main' into refactor/1080-rename-rawTransaction-rawTx
vinistevam Sep 5, 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
14 changes: 7 additions & 7 deletions packages/transaction-controller/src/TransactionController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,8 +592,8 @@ export class TransactionController extends BaseController<
unsignedEthTx,
transactionMeta.transaction.from,
);
const rawTransaction = bufferToHex(signedTx.serialize());
await query(this.ethQuery, 'sendRawTransaction', [rawTransaction]);
const rawTx = bufferToHex(signedTx.serialize());
await query(this.ethQuery, 'sendRawTransaction', [rawTx]);
transactionMeta.estimatedBaseFee = estimatedBaseFee;
transactionMeta.status = TransactionStatus.cancelled;
this.hub.emit(`${transactionMeta.id}:finished`, transactionMeta);
Expand Down Expand Up @@ -703,9 +703,9 @@ export class TransactionController extends BaseController<
unsignedEthTx,
transactionMeta.transaction.from,
);
const rawTransaction = bufferToHex(signedTx.serialize());
const rawTx = bufferToHex(signedTx.serialize());
const transactionHash = await query(this.ethQuery, 'sendRawTransaction', [
rawTransaction,
rawTx,
]);
const baseTransactionMeta = {
...transactionMeta,
Expand Down Expand Up @@ -1112,12 +1112,12 @@ export class TransactionController extends BaseController<
const signedTx = await this.sign(unsignedEthTx, from);
transactionMeta.status = TransactionStatus.signed;
this.updateTransaction(transactionMeta);
const rawTransaction = bufferToHex(signedTx.serialize());
const rawTx = bufferToHex(signedTx.serialize());

transactionMeta.rawTransaction = rawTransaction;
transactionMeta.rawTx = rawTx;
this.updateTransaction(transactionMeta);
const transactionHash = await query(this.ethQuery, 'sendRawTransaction', [
rawTransaction,
rawTx,
]);
transactionMeta.transactionHash = transactionHash;
transactionMeta.status = TransactionStatus.submitted;
Expand Down
2 changes: 1 addition & 1 deletion packages/transaction-controller/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ type TransactionMetaBase = {
/**
* Hex representation of the underlying transaction.
*/
rawTransaction?: string;
rawTx?: string;

/**
* When the transaction is dropped, this is the replacement transaction hash.
Expand Down