New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
core: drop legacy receipt types #26225
Merged
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,53 +1 @@ | ||
// Copyright 2022 The go-ethereum Authors | ||
// This file is part of the go-ethereum library. | ||
// | ||
// The go-ethereum library is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU Lesser General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
// | ||
// The go-ethereum library is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU Lesser General Public License for more details. | ||
// | ||
// You should have received a copy of the GNU Lesser General Public License | ||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
package types | ||
s1na marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
import ( | ||
"errors" | ||
|
||
"github.com/ethereum/go-ethereum/rlp" | ||
) | ||
|
||
// IsLegacyStoredReceipts tries to parse the RLP-encoded blob | ||
// first as an array of v3 stored receipt, then v4 stored receipt and | ||
// returns true if successful. | ||
func IsLegacyStoredReceipts(raw []byte) (bool, error) { | ||
var v3 []v3StoredReceiptRLP | ||
if err := rlp.DecodeBytes(raw, &v3); err == nil { | ||
return true, nil | ||
} | ||
var v4 []v4StoredReceiptRLP | ||
if err := rlp.DecodeBytes(raw, &v4); err == nil { | ||
return true, nil | ||
} | ||
var v5 []storedReceiptRLP | ||
// Check to see valid fresh stored receipt | ||
if err := rlp.DecodeBytes(raw, &v5); err == nil { | ||
return false, nil | ||
} | ||
return false, errors.New("value is not a valid receipt encoding") | ||
} | ||
|
||
// ConvertLegacyStoredReceipts takes the RLP encoding of an array of legacy | ||
// stored receipts and returns a fresh RLP-encoded stored receipt. | ||
func ConvertLegacyStoredReceipts(raw []byte) ([]byte, error) { | ||
var receipts []ReceiptForStorage | ||
if err := rlp.DecodeBytes(raw, &receipts); err != nil { | ||
return nil, err | ||
} | ||
return rlp.EncodeToBytes(&receipts) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just a nitpick and you can ignore it
Is it possible to re-use the definition in core/types package soomehow?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we can mark a TODO here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you have an idea how to do it without exporting an additional type in core/types?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think it's possible to reuse the definition in core/types.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be kind of nice to remove the
DecodeRLP
method ofreceiptLogs
. I think you could just rename the typestoredReceiptRLP
toreceiptLogs
. It would save a lot of reflect indirection during decoding.