Skip to content

Commit 87fc50a

Browse files
gtreptarv-jenkins
authored andcommitted
getTransactionReceipt fixes (#622)
* tests/web3/erc20/{erc20capped,tokentimelock}: extend tests to next passing * Fix transaction index parameter passed into serializeLogs * Fix address unparsing length
1 parent 611efd3 commit 87fc50a

File tree

5 files changed

+439
-2
lines changed

5 files changed

+439
-2
lines changed

tests/web3/erc20/erc20capped-partial.expected.json

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,3 +256,120 @@
256256
"id": 15,
257257
"result": "0x1f67206881a62c71931c4e5b768f28094bdf5d44d047d5659cb783e026eb3ca9"
258258
}
259+
{
260+
"jsonrpc": "2.0",
261+
"id": 16,
262+
"result": {
263+
"transactionHash": "0x1f67206881a62c71931c4e5b768f28094bdf5d44d047d5659cb783e026eb3ca9",
264+
"transactionIndex": "0x0",
265+
"blockHash": "0x2f0a95375c733d72fb3244d079f71541d3302e70a8830e4692a1218fa81ba6bd",
266+
"blockNumber": "0x2",
267+
"from": "0xe13c277c8e85d306d7dd26bc72569d285d1ece5a",
268+
"to": null,
269+
"gasUsed": "0x199daa",
270+
"cumulativeGasUsed": "0x199daa",
271+
"contractAddress": "0x754e0b6f4240cc86b37db58fafd8f7bc05a98c49",
272+
"logs": [
273+
{
274+
"logIndex": "0x0",
275+
"transactionIndex": "0x0",
276+
"transactionHash": "0x1f67206881a62c71931c4e5b768f28094bdf5d44d047d5659cb783e026eb3ca9",
277+
"blockHash": "0x2f0a95375c733d72fb3244d079f71541d3302e70a8830e4692a1218fa81ba6bd",
278+
"blockNumber": "0x2",
279+
"address": "0x754e0b6f4240cc86b37db58fafd8f7bc05a98c49",
280+
"data": "0x",
281+
"topics": [
282+
"0x6ae172837ea30b801fbfcdd4108aa1d5bf8ff775444fd70256b44e6bf3dfc3f6",
283+
"0x000000000000000000000000e13c277c8e85d306d7dd26bc72569d285d1ece5a"
284+
],
285+
"type": "mined"
286+
}
287+
],
288+
"status": "0x1",
289+
"logsBloom": "0x00800000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000002000000000000008000000000000000000000000000000400000000000000000000000000000000000000000040000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
290+
"v": "0x1b",
291+
"r": "0xe5a9fbad5af61ec60be0308680779d9e9da8bdd04b560e5989b4d58ac474bd3d",
292+
"s": "0x30be143321742d686237ed9ac8ca95353e87996a1381d5f4c7f958feb3ff7724"
293+
}
294+
}
295+
{
296+
"jsonrpc": "2.0",
297+
"id": 17,
298+
"result": "0x608060405234801561001057600080fd5b50600436106100cf5760003560e01c806370a082311161008c578063a457c2d711610066578063a457c2d71461036e578063a9059cbb146103d4578063aa271e1a1461043a578063dd62ed3e14610496576100cf565b806370a08231146102c8578063983b2d56146103205780639865027514610364576100cf565b8063095ea7b3146100d457806318160ddd1461013a57806323b872dd14610158578063355274ea146101de57806339509351146101fc57806340c10f1914610262575b600080fd5b610120600480360360408110156100ea57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061050e565b604051808215151515815260200191505060405180910390f35b61014261052c565b6040518082815260200191505060405180910390f35b6101c46004803603606081101561016e57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610536565b604051808215151515815260200191505060405180910390f35b6101e661060f565b6040518082815260200191505060405180910390f35b6102486004803603604081101561021257600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610619565b604051808215151515815260200191505060405180910390f35b6102ae6004803603604081101561027857600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506106cc565b604051808215151515815260200191505060405180910390f35b61030a600480360360208110156102de57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610747565b6040518082815260200191505060405180910390f35b6103626004803603602081101561033657600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061078f565b005b61036c610800565b005b6103ba6004803603604081101561038457600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610812565b604051808215151515815260200191505060405180910390f35b610420600480360360408110156103ea57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506108df565b604051808215151515815260200191505060405180910390f35b61047c6004803603602081101561045057600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506108fd565b604051808215151515815260200191505060405180910390f35b6104f8600480360360408110156104ac57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061091a565b6040518082815260200191505060405180910390f35b600061052261051b6109a1565b84846109a9565b6001905092915050565b6000600254905090565b6000610543848484610ba0565b6106048461054f6109a1565b6105ff856040518060600160405280602881526020016115df60289139600160008b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006105b56109a1565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610e569092919063ffffffff16565b6109a9565b600190509392505050565b6000600454905090565b60006106c26106266109a1565b846106bd85600160006106376109a1565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610f1690919063ffffffff16565b6109a9565b6001905092915050565b60006106de6106d96109a1565b6108fd565b610733576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252603081526020018061158e6030913960400191505060405180910390fd5b61073d8383610f9e565b6001905092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b61079f61079a6109a1565b6108fd565b6107f4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252603081526020018061158e6030913960400191505060405180910390fd5b6107fd8161103d565b50565b61081061080b6109a1565b611097565b565b60006108d561081f6109a1565b846108d08560405180606001604052806025815260200161167260259139600160006108496109a1565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610e569092919063ffffffff16565b6109a9565b6001905092915050565b60006108f36108ec6109a1565b8484610ba0565b6001905092915050565b60006109138260036110f190919063ffffffff16565b9050919050565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b600033905090565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415610a2f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602481526020018061164e6024913960400191505060405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff161415610ab5576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001806115466022913960400191505060405180910390fd5b80600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925836040518082815260200191505060405180910390a3505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415610c26576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260258152602001806116296025913960400191505060405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff161415610cac576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260238152602001806115236023913960400191505060405180910390fd5b610d1781604051806060016040528060268152602001611568602691396000808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610e569092919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610daa816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610f1690919063ffffffff16565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a3505050565b6000838311158290610f03576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825283818151815260200191508051906020019080838360005b83811015610ec8578082015181840152602081019050610ead565b50505050905090810190601f168015610ef55780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b5060008385039050809150509392505050565b600080828401905083811015610f94576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601b8152602001807f536166654d6174683a206164646974696f6e206f766572666c6f77000000000081525060200191505060405180910390fd5b8091505092915050565b600454610fbb82610fad61052c565b610f1690919063ffffffff16565b111561102f576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260198152602001807f45524332304361707065643a206361702065786365656465640000000000000081525060200191505060405180910390fd5b61103982826111cf565b5050565b61105181600361138a90919063ffffffff16565b8073ffffffffffffffffffffffffffffffffffffffff167f6ae172837ea30b801fbfcdd4108aa1d5bf8ff775444fd70256b44e6bf3dfc3f660405160405180910390a250565b6110ab81600361146590919063ffffffff16565b8073ffffffffffffffffffffffffffffffffffffffff167fe94479a9f7e1952cc78f2d6baab678adc1b772d936c6583def489e524cb6669260405160405180910390a250565b60008073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff161415611178576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001806116076022913960400191505060405180910390fd5b8260000160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff161415611272576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152602001807f45524332303a206d696e7420746f20746865207a65726f20616464726573730081525060200191505060405180910390fd5b61128781600254610f1690919063ffffffff16565b6002819055506112de816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610f1690919063ffffffff16565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35050565b61139482826110f1565b15611407576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152602001807f526f6c65733a206163636f756e7420616c72656164792068617320726f6c650081525060200191505060405180910390fd5b60018260000160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055505050565b61146f82826110f1565b6114c4576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260218152602001806115be6021913960400191505060405180910390fd5b60008260000160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e63654d696e746572526f6c653a2063616c6c657220646f6573206e6f74206861766520746865204d696e74657220726f6c65526f6c65733a206163636f756e7420646f6573206e6f74206861766520726f6c6545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e6365526f6c65733a206163636f756e7420697320746865207a65726f206164647265737345524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa265627a7a72315820ea845dc42ff0ae8d6d538253df3a228572800822c08e26a06456c4d2cd1c623664736f6c634300050b0032"
299+
}
300+
{
301+
"jsonrpc": "2.0",
302+
"id": 18,
303+
"result": "28346"
304+
}
305+
{
306+
"jsonrpc": "2.0",
307+
"id": 19,
308+
"result": {
309+
"number": "0x2",
310+
"hash": "0x2f0a95375c733d72fb3244d079f71541d3302e70a8830e4692a1218fa81ba6bd",
311+
"parentHash": "0xa19f384e0a5f751471ce5142e6ccf64dd89060ec069c4d0106a424e7625e5727",
312+
"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
313+
"nonce": "0x0000000000000000",
314+
"sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
315+
"logsBloom": "0x00800000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000002000000000000008000000000000000000000000000000400000000000000000000000000000000000000000040000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
316+
"transactionsRoot": "0xf9b635c682f95b50bd49bf9eac0dd3a494d04e30e9e90a8bec0fe0ff398fed51",
317+
"stateRoot": "0x48f6f6f6c2d8ccab694061fdb0eb5bf170bb34d1fe211b711b45808d6dc45a4f",
318+
"receiptsRoot": "0xde11f0e67d3b0be047ed5162ddb855544472a2b38b2496c5ce2a584ee06f9819",
319+
"miner": "0x0000000000000000000000000000000000000000",
320+
"difficulty": "0x0",
321+
"totalDifficulty": "0x0",
322+
"extraData": "0x",
323+
"size": "0x3e8",
324+
"gasLimit": "0x6691b7",
325+
"gasUsed": "0x199daa",
326+
"timestamp": "0x5dd24e09",
327+
"transactions": [
328+
"0x1f67206881a62c71931c4e5b768f28094bdf5d44d047d5659cb783e026eb3ca9"
329+
],
330+
"uncles": []
331+
}
332+
}
333+
{
334+
"jsonrpc": "2.0",
335+
"id": 20,
336+
"result": "0x00000000000000000000000000000000000000000000003635c9adc5dea00000"
337+
}
338+
{
339+
"jsonrpc": "2.0",
340+
"id": 21,
341+
"result": "0x2"
342+
}
343+
{
344+
"jsonrpc": "2.0",
345+
"id": 22,
346+
"result": "28346"
347+
}
348+
{
349+
"jsonrpc": "2.0",
350+
"id": 23,
351+
"result": {
352+
"number": "0x2",
353+
"hash": "0x2f0a95375c733d72fb3244d079f71541d3302e70a8830e4692a1218fa81ba6bd",
354+
"parentHash": "0xa19f384e0a5f751471ce5142e6ccf64dd89060ec069c4d0106a424e7625e5727",
355+
"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
356+
"nonce": "0x0000000000000000",
357+
"sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
358+
"logsBloom": "0x00800000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000002000000000000008000000000000000000000000000000400000000000000000000000000000000000000000040000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
359+
"transactionsRoot": "0xf9b635c682f95b50bd49bf9eac0dd3a494d04e30e9e90a8bec0fe0ff398fed51",
360+
"stateRoot": "0x48f6f6f6c2d8ccab694061fdb0eb5bf170bb34d1fe211b711b45808d6dc45a4f",
361+
"receiptsRoot": "0xde11f0e67d3b0be047ed5162ddb855544472a2b38b2496c5ce2a584ee06f9819",
362+
"miner": "0x0000000000000000000000000000000000000000",
363+
"difficulty": "0x0",
364+
"totalDifficulty": "0x0",
365+
"extraData": "0x",
366+
"size": "0x3e8",
367+
"gasLimit": "0x6691b7",
368+
"gasUsed": "0x199daa",
369+
"timestamp": "0x5dd24e09",
370+
"transactions": [
371+
"0x1f67206881a62c71931c4e5b768f28094bdf5d44d047d5659cb783e026eb3ca9"
372+
],
373+
"uncles": []
374+
}
375+
}

tests/web3/erc20/erc20capped-partial.in.json

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,3 +267,71 @@
267267
}
268268
]
269269
}
270+
{
271+
"jsonrpc": "2.0",
272+
"id": 16,
273+
"method": "eth_getTransactionReceipt",
274+
"params": [
275+
"0x1f67206881a62c71931c4e5b768f28094bdf5d44d047d5659cb783e026eb3ca9"
276+
]
277+
}
278+
{
279+
"jsonrpc": "2.0",
280+
"id": 17,
281+
"method": "eth_getCode",
282+
"params": [
283+
"0x754e0b6f4240cc86b37db58fafd8f7bc05a98c49",
284+
"latest"
285+
]
286+
}
287+
{
288+
"jsonrpc": "2.0",
289+
"id": 18,
290+
"method": "net_version",
291+
"params": []
292+
}
293+
{
294+
"jsonrpc": "2.0",
295+
"id": 19,
296+
"method": "eth_getBlockByNumber",
297+
"params": [
298+
"latest",
299+
false
300+
]
301+
}
302+
{
303+
"jsonrpc": "2.0",
304+
"id": 20,
305+
"method": "eth_call",
306+
"params": [
307+
{
308+
"from": "0x2ea064f7db7f235f1d48471ec944e2730ae1b9ba",
309+
"gas": "0x6691b7",
310+
"gasPrice": "0x4a817c800",
311+
"to": "0x754e0b6f4240cc86b37db58fafd8f7bc05a98c49",
312+
"data": "0x355274ea"
313+
},
314+
"latest"
315+
]
316+
}
317+
{
318+
"jsonrpc": "2.0",
319+
"id": 21,
320+
"method": "eth_blockNumber",
321+
"params": []
322+
}
323+
{
324+
"jsonrpc": "2.0",
325+
"id": 22,
326+
"method": "net_version",
327+
"params": []
328+
}
329+
{
330+
"jsonrpc": "2.0",
331+
"id": 23,
332+
"method": "eth_getBlockByNumber",
333+
"params": [
334+
"latest",
335+
false
336+
]
337+
}

0 commit comments

Comments
 (0)