Skip to content

Return type of transaction if legacy #1713

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
blackdevelopa merged 3 commits into from
Sep 26, 2023
Merged

Return type of transaction if legacy #1713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c58b091
add txn type if zero
blackdevelopa Sep 25, 2023
b854962
rebased to main
blackdevelopa Sep 26, 2023
324df9c
Merge branch 'main' into add_transaction_type_core
blackdevelopa Sep 26, 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
6 changes: 6 additions & 0 deletions packages/transaction-controller/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,12 @@ export interface TransactionParams {
* Value associated with this transaction.
*/
value?: string;

/**
* Type of transaction.
* 0x0 indicates a legacy transaction.
*/
type?: string;
}

/**
Expand Down
51 changes: 38 additions & 13 deletions packages/transaction-controller/src/utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ describe('utils', () => {
jest.clearAllMocks();
});

it('normalizeTxParams', () => {
const normalized = util.normalizeTxParams({
describe('normalizeTxParams', () => {
const commonInput = {
data: 'data',
from: 'FROM',
gas: 'gas',
Expand All @@ -31,18 +31,43 @@ describe('utils', () => {
maxFeePerGas: 'maxFeePerGas',
maxPriorityFeePerGas: 'maxPriorityFeePerGas',
estimatedBaseFee: 'estimatedBaseFee',
};

it('normalizeTransaction', () => {
const normalized = util.normalizeTxParams({
...commonInput,
});
expect(normalized).toStrictEqual({
data: '0xdata',
from: '0xfrom',
gas: '0xgas',
gasPrice: '0xgasPrice',
nonce: '0xnonce',
to: '0xto',
value: '0xvalue',
maxFeePerGas: '0xmaxFeePerGas',
maxPriorityFeePerGas: '0xmaxPriorityFeePerGas',
estimatedBaseFee: '0xestimatedBaseFee',
});
});
expect(normalized).toStrictEqual({
data: '0xdata',
from: '0xfrom',
gas: '0xgas',
gasPrice: '0xgasPrice',
nonce: '0xnonce',
to: '0xto',
value: '0xvalue',
maxFeePerGas: '0xmaxFeePerGas',
maxPriorityFeePerGas: '0xmaxPriorityFeePerGas',
estimatedBaseFee: '0xestimatedBaseFee',
it('normalizeTransaction if type is zero', () => {
const normalized = util.normalizeTxParams({
...commonInput,
type: '0x0',
});
expect(normalized).toStrictEqual({
data: '0xdata',
from: '0xfrom',
gas: '0xgas',
gasPrice: '0xgasPrice',
nonce: '0xnonce',
to: '0xto',
value: '0xvalue',
maxFeePerGas: '0xmaxFeePerGas',
maxPriorityFeePerGas: '0xmaxPriorityFeePerGas',
estimatedBaseFee: '0xestimatedBaseFee',
type: '0x0',
});
});
});

Expand Down
1 change: 1 addition & 0 deletions packages/transaction-controller/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const NORMALIZERS: { [param in keyof TransactionParams]: any } = {
addHexPrefix(maxPriorityFeePerGas),
estimatedBaseFee: (maxPriorityFeePerGas: string) =>
addHexPrefix(maxPriorityFeePerGas),
type: (type: string) => (type === '0x0' ? '0x0' : undefined),
};

/**
Expand Down