-
Notifications
You must be signed in to change notification settings - Fork 21.9k
core, eth, les, trie: add a prefix to contract code #21080
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| // Copyright 2020 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 rawdb | ||
|
|
||
| import ( | ||
| "github.com/ethereum/go-ethereum/common" | ||
| "github.com/ethereum/go-ethereum/ethdb" | ||
| "github.com/ethereum/go-ethereum/log" | ||
| ) | ||
|
|
||
| // ReadPreimage retrieves a single preimage of the provided hash. | ||
| func ReadPreimage(db ethdb.KeyValueReader, hash common.Hash) []byte { | ||
| data, _ := db.Get(preimageKey(hash)) | ||
| return data | ||
| } | ||
|
|
||
| // WritePreimages writes the provided set of preimages to the database. | ||
| func WritePreimages(db ethdb.KeyValueWriter, preimages map[common.Hash][]byte) { | ||
| for hash, preimage := range preimages { | ||
| if err := db.Put(preimageKey(hash), preimage); err != nil { | ||
| log.Crit("Failed to store trie preimage", "err", err) | ||
| } | ||
| } | ||
| preimageCounter.Inc(int64(len(preimages))) | ||
| preimageHitCounter.Inc(int64(len(preimages))) | ||
| } | ||
|
|
||
| // ReadCode retrieves the contract code of the provided code hash. | ||
| func ReadCode(db ethdb.KeyValueReader, hash common.Hash) []byte { | ||
| // Try with the legacy code scheme first, if not then try with current | ||
| // scheme. Since most of the code will be found with legacy scheme. | ||
| // | ||
| // todo(rjl493456442) change the order when we forcibly upgrade the code | ||
| // scheme with snapshot. | ||
| data, _ := db.Get(hash[:]) | ||
| if len(data) != 0 { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nitpick: if data,_ ;= db.Get(hash[:]); len(data) >0{
return data
}
return ReadCodeWithPrefix(db, hash) |
||
| return data | ||
| } | ||
| return ReadCodeWithPrefix(db, hash) | ||
| } | ||
|
|
||
| // ReadCodeWithPrefix retrieves the contract code of the provided code hash. | ||
| // The main difference between this function and ReadCode is this function | ||
| // will only check the existence with latest scheme(with prefix). | ||
| func ReadCodeWithPrefix(db ethdb.KeyValueReader, hash common.Hash) []byte { | ||
| data, _ := db.Get(codeKey(hash)) | ||
| return data | ||
| } | ||
|
|
||
| // WriteCode writes the provided contract code database. | ||
| func WriteCode(db ethdb.KeyValueWriter, hash common.Hash, code []byte) { | ||
| if err := db.Put(codeKey(hash), code); err != nil { | ||
| log.Crit("Failed to store contract code", "err", err) | ||
| } | ||
| } | ||
|
|
||
| // DeleteCode deletes the specified contract code from the database. | ||
| func DeleteCode(db ethdb.KeyValueWriter, hash common.Hash) { | ||
| if err := db.Delete(codeKey(hash)); err != nil { | ||
| log.Crit("Failed to delete contract code", "err", err) | ||
| } | ||
| } | ||
|
|
||
| // ReadTrieNode retrieves the trie node of the provided hash. | ||
| func ReadTrieNode(db ethdb.KeyValueReader, hash common.Hash) []byte { | ||
| data, _ := db.Get(hash.Bytes()) | ||
| return data | ||
| } | ||
|
|
||
| // WriteTrieNode writes the provided trie node database. | ||
| func WriteTrieNode(db ethdb.KeyValueWriter, hash common.Hash, node []byte) { | ||
| if err := db.Put(hash.Bytes(), node); err != nil { | ||
| log.Crit("Failed to store trie node", "err", err) | ||
| } | ||
| } | ||
|
|
||
| // DeleteTrieNode deletes the specified trie node from the database. | ||
| func DeleteTrieNode(db ethdb.KeyValueWriter, hash common.Hash) { | ||
| if err := db.Delete(hash.Bytes()); err != nil { | ||
| log.Crit("Failed to delete trie node", "err", err) | ||
| } | ||
| } | ||
This file contains hidden or 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 hidden or 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.
Uh oh!
There was an error while loading. Please reload this page.