diff --git a/packages/web3-eth/test/fixtures/prepare_transaction_for_signing.ts b/packages/web3-eth/test/fixtures/prepare_transaction_for_signing.ts index 0ef9a302e8b..590a6df9840 100644 --- a/packages/web3-eth/test/fixtures/prepare_transaction_for_signing.ts +++ b/packages/web3-eth/test/fixtures/prepare_transaction_for_signing.ts @@ -258,51 +258,49 @@ export const validTransactions: [ '0x9ebb6ca057a0535d6186462bc0b465b561c94a295bdb0621fc19208ab149a9c', '0x440ffd775ce91a833ab410777204d5341a6f9fa91216a6f3ee2c051fea6a0428', ], - // TODO - r doesn't match - // https://github.com/ChainSafe/web3.js/blob/1.x/test/eth.accounts.signTransaction.js#L167 - // [ - // preEip1559Block, - // { - // chainId: 1, - // nonce: 0, - // gasPrice: '10', - // gas: 31853, - // to: '0xF0109fC8DF283027b6285cc889F5aA624EaC1F55', - // from: '0x2c7536E3605D9C16a7a3D7b1898e529396a65c23', - // value: '0', - // data: '', - // common: common - // }, - // '0x4c0883a69102937d6231471b5dbb6204fe5129617082792ae468d01a3f362318', - // '0x2c7536E3605D9C16a7a3D7b1898e529396a65c23', - // '0xf85f800a827c6d94f0109fc8df283027b6285cc889f5aa624eac1f55808025a03cbfff5b8ef4588b930ecbf9b85388795875edf814dfc6c71884f99b6d7555cca057142e729c1c83bfccb2785e629fc32dffb2e613df565e78e119aa4694cb1df9', - // '0x247533e8b3d12185a871fca5503b7e86f2fecef4a43ded244d5c18ec6b6b057f', - // '0xf5932468728558772f9422155ef1d7de7f8daf41542da16f1c1063cb98299953', - // '0x25', - // '0x22f17b38af35286ffbb0c6376c86ec91c20ecbad93f84913a0cc15e7580cd9', - // '0x83d6e12e82e3544cb4439964d5087da78f74cefeec9a450b16ae179fd8fe20' - // ], - // [ - // preEip1559Block, - // { - // chainId: 1, - // nonce: 0, - // gasPrice: '10', - // gas: 31853, - // to: '0xF0109fC8DF283027b6285cc889F5aA624EaC1F55', - // value: '0', - // data: '', - // common: common - // }, - // '0x4c0883a69102937d6231471b5dbb6204fe5129617082792ae468d01a3f362318', - // '0x2c7536E3605D9C16a7a3D7b1898e529396a65c23', - // '0xf85f800a827c6d94f0109fc8df283027b6285cc889f5aa624eac1f55808025a03cbfff5b8ef4588b930ecbf9b85388795875edf814dfc6c71884f99b6d7555cca057142e729c1c83bfccb2785e629fc32dffb2e613df565e78e119aa4694cb1df9', - // '0x247533e8b3d12185a871fca5503b7e86f2fecef4a43ded244d5c18ec6b6b057f', - // '0xf5932468728558772f9422155ef1d7de7f8daf41542da16f1c1063cb98299953', - // '0x25', - // '0x22f17b38af35286ffbb0c6376c86ec91c20ecbad93f84913a0cc15e7580cd9', - // '0x83d6e12e82e3544cb4439964d5087da78f74cefeec9a450b16ae179fd8fe20' - // ], + [ + preEip1559Block, + { + chainId: 1, + nonce: 0, + gasPrice: '10', + gas: 31853, + to: '0xF0109fC8DF283027b6285cc889F5aA624EaC1F55', + from: '0x2c7536E3605D9C16a7a3D7b1898e529396a65c23', + value: '0', + data: '', + common, + }, + '0x4c0883a69102937d6231471b5dbb6204fe5129617082792ae468d01a3f362318', + '0x2c7536E3605D9C16a7a3D7b1898e529396a65c23', + '0xf85f800a827c6d94f0109fc8df283027b6285cc889f5aa624eac1f55808025a03cbfff5b8ef4588b930ecbf9b85388795875edf814dfc6c71884f99b6d7555cca057142e729c1c83bfccb2785e629fc32dffb2e613df565e78e119aa4694cb1df9', + '0x247533e8b3d12185a871fca5503b7e86f2fecef4a43ded244d5c18ec6b6b057f', + '0xf5932468728558772f9422155ef1d7de7f8daf41542da16f1c1063cb98299953', + '0x25', + '0x3cbfff5b8ef4588b930ecbf9b85388795875edf814dfc6c71884f99b6d7555cc', + '0x57142e729c1c83bfccb2785e629fc32dffb2e613df565e78e119aa4694cb1df9', + ], + [ + preEip1559Block, + { + chainId: 1, + nonce: 0, + gasPrice: '10', + gas: 31853, + to: '0xF0109fC8DF283027b6285cc889F5aA624EaC1F55', + value: '0', + data: '', + common, + }, + '0x4c0883a69102937d6231471b5dbb6204fe5129617082792ae468d01a3f362318', + '0x2c7536E3605D9C16a7a3D7b1898e529396a65c23', + '0xf85f800a827c6d94f0109fc8df283027b6285cc889f5aa624eac1f55808025a03cbfff5b8ef4588b930ecbf9b85388795875edf814dfc6c71884f99b6d7555cca057142e729c1c83bfccb2785e629fc32dffb2e613df565e78e119aa4694cb1df9', + '0x247533e8b3d12185a871fca5503b7e86f2fecef4a43ded244d5c18ec6b6b057f', + '0xf5932468728558772f9422155ef1d7de7f8daf41542da16f1c1063cb98299953', + '0x25', + '0x3cbfff5b8ef4588b930ecbf9b85388795875edf814dfc6c71884f99b6d7555cc', + '0x57142e729c1c83bfccb2785e629fc32dffb2e613df565e78e119aa4694cb1df9', + ], [ preEip1559Block, { @@ -833,31 +831,29 @@ export const validTransactions: [ '0xe3a2e10c7d3af3407ec2d38c64788d6673926e9b28d6d2e7df3c94cdf0548233', '0xad3e5faafaf3a9350ab16c1be0198ce9ff3c6bef0b91e05488d757f07de9557', ], - // TODO - RLP encoded value doesn't match - // https://github.com/ChainSafe/web3.js/blob/1.x/test/eth.accounts.signTransaction.js#L656 - // [ - // postEip1559Block, - // { - // chainId: 1, - // nonce: 0, - // maxPriorityFeePerGas: '0x3B9ACA00', - // maxFeePerGas: '0xB2D05E00', - // gasLimit: '0x6A40', - // to: '0xF0109fC8DF283027b6285cc889F5aA624EaC1F55', - // from: '0x2c7536E3605D9C16a7a3D7b1898e529396a65c23', - // value: '1000000000', - // data: '', - // common: commonLondon, - // }, - // '0x4c0883a69102937d6231471b5dbb6204fe5129617082792ae468d01a3f362318', - // '0x2c7536E3605D9C16a7a3D7b1898e529396a65c23', - // '0x02f86e018084c733124884cb72ec20826a4094f0109fc8df283027b6285cc889f5aa624eac1f55843b9aca0080c001a08896fb9a5c033e0163b073cf7a951a1db2dca41b26b4188f13a05158eb26fd32a005e8855691199cd0b6dcae88f3325c374e2f0697b9c528a5c10d5bd8dfb6a3e3', - // '0xd5b7290a477b9c421d39e61d0f566ec33276fb49b9ff85cfd6152a18f1c92dab', - // '0x17e20e530a889ce52057de228b5b97edcad6002468d723346cd0b6b7a9943457', - // '0x0', - // '0xe3a2e10c7d3af3407ec2d38c64788d6673926e9b28d6d2e7df3c94cdf0548233', - // '0xad3e5faafaf3a9350ab16c1be0198ce9ff3c6bef0b91e05488d757f07de9557', - // ], + [ + postEip1559Block, + { + chainId: 1, + nonce: 0, + maxPriorityFeePerGas: '0x3B9ACA00', + maxFeePerGas: '0xB2D05E00', + gasLimit: '0x6A40', + to: '0xF0109fC8DF283027b6285cc889F5aA624EaC1F55', + from: '0x2c7536E3605D9C16a7a3D7b1898e529396a65c23', + value: '1000000000', + data: '', + common: commonLondon, + }, + '0x4c0883a69102937d6231471b5dbb6204fe5129617082792ae468d01a3f362318', + '0x2c7536E3605D9C16a7a3D7b1898e529396a65c23', + '0x02f86e0180843b9aca0084b2d05e00826a4094f0109fc8df283027b6285cc889f5aa624eac1f55843b9aca0080c080a0d1290a118d51918c1ca17e3af0267c45efcd745cf42e78eabc444c424d6bcf37a003c81e1fda169575023a94200ee034128747f91020e704abaee30dbcfc785c36', + '0x82c19b39a6b7eaa0492863a8b236fad5018f267b4977c270ddd5228c4cbda60e', + '0xe3beea0918f445c21eb2f42e3cbc3c5d54321ec642f47d12c473b2765df97f2b', + '0x0', + '0xd1290a118d51918c1ca17e3af0267c45efcd745cf42e78eabc444c424d6bcf37', + '0x3c81e1fda169575023a94200ee034128747f91020e704abaee30dbcfc785c36', + ], [ postEip1559Block, {