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

Jump to bottom

Fix TransactionInfoAPI type #6539

Merged
merged 16 commits into from
Oct 26, 2023
Merged

Fix TransactionInfoAPI type #6539

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
003e472
fix tx type
avkos Oct 23, 2023
4809d1d
fix types. add withRequire type utility
avkos Oct 23, 2023
8f3f096
Revert "fix types. add withRequire type utility"
avkos Oct 23, 2023
5a0da12
Revert "fix tx type"
avkos Oct 23, 2023
bf66cc0
fix types.
avkos Oct 23, 2023
f359622
fix integration test
avkos Oct 23, 2023
126a962
fix unit tests
avkos Oct 23, 2023
780088d
Update web3_eth_methods_with_parameters.test.ts
avkos Oct 23, 2023
620c3ae
Merge branch '4.x' into ok/6501-gasPrice-doesn't-exist-in-web3.eth.ge…
avkos Oct 25, 2023
4ee23d9
fix
avkos Oct 26, 2023
045a387
fix build
avkos Oct 26, 2023
858ddd2
fix unit testscd
avkos Oct 26, 2023
7399a96
add gasPrice. revert fixtures.
avkos Oct 26, 2023
51cdaf2
revert fixture
avkos Oct 26, 2023
6c85a4e
add changelog
avkos Oct 26, 2023
8ba3faf
fix unit tests
avkos Oct 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
85 changes: 85 additions & 0 deletions packages/web3-eth/test/integration/rpc.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,91 @@ describe('rpc', () => {
validateTransaction(res as TransactionInfo);
expect(res?.hash).toBe(receipt.transactionHash);
});
it('check get transaction fields', async () => {
avkos marked this conversation as resolved.
Show resolved Hide resolved
const receipt0 = await web3Eth.sendTransaction({
from: tempAcc.address,
value: '0x1',
to: tempAcc2.address,
type: BigInt(0),
});
const res0 = await web3Eth.getTransaction(receipt0.transactionHash);

expect(res0.type).toBeDefined();
expect(res0.hash).toBeDefined();
expect(res0.nonce).toBeDefined();
expect(res0.blockHash).toBeDefined();
expect(res0.blockNumber).toBeDefined();
expect(res0.transactionIndex).toBeDefined();
expect(res0.from).toBeDefined();
expect(res0.to).toBeDefined();
expect(res0.value).toBeDefined();
expect(res0.gas).toBeDefined();
expect(res0.input).toBeDefined();
expect(res0.r).toBeDefined();
expect(res0.s).toBeDefined();
expect(res0.v).toBeDefined();
expect(res0.data).toBeDefined();
expect(res0?.hash).toBe(receipt0.transactionHash);
expect(res0.gasPrice).toBeDefined();

const receipt1 = await web3Eth.sendTransaction({
from: tempAcc.address,
value: '0x1',
maxPriorityFeePerGas: BigInt(500000000),
maxFeePerGas: BigInt(500000000),
to: tempAcc2.address,
type: BigInt(1),
});
const res1 = await web3Eth.getTransaction(receipt1.transactionHash);
expect(res1.type).toBeDefined();
expect(res1.hash).toBeDefined();
expect(res1.nonce).toBeDefined();
expect(res1.blockHash).toBeDefined();
expect(res1.blockNumber).toBeDefined();
expect(res1.transactionIndex).toBeDefined();
expect(res1.from).toBeDefined();
expect(res1.to).toBeDefined();
expect(res1.value).toBeDefined();
expect(res1.gas).toBeDefined();
expect(res1.input).toBeDefined();
expect(res1.r).toBeDefined();
expect(res1.s).toBeDefined();
expect(res1.v).toBeDefined();
expect(res1.data).toBeDefined();
expect(res1?.hash).toBe(receipt1.transactionHash);
expect(res1.gasPrice).toBeDefined();
expect(res1.maxPriorityFeePerGas).toBeDefined();
expect(res1.maxFeePerGas).toBeDefined();
expect(res1.accessList).toBeDefined();

const receipt2 = await web3Eth.sendTransaction({
from: tempAcc.address,
value: '0x1',
to: tempAcc2.address,
type: BigInt(2),
});
const res2 = await web3Eth.getTransaction(receipt2.transactionHash);
expect(res2.type).toBeDefined();
expect(res2.hash).toBeDefined();
expect(res2.nonce).toBeDefined();
expect(res2.blockHash).toBeDefined();
expect(res2.blockNumber).toBeDefined();
expect(res2.transactionIndex).toBeDefined();
expect(res2.from).toBeDefined();
expect(res2.to).toBeDefined();
expect(res2.value).toBeDefined();
expect(res2.gas).toBeDefined();
expect(res2.input).toBeDefined();
expect(res2.r).toBeDefined();
expect(res2.s).toBeDefined();
expect(res2.v).toBeDefined();
expect(res2.data).toBeDefined();
expect(res2?.hash).toBe(receipt2.transactionHash);
expect(res2.gasPrice).toBeDefined();
expect(res2.maxPriorityFeePerGas).toBeDefined();
expect(res2.maxFeePerGas).toBeDefined();
expect(res2.accessList).toBeDefined();
});

itIf(getSystemTestBackend() !== 'ganache')('getPendingTransactions', async () => {
const tx = web3Eth.sendTransaction({
Expand Down
3 changes: 2 additions & 1 deletion packages/web3-eth/test/unit/web3_eth_methods_with_parameters.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ along with web3.js. If not, see <http://www.gnu.org/licenses/>.
*/
import { ethRpcMethods } from 'web3-rpc-methods';

import { TransactionInfoAPI } from 'web3-types';
import Web3Eth from '../../src/index';
import * as rpcMethodWrappers from '../../src/rpc_method_wrappers';
import {
Expand Down Expand Up @@ -52,7 +53,7 @@ import { testData as createAccessListTestData } from './rpc_method_wrappers/fixt
jest.mock('web3-rpc-methods');
jest.mock('../../src/rpc_method_wrappers');
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
jest.spyOn(rpcMethodWrappers, 'getTransaction').mockResolvedValue(tx);
jest.spyOn(rpcMethodWrappers, 'getTransaction').mockResolvedValue(tx as TransactionInfoAPI);
jest.spyOn(rpcMethodWrappers, 'getTransactionReceipt').mockResolvedValue(txReceipt);

describe('web3_eth_methods_with_parameters', () => {
Expand Down
7 changes: 3 additions & 4 deletions packages/web3-types/src/apis/eth_execution_api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,9 @@ export type TransactionUnsignedAPI =
| TransactionLegacyUnsignedAPI;

// https://github.com/ethereum/execution-apis/blob/main/src/schemas/transaction.yaml#L211
export type TransactionSignedAPI =
| Transaction1559SignedAPI
| Transaction2930SignedAPI
| TransactionLegacySignedAPI;
export type TransactionSignedAPI = Transaction1559SignedAPI &
Transaction2930SignedAPI &
TransactionLegacySignedAPI;
avkos marked this conversation as resolved.
Show resolved Hide resolved
avkos marked this conversation as resolved.
Show resolved Hide resolved
avkos marked this conversation as resolved.
Show resolved Hide resolved

// https://github.com/ethereum/execution-apis/blob/main/src/schemas/transaction.yaml#L216
export type TransactionInfoAPI = TransactionSignedAPI & {
Expand Down
Loading