Skip to content

implementing PR #23558 from ethereum/go-ethereum#416

Merged
meowsbits merged 2 commits intoetclabscore:masterfrom
afmsavage:cmd-disable-memoryReturn
Oct 13, 2021
Merged

implementing PR #23558 from ethereum/go-ethereum#416
meowsbits merged 2 commits intoetclabscore:masterfrom
afmsavage:cmd-disable-memoryReturn

Conversation

@afmsavage
Copy link
Copy Markdown
Contributor

@afmsavage afmsavage commented Sep 23, 2021

Cloning the changes made ethereum/go-ethereum#23558 to core-geth.

@afmsavage afmsavage marked this pull request as draft September 23, 2021 17:13
@meowsbits
Copy link
Copy Markdown
Contributor

meowsbits commented Sep 23, 2021

Thanks @afmsavage. Looking good. Is it possible to cherry-pick the commit(s) to keep code provenance and ensure exact same changes? (Not sure; might be conflicts or other reasons why not..?)

Rel #412

@ziogaschr
Copy link
Copy Markdown
Member

ziogaschr commented Sep 23, 2021

Thanks @afmsavage. I would like to test some stuff on this PR which might break the trace_* API added on core-geth.

This (testing) will be done soon enough either way, while merging upstream changes.

@afmsavage
Copy link
Copy Markdown
Contributor Author

afmsavage commented Sep 29, 2021

Yea no problem @ziogaschr . I will try to cherry-pick from the go-ethereum PR but i think there were a few things that didn't exist in this repo VS the go-ethereum one, but I'll try what I can.

@ziogaschr
Copy link
Copy Markdown
Member

ziogaschr commented Sep 29, 2021

Thanks @afmsavage, we already found an issue and we fixed that. I will test a bit more.

@MariusVanDerWijden @holiman @afmsavage
core, rpc: disable memory output by default in traces (#23558)
36f0a83 
* core: cmd: invert disableMemory

* core: fix missed inversion

* cmd/evm: preserve Flags but change default value

* Apply suggestions from code review

Co-authored-by: Martin Holst Swende <martin@swende.se>

Co-authored-by: Martin Holst Swende <martin@swende.se>
@afmsavage
Copy link
Copy Markdown
Contributor Author

afmsavage commented Sep 29, 2021

Ok I was able to cherry pick the PR from go-ethereum but its pretty different. I commited it so the history is there though.

@afmsavage afmsavage marked this pull request as ready for review September 30, 2021 20:30
@ziogaschr
Copy link
Copy Markdown
Member

ziogaschr commented Oct 13, 2021

LGTM!!!

@meowsbits meowsbits merged commit 84b3b37 into etclabscore:master Oct 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@meowsbits meowsbits meowsbits approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@afmsavage @meowsbits @ziogaschr @MariusVanDerWijden