Skip to content

Commit

Permalink
Merge pull request #1687 from OffchainLabs/merge-v1.11.5
Browse files Browse the repository at this point in the history
Update go-ethereum to our fork of version v1.11.5
  • Loading branch information
PlasmaPower committed Jun 29, 2023
2 parents 47f76bb + 2b63530 commit ca73cbc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion go-ethereum
Submodule go-ethereum updated 93 files
+5 −0 .clabot
+1 −1 .github/CONTRIBUTING.md
+24 −0 .github/workflows/ci.yml
+1 −1 .travis.yml
+6 −6 README.md
+4 −1 accounts/abi/abi.go
+3 −5 arbitrum/apibackend.go
+2 −4 arbitrum/recordingdb.go
+1 −1 cmd/checkpoint-admin/README.md
+0 −1 cmd/devp2p/main.go
+3 −3 cmd/geth/consolecmd.go
+0 −1 cmd/geth/main.go
+7 −8 consensus/beacon/consensus.go
+7 −7 consensus/clique/clique.go
+5 −5 consensus/consensus.go
+6 −5 consensus/ethash/consensus.go
+3 −5 core/block_validator.go
+30 −29 core/blockchain.go
+73 −112 core/forkid/forkid_test.go
+1 −0 core/state/snapshot/snapshot_test.go
+11 −38 core/state/state_object.go
+10 −6 core/state/statedb.go
+3 −3 core/state_transition.go
+6 −9 core/txpool/list.go
+3 −5 core/txpool/txpool.go
+3 −3 core/txpool/txpool2_test.go
+29 −23 core/txpool/txpool_test.go
+1 −1 core/types/receipt_test.go
+2 −2 core/types/transaction_marshalling.go
+0 −1 core/vm/instructions.go
+1 −2 core/vm/interface.go
+4 −4 core/vm/jump_table.go
+1 −1 core/vm/logger.go
+1 −1 eth/api.go
+12 −0 eth/api_backend.go
+1 −1 eth/catalyst/api.go
+12 −1 eth/tracers/internal/tracetest/calltrace_test.go
+23 −1 eth/tracers/internal/tracetest/testdata/call_tracer/create.json
+23 −1 eth/tracers/internal/tracetest/testdata/call_tracer/deep_calls.json
+22 −0 eth/tracers/internal/tracetest/testdata/call_tracer/delegatecall.json
+23 −1 eth/tracers/internal/tracetest/testdata/call_tracer/inner_create_oog_outer_throw.json
+23 −1 eth/tracers/internal/tracetest/testdata/call_tracer/inner_instafail.json
+22 −0 eth/tracers/internal/tracetest/testdata/call_tracer/inner_revert_reason.json
+23 −1 eth/tracers/internal/tracetest/testdata/call_tracer/inner_throw_outer_revert.json
+22 −0 eth/tracers/internal/tracetest/testdata/call_tracer/oog.json
+23 −1 eth/tracers/internal/tracetest/testdata/call_tracer/revert.json
+22 −0 eth/tracers/internal/tracetest/testdata/call_tracer/revert_reason.json
+29 −1 eth/tracers/internal/tracetest/testdata/call_tracer/selfdestruct.json
+22 −0 eth/tracers/internal/tracetest/testdata/call_tracer/simple.json
+22 −0 eth/tracers/internal/tracetest/testdata/call_tracer/simple_onlytop.json
+22 −0 eth/tracers/internal/tracetest/testdata/call_tracer/throw.json
+22 −0 eth/tracers/internal/tracetest/testdata/call_tracer_withLog/calldata.json
+22 −0 eth/tracers/internal/tracetest/testdata/call_tracer_withLog/delegatecall.json
+22 −0 eth/tracers/internal/tracetest/testdata/call_tracer_withLog/multi_contracts.json
+23 −1 eth/tracers/internal/tracetest/testdata/call_tracer_withLog/multilogs.json
+22 −0 eth/tracers/internal/tracetest/testdata/call_tracer_withLog/notopic.json
+22 −0 eth/tracers/internal/tracetest/testdata/call_tracer_withLog/simple.json
+22 −0 eth/tracers/internal/tracetest/testdata/call_tracer_withLog/tx_failed.json
+22 −0 eth/tracers/internal/tracetest/testdata/call_tracer_withLog/tx_partial_failed.json
+22 −0 eth/tracers/internal/tracetest/testdata/call_tracer_withLog/with_onlyTopCall.json
+2 −1 eth/tracers/native/call.go
+2 −2 graphql/graphql.go
+9 −9 internal/ethapi/api.go
+2 −1 metrics/chunked_associative_array.go
+10 −0 p2p/discover/v5_udp.go
+16 −2 p2p/discover/v5wire/encoding.go
+1 −0 params/config.go
+1 −1 params/version.go
+64 −0 rlp/decode.go
+42 −0 rlp/decode_test.go
+25 −0 rlp/encbuffer.go
+21 −0 rlp/encode.go
+49 −0 rlp/encode_test.go
+50 −1 rlp/rlpgen/gen.go
+1 −1 rlp/rlpgen/gen_test.go
+10 −0 rlp/rlpgen/testdata/uint256.in.txt
+44 −0 rlp/rlpgen/testdata/uint256.out.txt
+10 −0 rlp/rlpgen/types.go
+1 −1 rpc/websocket.go
+13 −0 tests/init.go
+14 −32 trie/committer.go
+4 −5 trie/database.go
+61 −54 trie/nodeset.go
+1 −1 trie/proof.go
+19 −6 trie/proof_test.go
+6 −2 trie/stacktrie.go
+1 −0 trie/sync_test.go
+125 −0 trie/tracer.go
+368 −0 trie/tracer_test.go
+14 −14 trie/trie.go
+60 −37 trie/trie_test.go
+0 −305 trie/util_test.go
+0 −199 trie/utils.go

0 comments on commit ca73cbc

Please sign in to comment.