diff --git a/core/chain_makers.go b/core/chain_makers.go index 37f5a23eeb..4c25ab1261 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -22,6 +22,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/consensus" + "github.com/ethereum/go-ethereum/consensus/beacon" "github.com/ethereum/go-ethereum/consensus/misc" "github.com/ethereum/go-ethereum/consensus/misc/eip1559" "github.com/ethereum/go-ethereum/consensus/misc/eip4844" @@ -713,5 +714,10 @@ func (cm *chainMaker) GetBlock(hash common.Hash, number uint64) *types.Block { } func (cm *chainMaker) GetTd(hash common.Hash, number uint64) *big.Int { - return nil // not supported + // Allows tests to pass with beacon consensus engine + if _, ok := cm.engine.(*beacon.Beacon); ok { + return new(big.Int) + } + + return nil } diff --git a/eth/tracers/firehose.go b/eth/tracers/firehose.go index 70bfe345f9..e4c76fec5e 100644 --- a/eth/tracers/firehose.go +++ b/eth/tracers/firehose.go @@ -100,8 +100,6 @@ func NewTracingHooksFromFirehose(tracer *Firehose) *tracing.Hooks { OnGasChange: tracer.OnGasChange, OnLog: tracer.OnLog, - // This is being discussed in PR https://github.com/ethereum/go-ethereum/pull/29355 - // but Firehose needs them so we add handling for them in our patch. OnSystemCallStart: tracer.OnSystemCallStart, OnSystemCallEnd: tracer.OnSystemCallEnd, diff --git a/eth/tracers/internal/tracetest/firehose/firehose_test.go b/eth/tracers/internal/tracetest/firehose/firehose_test.go index 3b95ab9ece..94343d0e32 100644 --- a/eth/tracers/internal/tracetest/firehose/firehose_test.go +++ b/eth/tracers/internal/tracetest/firehose/firehose_test.go @@ -1,6 +1,8 @@ package firehose_test import ( + "math/big" + "os" "path/filepath" "strings" "testing" @@ -12,10 +14,15 @@ import ( "github.com/ethereum/go-ethereum/core/rawdb" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" + "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/params" "github.com/stretchr/testify/require" ) +func init() { + log.SetDefault(log.NewLogger(log.NewTerminalHandler(os.Stdout, false))) +} + type tracingModel string const ( @@ -171,7 +178,8 @@ func TestFirehosePrestate(t *testing.T) { func TestFirehose_SystemCalls(t *testing.T) { gspec := &core.Genesis{ - Config: params.MergedTestChainConfig, + Config: params.MergedTestChainConfig, + Difficulty: big.NewInt(0), } engine := beacon.New(ethash.NewFaker()) diff --git a/eth/tracers/internal/tracetest/firehose/helpers_test.go b/eth/tracers/internal/tracetest/firehose/helpers_test.go index 98d6cbba90..e22d647014 100644 --- a/eth/tracers/internal/tracetest/firehose/helpers_test.go +++ b/eth/tracers/internal/tracetest/firehose/helpers_test.go @@ -32,13 +32,14 @@ type firehoseBlockLines []firehoseBlockLine func newFirehoseTestTracer(t *testing.T, model tracingModel) (*tracers.Firehose, *tracing.Hooks, func()) { t.Helper() - tracer, err := tracers.NewFirehoseFromRawJSON([]byte(fmt.Sprintf(`{ + tracer, err := tracers.NewFirehoseFromRawJSON(fmt.Appendf(nil, `{ + "applyBackwardCompatibility": %t, "_private": { "flushToTestBuffer": true, "ignoreGenesisBlock": true, "forcedBackwardCompatibility": %t } - }`, model == tracingModelFirehose2_3))) + }`, model == tracingModelFirehose2_3, model == tracingModelFirehose2_3)) require.NoError(t, err) hooks := tracers.NewTracingHooksFromFirehose(tracer) diff --git a/eth/tracers/internal/tracetest/firehose/testdata/TestFirehosePrestate/extra_account_creations/fh3.0/block.207938.golden.json b/eth/tracers/internal/tracetest/firehose/testdata/TestFirehosePrestate/extra_account_creations/fh3.0/block.207938.golden.json index b0c3b4f5b5..7cd45c88ef 100644 --- a/eth/tracers/internal/tracetest/firehose/testdata/TestFirehosePrestate/extra_account_creations/fh3.0/block.207938.golden.json +++ b/eth/tracers/internal/tracetest/firehose/testdata/TestFirehosePrestate/extra_account_creations/fh3.0/block.207938.golden.json @@ -28,12 +28,6 @@ "beginOrdinal": "1", "calls": [ { - "accountCreations": [ - { - "account": "eo7Sf0wwUSMmh4ZS0g/IVydAGFQ=", - "ordinal": "53" - } - ], "address": "X/E31LD9zUncowx89X5XigJtJ4k=", "balanceChanges": [ { @@ -44,7 +38,7 @@ "oldValue": { "bytes": "BCJNar1sH1A=" }, - "ordinal": "2", + "ordinal": "3", "reason": "REASON_GAS_BUY" }, { @@ -55,7 +49,7 @@ "oldValue": { "bytes": "BBz5LMZCX1A=" }, - "ordinal": "52", + "ordinal": "61", "reason": "REASON_GAS_REFUND" }, { @@ -63,7 +57,7 @@ "newValue": { "bytes": "FS2x" }, - "ordinal": "54", + "ordinal": "63", "reason": "REASON_TRANSFER" }, { @@ -74,63 +68,84 @@ "oldValue": { "bytes": "0ct+JyxYSWY=" }, - "ordinal": "55", + "ordinal": "64", "reason": "REASON_TRANSFER" } ], + "beginOrdinal": "6", "callType": "CALL", "caller": "diuuNYBn2VTD1f0iIcjfhQt9Leo=", - "endOrdinal": "51", + "endOrdinal": "60", "executedCode": true, "failureReason": "execution reverted", "gasChanges": [ + { + "newValue": "300000", + "ordinal": "2", + "reason": "REASON_TX_INITIAL_BALANCE" + }, { "newValue": "263880", "oldValue": "300000", - "ordinal": "3", + "ordinal": "4", "reason": "REASON_INTRINSIC_GAS" }, + { + "newValue": "263880", + "ordinal": "7", + "reason": "REASON_CALL_INITIAL_BALANCE" + }, { "newValue": "255906", "oldValue": "255927", - "ordinal": "7", + "ordinal": "9", "reason": "REASON_CALL_DATA_COPY" }, { "newValue": "255616", "oldValue": "255659", - "ordinal": "8", + "ordinal": "10", "reason": "REASON_CALL_DATA_COPY" }, { "newValue": "255327", "oldValue": "255336", - "ordinal": "9", + "ordinal": "11", "reason": "REASON_CALL_DATA_COPY" }, { "newValue": "251104", "oldValue": "251122", - "ordinal": "10", + "ordinal": "12", "reason": "REASON_CALL_DATA_COPY" }, { "newValue": "248417", "oldValue": "250917", - "ordinal": "11", + "ordinal": "13", "reason": "REASON_STATE_COLD_ACCESS" }, { "newValue": "98417", "oldValue": "251017", - "ordinal": "12", + "ordinal": "14", "reason": "REASON_CALL" }, { "newValue": "102180", "oldValue": "98417", - "ordinal": "50", + "ordinal": "58", "reason": "REASON_REFUND_AFTER_EXECUTION" + }, + { + "oldValue": "101721", + "ordinal": "59", + "reason": "REASON_CALL_LEFT_OVER_RETURNED" + }, + { + "oldValue": "101721", + "ordinal": "62", + "reason": "REASON_TX_LEFT_OVER_RETURNED" } ], "gasConsumed": "162159", @@ -149,7 +164,7 @@ "address": "AAAAAAAAAAAAAAAAAAAAAAAAEBA=", "data": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOFqyK5cE8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIk1qvWwfUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANHLficsWElmAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABB7Hv5qyrwEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADRzwPSTxG5tQ==", "index": 3, - "ordinal": "56", + "ordinal": "65", "topics": [ "Tf4bu88Hfdw+ASke6i1ccMK0IrQV2VZFua3P1njLHWM=", "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBA=", @@ -163,7 +178,7 @@ "address": "diuuNYBn2VTD1f0iIcjfhQt9Leo=", "newValue": "5", "oldValue": "4", - "ordinal": "4" + "ordinal": "5" } ], "returnData": "IgJmtgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG0FBMTMgaW5pdENvZGUgZmFpbGVkIG9yIE9PRwAAAAAA", @@ -176,42 +191,52 @@ "key": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=", "newValue": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=", "oldValue": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=", - "ordinal": "6" + "ordinal": "8" } ] }, { "address": "f8mEMOrtu2Bws1s515hyUEkIg0g=", - "beginOrdinal": "13", + "beginOrdinal": "15", "callType": "CALL", "caller": "X/E31LD9zUncowx89X5XigJtJ4k=", "depth": 1, - "endOrdinal": "49", + "endOrdinal": "57", "executedCode": true, "gasChanges": [ + { + "newValue": "150000", + "ordinal": "16", + "reason": "REASON_CALL_INITIAL_BALANCE" + }, { "newValue": "149459", "oldValue": "149480", - "ordinal": "14", + "ordinal": "17", "reason": "REASON_CALL_DATA_COPY" }, { "newValue": "146827", "oldValue": "149327", - "ordinal": "15", + "ordinal": "18", "reason": "REASON_STATE_COLD_ACCESS" }, { "newValue": "2294", "oldValue": "149427", - "ordinal": "16", + "ordinal": "19", "reason": "REASON_CALL" }, { "newValue": "3869", "oldValue": "2294", - "ordinal": "48", + "ordinal": "55", "reason": "REASON_REFUND_AFTER_EXECUTION" + }, + { + "oldValue": "3763", + "ordinal": "56", + "reason": "REASON_CALL_LEFT_OVER_RETURNED" } ], "gasConsumed": "146237", @@ -224,43 +249,53 @@ }, { "address": "lAbMYYWjRpBiloQHRhJaDkSXZFQ=", - "beginOrdinal": "17", + "beginOrdinal": "20", "callType": "CALL", "caller": "f8mEMOrtu2Bws1s515hyUEkIg0g=", "depth": 2, - "endOrdinal": "47", + "endOrdinal": "54", "executedCode": true, "failureReason": "execution reverted", "gasChanges": [ + { + "newValue": "144533", + "ordinal": "21", + "reason": "REASON_CALL_INITIAL_BALANCE" + }, { "newValue": "143783", "oldValue": "144179", - "ordinal": "18", + "ordinal": "22", "reason": "REASON_CODE_COPY" }, { "newValue": "136634", "oldValue": "137052", - "ordinal": "19", + "ordinal": "23", "reason": "REASON_CODE_COPY" }, { "newValue": "103778", "oldValue": "136186", - "ordinal": "20", + "ordinal": "24", "reason": "REASON_CONTRACT_CREATION2" }, { "newValue": "1621", "oldValue": "103778", - "ordinal": "21", + "ordinal": "25", "reason": "REASON_CONTRACT_CREATION2" }, { "newValue": "1580", "oldValue": "1583", - "ordinal": "46", + "ordinal": "52", "reason": "REASON_RETURN_DATA_COPY" + }, + { + "oldValue": "1575", + "ordinal": "53", + "reason": "REASON_CALL_LEFT_OVER_RETURNED" } ], "gasConsumed": "142958", @@ -277,69 +312,70 @@ "statusReverted": true }, { - "accountCreations": [ - { - "account": "AjuDgYE6fZjZc+9wz+O2/T61r48=", - "ordinal": "24" - } - ], "address": "AjuDgYE6fZjZc+9wz+O2/T61r48=", - "beginOrdinal": "22", + "beginOrdinal": "26", "callType": "CREATE", "caller": "lAbMYYWjRpBiloQHRhJaDkSXZFQ=", "depth": 3, - "endOrdinal": "45", + "endOrdinal": "51", + "executedCode": true, "failureReason": "contract creation code storage out of gas", "gasChanges": [ + { + "newValue": "102157", + "ordinal": "27", + "reason": "REASON_CALL_INITIAL_BALANCE" + }, { "newValue": "102080", "oldValue": "102116", - "ordinal": "26", + "ordinal": "30", "reason": "REASON_CODE_COPY" }, { "newValue": "75232", "oldValue": "76357", - "ordinal": "28", + "ordinal": "32", "reason": "REASON_EVENT_LOG" }, { "newValue": "75062", "oldValue": "75077", - "ordinal": "30", + "ordinal": "34", "reason": "REASON_CODE_COPY" }, { "newValue": "1165", "oldValue": "74671", - "ordinal": "31", + "ordinal": "35", "reason": "REASON_DELEGATE_CALL" }, { "newValue": "48457", "oldValue": "1165", - "ordinal": "42", + "ordinal": "48", "reason": "REASON_REFUND_AFTER_EXECUTION" }, { "newValue": "47943", "oldValue": "48055", - "ordinal": "43", + "ordinal": "49", "reason": "REASON_CODE_COPY" }, { "oldValue": "47940", - "ordinal": "44", + "ordinal": "50", "reason": "REASON_FAILED_EXECUTION" } ], "gasConsumed": "102157", "gasLimit": "102157", "index": 4, + "input": "YIBgQFJgQFFhB8E4A4BhB8GDOYEBYECBkFJhACKRYQMhVlthAC6CgmAAYQA1VltQUGEEPlZbYQA+g2EAa1ZbYACCURGAYQBLV1CAWxVhAGZXYQBkg4NhAKtgIBthACkXYCAcVltQW1BQUFZbYQB0gWEA11ZbYEBRYAFgAWCgGwOCFpB/vHzXWiDuJ/2a3rqzIEH3VSFNvGv/qQzAIls52i5cLTuQYACQolBWW2BgYQDQg4NgQFGAYGABYEBSgGAngVJgIAFhB5pgJ5E5YQGpVluTklBQUFZbYQDqgWECImAgG2EAVRdgIBxWW2EBUVdgQFFiRhvNYOUbgVJgIGAEggFSYC1gJIIBUn9FUkMxOTY3OiBuZXcgaW1wbGVtZW50YXRpb24gaXMgbmBEggFSbBvdCBhIGNvbnRyYWN1gmhtgZIIBUmCEAVtgQFGAkQOQ/VuAYQGIfzYIlKE7oaMhBmfIKEktuY3KPiB2zDc1qSCjylBdOCu8YAAbYQIxYCAbYQBxF2AgHFZbgFRgAWABYKAbAxkWYAFgAWCgGwOSkJIWkZCRF5BVUFZbYGBgAICFYAFgAWCgGwMWhWBAUWEBxpGQYQPvVltgAGBAUYCDA4GFWvSRUFA9gGAAgRRhAgFXYEBRkVBgHxlgPz0BFoIBYEBSPYJSPWAAYCCEAT5hAgZWW2BgkVBbUJCSUJBQYQIYhoODh2ECNFZblpVQUFBQUFBWW2ABYAFgoBsDFjsVFZBWW5BWW2BggxVhAqNXglFgAANhApxXYAFgAWCgGwOFFjthApxXYEBRYkYbzWDlG4FSYCBgBIIBUmAdYCSCAVJ/QWRkcmVzczogY2FsbCB0byBub24tY29udHJhY3QAAABgRIIBUmBkAWEBSFZbUIFhAq1WW2ECrYODYQK1VluUk1BQUFBWW4FRFWECxVeBUYCDYCAB/VuAYEBRYkYbzWDlG4FSYAQBYQFIkZBhBAtWW2NOSHtxYOAbYABSYEFgBFJgJGAA/VtgAFuDgRAVYQMQV4GBAVGDggFSYCABYQL4VluDgREVYQBkV1BQYACRAVJWW2AAgGBAg4UDEhVhAzRXYACA/VuCUWABYAFgoBsDgRaBFGEDS1dgAID9W2AghAFRkJJQYAFgAWBAGwOAghEVYQNoV2AAgP1bgYUBkVCFYB+DARJhA3xXYACA/VuBUYGBERVhA45XYQOOYQLfVltgQFFgH4IBYB8ZkIEWYD8BFoEBkIOCEYGDEBcVYQO2V2EDtmEC31ZbgWBAUoKBUohgIISHAQERFWEDz1dgAID9W2ED4INgIIMBYCCIAWEC9VZbgJVQUFBQUFCSUJKQUFZbYACCUWEEAYGEYCCHAWEC9VZbkZCRAZKRUFBWW2AggVJgAIJRgGAghAFSYQQqgWBAhQFgIIcBYQL1VltgHwFgHxkWkZCRAWBAAZKRUFBWW2EDTYBhBE1gADlgAPP+YIBgQFI2YQATV2EAEWEAF1ZbAFthABFbYQAnYQAiYQB0VlthALlWW1ZbYGBhAE6Dg2BAUYBgYAFgQFKAYCeBUmAgAWEC8WAnkTlhAN1WW5OSUFBQVltz//////////////////////////8WOxUVkFZbkFZbYABhALR/NgiUoTuhoyEGZ8goSS25jco+IHbMNzWpIKPKUF04K7xUc///////////////////////////FpBWW5BQkFZbNmAAgDdgAIA2YACEWvQ9YACAPoCAFWEA2Fc9YADzWz1gAP1bYGBgAICFc///////////////////////////FoVgQFFhAQeRkGECg1ZbYABgQFGAgwOBhVr0kVBQPYBgAIEUYQFCV2BAUZFQYB8ZYD89ARaCAWBAUj2CUj1gAGAghAE+YQFHVltgYJFQW1CRUJFQYQFYhoODh2EBYlZblpVQUFBQUFBWW2BggxVhAf1XglFgAANhAfZXc///////////////////////////hRY7YQH2V2BAUX8Iw3mgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIFSYCBgBIIBUmAdYCSCAVJ/QWRkcmVzczogY2FsbCB0byBub24tY29udHJhY3QAAABgRIIBUmBkAVtgQFGAkQOQ/VtQgWECB1ZbYQIHg4NhAg9WW5STUFBQUFZbgVEVYQIfV4FRgINgIAH9W4BgQFF/CMN5oAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBUmAEAWEB7ZGQYQKfVltgAFuDgRAVYQJuV4GBAVGDggFSYCABYQJWVluDgREVYQJ9V2AAhIQBUltQUFBQVltgAIJRYQKVgYRgIIcBYQJTVluRkJEBkpFQUFZbYCCBUmAAglGAYCCEAVJhAr6BYECFAWAghwFhAlNWW2AfAX//////////////////////////////////////////4BaRkJEBYEABkpFQUFb+QWRkcmVzczogbG93LWxldmVsIGRlbGVnYXRlIGNhbGwgZmFpbGVkomRpcGZzWCISIBzXirajEhOYlmHP8tfQX8m5w4sahI6CSeLjmGWanrfjZHNvbGNDAAgPADNBZGRyZXNzOiBsb3ctbGV2ZWwgZGVsZWdhdGUgY2FsbCBmYWlsZWQAAAAAAAAAAAAAAACKuxM2C4e+XusbmGR6AWrdknoTbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACTE1m3oAAAAAAAAAAAAAAAAdiuuNYBn2VTD1f0iIcjfhQt9LeoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "logs": [ { "address": "AjuDgYE6fZjZc+9wz+O2/T61r48=", - "ordinal": "29", + "ordinal": "33", "topics": [ "vHzXWiDuJ/2a3rqzIEH3VSFNvGv/qQzAIls52i5cLTs=", "AAAAAAAAAAAAAAAAirsTNguHvl7rG5hkegFq3ZJ6E2w=" @@ -351,12 +387,12 @@ "address": "lAbMYYWjRpBiloQHRhJaDkSXZFQ=", "newValue": "3", "oldValue": "2", - "ordinal": "23" + "ordinal": "28" }, { "address": "AjuDgYE6fZjZc+9wz+O2/T61r48=", "newValue": "1", - "ordinal": "25" + "ordinal": "29" } ], "parentIndex": 3, @@ -368,30 +404,40 @@ "key": "NgiUoTuhoyEGZ8goSS25jco+IHbMNzWpIKPKUF04K7w=", "newValue": "AAAAAAAAAAAAAAAAirsTNguHvl7rG5hkegFq3ZJ6E2w=", "oldValue": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "ordinal": "27" + "ordinal": "31" } ] }, { "address": "irsTNguHvl7rG5hkegFq3ZJ6E2w=", - "beginOrdinal": "32", + "beginOrdinal": "36", "callType": "DELEGATE", "caller": "AjuDgYE6fZjZc+9wz+O2/T61r48=", "depth": 4, - "endOrdinal": "41", + "endOrdinal": "47", "executedCode": true, "gasChanges": [ + { + "newValue": "73406", + "ordinal": "37", + "reason": "REASON_CALL_INITIAL_BALANCE" + }, { "newValue": "48607", "oldValue": "50107", - "ordinal": "36", + "ordinal": "41", "reason": "REASON_EVENT_LOG" }, { "newValue": "47305", "oldValue": "48311", - "ordinal": "39", + "ordinal": "44", "reason": "REASON_EVENT_LOG" + }, + { + "oldValue": "47292", + "ordinal": "46", + "reason": "REASON_CALL_LEFT_OVER_RETURNED" } ], "gasConsumed": "26114", @@ -402,7 +448,7 @@ { "address": "AjuDgYE6fZjZc+9wz+O2/T61r48=", "index": 1, - "ordinal": "37", + "ordinal": "42", "topics": [ "R+Vcduem8f2JlqHagAjB6ilpnMo157zQV/LewxO25d4=", "AAAAAAAAAAAAAAAAX/E31LD9zUncowx89X5XigJtJ4k=", @@ -413,7 +459,7 @@ "address": "AjuDgYE6fZjZc+9wz+O2/T61r48=", "data": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=", "index": 2, - "ordinal": "40", + "ordinal": "45", "topics": [ "fya4P/luHytqaC8TOFL2eYoJxGXalZIUYM77OEdAJJg=" ] @@ -427,33 +473,33 @@ "key": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "newValue": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=", "oldValue": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "ordinal": "33" + "ordinal": "38" }, { "address": "AjuDgYE6fZjZc+9wz+O2/T61r48=", "key": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "newValue": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQE=", "oldValue": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=", - "ordinal": "34" + "ordinal": "39" }, { "address": "AjuDgYE6fZjZc+9wz+O2/T61r48=", "key": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "newValue": "AAAAAAAAAAAAAHYrrjWAZ9lUw9X9IiHI34ULfS3qAQE=", "oldValue": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQE=", - "ordinal": "35" + "ordinal": "40" }, { "address": "AjuDgYE6fZjZc+9wz+O2/T61r48=", "key": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "newValue": "AAAAAAAAAAAAAHYrrjWAZ9lUw9X9IiHI34ULfS3qAAE=", "oldValue": "AAAAAAAAAAAAAHYrrjWAZ9lUw9X9IiHI34ULfS3qAQE=", - "ordinal": "38" + "ordinal": "43" } ] } ], - "endOrdinal": "57", + "endOrdinal": "66", "from": "diuuNYBn2VTD1f0iIcjfhQt9Leo=", "gasLimit": "300000", "gasPrice": { @@ -471,7 +517,7 @@ "address": "AAAAAAAAAAAAAAAAAAAAAAAAEBA=", "data": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOFqyK5cE8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIk1qvWwfUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANHLficsWElmAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABB7Hv5qyrwEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADRzwPSTxG5tQ==", "index": 3, - "ordinal": "56", + "ordinal": "65", "topics": [ "Tf4bu88Hfdw+ASke6i1ccMK0IrQV2VZFua3P1njLHWM=", "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBA=", @@ -482,11 +528,12 @@ ], "logsBloom": "AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAIAAAAAAAgAAAAAAAAIAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA==" }, + "returnData": "IgJmtgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG0FBMTMgaW5pdENvZGUgZmFpbGVkIG9yIE9PRwAAAAAA", "s": "bk+EAD3UiLUfxRzH3Bbv5y8N7rhKESSMRwXu3bqryaQ=", "status": "REVERTED", "to": "X/E31LD9zUncowx89X5XigJtJ4k=", "v": "hPM=" } ], - "ver": 3 + "ver": 4 } \ No newline at end of file diff --git a/eth/tracers/internal/tracetest/firehose/testdata/TestFirehosePrestate/keccak256_too_few_memory_bytes_get_padded/fh3.0/block.3727495.golden.json b/eth/tracers/internal/tracetest/firehose/testdata/TestFirehosePrestate/keccak256_too_few_memory_bytes_get_padded/fh3.0/block.3727495.golden.json index 701c28cb5b..abad12e701 100644 --- a/eth/tracers/internal/tracetest/firehose/testdata/TestFirehosePrestate/keccak256_too_few_memory_bytes_get_padded/fh3.0/block.3727495.golden.json +++ b/eth/tracers/internal/tracetest/firehose/testdata/TestFirehosePrestate/keccak256_too_few_memory_bytes_get_padded/fh3.0/block.3727495.golden.json @@ -28,12 +28,6 @@ "beginOrdinal": "1", "calls": [ { - "accountCreations": [ - { - "account": "eo7Sf0wwUSMmh4ZS0g/IVydAGFQ=", - "ordinal": "12" - } - ], "address": "3Z+V4sEFOnYIm1AXgpuyMwy2rkc=", "balanceChanges": [ { @@ -44,7 +38,7 @@ "oldValue": { "bytes": "B5sluWe3fF0=" }, - "ordinal": "2", + "ordinal": "3", "reason": "REASON_GAS_BUY" }, { @@ -55,7 +49,7 @@ "oldValue": { "bytes": "B5sluWAKJ10=" }, - "ordinal": "11", + "ordinal": "14", "reason": "REASON_GAS_REFUND" }, { @@ -63,7 +57,7 @@ "newValue": { "bytes": "DdvV" }, - "ordinal": "13", + "ordinal": "16", "reason": "REASON_TRANSFER" }, { @@ -74,26 +68,47 @@ "oldValue": { "bytes": "AecopRVH6fvBC6c=" }, - "ordinal": "14", + "ordinal": "17", "reason": "REASON_TRANSFER" } ], + "beginOrdinal": "6", "callType": "CALL", "caller": "6z09YW8+Q+ntNh7dLQ5kTRjRebc=", - "endOrdinal": "10", + "endOrdinal": "13", "executedCode": true, "gasChanges": [ + { + "newValue": "200000", + "ordinal": "2", + "reason": "REASON_TX_INITIAL_BALANCE" + }, { "newValue": "178428", "oldValue": "200000", - "ordinal": "3", + "ordinal": "4", "reason": "REASON_INTRINSIC_GAS" }, + { + "newValue": "178428", + "ordinal": "7", + "reason": "REASON_CALL_INITIAL_BALANCE" + }, { "newValue": "130141", "oldValue": "131897", - "ordinal": "8", + "ordinal": "10", "reason": "REASON_EVENT_LOG" + }, + { + "oldValue": "130135", + "ordinal": "12", + "reason": "REASON_CALL_LEFT_OVER_RETURNED" + }, + { + "oldValue": "130135", + "ordinal": "15", + "reason": "REASON_TX_LEFT_OVER_RETURNED" } ], "gasConsumed": "48293", @@ -107,7 +122,7 @@ { "address": "3Z+V4sEFOnYIm1AXgpuyMwy2rkc=", "data": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPo=", - "ordinal": "9", + "ordinal": "11", "topics": [ "3fJSrRviyJtpwrBo/DeNqpUrp/FjxKEWKPVaTfUjs+8=", "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", @@ -119,7 +134,7 @@ "blockIndex": 1, "data": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgrk8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHmyW5Z7d8XQAAAAAAAAAAAAAAAAAAAAAAAAAAAAHnKKUVR+n7wQunAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5sluWUWzg4AAAAAAAAAAAAAAAAAAAAAAAAAAAAB5yilFUfp/mG59g==", "index": 1, - "ordinal": "15", + "ordinal": "18", "topics": [ "Tf4bu88Hfdw+ASke6i1ccMK0IrQV2VZFua3P1njLHWM=", "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBA=", @@ -133,7 +148,7 @@ "address": "6z09YW8+Q+ntNh7dLQ5kTRjRebc=", "newValue": "6", "oldValue": "5", - "ordinal": "4" + "ordinal": "5" } ], "storageChanges": [ @@ -142,19 +157,19 @@ "key": "u2X/egOxG3kUOwEdoN58Z/bZu49X3yOB2I1QPNsHsLY=", "newValue": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPo=", "oldValue": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "ordinal": "6" + "ordinal": "8" }, { "address": "3Z+V4sEFOnYIm1AXgpuyMwy2rkc=", "key": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=", "newValue": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPo=", "oldValue": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "ordinal": "7" + "ordinal": "9" } ] } ], - "endOrdinal": "16", + "endOrdinal": "19", "from": "6z09YW8+Q+ntNh7dLQ5kTRjRebc=", "gasLimit": "200000", "gasPrice": { @@ -171,7 +186,7 @@ { "address": "3Z+V4sEFOnYIm1AXgpuyMwy2rkc=", "data": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPo=", - "ordinal": "9", + "ordinal": "11", "topics": [ "3fJSrRviyJtpwrBo/DeNqpUrp/FjxKEWKPVaTfUjs+8=", "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", @@ -183,7 +198,7 @@ "blockIndex": 1, "data": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgrk8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHmyW5Z7d8XQAAAAAAAAAAAAAAAAAAAAAAAAAAAAHnKKUVR+n7wQunAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5sluWUWzg4AAAAAAAAAAAAAAAAAAAAAAAAAAAAB5yilFUfp/mG59g==", "index": 1, - "ordinal": "15", + "ordinal": "18", "topics": [ "Tf4bu88Hfdw+ASke6i1ccMK0IrQV2VZFua3P1njLHWM=", "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBA=", @@ -200,5 +215,5 @@ "v": "AVRtcg==" } ], - "ver": 3 + "ver": 4 } \ No newline at end of file diff --git a/eth/tracers/internal/tracetest/firehose/testdata/TestFirehosePrestate/keccak256_wrong_diff/fh3.0/block.3733424.golden.json b/eth/tracers/internal/tracetest/firehose/testdata/TestFirehosePrestate/keccak256_wrong_diff/fh3.0/block.3733424.golden.json index 62622fc6f8..343d40d7a5 100644 --- a/eth/tracers/internal/tracetest/firehose/testdata/TestFirehosePrestate/keccak256_wrong_diff/fh3.0/block.3733424.golden.json +++ b/eth/tracers/internal/tracetest/firehose/testdata/TestFirehosePrestate/keccak256_wrong_diff/fh3.0/block.3733424.golden.json @@ -28,12 +28,6 @@ "beginOrdinal": "1", "calls": [ { - "accountCreations": [ - { - "account": "eo7Sf0wwUSMmh4ZS0g/IVydAGFQ=", - "ordinal": "21" - } - ], "address": "VJoy1Xw102gR3mpGJZaXDIPqmyM=", "balanceChanges": [ { @@ -44,7 +38,7 @@ "oldValue": { "bytes": "B5sluMJIrb4=" }, - "ordinal": "2", + "ordinal": "3", "reason": "REASON_GAS_BUY" }, { @@ -55,7 +49,7 @@ "oldValue": { "bytes": "B5sluJ/kW34=" }, - "ordinal": "20", + "ordinal": "28", "reason": "REASON_GAS_REFUND" }, { @@ -63,7 +57,7 @@ "newValue": { "bytes": "CEm7Ag==" }, - "ordinal": "22", + "ordinal": "30", "reason": "REASON_TRANSFER" }, { @@ -74,50 +68,77 @@ "oldValue": { "bytes": "Aecpt9WGjDPX8TY=" }, - "ordinal": "23", + "ordinal": "31", "reason": "REASON_TRANSFER" } ], + "beginOrdinal": "6", "callType": "CALL", "caller": "6z09YW8+Q+ntNh7dLQ5kTRjRebc=", - "endOrdinal": "19", + "endOrdinal": "26", "executedCode": true, "gasChanges": [ + { + "newValue": "200000", + "ordinal": "2", + "reason": "REASON_TX_INITIAL_BALANCE" + }, { "newValue": "178664", "oldValue": "200000", - "ordinal": "3", + "ordinal": "4", "reason": "REASON_INTRINSIC_GAS" }, + { + "newValue": "178664", + "ordinal": "7", + "reason": "REASON_CALL_INITIAL_BALANCE" + }, { "newValue": "175937", "oldValue": "178437", - "ordinal": "6", + "ordinal": "8", "reason": "REASON_STATE_COLD_ACCESS" }, { "newValue": "2748", "oldValue": "178537", - "ordinal": "7", + "ordinal": "9", "reason": "REASON_CALL" }, { "newValue": "173596", "oldValue": "2748", - "ordinal": "10", + "ordinal": "14", "reason": "REASON_REFUND_AFTER_EXECUTION" }, { "newValue": "2677", "oldValue": "171474", - "ordinal": "11", + "ordinal": "15", "reason": "REASON_CALL" }, { "newValue": "144210", "oldValue": "2677", - "ordinal": "18", + "ordinal": "24", "reason": "REASON_REFUND_AFTER_EXECUTION" + }, + { + "oldValue": "144210", + "ordinal": "25", + "reason": "REASON_CALL_LEFT_OVER_RETURNED" + }, + { + "newValue": "149010", + "oldValue": "144210", + "ordinal": "27", + "reason": "REASON_TX_REFUNDS" + }, + { + "oldValue": "149010", + "ordinal": "29", + "reason": "REASON_TX_LEFT_OVER_RETURNED" } ], "gasConsumed": "34454", @@ -130,7 +151,7 @@ "blockIndex": 1, "data": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB67mQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHmyW4wkitvgAAAAAAAAAAAAAAAAAAAAAAAAAAAAHnKbfVhowz1/E2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5sluMHNv1oAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5ym31YaMNFLfmg==", "index": 1, - "ordinal": "24", + "ordinal": "32", "topics": [ "Tf4bu88Hfdw+ASke6i1ccMK0IrQV2VZFua3P1njLHWM=", "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBA=", @@ -144,18 +165,30 @@ "address": "6z09YW8+Q+ntNh7dLQ5kTRjRebc=", "newValue": "28", "oldValue": "27", - "ordinal": "4" + "ordinal": "5" } ] }, { "address": "LLZy2MEorMCCXcuvYeQ6KTpaUnY=", - "beginOrdinal": "8", + "beginOrdinal": "10", "callType": "CALL", "caller": "VJoy1Xw102gR3mpGJZaXDIPqmyM=", "depth": 1, - "endOrdinal": "9", + "endOrdinal": "13", "executedCode": true, + "gasChanges": [ + { + "newValue": "173186", + "ordinal": "11", + "reason": "REASON_CALL_INITIAL_BALANCE" + }, + { + "oldValue": "170848", + "ordinal": "12", + "reason": "REASON_CALL_LEFT_OVER_RETURNED" + } + ], "gasConsumed": "2338", "gasLimit": "173186", "index": 2, @@ -168,18 +201,28 @@ }, { "address": "LLZy2MEorMCCXcuvYeQ6KTpaUnY=", - "beginOrdinal": "12", + "beginOrdinal": "16", "callType": "CALL", "caller": "VJoy1Xw102gR3mpGJZaXDIPqmyM=", "depth": 1, - "endOrdinal": "17", + "endOrdinal": "23", "executedCode": true, "gasChanges": [ + { + "newValue": "168697", + "ordinal": "17", + "reason": "REASON_CALL_INITIAL_BALANCE" + }, { "newValue": "141533", "oldValue": "143289", - "ordinal": "15", + "ordinal": "20", "reason": "REASON_EVENT_LOG" + }, + { + "oldValue": "141533", + "ordinal": "22", + "reason": "REASON_CALL_LEFT_OVER_RETURNED" } ], "gasConsumed": "27164", @@ -194,7 +237,7 @@ { "address": "LLZy2MEorMCCXcuvYeQ6KTpaUnY=", "data": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJY=", - "ordinal": "16", + "ordinal": "21", "topics": [ "3fJSrRviyJtpwrBo/DeNqpUrp/FjxKEWKPVaTfUjs+8=", "AAAAAAAAAAAAAAAAVJoy1Xw102gR3mpGJZaXDIPqmyM=", @@ -209,19 +252,19 @@ "key": "u2X/egOxG3kUOwEdoN58Z/bZu49X3yOB2I1QPNsHsLY=", "newValue": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJY=", "oldValue": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "ordinal": "13" + "ordinal": "18" }, { "address": "LLZy2MEorMCCXcuvYeQ6KTpaUnY=", "key": "3+zF4pb61YPPMkCoeO+S/7CVXyhPAhbhZw9gwieeU7o=", "newValue": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "oldValue": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJY=", - "ordinal": "14" + "ordinal": "19" } ] } ], - "endOrdinal": "25", + "endOrdinal": "33", "from": "6z09YW8+Q+ntNh7dLQ5kTRjRebc=", "gasLimit": "200000", "gasPrice": { @@ -238,7 +281,7 @@ { "address": "LLZy2MEorMCCXcuvYeQ6KTpaUnY=", "data": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJY=", - "ordinal": "16", + "ordinal": "21", "topics": [ "3fJSrRviyJtpwrBo/DeNqpUrp/FjxKEWKPVaTfUjs+8=", "AAAAAAAAAAAAAAAAVJoy1Xw102gR3mpGJZaXDIPqmyM=", @@ -250,7 +293,7 @@ "blockIndex": 1, "data": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB67mQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHmyW4wkitvgAAAAAAAAAAAAAAAAAAAAAAAAAAAAHnKbfVhowz1/E2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5sluMHNv1oAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5ym31YaMNFLfmg==", "index": 1, - "ordinal": "24", + "ordinal": "32", "topics": [ "Tf4bu88Hfdw+ASke6i1ccMK0IrQV2VZFua3P1njLHWM=", "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBA=", @@ -267,5 +310,5 @@ "v": "Gw==" } ], - "ver": 3 + "ver": 4 } \ No newline at end of file diff --git a/eth/tracers/internal/tracetest/firehose/testdata/TestFirehosePrestate/suicide_double_withdraw/fh3.0/block.1550267.golden.json b/eth/tracers/internal/tracetest/firehose/testdata/TestFirehosePrestate/suicide_double_withdraw/fh3.0/block.1550267.golden.json index e53acd3b97..1e8a3ae1ac 100644 --- a/eth/tracers/internal/tracetest/firehose/testdata/TestFirehosePrestate/suicide_double_withdraw/fh3.0/block.1550267.golden.json +++ b/eth/tracers/internal/tracetest/firehose/testdata/TestFirehosePrestate/suicide_double_withdraw/fh3.0/block.1550267.golden.json @@ -28,16 +28,6 @@ "beginOrdinal": "1", "calls": [ { - "accountCreations": [ - { - "account": "tmHJ8wNCN1AUM716ZYd4S3AgslQ=", - "ordinal": "6" - }, - { - "account": "eo7Sf0wwUSMmh4ZS0g/IVydAGFQ=", - "ordinal": "13" - } - ], "address": "tmHJ8wNCN1AUM716ZYd4S3AgslQ=", "balanceChanges": [ { @@ -48,7 +38,7 @@ "oldValue": { "bytes": "Dbv1zrT3nx0=" }, - "ordinal": "2", + "ordinal": "3", "reason": "REASON_GAS_BUY" }, { @@ -59,7 +49,7 @@ "oldValue": { "bytes": "DbTWtv/L76k=" }, - "ordinal": "8", + "ordinal": "9", "reason": "REASON_TRANSFER" }, { @@ -67,7 +57,7 @@ "newValue": { "bytes": "d1bOoA==" }, - "ordinal": "9", + "ordinal": "10", "reason": "REASON_TRANSFER" }, { @@ -90,31 +80,44 @@ "reason": "REASON_TRANSFER" } ], + "beginOrdinal": "5", "callType": "CREATE", "caller": "eiOPKY1V+NsnuGDv8eAtFSixZYU=", - "endOrdinal": "12", + "endOrdinal": "13", + "executedCode": true, "failureReason": "invalid opcode: PUSH0", "gasChanges": [ + { + "newValue": "779146", + "ordinal": "2", + "reason": "REASON_TX_INITIAL_BALANCE" + }, { "newValue": "671370", "oldValue": "779146", - "ordinal": "3", + "ordinal": "4", "reason": "REASON_INTRINSIC_GAS" }, + { + "newValue": "671370", + "ordinal": "6", + "reason": "REASON_CALL_INITIAL_BALANCE" + }, { "oldValue": "671346", - "ordinal": "11", + "ordinal": "12", "reason": "REASON_FAILED_EXECUTION" } ], "gasConsumed": "671370", "gasLimit": "671370", "index": 1, + "input": "YIBgQFJzQwAAAAAAAAAAAAAAAAAAAAAAAABgAl9hAQAKgVSBc///////////////////////////AhkWkINz//////////////////////////8WAheQVVBzeiOPKY1V+NsnuGDv8eAtFSixZYVgA19hAQAKgVSBc///////////////////////////AhkWkINz//////////////////////////8WAheQVVBhALphAL9gIBtgIBxWW2EDHlZbX3+cIv9fIfC4GxE+Y/fbbalP7e8RshGbQIi4lmT7mjy2WJBQgGBAUWEA8JBhAnhWW4GQYEBRgJEDkF/1kFCAFYAVYQENVz1fgD49X/1bUF+AYQEACoFUgXP//////////////////////////wIZFpCDc///////////////////////////FgIXkFVQX4BUkGEBAAqQBHP//////////////////////////xZz//////////////////////////8WNGBAUWEBj5BhArJWW19gQFGAgwOBhYda8ZJQUFA9gF+BFGEByVdgQFGRUGAfGWA/PQEWggFgQFI9glI9X2AghAE+YQHOVltgYJFQW1BQUF+AVJBhAQAKkARz//////////////////////////8Wc///////////////////////////FmMPrxAhX4BUkGEBAAqQBHP//////////////////////////xZgQFGCY/////8WYOAbgVJgBAFhAkiRkGEDBVZbX2BAUYCDA4Ffh4A7FYAVYQJfV1+A/VtQWvEVgBVhAnFXPV+APj1f/VtQUFBQUFZbYQKKgGELSYM5AZBWW1+BkFCSkVBQVltQVltfYQKdX4NhAoVWW5FQYQKogmECj1ZbX4IBkFCRkFBWW19hAryCYQKSVluRUIGQUJGQUFZbX3P//////////////////////////4IWkFCRkFBWW19hAu+CYQLGVluQUJGQUFZbYQL/gWEC5VZbglJQUFZbX2AgggGQUGEDGF+DAYRhAvZWW5KRUFBWW2EIHoBhAytfOV/z/mCAYEBSYAQ2EGEAc1dfNWDgHIBjTffj0BFhAE1XgGNN9+PQFGEA3FeAY3R39wAUYQEGV4Bjex2CnBRhATBXgGPPOiF+FGEBWldhAHpWW4BjC2HNfxRhAH5XgGMNvmcfFGEAiFeAYx1j4k0UYQCyV2EAelZbNmEAelcAW1+A/VthAIZhAXBWWwBbNIAVYQCTV1+A/VtQYQCcYQMpVltgQFFhAKmRkGEEmlZbYEBRgJEDkPNbNIAVYQC9V1+A/VtQYQDGYQNMVltgQFFhANORkGEEy1ZbYEBRgJEDkPNbNIAVYQDnV1+A/VtQYQDwYQNSVltgQFFhAP2RkGEEmlZbYEBRgJEDkPNbNIAVYQERV1+A/VtQYQEaYQN3VltgQFFhASeRkGEEy1ZbYEBRgJEDkPNbNIAVYQE7V1+A/VtQYQFEYQN9VltgQFFhAVGRkGEEy1ZbYEBRgJEDkPNbNIAVYQFlV1+A/VtQYQFuYQODVlsAW19/nCL/XyHwuBsRPmP3222pT+3vEbIRm0CIuJZk+5o8tliQUIBgQFFhAaGQYQQTVluBkGBAUYCRA5Bf9ZBQgBWAFWEBvlc9X4A+PV/9W1BfgGEBAAqBVIFz//////////////////////////8CGRaQg3P//////////////////////////xYCF5BVUF+AVJBhAQAKkARz//////////////////////////8Wc///////////////////////////FjRgQFFhAkCQYQURVltfYEBRgIMDgYWHWvGSUFBQPYBfgRRhAnpXYEBRkVBgHxlgPz0BFoIBYEBSPYJSPV9gIIQBPmECf1ZbYGCRUFtQUFBfgFSQYQEACpAEc///////////////////////////FnP//////////////////////////xZjD68QIV+AVJBhAQAKkARz//////////////////////////8WYEBRgmP/////FmDgG4FSYAQBYQL5kZBhBUVWW19gQFGAgwOBX4eAOxWAFWEDEFdfgP1bUFrxFYAVYQMiVz1fgD49X/1bUFBQUFBWW1+AVJBhAQAKkARz//////////////////////////8WgVZbYAVUgVZbYAFfkFSQYQEACpAEc///////////////////////////FoFWW2AEVIFWW2AGVIFWW19/nCL/XyHwuBsRPmP3222pT+3vEbIRm0CIuJZk+5o8tliQUIBgQFFhA7SQYQQTVluBkGBAUYCRA5Bf9ZBQgBWAFWED0Vc9X4A+PV/9W1BfgGEBAAqBVIFz//////////////////////////8CGRaQg3P//////////////////////////xYCF5BVUFBWW2ECioBhBV+DOQGQVltfc///////////////////////////ghaQUJGQUFZbX4GQUJGQUFZbX2EEYmEEXWEEWIRhBCBWW2EEP1ZbYQQgVluQUJGQUFZbX2EEc4JhBEhWW5BQkZBQVltfYQSEgmEEaVZbkFCRkFBWW2EElIFhBHpWW4JSUFBWW19gIIIBkFBhBK1fgwGEYQSLVluSkVBQVltfgZBQkZBQVlthBMWBYQSzVluCUlBQVltfYCCCAZBQYQTeX4MBhGEEvFZbkpFQUFZbX4GQUJKRUFBWW1BWW19hBPxfg2EE5FZbkVBhBQeCYQTuVltfggGQUJGQUFZbX2EFG4JhBPFWW5FQgZBQkZBQVltfYQUvgmEEIFZbkFCRkFBWW2EFP4FhBSVWW4JSUFBWW19gIIIBkFBhBVhfgwGEYQU2VluSkVBQVv5ggGBAUnNDAAAAAAAAAAAAAAAAAAAAAAAAAF+AYQEACoFUgXP//////////////////////////wIZFpCDc///////////////////////////FgIXkFVQc3ojjymNVfjbJ7hg7/HgLRUosWWFYAFfYQEACoFUgXP//////////////////////////wIZFpCDc///////////////////////////FgIXkFVQNIAVYLVXX4D9W1BhAceAYQDDXzlf8/5ggGBAUmAENhBhADdXXzVg4ByAYw+vECEUYQBCV4BjHWPiTRRhAF5XgGN0d/cAFGEAiFdhAD5WWzZhAD5XAFtfgP1bYQBcYASANgOBAZBhAFeRkGEBNVZbYQCyVlsAWzSAFWEAaVdfgP1bUGEAcmEAy1ZbYEBRYQB/kZBhAXhWW2BAUYCRA5DzWzSAFWEAk1dfgP1bUGEAnGEA0VZbYEBRYQCpkZBhAXhWW2BAUYCRA5DzW4Bz//////////////////////////8W/1tgA1SBVltgAlSBVltfgP1bX3P//////////////////////////4IWkFCRkFBWW19hAQSCYQDbVluQUJGQUFZbYQEUgWEA+lZbgRRhAR5XX4D9W1BWW1+BNZBQYQEvgWEBC1ZbkpFQUFZbX2AggoQDEhVhAUpXYQFJYQDXVltbX2EBV4SChQFhASFWW5FQUJKRUFBWW1+BkFCRkFBWW2EBcoFhAWBWW4JSUFBWW19gIIIBkFBhAYtfgwGEYQFpVluSkVBQVv6iZGlwZnNYIhIgeJ3+vUw6BPBQJteR8YhtD8wTPcLbIRYEWUqAC1vSMjBkc29sY0MACBkAM6JkaXBmc1giEiC/VJdrQtHrDXIpsr3UjopR7bzpzAzhLuPtNOmtg7kBFWRzb2xjQwAIGQAzYIBgQFJzQwAAAAAAAAAAAAAAAAAAAAAAAABfgGEBAAqBVIFz//////////////////////////8CGRaQg3P//////////////////////////xYCF5BVUHN6I48pjVX42ye4YO/x4C0VKLFlhWABX2EBAAqBVIFz//////////////////////////8CGRaQg3P//////////////////////////xYCF5BVUDSAFWC1V1+A/VtQYQHHgGEAw185X/P+YIBgQFJgBDYQYQA3V181YOAcgGMPrxAhFGEAQleAYx1j4k0UYQBeV4BjdHf3ABRhAIhXYQA+Vls2YQA+VwBbX4D9W2EAXGAEgDYDgQGQYQBXkZBhATVWW2EAslZbAFs0gBVhAGlXX4D9W1BhAHJhAMtWW2BAUWEAf5GQYQF4VltgQFGAkQOQ81s0gBVhAJNXX4D9W1BhAJxhANFWW2BAUWEAqZGQYQF4VltgQFGAkQOQ81uAc///////////////////////////Fv9bYANUgVZbYAJUgVZbX4D9W19z//////////////////////////+CFpBQkZBQVltfYQEEgmEA21ZbkFCRkFBWW2EBFIFhAPpWW4EUYQEeV1+A/VtQVltfgTWQUGEBL4FhAQtWW5KRUFBWW19gIIKEAxIVYQFKV2EBSWEA11ZbW19hAVeEgoUBYQEhVluRUFCSkVBQVltfgZBQkZBQVlthAXKBYQFgVluCUlBQVltfYCCCAZBQYQGLX4MBhGEBaVZbkpFQUFb+omRpcGZzWCISIHid/r1MOgTwUCbXkfGIbQ/MEz3C2yEWBFlKgAtb0jIwZHNvbGNDAAgZADM=", "logs": [ { "address": "AAAAAAAAAAAAAAAAAAAAAAAAEBA=", "data": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHdWzqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANtNa2/8vvqQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADbTWtoh1IQkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAd1bOoA==", - "ordinal": "10", + "ordinal": "11", "topics": [ "5kl+PuVIozchNq8vywaW2zH8bPICYHB2RQaL0/6X88Q=", "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBA=", @@ -140,12 +143,12 @@ "address": "eiOPKY1V+NsnuGDv8eAtFSixZYU=", "newValue": "9", "oldValue": "8", - "ordinal": "5" + "ordinal": "7" }, { "address": "tmHJ8wNCN1AUM716ZYd4S3AgslQ=", "newValue": "1", - "ordinal": "7" + "ordinal": "8" } ], "stateReverted": true, @@ -199,5 +202,5 @@ } } ], - "ver": 3 + "ver": 4 } \ No newline at end of file diff --git a/eth/tracers/internal/tracetest/firehose/testdata/TestSystemCalls/fh2.3/block.1.golden.json b/eth/tracers/internal/tracetest/firehose/testdata/TestSystemCalls/fh2.3/block.1.golden.json index 55106f78b2..0709911258 100644 --- a/eth/tracers/internal/tracetest/firehose/testdata/TestSystemCalls/fh2.3/block.1.golden.json +++ b/eth/tracers/internal/tracetest/firehose/testdata/TestSystemCalls/fh2.3/block.1.golden.json @@ -1,71 +1,26 @@ { - "hash": "N6zSvR8q4sVWyJKo2vdOcc1KsrHinU95Ki/q4tjYQoc=", + "hash": "Iu/geSnZgN+2H6S8K8vpj3Oiqk03FaI7qFpX3htyq9U=", "header": { "baseFeePerGas": { "bytes": "NCdwwA==" }, - "blobGasUsed": "0", "coinbase": "AAAAAAAAAAAAAAAAAAAAAAAAAAA=", "difficulty": { "bytes": "AA==" }, - "excessBlobGas": "0", "gasLimit": "4712388", - "hash": "N6zSvR8q4sVWyJKo2vdOcc1KsrHinU95Ki/q4tjYQoc=", + "hash": "Iu/geSnZgN+2H6S8K8vpj3Oiqk03FaI7qFpX3htyq9U=", "logsBloom": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "mixHash": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "number": "1", - "parentBeaconRoot": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "parentHash": "MFX8J9a0oI6wcDOg0e51WkspiAhvKKYYnqwbUHUl7rE=", + "parentHash": "zVoIRvboN6qQqCFrZHaZUhpy0QQTWoTrFuDxIv8qRWg=", "receiptRoot": "VugfFxvMVab/g0XmksD4bltI4BuZbK3AAWIvteNjtCE=", - "requestsHash": "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=", "stateRoot": "VugfFxvMVab/g0XmksD4bltI4BuZbK3AAWIvteNjtCE=", "timestamp": "1970-01-01T00:00:10Z", "transactionsRoot": "VugfFxvMVab/g0XmksD4bltI4BuZbK3AAWIvteNjtCE=", - "uncleHash": "HcxN6N7HXXqrhbVntszUGtMSRRuUinQT8KFC/UDUk0c=", - "withdrawalsRoot": "VugfFxvMVab/g0XmksD4bltI4BuZbK3AAWIvteNjtCE=" + "uncleHash": "HcxN6N7HXXqrhbVntszUGtMSRRuUinQT8KFC/UDUk0c=" }, "number": "1", - "size": "611", - "systemCalls": [ - { - "address": "AA899tcygH7xMZ+3uLuFItC+rAI=", - "beginOrdinal": "1", - "callType": "CALL", - "caller": "//////////////////////////4=", - "endOrdinal": "2", - "gasLimit": "30000000", - "index": 1, - "input": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" - }, - { - "address": "AAD5CCfxxToQy3oCM1sXUyAAKTU=", - "beginOrdinal": "3", - "callType": "CALL", - "caller": "//////////////////////////4=", - "endOrdinal": "4", - "gasLimit": "30000000", - "index": 1, - "input": "MFX8J9a0oI6wcDOg0e51WkspiAhvKKYYnqwbUHUl7rE=" - }, - { - "address": "AAAJYe9IDrVegNGa2DV5pkwAcAI=", - "beginOrdinal": "5", - "callType": "CALL", - "caller": "//////////////////////////4=", - "endOrdinal": "6", - "gasLimit": "30000000", - "index": 1 - }, - { - "address": "AAC73cfOSIZC+1efiwDzpZAAclE=", - "beginOrdinal": "7", - "callType": "CALL", - "caller": "//////////////////////////4=", - "endOrdinal": "8", - "gasLimit": "30000000", - "index": 1 - } - ], + "size": "509", "ver": 3 } \ No newline at end of file diff --git a/eth/tracers/internal/tracetest/firehose/testdata/TestSystemCalls/fh3.0/block.1.golden.json b/eth/tracers/internal/tracetest/firehose/testdata/TestSystemCalls/fh3.0/block.1.golden.json index 1e736ccb0a..34e2894917 100644 --- a/eth/tracers/internal/tracetest/firehose/testdata/TestSystemCalls/fh3.0/block.1.golden.json +++ b/eth/tracers/internal/tracetest/firehose/testdata/TestSystemCalls/fh3.0/block.1.golden.json @@ -1,119 +1,26 @@ { - "hash": "N6zSvR8q4sVWyJKo2vdOcc1KsrHinU95Ki/q4tjYQoc=", + "hash": "Iu/geSnZgN+2H6S8K8vpj3Oiqk03FaI7qFpX3htyq9U=", "header": { "baseFeePerGas": { "bytes": "NCdwwA==" }, - "blobGasUsed": "0", "coinbase": "AAAAAAAAAAAAAAAAAAAAAAAAAAA=", "difficulty": { "bytes": "AA==" }, - "excessBlobGas": "0", "gasLimit": "4712388", - "hash": "N6zSvR8q4sVWyJKo2vdOcc1KsrHinU95Ki/q4tjYQoc=", + "hash": "Iu/geSnZgN+2H6S8K8vpj3Oiqk03FaI7qFpX3htyq9U=", "logsBloom": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "mixHash": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "number": "1", - "parentBeaconRoot": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "parentHash": "MFX8J9a0oI6wcDOg0e51WkspiAhvKKYYnqwbUHUl7rE=", + "parentHash": "zVoIRvboN6qQqCFrZHaZUhpy0QQTWoTrFuDxIv8qRWg=", "receiptRoot": "VugfFxvMVab/g0XmksD4bltI4BuZbK3AAWIvteNjtCE=", - "requestsHash": "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=", "stateRoot": "VugfFxvMVab/g0XmksD4bltI4BuZbK3AAWIvteNjtCE=", "timestamp": "1970-01-01T00:00:10Z", "transactionsRoot": "VugfFxvMVab/g0XmksD4bltI4BuZbK3AAWIvteNjtCE=", - "uncleHash": "HcxN6N7HXXqrhbVntszUGtMSRRuUinQT8KFC/UDUk0c=", - "withdrawalsRoot": "VugfFxvMVab/g0XmksD4bltI4BuZbK3AAWIvteNjtCE=" + "uncleHash": "HcxN6N7HXXqrhbVntszUGtMSRRuUinQT8KFC/UDUk0c=" }, "number": "1", - "size": "611", - "systemCalls": [ - { - "address": "AA899tcygH7xMZ+3uLuFItC+rAI=", - "beginOrdinal": "1", - "callType": "CALL", - "caller": "//////////////////////////4=", - "endOrdinal": "4", - "gasChanges": [ - { - "newValue": "30000000", - "ordinal": "2", - "reason": "REASON_CALL_INITIAL_BALANCE" - }, - { - "oldValue": "30000000", - "ordinal": "3", - "reason": "REASON_CALL_LEFT_OVER_RETURNED" - } - ], - "gasLimit": "30000000", - "index": 1, - "input": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" - }, - { - "address": "AAD5CCfxxToQy3oCM1sXUyAAKTU=", - "beginOrdinal": "5", - "callType": "CALL", - "caller": "//////////////////////////4=", - "endOrdinal": "8", - "gasChanges": [ - { - "newValue": "30000000", - "ordinal": "6", - "reason": "REASON_CALL_INITIAL_BALANCE" - }, - { - "oldValue": "30000000", - "ordinal": "7", - "reason": "REASON_CALL_LEFT_OVER_RETURNED" - } - ], - "gasLimit": "30000000", - "index": 1, - "input": "MFX8J9a0oI6wcDOg0e51WkspiAhvKKYYnqwbUHUl7rE=" - }, - { - "address": "AAAJYe9IDrVegNGa2DV5pkwAcAI=", - "beginOrdinal": "9", - "callType": "CALL", - "caller": "//////////////////////////4=", - "endOrdinal": "12", - "gasChanges": [ - { - "newValue": "30000000", - "ordinal": "10", - "reason": "REASON_CALL_INITIAL_BALANCE" - }, - { - "oldValue": "30000000", - "ordinal": "11", - "reason": "REASON_CALL_LEFT_OVER_RETURNED" - } - ], - "gasLimit": "30000000", - "index": 1 - }, - { - "address": "AAC73cfOSIZC+1efiwDzpZAAclE=", - "beginOrdinal": "13", - "callType": "CALL", - "caller": "//////////////////////////4=", - "endOrdinal": "16", - "gasChanges": [ - { - "newValue": "30000000", - "ordinal": "14", - "reason": "REASON_CALL_INITIAL_BALANCE" - }, - { - "oldValue": "30000000", - "ordinal": "15", - "reason": "REASON_CALL_LEFT_OVER_RETURNED" - } - ], - "gasLimit": "30000000", - "index": 1 - } - ], + "size": "509", "ver": 4 } \ No newline at end of file