Refactor for the new version of the Substate #7
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
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 |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package substate | ||
|
|
||
| import ( | ||
| "github.com/syndtr/goleveldb/leveldb/opt" | ||
|
|
||
| "github.com/Fantom-foundation/Substate/db" | ||
| "github.com/Fantom-foundation/Substate/substate" | ||
| ) | ||
|
|
||
| var ( | ||
| staticSubstateDB db.SubstateDB | ||
| RecordReplay bool = false | ||
| ) | ||
|
|
||
| func NewSubstateDB(path string) error { | ||
| var err error | ||
| staticSubstateDB, err = db.NewSubstateDB(path, &opt.Options{ReadOnly: false}, nil, nil) | ||
| return err | ||
| } | ||
|
|
||
| func CloseSubstateDB() error { | ||
| return staticSubstateDB.Close() | ||
| } | ||
|
|
||
| func PutSubstate(ss *substate.Substate) error { | ||
| return staticSubstateDB.PutSubstate(ss) | ||
| } |
|
There was a problem hiding this comment. I see a full copy of a structure in the util function. Can you and @matejmlejnek double check on performance penalty when recording new substates? There was a problem hiding this comment. Since this is our package, please add unit tests. |
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 |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| package substate | ||
|
|
||
| import ( | ||
| stypes "github.com/Fantom-foundation/Substate/types" | ||
| "github.com/ethereum/go-ethereum/common" | ||
| "github.com/ethereum/go-ethereum/core/types" | ||
| ) | ||
|
|
||
| //Here I put some utils to convert Geth types to Substate types | ||
|
|
||
| func HashGethToSubstate(g map[uint64]common.Hash) map[uint64]stypes.Hash { | ||
| res := make(map[uint64]stypes.Hash) | ||
| for k, v := range g { | ||
| res[k] = stypes.Hash(v) | ||
| } | ||
| return res | ||
| } | ||
|
|
||
| func AccessListGethToSubstate(al types.AccessList) stypes.AccessList { | ||
| st := stypes.AccessList{} | ||
| for _, tuple := range al { | ||
| var keys []stypes.Hash | ||
| for _, key := range tuple.StorageKeys { | ||
| keys = append(keys, stypes.Hash(key)) | ||
| } | ||
| st = append(st, stypes.AccessTuple{Address: stypes.Address(tuple.Address), StorageKeys: keys}) | ||
| } | ||
| return st | ||
| } | ||
|
|
||
| func LogsGethToSubstate(logs []*types.Log) []*stypes.Log { | ||
| var ls []*stypes.Log | ||
| for _, log := range logs { | ||
| l := new(stypes.Log) | ||
| l.BlockHash = stypes.Hash(log.BlockHash) | ||
| l.Data = log.Data | ||
| l.Address = stypes.Address(log.Address) | ||
| l.Index = log.Index | ||
| l.BlockNumber = log.BlockNumber | ||
| l.Removed = log.Removed | ||
| l.TxHash = stypes.Hash(log.TxHash) | ||
| l.TxIndex = log.TxIndex | ||
| for _, topic := range log.Topics { | ||
| l.Topics = append(l.Topics, stypes.Hash(topic)) | ||
| } | ||
|
|
||
| ls = append(ls, l) | ||
| } | ||
| return ls | ||
| } |
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
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.
This file seems to be modified by auto-formatting tool. I would suggest remove files which are unrelated to this change.