[evm] EIP-1153 enable transient storage feature #4214
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,24 +43,27 @@ | |
|
|
||
| // StateDBAdapter represents the state db adapter for evm to access iotx blockchain | ||
| StateDBAdapter struct { | ||
| sm protocol.StateManager | ||
| logs []*action.Log | ||
| transactionLogs []*action.TransactionLog | ||
| err error | ||
| blockHeight uint64 | ||
| executionHash hash.Hash256 | ||
| lastAddBalanceAddr string | ||
| lastAddBalanceAmount *big.Int | ||
| refund uint64 | ||
| refundSnapshot map[int]uint64 | ||
| cachedContract contractMap | ||
| contractSnapshot map[int]contractMap // snapshots of contracts | ||
| selfDestructed deleteAccount // account/contract calling SelfDestruct | ||
| selfDestructedSnapshot map[int]deleteAccount // snapshots of SelfDestruct accounts | ||
| preimages preimageMap | ||
| preimageSnapshot map[int]preimageMap | ||
| accessList *accessList // per-transaction access list | ||
| accessListSnapshot map[int]*accessList | ||
| // Transient storage | ||
| transientStorage transientStorage | ||
| transientStorageSnapshot map[int]transientStorage | ||
| logsSnapshot map[int]int // logs is an array, save len(logs) at time of snapshot suffices | ||
| txLogsSnapshot map[int]int | ||
| notFixTopicCopyBug bool | ||
|
|
@@ -170,23 +173,25 @@ | |
| opts ...StateDBAdapterOption, | ||
| ) (*StateDBAdapter, error) { | ||
| s := &StateDBAdapter{ | ||
| sm: sm, | ||
| logs: []*action.Log{}, | ||
| err: nil, | ||
| blockHeight: blockHeight, | ||
| executionHash: executionHash, | ||
| lastAddBalanceAmount: new(big.Int), | ||
| refundSnapshot: make(map[int]uint64), | ||
| cachedContract: make(contractMap), | ||
| contractSnapshot: make(map[int]contractMap), | ||
| selfDestructed: make(deleteAccount), | ||
| selfDestructedSnapshot: make(map[int]deleteAccount), | ||
| preimages: make(preimageMap), | ||
| preimageSnapshot: make(map[int]preimageMap), | ||
| accessList: newAccessList(), | ||
| accessListSnapshot: make(map[int]*accessList), | ||
| transientStorage: newTransientStorage(), | ||
| transientStorageSnapshot: make(map[int]transientStorage), | ||
| logsSnapshot: make(map[int]int), | ||
| txLogsSnapshot: make(map[int]int), | ||
| } | ||
| for _, opt := range opts { | ||
| if err := opt(s); err != nil { | ||
|
|
@@ -478,13 +483,16 @@ | |
|
|
||
| // SetTransientState sets transient storage for a given account | ||
| func (stateDB *StateDBAdapter) SetTransientState(addr common.Address, key, value common.Hash) { | ||
| prev := stateDB.transientStorage.Get(addr, key) | ||
| if prev == value { | ||
| return | ||
| } | ||
| stateDB.transientStorage.Set(addr, key, value) | ||
| } | ||
|
|
||
| // GetTransientState gets transient storage for a given account. | ||
| func (stateDB *StateDBAdapter) GetTransientState(addr common.Address, key common.Hash) common.Hash { | ||
| return stateDB.transientStorage.Get(addr, key) | ||
| } | ||
|
|
||
| // Selfdestruct6780 implements EIP-6780 | ||
|
|
@@ -530,6 +538,8 @@ | |
| if !rules.IsBerlin { | ||
| return | ||
| } | ||
| // Clear out any leftover from previous executions | ||
| stateDB.accessList = newAccessList() | ||
|
There was a problem hiding this comment. this is not necessary? we are creating a new There was a problem hiding this comment. for safety, it's best to add There was a problem hiding this comment. What is the relationship with eip-1153? There was a problem hiding this comment.
for what kind of safety? We need to be clear what we want to achieve. There was a problem hiding this comment. the code has updated in i think we missed it |
||
| stateDB.AddAddressToAccessList(sender) | ||
| if dst != nil { | ||
| stateDB.AddAddressToAccessList(*dst) | ||
|
|
@@ -547,6 +557,8 @@ | |
| if rules.IsShanghai { // EIP-3651: warm coinbase | ||
| stateDB.AddAddressToAccessList(coinbase) | ||
| } | ||
| // Reset transient storage at the beginning of transaction execution | ||
| stateDB.transientStorage = newTransientStorage() | ||
|
There was a problem hiding this comment. as discused, let's remove this, it is done in |
||
| } | ||
|
|
||
| // AddressInAccessList returns true if the given address is in the access list | ||
|
|
@@ -623,6 +635,18 @@ | |
| } | ||
| } | ||
| } | ||
| //restore transientStorage | ||
| stateDB.transientStorage = stateDB.transientStorageSnapshot[snapshot] | ||
| { | ||
| delete(stateDB.transientStorageSnapshot, snapshot) | ||
| for i := snapshot + 1; ; i++ { | ||
| if _, ok := stateDB.transientStorageSnapshot[i]; ok { | ||
| delete(stateDB.transientStorageSnapshot, i) | ||
| } else { | ||
| break | ||
| } | ||
| } | ||
| } | ||
| // restore logs and txLogs | ||
| if stateDB.revertLog { | ||
| stateDB.logs = stateDB.logs[:stateDB.logsSnapshot[snapshot]] | ||
|
|
@@ -750,6 +774,8 @@ | |
| stateDB.preimageSnapshot[sn] = p | ||
| // save a copy of access list | ||
| stateDB.accessListSnapshot[sn] = stateDB.accessList.Copy() | ||
| // save a copy of transient storage | ||
| stateDB.transientStorageSnapshot[sn] = stateDB.transientStorage.Copy() | ||
millken marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return sn | ||
| } | ||
|
|
||
|
|
@@ -1089,6 +1115,8 @@ | |
| stateDB.preimageSnapshot = make(map[int]preimageMap) | ||
| stateDB.accessList = newAccessList() | ||
| stateDB.accessListSnapshot = make(map[int]*accessList) | ||
| stateDB.transientStorage = newTransientStorage() | ||
| stateDB.transientStorageSnapshot = make(map[int]transientStorage) | ||
| stateDB.logsSnapshot = make(map[int]int) | ||
| stateDB.txLogsSnapshot = make(map[int]int) | ||
| stateDB.logs = []*action.Log{} | ||
|
|
||
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.
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.
comments need updates